Merge pull request #665 from booky10/fix/adventure-v4.15

Fix gson component serialization for adventure v4.15
retrooper · Jan 23, 2024 · 671c935 · 671c935
2 parents c08719a + c931974
commit 671c935
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...c/main/java/com/github/retrooper/packetevents/util/adventure/AdventureReflectionUtil.java b/...c/main/java/com/github/retrooper/packetevents/util/adventure/AdventureReflectionUtil.java
@@ -55,8 +55,18 @@ public class AdventureReflectionUtil {
             Constructor<?> SHOW_ENTITY_SERIALIZER_CONSTRUCTOR = Reflection.getConstructor(SHOW_ENTITY_SERIALIZER, 0);
             SHOW_ENTITY_SERIALIZER_CREATE = gson -> invokeSafe(SHOW_ENTITY_SERIALIZER_CONSTRUCTOR);
         } else {
-            Method COMPONENT_SERIALIZER_CREATE_METHOD = Reflection.getMethod(COMPONENT_SERIALIZER, "create", Gson.class);
-            COMPONENT_SERIALIZER_CREATE = gson -> invokeSafe(COMPONENT_SERIALIZER_CREATE_METHOD, gson);
+            try {
+                // adventure >= v4.15; add empty option state for serializer construction
+                Class<?> optionStateCls = Class.forName("net.kyori.option.OptionState");
+                Object optionState = invokeSafe(Reflection.getMethod(optionStateCls, "emptyOptionState"));
+
+                Method COMPONENT_SERIALIZER_CREATE_METHOD = Reflection.getMethod(COMPONENT_SERIALIZER, "create", optionStateCls, Gson.class);
+                COMPONENT_SERIALIZER_CREATE = gson -> invokeSafe(COMPONENT_SERIALIZER_CREATE_METHOD, optionState, gson);
+            } catch (ClassNotFoundException exception) {
+                // adventure < 4.15; no option states available
+                Method COMPONENT_SERIALIZER_CREATE_METHOD = Reflection.getMethod(COMPONENT_SERIALIZER, "create", Gson.class);
+                COMPONENT_SERIALIZER_CREATE = gson -> invokeSafe(COMPONENT_SERIALIZER_CREATE_METHOD, gson);
+            }
 
             Class<?> CLICK_EVENT_ACTION_SERIALIZER = Reflection.getClassByNameWithoutException("net.kyori.adventure.text.serializer.gson.ClickEventActionSerializer");
             Field CLICK_EVENT_ACTION_SERIALIZER_INSTANCE_FIELD = Reflection.getField(CLICK_EVENT_ACTION_SERIALIZER, "INSTANCE");

diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ subprojects {
     description = project.name
     version = '2.2.0'//TODO UPDATE - ADD "-SNAPSHOT" if we are dealing with snapshot versions
     project.ext.nettyVersion = '4.1.72.Final'
-    project.ext.adventureVersion = '4.14.0'
+    project.ext.adventureVersion = '4.15.0'
     project.ext.adventureDependencies=["net.kyori:adventure-api:${adventureVersion}",
                                        "net.kyori:adventure-text-serializer-gson:${adventureVersion}",
                                        "net.kyori:adventure-text-serializer-legacy:${adventureVersion}",