Fixed soo many bugs. Polished but now its a bit bloated.

Author: tanishisherewithhh

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

@@ -66,7 +66,8 @@ public DynamicHudConfigurator configure(DynamicHudConfigurator configurator) {
                 .addWidget(HelloWidget)
                 .addWidget(DynamicHUDWidget)
                 .configureRenderer(renderer -> {
-                    renderer.shouldRenderInGameHud(true);
+                    //Already true by default
+                    //renderer.shouldRenderInGameHud(true);
                     renderer.addScreen(TitleScreen.class);
                 })
                 .withMoveableScreen(config -> new AbstractMoveableScreen(Text.literal("Editor Screen"), config.getRenderer()) {});

src/main/java/com/tanishisherewith/dynamichud/integration/DynamicHudConfigurator.java

@@ -32,15 +32,31 @@ public DynamicHudConfigurator addWidget(Widget widget){
         return this;
     }
 
+    /**
+     * Configure the existing renderer object with this method
+     */
     public DynamicHudConfigurator configureRenderer(Consumer<WidgetRenderer> wrConsumer) {
-        return configureRenderer(wrConsumer, widgets);
+        if(renderer == null){
+            this.renderer = new WidgetRenderer(widgets);
+        }
+        wrConsumer.accept(renderer);
+        return this;
     }
 
     public DynamicHudConfigurator configureRenderer(Consumer<WidgetRenderer> wrConsumer, List<Widget> widgets) {
         this.renderer = new WidgetRenderer(widgets);
         wrConsumer.accept(renderer);
         return this;
     }
+
+    /**
+     * Override the present widget renderer with your own instance
+     */
+    public DynamicHudConfigurator overrideRenderer(WidgetRenderer renderer) {
+        this.renderer = renderer;
+        return this;
+    }
+
     /**
      * Called before saving these widgets
      */

src/main/java/com/tanishisherewith/dynamichud/integration/DynamicHudIntegration.java

@@ -3,6 +3,7 @@
 import com.tanishisherewith.dynamichud.screens.AbstractMoveableScreen;
 import com.tanishisherewith.dynamichud.widget.WidgetData;
 import com.tanishisherewith.dynamichud.widget.WidgetManager;
+import com.tanishisherewith.dynamichud.widget.WidgetRenderer;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.option.KeyBinding;
@@ -55,6 +56,11 @@ public interface DynamicHudIntegration {
      */
     void init();
 
+    /**
+     * This method is called after widgets from the widget file have been loaded successfully and added to the renderer.
+     */
+    default void postWidgetLoading(WidgetRenderer renderer) {}
+
     /**
      * To register custom widgets. This method can be overridden by implementations.
      * <p>

src/main/java/com/tanishisherewith/dynamichud/integration/IntegrationManager.java

@@ -110,20 +110,22 @@ public static void integrate(){
 
                 printInfo(String.format("Supported mod with id %s was found!", modId));
 
-
                 //Gets the widget file to save and load the widgets from
                 widgetsFile = DHIntegration.getWidgetsFile();
 
-                // Get the instance of AbstractMoveableScreen
-                screen = Objects.requireNonNull(configurator.getMovableScreen(), "AbstractMovableScreen instance should not be null!");
-
                 // Adds / loads widgets from file
                 if (WidgetManager.doesWidgetFileExist(widgetsFile)) {
-                    WidgetManager.loadWidgets(widgetsFile);
+                    List<Widget> widgets = WidgetManager.loadWidgets(widgetsFile);
+                    configurator.configureRenderer(renderer -> renderer.clearAndAdd(widgets));
+                    DHIntegration.postWidgetLoading(configurator.getRenderer());
                 } else {
                     configurator.registerWidgets();
                 }
 
+
+                // Get the instance of AbstractMoveableScreen
+                screen = Objects.requireNonNull(configurator.getMovableScreen(), "AbstractMovableScreen instance should not be null!");
+
                 // Get the keybind to open the screen instance
                 binding = DHIntegration.getKeyBind();
 

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

@@ -2,26 +2,31 @@
 
 import com.tanishisherewith.dynamichud.utils.DynamicValueRegistry;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class System {
     // A map to store all instances of DynamicValueRegistry by modId
-    protected static final Map<String, List<DynamicValueRegistry>> instances = new ConcurrentHashMap<>();
-    protected final String modId;
+    private static final Map<Class<?>, Map<String, Set<Object>>> instanceRegistry = new HashMap<>();
 
-    public System(String modId) {
-        this.modId = modId;
-        instances.computeIfAbsent(modId, k -> new ArrayList<>()).add((DynamicValueRegistry) this);
+    public static void registerInstance(Object instance, String modId) {
+        Class<?> cls = instance.getClass();
+        Map<String, Set<Object>> modMap = instanceRegistry.computeIfAbsent(cls, k -> new HashMap<>());
+        Set<Object> list = modMap.computeIfAbsent(modId, k -> new HashSet<>());
+        list.add(instance);
     }
 
-    public static List<DynamicValueRegistry> getInstances(String modId) {
-        return instances.get(modId);
-    }
-
-    public String getModId() {
-        return modId;
+    public static <T> List<T> getInstances(Class<T> cls, String modId) {
+        Map<String, Set<Object>> modMap = instanceRegistry.get(cls);
+        if (modMap == null) return Collections.emptyList();
+        Set<Object> list = modMap.get(modId);
+        if (list == null) return Collections.emptyList();
+        List<T> typedList = new ArrayList<>();
+        for (Object obj : list) {
+            if (cls.isInstance(obj)) {
+                typedList.add(cls.cast(obj));
+            }
+        }
+        return typedList;
     }
 }

src/main/java/com/tanishisherewith/dynamichud/screens/AbstractMoveableScreen.java

@@ -7,18 +7,17 @@
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
+import org.lwjgl.glfw.GLFW;
 
 public abstract class AbstractMoveableScreen extends Screen {
     public final WidgetRenderer widgetRenderer;
 
-    //TrayWidget trayWidget;
     /**
      * Constructs a AbstractMoveableScreen object.
      */
     public AbstractMoveableScreen(Text title, WidgetRenderer renderer) {
         super(title);
         this.widgetRenderer = renderer;
-       // this.trayWidget = new TrayWidget(width - 210,height - 10);
     }
 
     @Override
@@ -29,8 +28,6 @@ protected void init() {
     @Override
     public void onDisplayed() {
         super.onDisplayed();
-      //  this.trayWidget.updatePosition(width, height);
-      //  trayWidget.setFocused(true);
         widgetRenderer.isInEditor = true;
     }
 
@@ -68,12 +65,10 @@ public boolean mouseReleased(double mouseX, double mouseY, int button) {
     public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
         widgetRenderer.keyPressed(keyCode, scanCode, modifiers);
         ContextMenuManager.getInstance().keyPressed(keyCode, scanCode, modifiers);
-        /*
         if(widgetRenderer.selectedWidget != null && (keyCode == GLFW.GLFW_KEY_DELETE || keyCode == GLFW.GLFW_KEY_BACKSPACE)){
-            trayWidget.minimizeWidget(widgetRenderer.selectedWidget);
+     //       trayWidget.minimizeWidget(widgetRenderer.selectedWidget);
         }
 
-         */
         return super.keyPressed(keyCode, scanCode, modifiers);
     }
 
@@ -121,7 +116,6 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
                 }
             }
         }
