From a89d2c67dcc2844b65b074993655554f8a5f66ed Mon Sep 17 00:00:00 2001 From: senseiwells Date: Sun, 5 Jan 2025 00:11:35 +0000 Subject: [PATCH] Fix remapping issue --- build.gradle.kts | 5 ++--- .../mixins/compat/sodium/DefaultFluidRenderMixin.java | 11 ++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 17b91dcb..49077233 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ repositories { maven("https://jitpack.io") } -val modVersion = "2.1.0" +val modVersion = "2.1.1" val releaseVersion = "${modVersion}+${libs.versions.minecraft.get()}" version = releaseVersion group = "me.senseiwells" @@ -71,8 +71,7 @@ tasks { publishMods { file = remapJar.get().archiveFile changelog = """ - - Fixed highlight liquids not working with sodium - - Fixed error with carpet client + - Fixed remapping issue causing a crash when opening a world """.trimIndent() type = STABLE modLoaders.add("fabric") diff --git a/src/main/java/me/senseiwells/essential_client/mixins/compat/sodium/DefaultFluidRenderMixin.java b/src/main/java/me/senseiwells/essential_client/mixins/compat/sodium/DefaultFluidRenderMixin.java index b01110d5..6f867642 100644 --- a/src/main/java/me/senseiwells/essential_client/mixins/compat/sodium/DefaultFluidRenderMixin.java +++ b/src/main/java/me/senseiwells/essential_client/mixins/compat/sodium/DefaultFluidRenderMixin.java @@ -37,13 +37,13 @@ import java.util.Arrays; import java.util.List; -@Mixin(value = DefaultFluidRenderer.class, remap = false) +@Mixin(DefaultFluidRenderer.class) public abstract class DefaultFluidRenderMixin { @Unique private final ModelQuadViewMutable highlightQuad = new ModelQuad(); - @Shadow @Final private float[] brightness; + @Shadow(remap = false) @Final private float[] brightness; - @Shadow @Final private int[] quadColors; + @Shadow(remap = false) @Final private int[] quadColors; @Shadow protected abstract boolean isSideExposed(BlockAndTintGetter world, int x, int y, int z, Direction dir, float height); @@ -129,7 +129,8 @@ private boolean shouldCullFace( at = @At( value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/pipeline/DefaultFluidRenderer;setVertex(Lnet/caffeinemc/mods/sodium/client/model/quad/ModelQuadViewMutable;IFFFFF)V" - ) + ), + remap = false ) private boolean onVertex( ModelQuadViewMutable quad, @@ -189,7 +190,7 @@ private void onWriteQuad( method = "render", at = @At( value = "INVOKE", - target = "Lnet/minecraft/core/Direction;getAxis()Lnet/minecraft/core/Direction$Axis;" + target = "Lnet/caffeinemc/mods/sodium/client/model/quad/properties/ModelQuadFacing;fromDirection(Lnet/minecraft/core/Direction;)Lnet/caffeinemc/mods/sodium/client/model/quad/properties/ModelQuadFacing;" ) ) private void onAxis(