From 2b29cd535b9f5c3d0fb0b59eb088f138a864329b Mon Sep 17 00:00:00 2001 From: Steven Tracey Date: Wed, 22 Jun 2022 22:08:03 -0400 Subject: [PATCH] Make addCommand method accessible to inherited classes --- build.gradle | 2 +- .../net/nevet5gi/buzzbot/commands/utils/CommandManager.java | 3 ++- src/main/java/net/nevet5gi/buzzbot/modules/ModuleLoader.java | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 0755d8f..4932f0c 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { mainClassName = 'net.nevet5gi.buzzbot.Bot' group 'net.nevet5gi' -version '0.5.1' +version '0.5.2' sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/src/main/java/net/nevet5gi/buzzbot/commands/utils/CommandManager.java b/src/main/java/net/nevet5gi/buzzbot/commands/utils/CommandManager.java index 223197e..4ab031a 100644 --- a/src/main/java/net/nevet5gi/buzzbot/commands/utils/CommandManager.java +++ b/src/main/java/net/nevet5gi/buzzbot/commands/utils/CommandManager.java @@ -19,6 +19,7 @@ import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; +//TODO Make reload command for modules public class CommandManager { private static final Logger LOGGER = LoggerFactory.getLogger(CommandManager.class); protected final List commands = new ArrayList<>(); @@ -40,7 +41,7 @@ public class CommandManager { //addCommand(new CommandClass()); } - private void addCommand(ICmdGeneric cmd) { + protected void addCommand(ICmdGeneric cmd) { boolean nameFound = commands.stream().anyMatch(it -> it.getName().equalsIgnoreCase(cmd.getName())); if (nameFound) { throw new IllegalArgumentException("A command with this name is already present"); diff --git a/src/main/java/net/nevet5gi/buzzbot/modules/ModuleLoader.java b/src/main/java/net/nevet5gi/buzzbot/modules/ModuleLoader.java index 4fd4f0b..7e4af81 100644 --- a/src/main/java/net/nevet5gi/buzzbot/modules/ModuleLoader.java +++ b/src/main/java/net/nevet5gi/buzzbot/modules/ModuleLoader.java @@ -55,10 +55,6 @@ public class ModuleLoader { URLClassLoader urlClassLoader = URLClassLoader.newInstance(urls); - if (urlClassLoader == null) { - System.out.println("Classloader is null"); - } - Class mainClass = Class.forName(className, true, urlClassLoader); BuzzyModule newModule = (BuzzyModule) mainClass.getDeclaredConstructor().newInstance(); newModule.onPreEnable();