Merge branch 'upmaster' into dev

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/EntityIdRewriter.java

@@ -6,7 +6,7 @@ import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import us.myles.ViaVersion.api.minecraft.item.Item;
 
-public class ItemRewriter {
+public class EntityIdRewriter {
     private static BiMap<String, String> oldToNewNames = HashBiMap.create();
 
     static {
@@ -87,20 +87,32 @@ public class ItemRewriter {
         oldToNewNames.put("ZombieVillager", "minecraft:zombie_villager");
     }
 
-    public static void toClient(Item item) {
+    public static void toClient(CompoundTag tag) {
-        if (hasEntityTag(item)) {
+        if (tag.get("id") instanceof StringTag) {
-            CompoundTag entityTag = item.getTag().get("EntityTag");
+            StringTag id = tag.get("id");
-            if (entityTag.get("id") instanceof StringTag) {
-                StringTag id = entityTag.get("id");
             if (oldToNewNames.containsKey(id.getValue())) {
                 id.setValue(oldToNewNames.get(id.getValue()));
             }
         }
     }
+
+    public static void toClientSpawner(CompoundTag tag) {
+        if (tag != null && tag.contains("SpawnData")) {
+            CompoundTag spawnData = tag.get("SpawnData");
+            if (spawnData != null && spawnData.contains("id"))
+                toClient(spawnData);
+        }
+    }
+
+    public static void toClientItem(Item item) {
+        if (hasEntityTag(item)) {
+            CompoundTag entityTag = item.getTag().get("EntityTag");
+            toClient(entityTag);
+        }
         if (item != null && item.getAmount() <= 0) item.setAmount((byte) 1);
     }
 
-    public static void toServer(Item item) {
+    public static void toServerItem(Item item) {
         if (hasEntityTag(item)) {
             CompoundTag entityTag = item.getTag().get("EntityTag");
             if (entityTag.get("id") instanceof StringTag) {

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java

@@ -1,10 +1,13 @@
 package us.myles.ViaVersion.protocols.protocol1_11to1_10;
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.google.common.base.Optional;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.entities.Entity1_11Types;
+import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
 import us.myles.ViaVersion.api.protocol.Protocol;
 import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
@@ -15,6 +18,8 @@ import us.myles.ViaVersion.api.type.types.version.Types1_9;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocol1_11to1_10.packets.InventoryPackets;
 import us.myles.ViaVersion.protocols.protocol1_11to1_10.storage.EntityTracker;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
 public class Protocol1_11To1_10 extends Protocol {
     private static final ValueTransformer<Float, Short> toOldByte = new ValueTransformer<Float, Short>(Type.UNSIGNED_BYTE) {
@@ -243,6 +248,88 @@ public class Protocol1_11To1_10 extends Protocol {
             }
         });
 
+        // Update Block Entity
+        registerOutgoing(State.PLAY, 0x09, 0x09, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.POSITION); // 0 - Position
+                map(Type.UNSIGNED_BYTE); // 1 - Action
+                map(Type.NBT); // 2 - NBT data
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 1) {
+                            CompoundTag tag = wrapper.get(Type.NBT, 0);
+                            EntityIdRewriter.toClientSpawner(tag);
+                        }
+                    }
+                });
+            }
+        });
+
+        // Chunk Data
+        registerOutgoing(State.PLAY, 0x20, 0x20, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+
+                        Chunk1_9_3_4Type type = new Chunk1_9_3_4Type(clientWorld);
+                        Chunk chunk = wrapper.passthrough(type);
+
+                        if (chunk.getBlockEntities() == null) return;
+                        for (CompoundTag tag : chunk.getBlockEntities()) {
+                            if (tag.contains("id") &&
+                                    ((StringTag) tag.get("id")).getValue().equals("MobSpawner")) {
+                                EntityIdRewriter.toClientSpawner(tag);
+                            }
+                        }
+                    }
+                });
+            }
+        });
+
+        // Join (save dimension id)
+        registerOutgoing(State.PLAY, 0x23, 0x23, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Entity ID
+                map(Type.UNSIGNED_BYTE); // 1 - Gamemode
+                map(Type.INT); // 2 - Dimension
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ClientWorld clientChunks = wrapper.user().get(ClientWorld.class);
+
+                        int dimensionId = wrapper.get(Type.INT, 1);
+                        clientChunks.setEnvironment(dimensionId);
+                    }
+                });
+            }
+        });
+
+        // Respawn (save dimension id)
+        registerOutgoing(State.PLAY, 0x33, 0x33, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Dimension ID
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+
+                        int dimensionId = wrapper.get(Type.INT, 0);
+                        clientWorld.setEnvironment(dimensionId);
+                    }
+                });
+            }
+        });
+
         /*
             INCOMING PACKETS
          */
