fix(spigot): changed field type in advancement display on MC 1.20.4

The type of field 'background' changed from MinecraftKey to Optional<MinecraftKey>. Relates to #356
tritonmc · Dec 17, 2023 · fae936d · fae936d
1 parent 3659f00
commit fae936d
Showing 1 changed file with 32 additions and 17 deletions.
diff --git a/...pigot/src/main/java/com/rexcantor64/triton/spigot/wrappers/WrappedAdvancementDisplay.java b/...pigot/src/main/java/com/rexcantor64/triton/spigot/wrappers/WrappedAdvancementDisplay.java
@@ -1,15 +1,19 @@
 package com.rexcantor64.triton.spigot.wrappers;
 
 import com.comphenix.protocol.reflect.EquivalentConverter;
+import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.reflect.accessors.Accessors;
 import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
 import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.utility.MinecraftVersion;
 import com.comphenix.protocol.wrappers.AbstractWrapper;
 import com.comphenix.protocol.wrappers.BukkitConverters;
 import com.comphenix.protocol.wrappers.Converters;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
 
+import java.util.Optional;
+
 /**
  * Custom ProtocolLib Wrapper of NMS' AdvancementDisplay
  */
@@ -19,19 +23,20 @@ public class WrappedAdvancementDisplay extends AbstractWrapper {
     private static Class<?> ADVANCEMENT_FRAME_TYPE_CLASS = MinecraftReflection.getMinecraftClass("advancements.AdvancementFrameType", "AdvancementFrameType");
     private static ConstructorAccessor ADVANCEMENT_DISPLAY_CONSTRUTOR = Accessors.getConstructorAccessor(
             ADVANCEMENT_DISPLAY,
-            MinecraftReflection.getItemStackClass(),
-            MinecraftReflection.getIChatBaseComponentClass(),
-            MinecraftReflection.getIChatBaseComponentClass(),
-            MinecraftReflection.getMinecraftKeyClass(),
-            ADVANCEMENT_FRAME_TYPE_CLASS,
-            boolean.class,
-            boolean.class,
-            boolean.class);
+            MinecraftReflection.getItemStackClass(), // icon
+            MinecraftReflection.getIChatBaseComponentClass(), // title
+            MinecraftReflection.getIChatBaseComponentClass(), // description
+            MinecraftVersion.v1_20_4.atOrAbove() ? Optional.class : MinecraftReflection.getMinecraftKeyClass(), // background
+            ADVANCEMENT_FRAME_TYPE_CLASS, // frame
+            boolean.class, // showToast
+            boolean.class, // announceToChat
+            boolean.class // hidden
+    );
     private static FieldAccessor[] CHAT_COMPONENTS = Accessors.getFieldAccessorArray(ADVANCEMENT_DISPLAY, MinecraftReflection.getIChatBaseComponentClass(), true);
     private static FieldAccessor TITLE = CHAT_COMPONENTS[0];
     private static FieldAccessor DESCRIPTION = CHAT_COMPONENTS[1];
     private static FieldAccessor ITEM_STACK = Accessors.getFieldAccessor(ADVANCEMENT_DISPLAY, MinecraftReflection.getItemStackClass(), true);
-    private static FieldAccessor MINECRAFT_KEY = Accessors.getFieldAccessor(ADVANCEMENT_DISPLAY, MinecraftReflection.getMinecraftKeyClass(), true);
+    private static FieldAccessor MINECRAFT_KEY;
     private static FieldAccessor ADVANCEMENT_FRAME_TYPE = Accessors.getFieldAccessor(ADVANCEMENT_DISPLAY, ADVANCEMENT_FRAME_TYPE_CLASS, true);
     private static FieldAccessor[] BOOLEANS = Accessors.getFieldAccessorArray(ADVANCEMENT_DISPLAY, boolean.class, true);
     private static FieldAccessor SHOW_TOAST = BOOLEANS[0];
@@ -47,6 +52,15 @@ public class WrappedAdvancementDisplay extends AbstractWrapper {
 
     private boolean hasChanged = false;
 
+    static {
+        if (MinecraftVersion.v1_20_4.atOrAbove()) {
+            FuzzyReflection fuzzyReflection = FuzzyReflection.fromClass(ADVANCEMENT_DISPLAY, true);
+            MINECRAFT_KEY = Accessors.getFieldAccessor(fuzzyReflection.getParameterizedField(Optional.class, MinecraftReflection.getMinecraftKeyClass()));
+        } else {
+            MINECRAFT_KEY = Accessors.getFieldAccessor(ADVANCEMENT_DISPLAY, MinecraftReflection.getMinecraftKeyClass(), true);
+        }
+    }
+
     /**
      * Construct a new AdvancementDisplay wrapper.
      */
@@ -81,14 +95,14 @@ public boolean hasChangedAndReset() {
 
     public WrappedAdvancementDisplay shallowClone() {
         Object newInstance = ADVANCEMENT_DISPLAY_CONSTRUTOR.invoke(
-            ITEM_STACK.get(handle),
-            TITLE.get(handle),
-            DESCRIPTION.get(handle),
-            MINECRAFT_KEY.get(handle),
-            ADVANCEMENT_FRAME_TYPE.get(handle),
-            SHOW_TOAST.get(handle),
-            ANNOUNCE_TO_CHAT.get(handle),
-            HIDDEN.get(handle)
+                ITEM_STACK.get(handle),
+                TITLE.get(handle),
+                DESCRIPTION.get(handle),
+                MINECRAFT_KEY.get(handle),
+                ADVANCEMENT_FRAME_TYPE.get(handle),
+                SHOW_TOAST.get(handle),
+                ANNOUNCE_TO_CHAT.get(handle),
+                HIDDEN.get(handle)
         );
         X_CORD.set(newInstance, X_CORD.get(handle));
         Y_CORD.set(newInstance, Y_CORD.get(handle));
@@ -98,6 +112,7 @@ public WrappedAdvancementDisplay shallowClone() {
 
     /**
      * Construct a wrapped advancement display from a native NMS object.
+     *
      * @param handle - the native object.
      * @return The wrapped advancement display object.
      */