add Support 1.13.2 to 1.13.1

little particle fix for 1.13.1 to 1.13

core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java

@@ -17,6 +17,7 @@ import nl.matsv.viabackwards.protocol.protocol1_12_1to1_12_2.Protocol1_12_1To1_1
 import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13;
 import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
 import nl.matsv.viabackwards.protocol.protocol1_12to1_12_1.Protocol1_12To1_12_1;
+import nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.Protocol1_13_1To1_13_2;
 import nl.matsv.viabackwards.protocol.protocol1_13to1_13_1.Protocol1_13To1_13_1;
 import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10;
 import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
@@ -40,8 +41,9 @@ public interface ViaBackwardsPlatform {
             ProtocolRegistry.registerProtocol(new Protocol1_11_1To1_12(), Collections.singletonList(ProtocolVersion.v1_11_1.getId()), ProtocolVersion.v1_12.getId());
             ProtocolRegistry.registerProtocol(new Protocol1_12To1_12_1(), Collections.singletonList(ProtocolVersion.v1_12.getId()), ProtocolVersion.v1_12_1.getId());
             ProtocolRegistry.registerProtocol(new Protocol1_12_1To1_12_2(), Collections.singletonList(ProtocolVersion.v1_12_1.getId()), ProtocolVersion.v1_12_2.getId());
-            ProtocolRegistry.registerProtocol(new Protocol1_13To1_13_1(), Collections.singletonList(ProtocolVersion.v1_13.getId()), ProtocolVersion.v1_13_1.getId())
+            ProtocolRegistry.registerProtocol(new Protocol1_12_2To1_13(), Collections.singletonList(ProtocolVersion.v1_12_2.getId()), ProtocolVersion.v1_13.getId());
-            ProtocolRegistry.registerProtocol(new Protocol1_12_2To1_13(), Collections.singletonList(ProtocolVersion.v1_12_2.getId()), ProtocolVersion.v1_13.getId())
+            ProtocolRegistry.registerProtocol(new Protocol1_13To1_13_1(), Collections.singletonList(ProtocolVersion.v1_13.getId()), ProtocolVersion.v1_13_1.getId());
+            ProtocolRegistry.registerProtocol(new Protocol1_13_1To1_13_2(), Collections.singletonList(ProtocolVersion.v1_13_1.getId()), ProtocolVersion.v1_13_2.getId());
         }
     }
 

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/Protocol1_13_1To1_13_2.java

