From 4f9334c1ddd6d6abb4aea20ae141453f127cf534 Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Tue, 22 Jan 2019 13:58:06 +0100 Subject: [PATCH 1/6] fix tab complete --- .../protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java index ea62045a..8de399a4 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java @@ -157,7 +157,7 @@ public class PlayerPacket1_13 extends Rewriter { String match = wrapper.read(Type.STRING); wrapper.write(Type.STRING, (start == 0 ? "/" : "") + match); // Ignore tooltip - wrapper.read(Type.OPTIONAL_CHAT); + if (wrapper.read(Type.BOOLEAN)) wrapper.read(Type.STRING); } } }); From e5a110f24f78d57e6a28c9615797e235fc3d7b3d Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Tue, 22 Jan 2019 15:42:09 +0100 Subject: [PATCH 2/6] fix mapping issue --- .../protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java index cb57be17..7992037e 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java @@ -182,8 +182,8 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol { public static int getNewBlockStateId(int blockId) { if (blockId > 8590) { blockId -= 17; - } else if (blockId > 8573) { - blockId = 0; //TODO replace new blocks + } else if (blockId > 8588) { + blockId = 8573; } else if (blockId > 8479) { blockId -= 16; } else if (blockId > 8469 && blockId % 2 == 0) { From 7b9cde99469a2746b26026bd858ad594edd4d7fc Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Tue, 22 Jan 2019 21:25:53 +0100 Subject: [PATCH 3/6] fix wrong protocol --- .../protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java index cb13e8aa..8450fd9e 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java @@ -17,7 +17,6 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.remapper.ValueTransformer; import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.packets.State; -import us.myles.ViaVersion.protocols.protocol1_11to1_10.Protocol1_11To1_10; public class PlayerPackets1_11 { private static final ValueTransformer toNewFloat = new ValueTransformer(Type.FLOAT) { @@ -48,7 +47,7 @@ public class PlayerPackets1_11 { actionbar.write(Type.STRING, wrapper.read(Type.STRING)); actionbar.write(Type.BYTE, (byte) 2); // Above hotbar - actionbar.send(Protocol1_11To1_10.class); + actionbar.send(Protocol1_10To1_11.class); wrapper.cancel(); // Cancel the title packet return; From 8519ad8cf15d27bea2580bbf70e7ed8f3afdc84c Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Tue, 22 Jan 2019 21:41:49 +0100 Subject: [PATCH 4/6] fix actionbar color --- .../protocol1_10to1_11/packets/PlayerPackets1_11.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java index 8450fd9e..bde99336 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java @@ -17,6 +17,7 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.remapper.ValueTransformer; import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.packets.State; +import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter; public class PlayerPackets1_11 { private static final ValueTransformer toNewFloat = new ValueTransformer(Type.FLOAT) { @@ -44,7 +45,10 @@ public class PlayerPackets1_11 { if (action == 2) { // Convert to the old actionbar way PacketWrapper actionbar = new PacketWrapper(0x0F, null, wrapper.user()); // Chat Message packet - actionbar.write(Type.STRING, wrapper.read(Type.STRING)); + String msg = wrapper.read(Type.STRING); + msg = ChatRewriter.jsonTextToLegacy(msg); + msg = "{\"text\":\"" + msg + "\"}"; + actionbar.write(Type.STRING, msg); actionbar.write(Type.BYTE, (byte) 2); // Above hotbar actionbar.send(Protocol1_10To1_11.class); From 22a486752ba9e395bdae201ddb3f462e0ec4b2b8 Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Tue, 22 Jan 2019 21:49:17 +0100 Subject: [PATCH 5/6] remove sysout --- .../protocol1_12_2to1_13/packets/PlayerPacket1_13.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java index 8de399a4..06361308 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java @@ -203,13 +203,9 @@ public class PlayerPacket1_13 extends Rewriter { if (channel.equals("MC|BSign") || channel.equals("MC|BEdit")) { wrapper.setId(0x0B); Item book = wrapper.read(Type.ITEM); - System.out.println(book); BlockItemPackets1_13.toServer(book); - System.out.println(book); wrapper.write(Type.FLAT_ITEM, book); boolean signing = channel.equals("MC|BSign"); - System.out.println(channel); - System.out.println(signing); wrapper.write(Type.BOOLEAN, signing); } else if (channel.equals("MC|ItemName")) { wrapper.setId(0x1C); From 42bfe19c9cf90dcb814c8ceffe00be7bd4dc8aa5 Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Tue, 22 Jan 2019 22:37:24 +0100 Subject: [PATCH 6/6] block action block ids --- .../packets/BlockItemPackets1_13.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java index f153af26..18ec26bf 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java @@ -60,6 +60,46 @@ public class BlockItemPackets1_13 extends Rewriter { @Override protected void registerPackets(Protocol1_12_2To1_13 protocol) { + // Block Action + protocol.out(State.PLAY, 0x0A, 0x0A, new PacketRemapper() { + @Override + public void registerMap() { + map(Type.POSITION); // Location + map(Type.UNSIGNED_BYTE); // Action Id + map(Type.UNSIGNED_BYTE); // Action param + map(Type.VAR_INT); // Block Id - /!\ NOT BLOCK STATE ID + handler(new PacketHandler() { + @Override + public void handle(PacketWrapper wrapper) throws Exception { + int blockId = wrapper.get(Type.VAR_INT, 0); + + if (blockId == 73) + blockId = 25; + else if (blockId == 99) + blockId = 33; + else if (blockId == 92) + blockId = 29; + else if (blockId == 142) + blockId = 54; + else if (blockId == 305) + blockId = 146; + else if (blockId == 249) + blockId = 130; + else if (blockId == 257) + blockId = 138; + else if (blockId == 140) + blockId = 52; + else if (blockId == 472) + blockId = 209; + else if (blockId >= 483 && blockId <= 498) + blockId = blockId - 483 + 219; + + wrapper.set(Type.VAR_INT, 0, blockId); + } + }); + } + }); + // Update Block Entity protocol.out(State.PLAY, 0x09, 0x09, new PacketRemapper() { @Override