Remove Model Gap bugfix

Currently not working with Forge's model code
ACGaming · Oct 17, 2024 · f7f2380 · f7f2380
1 parent 93d99cd
commit f7f2380
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 168 deletions.
diff --git a/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/modelgap/UTModelFix.java b/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/modelgap/UTModelFix.java
diff --git a/.../mod/acgaming/universaltweaks/bugfixes/misc/modelgap/mixin/UTItemModelGeneratorMixin.java b/.../mod/acgaming/universaltweaks/bugfixes/misc/modelgap/mixin/UTItemModelGeneratorMixin.java
diff --git a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigBugfixes.java b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigBugfixes.java
@@ -327,10 +327,6 @@ public static class EntityListsCategory
 
     public static class MiscCategory
     {
-        @Config.LangKey("cfg.universaltweaks.bugfixes.misc.modelgap")
-        @Config.Name("Model Gap")
-        public final ModelGapCategory MODEL_GAP = new ModelGapCategory();
-
         @Config.RequiresMcRestart
         @Config.Name("Accurate Smooth Lighting")
         @Config.Comment("Improves the accuracy of smooth lighting by checking for suffocation and light opacity")
@@ -383,32 +379,6 @@ public static class MiscCategory
                 "Incompatible with SpongeForge and RandomPatches"
             })
         public int utPacketSize = 0x1000000;
-
-        public static class ModelGapCategory
-        {
-            @Config.RequiresMcRestart
-            @Config.Name("[1] Model Gap Toggle")
-            @Config.Comment("Fixes transparent gaps in all 3D models of blocks and items")
-            public boolean utModelGapToggle = true;
-
-            @Config.Name("[2] Recess Value")
-            @Config.Comment
-                ({
-                    "Quad X/Y offset",
-                    "Moves the quad toward the center of the item",
-                    "Use to hide gaps, keep as close to 0 as possible"
-                })
-            public double utModelGapRecess = 0.007D;
-
-            @Config.Name("[3] Expansion Value")
-            @Config.Comment
-                ({
-                    "Quad expansion increment",
-                    "Enlarges each quad",
-                    "Use to hide gaps, keep as close to 0 as possible"
-                })
-            public double utModelGapExpansion = 0.008D;
-        }
     }
 
     public static class WorldCategory

diff --git a/src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java b/src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java
@@ -175,7 +175,6 @@ public class UTLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader
             put("mixins.bugfixes.entities.entitylists.client.json", () -> UTConfigBugfixes.ENTITIES.ENTITY_LISTS.utWorldAdditionsToggle);
             put("mixins.bugfixes.entities.villagermantle.json", () -> UTConfigBugfixes.ENTITIES.utVillagerMantleToggle);
             put("mixins.bugfixes.misc.depthmask.json", () -> UTConfigBugfixes.MISC.utDepthMaskToggle);
-            put("mixins.bugfixes.misc.modelgap.json", () -> UTConfigBugfixes.MISC.MODEL_GAP.utModelGapToggle);
             put("mixins.bugfixes.misc.potionamplifier.json", () -> UTConfigBugfixes.MISC.utPotionAmplifierVisibilityToggle);
             put("mixins.bugfixes.misc.smoothlighting.json", () -> UTConfigBugfixes.MISC.utAccurateSmoothLighting);
             put("mixins.bugfixes.misc.spectatormenu.json", () -> UTConfigBugfixes.MISC.utSpectatorMenuToggle);

diff --git a/src/main/resources/assets/universaltweaks/lang/en_us.lang b/src/main/resources/assets/universaltweaks/lang/en_us.lang
@@ -46,7 +46,6 @@ cfg.universaltweaks.config.world=World
 cfg.universaltweaks.bugfixes.blocks.blockoverlay=Block Overlay
 cfg.universaltweaks.bugfixes.entities.desync=Entity Desync
 cfg.universaltweaks.bugfixes.entities.entitylists=Entity Lists
-cfg.universaltweaks.bugfixes.misc.modelgap=Model Gap
 
 cfg.universaltweaks.modintegration.abyssalcraft=AbyssalCraft
 cfg.universaltweaks.modintegration.actuallyadditions=Actually Additions

diff --git a/src/main/resources/assets/universaltweaks/lang/es_mx.lang b/src/main/resources/assets/universaltweaks/lang/es_mx.lang
@@ -30,7 +30,6 @@ cfg.universaltweaks.config.world=Mundo
 
 cfg.universaltweaks.bugfixes.blocks.blockoverlay=Block Overlay
 cfg.universaltweaks.bugfixes.entities.desync=Entity Desync
-cfg.universaltweaks.bugfixes.misc.modelgap=Brechas en modelos
 
 cfg.universaltweaks.modintegration.abyssalcraft=AbyssalCraft
 cfg.universaltweaks.modintegration.actuallyadditions=Actually Additions

diff --git a/src/main/resources/mixins.bugfixes.misc.modelgap.json b/src/main/resources/mixins.bugfixes.misc.modelgap.json
diff --git a/src/main/resources/universaltweaks_at.cfg b/src/main/resources/universaltweaks_at.cfg
@@ -2,10 +2,6 @@
 public-f net.minecraft.entity.ai.attributes.RangedAttribute field_111118_b # maximumValue
 public-f net.minecraft.entity.ai.attributes.RangedAttribute field_111120_a # minimumValue
 
-# Model Gap
-public net.minecraft.client.renderer.block.model.ItemModelGenerator$Span
-public net.minecraft.client.renderer.block.model.ItemModelGenerator$SpanFacing
-
 # Parry
 public net.minecraft.entity.projectile.EntityThrowable field_70192_c # EntityThrowable thrower
 public net.minecraft.entity.EntityLivingBase func_184583_d(Lnet/minecraft/util/DamageSource;)Z # EntityLivingBase canBlockDamageSource