From 3f0f275920fc3421f983ea444661b7507b971c8a Mon Sep 17 00:00:00 2001 From: FalsePattern Date: Tue, 6 May 2025 20:37:27 +0200 Subject: [PATCH] fix mixin remapping warnings --- .../vanilla/S21PacketChunkDataMixin.java | 32 ++++++++++++------- .../S22PacketMultiBlockChangeMixin.java | 3 +- .../vanilla/S23PacketBlockChangeMixin.java | 9 ++++-- .../vanilla/S26PacketMapChunkBulkMixin.java | 31 +++++++++++------- 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S21PacketChunkDataMixin.java b/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S21PacketChunkDataMixin.java index d1707c2..dd64959 100644 --- a/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S21PacketChunkDataMixin.java +++ b/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S21PacketChunkDataMixin.java @@ -44,25 +44,36 @@ import java.util.zip.Inflater; @Mixin(S21PacketChunkData.class) public abstract class S21PacketChunkDataMixin { - @Shadow(aliases = "field_149286_i") + @Shadow(aliases = "field_149286_i", + remap = false) private static byte[] buffer; - @Shadow + @Shadow(remap = false) private Semaphore deflateGate; - @Shadow(aliases = "field_149284_a") + @Shadow(aliases = "field_149284_a", + remap = false) private int xPosition; - @Shadow(aliases = "field_149282_b") + @Shadow(aliases = "field_149282_b", + remap = false) private int zPosition; - @Shadow(aliases = "field_149283_c") + @Shadow(aliases = "field_149283_c", + remap = false) private int subChunkMask; - @Shadow(aliases = "field_149281_e") + @Shadow(aliases = "field_149281_e", + remap = false) private byte[] deflatedData; - @Shadow(aliases = "field_149278_f") + @Shadow(aliases = "field_149278_f", + remap = false) private byte[] data; - @Shadow(aliases = "field_149279_g") + @Shadow(aliases = "field_149279_g", + remap = false) private boolean forceUpdate; - @Shadow(aliases = "field_149285_h") + @Shadow(aliases = "field_149285_h", + remap = false) private int deflatedSize; + @Shadow(remap = false) + protected abstract void deflate(); + /** * @author FalsePattern @@ -103,9 +114,6 @@ public abstract class S21PacketChunkDataMixin { return extracted; } - @Shadow - protected abstract void deflate(); - /** * @author FalsePattern * @reason Replace functionality diff --git a/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S22PacketMultiBlockChangeMixin.java b/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S22PacketMultiBlockChangeMixin.java index d262399..1b05163 100644 --- a/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S22PacketMultiBlockChangeMixin.java +++ b/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S22PacketMultiBlockChangeMixin.java @@ -50,7 +50,8 @@ import java.io.IOException; @Mixin(S22PacketMultiBlockChange.class) public abstract class S22PacketMultiBlockChangeMixin implements CustomPacketMultiBlockChange { - @Shadow(aliases = "field_148925_b") + @Shadow(aliases = "field_148925_b", + remap = false) private ChunkCoordIntPair coord; private S23PacketBlockChange[] subPackets; diff --git a/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S23PacketBlockChangeMixin.java b/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S23PacketBlockChangeMixin.java index 95813a2..1147d09 100644 --- a/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S23PacketBlockChangeMixin.java +++ b/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S23PacketBlockChangeMixin.java @@ -47,11 +47,14 @@ import java.io.IOException; @Mixin(S23PacketBlockChange.class) public abstract class S23PacketBlockChangeMixin implements CustomPacketBlockChange { - @Shadow(aliases = "field_148887_a") + @Shadow(aliases = "field_148887_a", + remap = false) private int xCoord; - @Shadow(aliases = "field_148885_b") + @Shadow(aliases = "field_148885_b", + remap = false) private int yCoord; - @Shadow(aliases = "field_148886_c") + @Shadow(aliases = "field_148886_c", + remap = false) private int zCoord; @Shadow public Block field_148883_d; diff --git a/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S26PacketMapChunkBulkMixin.java b/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S26PacketMapChunkBulkMixin.java index 8df688d..c8bfa19 100644 --- a/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S26PacketMapChunkBulkMixin.java +++ b/src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S26PacketMapChunkBulkMixin.java @@ -41,28 +41,37 @@ import java.util.zip.Inflater; @Mixin(S26PacketMapChunkBulk.class) public abstract class S26PacketMapChunkBulkMixin { - @Shadow(aliases = "field_149268_i") + @Shadow(aliases = "field_149268_i", + remap = false) private static byte[] inflaterBuffer; - @Shadow(aliases = "field_149263_e") + @Shadow(aliases = "field_149263_e", + remap = false) private byte[] deflatedData; - @Shadow + @Shadow(remap = false) private Semaphore deflateGate; - @Shadow(aliases = "field_149266_a") + @Shadow(aliases = "field_149266_a", + remap = false) private int[] xPositions; - @Shadow(aliases = "field_149264_b") + @Shadow(aliases = "field_149264_b", + remap = false) private int[] zPositions; - @Shadow(aliases = "field_149265_c") + @Shadow(aliases = "field_149265_c", + remap = false) private int[] subChunkMasks; - @Shadow(aliases = "field_149262_d") + @Shadow(aliases = "field_149262_d", + remap = false) private int[] subChunkMSBMasks; - @Shadow(aliases = "field_149261_g") + @Shadow(aliases = "field_149261_g", + remap = false) private int deflatedSize; - @Shadow(aliases = "field_149267_h") + @Shadow(aliases = "field_149267_h", + remap = false) private boolean skylight; - @Shadow(aliases = "field_149260_f") + @Shadow(aliases = "field_149260_f", + remap = false) private byte[][] datas; - @Shadow + @Shadow(remap = false) protected abstract void deflate(); /**