@@ -314,5 +401,7 @@ public class Protocol1_11To1_10 extends Protocol {
     @Override
     public void init(UserConnection userConnection) {
         userConnection.put(new EntityTracker(userConnection));
+        if (!userConnection.has(ClientWorld.class))
+            userConnection.put(new ClientWorld(userConnection));
     }
 }

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/packets/InventoryPackets.java

@@ -6,7 +6,7 @@ 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 us.myles.ViaVersion.protocols.protocol1_11to1_10.ItemRewriter;
+import us.myles.ViaVersion.protocols.protocol1_11to1_10.EntityIdRewriter;
 import us.myles.ViaVersion.protocols.protocol1_11to1_10.Protocol1_11To1_10;
 
 public class InventoryPackets {
@@ -27,7 +27,7 @@ public class InventoryPackets {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         Item stack = wrapper.get(Type.ITEM, 0);
-                        ItemRewriter.toClient(stack);
+                        EntityIdRewriter.toClientItem(stack);
                     }
                 });
             }
@@ -45,7 +45,7 @@ public class InventoryPackets {
                     public void handle(PacketWrapper wrapper) throws Exception {
                         Item[] stacks = wrapper.get(Type.ITEM_ARRAY, 0);
                         for (Item stack : stacks)
-                            ItemRewriter.toClient(stack);
+                            EntityIdRewriter.toClientItem(stack);
                     }
                 });
             }
@@ -63,7 +63,7 @@ public class InventoryPackets {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         Item stack = wrapper.get(Type.ITEM, 0);
-                        ItemRewriter.toClient(stack);
+                        EntityIdRewriter.toClientItem(stack);
                     }
                 });
             }
@@ -83,12 +83,12 @@ public class InventoryPackets {
 
                             int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
                             for (int i = 0; i < size; i++) {
-                                ItemRewriter.toClient(wrapper.passthrough(Type.ITEM)); // Input Item
+                                EntityIdRewriter.toClientItem(wrapper.passthrough(Type.ITEM)); // Input Item
-                                ItemRewriter.toClient(wrapper.passthrough(Type.ITEM)); // Output Item
+                                EntityIdRewriter.toClientItem(wrapper.passthrough(Type.ITEM)); // Output Item
 
                                 boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
                                 if (secondItem)
-                                    ItemRewriter.toClient(wrapper.passthrough(Type.ITEM)); // Second Item
+                                    EntityIdRewriter.toClientItem(wrapper.passthrough(Type.ITEM)); // Second Item
 
                                 wrapper.passthrough(Type.BOOLEAN); // Trade disabled
                                 wrapper.passthrough(Type.INT); // Number of tools uses
@@ -119,7 +119,7 @@ public class InventoryPackets {
                             @Override
                             public void handle(PacketWrapper wrapper) throws Exception {
                                 Item item = wrapper.get(Type.ITEM, 0);
-                                ItemRewriter.toServer(item);
+                                EntityIdRewriter.toServerItem(item);
                             }
                         });
                     }
@@ -137,7 +137,7 @@ public class InventoryPackets {
                             @Override
                             public void handle(PacketWrapper wrapper) throws Exception {
                                 Item item = wrapper.get(Type.ITEM, 0);
-                                ItemRewriter.toServer(item);
+                                EntityIdRewriter.toServerItem(item);
                             }
                         });
                     }

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java

@@ -13,6 +13,7 @@ import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.BlockEntity;
 import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.types.Chunk1_9_1_2Type;
 
 public class Protocol1_9_1_2TO1_9_3_4 extends Protocol {
 
@@ -53,6 +54,7 @@ public class Protocol1_9_1_2TO1_9_3_4 extends Protocol {
             }
         });
 
+        // Chunk Packet
         registerOutgoing(State.PLAY, 0x20, 0x20, new PacketRemapper() {
             @Override
             public void registerMap() {
@@ -61,9 +63,11 @@ public class Protocol1_9_1_2TO1_9_3_4 extends Protocol {
                     public void handle(PacketWrapper wrapper) throws Exception {
                         ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
 
-                        Chunk1_9_3_4Type type = new Chunk1_9_3_4Type(clientWorld);
+                        Chunk1_9_3_4Type newType = new Chunk1_9_3_4Type(clientWorld);
-                        Chunk chunk = wrapper.passthrough(type);
+                        Chunk1_9_1_2Type oldType = new Chunk1_9_1_2Type(clientWorld); // Get the old type to not write Block Entities
 
+                        Chunk chunk = wrapper.read(newType);
+                        wrapper.write(oldType, chunk);
                         BlockEntity.handle(chunk.getBlockEntities(), wrapper.user());
                     }
                 });

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java

@@ -92,7 +92,8 @@ public class Chunk1_9_3_4Type extends PartialType<Chunk, ClientWorld> {
             output.writeBytes(chunk.getBiomeData());
         }
 
-        // Don't write block entities
+        // Write Block Entities
+        Type.NBT_ARRAY.write(output, chunk.getBlockEntities().toArray(new CompoundTag[0]));
     }
 
     @Override