implement fluent access to Paper's additional chat component fields in chat packets

lukas81298 · lukas81298 · commit 49064f830a40 · 2023-05-30T18:32:38.000+02:00
diff --git a/src/main/java/com/comphenix/packetwrapper/util/ReflectiveAdventureComponentConverter.java b/src/main/java/com/comphenix/packetwrapper/util/ReflectiveAdventureComponentConverter.java
@@ -0,0 +1,40 @@
+package com.comphenix.packetwrapper.util;
+
+import com.comphenix.protocol.reflect.accessors.Accessors;
+import com.comphenix.protocol.reflect.accessors.MethodAccessor;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.wrappers.WrappedChatComponent;
+
+public class ReflectiveAdventureComponentConverter {
+    private static final Class<?> COMPONENT_CLASS = MinecraftReflection.getLibraryClass("net.kyori.adventure.text.Component");
+    private static final Class<?> GSON_COMPONENT_SERIALIZER_CLASS = MinecraftReflection.getLibraryClass("net.kyori.adventure.text.serializer.gson.GsonComponentSerializer");
+
+    private static final MethodAccessor GET_GSON_SERIALIZER_METHOD = Accessors.getMethodAccessor(GSON_COMPONENT_SERIALIZER_CLASS, "gson");
+    private static final MethodAccessor DESERIALIZE_METHOD = Accessors.getMethodAccessor(GSON_COMPONENT_SERIALIZER_CLASS, "deserialize", String.class);
+    private static final MethodAccessor SERIALIZE_METHOD = Accessors.getMethodAccessor(GSON_COMPONENT_SERIALIZER_CLASS, "serialize", COMPONENT_CLASS);
+
+    private static Object GSON_SERIALIZER;
+
+    private static Object getGsonSerializer() {
+        if(GSON_SERIALIZER == null) {
+            GSON_SERIALIZER = GET_GSON_SERIALIZER_METHOD.invoke(null);
+        }
+        return GSON_SERIALIZER;
+    }
+
+    public static Object fromWrapper(WrappedChatComponent wrapper) {
+        return DESERIALIZE_METHOD.invoke(getGsonSerializer(), wrapper.getJson());
+    }
+
+    public static WrappedChatComponent fromComponent(Object component) {
+        return WrappedChatComponent.fromJson((String)SERIALIZE_METHOD.invoke(getGsonSerializer(), component));
+    }
+
+    public static String componentToString(Object component) {
+        return (String)SERIALIZE_METHOD.invoke(getGsonSerializer(), component);
+    }
+
+    public static Class<?> getComponentClass() {
+        return COMPONENT_CLASS;
+    }
+}
diff --git a/src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerSetActionBarText.java b/src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerSetActionBarText.java
@@ -1,10 +1,14 @@
 package com.comphenix.packetwrapper.wrappers.play.clientbound;
 
