Replace YACL with ContextMenu. Fix major bugs with MinecraftSkin

Author: tanishisherewithhh

build.gradle

@@ -34,8 +34,6 @@ dependencies {
     implementation "net.fabricmc:fabric-loader:${project.loader_version}"
     implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    implementation "dev.isxander:yet-another-config-lib:${project.yacl_version}"
-
     //fuzzyscore
     implementation 'org.apache.commons:commons-text:1.12.0'
 }
@@ -44,7 +42,6 @@ processResources {
     inputs.property "version", project.version
     inputs.property "loader_version", project.loader_version
     inputs.property "minecraft_version", project.minecraft_version
-    inputs.property "yacl_version", project.yacl_version
 
     filesMatching("fabric.mod.json") {
             expand([

gradle.properties

@@ -18,5 +18,4 @@ maven_group = com.tanishisherewith
 archives_base_name = dynamichud
 
 # Dependencies
-fabric_version=0.145.4+26.1.1
-yacl_version=3.9.4+26.1-fabric
+fabric_version=0.145.4+26.1.1

src/main/java/com/tanishisherewith/dynamichud/DynamicHUD.java

@@ -49,8 +49,8 @@ public static void printWarn(String msg) {
     public void onInitializeClient() {
         printInfo("Initialising DynamicHUD");
 
-        //YACL load
-        GlobalConfig.HANDLER.load();
+        //Config load
+        GlobalConfig.loadOrCreate();
 
         ClientLifecycleEvents.CLIENT_STARTED.register((minecraft)-> IntegrationManager.integrate());
 

src/main/java/com/tanishisherewith/dynamichud/config/GlobalConfig.java

@@ -0,0 +1,29 @@
+package com.tanishisherewith.dynamichud.internal;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+
+import java.awt.Color;
+import java.io.IOException;
+
+public class ColorTypeAdapter extends TypeAdapter<Color> {
+    @Override
+    public void write(JsonWriter out, Color color) throws IOException {
+        if (color == null) {
+            out.nullValue();
+            return;
+        }
+        out.value(color.getRGB());
+    }
+
+    @Override
+    public Color read(JsonReader in) throws IOException {
+        if (in.peek() == JsonToken.NULL) {
+            in.nextNull();
+            return null;
+        }
+        return new Color(in.nextInt(), true);
+    }
+}

src/main/java/com/tanishisherewith/dynamichud/internal/ColorTypeAdapter.java

@@ -2,20 +2,27 @@
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.tanishisherewith.dynamichud.config.GlobalConfig;
+import com.tanishisherewith.dynamichud.utils.contextmenu.ContextMenuManager;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.layouts.HeaderAndFooterLayout;
 import net.minecraft.client.gui.layouts.LinearLayout;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.gui.screens.options.OptionsScreen;
+import net.minecraft.client.input.CharacterEvent;
+import net.minecraft.client.input.KeyEvent;
+import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
+import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.function.Supplier;
 
@@ -45,13 +52,12 @@ protected OptionsScreenMixin(Component title) {
     )
     private void injectDHLayout(CallbackInfo ci, @Local(ordinal = 0) LinearLayout header) {
         this.header = header;
-        dhButton = openScreenButton(Component.literal("DH"), () -> GlobalConfig.get().createYACLGUI());
+        dhButton = openScreenButton(Component.literal("DH"), () -> GlobalConfig.get().openMenu());
         dhButton.setPosition(this.width / 2 - 150 - 24 - 8, header.getY() + header.getHeight() - 20);
         dhButton.setSize(20,20);
         this.addRenderableWidget(dhButton);
     }
 
-
     @Inject(
             method = "repositionElements",
             at = @At(value = "TAIL")

src/main/java/com/tanishisherewith/dynamichud/mixins/OptionsScreenMixin.java

@@ -97,7 +97,7 @@ private static List<Option<?>> filterAndSortOptions(List<Option<?>> source, int
                 boolean groupMatches = groupScore >= threshold;
 
                 if (groupMatches || !filteredChildren.isEmpty()) {
-                    OptionGroup newGroup = new OptionGroup(group.name);
+                    OptionGroup newGroup = new OptionGroup(group.getName());
                     newGroup.setExpanded(true);
                     for (Option<?> child : filteredChildren) {
                         newGroup.addOption(child);
@@ -115,6 +115,7 @@ private static List<Option<?>> filterAndSortOptions(List<Option<?>> source, int
             int sb = getEffectiveScore(b, scoreMap);
             return Integer.compare(sb, sa);
         });
+        System.out.println("RESULT: " + result);
         return result;
     }
 

src/main/java/com/tanishisherewith/dynamichud/utils/Util.java

@@ -113,7 +113,7 @@ public void render(GuiGraphicsExtractor graphics, int xPos, int yPos, int mouseX
 
         update();
 
-        if (animScale <= 0.0f || newScreenFlag) return;
+        if (animScale <= 0.01f || newScreenFlag) return;
 
         int screenWidth = DynamicHUD.MC.getWindow().getGuiScaledWidth();
         int screenHeight = DynamicHUD.MC.getWindow().getGuiScaledHeight();
@@ -195,11 +195,17 @@ public void toggleDisplay() {
     }
 
     protected double getTMouseX(double mouseX) {
-        return mouseX / getMenuScale();
+        if(getMenuScale() < 1.0f) {
+            return DynamicHUD.MC.mouseHandler.xpos() / getMenuScale();
+        }
+        return mouseX;
     }
 
     protected double getTMouseY(double mouseY) {
-        return mouseY / getMenuScale();
+        if(getMenuScale() < 1.0f) {
+            return DynamicHUD.MC.mouseHandler.ypos() / getMenuScale();
+        }
+        return mouseY;
     }
 
     public boolean toggleDisplay(WidgetBox widgetBox, double mouseX, double mouseY, int button) {

src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/ContextMenu.java

@@ -22,8 +22,7 @@ public class ContextMenuProperties {
     protected boolean enableAnimations = true;
     protected Skin skin = new ClassicSkin();
 
-    protected ContextMenuProperties() {
-    }
+    protected ContextMenuProperties() {}
 
     public static Builder<?> builder() {
         return new Builder<>(new ContextMenuProperties());

src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/ContextMenuProperties.java

@@ -16,10 +16,10 @@
  * Manages item spacing, padding, min width, and active layout strategies.
  */
 public class LayoutEngine {
-    private int horizontalPadding = 8;
-    private int verticalPadding = 4;
-    private int itemSpacing = 2;
-    private int minWidth = 80;
+    private int horizontalPadding;
+    private int verticalPadding;
+    private int itemSpacing;
+    private int minWidth;
     private LayoutStrategy activeStrategy;
 
     public LayoutEngine() {
@@ -126,7 +126,7 @@ public void layout(ContextMenu<?> menu, LayoutEngine engine) {
             int maxInnerWidth = engine.getMinWidth();
             for (Option<?> option : visibleOptions) {
                 if (!option.shouldRender()) continue;
-                int preferredWidth = option.getWidth() > 0 ? option.getWidth() : font.width(option.name);
+                int preferredWidth = option.getWidth() > 0 ? option.getWidth() : font.width(option.getName());
                 maxInnerWidth = Math.max(maxInnerWidth, preferredWidth);
             }