Update configs, readme

jchung01 · Aug 24, 2024 · 96ea283 · 96ea283
1 parent 18a0635
commit 96ea283
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -285,6 +285,8 @@ All changes are toggleable via config files.
     * **Improved Player Tick:** Improves AoA player ticking by only sending inventory changes when necessary
 * **Arcane Archives**
     * **Duplication Fixes:** Fixes various duplication exploits
+* **Bibliocraft**
+    * **Disable Version Check:** Fixes client-side memory leak by disabling version check
 * **Binnie's Mods**
     * **Gather Windfall:** Allows Forestry farms to pick up ExtraTrees fruit
 * **Biomes O' Plenty**
@@ -309,8 +311,9 @@ All changes are toggleable via config files.
 * **Collective**
     * **Memory Leak Fix:** Fixes memory leak when unloading worlds/switching dimensions
 * **Compact Machines**
-    * **Invisible Wall Render Fix:** Fixes some compact machine walls being invisible if [Nothirium](https://www.curseforge.com/minecraft/mc-mods/nothirium) 0.2.x (and up) or [Vintagium](https://github.com/Asek3/sodium-1.12) is installed
     * **Allowed Spawns Improvement:** Improves server performance by properly controlling spawn checks (effectiveness depends on CM's config)
+    * **Invisible Wall Render Fix:** Fixes some compact machine walls being invisible if [Nothirium](https://www.curseforge.com/minecraft/mc-mods/nothirium) 0.2.x (and up) or [Vintagium](https://github.com/Asek3/sodium-1.12) is installed
+    * **Memory Leak Fix:** Fixes client-side memory leak associated with miniaturization recipes
 * **Effortless Building**
     * **Block Transmutation Fix:** Fixes Effortless Building ignoring Metadata when checking for items in inventory
 * **Elementary Staffs**
@@ -321,6 +324,8 @@ All changes are toggleable via config files.
     * **Sprinting Integration:** Configurable consumption of feathers when the player is sprinting
 * **Emojicord**
     * **Emoji Context:** Improves emoji context calculation to improve fps when rendering a lot of text
+* **Ender IO**
+    * **Replace Obelisk Renderer:** Fixes client-side memory leak by replacing obelisk renderer with a simpler one 
 * **Ender Storage**
     * **Fix Frequency Tracking:** Fixes storage frequencies being tracked multiple times
 * **Epic Siege Mod**
@@ -348,6 +353,8 @@ All changes are toggleable via config files.
     * **Sticky Pedestal Compatibility:** Enables compatibility between Infernal Mobs' Sticky effect and Reliquary's Pedestal
 * **Iron Backpacks**
     * **Duplication Fixes:** Fixes various duplication exploits
+* **Iron Chests**
+    * **Replace Crystal Chest/Shulker Renderer:** Fixes client-side memory leak by replacing the crystal chest/shulker box renderer with a simpler one (Note: Disables stack size rendering)
 * **Item Stages**
     * **Ingredient Matching:** Changes item matching code to CraftTweaker's ingredient matching system, fixes item NBT issues
 * **Mekanism**

diff --git a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java
@@ -35,6 +35,10 @@ public class UTConfigMods
     @Config.Name("Advent of Ascension")
     public static final AOACategory AOA = new AOACategory();
 
+    @Config.LangKey("cfg.universaltweaks.modintegration.bibliocraft")
+    @Config.Name("BiblioCraft")
+    public static final BiblioCraftCategory BIBLIOCRAFT = new BiblioCraftCategory();
+
     @Config.LangKey("cfg.universaltweaks.modintegration.bop")
     @Config.Name("Biomes O' Plenty")
     public static final BiomesOPlentyCategory BIOMES_O_PLENTY = new BiomesOPlentyCategory();
@@ -91,6 +95,10 @@ public class UTConfigMods
     @Config.Name("Emojicord")
     public static final EmojicordCategory EMOJICORD = new EmojicordCategory();
 
+    @Config.LangKey("cfg.universaltweaks.modintegration.enderio")
+    @Config.Name("Ender IO")
+    public static final EnderIOCategory ENDER_IO = new EnderIOCategory();
+
     @Config.LangKey("cfg.universaltweaks.modintegration.enderstorage")
     @Config.Name("Ender Storage")
     public static final EnderStorageCategory ENDER_STORAGE = new EnderStorageCategory();
@@ -127,6 +135,10 @@ public class UTConfigMods
     @Config.Name("Iron Backpacks")
     public static final IronBackpacksCategory IRON_BACKPACKS = new IronBackpacksCategory();
 
+    @Config.LangKey("cfg.universaltweaks.modintegration.ironchests")
+    @Config.Name("Iron Chests")
+    public static final IronChestsCategory IRON_CHESTS = new IronChestsCategory();
+
     @Config.LangKey("cfg.universaltweaks.modintegration.itemstages")
     @Config.Name("Item Stages")
     public static final ItemStagesCategory ITEM_STAGES = new ItemStagesCategory();
@@ -306,6 +318,14 @@ public static class AOACategory
         public boolean utImprovedPlayerTickToggle = true;
     }
 
+    public static class BiblioCraftCategory
+    {
+        @Config.RequiresMcRestart
+        @Config.Name("Disable Version Check")
+        @Config.Comment("Fixes client-side memory leak by disabling version check")
+        public boolean utDisableVersionCheckToggle = true;
+    }
+
     public static class BiomesOPlentyCategory
     {
         @Config.RequiresMcRestart
@@ -399,11 +419,6 @@ public static class CollectiveCategory
 
     public static class CompactMachinesCoreCategory
     {
-        @Config.RequiresMcRestart
-        @Config.Name("Invisible Wall Render Fix")
-        @Config.Comment("Fixes some compact machine walls being invisible if Nothirium 0.2.x (and up) or Vintagium is installed")
-        public boolean utCMRenderFixToggle = true;
-
         @Config.RequiresMcRestart
         @Config.Name("Allowed Spawns Improvement")
         @Config.Comment
@@ -413,6 +428,16 @@ public static class CompactMachinesCoreCategory
                 "Does nothing if both config values are true"
             })
         public boolean utAllowedSpawnsImprovementToggle = true;
+
+        @Config.RequiresMcRestart
+        @Config.Name("Invisible Wall Render Fix")
+        @Config.Comment("Fixes some compact machine walls being invisible if Nothirium 0.2.x (and up) or Vintagium is installed")
+        public boolean utCMRenderFixToggle = true;
+
+        @Config.RequiresMcRestart
+        @Config.Name("Memory Leak Fix")
+        @Config.Comment("Fixes client-side memory leak associated with miniaturization recipes")
+        public boolean utMemoryLeakFixToggle = true;
     }
 
     public static class EffortlessBuildingCategory
@@ -465,6 +490,14 @@ public static class EmojicordCategory
         public boolean utEmojiContextToggle = true;
     }
 
