feat: 1.20.4対応

TeamKun · Jun 2, 2024 · ecf5566 · ecf5566
1 parent a574352
commit ecf5566
Show file tree

Hide file tree

Showing 63 changed files with 3,104 additions and 19 deletions.
diff --git a/.run/RunTestPlugin_1.20.4.run.xml b/.run/RunTestPlugin_1.20.4.run.xml
@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="RunTestPlugin_1.20.4" type="JarApplication">
+        <option name="JAR_PATH" value="$PROJECT_DIR$/bukkit/test_plugin_1.20.4/server/server.jar"/>
+        <option name="VM_PARAMETERS" value="-Dplugin.env=DEV"/>
+        <option name="PROGRAM_PARAMETERS" value="nogui"/>
+        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/bukkit/test_plugin_1.20.4/server"/>
+        <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true"/>
+        <option name="ALTERNATIVE_JRE_PATH" value="17"/>
+        <method v="2">
+            <option name="Gradle.BeforeRunTask" enabled="false" tasks="downloadServerJar"
+                    externalProjectPath="$PROJECT_DIR$/bukkit/test_plugin_1.20.4" vmOptions="" scriptParameters=""/>
+            <option name="Gradle.BeforeRunTask" enabled="true" tasks="build"
+                    externalProjectPath="$PROJECT_DIR$/bukkit/test_plugin_1.20.4" vmOptions="" scriptParameters=""/>
+            <option name="Gradle.BeforeRunTask" enabled="true" tasks="copyToServer"
+                    externalProjectPath="$PROJECT_DIR$/bukkit/test_plugin_1.20.4" vmOptions="" scriptParameters=""/>
+        </method>
+    </configuration>
+</component>
diff --git a/.run/RunTestPlugin_1.20.6.run.xml b/.run/RunTestPlugin_1.20.6.run.xml
@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="RunTestPlugin_1.20.6" type="JarApplication">
+        <option name="JAR_PATH" value="$PROJECT_DIR$/bukkit/test_plugin_1.20.6/server/server.jar"/>
+        <option name="VM_PARAMETERS" value="-Dplugin.env=DEV"/>
+        <option name="PROGRAM_PARAMETERS" value="nogui"/>
+        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/bukkit/test_plugin_1.20.6/server"/>
+        <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true"/>
+        <option name="ALTERNATIVE_JRE_PATH" value="21"/>
+        <method v="2">
+            <option name="Gradle.BeforeRunTask" enabled="false" tasks="downloadServerJar"
+                    externalProjectPath="$PROJECT_DIR$/bukkit/test_plugin_1.20.6" vmOptions="" scriptParameters=""/>
+            <option name="Gradle.BeforeRunTask" enabled="true" tasks="build"
+                    externalProjectPath="$PROJECT_DIR$/bukkit/test_plugin_1.20.6" vmOptions="" scriptParameters=""/>
+            <option name="Gradle.BeforeRunTask" enabled="true" tasks="copyToServer"
+                    externalProjectPath="$PROJECT_DIR$/bukkit/test_plugin_1.20.6" vmOptions="" scriptParameters=""/>
+        </method>
+    </configuration>
+</component>
diff --git a/bukkit/build.gradle b/bukkit/build.gradle
@@ -15,6 +15,9 @@ dependencies {
     compileOnly "com.mojang:brigadier:1.0.18"
 //    compileOnly fileTree(dir: "./test_plugin_1.16.5/", include: "server/cache/patched*.jar")
 //    compileOnly fileTree(dir: "./test_plugin_1.19.4/", include: ["server/versions/1.19.4/paper*.jar", "server_mojmap/versions/1.19.4/paper*jar"])
+
+    testImplementation "org.junit.jupiter:junit-jupiter:5.8.1"
+    testImplementation "org.assertj:assertj-core:3.25.1"
 }
 
 def targetJavaVersion = 8
@@ -27,6 +30,10 @@ java {
     }
 }
 
+test {
+    useJUnitPlatform()
+}
+
 shadowJar {
     relocate "org.apache", "${project.group}.${rootProject.name.toLowerCase()}.shadow.org.apache"
 }

