New module system

Author: Despical

src/main/java/dev/despical/commandframework/CommandArguments.java

@@ -18,6 +18,8 @@
 
 package dev.despical.commandframework;
 
+import dev.despical.commandframework.internal.FrameworkContext;
+import dev.despical.commandframework.internal.MessageHelper;
 import dev.despical.commandframework.utils.Utils;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
@@ -55,11 +57,13 @@ public final class CommandArguments {
 	private final String label;
 	private final String [] arguments;
 
-	CommandArguments(CommandSender commandSender,
-					 Command bukkitCommand,
-					 dev.despical.commandframework.annotations.Command command,
-					 String label,
-					 String... arguments) {
+	CommandArguments(
+        CommandSender commandSender,
+		Command bukkitCommand,
+		dev.despical.commandframework.annotations.Command command,
+		String label,
+		String... arguments
+    ) {
 		this.commandSender = commandSender;
 		this.bukkitCommand = bukkitCommand;
 		this.command = command;
@@ -257,7 +261,7 @@ public boolean isArgumentsEmpty() {
 	public void sendMessage(String message) {
 		if (message == null)
 			return;
-		commandSender.sendMessage(Message.applyColorFormatter(message));
+		commandSender.sendMessage(MessageHelper.applyColorFormatter(message));
 	}
 
 	/**
@@ -270,7 +274,7 @@ public void sendMessage(String message) {
 	public void sendMessage(String message, Object... params) {
 		if (message == null)
 			return;
-		commandSender.sendMessage(Message.applyColorFormatter(MessageFormat.format(message, params)));
+		commandSender.sendMessage(MessageHelper.applyColorFormatter(MessageFormat.format(message, params)));
 	}
 
 	/**
@@ -512,7 +516,7 @@ public boolean isFloatingDecimal(String string) {
 	 * @return {@code true} if the sender has a cooldown on this command
 	 */
 	public boolean checkCooldown() {
-		return CommandFramework.getInstance().getCooldownManager().hasCooldown(this);
+		return FrameworkContext.getInstance().getCooldownManager().hasCooldown(this);
 	}
 
 	void setParsedOptions(Map<String, List<String>> parsedOptions) {

src/main/java/dev/despical/commandframework/CommandFramework.java

@@ -20,19 +20,16 @@
 
 import dev.despical.commandframework.annotations.Command;
 import dev.despical.commandframework.annotations.Param;
-import dev.despical.commandframework.confirmations.ConfirmationManager;
 import dev.despical.commandframework.exceptions.CommandException;
-import dev.despical.commandframework.cooldown.CooldownManager;
 import dev.despical.commandframework.debug.DebugLogger;
 import dev.despical.commandframework.options.FrameworkOption;
 import dev.despical.commandframework.options.OptionManager;
 import org.bukkit.command.CommandMap;
-import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
@@ -52,22 +49,16 @@ public class CommandFramework extends CommandHandler {
 	protected static CommandFramework instance;
 
 	private Logger logger;
-	private CooldownManager cooldownManager;
-	private ConfirmationManager confirmationManager;
-
-	protected final Plugin plugin;
-	private final OptionManager optionManager;
-	private final CommandRegistry registry;
+	private final Plugin plugin;
+    private final OptionManager optionManager;
 
 	public CommandFramework(@NotNull Plugin plugin) {
 		this.checkRelocation();
 		this.checkIsAlreadyInitialized();
 
 		this.plugin = plugin;
-		this.registry = new CommandRegistry();
-		this.optionManager = new OptionManager();
+        this.optionManager = new OptionManager();
 		this.initializeLogger();
-		super.setRegistry(this);
 	}
 
 	private void checkRelocation() {
@@ -114,14 +105,14 @@ public final void registerCommands(@NotNull Object instance) {
 	 * @param commandName name of the command that's going to be removed
 	 */
 	public final void unregisterCommand(@NotNull String commandName) {
-		this.registry.unregisterCommand(commandName);
+        this.registry.unregisterCommand(commandName);
 	}
 
 	/**
 	 * Unregisters all of registered commands and tab completers using that instance.
 	 */
 	public final void unregisterCommands() {
-		this.registry.unregisterCommands();
+        this.registry.unregisterCommands();
 	}
 
 	/**
@@ -171,6 +162,7 @@ public final <T> void addCustomParameter(@NotNull Class<T> clazz, @NotNull Funct
 	 * @since 1.4.8
 	 */
 	@NotNull
+    @Contract(pure = true)
 	public final Logger getLogger() {
 		return logger;
 	}
@@ -195,31 +187,8 @@ public final OptionManager options() {
 		return this.optionManager;
 	}
 
-	@ApiStatus.Internal
-	CooldownManager getCooldownManager() {
-		if (this.cooldownManager == null)
-			this.cooldownManager = new CooldownManager(this);
-		return cooldownManager;
-	}
-
-	@ApiStatus.Internal
-	CommandRegistry getRegistry() {
-		return registry;
-	}
-
-	@ApiStatus.Internal
-	boolean checkConfirmation(CommandSender sender, final Command command, final Method method) {
-		if (!this.optionManager.isEnabled(FrameworkOption.CONFIRMATIONS)) {
-			return false;
-		}
-
-		if (this.confirmationManager == null)
-			this.confirmationManager = new ConfirmationManager();
-		return confirmationManager.checkConfirmations(sender, command, method);
-	}
-
 	protected final void setCommandMap(CommandMap commandMap) {
-		this.registry.setCommandMap(commandMap);
+        this.registry.setCommandMap(commandMap);
 	}
 
 	/**
@@ -228,6 +197,7 @@ protected final void setCommandMap(CommandMap commandMap) {
 	 * @return list of the commands.
 	 */
 	@NotNull
+    @Contract(pure = true)
 	public final List<Command> getCommands() {
 		return new ArrayList<>(this.registry.getCommands());
 	}
@@ -238,6 +208,7 @@ public final List<Command> getCommands() {
 	 * @return list of the sub-commands.
 	 */
 	@NotNull
+    @Contract(pure = true)
 	public final List<Command> getSubCommands() {
 		return new ArrayList<>(this.registry.getSubCommands());
 	}
@@ -248,14 +219,21 @@ public final List<Command> getSubCommands() {
 	 * @return list of the commands and sub-commands.
 	 */
 	@NotNull
+    @Contract(pure = true)
 	public final List<Command> getAllCommands() {
-		final List<Command> commands = new ArrayList<>(this.registry.getCommands());
-		commands.addAll(this.registry.getSubCommands());
+		final List<Command> commands = new ArrayList<>(registry.getCommands());
+		commands.addAll(registry.getSubCommands());
 
 		return commands;
 	}
 
-	public static CommandFramework getInstance() {
+    @NotNull
+    @Contract(pure = true)
+    public final Plugin getPlugin() {
+        return plugin;
+    }
+
+    public static CommandFramework getInstance() {
 		return instance;
 	}
 }

src/main/java/dev/despical/commandframework/CommandHandler.java

@@ -23,6 +23,9 @@
 import dev.despical.commandframework.annotations.Command;
 import dev.despical.commandframework.annotations.Completer;
 import dev.despical.commandframework.exceptions.CooldownException;
+import dev.despical.commandframework.internal.CommandRegistry;
+import dev.despical.commandframework.internal.FrameworkContext;
+import dev.despical.commandframework.internal.ParameterHandler;
 import dev.despical.commandframework.options.FrameworkOption;
 import dev.despical.commandframework.parser.OptionParser;
 import dev.despical.commandframework.utils.Utils;
@@ -54,15 +57,15 @@
 @ApiStatus.NonExtendable
 abstract class CommandHandler implements CommandExecutor, TabCompleter {
 
-	private CommandRegistry registry;
-	protected ParameterHandler parameterHandler;
+	protected final CommandRegistry registry;
+	protected final ParameterHandler parameterHandler;
 
-	void setRegistry(CommandFramework commandFramework) {
-		this.registry = commandFramework.getRegistry();
-		this.parameterHandler = new ParameterHandler();
-	}
+    public CommandHandler() {
+        this.registry = FrameworkContext.getInstance().getRegistry();
+        this.parameterHandler = new ParameterHandler();
+    }
 
-	@Override
+    @Override
 	public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.command.Command cmd, @NotNull String label, String[] args) {
 		Map.Entry<Command, Map.Entry<Method, Object>> entry = registry.getCommandMatcher().getAssociatedCommand(cmd.getName(), args);
 
@@ -109,12 +112,13 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.comm
 		}
 
 		CommandFramework commandFramework = CommandFramework.getInstance();
+        FrameworkContext context = FrameworkContext.getInstance();
 
-		if (commandFramework.checkConfirmation(sender, command, method)) {
+        if (context.checkConfirmation(sender, command, method)) {
 			return true;
 		}
 
-		if (!commandFramework.options().isEnabled(FrameworkOption.CUSTOM_COOLDOWN_CHECKER) && commandFramework.getCooldownManager().hasCooldown(arguments, command, method)) {
+		if (!commandFramework.options().isEnabled(FrameworkOption.CUSTOM_COOLDOWN_CHECKER) && context.getCooldownManager().hasCooldown(arguments, command, method)) {
 			return true;
 		}
 
@@ -142,8 +146,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.comm
 		};
 
 		if (command.async()) {
-			Plugin plugin = commandFramework.plugin;
-
+			Plugin plugin = commandFramework.getPlugin();
 			plugin.getServer().getScheduler().runTaskAsynchronously(plugin, invocation);
 		} else {
 			invocation.run();