From 56dfc985d23785b074098a49992db62942e1f948 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Wed, 6 Apr 2022 22:53:45 +0200
Subject: [PATCH] Add item mappings, rename carpets tag for older versions

---
 .../Protocol1_18_2To1_19.java                    |  7 ++++++-
 .../packets/EntityPackets1_19.java               | 16 ++++++++--------
 .../viabackwards/data/mapping-1.18to1.19.json    |  8 ++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/Protocol1_18_2To1_19.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/Protocol1_18_2To1_19.java
index 415ded6f..c7c13fdf 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/Protocol1_18_2To1_19.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/Protocol1_18_2To1_19.java
@@ -25,6 +25,7 @@ import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.data.BackwardsM
 import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.packets.BlockItemPackets1_19;
 import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.packets.EntityPackets1_19;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_19Types;
 import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.rewriter.EntityRewriter;
@@ -113,7 +114,11 @@ public final class Protocol1_18_2To1_19 extends BackwardsProtocol<ClientboundPac
             }
         });
 
-        new TagRewriter(this).registerGeneric(ClientboundPackets1_19.TAGS);
+        final TagRewriter tagRewriter = new TagRewriter(this);
+        tagRewriter.removeTags("minecraft:cat_variant");
+        tagRewriter.renameTag(RegistryType.BLOCK, "minecraft:wool_carpets", "minecraft:carpets");
+        tagRewriter.renameTag(RegistryType.ITEM, "minecraft:wool_carpets", "minecraft:carpets");
+        tagRewriter.registerGeneric(ClientboundPackets1_19.TAGS);
 
         new StatisticsRewriter(this).register(ClientboundPackets1_19.STATISTICS);
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java
index d9cfbc23..1e6adb48 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java
@@ -53,14 +53,14 @@ public final class EntityPackets1_19 extends EntityRewriter<Protocol1_18_2To1_19
         protocol.registerClientbound(ClientboundPackets1_19.SPAWN_ENTITY, 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 - Pitch
-                map(Type.BYTE); // 7 - Yaw
+                map(Type.VAR_INT); // Entity id
+                map(Type.UUID); // Entity UUID
+                map(Type.VAR_INT); // Entity Type
+                map(Type.DOUBLE); // X
+                map(Type.DOUBLE); // Y
+                map(Type.DOUBLE); // Z
+                map(Type.BYTE); // Pitch
+                map(Type.BYTE); // Yaw
                 handler(wrapper -> {
                     final byte headYaw = wrapper.read(Type.BYTE);
                     int data = wrapper.read(Type.VAR_INT);
diff --git a/common/src/main/resources/assets/viabackwards/data/mapping-1.18to1.19.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.18to1.19.json
index 84f7f95e..6768ca22 100644
--- a/common/src/main/resources/assets/viabackwards/data/mapping-1.18to1.19.json
+++ b/common/src/main/resources/assets/viabackwards/data/mapping-1.18to1.19.json
@@ -584,6 +584,14 @@
     "minecraft:reinforced_deepslate": {
       "id": "minecraft:obsidian",
       "name": "1.19 Reinforced Deepslate"
+    },
+    "minecraft:echo_shard": {
+      "id": "minecraft:prismarine_shard",
+      "name": "1.19 Echo Shard"
+    },
+    "minecraft:recovery_compass": {
+      "id": "minecraft:compass",
+      "name": "1.19 Recovery Compass"
     }
   },
   "particles": {