From b023751c61762d4460242425188acf6855e023b5 Mon Sep 17 00:00:00 2001
From: xSquishyLiam <56977759+xSquishyLiam@users.noreply.github.com>
Date: Tue, 16 Dec 2025 22:36:33 +0000
Subject: [PATCH] Reenabled CommandAPI

---
 .idea/workspace.xml                           |  2 +-
 paper/build.gradle.kts                        |  4 ++--
 .../geysermodelengine/GeyserModelEngine.java  |  8 +++++---
 .../GeyserModelEngineReloadCommand.java       | 20 ++++++++++---------
 .../GeyserModelEngineCommandManager.java      | 11 +++++-----
 .../commands/subcommands/SubCommands.java     |  4 +++-
 6 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 04b1df4..fd17992 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,7 +11,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="DarkyenusTimeTracker">
-    <option name="totalTimeSeconds" value="32226" />
+    <option name="totalTimeSeconds" value="34744" />
   </component>
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts
index f4e67cf..5129cdf 100644
--- a/paper/build.gradle.kts
+++ b/paper/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "re.imc"
-version = "1.0.1"
+version = "1.0.2"
 
 repositories {
     mavenCentral()
@@ -21,7 +21,7 @@ repositories {
 
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT")
-//    implementation("dev.jorel:commandapi-paper-shade:11.0.0")
+    implementation("dev.jorel:commandapi-paper-shade:11.1.0")
 
     compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.9")
     compileOnly("io.github.toxicity188:bettermodel:1.14.0")
diff --git a/paper/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java b/paper/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java
index edc1384..eb45dc9 100644
--- a/paper/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java
+++ b/paper/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java
@@ -2,6 +2,8 @@ package re.imc.geysermodelengine;
 
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.event.PacketListenerPriority;
+import dev.jorel.commandapi.CommandAPI;
+import dev.jorel.commandapi.CommandAPIPaperConfig;
 import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
@@ -34,7 +36,7 @@ public class GeyserModelEngine extends JavaPlugin {
         PacketEvents.setAPI(SpigotPacketEventsBuilder.build(this));
         PacketEvents.getAPI().load();
 
-//        CommandAPI.onLoad(new CommandAPIPaperConfig(this));
+        CommandAPI.onLoad(new CommandAPIPaperConfig(this));
         preLoadManagers();
     }
 
@@ -56,13 +58,13 @@ public class GeyserModelEngine extends JavaPlugin {
         this.modelManager.removeEntities();
 
         PacketEvents.getAPI().terminate();
-//        CommandAPI.onDisable();
+        CommandAPI.onDisable();
     }
 
     private void loadHooks() {
         PacketEvents.getAPI().init();
         FloodgateAPIHook.loadHook(this);
-//        CommandAPI.onEnable();
+        CommandAPI.onEnable();
     }
 
     private void loadBStats() {
diff --git a/paper/src/main/java/re/imc/geysermodelengine/commands/geysermodelenginecommands/GeyserModelEngineReloadCommand.java b/paper/src/main/java/re/imc/geysermodelengine/commands/geysermodelenginecommands/GeyserModelEngineReloadCommand.java
index 5ecd25f..2e4bfa7 100644
--- a/paper/src/main/java/re/imc/geysermodelengine/commands/geysermodelenginecommands/GeyserModelEngineReloadCommand.java
+++ b/paper/src/main/java/re/imc/geysermodelengine/commands/geysermodelenginecommands/GeyserModelEngineReloadCommand.java
@@ -1,5 +1,7 @@
 package re.imc.geysermodelengine.commands.geysermodelenginecommands;
 
+import dev.jorel.commandapi.CommandAPICommand;
+import org.bukkit.Bukkit;
 import re.imc.geysermodelengine.GeyserModelEngine;
 import re.imc.geysermodelengine.managers.commands.subcommands.SubCommands;
 import re.imc.geysermodelengine.util.ColourUtils;
@@ -14,13 +16,13 @@ public class GeyserModelEngineReloadCommand implements SubCommands {
         this.plugin = plugin;
     }
 
-//    @Override
-//    public CommandAPICommand onCommand() {
-//        return new CommandAPICommand("reload")
-//                .withPermission("geysermodelengine.commands.reload")
-//                .executes((sender, args) -> {
-//                    Bukkit.getAsyncScheduler().runNow(plugin, scheduledTask -> plugin.getConfigManager().load());
-//                    sender.sendMessage(colourUtils.miniFormat(plugin.getConfigManager().getLang().getString("commands.reload.successfully-reloaded")));
-//                });
-//    }
+    @Override
+    public CommandAPICommand onCommand() {
+        return new CommandAPICommand("reload")
+                .withPermission("geysermodelengine.commands.reload")
+                .executes((sender, args) -> {
+                    Bukkit.getAsyncScheduler().runNow(plugin, scheduledTask -> plugin.getConfigManager().load());
+                    sender.sendMessage(colourUtils.miniFormat(plugin.getConfigManager().getLang().getString("commands.reload.successfully-reloaded")));
+                });
+    }
 }
\ No newline at end of file
diff --git a/paper/src/main/java/re/imc/geysermodelengine/managers/commands/managers/geysermodelengine/GeyserModelEngineCommandManager.java b/paper/src/main/java/re/imc/geysermodelengine/managers/commands/managers/geysermodelengine/GeyserModelEngineCommandManager.java
index c821956..37b0a7d 100644
--- a/paper/src/main/java/re/imc/geysermodelengine/managers/commands/managers/geysermodelengine/GeyserModelEngineCommandManager.java
+++ b/paper/src/main/java/re/imc/geysermodelengine/managers/commands/managers/geysermodelengine/GeyserModelEngineCommandManager.java
@@ -1,5 +1,6 @@
 package re.imc.geysermodelengine.managers.commands.managers.geysermodelengine;
 
+import dev.jorel.commandapi.CommandAPICommand;
 import re.imc.geysermodelengine.GeyserModelEngine;
 import re.imc.geysermodelengine.commands.geysermodelenginecommands.GeyserModelEngineReloadCommand;
 import re.imc.geysermodelengine.managers.commands.CommandManagers;
@@ -18,11 +19,11 @@ public class GeyserModelEngineCommandManager implements CommandManagers {
     }
 
     private void registerCommand() {
-//        CommandAPICommand geyserModelEngineCommand = new CommandAPICommand(getName());
-//
-//        commands.forEach(subCommands -> geyserModelEngineCommand.withSubcommand(subCommands.onCommand()));
-//
-//        geyserModelEngineCommand.register();
+        CommandAPICommand geyserModelEngineCommand = new CommandAPICommand(getName());
+
+        commands.forEach(subCommands -> geyserModelEngineCommand.withSubcommand(subCommands.onCommand()));
+
+        geyserModelEngineCommand.register();
     }
 
     @Override
diff --git a/paper/src/main/java/re/imc/geysermodelengine/managers/commands/subcommands/SubCommands.java b/paper/src/main/java/re/imc/geysermodelengine/managers/commands/subcommands/SubCommands.java
index 7391e64..3d336fb 100644
--- a/paper/src/main/java/re/imc/geysermodelengine/managers/commands/subcommands/SubCommands.java
+++ b/paper/src/main/java/re/imc/geysermodelengine/managers/commands/subcommands/SubCommands.java
@@ -1,9 +1,11 @@
 package re.imc.geysermodelengine.managers.commands.subcommands;
 
+import dev.jorel.commandapi.CommandAPICommand;
+
 public interface SubCommands {
 
     /**
      * Subcommand setup
      */
-//    CommandAPICommand onCommand();
+    CommandAPICommand onCommand();
 }