2.0.0-Alpha.13+Fabric

XDPXI · Aug 7, 2024 · fe92959 · fe92959
1 parent d5bdc2b
commit fe92959
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 11 deletions.
diff --git a/api/1.21/fabric.jar b/api/1.21/fabric.jar
diff --git a/gradle.properties b/gradle.properties
@@ -6,9 +6,9 @@ yarn_mappings=1.21+build.9
 loader_version=0.16.0
 cloth_version=15.0.128
 modmenu_version=11.0.1
-fabric_version=0.100.8+1.21
-sodium_version=mc1.21-0.5.9
+fabric_version=0.101.2+1.21
+sodium_version=mc1.21-0.5.11
 
-mod_version=2.0.0-Alpha.12+Fabric
+mod_version=2.0.0-Alpha.13+Fabric
 maven_group=com.ztrolix.zlibs
 archives_base_name=ztrolix-libs
diff --git a/src/client/java/com/ztrolix/zlibs/DiscordRPCHandler.java b/src/client/java/com/ztrolix/zlibs/DiscordRPCHandler.java
@@ -27,18 +27,25 @@ public static void init() {
                 lib.Discord_RunCallbacks();
                 try {
                     Thread.sleep(2000);
-                } catch (InterruptedException ignored) {
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
                 }
             }
+            LOGGER.info("ZtrolixLibs - Callback thread interrupted.");
         }, "RPC-Callback-Handler");
         callbackThread.start();
     }
 
     public static void shutdown() {
-        if (callbackThread != null && !callbackThread.isInterrupted()) {
+        if (callbackThread != null && callbackThread.isAlive()) {
             callbackThread.interrupt();
+            try {
+                callbackThread.join();
+            } catch (InterruptedException e) {
+                LOGGER.error("ZtrolixLibs - Failed to join callback thread.", e);
+                Thread.currentThread().interrupt();
+            }
         }
         DiscordRPC.INSTANCE.Discord_Shutdown();
-        LOGGER.info("ZtrolixLibs - Discord RPC Shutdown Successfully!");
     }
 }
diff --git a/src/client/java/com/ztrolix/zlibs/ZtrolixLibsClient.java b/src/client/java/com/ztrolix/zlibs/ZtrolixLibsClient.java
@@ -3,13 +3,15 @@
 import com.ztrolix.zlibs.config.ZLibsConfig;
 import com.ztrolix.zlibs.sodium.CustomOptions;
 import me.shedaniel.autoconfig.AutoConfig;
+import me.shedaniel.autoconfig.ConfigHolder;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
+import net.minecraft.util.ActionResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,6 +34,12 @@ public void onInitializeClient() {
         ZLibsConfig config = AutoConfig.getConfigHolder(ZLibsConfig.class).getConfig();
         applyConfig();
 
+        ConfigHolder<ZLibsConfig> holder = AutoConfig.getConfigHolder(ZLibsConfig.class);
+        holder.registerSaveListener((configHolder, config1) -> {
+            applyConfig();
+            return ActionResult.SUCCESS;
+        });
+
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
             dispatcher.register(ClientCommandManager.literal("zlibs").executes(context -> {
                 context.getSource().sendFeedback(Text.literal("-------------------------------"));
@@ -65,6 +73,7 @@ public void applyConfig() {
             });
             LOGGER.info("Player Count: Enabled!");
         } else {
+            clientOffline();
             LOGGER.info("Player Count: Disabled!");
         }
         LOGGER.info("-- -- -- -- -- -- -- -- -- -- -- --");
@@ -75,6 +84,7 @@ public void applyConfig() {
             });
             LOGGER.info("Discord RPC: Enabled!");
         } else {
+            DiscordRPCHandler.shutdown();
             LOGGER.info("Discord RPC: Disabled!");
         }
         if (config.compatibility.sodiumIntegration) {

diff --git a/src/client/java/com/ztrolix/zlibs/config/ZLibsConfig.java b/src/client/java/com/ztrolix/zlibs/config/ZLibsConfig.java
@@ -1,5 +1,6 @@
 package com.ztrolix.zlibs.config;
 
+import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.annotation.Config;
 import me.shedaniel.autoconfig.annotation.ConfigEntry;
 import me.shedaniel.autoconfig.serializer.PartitioningSerializer;
@@ -13,4 +14,8 @@ public class ZLibsConfig extends PartitioningSerializer.GlobalData {
     @ConfigEntry.Category("compatibility")
     @ConfigEntry.Gui.TransitiveObject
     public compatibility compatibility = new compatibility();
+
+    public static ZLibsConfig get() {
+        return AutoConfig.getConfigHolder(ZLibsConfig.class).getConfig();
+    }
 }
diff --git a/src/client/java/com/ztrolix/zlibs/config/compatibility.java b/src/client/java/com/ztrolix/zlibs/config/compatibility.java
@@ -7,8 +7,7 @@
 
 @Config(name = "compatibility")
 public class compatibility implements ConfigData {
-    @ConfigEntry.Gui.RequiresRestart
-    @Comment("Enable Discord RPC (Restart Required)")
+    @Comment("Enable Discord RPC")
     public boolean discordRPC = true;
     @ConfigEntry.Gui.RequiresRestart
     @Comment("Add ZtrolixLibs Settings to Sodium Video Settings (Restart Required)")

diff --git a/src/client/java/com/ztrolix/zlibs/config/main.java b/src/client/java/com/ztrolix/zlibs/config/main.java
@@ -2,7 +2,6 @@
 
 import me.shedaniel.autoconfig.ConfigData;
 import me.shedaniel.autoconfig.annotation.Config;
-import me.shedaniel.autoconfig.annotation.ConfigEntry;
 import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.Comment;
 
 @Config(name = "main")
@@ -11,7 +10,6 @@ public class main implements ConfigData {
     public boolean modEnabled = true;
     @Comment("Add The Mod To The World")
     public boolean injectToWorld = true;
-    @ConfigEntry.Gui.RequiresRestart
-    @Comment("Count Your Client To The Player Count (Restart Required)")
+    @Comment("Count Your Client To The Player Count")
     public boolean contributeToPlayerCount = true;
 }