Merge branch 'master' into 1.20

# Conflicts:
#	README.md
#	pom.xml

Author: lukas81298

README.md

@@ -16,7 +16,7 @@ Enter PacketWrapper. It contains wrapper classes for all known packets in 1.19.4
 
 #### Maven:
 
-First, add this repository
+First add my repository to your pom.xml so Maven can find the library.
 
 ```
 <repositories>
@@ -27,7 +27,7 @@ First, add this repository
 </repositories>
 ```
 
-Then, include the actual dependency
+First add my repository so Gradle can find the dependency:
 
 ```
 <dependencies>
@@ -60,7 +60,7 @@ Then add the actual dependency:
 ```
 dependencies {
     ...
-    compile 'com.comphenix.packetwrapper:PacketWrapper:1.20-2.2.0-SNAPSHOT'
+    compile 'com.comphenix.packetwrapper:PacketWrapper:1.20-2.2.0'
 }
 ```
 

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.comphenix.packetwrapper</groupId>
     <artifactId>PacketWrapper</artifactId>
-    <version>1.20-2.1.1-SNAPSHOT</version>
+    <version>1.20-2.2.0-SNAPSHOT</version>
 
     <name>PacketWrapper</name>
 

src/main/java/com/comphenix/packetwrapper/util/ReflectiveAdventureComponentConverter.java

@@ -0,0 +1,42 @@
+package com.comphenix.packetwrapper.util;
+
+import com.comphenix.protocol.reflect.FuzzyReflection;
+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 Class<?> COMPONENT_SERIALIZER_CLASS = MinecraftReflection.getLibraryClass("net.kyori.adventure.text.serializer.ComponentSerializer");
+
+    private static final MethodAccessor GET_GSON_SERIALIZER_METHOD = Accessors.getMethodAccessor(GSON_COMPONENT_SERIALIZER_CLASS, "gson");
+    private static final MethodAccessor DESERIALIZE_METHOD = Accessors.getMethodAccessor(FuzzyReflection.fromClass(COMPONENT_SERIALIZER_CLASS, false).getMethodByName("deserializeOrNull"));
+    private static final MethodAccessor SERIALIZE_METHOD = Accessors.getMethodAccessor(FuzzyReflection.fromClass(COMPONENT_SERIALIZER_CLASS, false).getMethodByName("serialize"));
+
+    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;
+    }
+}

src/main/java/com/comphenix/packetwrapper/wrappers/handshaking/WrapperHandshakingClientSetProtocol.java

@@ -7,6 +7,9 @@
 
 public class WrapperHandshakingClientSetProtocol extends AbstractPacket {
 
+    /**
+     * The packet type that is wrapped by this wrapper.
+     */
     public static final PacketType TYPE = PacketType.Handshake.Client.SET_PROTOCOL;
 
     public WrapperHandshakingClientSetProtocol() {

src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerAbilities.java

@@ -5,7 +5,9 @@
 import com.comphenix.protocol.events.PacketContainer;
 
 public class WrapperPlayServerAbilities extends AbstractPacket {
-
+    /**
+     * The packet type that is wrapped by this wrapper.
+     */
     public static final PacketType TYPE = PacketType.Play.Server.ABILITIES;
 
     /**
@@ -17,6 +19,7 @@ public WrapperPlayServerAbilities() {
 
     /**
      * Constructors a new wrapper for the specified packet
+     *
      * @param packet the packet to wrap
      */
     public WrapperPlayServerAbilities(PacketContainer packet) {

src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerAdvancements.java

@@ -10,7 +10,9 @@
 import java.util.Set;
 
 public class WrapperPlayServerAdvancements extends AbstractPacket {
-
+    /**
+     * The packet type that is wrapped by this wrapper.
+     */
     public static final PacketType TYPE = PacketType.Play.Server.ADVANCEMENTS;
 
     /**
@@ -22,6 +24,7 @@ public WrapperPlayServerAdvancements() {
 
     /**
      * Constructors a new wrapper for the specified packet
+     *
      * @param packet the packet to wrap
      */
     public WrapperPlayServerAdvancements(PacketContainer packet) {

src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerAnimation.java

@@ -11,6 +11,9 @@
  */
 public class WrapperPlayServerAnimation extends AbstractPacket {
 
+    /**
+     * The packet type that is wrapped by this wrapper.
+     */
     public static final PacketType TYPE = PacketType.Play.Server.ANIMATION;
 
     /**
@@ -22,6 +25,7 @@ public WrapperPlayServerAnimation() {
 
     /**
      * Constructors a new wrapper for the specified packet
+     *
      * @param packet the packet to wrap
      */
     public WrapperPlayServerAnimation(PacketContainer packet) {
@@ -66,14 +70,13 @@ public Animation getAction() {
     }
 
 
-
     /**
      * Sets the numerical index of the corresponding animation
      *
      * @param value New value for field 'action'
      */
     public void setActionId(int value) {
-        this.handle.getIntegers().write(1,  value);
+        this.handle.getIntegers().write(1, value);
     }
 
     /**

src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerAttachEntity.java

@@ -6,6 +6,9 @@
 
 public class WrapperPlayServerAttachEntity extends AbstractPacket {
 
+    /**
+     * The packet type that is wrapped by this wrapper.
+     */
     public static final PacketType TYPE = PacketType.Play.Server.ATTACH_ENTITY;
 
     /**
@@ -17,6 +20,7 @@ public WrapperPlayServerAttachEntity() {
 
     /**
      * Constructors a new wrapper for the specified packet
+     *
      * @param packet the packet to wrap
      */
     public WrapperPlayServerAttachEntity(PacketContainer packet) {

src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerAutoRecipe.java

@@ -7,6 +7,9 @@
 
 public class WrapperPlayServerAutoRecipe extends AbstractPacket {
 
+    /**
+     * The packet type that is wrapped by this wrapper.
+     */
     public static final PacketType TYPE = PacketType.Play.Server.AUTO_RECIPE;
 
     /**
@@ -18,6 +21,7 @@ public WrapperPlayServerAutoRecipe() {
 
     /**
      * Constructors a new wrapper for the specified packet
+     *
      * @param packet the packet to wrap
      */
     public WrapperPlayServerAutoRecipe(PacketContainer packet) {

src/main/java/com/comphenix/packetwrapper/wrappers/play/clientbound/WrapperPlayServerBlockAction.java

@@ -13,6 +13,9 @@
  */
 public class WrapperPlayServerBlockAction extends AbstractPacket {
 
+    /**
+     * The packet type that is wrapped by this wrapper.
+     */
     public static final PacketType TYPE = PacketType.Play.Server.BLOCK_ACTION;
 
     /**
@@ -24,6 +27,7 @@ public WrapperPlayServerBlockAction() {
 
     /**
      * Constructors a new wrapper for the specified packet
+     *
      * @param packet the packet to wrap
      */
     public WrapperPlayServerBlockAction(PacketContainer packet) {