Merge pull request #4 from tanishisherewithhh/master

Another mega update. Especially to ContextMenu.

Author: tanishisherewithhh

.github/workflows/gradle.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: capture build artifacts
         if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from the latest java on one OS
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Dynamichud
           path: build/libs/

.gitignore

@@ -116,3 +116,5 @@ run/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
+
+*.profileconfig.json

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.7-SNAPSHOT'
+    id 'fabric-loom' version '1.9-SNAPSHOT'
     id 'maven-publish'
 }
 
@@ -34,8 +34,6 @@ dependencies {
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     modImplementation "dev.isxander:yet-another-config-lib:${project.yacl_version}"
-
-    modApi "com.terraformersmc:modmenu:11.0.1"
 }
 
 processResources {

gradle.properties

@@ -4,15 +4,16 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21
-yarn_mappings=1.21+build.2
-loader_version=0.15.11
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.1
+loader_version=0.16.9
 
 # Mod Properties
-mod_version = 2.1.0
+# need versioning system
+mod_version = 3.0.0
 maven_group = com.tanishisherewith
 archives_base_name = dynamichud
 
 # Dependencies
-fabric_version=0.100.3+1.21
-yacl_version=3.5.0+1.21-fabric
+fabric_version=0.111.0+1.21.4
+yacl_version=3.6.6+1.21.4-fabric

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -1,52 +1,22 @@
 package com.tanishisherewith.dynamichud;
 
 import com.tanishisherewith.dynamichud.config.GlobalConfig;
-import com.tanishisherewith.dynamichud.screens.AbstractMoveableScreen;
-import com.tanishisherewith.dynamichud.utils.BooleanPool;
-import com.tanishisherewith.dynamichud.widget.Widget;
-import com.tanishisherewith.dynamichud.widget.WidgetManager;
-import com.tanishisherewith.dynamichud.widget.WidgetRenderer;
-import com.tanishisherewith.dynamichud.widgets.TextWidget;
+import com.tanishisherewith.dynamichud.integration.IntegrationManager;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
-import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.metadata.ModMetadata;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.option.KeyBinding;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
-
+@Environment(EnvType.CLIENT)
 public class DynamicHUD implements ClientModInitializer {
-    /**
-     * This is a map to store the list of widgets for each widget file to be saved.
-     * <p>
-     * Allows saving widgets across different mods with same save file name.
-     */
-    public static final HashMap<String, List<Widget>> FILE_MAP = new HashMap<>();
-    public static final Logger logger = LoggerFactory.getLogger("DynamicHud");
-    private static final List<WidgetRenderer> widgetRenderers = new ArrayList<>();
     public static MinecraftClient MC = MinecraftClient.getInstance();
+    public static final Logger logger = LoggerFactory.getLogger("DynamicHud");
     public static String MOD_ID = "dynamichud";
 
-    public static void addWidgetRenderer(WidgetRenderer widgetRenderer) {
-        widgetRenderers.add(widgetRenderer);
-    }
-
-    public static List<WidgetRenderer> getWidgetRenderers() {
-        return widgetRenderers;
-    }
-
     public static void printInfo(String msg) {
         logger.info(msg);
     }
@@ -55,133 +25,16 @@ public static void printWarn(String msg) {
         logger.warn(msg);
     }
 
-    /**
-     * Opens the MovableScreen when the specified key is pressed.
-     *
-     * @param key    The key to listen for
-     * @param screen The AbstractMoveableScreen instance to use to set the screen
-     */
-    public static void openDynamicScreen(KeyBinding key, AbstractMoveableScreen screen) {
-        if (key.wasPressed()) {
-            MC.setScreen(screen);
-        }
-    }
-
     @Override
     public void onInitializeClient() {
-        printInfo("Initialising DynamicHud");
-
-        // Add WidgetData of included widgets
-        WidgetManager.registerCustomWidgets(
-                TextWidget.DATA
-        );
+        printInfo("Initialising DynamicHUD");
 
         //YACL load
         GlobalConfig.HANDLER.load();
 
-        printInfo("Integrating mods...");
-        FabricLoader.getInstance()
-                .getEntrypointContainers("dynamicHud", DynamicHudIntegration.class)
-                .forEach(entrypoint -> {
-                    ModMetadata metadata = entrypoint.getProvider().getMetadata();
-                    String modId = metadata.getId();
-
-                    printInfo(String.format("Supported mod with id %s was found!", modId));
-
-                    AbstractMoveableScreen screen;
-                    KeyBinding binding;
-                    WidgetRenderer widgetRenderer;
-                    File widgetsFile;
-                    try {
-                        DynamicHudIntegration DHIntegration = entrypoint.getEntrypoint();
-
-                        //Calls the init method
-                        DHIntegration.init();
-
-                        //Gets the widget file to save and load the widgets from
-                        widgetsFile = DHIntegration.getWidgetsFile();
-
-                        // Adds / loads widgets from file
-                        if (widgetsFile.exists()) {
-                            WidgetManager.loadWidgets(widgetsFile);
-                        } else {
-                            DHIntegration.addWidgets();
-                        }
-
-                        //Calls the second init method
-                        DHIntegration.initAfter();
-
-                        // Get the instance of AbstractMoveableScreen
-                        screen = Objects.requireNonNull( DHIntegration.getMovableScreen());
-
-                        // Get the keybind to open the screen instance
-                        binding = DHIntegration.getKeyBind();
-
-                        //Register custom widget datas by WidgetManager.registerCustomWidgets();
-                        DHIntegration.registerCustomWidgets();
-
-                        //WidgetRenderer with widgets instance
-                        widgetRenderer = DHIntegration.getWidgetRenderer();
-                        addWidgetRenderer(widgetRenderer);
-
-                        List<Widget> widgets = FILE_MAP.get(widgetsFile.getName());
-
-                        if (widgets == null || widgets.isEmpty()) {
-                            FILE_MAP.put(widgetsFile.getName(), widgetRenderer.getWidgets());
-                        } else {
-                            widgets.addAll(widgetRenderer.getWidgets());
-                            FILE_MAP.put(widgetsFile.getName(), widgets);
-                        }
-
-                        //Register events for rendering, saving, loading, and opening the hudEditor
-                        ClientTickEvents.START_CLIENT_TICK.register((client) -> openDynamicScreen(binding, screen));
-
-                        /* === Saving === */
-
-                        //When a player exits a world (SinglePlayer worlds) or a server stops
-                        ServerLifecycleEvents.SERVER_STOPPING.register(server -> saveWidgetsSafely(widgetsFile, FILE_MAP.get(widgetsFile.getName())));
-
-                        // When a resource pack is reloaded.
-                        ServerLifecycleEvents.END_DATA_PACK_RELOAD.register((server, resourceManager, s) -> saveWidgetsSafely(widgetsFile, FILE_MAP.get(widgetsFile.getName())));
-
-                        //When player disconnects
-                        ServerPlayConnectionEvents.DISCONNECT.register((handler, packetSender) -> saveWidgetsSafely(widgetsFile, FILE_MAP.get(widgetsFile.getName())));
-
-                        //When minecraft closes
-                        ClientLifecycleEvents.CLIENT_STOPPING.register((minecraftClient) -> saveWidgetsSafely(widgetsFile, FILE_MAP.get(widgetsFile.getName())));
-
-                        printInfo(String.format("Integration of mod %s was successful", modId));
-                    } catch (Throwable e) {
-                        if (e instanceof IOException) {
-                            logger.warn("An error has occurred while loading widgets of mod {}", modId, e);
-                        } else {
-                            logger.warn("Mod {} has improper implementation of DynamicHUD", modId, e);
-                        }
-                    }
-                });
-        printInfo("(DynamicHUD) Integration of mods found was successful");
-
-
-        //Global config saving (YACL)
-        ServerLifecycleEvents.SERVER_STOPPING.register(server -> GlobalConfig.HANDLER.save());
-        ServerLifecycleEvents.END_DATA_PACK_RELOAD.register((server, resourceManager, s) -> GlobalConfig.HANDLER.save());
-        ServerPlayConnectionEvents.DISCONNECT.register((handler, packetSender) -> GlobalConfig.HANDLER.save());
-        ClientLifecycleEvents.CLIENT_STOPPING.register((minecraftClient) -> {
-            GlobalConfig.HANDLER.save();
-        });
-
+        IntegrationManager.integrate();
 
         //In game screen render.
         HudRenderCallback.EVENT.register(new HudRender());
     }
-
-    private void saveWidgetsSafely(File widgetsFile, List<Widget> widgets) {
-        try {
-            WidgetManager.saveWidgets(widgetsFile, widgets);
-        } catch (IOException e) {
-            logger.error("Failed to save widgets. Widgets passed: {}", widgets);
-            throw new RuntimeException(e);
-        }
-    }
-
 }

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

@@ -1,5 +1,6 @@
 package com.tanishisherewith.dynamichud;
 
+import com.tanishisherewith.dynamichud.integration.IntegrationManager;
 import com.tanishisherewith.dynamichud.widget.WidgetRenderer;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.gui.DrawContext;
@@ -9,11 +10,11 @@
  * Using the fabric event {@link HudRenderCallback} to render widgets in the game HUD.
  * Mouse positions are passed in the negatives even though theoretically it's in the centre of the screen.
  */
-public class HudRender implements HudRenderCallback{
+public class HudRender implements HudRenderCallback {
 
     @Override
     public void onHudRender(DrawContext drawContext, RenderTickCounter tickCounter) {
-        for (WidgetRenderer widgetRenderer : DynamicHUD.getWidgetRenderers()) {
+        for (WidgetRenderer widgetRenderer : IntegrationManager.getWidgetRenderers()) {
             widgetRenderer.renderWidgets(drawContext, -120, -120);
         }
     }