From fe6c4f75077d8ce911a1057ecb1e704b7bc0c283 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 2 Feb 2026 07:18:10 -0600 Subject: [PATCH] Remove MC Texture LodBias config --- coreSubProjects | 2 +- .../mixins/client/MixinTextureUtil.java | 38 ------------------- .../DistantHorizons.fabric.mixins.json | 3 +- .../forge/mixins/client/MixinTextureUtil.java | 31 --------------- .../DistantHorizons.forge.mixins.json | 3 +- .../neoforge/NeoforgeClientProxy.java | 1 - .../mixins/client/MixinTextureUtil.java | 37 ------------------ .../DistantHorizons.neoforge.mixins.json | 3 +- 8 files changed, 4 insertions(+), 114 deletions(-) delete mode 100644 fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinTextureUtil.java delete mode 100644 forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinTextureUtil.java delete mode 100644 neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinTextureUtil.java diff --git a/coreSubProjects b/coreSubProjects index b511ab4fb..a488478b1 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit b511ab4fb3593eb2216ca118570bb1c186f9ef30 +Subproject commit a488478b1d349bcae10fc0000fc76986d3fc6cfc diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinTextureUtil.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinTextureUtil.java deleted file mode 100644 index 301c4ac94..000000000 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinTextureUtil.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.seibel.distanthorizons.fabric.mixins.client; - -#if MC_VER < MC_1_21_5 -import com.mojang.blaze3d.platform.GlStateManager; -#endif -import com.mojang.blaze3d.platform.TextureUtil; -import com.seibel.distanthorizons.core.config.Config; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - - -/** - * Sets Minecraft's LOD Bias (looks similar to mipmaps) - * - * @author coolGi - */ -@Mixin(TextureUtil.class) -public class MixinTextureUtil -{ - // TODO fix for MC 1.21.5+ - - #if MC_VER < MC_1_21_5 - @Redirect(method = "Lcom/mojang/blaze3d/platform/TextureUtil;prepareImage(Lcom/mojang/blaze3d/platform/NativeImage$InternalGlFormat;IIII)V", - at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;_texParameter(IIF)V", #if MC_VER == MC_1_16_5 remap = true #else remap = false #endif)) - private static void setLodBias(int target, int pname, float param) - { - float biasValue = Config.Client.Advanced.Graphics.Quality.lodBias.get().floatValue(); - if (biasValue != 0) - { - // The target is GL11.GL_TEXTURE_2D - // And the pname is GL14.GL_TEXTURE_LOD_BIAS - GlStateManager._texParameter(target, pname, biasValue); - } - } - #endif - -} diff --git a/fabric/src/main/resources/DistantHorizons.fabric.mixins.json b/fabric/src/main/resources/DistantHorizons.fabric.mixins.json index dca9096a5..9faea69bf 100644 --- a/fabric/src/main/resources/DistantHorizons.fabric.mixins.json +++ b/fabric/src/main/resources/DistantHorizons.fabric.mixins.json @@ -20,8 +20,7 @@ "client.MixinChunkSectionsToRender", "client.MixinLightTexture", "client.MixinMinecraft", - "client.MixinOptionsScreen", - "client.MixinTextureUtil" + "client.MixinOptionsScreen" ], "server": [], "injectors": { diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinTextureUtil.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinTextureUtil.java deleted file mode 100644 index d9b2b12b9..000000000 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinTextureUtil.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.seibel.distanthorizons.forge.mixins.client; - -import com.mojang.blaze3d.platform.GlStateManager; -import com.mojang.blaze3d.platform.TextureUtil; -import com.seibel.distanthorizons.core.config.Config; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -/** - * Sets Minecraft's LOD Bias (looks similar to mipmaps) - * - * @author coolGi - */ -@Mixin(TextureUtil.class) -public class MixinTextureUtil -{ - @Redirect(method = "prepareImage(Lcom/mojang/blaze3d/platform/NativeImage$InternalGlFormat;IIII)V", - at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;_texParameter(IIF)V"), remap = false) - private static void setLodBias(int target, int pname, float param) - { - float biasValue = Config.Client.Advanced.Graphics.Quality.lodBias.get().floatValue(); - if (biasValue != 0) - { - // The target is GL11.GL_TEXTURE_2D - // And the pname is GL14.GL_TEXTURE_LOD_BIAS - GlStateManager._texParameter(target, pname, biasValue); - } - } - -} \ No newline at end of file diff --git a/forge/src/main/resources/DistantHorizons.forge.mixins.json b/forge/src/main/resources/DistantHorizons.forge.mixins.json index f5842f306..8f5955b2d 100644 --- a/forge/src/main/resources/DistantHorizons.forge.mixins.json +++ b/forge/src/main/resources/DistantHorizons.forge.mixins.json @@ -16,8 +16,7 @@ "client.MixinFogRenderer", "client.MixinLevelRenderer", "client.MixinLightTexture", - "client.MixinOptionsScreen", - "client.MixinTextureUtil" + "client.MixinOptionsScreen" ], "server": [] } diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java index e00d25c0a..7d6506753 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java @@ -90,7 +90,6 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy ClientLevel clientLevel = (ClientLevel) level; IClientLevelWrapper clientLevelWrapper = ClientLevelWrapper.getWrapper(clientLevel, true); - // TODO this causes a crash due to level being set to null somewhere ClientApi.INSTANCE.clientLevelLoadEvent(clientLevelWrapper); } @SubscribeEvent diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinTextureUtil.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinTextureUtil.java deleted file mode 100644 index 70d4e3c37..000000000 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinTextureUtil.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.seibel.distanthorizons.neoforge.mixins.client; - -#if MC_VER < MC_1_21_5 -import com.mojang.blaze3d.platform.GlStateManager; -#endif -import com.mojang.blaze3d.platform.TextureUtil; -import com.seibel.distanthorizons.core.config.Config; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -/** - * Sets Minecraft's LOD Bias (looks similar to mipmaps) - * - * @author coolGi - */ -@Mixin(TextureUtil.class) -public class MixinTextureUtil -{ - // TODO fix for MC 1.21.5+ - - #if MC_VER < MC_1_21_5 - @Redirect(method = "prepareImage(Lcom/mojang/blaze3d/platform/NativeImage$InternalGlFormat;IIII)V", - at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;_texParameter(IIF)V"), remap = false) - private static void setLodBias(int target, int pname, float param) - { - float biasValue = Config.Client.Advanced.Graphics.Quality.lodBias.get().floatValue(); - if (biasValue != 0) - { - // The target is GL11.GL_TEXTURE_2D - // And the pname is GL14.GL_TEXTURE_LOD_BIAS - GlStateManager._texParameter(target, pname, biasValue); - } - } - #endif - -} \ No newline at end of file diff --git a/neoforge/src/main/resources/DistantHorizons.neoforge.mixins.json b/neoforge/src/main/resources/DistantHorizons.neoforge.mixins.json index e0f886569..b4f85ecb1 100644 --- a/neoforge/src/main/resources/DistantHorizons.neoforge.mixins.json +++ b/neoforge/src/main/resources/DistantHorizons.neoforge.mixins.json @@ -18,8 +18,7 @@ "client.MixinLevelRenderer", "client.MixinLightTexture", "client.MixinMinecraft", - "client.MixinOptionsScreen", - "client.MixinTextureUtil" + "client.MixinOptionsScreen" ], "server": [], "plugin": "com.seibel.distanthorizons.neoforge.mixins.NeoforgeMixinPlugin"