Skip to content

Commit 3f0f275

Browse files
committed
fix mixin remapping warnings
1 parent ff303f5 commit 3f0f275

File tree

4 files changed

+48
-27
lines changed

4 files changed

+48
-27
lines changed

src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S21PacketChunkDataMixin.java

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,36 @@
4444
@Mixin(S21PacketChunkData.class)
4545
public abstract class S21PacketChunkDataMixin {
4646

47-
@Shadow(aliases = "field_149286_i")
47+
@Shadow(aliases = "field_149286_i",
48+
remap = false)
4849
private static byte[] buffer;
49-
@Shadow
50+
@Shadow(remap = false)
5051
private Semaphore deflateGate;
51-
@Shadow(aliases = "field_149284_a")
52+
@Shadow(aliases = "field_149284_a",
53+
remap = false)
5254
private int xPosition;
53-
@Shadow(aliases = "field_149282_b")
55+
@Shadow(aliases = "field_149282_b",
56+
remap = false)
5457
private int zPosition;
55-
@Shadow(aliases = "field_149283_c")
58+
@Shadow(aliases = "field_149283_c",
59+
remap = false)
5660
private int subChunkMask;
57-
@Shadow(aliases = "field_149281_e")
61+
@Shadow(aliases = "field_149281_e",
62+
remap = false)
5863
private byte[] deflatedData;
59-
@Shadow(aliases = "field_149278_f")
64+
@Shadow(aliases = "field_149278_f",
65+
remap = false)
6066
private byte[] data;
61-
@Shadow(aliases = "field_149279_g")
67+
@Shadow(aliases = "field_149279_g",
68+
remap = false)
6269
private boolean forceUpdate;
63-
@Shadow(aliases = "field_149285_h")
70+
@Shadow(aliases = "field_149285_h",
71+
remap = false)
6472
private int deflatedSize;
6573

74+
@Shadow(remap = false)
75+
protected abstract void deflate();
76+
6677

6778
/**
6879
* @author FalsePattern
@@ -103,9 +114,6 @@ public static S21PacketChunkData.Extracted func_149269_a(Chunk chunk, boolean fo
103114
return extracted;
104115
}
105116

106-
@Shadow
107-
protected abstract void deflate();
108-
109117
/**
110118
* @author FalsePattern
111119
* @reason Replace functionality

src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S22PacketMultiBlockChangeMixin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050

5151
@Mixin(S22PacketMultiBlockChange.class)
5252
public abstract class S22PacketMultiBlockChangeMixin implements CustomPacketMultiBlockChange {
53-
@Shadow(aliases = "field_148925_b")
53+
@Shadow(aliases = "field_148925_b",
54+
remap = false)
5455
private ChunkCoordIntPair coord;
5556

5657
private S23PacketBlockChange[] subPackets;

src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S23PacketBlockChangeMixin.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,14 @@
4747

4848
@Mixin(S23PacketBlockChange.class)
4949
public abstract class S23PacketBlockChangeMixin implements CustomPacketBlockChange {
50-
@Shadow(aliases = "field_148887_a")
50+
@Shadow(aliases = "field_148887_a",
51+
remap = false)
5152
private int xCoord;
52-
@Shadow(aliases = "field_148885_b")
53+
@Shadow(aliases = "field_148885_b",
54+
remap = false)
5355
private int yCoord;
54-
@Shadow(aliases = "field_148886_c")
56+
@Shadow(aliases = "field_148886_c",
57+
remap = false)
5558
private int zCoord;
5659

5760
@Shadow public Block field_148883_d;

src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S26PacketMapChunkBulkMixin.java

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,28 +41,37 @@
4141

4242
@Mixin(S26PacketMapChunkBulk.class)
4343
public abstract class S26PacketMapChunkBulkMixin {
44-
@Shadow(aliases = "field_149268_i")
44+
@Shadow(aliases = "field_149268_i",
45+
remap = false)
4546
private static byte[] inflaterBuffer;
46-
@Shadow(aliases = "field_149263_e")
47+
@Shadow(aliases = "field_149263_e",
48+
remap = false)
4749
private byte[] deflatedData;
48-
@Shadow
50+
@Shadow(remap = false)
4951
private Semaphore deflateGate;
50-
@Shadow(aliases = "field_149266_a")
52+
@Shadow(aliases = "field_149266_a",
53+
remap = false)
5154
private int[] xPositions;
52-
@Shadow(aliases = "field_149264_b")
55+
@Shadow(aliases = "field_149264_b",
56+
remap = false)
5357
private int[] zPositions;
54-
@Shadow(aliases = "field_149265_c")
58+
@Shadow(aliases = "field_149265_c",
59+
remap = false)
5560
private int[] subChunkMasks;
56-
@Shadow(aliases = "field_149262_d")
61+
@Shadow(aliases = "field_149262_d",
62+
remap = false)
5763
private int[] subChunkMSBMasks;
58-
@Shadow(aliases = "field_149261_g")
64+
@Shadow(aliases = "field_149261_g",
65+
remap = false)
5966
private int deflatedSize;
60-
@Shadow(aliases = "field_149267_h")
67+
@Shadow(aliases = "field_149267_h",
68+
remap = false)
6169
private boolean skylight;
62-
@Shadow(aliases = "field_149260_f")
70+
@Shadow(aliases = "field_149260_f",
71+
remap = false)
6372
private byte[][] datas;
6473

65-
@Shadow
74+
@Shadow(remap = false)
6675
protected abstract void deflate();
6776

6877
/**

0 commit comments

Comments
 (0)