+    public static class EnderIOCategory
+    {
+        @Config.RequiresMcRestart
+        @Config.Name("Replace Obelisk Renderer")
+        @Config.Comment("Fixes client-side memory leak by replacing obelisk renderer with a simpler one")
+        public boolean utReplaceItemRenderer = true;
+    }
+
     public static class EnderStorageCategory
     {
         @Config.RequiresMcRestart
@@ -620,6 +653,18 @@ public static class IronBackpacksCategory
         public boolean utDuplicationFixesToggle = true;
     }
 
+    public static class IronChestsCategory
+    {
+        @Config.RequiresMcRestart
+        @Config.Name("Replace Crystal Chest/Shulker Renderer")
+        @Config.Comment
+            ({
+                "Fixes client-side memory leak by replacing the crystal chest/shulker box renderer with a simpler one",
+                "Note: Stack sizes are not rendered, similar to modern versions of this mod"
+            })
+        public boolean utReplaceItemRenderer = true;
+    }
+
     public static class ItemStagesCategory
     {
         @Config.RequiresMcRestart
@@ -1047,7 +1092,7 @@ public static class TinkersConstructCategory
 
         @Config.LangKey("cfg.universaltweaks.modintegration.tcon.toolcustomization")
         @Config.Name("Tool Customization")
-        public final TinkersConstructCategory.ToolCustomizationCategory TOOL_CUSTOMIZATION = new TinkersConstructCategory.ToolCustomizationCategory();
+        public final ToolCustomizationCategory TOOL_CUSTOMIZATION = new ToolCustomizationCategory();
 
         public static class ToolCustomizationCategory
         {

diff --git a/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java b/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java
@@ -18,18 +18,14 @@ public class UTMixinLoader implements ILateMixinLoader
     private static final Map<String, Supplier<Boolean>> clientsideMixinConfigs = ImmutableMap.copyOf(new HashMap<String, Supplier<Boolean>>()
     {
         {
-            // TODO: add config
-            put("mixins.mods.bibliocraft.json", () -> loaded("bibliocraft"));
+            put("mixins.mods.bibliocraft.json", () -> loaded("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utDisableVersionCheckToggle);
             put("mixins.mods.cbmultipart.client.json", () -> loaded("forgemultipartcbe") && UTConfigMods.CB_MULTIPART.utMemoryLeakFixToggle);
-            // TODO: add config
-            put("mixins.mods.compactmachines.memory.json", () -> loaded("compactmachines3"));
+            put("mixins.mods.compactmachines.memory.json", () -> loaded("compactmachines3") && UTConfigMods.COMPACT_MACHINES.utMemoryLeakFixToggle);
             put("mixins.mods.compactmachines.render.json", () -> loaded("compactmachines3") && UTConfigMods.COMPACT_MACHINES.utCMRenderFixToggle);
             put("mixins.mods.crafttweaker.json", () -> loaded("crafttweaker"));
-            // TODO: add config
-            put("mixins.mods.enderio.json", () -> loaded("enderio"));
+            put("mixins.mods.enderio.json", () -> loaded("enderio") && UTConfigMods.ENDER_IO.utReplaceItemRenderer);
             put("mixins.mods.hwyla.json", () -> loaded("waila"));
-            // TODO: add config
-            put("mixins.mods.ironchests.json", () -> loaded("ironchest"));
+            put("mixins.mods.ironchests.json", () -> loaded("ironchest") && UTConfigMods.IRON_CHESTS.utReplaceItemRenderer);
             put("mixins.mods.modularrouters.json", () -> loaded("modularrouters") && UTConfigMods.MODULAR_ROUTERS.utParticleThreadToggle);
             put("mixins.mods.roost.json", () -> loaded("roost") && loaded("contenttweaker"));
             put("mixins.mods.storagedrawers.client.json", () -> loaded("storagedrawers"));

diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/bibliocraft/mixin/UTBiblioCraftMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/bibliocraft/mixin/UTBiblioCraftMixin.java
@@ -6,6 +6,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+// Courtesy of jchung01
 @Mixin(value = BiblioCraft.class, remap = false)
 public class UTBiblioCraftMixin
 {

diff --git a/...n/java/mod/acgaming/universaltweaks/mods/enderio/mixin/UTObeliskSpecialRendererMixin.java b/...n/java/mod/acgaming/universaltweaks/mods/enderio/mixin/UTObeliskSpecialRendererMixin.java
@@ -21,6 +21,7 @@
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 
+// Courtesy of jchung01
 @Mixin(value = ObeliskSpecialRenderer.class, remap = false)
 public abstract class UTObeliskSpecialRendererMixin<T extends TileEntityBase> extends ManagedTESR<T>
 {
@@ -29,7 +30,6 @@ public abstract class UTObeliskSpecialRendererMixin<T extends TileEntityBase> ex
     private Random rand;
 
     @Shadow
-    @Nonnull
     protected abstract ItemStack getFloatingItem(T te);
 
     protected UTObeliskSpecialRendererMixin(Block block)

diff --git a/src/main/resources/assets/universaltweaks/lang/en_us.lang b/src/main/resources/assets/universaltweaks/lang/en_us.lang
@@ -53,6 +53,7 @@ cfg.universaltweaks.modintegration.actuallyadditions=Actually Additions
 cfg.universaltweaks.modintegration.aoa=Advent of Ascension
 cfg.universaltweaks.modintegration.arcanearchives=Arcane Archives
 cfg.universaltweaks.modintegration.astralsorcery=Astral Sorcery
+cfg.universaltweaks.modintegration.bibliocraft=BiblioCraft
 cfg.universaltweaks.modintegration.bm=Blood Magic
 cfg.universaltweaks.modintegration.bop=Biomes O' Plenty
 cfg.universaltweaks.modintegration.botania=Botania
@@ -67,6 +68,7 @@ cfg.universaltweaks.modintegration.effortlessbuilding=Effortless Building
 cfg.universaltweaks.modintegration.elementarystaffs=Elementary Staffs
 cfg.universaltweaks.modintegration.elenaidodge2=Elenai Dodge 2
 cfg.universaltweaks.modintegration.emojicord=Emojicord
+cfg.universaltweaks.modintegration.enderio=Ender IO
 cfg.universaltweaks.modintegration.enderstorage=Ender Storage
 cfg.universaltweaks.modintegration.erebus=The Erebus
 cfg.universaltweaks.modintegration.esm=Epic Siege Mod
@@ -76,6 +78,7 @@ cfg.universaltweaks.modintegration.industrialcraft=IndustrialCraft 2
 cfg.universaltweaks.modintegration.industrialforegoing=Industrial Foregoing
 cfg.universaltweaks.modintegration.infernalmobs=Infernal Mobs
 cfg.universaltweaks.modintegration.ironbackpacks=Iron Backpacks
+cfg.universaltweaks.modintegration.ironchests=Iron Chests
 cfg.universaltweaks.modintegration.itemstages=Item Stages
 cfg.universaltweaks.modintegration.mekanism=Mekanism
 cfg.universaltweaks.modintegration.mobstages=Mob Stages