8000 Fix register method access in 1.19 NMS when testing · CommandAPI/CommandAPI@b13102c · GitHub
[go: up one dir, main page]
Skip to content

Commit b13102c

Browse files
willkrobothwillkroboth
committed
Fix register method access in 1.19 NMS when testing
1 parent 5652dab commit b13102c

File tree

3 files changed

+6
-6
lines changed
  • commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms

3 files changed

+6
-6
lines changed

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.19-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_Common.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -865,8 +865,8 @@ public void registerCustomArgumentType() {
865865
isFrozen.set(Registry.COMMAND_ARGUMENT_TYPE, false);
866866

867867
// Register argument
868-
Method registerArgument = ArgumentTypeInfos.class.getDeclaredMethod("a", Registry.class, String.class,
869-
Class.class, ArgumentTypeInfo.class);
868+
Method registerArgument = ArgumentTypeInfos.class.getDeclaredMethod(SafeVarHandle.USING_MOJANG_MAPPINGS ? "register" : "a",
869+
Registry.class, String.class, Class.class, ArgumentTypeInfo.class);
870870
registerArgument.setAccessible(true);
871871

872872
registerArgument.invoke(null, Registry.COMMAND_ARGUMENT_TYPE, "commandapi:exception_handler",

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.19.3/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_3_R2.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -758,8 +758,8 @@ public void registerCustomArgumentType() {
758758
isFrozen.set(BuiltInRegistries.COMMAND_ARGUMENT_TYPE, false);
759759

760760
// Register argument
761-
Method registerArgument = ArgumentTypeInfos.class.getDeclaredMethod("a", Registry.class, String.class,
762-
Class.class, ArgumentTypeInfo.class);
761+
Method registerArgument = ArgumentTypeInfos.class.getDeclaredMethod(SafeVarHandle.USING_MOJANG_MAPPINGS ? "register" : "a",
762+
Registry.class, String.class, Class.class, ArgumentTypeInfo.class);
763763
registerArgument.setAccessible(true);
764764

765765
registerArgument.invoke(null, BuiltInRegistries.COMMAND_ARGUMENT_TYPE, "commandapi:exception_handler",

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.19.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_4_R3.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -772,8 +772,8 @@ public void registerCustomArgumentType() {
772772
isFrozen.set(BuiltInRegistries.COMMAND_ARGUMENT_TYPE, false);
773773

774774
// Register argument
775-
Method registerArgument = ArgumentTypeInfos.class.getDeclaredMethod("a", Registry.class, String.class,
776-
Class.class, ArgumentTypeInfo.class);
775+
Method registerArgument = ArgumentTypeInfos.class.getDeclaredMethod(SafeVarHandle.USING_MOJANG_MAPPINGS ? "register" : "a",
776+
Registry.class, String.class, Class.class, ArgumentTypeInfo.class);
777777
registerArgument.setAccessible(true);
778778

779779
registerArgument.invoke(null, BuiltInRegistries.COMMAND_ARGUMENT_TYPE, "commandapi:exception_handler",

0 commit comments

Comments
 (0)
0