From e02544ace72ba9a676db8483685f83042f24a089 Mon Sep 17 00:00:00 2001
From: ACGaming <4818419+ACGaming@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:23:57 +0100
Subject: [PATCH] Remove Thaumic Wonders Memory Leak Fix

Now part of an official release: https://www.curseforge.com/minecraft/mc-mods/thaumic-wonders/files/5181197
---
 .../universaltweaks/config/UTConfigMods.java  |  5 ----
 .../universaltweaks/core/UTMixinLoader.java   |  3 ---
 .../mixin/UTItemVoidFortressArmorMixin.java   | 24 -------------------
 .../mixins.mods.thaumicwonders.client.json    |  7 ------
 4 files changed, 39 deletions(-)
 delete mode 100644 src/main/java/mod/acgaming/universaltweaks/mods/thaumicwonders/mixin/UTItemVoidFortressArmorMixin.java
 delete mode 100644 src/main/resources/mixins.mods.thaumicwonders.client.json

diff --git a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java
index 38597a85..97b9aebe 100644
--- a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java
+++ b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java
@@ -754,11 +754,6 @@ public static class ThaumicWondersCategory
         @Config.Name("Duplication Fixes")
         @Config.Comment("Fixes various duplication exploits")
         public boolean utDuplicationFixesToggle = true;
-
-        @Config.RequiresMcRestart
-        @Config.Name("Memory Leak Fix")
-        @Config.Comment("Fixes a client-side memory leak when wearing Void Fortress armor")
-        public boolean utMemoryLeakFixToggle = true;
     }
 
     public static class TheFarlandersCategory
diff --git a/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java b/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java
index cb7bbc2d..f29bf880 100644
--- a/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java
+++ b/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java
@@ -23,7 +23,6 @@ public List<String> getMixinConfigs()
             configs.add("mixins.mods.roost.json");
             configs.add("mixins.mods.storagedrawers.client.json");
             configs.add("mixins.mods.thaumcraft.entities.client.json");
-            configs.add("mixins.mods.thaumicwonders.client.json");
         }
         // COMMON
         configs.add("mixins.mods.aoa3.json");
@@ -105,8 +104,6 @@ public boolean shouldMixinConfigQueue(String mixinConfig)
                     return Loader.isModLoaded("storagedrawers");
                 case "mixins.mods.thaumcraft.entities.client.json":
                     return Loader.isModLoaded("thaumcraft");
-                case "mixins.mods.thaumicwonders.client.json":
-                    return Loader.isModLoaded("thaumicwonders") && UTConfigMods.THAUMIC_WONDERS.utMemoryLeakFixToggle;
             }
         }
         switch (mixinConfig)
diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/thaumicwonders/mixin/UTItemVoidFortressArmorMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/thaumicwonders/mixin/UTItemVoidFortressArmorMixin.java
deleted file mode 100644
index 212b4a1f..00000000
--- a/src/main/java/mod/acgaming/universaltweaks/mods/thaumicwonders/mixin/UTItemVoidFortressArmorMixin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package mod.acgaming.universaltweaks.mods.thaumicwonders.mixin;
-
-import com.verdantartifice.thaumicwonders.client.renderers.models.gear.ModelVoidFortressArmor;
-import com.verdantartifice.thaumicwonders.common.items.armor.ItemVoidFortressArmor;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-// Courtesy of 2302479492 ("Aqua")
-@Mixin(value = ItemVoidFortressArmor.class, remap = false)
-public class UTItemVoidFortressArmorMixin
-{
-    @Unique
-    private static final ModelVoidFortressArmor universalTweaks$legModel = new ModelVoidFortressArmor(0.5F);
-    @Unique
-    private static final ModelVoidFortressArmor universalTweaks$generalModel = new ModelVoidFortressArmor(1.0F);
-
-    @Redirect(method = "getArmorModel", at = @At(value = "NEW", target = "(F)Lcom/verdantartifice/thaumicwonders/client/renderers/models/gear/ModelVoidFortressArmor;"))
-    private ModelVoidFortressArmor utUseStaticModels(float f)
-    {
-        return f == 0.5 ? universalTweaks$legModel : universalTweaks$generalModel;
-    }
-}
diff --git a/src/main/resources/mixins.mods.thaumicwonders.client.json b/src/main/resources/mixins.mods.thaumicwonders.client.json
deleted file mode 100644
index 9b81afb8..00000000
--- a/src/main/resources/mixins.mods.thaumicwonders.client.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "package": "mod.acgaming.universaltweaks.mods.thaumicwonders.mixin",
-  "refmap": "universaltweaks.refmap.json",
-  "minVersion": "0.8",
-  "compatibilityLevel": "JAVA_8",
-  "client": ["UTItemVoidFortressArmorMixin"]
-}
\ No newline at end of file