Merge pull request #363 from jchung01/main

Fix obsolete mod detection checked by class
ACGaming · Jan 25, 2024 · d40a492 · d40a492
2 parents 30d085f + 76cadee
commit d40a492
Showing 1 changed file with 18 additions and 21 deletions.
diff --git a/src/main/java/mod/acgaming/universaltweaks/util/compat/UTObsoleteModsHandler.java b/src/main/java/mod/acgaming/universaltweaks/util/compat/UTObsoleteModsHandler.java
@@ -117,29 +117,26 @@ public static List<String> obsoleteModsMessage()
         if (Loader.isModLoaded("unloader") && UTConfigTweaks.WORLD.DIMENSION_UNLOAD.utUnloaderToggle) messages.add("Unloader");
         if (Loader.isModLoaded("villagermantlefix") && UTConfigBugfixes.ENTITIES.utVillagerMantleToggle) messages.add("Villager Mantle Fix");
         if (Loader.isModLoaded("watercontrolextreme") && UTConfigTweaks.BLOCKS.FINITE_WATER.utFiniteWaterToggle) messages.add("Water Control Extreme");
-        try
-        {
-            Class.forName("com.chocohead.biab.BornInABarn");
-            messages.add("Born in a Barn");
-            if (UTConfigBugfixes.MISC.utLocaleToggle)
-            {
-                Class.forName("io.github.jikuja.LocaleTweaker");
-                messages.add("LocaleFixer");
-            }
-            if (UTConfigTweaks.BLOCKS.utBlockHitDelay != 5)
-            {
-                Class.forName("com.cleanroommc.blockdelayremover.BlockDelayRemoverCore");
-                messages.add("Block Delay Remover");
-            }
-            if (UTConfigTweaks.WORLD.CHUNK_GEN_LIMIT.utChunkGenLimitToggle)
-            {
-                Class.forName("io.github.barteks2x.chunkgenlimiter.ChunkGenLimitMod");
-                messages.add("Chunk Generation Limiter");
-            }
-        }
-        catch (ClassNotFoundException ignored) {}
+        // Mods checked by class
+        if (isClassLoaded("com.chocohead.biab.BornInABarn")) messages.add("Born in a Barn");
+        if (isClassLoaded("io.github.jikuja.LocaleTweaker") && UTConfigBugfixes.MISC.utLocaleToggle) messages.add("LocaleFixer");
+        if (isClassLoaded("com.cleanroommc.blockdelayremover.BlockDelayRemoverCore") && UTConfigTweaks.BLOCKS.utBlockHitDelay != 5) messages.add("Block Delay Remover");
+        if (isClassLoaded("io.github.barteks2x.chunkgenlimiter.ChunkGenLimitMod") && UTConfigTweaks.WORLD.CHUNK_GEN_LIMIT.utChunkGenLimitToggle) messages.add("Chunk Generation Limiter");
         messages.add("");
         messages.add(new TextComponentTranslation("msg.universaltweaks.obsoletemods.warning3").getFormattedText());
         return messages;
     }
+
+    private static boolean isClassLoaded(String className)
+    {
+        try
+        {
+            Class.forName(className);
+            return true;
+        }
+        catch (ClassNotFoundException ignored)
+        {
+            return false;
+        }
+    }
 }