From 4473f863c63559239a2c517f646c6ad184371bc4 Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Sat, 10 Apr 2021 17:03:43 +0200
Subject: [PATCH] Update ComponentRewriter

---
 .../api/rewriters/ComponentRewriter.java      | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/common/src/main/java/us/myles/ViaVersion/api/rewriters/ComponentRewriter.java b/common/src/main/java/us/myles/ViaVersion/api/rewriters/ComponentRewriter.java
index bce579225..f927f23f3 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/rewriters/ComponentRewriter.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/rewriters/ComponentRewriter.java
@@ -28,23 +28,6 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.util.GsonUtil;
 
-// Packets using components:
-// ping (status)
-// disconnect (play and login)
-// chat
-// bossbar
-// open window
-// combat event
-// title
-// tablist
-// teams
-// scoreboard
-// player info
-// map data
-// declare commands
-// advancements
-// update sign
-
 /**
  * Handles json chat components, containing methods to override certain parts of the handling.
  * Also contains methods to register a few of the packets using components.
@@ -63,7 +46,13 @@ public class ComponentRewriter {
         this.protocol = null;
     }
 
-    public void registerChatMessage(ClientboundPacketType packetType) {
+    /**
+     * Processes components at the beginning of the packet.
+     * Used for packets that have components as their very first value, so no special pre-reading is necessary.
+     *
+     * @param packetType clientbound packet type
+     */
+    public void registerComponentPacket(ClientboundPacketType packetType) {
         protocol.registerOutgoing(packetType, new PacketRemapper() {
             @Override
             public void registerMap() {
@@ -72,6 +61,10 @@ public class ComponentRewriter {
         });
     }
 
+    public void registerChatMessage(ClientboundPacketType packetType) {
+        registerComponentPacket(packetType);
+    }
+
     public void registerBossBar(ClientboundPacketType packetType) {
         protocol.registerOutgoing(packetType, new PacketRemapper() {
             @Override
@@ -88,6 +81,9 @@ public class ComponentRewriter {
         });
     }
 
+    /**
+     * Handles sub 1.17 combat event components.
+     */
     public void registerCombatEvent(ClientboundPacketType packetType) {
         protocol.registerOutgoing(packetType, new PacketRemapper() {
             @Override
@@ -103,6 +99,9 @@ public class ComponentRewriter {
         });
     }
 
+    /**
+     * Handles sub 1.17 title components.
+     */
     public void registerTitle(ClientboundPacketType packetType) {
         protocol.registerOutgoing(packetType, new PacketRemapper() {
             @Override