[BUG] Fix Config watcher using too many threads and not detecting changes on Linux systems

2025-03-13 15:01:19 +02:00
parent 1a48fb6d33
commit 23720f6629
65 changed files with 186 additions and 178 deletions
--- a/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
+++ b/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
@@ -18,7 +18,7 @@
 import net.minecraftforge.forgespi.language.IModInfo;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-@@ -19,24 +22,30 @@
+@@ -19,23 +22,29 @@
 /**
  * @author HypherionSA
  */
@@ -33,13 +33,12 @@
 -    @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
 +    @Inject(at = @At("RETURN"), method = "getGuiFactoryFor", cancellable = true, remap = false)
     private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
-        ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
+-        ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
 +        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-             AbstractConfig config = watcher.getLeft();
             if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
                 return;
 
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
 +++ /dev/null
-@@ -1,69 +1,0 @@
+@@ -1,68 +1,0 @@
 -package com.hypherionmc.craterlib.client;
 -
 -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
@@ -57,12 +57,11 @@
 -        LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
 -        CraterEventBus.INSTANCE.postEvent(event);
 -
-        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-            AbstractConfig config = watcher.getLeft();
+-        ConfigController.getWatchedConfigs().forEach((conf, config) -> {
 -            if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
 -                return;
 -
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.18.2/gradle.properties.patch
+++ b/patches/1.18.2/gradle.properties.patch
@@ -22,7 +22,7 @@
 +forge_version=40.2.0
 
 # Dependencies
- moon_config=1.0.10
+ moon_config=1.0.11
@@ -29,23 +26,22 @@
 adventure=4.17.0
 rpc_sdk=1.0
--- a/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
+++ b/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
@@ -14,17 +14,16 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraftforge.client.ConfigScreenHandler;
-@@ -28,15 +31,21 @@
+@@ -28,14 +31,20 @@
      */
     @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
     private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
-        ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
+-        ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
 +        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-             AbstractConfig config = watcher.getLeft();
             if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
                 return;
 
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
 +++ /dev/null
-@@ -1,69 +1,0 @@
+@@ -1,68 +1,0 @@
 -package com.hypherionmc.craterlib.client;
 -
 -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
@@ -57,12 +57,11 @@
 -        LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
 -        CraterEventBus.INSTANCE.postEvent(event);
 -
-        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-            AbstractConfig config = watcher.getLeft();
+-        ConfigController.getWatchedConfigs().forEach((conf, config) -> {
 -            if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
 -                return;
 -
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.19.2/gradle.properties.patch
+++ b/patches/1.19.2/gradle.properties.patch
@@ -22,7 +22,7 @@
 +forge_version=43.4.0
 
 # Dependencies
- moon_config=1.0.10
+ moon_config=1.0.11
@@ -29,23 +26,22 @@
 adventure=4.17.0
 rpc_sdk=1.0
--- a/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
+++ b/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
@@ -14,17 +14,16 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraftforge.client.ConfigScreenHandler;
-@@ -28,17 +31,22 @@
+@@ -28,16 +31,21 @@
      */
     @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
     private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
-        ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
+-        ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
 +        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-             AbstractConfig config = watcher.getLeft();
             if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
                 return;
 
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
 +++ /dev/null
-@@ -1,69 +1,0 @@
+@@ -1,68 +1,0 @@
 -package com.hypherionmc.craterlib.client;
 -
 -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
@@ -57,12 +57,11 @@
 -        LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
 -        CraterEventBus.INSTANCE.postEvent(event);
 -
-        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-            AbstractConfig config = watcher.getLeft();
+-        ConfigController.getWatchedConfigs().forEach((conf, config) -> {
 -            if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
 -                return;
 -
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.19.3/gradle.properties.patch
+++ b/patches/1.19.3/gradle.properties.patch
@@ -22,7 +22,7 @@
 +forge_version=45.3.0
 
 # Dependencies
- moon_config=1.0.10
+ moon_config=1.0.11
@@ -29,23 +26,22 @@
 adventure=4.17.0
 rpc_sdk=1.0
--- a/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
+++ b/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
@@ -14,17 +14,16 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraftforge.client.ConfigScreenHandler;
-@@ -28,17 +31,22 @@
+@@ -28,16 +31,21 @@
      */
     @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
     private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
-        ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
+-        ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
 +        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-             AbstractConfig config = watcher.getLeft();
             if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
                 return;
 
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
 +++ /dev/null
-@@ -1,69 +1,0 @@
+@@ -1,68 +1,0 @@
 -package com.hypherionmc.craterlib.client;
 -
 -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
@@ -57,12 +57,11 @@
 -        LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
 -        CraterEventBus.INSTANCE.postEvent(event);
 -
-        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-            AbstractConfig config = watcher.getLeft();
+-        ConfigController.getWatchedConfigs().forEach((conf, config) -> {
 -            if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
 -                return;
 -
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.20.2/gradle.properties.patch
+++ b/patches/1.20.2/gradle.properties.patch
@@ -22,7 +22,7 @@
 +forge_version=48.1.0
 
 # Dependencies
- moon_config=1.0.10
+ moon_config=1.0.11
@@ -29,23 +26,22 @@
 adventure=4.17.0
 rpc_sdk=1.0
--- a/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
+++ b/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
@@ -14,17 +14,16 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraftforge.client.ConfigScreenHandler;
-@@ -28,17 +31,22 @@
+@@ -28,16 +31,21 @@
      */
     @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
     private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
-        ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
+-        ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
 +        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-             AbstractConfig config = watcher.getLeft();
             if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
                 return;
 
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -24,7 +24,7 @@
 
 import java.util.Objects;
 
-@@ -48,22 +37,5 @@
+@@ -48,21 +37,5 @@
     public Connection getClientConnection() {
         Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
         return Minecraft.getInstance().getConnection().getConnection();
@@ -34,12 +34,11 @@
 -        LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
 -        CraterEventBus.INSTANCE.postEvent(event);
 -
-        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-            AbstractConfig config = watcher.getLeft();
+-        ConfigController.getWatchedConfigs().forEach((conf, config) -> {
 -            if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
 -                return;
 -
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
+++ b/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
-@@ -1,0 +1,44 @@
+@@ -1,0 +1,43 @@
 +package com.hypherionmc.craterlib.mixin;
 +
 +import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
@@ -32,9 +32,8 @@
 +     */
 +    @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
 +    private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
-+        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
+        ConfigController.getWatchedConfigs().forEach((conf, config) -> {
 +            if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
-+                AbstractConfig config = watcher.getLeft();
 +                if (config.getModId().equals(selectedMod.getModId())) {
 +                    cir.setReturnValue(
 +                            Optional.of((minecraft, screen) -> new CraterConfigScreen(config, screen))
--- a/patches/1.20.4/gradle.properties.patch
+++ b/patches/1.20.4/gradle.properties.patch
@@ -23,7 +23,7 @@
 +neoforge_version=234
 
 # Dependencies
- moon_config=1.0.10
+ moon_config=1.0.11
@@ -29,23 +29,23 @@
 adventure=4.17.0
 rpc_sdk=1.0
--- a/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
+++ b/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
@@ -14,17 +14,16 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraftforge.client.ConfigScreenHandler;
-@@ -28,17 +31,22 @@
+@@ -28,16 +31,21 @@
      */
     @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
     private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
-        ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
+-        ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
 +        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-             AbstractConfig config = watcher.getLeft();
             if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
                 return;
 
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
 +++ /dev/null
-@@ -1,69 +1,0 @@
+@@ -1,68 +1,0 @@
 -package com.hypherionmc.craterlib.client;
 -
 -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
@@ -57,12 +57,11 @@
 -        LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
 -        CraterEventBus.INSTANCE.postEvent(event);
 -
-        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-            AbstractConfig config = watcher.getLeft();
+-        ConfigController.getWatchedConfigs().forEach((conf, config) -> {
 -            if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
 -                return;
 -
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.20/changelog.md.patch
+++ b/patches/1.20/changelog.md.patch
@@ -1,9 +1,9 @@
 --- a/changelog.md
 +++ b/changelog.md
-@@ -1,6 +1,7 @@
- **Bug Fixes**:
+@@ -2,6 +2,7 @@
 
 - Fixed LuckPerms breaking commands on Paper
+ - Fix Config watcher using too many threads and not detecting changes on Linux systems
 +- Fixed crash when trying to open config screens on NeoForge
 
 **New Features**:
--- a/patches/1.20/gradle.properties.patch
+++ b/patches/1.20/gradle.properties.patch
@@ -22,7 +22,7 @@
 +forge_version=46.0.14
 
 # Dependencies
- moon_config=1.0.10
+ moon_config=1.0.11
@@ -29,23 +26,22 @@
 adventure=4.17.0
 rpc_sdk=1.0
--- a/patches/1.21.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
+++ b/patches/1.21.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
@@ -1,6 +1,6 @@
 --- a/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
 +++ /dev/null
-@@ -1,44 +1,0 @@
+@@ -1,43 +1,0 @@
 -package com.hypherionmc.craterlib.mixin;
 -
 -import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
@@ -31,12 +31,11 @@
 -     */
 -    @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
 -    private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
-        ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
-            AbstractConfig config = watcher.getLeft();
+-        ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
 -            if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
 -                return;
 -
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.21/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
+++ b/patches/1.21/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
@@ -1,6 +1,6 @@
 --- a/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
 +++ /dev/null
-@@ -1,44 +1,0 @@
+@@ -1,43 +1,0 @@
 -package com.hypherionmc.craterlib.mixin;
 -
 -import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
@@ -31,12 +31,11 @@
 -     */
 -    @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
 -    private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
-        ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
-            AbstractConfig config = watcher.getLeft();
+-        ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
 -            if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
 -                return;
 -
-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
 -                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
 -            } else {
 -                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
--- a/patches/1.21/gradle.properties.patch
+++ b/patches/1.21/gradle.properties.patch
@@ -22,7 +22,7 @@
 +neoforge_version=167
 
 # Dependencies
- moon_config=1.0.10
+ moon_config=1.0.11
@@ -29,7 +29,7 @@
 adventure=4.17.0
 rpc_sdk=1.0