From 2a2afa38214a0ea270e94c5aed335385f5ca3727 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 11 Sep 2024 18:22:26 +0200
Subject: [PATCH] Register component rewriter

---
 .../template/BlockItemPacketRewriter1_99.java |  4 +-
 .../template/ComponentRewriter1_99.java       | 46 +++++++++++++++++++
 .../protocols/template/Protocol1_99To_98.java | 20 ++++++++
 .../rewriter/ComponentRewriter1_21.java       |  5 --
 .../v1_21to1_21_2/Protocol1_21To1_21_2.java   | 12 +++++
 .../rewriter/ComponentRewriter1_21_2.java     |  5 +-
 .../rewriter/ComponentRewriter.java           |  2 +-
 .../viaversion/util/SerializerVersion.java    |  2 +-
 8 files changed, 83 insertions(+), 13 deletions(-)
 create mode 100644 common/src/main/java/com/viaversion/viaversion/protocols/template/ComponentRewriter1_99.java

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/template/BlockItemPacketRewriter1_99.java b/common/src/main/java/com/viaversion/viaversion/protocols/template/BlockItemPacketRewriter1_99.java
index 7d8da0bcf..ac066f88f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/template/BlockItemPacketRewriter1_99.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/template/BlockItemPacketRewriter1_99.java
@@ -57,8 +57,8 @@ final class BlockItemPacketRewriter1_99 extends StructuredItemRewriter<Clientbou
 
         // Registers item id changes
         // Other places using item ids are: Entity data, tags, statistics, effect
-        // registerOpenWindow(ClientboundPackets1_21.OPEN_WINDOW); - If a new container type was added
-        // protocol.registerClientbound(ClientboundPackets1_21_2.SET_CURSOR_ITEM, this::passthroughClientboundItem);
+        // registerOpenScreen(ClientboundPackets1_21.OPEN_SCREEN); If a new container type was added; also remove from the component rewriter registration
+        //protocol.registerClientbound(ClientboundPackets1_21_2.SET_CURSOR_ITEM, this::passthroughClientboundItem);
         registerCooldown1_21_2(ClientboundPackets1_21.COOLDOWN);
         registerSetContent1_21_2(ClientboundPackets1_21.CONTAINER_SET_CONTENT);
         registerSetSlot1_21_2(ClientboundPackets1_21.CONTAINER_SET_SLOT);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/template/ComponentRewriter1_99.java b/common/src/main/java/com/viaversion/viaversion/protocols/template/ComponentRewriter1_99.java
new file mode 100644
index 000000000..39224c21a
--- /dev/null
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/template/ComponentRewriter1_99.java
@@ -0,0 +1,46 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viaversion.protocols.template;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundPacket1_21;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.util.SerializerVersion;
+
+public final class ComponentRewriter1_99 extends ComponentRewriter<ClientboundPacket1_21> {
+
+    public ComponentRewriter1_99(final Protocol1_99To_98 protocol) {
+        super(protocol, ReadType.NBT);
+    }
+
+    @Override
+    protected void handleShowItem(final UserConnection connection, final CompoundTag itemTag, final CompoundTag componentsTag) {
+        super.handleShowItem(connection, itemTag, componentsTag);
+        if (componentsTag == null) {
+            return;
+        }
+
+        // Remove or update data from componentsTag
+    }
+
+    @Override
+    protected SerializerVersion inputSerializerVersion() {
+        return SerializerVersion.V1_20_5;
+    }
+}
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/template/Protocol1_99To_98.java b/common/src/main/java/com/viaversion/viaversion/protocols/template/Protocol1_99To_98.java
index 700eafa0b..d79a08a0c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/template/Protocol1_99To_98.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/template/Protocol1_99To_98.java
@@ -24,6 +24,7 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
 import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
+import com.viaversion.viaversion.api.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundConfigurationPackets1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPacket1_20_5;
@@ -50,6 +51,7 @@ final class Protocol1_99To_98 extends AbstractProtocol<ClientboundPacket1_21, Cl
     private final EntityPacketRewriter1_99 entityRewriter = new EntityPacketRewriter1_99(this);
     private final BlockItemPacketRewriter1_99 itemRewriter = new BlockItemPacketRewriter1_99(this);
     private final TagRewriter<ClientboundPacket1_21> tagRewriter = new TagRewriter<>(this);
+    private final ComponentRewriter1_99 componentRewriter = new ComponentRewriter1_99(this);
 
     public Protocol1_99To_98() {
         // Passing the class types into the super constructor is needed for automatic packet type id remapping, but can otherwise be omitted
@@ -63,6 +65,19 @@ final class Protocol1_99To_98 extends AbstractProtocol<ClientboundPacket1_21, Cl
         tagRewriter.registerGeneric(ClientboundPackets1_21.UPDATE_TAGS);
         tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21.UPDATE_TAGS);
 
