Removed Config & Title Screen Warnings

XDPXI · Nov 27, 2024 · 90074c8 · 90074c8
1 parent 6096569
commit 90074c8
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 286 deletions.
diff --git a/src/client/java/dev/xdpxi/xdlib/XDsLibraryClient.java b/src/client/java/dev/xdpxi/xdlib/XDsLibraryClient.java
@@ -1,6 +1,5 @@
 package dev.xdpxi.xdlib;
 
-import dev.xdpxi.xdlib.config.configManager;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -28,7 +27,6 @@ public class XDsLibraryClient implements ClientModInitializer {
     public static int duration = -1;
     public static List<HostileEntity> list = new ArrayList<>();
     public static Map<String, Float> WorldCloudHeights = new HashMap<>();
-    public configManager CONFIG_MANAGER;
 
     public static boolean isWindows() {
         return System.getProperty("os.name").toLowerCase().contains("windows");
@@ -86,9 +84,6 @@ public boolean isNoEarlyLoaders() {
 
     @Override
     public void onInitializeClient() {
-        configManager.registerConfig();
-        CONFIG_MANAGER = new configManager();
-
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
             if (client.player != null) {
                 StatusEffectInstance darknessEffect = client.player.getStatusEffect(StatusEffects.DARKNESS);

diff --git a/src/client/java/dev/xdpxi/xdlib/config/clothConfig/modConfigScreen.java b/src/client/java/dev/xdpxi/xdlib/config/clothConfig/modConfigScreen.java
diff --git a/src/client/java/dev/xdpxi/xdlib/config/configManager.java b/src/client/java/dev/xdpxi/xdlib/config/configManager.java
diff --git a/src/client/java/dev/xdpxi/xdlib/config/modMenuIntegration.java b/src/client/java/dev/xdpxi/xdlib/config/modMenuIntegration.java
diff --git a/src/client/java/dev/xdpxi/xdlib/mixin/client/ModBadgeRendererMixin.java b/src/client/java/dev/xdpxi/xdlib/mixin/client/ModBadgeRendererMixin.java
@@ -3,7 +3,6 @@
 import com.terraformersmc.modmenu.util.mod.Mod;
 import com.terraformersmc.modmenu.util.mod.ModBadgeRenderer;
 import dev.xdpxi.xdlib.api.mod.loader;
-import dev.xdpxi.xdlib.config.configManager;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.text.OrderedText;
@@ -33,30 +32,28 @@ public abstract class ModBadgeRendererMixin {
 
     @Inject(method = "draw", at = @At("TAIL"))
     public void drawCustomBadges(DrawContext DrawContext, int mouseX, int mouseY, CallbackInfo ci) {
-        if (configManager.configData.isCustomBadges()) {
-            try {
-                FabricLoader.getInstance().getModContainer(mod.getId()).orElse(null)
-                        .getMetadata().getCustomValue("mcb").getAsArray().forEach(customValue -> {
-                            var obj = customValue.getAsObject();
-                            var name = obj.get("name").getAsString();
-                            var outline = obj.get("outlineColor").getAsNumber().intValue();
-                            var fill = obj.get("fillColor").getAsNumber().intValue();
-                            drawBadge(DrawContext, Text.literal(name).asOrderedText(), outline, fill, mouseX, mouseY);
-                        });
-            } catch (Exception ignored) {
-            }
-            try {
-                FabricLoader.getInstance().getModContainer(mod.getId()).orElse(null)
-                        .getMetadata().getCustomValue("xdlib").getAsObject()
-                        .get("badges").getAsArray().forEach(customValue -> {
-                            var obj = customValue.getAsObject();
-                            var name = obj.get("name").getAsString();
-                            var outline = obj.get("outlineColor").getAsNumber().intValue();
-                            var fill = obj.get("fillColor").getAsNumber().intValue();
-                            drawBadge(DrawContext, Text.literal(name).asOrderedText(), outline, fill, mouseX, mouseY);
-                        });
-            } catch (Exception ignored) {
-            }
+        try {
+            FabricLoader.getInstance().getModContainer(mod.getId()).orElse(null)
+                    .getMetadata().getCustomValue("mcb").getAsArray().forEach(customValue -> {
+                        var obj = customValue.getAsObject();
+                        var name = obj.get("name").getAsString();
+                        var outline = obj.get("outlineColor").getAsNumber().intValue();
+                        var fill = obj.get("fillColor").getAsNumber().intValue();
+                        drawBadge(DrawContext, Text.literal(name).asOrderedText(), outline, fill, mouseX, mouseY);
+                    });
+        } catch (Exception ignored) {
+        }
+        try {
+            FabricLoader.getInstance().getModContainer(mod.getId()).orElse(null)
+                    .getMetadata().getCustomValue("xdlib").getAsObject()
+                    .get("badges").getAsArray().forEach(customValue -> {
+                        var obj = customValue.getAsObject();
+                        var name = obj.get("name").getAsString();
+                        var outline = obj.get("outlineColor").getAsNumber().intValue();
+                        var fill = obj.get("fillColor").getAsNumber().intValue();
+                        drawBadge(DrawContext, Text.literal(name).asOrderedText(), outline, fill, mouseX, mouseY);
+                    });
+        } catch (Exception ignored) {
         }
     }
 }
diff --git a/src/client/java/dev/xdpxi/xdlib/mixin/client/TitleScreenMixin.java b/src/client/java/dev/xdpxi/xdlib/mixin/client/TitleScreenMixin.java
diff --git a/src/client/java/dev/xdpxi/xdlib/support.java b/src/client/java/dev/xdpxi/xdlib/support.java
diff --git a/src/client/resources/xdlib.client.mixins.json b/src/client/resources/xdlib.client.mixins.json
@@ -21,8 +21,7 @@
     "MultiplayerServerListWidgetMixin",
     "ProgressScreenMixin",
     "ScreenAccessor",
-    "SoundSystemMixin",
-    "TitleScreenMixin"
+    "SoundSystemMixin"
   ],
   "injectors": {
     "defaultRequire": 1