From a8781adb86fb21d75be78e3383949abf6ccb5e9b Mon Sep 17 00:00:00 2001
From: jchung01 <jjchung276@gmail.com>
Date: Tue, 24 Sep 2024 15:15:24 -0700
Subject: [PATCH] Update config/readme

---
 README.md                                            |  2 ++
 gradle.properties                                    |  2 +-
 .../universaltweaks/config/UTConfigMods.java         | 12 ++++++++++++
 .../acgaming/universaltweaks/core/UTMixinLoader.java |  3 +--
 .../resources/assets/universaltweaks/lang/en_us.lang |  1 +
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 773a5cf0..8af4b0d0 100644
--- a/README.md
+++ b/README.md
@@ -343,6 +343,8 @@ All changes are toggleable via config files.
     * **Replanting Cocoa Beans:** Allows Forestry farms to automatically replant cocoa beans
 * **HWYLA**
   * **Keybindings Fix:** Fixes crashes in all menus when changing HWYLA keybindings to unsupported values
+* **In Control!**
+    * **Spawn Rule Stats Fix:** Fixes onJoin spawn rules repeatedly modifying mob attack/health/speed
 * **IndustrialCraft 2**
     * **Duplication Fixes:** Fixes various duplication exploits
 * **Industrial Foregoing**
diff --git a/gradle.properties b/gradle.properties
index d997ff6a..7bf61280 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -34,7 +34,7 @@ debug_extra_utilities_2 = false
 debug_forestry = false
 debug_forgemultipartcbe = false
 debug_hwyla = false
-debug_incontrol = true
+debug_incontrol = false
 debug_industrial_foregoing = false
 debug_industrialcraft = false
 debug_iron_backpacks = false
diff --git a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java
index 8b41c578..9e0e2b79 100644
--- a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java
+++ b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java
@@ -119,6 +119,10 @@ public class UTConfigMods
     @Config.Name("Forestry")
     public static final ForestryCategory FORESTRY = new ForestryCategory();
 
+    @Config.LangKey("cfg.universaltweaks.modintegration.incontrol")
+    @Config.Name("In Control!")
+    public static final InControlCategory INCONTROL = new InControlCategory();
+
     @Config.LangKey("cfg.universaltweaks.modintegration.industrialcraft")
     @Config.Name("IndustrialCraft 2")
     public static final IndustrialCraftCategory INDUSTRIALCRAFT = new IndustrialCraftCategory();
@@ -615,6 +619,14 @@ public static class ForestryCategory
         public boolean utParticleFixesToggle = true;
     }
 
+    public static class InControlCategory
+    {
+        @Config.RequiresMcRestart
+        @Config.Name("Spawn Rule Stats Fix")
+        @Config.Comment("Fixes onJoin spawn rules repeatedly modifying mob attack/health/speed")
+        public boolean utStatsFixToggle = true;
+    }
+
     public static class IndustrialCraftCategory
     {
         @Config.RequiresMcRestart
diff --git a/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java b/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java
index 909775ad..6ef26761 100644
--- a/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java
+++ b/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java
@@ -74,8 +74,7 @@ public class UTMixinLoader implements ILateMixinLoader
             put("mixins.mods.forestry.dupes.json", () -> loaded("forestry") && UTConfigMods.FORESTRY.utDuplicationFixesToggle);
             put("mixins.mods.forestry.extratrees.json", () -> loaded("extratrees"));
             put("mixins.mods.forestry.json", () -> loaded("forestry"));
-            // TODO: Add config
-            put("mixins.mods.incontrol.json", () -> loaded("incontrol"));
+            put("mixins.mods.incontrol.json", () -> loaded("incontrol") && UTConfigMods.INCONTROL.utStatsFixToggle);
             put("mixins.mods.industrialcraft.dupes.json", () -> loaded("ic2") && UTConfigMods.INDUSTRIALCRAFT.utDuplicationFixesToggle);
             put("mixins.mods.industrialforegoing.dupes.json", () -> loaded("industrialforegoing") && UTConfigMods.INDUSTRIAL_FOREGOING.utDuplicationFixesToggle);
             put("mixins.mods.industrialforegoing.rangeaddon.json", () -> loaded("industrialforegoing") && UTConfigMods.INDUSTRIAL_FOREGOING.utRangeAddonNumberFix);
diff --git a/src/main/resources/assets/universaltweaks/lang/en_us.lang b/src/main/resources/assets/universaltweaks/lang/en_us.lang
index eebc1188..86f0e7b2 100644
--- a/src/main/resources/assets/universaltweaks/lang/en_us.lang
+++ b/src/main/resources/assets/universaltweaks/lang/en_us.lang
@@ -74,6 +74,7 @@ cfg.universaltweaks.modintegration.erebus=The Erebus
 cfg.universaltweaks.modintegration.esm=Epic Siege Mod
 cfg.universaltweaks.modintegration.extrautilities=Extra Utilities 2
 cfg.universaltweaks.modintegration.forestry=Forestry
+cfg.universaltweaks.modintegration.incontrol=In Control!
 cfg.universaltweaks.modintegration.industrialcraft=IndustrialCraft 2
 cfg.universaltweaks.modintegration.industrialforegoing=Industrial Foregoing
 cfg.universaltweaks.modintegration.infernalmobs=Infernal Mobs