+import com.comphenix.packetwrapper.util.ReflectiveAdventureComponentConverter;
 import com.comphenix.packetwrapper.wrappers.AbstractPacket;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.InternalStructure;
 import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.comphenix.protocol.wrappers.ComponentConverter;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import net.md_5.bungee.api.chat.BaseComponent;
 
 public class WrapperPlayServerSetActionBarText extends AbstractPacket {
 
@@ -22,61 +26,36 @@ public WrapperPlayServerSetActionBarText(PacketContainer packet) {
     }
 
     /**
-     * Retrieves the value of field 'text'
+     * Get the action bar component
      *
-     * @return 'text'
+     * @return action bar components
      */
     public WrappedChatComponent getText() {
-        return this.handle.getChatComponents().read(0);
+        WrappedChatComponent read = this.handle.getChatComponents().read(0);
+        if(read != null) {
+            return read;
+        }
+        Object adventure = this.handle.getStructures().read(1).getHandle();
+        if(adventure != null) {
+            return ReflectiveAdventureComponentConverter.fromComponent(adventure);
+        }
+        BaseComponent[] baseComponents = (BaseComponent[]) this.handle.getStructures().read(2).getHandle();
+        return ComponentConverter.fromBaseComponent(baseComponents);
     }
 
     /**
-     * Sets the value of field 'text'
+     * Sets the action bar component
      *
-     * @param value New value for field 'text'
+     * @param value New action bar component
      */
     public void setText(WrappedChatComponent value) {
         this.handle.getChatComponents().write(0, value);
-    }
-
-    /**
-     * Retrieves the value of field 'adventure$text'
-     * ProtocolLib currently does not provide a wrapper for this type. Access to this type is only provided by an InternalStructure
-     *
-     * @return 'adventure$text'
-     */
-    public InternalStructure getAdventure$textInternal() {
-        return this.handle.getStructures().read(1); // TODO: No specific modifier has been found for type interface net.kyori.adventure.text.Component Generic type: interface net.kyori.adventure.text.Component
-    }
-
-    /**
-     * Sets the value of field 'adventure$text'
-     * ProtocolLib currently does not provide a wrapper for this type. Access to this type is only provided by an InternalStructure
-     *
-     * @param value New value for field 'adventure$text'
-     */
-    public void setAdventure$textInternal(InternalStructure value) {
-        this.handle.getStructures().write(1, value); // TODO: No specific modifier has been found for type interface net.kyori.adventure.text.Component Generic type: interface net.kyori.adventure.text.Component
-    }
-
-    /**
-     * Retrieves the value of field 'components'
-     * ProtocolLib currently does not provide a wrapper for this type. Access to this type is only provided by an InternalStructure
-     *
-     * @return 'components'
-     */
-    public InternalStructure getComponentsInternal() {
-        return this.handle.getStructures().read(2); // TODO: No specific modifier has been found for type class [Lnet.md_5.bungee.api.chat.BaseComponent; Generic type: class [Lnet.md_5.bungee.api.chat.BaseComponent;
-    }
-
-    /**
-     * Sets the value of field 'components'
-     * ProtocolLib currently does not provide a wrapper for this type. Access to this type is only provided by an InternalStructure
-     *
-     * @param value New value for field 'components'
-     */
-    public void setComponentsInternal(InternalStructure value) {
-        this.handle.getStructures().write(2, value); // TODO: No specific modifier has been found for type class [Lnet.md_5.bungee.api.chat.BaseComponent; Generic type: class [Lnet.md_5.bungee.api.chat.BaseComponent;
+        StructureModifier<InternalStructure> structures = this.handle.getStructures();
+        if(structures.size() > 1) {
+            for(int i = 1; i < structures.size(); i++) {
+                structures.write(i, null);
+            }
+        }
     }
 
 }
diff --git a/src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerSetSubtitleText.java b/src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerSetSubtitleText.java
@@ -1,10 +1,14 @@
 package com.comphenix.packetwrapper.wrappers.play.clientbound;
 
+import com.comphenix.packetwrapper.util.ReflectiveAdventureComponentConverter;
 import com.comphenix.packetwrapper.wrappers.AbstractPacket;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.InternalStructure;
 import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.comphenix.protocol.wrappers.ComponentConverter;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import net.md_5.bungee.api.chat.BaseComponent;
 
 public class WrapperPlayServerSetSubtitleText extends AbstractPacket {
 
@@ -22,61 +26,36 @@ public WrapperPlayServerSetSubtitleText(PacketContainer packet) {
     }
 
     /**
-     * Retrieves the value of field 'text'
+     * Retrieves the subtitle as a chat component
      *
-     * @return 'text'
+     * @return 'text' subtitle component
      */
     public WrappedChatComponent getText() {
-        return this.handle.getChatComponents().read(0);
+        WrappedChatComponent read = this.handle.getChatComponents().read(0);
+        if(read != null) {
+            return read;
+        }
+        Object adventure = this.handle.getStructures().read(1).getHandle();
+        if(adventure != null) {
+            return ReflectiveAdventureComponentConverter.fromComponent(adventure);
+        }
+        BaseComponent[] baseComponents = (BaseComponent[]) this.handle.getStructures().read(2).getHandle();
+        return ComponentConverter.fromBaseComponent(baseComponents);
     }
 
     /**
-     * Sets the value of field 'text'
+     * Sets the subtitle as a chat component
      *
      * @param value New value for field 'text'
      */
     public void setText(WrappedChatComponent value) {
         this.handle.getChatComponents().write(0, value);
-    }
-
-    /**
-     * Retrieves the value of field 'adventure$text'
-     * ProtocolLib currently does not provide a wrapper for this type. Access to this type is only provided by an InternalStructure
-     *
-     * @return 'adventure$text'
-     */
-    public InternalStructure getAdventure$textInternal() {
-        return this.handle.getStructures().read(1); // TODO: No specific modifier has been found for type interface net.kyori.adventure.text.Component Generic type: interface net.kyori.adventure.text.Component
-    }
-
-    /**
-     * Sets the value of field 'adventure$text'
-     * ProtocolLib currently does not provide a wrapper for this type. Access to this type is only provided by an InternalStructure
-     *
-     * @param value New value for field 'adventure$text'
-     */
-    public void setAdventure$textInternal(InternalStructure value) {
-        this.handle.getStructures().write(1, value); // TODO: No specific modifier has been found for type interface net.kyori.adventure.text.Component Generic type: interface net.kyori.adventure.text.Component
-    }
-
-    /**
-     * Retrieves the value of field 'components'
-     * ProtocolLib currently does not provide a wrapper for this type. Access to this type is only provided by an InternalStructure
-     *
-     * @return 'components'
-     */
-    public InternalStructure getComponentsInternal() {
-        return this.handle.getStructures().read(2); // TODO: No specific modifier has been found for type class [Lnet.md_5.bungee.api.chat.BaseComponent; Generic type: class [Lnet.md_5.bungee.api.chat.BaseComponent;
-    }
-
-    /**
-     * Sets the value of field 'components'
-     * ProtocolLib currently does not provide a wrapper for this type. Access to this type is only provided by an InternalStructure
-     *
-     * @param value New value for field 'components'
-     */
-    public void setComponentsInternal(InternalStructure value) {
-        this.handle.getStructures().write(2, value); // TODO: No specific modifier has been found for type class [Lnet.md_5.bungee.api.chat.BaseComponent; Generic type: class [Lnet.md_5.bungee.api.chat.BaseComponent;
+        StructureModifier<InternalStructure> structures = this.handle.getStructures();
+        if(structures.size() > 1) {
+            for(int i = 1; i < structures.size(); i++) {
+                structures.write(i, null);
+            }
+        }
     }
 
 }
