From fc44151f2b10df163aedaa6ba1e9046280c145e2 Mon Sep 17 00:00:00 2001 From: Marc Baloup Date: Fri, 18 Jul 2025 01:52:17 +0200 Subject: [PATCH] Fix reflection for 1.21.7/8 (round 4) --- .../lib/paper/reflect/wrapper/minecraft/nbt/CompoundTag.java | 4 ---- .../lib/paper/reflect/wrapper/minecraft/world/ValueInput.java | 2 ++ .../wrapper/minecraft/world/ValueInputTypedInputList.java | 2 ++ .../paper/reflect/wrapper/minecraft/world/ValueOutput.java | 2 ++ .../wrapper/minecraft/world/ValueOutputTypedOutputList.java | 2 ++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/CompoundTag.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/CompoundTag.java index 459a5d4..119b451 100644 --- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/CompoundTag.java +++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/CompoundTag.java @@ -24,7 +24,6 @@ public class CompoundTag extends ReflectWrapper implements Tag { private static final ReflectMethod putInt = wrapEx(() -> REFLECT.method("putInt", String.class, int.class)); private static final ReflectMethod putIntArray = wrapEx(() -> REFLECT.method("putIntArray", String.class, int[].class)); private static final ReflectMethod putString = wrapEx(() -> REFLECT.method("putString", String.class, String.class)); - private static final ReflectMethod putUUID = wrapEx(() -> REFLECT.method("putUUID", String.class, UUID.class)); private static final ReflectMethod putLong = wrapEx(() -> REFLECT.method("putLong", String.class, long.class)); private static final ReflectMethod putLongArray = wrapEx(() -> REFLECT.method("putLongArray", String.class, long[].class)); private static final ReflectMethod putShort = wrapEx(() -> REFLECT.method("putShort", String.class, short.class)); @@ -84,9 +83,6 @@ public class CompoundTag extends ReflectWrapper implements Tag { public void putString(String key, String value) { wrapReflectEx(() -> putString.invoke(__getRuntimeInstance(), key, value)); } - public void putUUID(String key, UUID value) { - wrapReflectEx(() -> putUUID.invoke(__getRuntimeInstance(), key, value)); - } public void putLong(String key, long value) { wrapReflectEx(() -> putLong.invoke(__getRuntimeInstance(), key, value)); } diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueInput.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueInput.java index e89dbab..3701108 100644 --- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueInput.java +++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueInput.java @@ -4,6 +4,7 @@ import com.mojang.serialization.Codec; import fr.pandacube.lib.reflect.Reflect; import fr.pandacube.lib.reflect.ReflectClass; import fr.pandacube.lib.reflect.ReflectMethod; +import fr.pandacube.lib.reflect.wrapper.ConcreteWrapper; import fr.pandacube.lib.reflect.wrapper.ReflectWrapper; import fr.pandacube.lib.reflect.wrapper.ReflectWrapperI; @@ -11,6 +12,7 @@ import static fr.pandacube.lib.reflect.wrapper.ReflectWrapper.wrap; import static fr.pandacube.lib.util.ThrowableUtil.wrapEx; import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx; +@ConcreteWrapper(ValueInput.__concrete.class) public interface ValueInput extends ReflectWrapperI { ReflectClass REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.world.level.storage.ValueInput")); ReflectMethod listOrEmpty = wrapEx(() -> REFLECT.method("listOrEmpty", String.class, Codec.class)); diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueInputTypedInputList.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueInputTypedInputList.java index 8724b02..32d6abd 100644 --- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueInputTypedInputList.java +++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueInputTypedInputList.java @@ -2,11 +2,13 @@ package fr.pandacube.lib.paper.reflect.wrapper.minecraft.world; import fr.pandacube.lib.reflect.Reflect; import fr.pandacube.lib.reflect.ReflectClass; +import fr.pandacube.lib.reflect.wrapper.ConcreteWrapper; import fr.pandacube.lib.reflect.wrapper.ReflectWrapperTyped; import fr.pandacube.lib.reflect.wrapper.ReflectWrapperTypedI; import static fr.pandacube.lib.util.ThrowableUtil.wrapEx; +@ConcreteWrapper(ValueInputTypedInputList.__concrete.class) public interface ValueInputTypedInputList extends ReflectWrapperTypedI> { ReflectClass REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.world.level.storage.ValueInput$TypedInputList")); diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueOutput.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueOutput.java index aa7a041..9556701 100644 --- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueOutput.java +++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueOutput.java @@ -4,6 +4,7 @@ import com.mojang.serialization.Codec; import fr.pandacube.lib.reflect.Reflect; import fr.pandacube.lib.reflect.ReflectClass; import fr.pandacube.lib.reflect.ReflectMethod; +import fr.pandacube.lib.reflect.wrapper.ConcreteWrapper; import fr.pandacube.lib.reflect.wrapper.ReflectWrapper; import fr.pandacube.lib.reflect.wrapper.ReflectWrapperI; @@ -11,6 +12,7 @@ import static fr.pandacube.lib.reflect.wrapper.ReflectWrapper.wrap; import static fr.pandacube.lib.util.ThrowableUtil.wrapEx; import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx; +@ConcreteWrapper(ValueOutput.__concrete.class) public interface ValueOutput extends ReflectWrapperI { ReflectClass REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.world.level.storage.ValueOutput")); ReflectMethod list = wrapEx(() -> REFLECT.method("list", String.class, Codec.class)); diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueOutputTypedOutputList.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueOutputTypedOutputList.java index d6a3fcf..e30a1f3 100644 --- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueOutputTypedOutputList.java +++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueOutputTypedOutputList.java @@ -3,12 +3,14 @@ package fr.pandacube.lib.paper.reflect.wrapper.minecraft.world; import fr.pandacube.lib.reflect.Reflect; import fr.pandacube.lib.reflect.ReflectClass; import fr.pandacube.lib.reflect.ReflectMethod; +import fr.pandacube.lib.reflect.wrapper.ConcreteWrapper; import fr.pandacube.lib.reflect.wrapper.ReflectWrapper; import fr.pandacube.lib.reflect.wrapper.ReflectWrapperI; import static fr.pandacube.lib.util.ThrowableUtil.wrapEx; import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx; +@ConcreteWrapper(ValueOutputTypedOutputList.__concrete.class) public interface ValueOutputTypedOutputList extends ReflectWrapperI { ReflectClass REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.world.level.storage.ValueOutput$TypedOutputList")); ReflectMethod add = wrapEx(() -> REFLECT.method("add", Object.class));