From d78653a76fba93f4e6f139bc3bf678b30480078c Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Sun, 14 Sep 2025 19:51:41 +1000 Subject: [PATCH] move to irisutil --- .../me/cortex/voxy/client/core/RenderPipelineFactory.java | 2 +- .../java/me/cortex/voxy/client/core/util/IrisUtil.java | 7 +++++++ .../java/me/cortex/voxy/client/iris/IrisShaderPatch.java | 5 +++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/cortex/voxy/client/core/RenderPipelineFactory.java b/src/main/java/me/cortex/voxy/client/core/RenderPipelineFactory.java index 4058c9d0..28026da6 100644 --- a/src/main/java/me/cortex/voxy/client/core/RenderPipelineFactory.java +++ b/src/main/java/me/cortex/voxy/client/core/RenderPipelineFactory.java @@ -39,7 +39,7 @@ public class RenderPipelineFactory { return new IrisVoxyRenderPipeline(pipeData, nodeManager, nodeCleaner, traversal, frexSupplier); } catch (Exception e) { Logger.error("Failed to create iris render pipeline", e); - IrisApi.getInstance().getConfig().setShadersEnabledAndApply(false); + IrisUtil.disableIrisShaders(); return null; } } diff --git a/src/main/java/me/cortex/voxy/client/core/util/IrisUtil.java b/src/main/java/me/cortex/voxy/client/core/util/IrisUtil.java index 0df6497c..6d9ffb8d 100644 --- a/src/main/java/me/cortex/voxy/client/core/util/IrisUtil.java +++ b/src/main/java/me/cortex/voxy/client/core/util/IrisUtil.java @@ -6,6 +6,7 @@ import net.caffeinemc.mods.sodium.client.render.chunk.ChunkRenderMatrices; import net.caffeinemc.mods.sodium.client.util.FogParameters; import net.fabricmc.loader.api.FabricLoader; import net.irisshaders.iris.Iris; +import net.irisshaders.iris.api.v0.IrisApi; import net.irisshaders.iris.gl.IrisRenderSystem; import net.irisshaders.iris.shadows.ShadowRenderer; @@ -47,4 +48,10 @@ public class IrisUtil { public static boolean irisShaderPackEnabled() { return IRIS_INSTALLED && irisShaderPackEnabled0(); } + public static void disableIrisShaders() { + if(IRIS_INSTALLED) disableIrisShaders0(); + } + private static void disableIrisShaders0() { + IrisApi.getInstance().getConfig().setShadersEnabledAndApply(false);//Disable shaders + } } diff --git a/src/main/java/me/cortex/voxy/client/iris/IrisShaderPatch.java b/src/main/java/me/cortex/voxy/client/iris/IrisShaderPatch.java index 60d28d86..c5c3a3d7 100644 --- a/src/main/java/me/cortex/voxy/client/iris/IrisShaderPatch.java +++ b/src/main/java/me/cortex/voxy/client/iris/IrisShaderPatch.java @@ -7,6 +7,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; +import me.cortex.voxy.client.core.util.IrisUtil; import me.cortex.voxy.common.Logger; import net.irisshaders.iris.api.v0.IrisApi; import net.irisshaders.iris.shaderpack.ShaderPack; @@ -315,14 +316,14 @@ public class IrisShaderPatch { } catch (Exception e) { patchData = null; Logger.error("Failed to parse patch data gson",e); - IrisApi.getInstance().getConfig().setShadersEnabledAndApply(false);//Disable shaders + IrisUtil.disableIrisShaders(); } if (patchData == null) { return null; } if (patchData.version != VERSION) { Logger.error("Shader has voxy patch data, but patch version is incorrect. expected " + VERSION + " got "+patchData.version); - IrisApi.getInstance().getConfig().setShadersEnabledAndApply(false);//Disable shaders + IrisUtil.disableIrisShaders(); return null; } return new IrisShaderPatch(patchData, ipack);