Merge pull request #527 from IcarussOne/main

Remove Thaumcraft fixes

README.md

@@ -394,16 +394,12 @@ All changes are toggleable via config files.
 * **Tech Reborn**
     * **Optimized Rolling Machine:** Optimizes the Rolling Machine to reduce tick time
 * **Thaumcraft**
-    * **Duplication Fixes:** Fixes various duplication exploits
-    * **Firebat Particles:** Adds particles to firebats similar to legacy versions
-    * **Flower Bounding Box:** Fixes the bounding box always being at the center in both cinderpearls and shimmerleafs
     * **Focus Effects**
         * Revamps the cast sounds of certain focus effects to provide better variety
         * Adds impact sounds (like air or curse) to various focus effects that lack it
     * **Focus Mediums:** Makes several focus mediums play additional cast sounds to make them stand out more
     * **Spiderlike Eldritch Crabs:** Rotates dead eldritch crabs all the way like endermites, silverfish, and spiders
     * **Stable Thaumometer:** Stops the thaumometer from bobbing rapidly when using it to scan objects
-    * **Wisp Particles:** Increases particle size of wisps similar to legacy versions
 * **Thaumic Wonders**
     * **Duplication Fixes:** Fixes various duplication exploits
 * **The Erebus**

src/main/java/mod/acgaming/universaltweaks/UniversalTweaks.java

@@ -26,7 +26,6 @@
 import mod.acgaming.universaltweaks.mods.tconstruct.UTTConstructEvents;
 import mod.acgaming.universaltweaks.mods.tconstruct.UTTConstructMaterials;
 import mod.acgaming.universaltweaks.mods.tconstruct.oredictcache.UTOreDictCache;
-import mod.acgaming.universaltweaks.mods.thaumcraft.UTThaumcraftEvents;
 import mod.acgaming.universaltweaks.tweaks.blocks.betterplacement.UTBetterPlacement;
 import mod.acgaming.universaltweaks.tweaks.blocks.breakablebedrock.UTBreakableBedrock;
 import mod.acgaming.universaltweaks.tweaks.blocks.dispenser.UTBlockDispenser;
@@ -176,7 +175,6 @@ public void init(FMLInitializationEvent event)
         // Unregister reason: event handler adds to an unused map that is never cleared.
         if (Loader.isModLoaded("tardis") && UTConfigMods.TARDIS.utMemoryLeakFixToggle) MinecraftForge.EVENT_BUS.unregister(ClientProxy.class);
         if (Loader.isModLoaded("tconstruct") && UTConfigMods.TINKERS_CONSTRUCT.utDuplicationFixesToggle) MinecraftForge.EVENT_BUS.register(new UTTConstructEvents());
-        if (Loader.isModLoaded("thaumcraft") && UTConfigMods.THAUMCRAFT.utDuplicationFixesToggle) MinecraftForge.EVENT_BUS.register(new UTThaumcraftEvents());
         LOGGER.info(NAME + " initialized");
     }
 

src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java

@@ -811,38 +811,18 @@ public static class TechRebornCategory
 
     public static class ThaumcraftCategory
     {
-        @Config.RequiresMcRestart
-        @Config.Name("Flower Bounding Box")
-        @Config.Comment("Fixes the bounding box always being at the center in both cinderpearls and shimmerleafs")
-        public boolean utTCFlowerBoundingBoxToggle = true;
-
         @Config.RequiresMcRestart
         @Config.Name("Stable Thaumometer")
         @Config.Comment("Stops the thaumometer from bobbing rapidly when using it to scan objects")
         public boolean utTCStableThaumometerToggle = true;
-
-        @Config.RequiresMcRestart
-        @Config.Name("Duplication Fixes")
-        @Config.Comment("Fixes various duplication exploits")
-        public boolean utDuplicationFixesToggle = true;
     }
 
     public static class ThaumcraftEntitiesCategory
     {
-        @Config.RequiresMcRestart
-        @Config.Name("Firebat Particles")
-        @Config.Comment("Adds particles to firebats similar to legacy versions")
-        public boolean utTCFirebatParticlesToggle = true;
-
         @Config.RequiresMcRestart
         @Config.Name("Spiderlike Eldritch Crabs")
         @Config.Comment("Rotates dead eldritch crabs all the way like endermites, silverfish, and spiders")
         public boolean utTCSpiderlikeEldritchCrabToggle = true;
-
-        @Config.RequiresMcRestart
-        @Config.Name("Wisp Particles")
-        @Config.Comment("Increases particle size of wisps similar to legacy versions")
-        public boolean utTCWispParticlesToggle = true;
     }
 
     public static class ThaumcraftFociCategory

src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java

@@ -96,9 +96,6 @@ public class UTMixinLoader implements ILateMixinLoader
             put("mixins.mods.tconstruct.toolcustomization.json", () -> loaded("tconstruct") && UTConfigMods.TINKERS_CONSTRUCT.utTConToolCustomizationToggle);
             put("mixins.mods.tconstruct.toolcustomization.plustic.json", () -> loaded("tconstruct") && loaded("plustic") && UTConfigMods.TINKERS_CONSTRUCT.utTConToolCustomizationToggle);
             put("mixins.mods.techreborn.json", () -> loaded("techreborn"));
-            put("mixins.mods.thaumcraft.dupes.json", () -> loaded("thaumcraft") && UTConfigMods.THAUMCRAFT.utDuplicationFixesToggle);
-            put("mixins.mods.thaumcraft.enderio.dupes.json", () -> loaded("thaumcraft") && loaded("enderio") && UTConfigMods.THAUMCRAFT.utDuplicationFixesToggle);
-            put("mixins.mods.thaumcraft.entities.server.json", () -> loaded("thaumcraft"));
             put("mixins.mods.thaumcraft.foci.focuseffects.json", () -> loaded("thaumcraft"));
             put("mixins.mods.thaumcraft.foci.focusmediums.json", () -> loaded("thaumcraft"));
             put("mixins.mods.thaumcraft.json", () -> loaded("thaumcraft"));