move to irisutil
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user