diff --git a/src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerSetTitleText.java b/src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerSetTitleText.java
@@ -1,10 +1,15 @@
 package com.comphenix.packetwrapper.wrappers.play.clientbound;
 
+import com.comphenix.packetwrapper.util.ReflectiveAdventureComponentConverter;
 import com.comphenix.packetwrapper.wrappers.AbstractPacket;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.InternalStructure;
 import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.comphenix.protocol.wrappers.AdventureComponentConverter;
+import com.comphenix.protocol.wrappers.ComponentConverter;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import net.md_5.bungee.api.chat.BaseComponent;
 
 public class WrapperPlayServerSetTitleText extends AbstractPacket {
 
@@ -22,61 +27,35 @@ public WrapperPlayServerSetTitleText(PacketContainer packet) {
     }
 
     /**
-     * Retrieves the value of field 'text'
+     * Retrieves the main title as a chat component
      *
      * @return 'text'
      */
     public WrappedChatComponent getText() {
-        return this.handle.getChatComponents().read(0);
+        WrappedChatComponent read = this.handle.getChatComponents().read(0);
+        if(read != null) {
+            return read;
+        }
+        Object adventure = this.handle.getStructures().read(1).getHandle();
+        if(adventure != null) {
+            return ReflectiveAdventureComponentConverter.fromComponent(adventure);
+        }
+        BaseComponent[] baseComponents = (BaseComponent[]) this.handle.getStructures().read(2).getHandle();
+        return ComponentConverter.fromBaseComponent(baseComponents);
     }
 
     /**
-     * Sets the value of field 'text'
+     * Sets the main title as a chat component
      *
      * @param value New value for field 'text'
      */
     public void setText(WrappedChatComponent value) {
         this.handle.getChatComponents().write(0, value);
+        StructureModifier<InternalStructure> structures = this.handle.getStructures();
+        if(structures.size() > 1) {
+            for(int i = 1; i < structures.size(); i++) {
+                structures.write(i, null);
+            }
+        }
     }
-
-    /**
-     * Retrieves the value of field 'adventure$text'
-     * ProtocolLib currently does not provide a wrapper for this type. Access to this type is only provided by an InternalStructure
-     *
-     * @return 'adventure$text'
-     */
-    public InternalStructure getAdventure$textInternal() {
-        return this.handle.getStructures().read(1); // TODO: No specific modifier has been found for type interface net.kyori.adventure.text.Component Generic type: interface net.kyori.adventure.text.Component
-    }
-
-    /**
-     * Sets the value of field 'adventure$text'
-     * ProtocolLib currently does not provide a wrapper for this type. Access to this type is only provided by an InternalStructure
-     *
-     * @param value New value for field 'adventure$text'
-     */
-    public void setAdventure$textInternal(InternalStructure value) {
-        this.handle.getStructures().write(1, value); // TODO: No specific modifier has been found for type interface net.kyori.adventure.text.Component Generic type: interface net.kyori.adventure.text.Component
-    }
-
-    /**
-     * Retrieves the value of field 'components'
-     * ProtocolLib currently does not provide a wrapper for this type. Access to this type is only provided by an InternalStructure
-     *
-     * @return 'components'
-     */
-    public InternalStructure getComponentsInternal() {
-        return this.handle.getStructures().read(2); // TODO: No specific modifier has been found for type class [Lnet.md_5.bungee.api.chat.BaseComponent; Generic type: class [Lnet.md_5.bungee.api.chat.BaseComponent;
-    }
-
-    /**
-     * Sets the value of field 'components'
-     * ProtocolLib currently does not provide a wrapper for this type. Access to this type is only provided by an InternalStructure
-     *
-     * @param value New value for field 'components'
-     */
-    public void setComponentsInternal(InternalStructure value) {
-        this.handle.getStructures().write(2, value); // TODO: No specific modifier has been found for type class [Lnet.md_5.bungee.api.chat.BaseComponent; Generic type: class [Lnet.md_5.bungee.api.chat.BaseComponent;
-    }
-
 }