@@ -0,0 +1,83 @@
+package nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2;
+
+import nl.matsv.viabackwards.api.BackwardsProtocol;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+import nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.packets.EntityPackets;
+import nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.packets.InventoryPackets;
+import nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.packets.WorldPackets;
+
+/**
+ * Created by Marco Neuhaus on 12.11.2018 for the Project ViaBackwards.
+ */
+public class Protocol1_13_1To1_13_2 extends BackwardsProtocol {
+
+    @Override
+    protected void registerPackets() {
+        InventoryPackets.register(this);
+        WorldPackets.register(this);
+        EntityPackets.register(this);
+
+        //Edit Book
+        registerIncoming(State.PLAY, 0x0B, 0x0B, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.FLAT_VAR_INT_ITEM, Type.FLAT_ITEM);
+                map(Type.BOOLEAN);
+            }
+        });
+
+        // Advancements
+        registerOutgoing(State.PLAY, 0x51, 0x51, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.passthrough(Type.BOOLEAN); // Reset/clear
+                        int size = wrapper.passthrough(Type.VAR_INT); // Mapping size
+
+                        for (int i = 0; i < size; i++) {
+                            wrapper.passthrough(Type.STRING); // Identifier
+
+                            // Parent
+                            if (wrapper.passthrough(Type.BOOLEAN))
+                                wrapper.passthrough(Type.STRING);
+
+                            // Display data
+                            if (wrapper.passthrough(Type.BOOLEAN)) {
+                                wrapper.passthrough(Type.STRING); // Title
+                                wrapper.passthrough(Type.STRING); // Description
+                                Item icon = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                                wrapper.write(Type.FLAT_ITEM, icon);
+                                wrapper.passthrough(Type.VAR_INT); // Frame type
+                                int flags = wrapper.passthrough(Type.INT); // Flags
+                                if ((flags & 1) != 0)
+                                    wrapper.passthrough(Type.STRING); // Background texture
+                                wrapper.passthrough(Type.FLOAT); // X
+                                wrapper.passthrough(Type.FLOAT); // Y
+                            }
+
+                            wrapper.passthrough(Type.STRING_ARRAY); // Criteria
+
+                            int arrayLength = wrapper.passthrough(Type.VAR_INT);
+                            for (int array = 0; array < arrayLength; array++) {
+                                wrapper.passthrough(Type.STRING_ARRAY); // String array
+                            }
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    public void init(UserConnection userConnection) {
+
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/EntityPackets.java

@@ -0,0 +1,101 @@
+package nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.packets;
+
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_13;
+import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_13_2;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_13;
+import us.myles.ViaVersion.api.type.types.version.Types1_13_2;
+import us.myles.ViaVersion.packets.State;
+
+/**
+ * Created by Marco Neuhaus on 12.11.2018 for the Project ViaBackwards.
+ */
+public class EntityPackets {
+
+
+    public static void register(Protocol protocol) {
+        // Spawn mob packet
+        protocol.registerOutgoing(State.PLAY, 0x3, 0x3, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.UUID); // 1 - Entity UUID
+                map(Type.VAR_INT); // 2 - Entity Type
+                map(Type.DOUBLE); // 3 - X
+                map(Type.DOUBLE); // 4 - Y
+                map(Type.DOUBLE); // 5 - Z
+                map(Type.BYTE); // 6 - Yaw
+                map(Type.BYTE); // 7 - Pitch
+                map(Type.BYTE); // 8 - Head Pitch
+                map(Type.SHORT); // 9 - Velocity X
+                map(Type.SHORT); // 10 - Velocity Y
+                map(Type.SHORT); // 11 - Velocity Z
+                map(Types1_13_2.METADATA_LIST, Types1_13.METADATA_LIST); // 12 - Metadata
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        for (Metadata metadata : wrapper.get(Types1_13.METADATA_LIST, 0)) {
+                            if (metadata.getMetaType() == MetaType1_13_2.Slot) {
+                                metadata.setMetaType(MetaType1_13.Slot);
+                            }
+                        }
+                    }
+                });
+            }
+        });
+
+        // Spawn player packet
+        protocol.registerOutgoing(State.PLAY, 0x05, 0x05, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.UUID); // 1 - Player UUID
+                map(Type.DOUBLE); // 2 - X
+                map(Type.DOUBLE); // 3 - Y
+                map(Type.DOUBLE); // 4 - Z
+                map(Type.BYTE); // 5 - Yaw
+                map(Type.BYTE); // 6 - Pitch
+                map(Types1_13_2.METADATA_LIST, Types1_13.METADATA_LIST); // 7 - Metadata
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        for (Metadata metadata : wrapper.get(Types1_13.METADATA_LIST, 0)) {
+                            if (metadata.getMetaType() == MetaType1_13_2.Slot) {
+                                metadata.setMetaType(MetaType1_13.Slot);
+                            }
+                        }
+                    }
+                });
+            }
+        });
+
+
+        // Metadata packet
+        protocol.registerOutgoing(State.PLAY, 0x3F, 0x3F, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Types1_13_2.METADATA_LIST, Types1_13.METADATA_LIST); // 1 - Metadata list
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        for (Metadata metadata : wrapper.get(Types1_13.METADATA_LIST, 0)) {
+                            if (metadata.getMetaType() == MetaType1_13_2.Slot) {
+                                metadata.setMetaType(MetaType1_13.Slot);
+                            }
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/InventoryPackets.java

@@ -0,0 +1,154 @@
+package nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.packets;
+
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+
+/**
+ * Created by Marco Neuhaus on 12.11.2018 for the Project ViaBackwards.
+ */
+public class InventoryPackets {
+
+    public static void register(Protocol protocol) {
+
+		/*
+            Outgoing packets
+        */
+
+        // Set slot packet
+        protocol.registerOutgoing(State.PLAY, 0x17, 0x17, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.BYTE); // 0 - Window ID
+                map(Type.SHORT); // 1 - Slot ID
+                map(Type.FLAT_VAR_INT_ITEM, Type.FLAT_ITEM); // 2 - Slot Value
+            }
+        });
+
+        // Window items packet
+        protocol.registerOutgoing(State.PLAY, 0x15, 0x15, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                map(Type.FLAT_VAR_INT_ITEM_ARRAY, Type.FLAT_ITEM_ARRAY); // 1 - Window Values
+            }
+        });
+
+        // Plugin message
+        protocol.registerOutgoing(State.PLAY, 0x19, 0x19, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // Channel
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        String channel = wrapper.get(Type.STRING, 0);
+                        if (channel.equals("minecraft:trader_list") || channel.equals("trader_list")) {
+                            wrapper.passthrough(Type.INT); // Passthrough Window ID
+
+                            int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
+                            for (int i = 0; i < size; i++) {
+                                // Input Item
+                                wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                                // Output Item
+                                wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+
+                                boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
+                                if (secondItem) {
+                                    wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                                }
+
+                                wrapper.passthrough(Type.BOOLEAN); // Trade disabled
+                                wrapper.passthrough(Type.INT); // Number of tools uses
+                                wrapper.passthrough(Type.INT); // Maximum number of trade uses
+                            }
+                        }
+                    }
+                });
+            }
+        });
+
+        // Entity Equipment Packet
+        protocol.registerOutgoing(State.PLAY, 0x42, 0x42, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.VAR_INT); // 1 - Slot ID
+                map(Type.FLAT_VAR_INT_ITEM, Type.FLAT_ITEM); // 2 - Item
+            }
+        });
+
+        //        // Declare Recipes
+        protocol.registerOutgoing(State.PLAY, 0x54, 0x54, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int recipesNo = wrapper.passthrough(Type.VAR_INT);
+                        for (int i = 0; i < recipesNo; i++) {
+                            wrapper.passthrough(Type.STRING); // Id
+                            String type = wrapper.passthrough(Type.STRING);
+                            if (type.equals("crafting_shapeless")) {
+                                wrapper.passthrough(Type.STRING); // Group
+                                int ingredientsNo = wrapper.passthrough(Type.VAR_INT);
+                                for (int i1 = 0; i1 < ingredientsNo; i1++) {
+                                    wrapper.write(Type.FLAT_ITEM_ARRAY_VAR_INT, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
+                                }
+                                wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                            } else if (type.equals("crafting_shaped")) {
+                                int ingredientsNo = wrapper.passthrough(Type.VAR_INT) * wrapper.passthrough(Type.VAR_INT);
+                                wrapper.passthrough(Type.STRING); // Group
+                                for (int i1 = 0; i1 < ingredientsNo; i1++) {
+                                    wrapper.write(Type.FLAT_ITEM_ARRAY_VAR_INT, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
+                                }
+                                wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                            } else if (type.equals("smelting")) {
+                                wrapper.passthrough(Type.STRING); // Group
+                                // Ingredient start
+                                wrapper.write(Type.FLAT_ITEM_ARRAY_VAR_INT, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
+                                // Ingredient end
+                                wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                                wrapper.passthrough(Type.FLOAT); // EXP
+                                wrapper.passthrough(Type.VAR_INT); // Cooking time
+                            }
+                        }
+                    }
+                });
+            }
+        });
+
+
+        /*
+            Incoming packets
+         */
+
+        // Click window packet
+        protocol.registerIncoming(State.PLAY, 0x08, 0x08, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                        map(Type.SHORT); // 1 - Slot
+                        map(Type.BYTE); // 2 - Button
+                        map(Type.SHORT); // 3 - Action number
+                        map(Type.VAR_INT); // 4 - Mode
+                        map(Type.FLAT_ITEM, Type.FLAT_VAR_INT_ITEM); // 5 - Clicked Item
+                    }
+                }
+        );
+
+        // Creative Inventory Action
+        protocol.registerIncoming(State.PLAY, 0x24, 0x24, new PacketRemapper() {
+                    @Override
+                    public void registerMap() {
+                        map(Type.SHORT); // 0 - Slot
+                        map(Type.FLAT_ITEM, Type.FLAT_VAR_INT_ITEM); // 1 - Clicked Item
+                    }
+                }
+        );
+    }
+
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/WorldPackets.java

