From ed04e218619010f6b190cbac37aa832a711181c4 Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Tue, 2 Sep 2025 02:12:41 +1000 Subject: [PATCH] Version bump, fix dh impersonation uniform, add 4 more colourtexs to iris --- gradle.properties | 2 +- .../cortex/voxy/client/iris/VoxyUniforms.java | 2 +- .../iris/MixinPackRenderTargetDirectives.java | 22 +++++++++++++++++++ src/main/resources/client.voxy.mixins.json | 1 + 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 src/main/java/me/cortex/voxy/client/mixin/iris/MixinPackRenderTargetDirectives.java diff --git a/gradle.properties b/gradle.properties index 8ef6d33e..d003c05b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ loom_version=1.11-SNAPSHOT fabric_version=0.129.0+1.21.8 # Mod Properties -mod_version = 0.2.4-alpha +mod_version = 0.2.5-alpha maven_group = me.cortex archives_base_name = voxy \ No newline at end of file diff --git a/src/main/java/me/cortex/voxy/client/iris/VoxyUniforms.java b/src/main/java/me/cortex/voxy/client/iris/VoxyUniforms.java index 816c943a..c55ada7b 100644 --- a/src/main/java/me/cortex/voxy/client/iris/VoxyUniforms.java +++ b/src/main/java/me/cortex/voxy/client/iris/VoxyUniforms.java @@ -62,7 +62,7 @@ public class VoxyUniforms { .uniform1f(PER_FRAME, "dhNearPlane", ()->16)//Presently hardcoded in voxy .uniform1f(PER_FRAME, "dhFarPlane", ()->16*3000)//Presently hardcoded in voxy - .uniform1i(PER_FRAME, "dhRenderDistance", ()-> VoxyConfig.CONFIG.sectionRenderDistance*32)//In chunks + .uniform1i(PER_FRAME, "dhRenderDistance", ()-> VoxyConfig.CONFIG.sectionRenderDistance*32*16)//In blocks .uniformMatrix(PER_FRAME, "dhProjection", VoxyUniforms::getProjection) .uniformMatrix(PER_FRAME, "dhProjectionInverse", new Inverted(VoxyUniforms::getProjection)) .uniformMatrix(PER_FRAME, "dhPreviousProjection", new PreviousMat(VoxyUniforms::getProjection)); diff --git a/src/main/java/me/cortex/voxy/client/mixin/iris/MixinPackRenderTargetDirectives.java b/src/main/java/me/cortex/voxy/client/mixin/iris/MixinPackRenderTargetDirectives.java new file mode 100644 index 00000000..4d425a5c --- /dev/null +++ b/src/main/java/me/cortex/voxy/client/mixin/iris/MixinPackRenderTargetDirectives.java @@ -0,0 +1,22 @@ +package me.cortex.voxy.client.mixin.iris; + +import com.google.common.collect.ImmutableSet; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import net.irisshaders.iris.shaderpack.properties.PackRenderTargetDirectives; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Set; + +@Mixin(value = PackRenderTargetDirectives.class, remap = false) +public class MixinPackRenderTargetDirectives { + @Redirect(method = "", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableSet$Builder;build()Lcom/google/common/collect/ImmutableSet;")) + private static ImmutableSet voxy$injectExtraColourTex(ImmutableSet.Builder builder) { + for (int i = 16; i < 20; i++) { + builder.add(i); + } + return builder.build(); + } +} diff --git a/src/main/resources/client.voxy.mixins.json b/src/main/resources/client.voxy.mixins.json index eb766dbc..63896bb9 100644 --- a/src/main/resources/client.voxy.mixins.json +++ b/src/main/resources/client.voxy.mixins.json @@ -3,6 +3,7 @@ "package": "me.cortex.voxy.client.mixin", "compatibilityLevel": "JAVA_17", "client": [ + "iris.MixinPackRenderTargetDirectives", "iris.CustomUniformsAccessor", "iris.IrisRenderingPipelineAccessor", "iris.MixinIrisRenderingPipeline",