-       // trayWidget.render(drawContext,mouseX,mouseY,delta);
     }
 
     public void handleClickOnWidget(Widget widget, double mouseX, double mouseY, int button) {}

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

@@ -19,7 +19,7 @@
  * </pre>
  * </p>
  */
-public class DynamicValueRegistry extends System {
+public class DynamicValueRegistry {
     /**
      * A map that holds the global registry of suppliers.
      *
@@ -40,7 +40,7 @@ public class DynamicValueRegistry extends System {
      * @param modId The ID of the mod for which this registry is being created. Doesn't need to be modId, it can simply be used as a standard unique identifier string.
      */
     public DynamicValueRegistry(String modId) {
-        super(modId);
+        System.registerInstance(this,modId);
     }
 
     /**
@@ -99,7 +99,7 @@ public void setLocalRegistry(Map<String, Supplier<?>> map) {
      * @return A list of DynamicValueRegistry instances, or an empty list if none exist.
      */
     public static List<DynamicValueRegistry> getInstances(String modId) {
-        return instances.getOrDefault(modId, Collections.emptyList());
+        return System.getInstances(DynamicValueRegistry.class, modId);
     }
 
     /**

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

@@ -2,9 +2,10 @@
 
 import com.tanishisherewith.dynamichud.DynamicHUD;
 import com.tanishisherewith.dynamichud.helpers.DrawHelper;
-import com.tanishisherewith.dynamichud.helpers.animationhelper.animations.MathAnimations;
+import com.tanishisherewith.dynamichud.internal.System;
 import com.tanishisherewith.dynamichud.utils.Input;
 import com.tanishisherewith.dynamichud.utils.contextmenu.contextmenuscreen.ContextMenuScreenFactory;
+import com.tanishisherewith.dynamichud.utils.contextmenu.contextmenuscreen.ContextMenuScreenRegistry;
 import com.tanishisherewith.dynamichud.utils.contextmenu.contextmenuscreen.DefaultContextMenuScreenFactory;
 import com.tanishisherewith.dynamichud.utils.contextmenu.options.Option;
 import net.minecraft.client.gui.DrawContext;
@@ -19,6 +20,7 @@
 import java.util.List;
 import java.util.Objects;
 
+@SuppressWarnings({"rawtypes", "unchecked"})
 public class ContextMenu<T extends ContextMenuProperties> implements Input {
     public final Color darkerBackgroundColor;
     //The properties of a context menu
@@ -57,6 +59,9 @@ public ContextMenu(int x, int y, @NotNull T properties, ContextMenuScreenFactory
         this.darkerBackgroundColor = properties.getBackgroundColor().darker().darker().darker().darker().darker().darker();
         this.parentMenu = parentMenu;
         this.properties.getSkin().setContextMenu(this);
+
+        Screen dummy = screenFactory.create(this, properties);
+        System.registerInstance(new ContextMenuScreenRegistry(dummy.getClass()), DynamicHUD.MOD_ID);
     }
 
     public void addOption(Option<?> option) {

src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/contextmenuscreen/ContextMenuScreenRegistry.java

@@ -0,0 +1,11 @@
+package com.tanishisherewith.dynamichud.utils.contextmenu.contextmenuscreen;
+
+import net.minecraft.client.gui.screen.Screen;
+
+public class ContextMenuScreenRegistry{
+    public Class<? extends Screen> screenKlass;
+
+    public ContextMenuScreenRegistry(Class<? extends Screen> screenKlass){
+        this.screenKlass = screenKlass;
+    }
+}

src/main/java/com/tanishisherewith/dynamichud/utils/contextmenu/options/BooleanOption.java

@@ -12,23 +12,23 @@
 public class BooleanOption extends Option<Boolean> {
     private final BooleanType booleanType;
 
-    public BooleanOption(String name, Supplier<Boolean> getter, Consumer<Boolean> setter, BooleanType booleanType) {
+    public BooleanOption(Text name, Supplier<Boolean> getter, Consumer<Boolean> setter, BooleanType booleanType) {
         super(name,getter, setter);
         this.booleanType = booleanType;
         this.renderer.init(this);
     }
 
-    public BooleanOption(String name, Supplier<Boolean> getter, Consumer<Boolean> setter) {
+    public BooleanOption(Text name, Supplier<Boolean> getter, Consumer<Boolean> setter) {
         this(name, getter, setter, BooleanType.TRUE_FALSE);
     }
 
-    public BooleanOption(String name, boolean defaultValue) {
+    public BooleanOption(Text name, boolean defaultValue) {
         this(name, defaultValue, BooleanType.TRUE_FALSE);
     }
 
-    public BooleanOption(String name, boolean defaultValue, BooleanType type) {
-        this(name, () -> BooleanPool.get(name), value -> BooleanPool.put(name, value), type);
-        BooleanPool.put(name, defaultValue);
+    public BooleanOption(Text name, boolean defaultValue, BooleanType type) {
+        this(name, () -> BooleanPool.get(name.getString()), value -> BooleanPool.put(name.getString(), value), type);
+        BooleanPool.put(name.getString(), defaultValue);
     }
 
     @Override