Merge remote-tracking branch 'origin/v3' into v3

# Conflicts: # bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/MinecraftArgumentType.java
Revxrsal · Dec 24, 2024 · 86c00fc · 86c00fc
2 parents e7df2f2 + a14d364
commit 86c00fc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ subprojects {
     apply plugin: "maven-publish"
 
     group = "io.github.revxrsal"
-    version = "3.3.2"
+    version = "3.3.3"
 
     if (name != "velocity") {
         sourceCompatibility = 1.8

diff --git a/bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/BukkitVersion.java b/bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/BukkitVersion.java
@@ -130,9 +130,12 @@ public static int patchNumber() {
     @SneakyThrows
     public static @NotNull Class<?> findNmsClass(@NotNull String name) {
         if (supports(1, UNVERSION_NMS)) {
-            return Class.forName("net.minecraft.server." + name);
+            return Class.forName("net.minecraft." + name);
         }
-        return Class.forName("net.minecraft.server." + VERSION + "." + name);
+        int dotIndex = name.lastIndexOf('.');
+        if (dotIndex == -1)
+            return Class.forName("net.minecraft.server." + VERSION + "." + name);
+        return Class.forName("net.minecraft.server." + VERSION + "." + name.substring(dotIndex + 1));
     }
 
     /**

diff --git a/bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/ReflectionCommodore.java b/bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/ReflectionCommodore.java
@@ -64,14 +64,8 @@ final class ReflectionCommodore extends Commodore {
             final Class<?> minecraftServer;
             final Class<?> commandDispatcher;
 
-            if (BukkitVersion.supports(1, 16)) {
-                minecraftServer = BukkitVersion.findNmsClass("server.MinecraftServer");
-                commandDispatcher = BukkitVersion.findNmsClass("commands.CommandDispatcher");
-            } else {
-                minecraftServer = BukkitVersion.findNmsClass("MinecraftServer");
-                commandDispatcher = BukkitVersion.findNmsClass("CommandDispatcher");
-            }
-
+            minecraftServer = BukkitVersion.findNmsClass("server.MinecraftServer");
+            commandDispatcher = BukkitVersion.findNmsClass("commands.CommandDispatcher");
             Class<?> craftServer = BukkitVersion.findOcbClass("CraftServer");
             CONSOLE_FIELD = craftServer.getDeclaredField("console");
             CONSOLE_FIELD.setAccessible(true);