[1.13.13.1]CommandTree不再限制重复注册,添加一些debug信息

Author: YufiriaMazenta

build.gradle.kts

@@ -1,7 +1,7 @@
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 java.targetCompatibility = JavaVersion.VERSION_1_8
 rootProject.group = "com.crypticlib"
-rootProject.version = "1.13.13.0"
+rootProject.version = "1.13.13.1"
 //全项目重构时更新大版本号
 //添加模块或有较大更改时更新次版本号
 //有API变动(新增/删除/更改声明)时更新修订号

platform/bukkit/src/main/java/crypticlib/BukkitPlugin.java

@@ -58,6 +58,7 @@ public final void onLoad() {
                 BukkitConfigContainer configContainer = new BukkitConfigContainer(configClass, configWrapper);
                 configContainerMap.put(configClass, configContainer);
                 configContainer.reload();
+                IOHelper.debug("Loaded config file: " + path);
             }
         );
         whenLoad();
@@ -74,6 +75,7 @@ public final void onEnable() {
                     }
                     Listener listener = (Listener) ReflectionHelper.getSingletonClassInstance(listenerClass);
                     Bukkit.getPluginManager().registerEvents(listener, this);
+                    IOHelper.debug("Registered listener for class: " + listenerClass.getName());
                 } catch (ClassNotFoundException | NoClassDefFoundError e) {
                     EventListener annotation = listenerClass.getAnnotation(EventListener.class);
                     if (!annotation.ignoreClassNotFound()) {
@@ -96,6 +98,7 @@ public final void onEnable() {
                     }
                     CommandTree commandTree = (CommandTree) ReflectionHelper.getSingletonClassInstance(commandClass);
                     commandTree.register();
+                    IOHelper.debug("Registered command `" + commandTree.commandInfo().name() + "`, handler class: " + commandTree.getClass().getName());
                 } catch (ClassNotFoundException | NoClassDefFoundError e) {
                     if (!annotation.ignoreClassNotFound()) {
                         e.printStackTrace();

platform/bungee/src/main/java/crypticlib/BungeePlugin.java

@@ -57,6 +57,7 @@ public final void onLoad() {
                 BungeeConfigContainer configContainer = new BungeeConfigContainer(configClass, configWrapper);
                 configContainerMap.put(configClass, configContainer);
                 configContainer.reload();
+                IOHelper.debug("Loaded config file: " + path);
             }
         );
         whenLoad();
@@ -73,6 +74,7 @@ public final void onEnable() {
                     }
                     Listener listener = (Listener) ReflectionHelper.getSingletonClassInstance(listenerClass);
                     getProxy().getPluginManager().registerListener(this, listener);
+                    IOHelper.debug("Registered listener for class: " + listenerClass.getName());
                 } catch (ClassNotFoundException | NoClassDefFoundError e) {
                     EventListener annotation = listenerClass.getAnnotation(EventListener.class);
                     if (!annotation.ignoreClassNotFound()) {
@@ -95,6 +97,7 @@ public final void onEnable() {
                     }
                     CommandTree commandTree = (CommandTree) ReflectionHelper.getSingletonClassInstance(commandClass);
                     commandTree.register();
+                    IOHelper.debug("Registered command `" + commandTree.commandInfo().name() + "`, handler class: " + commandTree.getClass().getName());
                 } catch (ClassNotFoundException | NoClassDefFoundError e) {
                     if (!annotation.ignoreClassNotFound()) {
                         e.printStackTrace();

platform/common/src/main/java/crypticlib/command/CommandTree.java

@@ -12,8 +12,6 @@
  */
 public class CommandTree extends CommandNode {
 
-    private boolean registered = false;
-
     public CommandTree(@NotNull CommandInfo commandInfo) {
         super(commandInfo);
     }
@@ -40,12 +38,9 @@ public CommandTree regSub(@NotNull CommandNode commandNode) {
     }
 
     public final void register() {
-        if (registered)
-            throw new UnsupportedOperationException("Cannot register a command repeatedly");
         scanSubCommands();
         registerPerms();
         CrypticLib.commandManager().register(this);
-        registered = true;
     }
 
 }

platform/common/src/main/java/crypticlib/internal/PluginScanner.java

@@ -1,5 +1,6 @@
 package crypticlib.internal;
 
+import crypticlib.util.IOHelper;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
@@ -47,6 +48,7 @@ public void scanJar(@NotNull JarFile jarFile) {
                         .replace('/', '.')
                         .substring(0, entry.getName().length() - 6);
                     Class<?> clazz = classLoader.loadClass(className);
+                    IOHelper.debug("Loaded class: " + className);
                     pluginClassMap.put(className, clazz);
                     //添加注解缓存
                     for (Annotation annotation : clazz.getAnnotations()) {

platform/velocity/src/main/java/crypticlib/VelocityPlugin.java

@@ -73,6 +73,7 @@ public final void onProxyInitialization(ProxyInitializeEvent event) {
                 VelocityConfigContainer configContainer = new VelocityConfigContainer(configClass, configWrapper);
                 configContainerMap.put(configClass, configContainer);
                 configContainer.reload();
+                IOHelper.debug("Loaded config file: " + path);
             }
         );
         whenLoad();
@@ -84,6 +85,7 @@ public final void onProxyInitialization(ProxyInitializeEvent event) {
                 try {
                     Object listener = ReflectionHelper.getSingletonClassInstance(listenerClass);
                     proxyServer.getEventManager().register(this, listener);
+                    IOHelper.debug("Registered listener for class: " + listenerClass.getName());
                 } catch (ClassNotFoundException | NoClassDefFoundError e) {
                     EventListener annotation = listenerClass.getAnnotation(EventListener.class);
                     if (!annotation.ignoreClassNotFound()) {
@@ -107,6 +109,7 @@ public final void onProxyInitialization(ProxyInitializeEvent event) {
                     }
                     CommandTree commandTree = (CommandTree) ReflectionHelper.getSingletonClassInstance(commandClass);
                     commandTree.register();
+                    IOHelper.debug("Registered command `" + commandTree.commandInfo().name() + "`, handler class: " + commandTree.getClass().getName());
                 } catch (ClassNotFoundException | NoClassDefFoundError e) {
                     if (!annotation.ignoreClassNotFound()) {
                         e.printStackTrace();