Handle incompatibility of realms button tweak, closes #232

ACGaming · Jul 14, 2023 · c758820 · c758820
1 parent 19197b6
commit c758820
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/mod/acgaming/universaltweaks/config/UTConfig.java b/src/main/java/mod/acgaming/universaltweaks/config/UTConfig.java
@@ -1340,7 +1340,11 @@ public static class TweaksMiscCategory
 
         @Config.RequiresMcRestart
         @Config.Name("Remove Realms Button")
-        @Config.Comment("Removes the redundant Minecraft Realms button from the main menu")
+        @Config.Comment
+            ({
+                "Removes the redundant Minecraft Realms button from the main menu",
+                "Incompatible with RandomPatches"
+            })
         public boolean utRealmsButtonToggle = true;
 
         @Config.RequiresMcRestart

diff --git a/src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java b/src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java
@@ -21,6 +21,7 @@ public class UTLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader
 {
     public static final boolean isClient = FMLLaunchHandler.side().isClient();
     public static final boolean isDev = FMLLaunchHandler.isDeobfuscatedEnvironment();
+    public static boolean randomPatchesLoaded;
     public static boolean spongeForgeLoaded;
     public static long launchTime;
 
@@ -33,6 +34,13 @@ public class UTLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader
             Locale.setDefault(Locale.ENGLISH);
         }
 
+        try
+        {
+            Class.forName("com.therandomlabs.randompatches.RandomPatches");
+            randomPatchesLoaded = true;
+        }
+        catch (ClassNotFoundException ignored) {}
+
         try
         {
             Class.forName("org.spongepowered.mod.SpongeCoremod");
@@ -296,7 +304,7 @@ public boolean shouldMixinConfigQueue(String mixinConfig)
                 case "mixins.tweaks.items.itementities.client.json":
                     return UTConfig.TWEAKS_ITEMS.ITEM_ENTITIES.utItemEntitiesToggle;
                 case "mixins.tweaks.misc.buttons.realms.json":
-                    return UTConfig.TWEAKS_MISC.utRealmsButtonToggle;
+                    return UTConfig.TWEAKS_MISC.utRealmsButtonToggle && !randomPatchesLoaded;
                 case "mixins.tweaks.misc.buttons.snooper.client.json":
                     return UTConfig.TWEAKS_MISC.utSnooperToggle;
                 case "mixins.tweaks.misc.commands.seed.json":