stuff

Author: ThatPotatoDev

PotatoDiscordLink/src/main/java/com/mcdragonmasters/potatodiscordlink/PotatoDiscordLink.java

@@ -35,8 +35,8 @@ public class PotatoDiscordLink extends PotatoPlugin {
     private static JDA jda;
     @Getter
     private static LinkManager linkManager;
-    @Override
     @SneakyThrows
+    @Override
     public void onEnable() {
         saveDefaultConfig();
         INSTANCE = this;

PotatoEssentials/src/main/java/com/mcdragonmasters/potatoessentials/PotatoPlugin.java

@@ -7,11 +7,8 @@
 
 public abstract class PotatoPlugin extends JavaPlugin {
     private PotatoLogger logger = null;
-    private PotatoCommandRegistrar commandRegistrar = null;
+    private final PotatoCommandRegistrar commandRegistrar = new PotatoCommandRegistrar(this);
     public PotatoCommandRegistrar getCommandRegistrar() {
-        if (this.commandRegistrar == null) {
-            this.commandRegistrar = new PotatoCommandRegistrar(this);
-        }
         return this.commandRegistrar;
     }
     @Override

PotatoEssentials/src/main/java/com/mcdragonmasters/potatoessentials/commands/EnchantCommand.java

@@ -4,7 +4,6 @@
 import com.mcdragonmasters.potatoessentials.utils.PotatoCommand;
 import com.mcdragonmasters.potatoessentials.utils.Replacer;
 import com.mcdragonmasters.potatoessentials.utils.Utils;
-import dev.jorel.commandapi.CommandAPI;
 import dev.jorel.commandapi.CommandAPICommand;
 import dev.jorel.commandapi.arguments.Argument;
 import dev.jorel.commandapi.arguments.EnchantmentArgument;
@@ -30,7 +29,6 @@ public EnchantCommand() {
 
     @Override
     public void register() {
-        CommandAPI.unregister(name);
         new CommandAPICommand(name)
                 .withPermission(permission)
                 .withArguments(playerArg)

PotatoEssentials/src/main/java/com/mcdragonmasters/potatoessentials/commands/GameModeCommand.java

@@ -1,6 +1,5 @@
 package com.mcdragonmasters.potatoessentials.commands;
 import com.mcdragonmasters.potatoessentials.utils.PotatoCommand;
-import dev.jorel.commandapi.CommandAPI;
 import dev.jorel.commandapi.CommandAPICommand;
 import dev.jorel.commandapi.arguments.Argument;
 import dev.jorel.commandapi.arguments.EntitySelectorArgument;
@@ -24,8 +23,6 @@ public GameModeCommand() {
     @Override
     public void register() {
 
-        CommandAPI.unregister("gamemode");
-
         Argument<String> gmArg = new MultiLiteralArgument("gamemode",
                 "adventure", "creative", "spectator", "survival",
                 "a", "c", "sp", "s", "0", "1", "2", "3");

PotatoEssentials/src/main/java/com/mcdragonmasters/potatoessentials/commands/messaging/MessageCommand.java

@@ -4,7 +4,6 @@
 import com.mcdragonmasters.potatoessentials.utils.PotatoCommand;
 import com.mcdragonmasters.potatoessentials.utils.Replacer;
 import com.mcdragonmasters.potatoessentials.utils.Utils;
-import dev.jorel.commandapi.CommandAPI;
 import dev.jorel.commandapi.CommandAPICommand;
 import dev.jorel.commandapi.arguments.Argument;
 import dev.jorel.commandapi.arguments.EntitySelectorArgument;
@@ -35,11 +34,6 @@ public MessageCommand() {
 
     @Override
     public void register() {
-        CommandAPI.unregister("message");
-        CommandAPI.unregister("msg");
-        CommandAPI.unregister("whisper");
-        CommandAPI.unregister("w");
-
         new CommandAPICommand(name)
                 .withAliases(aliases)
                 .withPermission(permission)

PotatoEssentials/src/main/java/com/mcdragonmasters/potatoessentials/utils/PotatoCommandRegistrar.java

@@ -1,16 +1,15 @@
 package com.mcdragonmasters.potatoessentials.utils;
 
-import com.mcdragonmasters.potatoessentials.PotatoEssentials;
 import com.mcdragonmasters.potatoessentials.PotatoPlugin;
 import dev.jorel.commandapi.CommandAPI;
+import dev.jorel.commandapi.CommandAPIBukkit;
 import dev.jorel.commandapi.InternalConfig;
 import lombok.Getter;
+import lombok.Setter;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
 import java.util.logging.Level;
 
 public class PotatoCommandRegistrar {
@@ -22,29 +21,39 @@ public class PotatoCommandRegistrar {
     @Getter
     private final List<String> registeredCommandNames = new ArrayList<>();
     private final HashMap<Class<? extends PotatoCommand>, PotatoCommand> commandInstances = new HashMap<>();
+    @Setter
+    private Function<String, Boolean> commandEnabledCheck;
 
     public PotatoCommandRegistrar(PotatoPlugin plugin) {
         this.plugin = plugin;
         this.LOGGER = plugin.getLogger();
-        PotatoEssentials.INSTANCE.getCmdAPIConfig().setNamespace(plugin.getName().toLowerCase());
-        try {
-            Field field = InternalConfig.class.getDeclaredField("namespace");
-            field.setAccessible(true);
-            field.set(CommandAPI.getConfiguration(), plugin.getName().toLowerCase());
-        } catch (Exception e) {
-            LOGGER.log(Level.SEVERE, "error setting namespace", e);
-        }
+        setCommandEnabledCheck((name) -> plugin.getConfig().getBoolean("commands."+name+".enabled"));
     }
 
     public <T extends PotatoCommand> T getCommandInstance(Class<T> clazz) {
         return clazz.cast(commandInstances.get(clazz));
     }
 
     public void register(PotatoCommand command, boolean forced) {
+        if (!CommandAPI.getConfiguration().getNamespace().equals(plugin.getName().toLowerCase())) {
+            try {
+                Field field = InternalConfig.class.getDeclaredField("namespace");
+                field.setAccessible(true);
+                field.set(CommandAPI.getConfiguration(), plugin.getName().toLowerCase());
+            } catch (Exception e) {
+                LOGGER.log(Level.SEVERE, "error setting namespace", e);
+            }
+        }
         String name = command.getName();
         if (commandInstances.containsKey(command.getClass())) {
             LOGGER.warning("Command '"+command+"' was registered multiple times!");
-        } else if (forced || Config.commandEnabled(name, plugin.getConfig())) {
+        } else if (forced || commandEnabledCheck.apply(name)) {
+            for (String alias : command.getAliases()) {
+                CommandAPIBukkit.unregister(alias, false, true);
+                CommandAPIBukkit.unregister(alias, false, false);
+            }
+            CommandAPIBukkit.unregister(name, false, true);
+            CommandAPIBukkit.unregister(name, false, false);
             command.registrar = this;
             command.register();
             var msg = "Registering command '%s'";
@@ -63,7 +72,6 @@ public void register(List<PotatoCommand> commands) {
             this.register(command, false);
         }
     }
-
     public void register(PotatoCommand... commands) {
         this.register(Arrays.asList(commands));
     }