From 75685d57d6911a7e6fa93629d534a9a1c6946b4a Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Sat, 26 Apr 2025 21:32:09 +1000 Subject: [PATCH] work --- .../core/rendering/building/RenderDataFactory45.java | 11 +++++------ .../client/mixin/sodium/MixinSodiumOptionsGUI.java | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory45.java b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory45.java index 25cc977c..927f1bf4 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory45.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory45.java @@ -363,15 +363,14 @@ public class RenderDataFactory45 { { int idx = index + (pidx*32); - - //TODO: swap this out for something not getting the next entry - long A = this.sectionData[idx * 2]; - long B = this.sectionData[(idx + skipAmount * 32) * 2]; + int shift = skipAmount * 32; //Flip data with respect to facing direction - long selfModel = facingForward == 1 ? A : B; - long nextModel = facingForward == 1 ? B : A; + int iA = idx * 2 + (facingForward == 1 ? 0 : shift); + int iB = idx * 2 + (facingForward == 1 ? shift : 0); + long selfModel = this.sectionData[iA]; + long nextModel = this.sectionData[iB]; this.blockMesher.putNext(((long) facingForward) |//Facing selfModel | diff --git a/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinSodiumOptionsGUI.java b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinSodiumOptionsGUI.java index 2faeb946..9d331792 100644 --- a/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinSodiumOptionsGUI.java +++ b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinSodiumOptionsGUI.java @@ -15,7 +15,7 @@ import java.util.List; @Mixin(SodiumOptionsGUI.class) public class MixinSodiumOptionsGUI { - @Shadow @Final private List pages; + @Shadow(remap = false) @Final private List pages; @Inject(method = "", at = @At("TAIL")) private void voxy$addConfigPage(Screen prevScreen, CallbackInfo ci) {