From 4cc3ea088395d7f629f40ee48d3df6ccbc0b5482 Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Tue, 1 Jun 2021 23:57:54 +0200
Subject: [PATCH] Replace some hardcoded packet ids

---
 .../protocol/protocol1_11_1to1_12/data/ShoulderTracker.java | 5 +++--
 .../protocol1_11_1to1_12/packets/BlockItemPackets1_12.java  | 3 ++-
 .../protocol1_12_2to1_13/packets/EntityPackets1_13.java     | 3 ++-
 .../protocol1_13_2to1_14/packets/EntityPackets1_14.java     | 6 +++---
 .../protocol1_13_2to1_14/packets/SoundPackets1_14.java      | 3 ++-
 .../protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java
index 06eab86a..eb7b2d8c 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java
@@ -24,6 +24,7 @@ import com.viaversion.viaversion.api.connection.StoredObject;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
 
 public class ShoulderTracker extends StoredObject {
@@ -36,13 +37,13 @@ public class ShoulderTracker extends StoredObject {
     }
 
     public void update() {
-        PacketWrapper wrapper = PacketWrapper.create(0x0F, null, getUser());
+        PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_12.CHAT_MESSAGE, null, getUser());
 
         wrapper.write(Type.COMPONENT, Protocol1_9To1_8.fixJson(generateString()));
         wrapper.write(Type.BYTE, (byte) 2);
 
         try {
-            wrapper.send(Protocol1_11_1To1_12.class);
+            wrapper.scheduleSend(Protocol1_11_1To1_12.class);
         } catch (Exception e) {
             ViaBackwards.getPlatform().getLogger().severe("Failed to send the shoulder indication");
             e.printStackTrace();
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java
index 542d5482..a8cbffca 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java
@@ -33,6 +33,7 @@ import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntArrayTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.LongArrayTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12;
+import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ServerboundPackets1_12;
 import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
@@ -146,7 +147,7 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<Protocol1_11_1
                             wrapper.set(Type.ITEM, 0, null); // Set null item (probably will work)
 
                             // Apologize (may happen in some cases, maybe if inventory is full?)
-                            PacketWrapper confirm = wrapper.create(0x6);
+                            PacketWrapper confirm = wrapper.create(ServerboundPackets1_12.WINDOW_CONFIRMATION);
                             confirm.write(Type.BYTE, wrapper.get(Type.UNSIGNED_BYTE, 0).byteValue());
                             confirm.write(Type.SHORT, wrapper.get(Type.SHORT, 1));
                             confirm.write(Type.BOOLEAN, false); // Success - not used
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
index eda0a2c5..2fbfe4dd 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
@@ -38,6 +38,7 @@ import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.api.type.types.version.Types1_12;
 import com.viaversion.viaversion.api.type.types.version.Types1_13;
+import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
@@ -243,7 +244,7 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
                         PlayerPositionStorage1_13 positionStorage = wrapper.user().get(PlayerPositionStorage1_13.class);
 
                         // Send teleport packet to client
-                        PacketWrapper positionAndLook = wrapper.create(0x2F);
+                        PacketWrapper positionAndLook = wrapper.create(ClientboundPackets1_12_1.PLAYER_POSITION);
                         positionAndLook.write(Type.DOUBLE, 0D);
                         positionAndLook.write(Type.DOUBLE, 0D);
                         positionAndLook.write(Type.DOUBLE, 0D);
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
index eec143f7..816dbb60 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
@@ -87,7 +87,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
 
                     // Remove equipment, else the client will see ghost items
                     for (int i = 0; i <= 5; i++) {
-                        PacketWrapper equipmentPacket = wrapper.create(0x42);
+                        PacketWrapper equipmentPacket = wrapper.create(ClientboundPackets1_13.ENTITY_EQUIPMENT);
                         equipmentPacket.write(Type.VAR_INT, entityId);
                         equipmentPacket.write(Type.VAR_INT, i);
                         equipmentPacket.write(Type.FLAT_VAR_INT_ITEM, null);
@@ -453,12 +453,12 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
                 Position position = (Position) meta.getValue();
                 if (position != null) {
                     // Use bed
-                    PacketWrapper wrapper = PacketWrapper.create(0x33, null, event.user());
+                    PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_13.USE_BED, null, event.user());
                     wrapper.write(Type.VAR_INT, event.entityId());
                     wrapper.write(Type.POSITION, position);
 
                     try {
-                        wrapper.send(Protocol1_13_2To1_14.class);
+                        wrapper.scheduleSend(Protocol1_13_2To1_14.class);
                     } catch (Exception ex) {
                         ex.printStackTrace();
                     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java
index bbeddc37..c9d74569 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java
@@ -25,6 +25,7 @@ import com.viaversion.viaversion.api.data.entity.StoredEntityData;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.rewriter.RewriterBase;
 
@@ -68,7 +69,7 @@ public class SoundPackets1_14 extends RewriterBase<Protocol1_13_2To1_14> {
                     int y = (int) (entityStorage.getY() * 8D);
                     int z = (int) (entityStorage.getZ() * 8D);
 
-                    PacketWrapper soundPacket = wrapper.create(0x4D);
+                    PacketWrapper soundPacket = wrapper.create(ClientboundPackets1_13.SOUND);
                     soundPacket.write(Type.VAR_INT, newId);
                     soundPacket.write(Type.VAR_INT, category);
                     soundPacket.write(Type.INT, x);
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java
index 48c9301c..8125c1ca 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java
@@ -79,7 +79,7 @@ public class Protocol1_14_4To1_15 extends BackwardsProtocol<ClientboundPackets1_
                 map(Type.FLOAT); // y
                 map(Type.FLOAT); // z
                 handler(wrapper -> {
-                    PacketWrapper soundPacket = wrapper.create(0x51);
+                    PacketWrapper soundPacket = wrapper.create(ClientboundPackets1_14.SOUND);
                     soundPacket.write(Type.VAR_INT, 243); // entity.generic.explode
                     soundPacket.write(Type.VAR_INT, 4); // blocks category
                     soundPacket.write(Type.INT, toEffectCoordinate(wrapper.get(Type.FLOAT, 0))); // x