diff --git a/bukkit/src/main/java/net/kunmc/lab/commandlib/util/ReflectionUtil.java b/bukkit/src/main/java/net/kunmc/lab/commandlib/util/ReflectionUtil.java
@@ -4,9 +4,6 @@
 import java.lang.reflect.Method;
 
 public class ReflectionUtil {
-    private ReflectionUtil() {
-    }
-
     public static Field getFieldIncludingSuperclasses(Class<?> clazz, String name) throws NoSuchFieldException {
         Field field;
 
@@ -40,4 +37,7 @@ public static Method getMethodIncludingSuperclasses(Class<?> clazz,
 
         return method;
     }
+
+    private ReflectionUtil() {
+    }
 }
diff --git a/bukkit/src/main/java/net/kunmc/lab/commandlib/util/bukkit/VersionUtil.java b/bukkit/src/main/java/net/kunmc/lab/commandlib/util/bukkit/VersionUtil.java
@@ -0,0 +1,61 @@
+package net.kunmc.lab.commandlib.util.bukkit;
+
+import org.bukkit.Bukkit;
+
+import java.util.regex.Pattern;
+
+public class VersionUtil {
+    private static final Pattern MINECRAFT_VERSION_PATTERN = Pattern.compile("\\d+.\\d+.\\d+");
+
+    private static void checkMinecraftVersionFormat(String s) {
+        if (!MINECRAFT_VERSION_PATTERN.matcher(s)
+                                      .matches()) {
+            throw new InvalidVersionFormatException("'" + s + "' is not satisfies the version format '\\d+.\\d+.\\d+'");
+        }
+    }
+
+    public static boolean is1_20_x() {
+        return compareMinecraftVersion(Bukkit.getMinecraftVersion(),
+                                       "1.19.99999") > 0 && compareMinecraftVersion(Bukkit.getMinecraftVersion(),
+                                                                                    "1.21.0") < 0;
+    }
+
+    /**
+     * Compares two Minecraft Version values numerically.
+     *
+     * @param x the first Minecraft Version to compare
+     * @param y the second Minecraft Version to compare
+     * @return the value {@code 0} if {@code x == y};
+     * a value less than {@code 0} if {@code x < y}; and
+     * a value greater than {@code 0} if {@code x > y}
+     */
+    public static int compareMinecraftVersion(String x, String y) {
+        checkMinecraftVersionFormat(x);
+        checkMinecraftVersionFormat(y);
+
+        String[] xUnits = x.split("\\.");
+        String[] yUnits = y.split("\\.");
+        for (int i = 0; i < xUnits.length; i++) {
+            int xn = Integer.parseInt(xUnits[i]);
+            int yn = Integer.parseInt(yUnits[i]);
+
+            if (xn < yn) {
+                return -1;
+            }
+            if (xn > yn) {
+                return 1;
+            }
+        }
+
+        return 0;
+    }
+
+    public static class InvalidVersionFormatException extends RuntimeException {
+        public InvalidVersionFormatException(String message) {
+            super(message);
+        }
+    }
+
+    private VersionUtil() {
+    }
+}
diff --git a/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/NMSClass.java b/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/NMSClass.java
@@ -69,6 +69,10 @@ protected final Object invokeMethod(String[] methodNames, Object... args) {
         return invokeMethod(methodNames, argClasses, args);
     }
 
+    protected final Object invokeMethod(String methodName, Class<?>[] parameterClasses, Object... args) {
+        return invokeMethod(new String[]{methodName}, parameterClasses, args);
+    }
+
     protected final Object invokeMethod(String[] methodNames, Class<?>[] parameterClasses, Object... args) {
         Method method = null;
         for (String methodName : methodNames) {

diff --git a/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/NMSReflection.java b/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/NMSReflection.java
@@ -21,13 +21,26 @@ public class NMSReflection {
                                                           .getClassLoader();
 
     static {
-        VERSION = Bukkit.getServer()
+        String ver;
+        try {
+            ver = Bukkit.getServer()
                         .getClass()
                         .getPackage()
                         .getName()
                         .split("\\.")[3];
-        NMS_PACKAGE_PREFIX = "net.minecraft.server." + VERSION;
-        CRAFT_BUKKIT_PACKAGE_PREFIX = "org.bukkit.craftbukkit." + VERSION;
+        } catch (ArrayIndexOutOfBoundsException e) {
+            // 1.20.6からはバージョンがパッケージ名から消えていた
+            ver = null;
+        }
+        VERSION = ver;
+
+        if (VERSION != null) {
+            NMS_PACKAGE_PREFIX = "net.minecraft.server." + VERSION;
+            CRAFT_BUKKIT_PACKAGE_PREFIX = "org.bukkit.craftbukkit." + VERSION;
+        } else {
+            NMS_PACKAGE_PREFIX = "net.minecraft.server";
+            CRAFT_BUKKIT_PACKAGE_PREFIX = "org.bukkit.craftbukkit";
+        }
     }
 
     @NotNull

diff --git a/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/argument/NMSArgumentEnchantment.java b/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/argument/NMSArgumentEnchantment.java
@@ -2,6 +2,7 @@
 
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.context.CommandContext;
+import net.kunmc.lab.commandlib.util.bukkit.VersionUtil;
 import net.kunmc.lab.commandlib.util.nms.command.NMSCommandBuildContext;
 import net.kunmc.lab.commandlib.util.nms.core.NMSHolder;
 import net.kunmc.lab.commandlib.util.nms.core.NMSRegistries;
@@ -32,6 +33,10 @@ public ArgumentType<?> argument() {
 
     @Override
     protected NMSEnchantment parseImpl(CommandContext<?> ctx, String name) {
+        if (VersionUtil.is1_20_x()) {
+            return new NMSEnchantment(new NMSHolder.NMSReference(invokeMethod("g", ctx, name)).value());
+        }
+
         try {
             return new NMSEnchantment(invokeMethod("a", ctx, name));
         } catch (MethodNotFoundException e) {

diff --git a/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/argument/NMSArgumentMobEffect.java b/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/argument/NMSArgumentMobEffect.java
@@ -2,6 +2,7 @@
 
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.context.CommandContext;
+import net.kunmc.lab.commandlib.util.bukkit.VersionUtil;
 import net.kunmc.lab.commandlib.util.nms.command.NMSCommandBuildContext;
 import net.kunmc.lab.commandlib.util.nms.core.NMSHolder;
 import net.kunmc.lab.commandlib.util.nms.core.NMSRegistries;
@@ -32,6 +33,10 @@ public ArgumentType<?> argument() {
 
     @Override
     protected NMSMobEffectList parseImpl(CommandContext<?> ctx, String name) {
+        if (VersionUtil.is1_20_x()) {
+            return new NMSMobEffectList(new NMSHolder.NMSReference(invokeMethod("f", ctx, name)).value());
+        }
+
         try {
             return new NMSMobEffectList(invokeMethod("a", ctx, name));
         } catch (MethodNotFoundException e) {

diff --git a/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/chat/NMSTranslatableContents.java b/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/chat/NMSTranslatableContents.java
@@ -1,5 +1,6 @@
 package net.kunmc.lab.commandlib.util.nms.chat;
 
+import net.kunmc.lab.commandlib.util.bukkit.VersionUtil;
 import net.kunmc.lab.commandlib.util.nms.MinecraftClass;
 
 public class NMSTranslatableContents extends MinecraftClass {
@@ -8,10 +9,18 @@ public NMSTranslatableContents(Object handle) {
     }
 
     public String getKey() {
+        if (VersionUtil.is1_20_x()) {
+            return ((String) invokeMethod("b"));
+        }
+
         return ((String) invokeMethod("a", "getKey"));
     }
 
     public Object[] getArgs() {
+        if (VersionUtil.is1_20_x()) {
+            return ((Object[]) invokeMethod("d"));
+        }
+
         return ((Object[]) invokeMethod("c", "getArgs"));
     }
 }
diff --git a/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/core/NMSRegistries.java b/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/core/NMSRegistries.java
@@ -1,5 +1,6 @@
 package net.kunmc.lab.commandlib.util.nms.core;
 
+import net.kunmc.lab.commandlib.util.bukkit.VersionUtil;
 import net.kunmc.lab.commandlib.util.nms.MinecraftClass;
 import net.kunmc.lab.commandlib.util.nms.resources.NMSResourceKey;
 
@@ -9,10 +10,18 @@ public NMSRegistries() {
     }
 
     public NMSResourceKey enchantment() {
+        if (VersionUtil.is1_20_x()) {
+            return new NMSResourceKey(getValue(Object.class, "t", "ENCHANTMENT"));
+        }
+
         return new NMSResourceKey(getValue(Object.class, "q", "ENCHANTMENT"));
     }
 
     public NMSResourceKey mobEffect() {
+        if (VersionUtil.is1_20_x()) {
+            return new NMSResourceKey(getValue(Object.class, "Q", "MOB_EFFECT"));
+        }
+
         return new NMSResourceKey(getValue(Object.class, "N", "MOB_EFFECT"));
     }
 }
diff --git a/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/server/NMSDedicatedServer.java b/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/server/NMSDedicatedServer.java
@@ -1,5 +1,6 @@
 package net.kunmc.lab.commandlib.util.nms.server;
 
+import net.kunmc.lab.commandlib.util.bukkit.VersionUtil;
 import net.kunmc.lab.commandlib.util.nms.MinecraftClass;
 import net.kunmc.lab.commandlib.util.nms.command.NMSCommandDispatcher;
 
@@ -9,11 +10,21 @@ public NMSDedicatedServer(Object handle) {
     }
 
     public NMSCommandDispatcher getCommandDispatcher() {
+        if (VersionUtil.is1_20_x()) {
+            return new NMSCommandDispatcher(invokeMethod("aE"));
+        }
+
         return new NMSCommandDispatcher(invokeMethod("getCommandDispatcher", "getCommands", "aC"));
     }
 
     public NMSDataPackResources getDataPackResources() {
-        Object obj = getValue(Object.class, "dataPackResources", "au", "resources");
+        Object obj;
+        if (VersionUtil.is1_20_x()) {
+            obj = getValue(Object.class, "ax");
+        } else {
+            obj = getValue(Object.class, "dataPackResources", "au", "resources");
+        }
+
         try {
             return new NMSDataPackResources(obj);
         } catch (Exception e) {

diff --git a/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/world/NMSCraftEnchantment.java b/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/world/NMSCraftEnchantment.java
@@ -1,5 +1,6 @@
 package net.kunmc.lab.commandlib.util.nms.world;
 
+import net.kunmc.lab.commandlib.util.bukkit.VersionUtil;
 import net.kunmc.lab.commandlib.util.nms.CraftBukkitClass;
 import org.bukkit.enchantments.Enchantment;
 
@@ -9,6 +10,10 @@ public NMSCraftEnchantment() {
     }
 
     public Enchantment createInstance(NMSEnchantment nms) {
+        if (VersionUtil.is1_20_x()) {
+            return ((Enchantment) invokeMethod("minecraftToBukkit", new Class[]{nms.getFoundClass()}, nms.getHandle()));
+        }
+
         return ((Enchantment) newInstance(new Class[]{nms.getFoundClass()}, new Object[]{nms.getHandle()}));
     }
 }
diff --git a/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/world/NMSCraftPotionEffectType.java b/bukkit/src/main/java/net/kunmc/lab/commandlib/util/nms/world/NMSCraftPotionEffectType.java
@@ -1,5 +1,6 @@
 package net.kunmc.lab.commandlib.util.nms.world;
 
+import net.kunmc.lab.commandlib.util.bukkit.VersionUtil;
 import net.kunmc.lab.commandlib.util.nms.CraftBukkitClass;
 import org.bukkit.potion.PotionEffectType;
 
@@ -13,6 +14,12 @@ public NMSCraftPotionEffectType(Object handle) {
     }
 
     public PotionEffectType createInstance(NMSMobEffectList nms) {
+        if (VersionUtil.is1_20_x()) {
+            return ((PotionEffectType) invokeMethod("minecraftToBukkit",
+                                                    new Class[]{nms.getFoundClass()},
+                                                    nms.getHandle()));
+        }
+
         return ((PotionEffectType) newInstance(new Class[]{nms.getFoundClass()}, new Object[]{nms.getHandle()}));
     }
 }
diff --git a/bukkit/src/test/java/net/kunmc/lab/commandlib/util/bukkit/VersionUtilTest.java b/bukkit/src/test/java/net/kunmc/lab/commandlib/util/bukkit/VersionUtilTest.java
@@ -0,0 +1,31 @@
+package net.kunmc.lab.commandlib.util.bukkit;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+class VersionUtilTest {
+    @Nested
+    class CompareMinecraftVersion {
+        @Test
+        void returns_zero_with_same_values() {
+            int res = VersionUtil.compareMinecraftVersion("1.16.5", "1.16.5");
+            Assertions.assertThat(res)
+                      .isEqualTo(0);
+        }
+
+        @Test
+        void returns_negative_when_x_is_lower() {
+            int res = VersionUtil.compareMinecraftVersion("1.16.5", "1.20.4");
+            Assertions.assertThat(res)
+                      .isLessThan(0);
+        }
+
+        @Test
+        void returns_positive_when_x_is_greater() {
+            int res = VersionUtil.compareMinecraftVersion("1.20.4", "1.16.5");
+            Assertions.assertThat(res)
+                      .isGreaterThan(0);
+        }
+    }
+}
diff --git a/bukkit/test_plugin_1.16.5/README.md b/bukkit/test_plugin_1.16.5/README.md
diff --git a/bukkit/test_plugin_1.19.4/README.md b/bukkit/test_plugin_1.19.4/README.md