fix: WrappedRegistrable returning incorrect key (#2970)

dmulloy2 · Jun 4, 2024 · 11f4810 · 11f4810
1 parent fe51dea
commit 11f4810
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 12 deletions.
diff --git a/src/main/java/com/comphenix/protocol/wrappers/WrappedRegistrable.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedRegistrable.java
@@ -149,20 +149,9 @@ private static final class Factory {
         @NotNull
         private final WrappedRegistry registry;
 
-        @NotNull
-        private final FieldAccessor fieldAccessor;
-
         private Factory(@NotNull final Class<?> registrableClass) {
             this.registrableClass = registrableClass;
             this.registry = WrappedRegistry.getRegistry(registrableClass);
-            this.fieldAccessor = Accessors.getFieldAccessor(
-                FuzzyReflection.fromClass(registrableClass, true)
-                    .getField(
-                        FuzzyFieldContract.newBuilder()
-                            .typeExact(registrableClass)
-                            .build()
-                    )
-            );
         }
 
         @NotNull
@@ -174,7 +163,7 @@ public static Factory getOrCreate(
 
         @NotNull
         public MinecraftKey getKey(@NotNull final Object handle) {
-            return registry.getKey(fieldAccessor.get(handle));
+            return registry.getKey(handle);
         }
 
         @NotNull

diff --git a/src/test/java/com/comphenix/protocol/wrappers/WrappedRegistrableTest.java b/src/test/java/com/comphenix/protocol/wrappers/WrappedRegistrableTest.java
@@ -0,0 +1,49 @@
+package com.comphenix.protocol.wrappers;
+
+import com.comphenix.protocol.BukkitInitialization;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Sound;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.entity.EntityType;
+import org.bukkit.potion.PotionEffectType;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class WrappedRegistrableTest {
+
+    @BeforeAll
+    static void initialize() {
+        BukkitInitialization.initializeAll();
+    }
+
+    @Test
+    void testRegistrables() {
+        // some randomly selected registrables which we can prove that work using the bukkit api
+        validate(MinecraftReflection.getEntityTypes(), EntityType.WARDEN.getKey());
+        validate(MinecraftReflection.getItemClass(), Material.DIAMOND_AXE.getKey());
+        validate(MinecraftReflection.getAttributeBase(), Attribute.GENERIC_MAX_HEALTH.getKey());
+        validate(MinecraftReflection.getSoundEffectClass(), Sound.ENTITY_WARDEN_SNIFF.getKey());
+        validate(MinecraftReflection.getMobEffectListClass(), PotionEffectType.REGENERATION.getKey());
+    }
+
+    void validate(Class<?> registryType, NamespacedKey key) {
+        MinecraftKey minecraftKey = new MinecraftKey(key.getNamespace(), key.getKey());
+        WrappedRegistrable registrable = WrappedRegistrable.fromClassAndKey(registryType, minecraftKey);
+        assertNotNull(registrable);
+
+        Object registrableHandle = registrable.getHandle();
+        assertNotNull(registrableHandle);
+        assertInstanceOf(registryType, registrableHandle);
+
+        MinecraftKey registrableKey = registrable.getKey();
+        assertEquals(key.getNamespace(), registrableKey.getPrefix());
+        assertEquals(key.getKey(), registrableKey.getKey());
+    }
+}
+