Properly add 1.20.4 support

Test-Account666 · Dec 30, 2023 · 8e08631 · 8e08631
1 parent 80213d9
commit 8e08631
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/main/java/com/rylinaux/plugman/util/BukkitCommandWrap.java b/src/main/java/com/rylinaux/plugman/util/BukkitCommandWrap.java
@@ -80,11 +80,22 @@ public void wrap(Command command, String alias) {
         }
 
         if (this.bField == null) try {
-            this.bField = Class.forName("net.minecraft.commands.CommandDispatcher").getDeclaredField("g");
+            this.bField = Class.forName("net.minecraft.server." + this.nmsVersion + ".CommandDispatcher").getDeclaredField("b");
             this.bField.setAccessible(true);
         } catch (NoSuchFieldException | ClassNotFoundException e) {
-            e.printStackTrace();
-            return;
+            if (this.bField == null) try {
+                Class<?> commandDispatcherClass = Class.forName("net.minecraft.commands.CommandDispatcher");
+                if (commandDispatcherClass.getDeclaredField("g").getType() == com.mojang.brigadier.CommandDispatcher.class) {
+                    this.bField = commandDispatcherClass.getDeclaredField("g");
+                } else {
+                    this.bField = commandDispatcherClass.getDeclaredField("h");
+                }
+                this.bField.setAccessible(true);
+            } catch (NoSuchFieldException | ClassNotFoundException ex) {
+                ex.addSuppressed(e);
+                e.printStackTrace();
+                return;
+            }
         }
 
         com.mojang.brigadier.CommandDispatcher b;