From 4c0f2f268552ed59ff2f4d60a319b180351b2335 Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Wed, 5 Nov 2025 15:18:42 -0500 Subject: [PATCH] Disable hardcoded custom uniforms by default --- .../com/gtnewhorizons/angelica/config/AngelicaConfig.java | 4 ++++ .../java/net/coderbot/iris/uniforms/CommonUniforms.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index fb4cfc940..4e3c1f09e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -166,4 +166,8 @@ public class AngelicaConfig { @Config.Comment("Allows unicode languages to use an odd gui scale") @Config.DefaultBoolean(true) public static boolean removeUnicodeEvenScaling; + + @Config.Comment("Register HardcodedCustomUniforms in Iris Shaders. May help with compatibility in certain shader packs") + @Config.DefaultBoolean(false) + public static boolean enableHardcodedCustomUniforms; } diff --git a/src/main/java/net/coderbot/iris/uniforms/CommonUniforms.java b/src/main/java/net/coderbot/iris/uniforms/CommonUniforms.java index ccec18cd9..f2b42532d 100644 --- a/src/main/java/net/coderbot/iris/uniforms/CommonUniforms.java +++ b/src/main/java/net/coderbot/iris/uniforms/CommonUniforms.java @@ -1,5 +1,6 @@ package net.coderbot.iris.uniforms; +import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.glsm.states.BlendState; import com.gtnewhorizons.angelica.glsm.texture.TextureInfo; @@ -53,7 +54,11 @@ public final class CommonUniforms { IrisExclusiveUniforms.addIrisExclusiveUniforms(uniforms); IdMapUniforms.addIdMapUniforms(updateNotifier, uniforms, idMap, directives.isOldHandLight()); MatrixUniforms.addMatrixUniforms(uniforms, directives); - HardcodedCustomUniforms.addHardcodedCustomUniforms(uniforms, updateNotifier); + + if (AngelicaConfig.enableHardcodedCustomUniforms) { + HardcodedCustomUniforms.addHardcodedCustomUniforms(uniforms, updateNotifier); + } + CommonUniforms.generalCommonUniforms(uniforms, updateNotifier, directives); }