From b5308b77bdb3cdea25a537f97d79862e48b0059a Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sat, 26 Apr 2025 17:56:42 +0800 Subject: [PATCH] Update BukkitReflectionUtils.java --- .../bukkit/util/BukkitReflectionUtils.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/BukkitReflectionUtils.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/BukkitReflectionUtils.java index 68eadb3ec..7d8a0cbe3 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/BukkitReflectionUtils.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/BukkitReflectionUtils.java @@ -5,6 +5,7 @@ import net.momirealms.craftengine.core.util.VersionHelper; import org.bukkit.Bukkit; import java.lang.reflect.Method; +import java.util.List; import java.util.Objects; public final class BukkitReflectionUtils { @@ -69,7 +70,22 @@ public final class BukkitReflectionUtils { } public static Class findReobfOrMojmapClass(String reobf, String mojmap) { - if (VersionHelper.isMojmap()) return ReflectionUtils.getClazz(BukkitReflectionUtils.assembleMCClass(mojmap)); - else return ReflectionUtils.getClazz(BukkitReflectionUtils.assembleMCClass(reobf)); + if (VersionHelper.isMojmap()) return ReflectionUtils.getClazz(mojmap); + else return ReflectionUtils.getClazz(reobf); + } + + public static Class findReobfOrMojmapClass(List reobf, String mojmap) { + if (VersionHelper.isMojmap()) return ReflectionUtils.getClazz(mojmap); + else return ReflectionUtils.getClazz(reobf.toArray(new String[0])); + } + + public static Class findReobfOrMojmapClass(String reobf, List mojmap) { + if (VersionHelper.isMojmap()) return ReflectionUtils.getClazz(mojmap.toArray(new String[0])); + else return ReflectionUtils.getClazz(reobf); + } + + public static Class findReobfOrMojmapClass(List reobf, List mojmap) { + if (VersionHelper.isMojmap()) return ReflectionUtils.getClazz(mojmap.toArray(new String[0])); + else return ReflectionUtils.getClazz(reobf.toArray(new String[0])); } }