@@ -0,0 +1,42 @@
+package nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.packets;
+
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+
+/**
+ * Created by Marco Neuhaus on 12.11.2018 for the Project ViaBackwards.
+ */
+public class WorldPackets {
+
+    public static void register(Protocol protocol) {
+        //spawn particle
+        protocol.registerOutgoing(State.PLAY, 0x24, 0x24, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Particle ID
+                map(Type.BOOLEAN); // 1 - Long Distance
+                map(Type.FLOAT); // 2 - X
+                map(Type.FLOAT); // 3 - Y
+                map(Type.FLOAT); // 4 - Z
+                map(Type.FLOAT); // 5 - Offset X
+                map(Type.FLOAT); // 6 - Offset Y
+                map(Type.FLOAT); // 7 - Offset Z
+                map(Type.FLOAT); // 8 - Particle Data
+                map(Type.INT); // 9 - Particle Count
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int id = wrapper.get(Type.INT, 0);
+                        if (id == 27) {
+                            wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                        }
+                    }
+                });
+            }
+        });
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets.java

@@ -175,6 +175,8 @@ public class WorldPackets {
                         if(id == 3 || id == 20){
                             int data = wrapper.passthrough(Type.VAR_INT);
                             wrapper.set(Type.VAR_INT, 0, Protocol1_13To1_13_1.getNewBlockStateId(data));
+                        } else if (id == 27) {
+                            InventoryPackets.toClient(wrapper.passthrough(Type.FLAT_ITEM));
                         }
                     }
                 });