zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

bukkit/paper : Fix ItemStackPredicateArgument reflection

Browse source
This commit is contained in:
Jason Penilla 2022-08-18 14:46:26 -07:00 • committed by Jason
parent 08242519dd
commit abf662a51d
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackPredicateArgument.java
View file

@ -147,24 +147,25 @@ public final class ItemStackPredicateArgument<C> extends CommandArgument<C, Item
CraftBukkitReflection.needOBCClass("inventory.CraftItemStack");
private static final Class<?> ARGUMENT_ITEM_PREDICATE_CLASS =
MinecraftArgumentTypes.getClassByKey(NamespacedKey.minecraft("item_predicate"));
private static final Class<?> ARGUMENT_ITEM_PREDICATE_RESULT_CLASS = CraftBukkitReflection.firstNonNullOrThrow(
() -> "Couldn't find ItemPredicateArgument$Result class",
private static final Class<?> ARGUMENT_ITEM_PREDICATE_RESULT_CLASS = CraftBukkitReflection.firstNonNullOrNull(
CraftBukkitReflection.findNMSClass("ArgumentItemPredicate$b"),
CraftBukkitReflection.findMCClass("commands.arguments.item.ArgumentItemPredicate$b"),
CraftBukkitReflection.findMCClass("commands.arguments.item.ItemPredicateArgument$Result")
);
private static final @Nullable Method CREATE_PREDICATE_METHOD = CraftBukkitReflection.firstNonNullOrNull(
CraftBukkitReflection.findMethod(
ARGUMENT_ITEM_PREDICATE_RESULT_CLASS,
"create",
com.mojang.brigadier.context.CommandContext.class
),
CraftBukkitReflection.findMethod(
ARGUMENT_ITEM_PREDICATE_RESULT_CLASS,
"a",
com.mojang.brigadier.context.CommandContext.class
)
);
private static final @Nullable Method CREATE_PREDICATE_METHOD = ARGUMENT_ITEM_PREDICATE_RESULT_CLASS == null
? null
: CraftBukkitReflection.firstNonNullOrNull(
CraftBukkitReflection.findMethod(
ARGUMENT_ITEM_PREDICATE_RESULT_CLASS,
"create",
com.mojang.brigadier.context.CommandContext.class
),
CraftBukkitReflection.findMethod(
ARGUMENT_ITEM_PREDICATE_RESULT_CLASS,
"a",
com.mojang.brigadier.context.CommandContext.class
)
);
private static final Method AS_NMS_COPY_METHOD =
CraftBukkitReflection.needMethod(CRAFT_ITEM_STACK_CLASS, "asNMSCopy", ItemStack.class);