+        // If needed for item or component changes
+        componentRewriter.registerOpenScreen(ClientboundPackets1_21.OPEN_SCREEN);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21.SET_ACTION_BAR_TEXT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21.SET_TITLE_TEXT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21.SET_SUBTITLE_TEXT);
+        componentRewriter.registerBossEvent(ClientboundPackets1_21.BOSS_EVENT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21.DISCONNECT);
+        componentRewriter.registerTabList(ClientboundPackets1_21.TAB_LIST);
+        componentRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21.PLAYER_COMBAT_KILL);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21.SYSTEM_CHAT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21.DISGUISED_CHAT);
+        componentRewriter.registerPing();
+
         final SoundRewriter<ClientboundPacket1_21> soundRewriter = new SoundRewriter<>(this);
         soundRewriter.registerSound1_19_3(ClientboundPackets1_21.SOUND);
         soundRewriter.registerSound1_19_3(ClientboundPackets1_21.SOUND_ENTITY);
@@ -132,6 +147,11 @@ final class Protocol1_99To_98 extends AbstractProtocol<ClientboundPacket1_21, Cl
         return tagRewriter;
     }
 
+    @Override
+    public ComponentRewriter getComponentRewriter() {
+        return componentRewriter;
+    }
+
     @Override
     protected PacketTypesProvider<ClientboundPacket1_21, ClientboundPacket1_21, ServerboundPacket1_20_5, ServerboundPacket1_20_5> createPacketTypesProvider() {
         return new SimplePacketTypesProvider<>(
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/ComponentRewriter1_21.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/ComponentRewriter1_21.java
index 739e3d4d3..409895843 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/ComponentRewriter1_21.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/ComponentRewriter1_21.java
@@ -60,9 +60,4 @@ public final class ComponentRewriter1_21 extends ComponentRewriter<ClientboundPa
     protected SerializerVersion inputSerializerVersion() {
         return SerializerVersion.V1_20_5;
     }
-
-    @Override
-    protected SerializerVersion outputSerializerVersion() {
-        return SerializerVersion.V1_20_5;
-    }
 }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/Protocol1_21To1_21_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/Protocol1_21To1_21_2.java
index c1ebe08b6..eb0558d69 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/Protocol1_21To1_21_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/Protocol1_21To1_21_2.java
@@ -70,6 +70,18 @@ public final class Protocol1_21To1_21_2 extends AbstractProtocol<ClientboundPack
         tagRewriter.registerGeneric(ClientboundPackets1_21.UPDATE_TAGS);
         tagRewriter.registerGeneric(ClientboundConfigurationPackets1_21.UPDATE_TAGS);
 
+        componentRewriter.registerOpenScreen(ClientboundPackets1_21.OPEN_SCREEN);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21.SET_ACTION_BAR_TEXT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21.SET_TITLE_TEXT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21.SET_SUBTITLE_TEXT);
+        componentRewriter.registerBossEvent(ClientboundPackets1_21.BOSS_EVENT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21.DISCONNECT);
+        componentRewriter.registerTabList(ClientboundPackets1_21.TAB_LIST);
+        componentRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21.PLAYER_COMBAT_KILL);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21.SYSTEM_CHAT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_21.DISGUISED_CHAT);
+        componentRewriter.registerPing();
+
         final SoundRewriter<ClientboundPacket1_21> soundRewriter = new SoundRewriter<>(this);
         soundRewriter.registerSound1_19_3(ClientboundPackets1_21.SOUND);
         soundRewriter.registerSound1_19_3(ClientboundPackets1_21.SOUND_ENTITY);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/ComponentRewriter1_21_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/ComponentRewriter1_21_2.java
index 2840e8745..b11a246b0 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/ComponentRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/ComponentRewriter1_21_2.java
@@ -62,8 +62,5 @@ public final class ComponentRewriter1_21_2 extends ComponentRewriter<Clientbound
         return SerializerVersion.V1_20_5;
     }
 
-    @Override
-    protected SerializerVersion outputSerializerVersion() {
-        return SerializerVersion.V1_20_5;
-    }
+    // Only cosmetic changes in the 1.21.2 serializer
 }
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java
index 6c8e3ec52..3f3abd8f4 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java
@@ -447,7 +447,7 @@ public class ComponentRewriter<C extends ClientboundPacketType> implements com.v
     }
 
     protected SerializerVersion outputSerializerVersion() {
-        return null;
+        return inputSerializerVersion(); // Only matters if the nbt serializer changed
     }
 
     private void convertLegacyContents(final CompoundTag hoverEvent) {
diff --git a/common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java b/common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java
index 1d1d8fa99..3380a2f78 100644
--- a/common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java
+++ b/common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java
@@ -115,4 +115,4 @@ public enum SerializerVersion {
             throw new RuntimeException(e);
         }
     }
-}
\ No newline at end of file
+}