diff --git a/build.gradle b/build.gradle index 7345c45c..a9d7ba83 100644 --- a/build.gradle +++ b/build.gradle @@ -124,7 +124,6 @@ dependencies { //modImplementation "maven.modrinth:sodium:mc1.21.11-0.8.0-fabric" modImplementation "net.caffeinemc:sodium-fabric:0.8.1-SNAPSHOT+mc1.21.11+" - modImplementation("maven.modrinth:lithium:mc1.21.11-0.21.0-fabric") //modRuntimeOnlyMsk "drouarb:nvidium:0.4.1-beta4:1.21.6@jar" @@ -140,9 +139,6 @@ dependencies { //modCompileOnly("maven.modrinth:immersiveportals:v5.1.7-mc1.20.4") - modCompileOnly("maven.modrinth:sodium-extra:mc1.21.11-0.8.0+fabric") - //modRuntimeOnlyMsk("maven.modrinth:sodium-extra:mc1.21.11-0.8.0+fabric") - modCompileOnly("maven.modrinth:chunky:1.4.54-fabric") //modRuntimeOnlyMsk("maven.modrinth:chunky:1.4.40-fabric") diff --git a/src/main/java/me/cortex/voxy/client/compat/SodiumExtra.java b/src/main/java/me/cortex/voxy/client/compat/SodiumExtra.java deleted file mode 100644 index 9c9739a0..00000000 --- a/src/main/java/me/cortex/voxy/client/compat/SodiumExtra.java +++ /dev/null @@ -1,18 +0,0 @@ -package me.cortex.voxy.client.compat; - -import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod; -import net.fabricmc.loader.api.FabricLoader; - -public class SodiumExtra { - public static final boolean HAS_SODIUM_EXTRA = FabricLoader.getInstance().isModLoaded("sodium-extra"); - public static boolean useSodiumExtraCulling() { - if (!HAS_SODIUM_EXTRA) { - return false; - } - return useSodiumExtraCulling0(); - } - - private static boolean useSodiumExtraCulling0() { - return !SodiumExtraClientMod.options().renderSettings.globalFog; - } -} diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/ChunkBoundRenderer.java b/src/main/java/me/cortex/voxy/client/core/rendering/ChunkBoundRenderer.java index a269c111..f212b883 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/ChunkBoundRenderer.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/ChunkBoundRenderer.java @@ -2,8 +2,6 @@ package me.cortex.voxy.client.core.rendering; import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; -import me.cortex.voxy.client.VoxyClient; -import me.cortex.voxy.client.compat.SodiumExtra; import me.cortex.voxy.client.core.AbstractRenderPipeline; import me.cortex.voxy.client.core.gl.GlBuffer; import me.cortex.voxy.client.core.gl.GlVertexArray; @@ -56,7 +54,6 @@ public class ChunkBoundRenderer { this.rasterShader = Shader.makeAuto() .addSource(ShaderType.VERTEX, vert) .defineIf("TAA", taa != null) - .defineIf("USE_SODIUM_EXTRA_CULLING", SodiumExtra.useSodiumExtraCulling()) .add(ShaderType.FRAGMENT, "voxy:chunkoutline/outline.fsh") .compile() .ubo(0, this.uniformBuffer) diff --git a/src/main/resources/assets/voxy/shaders/chunkoutline/outline.vsh b/src/main/resources/assets/voxy/shaders/chunkoutline/outline.vsh index a4c9b48c..8994eb14 100644 --- a/src/main/resources/assets/voxy/shaders/chunkoutline/outline.vsh +++ b/src/main/resources/assets/voxy/shaders/chunkoutline/outline.vsh @@ -15,18 +15,9 @@ ivec3 unpackPos(ivec2 pos) { } bool shouldRender(ivec3 icorner) { - #ifdef USE_SODIUM_EXTRA_CULLING - #define MIN 0 - #define MAX 16 - #else - #define MIN 1 - #define MAX 17 - #endif vec3 corner = vec3(mix(mix(ivec3(0), icorner-MIN, greaterThan(icorner-MIN, ivec3(0))), icorner+MAX, lessThan(icorner+MAX, ivec3(0))))-negInnerSec.xyz; bool visible = (corner.x*corner.x + corner.z*corner.z) < (negInnerSec.w*negInnerSec.w); - #ifndef USE_SODIUM_EXTRA_CULLING visible = visible && abs(corner.y) < negInnerSec.w; - #endif return visible; }