From e41f445e92a66b19ba0410fd65e38710e5f3bf2b Mon Sep 17 00:00:00 2001
From: creeper123123321 <creeper123123321@gmail.com>
Date: Thu, 19 Apr 2018 19:39:30 -0300
Subject: [PATCH] 18w16a

---
 .../data/SpawnEggRewriter.java                |  6 ++
 .../packets/InventoryPackets.java             | 70 +++++++++++--------
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/SpawnEggRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/SpawnEggRewriter.java
index 1952d1157..6a1b0524e 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/SpawnEggRewriter.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/SpawnEggRewriter.java
@@ -1,5 +1,6 @@
 package us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.data;
 
+import com.google.common.base.Optional;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 
@@ -67,4 +68,9 @@ public class SpawnEggRewriter {
             return 25100288;
         return (383 << 16 | (spawnEggs.get(entityIdentifier) & 0xFFFF));
     }
+
+    public static Optional<String> getEntityId(int spawnEggId) {
+        if (spawnEggId >> 16 != 383) return Optional.absent();
+        return Optional.fromNullable(spawnEggs.inverse().get(spawnEggId & 0xFFFF));
+    }
 }
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/InventoryPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/InventoryPackets.java
index 71937421d..af854e967 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/InventoryPackets.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/InventoryPackets.java
@@ -250,8 +250,8 @@ public class InventoryPackets {
         }
 
         if (!MappingData.oldToNewItems.containsKey(rawId)) {
-            if (MappingData.oldToNewItems.containsKey(item.getId() << 4)) {
-                rawId = item.getId() << 4;
+            if (MappingData.oldToNewItems.containsKey(rawId & ~0xF)) {
+                rawId &= ~0xF; // Remove data
             } else {
                 System.out.println("FAILED TO GET 1.13 ITEM FOR " + item.getId()); // TODO: Make this nicer etc, perhaps fix issues with mapping :T
                 rawId = 16; // Stone
@@ -286,45 +286,59 @@ public class InventoryPackets {
             for (Map.Entry<Integer, Integer> entry : MappingData.oldToNewItems.entrySet()) {
                 if (entry.getValue() == item.getId()) {
                     int oldId = entry.getKey();
-                    rawId = (oldId >> 4) << 16 | oldId & 0xF;
+                    // Handle spawn eggs
+                    Optional<String> eggEntityId = SpawnEggRewriter.getEntityId(oldId);
+                    if (eggEntityId.isPresent()) {
+                        rawId = 383 << 16;
+                        if (tag == null)
+                            item.setTag(tag = new CompoundTag("tag"));
+                        if (!tag.contains("EntityTag")) {
+                            CompoundTag entityTag = new CompoundTag("EntityTag");
+                            entityTag.put(new StringTag("id", eggEntityId.get()));
+                            tag.put(entityTag);
+                        }
+                    } else {
+                        rawId = (oldId >> 4) << 16 | oldId & 0xF;
+                    }
                     break;
                 }
             }
         }
 
-        if (rawId != null) {
-            item.setId((short) (rawId >> 16));
-            item.setData((short) (rawId & 0xFFFF));
+        if (rawId == null) {
+            System.out.println("FAILED TO GET 1.12 ITEM FOR " + item.getId());
+            rawId = 0x10000; // Stone
+        }
 
-            if (tag != null) {
-                if (isDamageable(item.getId())) {
-                    if (tag.get("Damage") instanceof IntTag) {
-                        if (!gotRawIdFromTag)
-                            item.setData((short) (int) tag.get("Damage").getValue());
-                        tag.remove("Damage");
-                    }
+        item.setId((short) (rawId >> 16));
+        item.setData((short) (rawId & 0xFFFF));
+
+        if (tag != null) {
+            if (isDamageable(item.getId())) {
+                if (tag.get("Damage") instanceof IntTag) {
+                    if (!gotRawIdFromTag)
+                        item.setData((short) (int) tag.get("Damage").getValue());
+                    tag.remove("Damage");
                 }
+            }
 
-                if (item.getId() == 358) { // map
-                    if (tag.get("map") instanceof IntTag) {
-                        if (!gotRawIdFromTag)
-                            item.setData((short) (int) tag.get("map").getValue());
-                        tag.remove("map");
-                    }
+            if (item.getId() == 358) { // map
+                if (tag.get("map") instanceof IntTag) {
+                    if (!gotRawIdFromTag)
+                        item.setData((short) (int) tag.get("map").getValue());
+                    tag.remove("map");
                 }
+            }
 
-                if (item.getId() == 442) { // shield
-                    if (tag.get("BlockEntityTag") instanceof CompoundTag) {
-                        CompoundTag blockEntityTag = tag.get("BlockEntityTag");
-                        if (blockEntityTag.get("Base") instanceof IntTag) {
-                            IntTag base = blockEntityTag.get("Base");
-                            base.setValue(15 - base.getValue()); // invert color id
-                        }
+            if (item.getId() == 442) { // shield
+                if (tag.get("BlockEntityTag") instanceof CompoundTag) {
+                    CompoundTag blockEntityTag = tag.get("BlockEntityTag");
+                    if (blockEntityTag.get("Base") instanceof IntTag) {
+                        IntTag base = blockEntityTag.get("Base");
+                        base.setValue(15 - base.getValue()); // invert color id
                     }
                 }
             }
-        } else {
-            System.out.println("FAILED TO GET 1.12 ITEM FOR " + item.getId()); // TODO: Make this nicer etc, perhaps fix issues with mapping :T
         }
     }