From f2ab5521d10b5efe8b079bc4ae0f730f8ac48cd9 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Fri, 8 Jan 2021 20:00:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=D1=81=D1=8F=20=D0=BE=D1=82=20=D1=80=D0=B5=D1=84?= =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B8=D0=B8:=20CommnadManager:=20regis?= =?UTF-8?q?ter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildSrc/src/main/groovy/libs/LibsExtention.groovy | 1 - .../bukkit/craftbukkit/v1_12_R1/CraftServer.java | 10 ++++++++++ tools/build.gradle | 1 - .../main/java/ghast/command/CommandManager.java | 14 +++++--------- 4 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 phantom-classes/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftServer.java diff --git a/buildSrc/src/main/groovy/libs/LibsExtention.groovy b/buildSrc/src/main/groovy/libs/LibsExtention.groovy index 938030e..edf3e51 100644 --- a/buildSrc/src/main/groovy/libs/LibsExtention.groovy +++ b/buildSrc/src/main/groovy/libs/LibsExtention.groovy @@ -5,7 +5,6 @@ class LibsExtention { final def commons_text = 'org.apache.commons:commons-text:1.9' final def lombok = 'org.projectlombok:lombok:1.18.12' - final def refobj = 'ru.dmitriymx:reflection-object:1.2' final def bukkit = filter([ lib : 'org.bukkit:bukkit:1.12.2-R0.1-SNAPSHOT', diff --git a/phantom-classes/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftServer.java b/phantom-classes/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftServer.java new file mode 100644 index 0000000..09ae211 --- /dev/null +++ b/phantom-classes/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftServer.java @@ -0,0 +1,10 @@ +package org.bukkit.craftbukkit.v1_12_R1; + +import org.bukkit.command.SimpleCommandMap; + +public class CraftServer { + + public SimpleCommandMap getCommandMap() { + return null; + } +} diff --git a/tools/build.gradle b/tools/build.gradle index a9416c6..f524670 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -7,7 +7,6 @@ dependencies { compileOnly project(':phantom-classes') compileOnly libs.bukkit implementation libs.commons_text - implementation libs.refobj testImplementation libs.bukkit testImplementation libs.test.h2db diff --git a/tools/src/main/java/ghast/command/CommandManager.java b/tools/src/main/java/ghast/command/CommandManager.java index b4a27f7..4e86314 100644 --- a/tools/src/main/java/ghast/command/CommandManager.java +++ b/tools/src/main/java/ghast/command/CommandManager.java @@ -4,8 +4,7 @@ import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.UtilityClass; import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import ru.dmitriymx.reflection.ReflectionObject; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; @UtilityClass @SuppressWarnings("unused") @@ -59,13 +58,10 @@ public class CommandManager { } public void register() { - //TODO для Paper такие "извращения" не требуются. Нужно продумать. - new ReflectionObject(Bukkit.getServer()) - .method("getCommandMap").invoke() - .method("register", String.class, Command.class).invoke( - name, new CommandWrapper(name, this.onlyPlayer, this.deniedMessage, - this.executer, this.errorConsumer) - ); + ((CraftServer) Bukkit.getServer()).getCommandMap().register( + name, + new CommandWrapper(name, this.onlyPlayer, this.deniedMessage, this.executer, this.errorConsumer) + ); } } }