From 4d701b1c4e87b4b3c53d7543a9dc2d8ecace7bd5 Mon Sep 17 00:00:00 2001
From: KennyTV <kennytv@t-online.de>
Date: Wed, 22 Apr 2020 19:30:41 +0200
Subject: [PATCH] Use properly renamed entity type constants

---
 .../protocol1_12_2to1_13/packets/EntityPackets1_13.java     | 6 +++---
 .../protocol1_13_2to1_14/packets/EntityPackets1_14.java     | 6 +++---
 .../protocol1_13to1_13_1/packets/EntityPackets1_13_1.java   | 2 +-
 .../protocol1_14_4to1_15/data/EntityTypeMapping.java        | 2 +-
 .../protocol1_14_4to1_15/packets/EntityPackets1_15.java     | 4 ++--
 .../protocol1_14to1_14_1/packets/EntityPackets1_14_1.java   | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
index 412227f8..f58ff691 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
@@ -116,7 +116,7 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
         });
 
         // Spawn Experience Orb
-        registerExtraTracker(0x01, Entity1_13Types.EntityType.XP_ORB);
+        registerExtraTracker(0x01, Entity1_13Types.EntityType.EXPERIENCE_ORB);
 
         // Spawn Global Entity
         registerExtraTracker(0x02, Entity1_13Types.EntityType.LIGHTNING_BOLT);
@@ -293,8 +293,8 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
 
         // Fishy
         mapEntity(Entity1_13Types.EntityType.COD_MOB, Entity1_13Types.EntityType.SQUID).mobName("Cod");
-        mapEntity(Entity1_13Types.EntityType.SALMON_MOB, Entity1_13Types.EntityType.SQUID).mobName("Salmon");
-        mapEntity(Entity1_13Types.EntityType.PUFFER_FISH, Entity1_13Types.EntityType.SQUID).mobName("Puffer Fish");
+        mapEntity(Entity1_13Types.EntityType.SALMON, Entity1_13Types.EntityType.SQUID).mobName("Salmon");
+        mapEntity(Entity1_13Types.EntityType.PUFFERFISH, Entity1_13Types.EntityType.SQUID).mobName("Puffer Fish");
         mapEntity(Entity1_13Types.EntityType.TROPICAL_FISH, Entity1_13Types.EntityType.SQUID).mobName("Tropical Fish");
 
         // Phantom
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
index bc3c1426..cc6ce884 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
@@ -133,7 +133,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
                                 case HOPPER_MINECART:
                                     data = 5;
                                     break;
-                                case COMMANDBLOCK_MINECART:
+                                case COMMAND_BLOCK_MINECART:
                                     data = 6;
                                     break;
                             }
@@ -213,7 +213,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
                 map(Type.DOUBLE); // Needs to be mapped for the position cache
                 map(Type.DOUBLE);
                 map(Type.DOUBLE);
-                handler(wrapper -> addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), Entity1_14Types.EntityType.XP_ORB));
+                handler(wrapper -> addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), Entity1_14Types.EntityType.EXPERIENCE_ORB));
             }
         });
 
@@ -383,7 +383,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
             return meta;
         });
 
-        registerMetaHandler().filter(Entity1_14Types.EntityType.FIREWORKS_ROCKET, 8).handle(e -> {
+        registerMetaHandler().filter(Entity1_14Types.EntityType.FIREWORK_ROCKET, 8).handle(e -> {
             Metadata meta = e.getData();
             meta.setMetaType(MetaType1_13_2.VarInt);
             Integer value = (Integer) meta.getValue();
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java
index cdc4bfb4..afdc09b9 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java
@@ -63,7 +63,7 @@ public class EntityPackets1_13_1 extends LegacyEntityRewriter<Protocol1_13To1_13
         });
 
         // Spawn Experience Orb
-        registerExtraTracker(0x01, Entity1_13Types.EntityType.XP_ORB);
+        registerExtraTracker(0x01, Entity1_13Types.EntityType.EXPERIENCE_ORB);
 
         // Spawn Global Entity
         registerExtraTracker(0x02, Entity1_13Types.EntityType.LIGHTNING_BOLT);
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java
index 8ed90d35..c0d49485 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java
@@ -6,7 +6,7 @@ public class EntityTypeMapping {
 
     // There's only the bee, so not much to do here
     public static int getOldEntityId(int entityId) {
-        if (entityId == 4) return Entity1_14Types.EntityType.PUFFER_FISH.getId(); // Flying pufferfish!
+        if (entityId == 4) return Entity1_14Types.EntityType.PUFFERFISH.getId(); // Flying pufferfish!
         return entityId >= 5 ? entityId - 1 : entityId;
     }
 }
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java
index 45fbfd2a..c3f85590 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java
@@ -124,7 +124,7 @@ public class EntityPackets1_15 extends EntityRewriter<Protocol1_14_4To1_15> {
         });
 
         // Spawn Experience Orb
-        registerExtraTracker(0x01, Entity1_15Types.EntityType.XP_ORB);
+        registerExtraTracker(0x01, Entity1_15Types.EntityType.EXPERIENCE_ORB);
 
         // Spawn Global Object
         registerExtraTracker(0x02, Entity1_15Types.EntityType.LIGHTNING_BOLT);
@@ -230,7 +230,7 @@ public class EntityPackets1_15 extends EntityRewriter<Protocol1_14_4To1_15> {
         registerMetaHandler().filter(Entity1_15Types.EntityType.BEE, 15).removed();
         registerMetaHandler().filter(Entity1_15Types.EntityType.BEE, 16).removed();
 
-        mapEntity(Entity1_15Types.EntityType.BEE, Entity1_15Types.EntityType.PUFFER_FISH).jsonName("Bee").spawnMetadata(storage -> {
+        mapEntity(Entity1_15Types.EntityType.BEE, Entity1_15Types.EntityType.PUFFERFISH).jsonName("Bee").spawnMetadata(storage -> {
             storage.add(new Metadata(14, MetaType1_14.Boolean, false));
             storage.add(new Metadata(15, MetaType1_14.VarInt, 2));
         });
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java
index f8131a4f..af9ad5e0 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java
@@ -20,7 +20,7 @@ public class EntityPackets1_14_1 extends LegacyEntityRewriter<Protocol1_14To1_14
 
     @Override
     protected void registerPackets() {
-        registerExtraTracker(0x01, Entity1_14Types.EntityType.XP_ORB);
+        registerExtraTracker(0x01, Entity1_14Types.EntityType.EXPERIENCE_ORB);
         registerExtraTracker(0x02, Entity1_14Types.EntityType.LIGHTNING_BOLT);
         registerExtraTracker(0x04, Entity1_14Types.EntityType.PAINTING);
         registerExtraTracker(0x05, Entity1_14Types.EntityType.PLAYER);