Experimental

PhantomVoting/dependency-reduced-pom.xml

@@ -36,10 +36,6 @@
         <configuration>
           <minimizeJar>true</minimizeJar>
           <relocations>
-            <relocation>
-              <pattern>dev.jorel.commandapi</pattern>
-              <shadedPattern>me.fergs.commandapi</shadedPattern>
-            </relocation>
             <relocation>
               <pattern>org.bstats</pattern>
               <shadedPattern>me.bstats</shadedPattern>
@@ -50,14 +46,14 @@
     </plugins>
   </build>
   <repositories>
-    <repository>
-      <id>spigot-repo</id>
-      <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-    </repository>
     <repository>
       <id>maven-central</id>
       <url>https://oss.sonatype.org/content/groups/public</url>
     </repository>
+    <repository>
+      <id>spigot-repo</id>
+      <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+    </repository>
     <repository>
       <id>bencodez repo</id>
       <url>https://nexus.bencodez.com/repository/maven-public/</url>
@@ -90,12 +86,6 @@
       <version>2.11.6</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>dev.jorel</groupId>
-      <artifactId>commandapi-bukkit-core</artifactId>
-      <version>10.1.2</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.mojang</groupId>
       <artifactId>authlib</artifactId>

PhantomVoting/pom.xml

@@ -43,11 +43,6 @@
                 <configuration>
                     <minimizeJar>true</minimizeJar>
                     <relocations>
-                        <!-- Relocate CommandAPI -->
-                        <relocation>
-                            <pattern>dev.jorel.commandapi</pattern>
-                            <shadedPattern>me.fergs.commandapi</shadedPattern>
-                        </relocation>
                         <!-- Relocate bStats -->
                         <relocation>
                             <pattern>org.bstats</pattern>
@@ -66,14 +61,14 @@
     </build>
 
     <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
         <repository>
             <id>maven-central</id>
             <url>https://oss.sonatype.org/content/groups/public</url>
         </repository>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
         <repository>
             <id>bencodez repo</id>
             <url>https://nexus.bencodez.com/repository/maven-public/</url>
@@ -107,17 +102,6 @@
             <version>2.11.6</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>dev.jorel</groupId>
-            <artifactId>commandapi-bukkit-core</artifactId>
-            <version>10.1.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>dev.jorel</groupId>
-            <artifactId>commandapi-bukkit-shade</artifactId>
-            <version>10.1.2</version>
-        </dependency>
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>

PhantomVoting/src/main/java/me/fergs/phantomvoting/PhantomVoting.java

@@ -1,9 +1,6 @@
 package me.fergs.phantomvoting;
 
-import dev.jorel.commandapi.CommandAPI;
-import dev.jorel.commandapi.CommandAPIBukkitConfig;
-import me.fergs.phantomvoting.commands.AdminCommands;
-import me.fergs.phantomvoting.commands.PlayerCommands;
+import me.fergs.phantomvoting.commands.impl.CommandManager;
 import me.fergs.phantomvoting.config.ConfigurationManager;
 import me.fergs.phantomvoting.database.VoteStorage;
 import me.fergs.phantomvoting.inventories.LeaderboardInventory;
@@ -35,16 +32,8 @@ public final class PhantomVoting extends JavaPlugin {
     private VoteReminderManager<PhantomVoting> voteReminderManager;
     private MilestonesInventory milestonesInventory;
     private StreaksInventory streaksInventory;
-    /**
-     * Called when the plugin is loaded.
-     * This is where we register the Command API if it is not already loaded.
-     */
-    @Override
-    public void onLoad() {
-        if (!CommandAPI.isLoaded()) {
-            CommandAPI.onLoad(new CommandAPIBukkitConfig(this).verboseOutput(false));
-        }
-    }
+    private CommandManager commandManager;
+
     @Override
     public void onEnable() {
         instance = this;
@@ -89,8 +78,8 @@ public void onEnable() {
             new PlaceholderManager(voteStorage, votePartyManager).register();
         }
 
-        new PlayerCommands().register(this);
-        new AdminCommands().register(this);
+        commandManager = new CommandManager(this);
+        commandManager.registerCommands();
 
         if (configurationManager.isModuleEnabled("bossbar")) {
             bossbarManager = new BossbarManager<>(this);
@@ -109,6 +98,7 @@ public void onEnable() {
 
         new Metrics(this, 23888);
     }
+
     @Override
     public void onDisable() {
         try {
@@ -123,21 +113,25 @@ public void onDisable() {
             voteReminderManager.cancelAllTasks();
         }
     }
+
     /**
      * Gets the plugin instance.
      *
      * @return the plugin instance
      */
     public static PhantomVoting getInstance() {
         return instance;
-    }/**
+    }
+
+    /**
      * Gets the configuration manager.
      *
      * @return the configuration manager
      */
     public ConfigurationManager<PhantomVoting> getConfigurationManager() {
         return configurationManager;
     }
+
     /**
      * Gets the message manager.
      *
@@ -146,6 +140,7 @@ public ConfigurationManager<PhantomVoting> getConfigurationManager() {
     public MessageManager<PhantomVoting> getMessageManager() {
         return messageManager;
     }
+
     /**
      * Gets the vote storage.
      *
@@ -154,6 +149,7 @@ public MessageManager<PhantomVoting> getMessageManager() {
     public VoteStorage getVoteStorage() {
         return voteStorage;
     }
+
     /**
      * Gets the vote party manager.
      *
@@ -162,6 +158,7 @@ public VoteStorage getVoteStorage() {
     public VotePartyManager getVotePartyManager() {
         return votePartyManager;
     }
+
     /**
      * Gets the listener manager.
      *
@@ -170,6 +167,7 @@ public VotePartyManager getVotePartyManager() {
     public ListenerManager<PhantomVoting> getListenerManager() {
         return listenerManager;
     }
+
     /**
      * Gets the player manager.
      *
@@ -178,6 +176,7 @@ public ListenerManager<PhantomVoting> getListenerManager() {
     public PlayerManager<PhantomVoting> getPlayerManager() {
         return playerManager;
     }
+
     /**
      * Gets the bossbar manager.
      *
@@ -186,6 +185,7 @@ public PlayerManager<PhantomVoting> getPlayerManager() {
     public BossbarManager<PhantomVoting> getBossbarManager() {
         return bossbarManager;
     }
+
     /**
      * Gets the leaderboard inventory.
      *
@@ -194,6 +194,7 @@ public BossbarManager<PhantomVoting> getBossbarManager() {
     public LeaderboardInventory<PhantomVoting> getLeaderboardInventory() {
         return leaderboardInventory;
     }
+
     /**
      * Gets the vote reminder manager.
      *
@@ -202,6 +203,7 @@ public LeaderboardInventory<PhantomVoting> getLeaderboardInventory() {
     public VoteReminderManager<PhantomVoting> getVoteReminderManager() {
         return voteReminderManager;
     }
+
     /**
      * Gets the milestones inventory.
      *
@@ -210,6 +212,7 @@ public VoteReminderManager<PhantomVoting> getVoteReminderManager() {
     public MilestonesInventory getMilestonesInventory() {
         return milestonesInventory;
     }
+
     /**
      * Gets the streaks inventory.
      *