From 751c585469feaed0726d462fc692582c55ed369a Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Mon, 22 Jul 2019 22:38:12 +0200 Subject: [PATCH 1/2] fix #122 --- .../protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java index 169e521e..d552243a 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java @@ -125,8 +125,8 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol { in(State.PLAY, 0x1B, 0x17, cancel()); // Recipe Book Data TODO MODIFIED in(State.PLAY, 0x1D, 0x18); // Resource Pack Status in(State.PLAY, 0x1E, 0x19); // Advancement Tab - in(State.PLAY, 0x1F, -1); // Select Trade - in(State.PLAY, 0x20, -1); // Set Beacon Effect + //in(State.PLAY, 0x1F, -1); // Select Trade (the client won't send this) + //in(State.PLAY, 0x20, -1); // Set Beacon Effect (the client won't send this) in(State.PLAY, 0x21, 0x1A); // Held Item Change (serverbound) in(State.PLAY, 0x26, 0x1C); // Update Sign in(State.PLAY, 0x27, 0x1D); // Animation (serverbound) From 66b7b461b763bd0c2f50932036457b3da6de8d8c Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Fri, 26 Jul 2019 10:53:53 +0200 Subject: [PATCH 2/2] use correct byte type in trade list packets --- .../protocol1_10to1_11/packets/BlockItemPackets1_11.java | 2 +- .../protocol1_11_1to1_12/packets/BlockItemPackets1_12.java | 2 +- .../protocol1_11to1_11_1/packets/ItemPackets1_11_1.java | 2 +- .../protocol1_9_4to1_10/packets/BlockItemPackets1_10.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java index 9945c7e1..5a626153 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java @@ -139,7 +139,7 @@ public class BlockItemPackets1_11 extends BlockItemRewriter if (wrapper.get(Type.STRING, 0).equalsIgnoreCase("MC|TrList")) { wrapper.passthrough(Type.INT); // Passthrough Window ID - int size = wrapper.passthrough(Type.BYTE); + int size = wrapper.passthrough(Type.UNSIGNED_BYTE); for (int i = 0; i < size; i++) { wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Input Item wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Output Item diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java index e297e819..b930597b 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java @@ -140,7 +140,7 @@ public class BlockItemPackets1_12 extends BlockItemRewriter { if (wrapper.get(Type.STRING, 0).equalsIgnoreCase("MC|TrList")) { wrapper.passthrough(Type.INT); // Passthrough Window ID - int size = wrapper.passthrough(Type.BYTE); + int size = wrapper.passthrough(Type.UNSIGNED_BYTE); for (int i = 0; i < size; i++) { wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Input Item wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Output Item diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java index 78673b34..e0b23f4e 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java @@ -96,7 +96,7 @@ public class BlockItemPackets1_10 extends BlockItemRewriter if (wrapper.get(Type.STRING, 0).equalsIgnoreCase("MC|TrList")) { wrapper.passthrough(Type.INT); // Passthrough Window ID - int size = wrapper.passthrough(Type.BYTE); + int size = wrapper.passthrough(Type.UNSIGNED_BYTE); for (int i = 0; i < size; i++) { wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Input Item wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Output Item