diff --git a/src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerSetTitlesAnimation.java b/src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerSetTitlesAnimation.java
@@ -20,7 +20,7 @@ public WrapperPlayServerSetTitlesAnimation(PacketContainer packet) {
     }
 
     /**
-     * Retrieves the value of field 'fadeIn'
+     * Retrieves the number of ticks the title is faded in
      *
      * @return 'fadeIn'
      */
@@ -29,7 +29,7 @@ public int getFadeIn() {
     }
 
     /**
-     * Sets the value of field 'fadeIn'
+     * Sets the number of ticks the title is faded in
      *
      * @param value New value for field 'fadeIn'
      */
@@ -38,7 +38,7 @@ public void setFadeIn(int value) {
     }
 
     /**
-     * Retrieves the value of field 'stay'
+     * Retrieves the number of ticks the title stays on screen
      *
      * @return 'stay'
      */
@@ -47,7 +47,7 @@ public int getStay() {
     }
 
     /**
-     * Sets the value of field 'stay'
+     * Sets the number of ticks the title stays on screen
      *
      * @param value New value for field 'stay'
      */
@@ -56,7 +56,7 @@ public void setStay(int value) {
     }
 
     /**
-     * Retrieves the value of field 'fadeOut'
+     * Retrieves the number of ticks to fade out the title
      *
      * @return 'fadeOut'
      */
@@ -65,7 +65,7 @@ public int getFadeOut() {
     }
 
     /**
-     * Sets the value of field 'fadeOut'
+     * Sets the number of ticks to fade out the title
      *
      * @param value New value for field 'fadeOut'
      */
diff --git a/src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerSystemChat.java b/src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerSystemChat.java

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public WrapperPlayServerSetTitlesAnimation(PacketContainer packet) {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`/**`
`23`		`- * Retrieves the value of field 'fadeIn'`
	`23`	`+ * Retrieves the number of ticks the title is faded in`
`24`	`24`	`*`
`25`	`25`	`* @return 'fadeIn'`
`26`	`26`	`*/`
`@@ -29,7 +29,7 @@ public int getFadeIn() {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
`32`		`- * Sets the value of field 'fadeIn'`
	`32`	`+ * Sets the number of ticks the title is faded in`
`33`	`33`	`*`
`34`	`34`	`* @param value New value for field 'fadeIn'`
`35`	`35`	`*/`
`@@ -38,7 +38,7 @@ public void setFadeIn(int value) {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
`41`		`- * Retrieves the value of field 'stay'`
	`41`	`+ * Retrieves the number of ticks the title stays on screen`
`42`	`42`	`*`
`43`	`43`	`* @return 'stay'`
`44`	`44`	`*/`
`@@ -47,7 +47,7 @@ public int getStay() {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
`50`		`- * Sets the value of field 'stay'`
	`50`	`+ * Sets the number of ticks the title stays on screen`
`51`	`51`	`*`
`52`	`52`	`* @param value New value for field 'stay'`
`53`	`53`	`*/`
`@@ -56,7 +56,7 @@ public void setStay(int value) {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
`59`		`- * Retrieves the value of field 'fadeOut'`
	`59`	`+ * Retrieves the number of ticks to fade out the title`
`60`	`60`	`*`
`61`	`61`	`* @return 'fadeOut'`
`62`	`62`	`*/`
`@@ -65,7 +65,7 @@ public int getFadeOut() {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`
`68`		`- * Sets the value of field 'fadeOut'`
	`68`	`+ * Sets the number of ticks to fade out the title`
`69`	`69`	`*`
`70`	`70`	`* @param value New value for field 'fadeOut'`
`71`	`71`	`*/`