spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move to irisutil

Browse Source
This commit is contained in:
mcrcortex
2025-09-14 19:51:41 +10:00
parent b86546a178
commit d78653a76f
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/cortex/voxy/client/core/RenderPipelineFactory.java
View File

@@ -39,7 +39,7 @@ public class RenderPipelineFactory {
return new IrisVoxyRenderPipeline(pipeData, nodeManager, nodeCleaner, traversal, frexSupplier); return new IrisVoxyRenderPipeline(pipeData, nodeManager, nodeCleaner, traversal, frexSupplier);
} catch (Exception e) { } catch (Exception e) {
Logger.error("Failed to create iris render pipeline", e); Logger.error("Failed to create iris render pipeline", e);
IrisApi.getInstance().getConfig().setShadersEnabledAndApply(false); IrisUtil.disableIrisShaders();
return null; return null;
} }
} }

7
src/main/java/me/cortex/voxy/client/core/util/IrisUtil.java
View File

@@ -6,6 +6,7 @@ import net.caffeinemc.mods.sodium.client.render.chunk.ChunkRenderMatrices;
import net.caffeinemc.mods.sodium.client.util.FogParameters; import net.caffeinemc.mods.sodium.client.util.FogParameters;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import net.irisshaders.iris.Iris; import net.irisshaders.iris.Iris;
import net.irisshaders.iris.api.v0.IrisApi;
import net.irisshaders.iris.gl.IrisRenderSystem; import net.irisshaders.iris.gl.IrisRenderSystem;
import net.irisshaders.iris.shadows.ShadowRenderer; import net.irisshaders.iris.shadows.ShadowRenderer;
@@ -47,4 +48,10 @@ public class IrisUtil {
public static boolean irisShaderPackEnabled() { public static boolean irisShaderPackEnabled() {
return IRIS_INSTALLED && irisShaderPackEnabled0(); return IRIS_INSTALLED && irisShaderPackEnabled0();
} }
public static void disableIrisShaders() {
if(IRIS_INSTALLED) disableIrisShaders0();
}
private static void disableIrisShaders0() {
IrisApi.getInstance().getConfig().setShadersEnabledAndApply(false);//Disable shaders
}
} }

5
src/main/java/me/cortex/voxy/client/iris/IrisShaderPatch.java
View File

@@ -7,6 +7,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import me.cortex.voxy.client.core.util.IrisUtil;
import me.cortex.voxy.common.Logger; import me.cortex.voxy.common.Logger;
import net.irisshaders.iris.api.v0.IrisApi; import net.irisshaders.iris.api.v0.IrisApi;
import net.irisshaders.iris.shaderpack.ShaderPack; import net.irisshaders.iris.shaderpack.ShaderPack;
@@ -315,14 +316,14 @@ public class IrisShaderPatch {
} catch (Exception e) { } catch (Exception e) {
patchData = null; patchData = null;
Logger.error("Failed to parse patch data gson",e); Logger.error("Failed to parse patch data gson",e);
IrisApi.getInstance().getConfig().setShadersEnabledAndApply(false);//Disable shaders IrisUtil.disableIrisShaders();
} }
if (patchData == null) { if (patchData == null) {
return null; return null;
} }
if (patchData.version != VERSION) { if (patchData.version != VERSION) {
Logger.error("Shader has voxy patch data, but patch version is incorrect. expected " + VERSION + " got "+patchData.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 null;
} }
return new IrisShaderPatch(patchData, ipack); return new IrisShaderPatch(patchData, ipack);