[+] Added Respawn Command for respawning the bot.

NeonAngelThreads · NeonAngelThreads · commit 62ad3e6b5891 · 2026-03-17T18:45:56.000+08:00
[+] Added command usages for reload command.
[+] Added Command Menu for tab completing.
[#] Improved Logging system.
[+] Added Reconnect Command for reconnecting to the server.
[+] Added Exception Detection in Event Manager.
[-] Removed setting of Disabling READ_TIMEOUT.
[#] Improved Terminal Command Completer.
[#] Fixed bug that players' skins duplicates when property.isEmpty() is true.
[#] Fixed Terminal Command Completer Not Working when command starting with "/".
[#] Improved code quality.
[#] Updated submodule `DolphinStudio` in project.
diff --git a/DolphinStudio b/DolphinStudio
@@ -1 +1 @@
-Subproject commit d091230e682ff7e0fb371bd56deadedbfe2343e6
+Subproject commit 4938fb97c46baf2846906f08937911d9ff22c71e
diff --git a/src/main/java/org/angellock/impl/AbstractRobot.java b/src/main/java/org/angellock/impl/AbstractRobot.java
@@ -150,8 +150,8 @@ public String getPassword(){
 
     public void connect(){
         onPreLogin();
-        String serverIP = this.infoHelper.getServer(); // != null ? this.infoHelper.getServer() : this.config().getServer();
-        int serverPort = this.infoHelper.getPort(); // != 0 ? this.infoHelper.getPort() : this.config().getPort();
+        String serverIP = this.infoHelper.getServer();
+        int serverPort = this.infoHelper.getPort();
 
         if (this.proxyInfo != null) {
             this.serverSession = new TcpClientSession(serverIP, serverPort, minecraftProtocol, this.proxyInfo);
@@ -168,7 +168,6 @@ public void connect(){
         this.serverSession.addListener(new PlayerEmergeHandler(this));
         this.serverSession.addListener(new PlayerPositionPacket((RobotPlayer) this));
         if (this.config().getDebugSettings().isEnablePacketDebug()) { this.serverSession.addListener(new PacketDebugger()); }
-        //this.serverSession.setFlag(BuiltinFlags.READ_TIMEOUT, -1);
         this.serverSession.setFlag(BuiltinFlags.WRITE_TIMEOUT, -1);
         this.serverSession.connect(true, false);
 
@@ -197,9 +196,11 @@ public void connect(){
                     }
                 }
                 catch (InterruptedException e){
-                    throw new RuntimeException(e);
+                    continue;
                 } catch (IllegalArgumentException e) {
                     TranslatableUtil.warnTranslatableOf(EnumSystemEvents.PACKET_ERROR, e);
+                } catch (Exception e) {
+                    TranslatableUtil.warnTranslatableOf(EnumSystemEvents.PLUGIN_ERROR, e);
                 }
             }
         } finally {
diff --git a/src/main/java/org/angellock/impl/ChatMessageManager.java b/src/main/java/org/angellock/impl/ChatMessageManager.java
@@ -44,7 +44,7 @@ public void putMessage(String msg){
         this.chatMessageQueue.offer(msg);
     }
 
-    public boolean pollMessage() {
+    public boolean pollMessage() throws Exception{
         String removal = this.chatMessageQueue.poll();
         if(removal != null) {
             this.sendMessagePacket(removal);
diff --git a/src/main/java/org/angellock/impl/EnumSystemEvents.java b/src/main/java/org/angellock/impl/EnumSystemEvents.java
@@ -37,7 +37,7 @@ public enum EnumSystemEvents {
     PACKET_ERROR("packet.error"),
     DOLPHIN_TIMING_RESET("dolphin.timing.reset"),
     SERVER_PLAYER_GAMEMODE("server.player.gamemode"),
-
+    PLUGIN_ERROR("plugin.error"),
     SERVER_WORLD_JOIN("server.world.join"),
     CHAT_MESSAGE_SEND("chat.message.send"),
     CHAT_COMMAND_SEND("chat.command.send"),
diff --git a/src/main/java/org/angellock/impl/api/events/MessageBroadcastEvent.java b/src/main/java/org/angellock/impl/api/events/MessageBroadcastEvent.java
@@ -25,7 +25,7 @@ public class MessageBroadcastEvent extends AbstractEvent {
     private static final HandlerMapper HANDLERS = new HandlerMapper();
     @Override
     public HandlerMapper getMapper() {
-        return null;
+        return HANDLERS;
     }
     private final BotMessage message;
     public MessageBroadcastEvent(BotMessage message){
diff --git a/src/main/java/org/angellock/impl/events/EventDispatcher.java b/src/main/java/org/angellock/impl/events/EventDispatcher.java
@@ -61,7 +61,7 @@ public void registerListeners(IListener listener, Plugin plugin) {
         }
     }
 
-    public void callEvent(AbstractEvent event) {
+    public void callEvent(AbstractEvent event) throws Exception{
         HandlerMapper list = event.getMapper();
         for (ActiveListener registeredListener : list.getRegisteredListenersInOrder()) {
             try {
diff --git a/src/main/java/org/angellock/impl/managers/EventManager.java b/src/main/java/org/angellock/impl/managers/EventManager.java
@@ -16,8 +16,10 @@
 
 package org.angellock.impl.managers;
 
+import org.angellock.impl.EnumSystemEvents;
 import org.angellock.impl.events.EventDispatcher;
 import org.angellock.impl.events.bukkit.AbstractEvent;
+import org.angellock.impl.util.TranslatableUtil;
 
 public class EventManager {
     private final EventDispatcher dispatcher = new EventDispatcher();
@@ -27,6 +29,10 @@ public EventDispatcher dispatcher(){
     }
 
     public void broadcastEvent(AbstractEvent event){
-        this.dispatcher.callEvent(event);
+        try {
+            this.dispatcher.callEvent(event);
+        } catch (Exception e) {
+            TranslatableUtil.errorTranslatableOf(EnumSystemEvents.PLUGIN_ERROR, e);
+        }
     }
 }
diff --git a/src/main/java/org/angellock/impl/plugin/AbstractPlugin.java b/src/main/java/org/angellock/impl/plugin/AbstractPlugin.java
@@ -22,6 +22,7 @@
 import org.angellock.impl.managers.TerminalCommandManager;
 import org.angellock.impl.managers.utils.Manager;
 import org.angellock.impl.util.ConsoleTokens;
+import org.angellock.impl.util.wrapper.LoggerWrapper;
 import org.geysermc.mcprotocollib.network.event.session.SessionListener;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -35,12 +36,11 @@
 public abstract class AbstractPlugin extends Manager implements Plugin {
     private Path dataPath;
     private String simpleName;
-    private Manifest manifest;
-    private boolean enabled = false;
     private Manifest pluginManifest;
+    private boolean enabled = false;
     private final List<SessionListener> listeners = new ArrayList<>();
     private AbstractRobot targetBot;
-    private static final Logger log = LoggerFactory.getLogger(ConsoleTokens.colorizeText("&6&lPlugins"));
+    private final LoggerWrapper log = new LoggerWrapper();
     protected Thread schedulerThread;
     private ClassLoader classLoader;
 
@@ -58,6 +58,7 @@ public AbstractPlugin(){
         String path = getBaseConfigRoot();
         this.dataPath = Path.of(path);
         this.simpleName = this.getClass().getSimpleName();
+        log.setLoggerName(this.simpleName);
     }
 
     public EventDispatcher getEvents(){
@@ -68,11 +69,11 @@ public String getSimpleName() {
         return simpleName;
     }
 
-    public Manifest getManifest(){
+    public Manifest getPluginManifest(){
         return this.pluginManifest;
     }
 
-    public static Logger getLogger(){
+    public LoggerWrapper getLogger(){
         return log;
     }
 
@@ -100,6 +101,7 @@ public ClassLoader getClassLoader() {
     @Override
     public void onEnables(AbstractRobot targetBot){
         this.targetBot = targetBot;
+        this.log.setBot(targetBot);
         if (this.listeners.isEmpty()) {
             try {
                 onEnable(this.targetBot);
@@ -117,7 +119,7 @@ public String getName(){
             return this.getPluginName();
         }
         else {
-            String pluginName = getManifest().getPluginName();
+            String pluginName = getPluginManifest().getPluginName();
             if(!pluginName.isEmpty()){
                 return pluginName;
             }
@@ -139,8 +141,8 @@ public List<SessionListener> getListeners(){
         return this.listeners;
     }
     @Override
-    public void setManifest(Manifest manifest){
-        this.manifest = manifest;
+    public void setPluginManifest(Manifest pluginManifest){
+        this.pluginManifest = pluginManifest;
     }
     @Override
     public void setEnabled(boolean state){
diff --git a/src/main/java/org/angellock/impl/plugin/Plugin.java b/src/main/java/org/angellock/impl/plugin/Plugin.java
@@ -28,7 +28,7 @@ public interface Plugin {
     String getVersion();
     String getDescription();
     boolean isEnabled();
-    void setManifest(Manifest name);
+    void setPluginManifest(Manifest name);
     void setEnabled(boolean state);
     List<SessionListener> getListeners();
     void onDisable();
diff --git a/src/main/java/org/angellock/impl/plugin/PluginManager.java b/src/main/java/org/angellock/impl/plugin/PluginManager.java
@@ -85,14 +85,16 @@ public void keepScheduleThreadsAlive(){
 
     public void listRegisterInfo(AbstractRobot botInstance) {
         Set<String> pl = botInstance.getRegisteredCommands().getRegisteredCommands().keySet();
-        log.info(botInstance.getBotLabel(), TranslatableUtil.getFormattedMessage(EnumSystemEvents.PLUGIN_LOAD_COMMANDS, pl, pl.size()));
+        if (!pl.isEmpty()){
+            log.info(botInstance.getBotLabel(), TranslatableUtil.getFormattedMessage(EnumSystemEvents.PLUGIN_LOAD_COMMANDS, pl, pl.size()));
+        }
         Set<String> tCommand = TerminalCommandManager.registeredCommand.keySet();
         log.info(botInstance.getBotLabel(), TranslatableUtil.getFormattedMessage(EnumSystemEvents.PLUGIN_LOAD_TERMINAL_COMMANDS, tCommand, tCommand.size()));
         List<SessionListener> listeners = botInstance.getSession().getListeners();
         log.info(botInstance.getBotLabel(), TranslatableUtil.getFormattedMessage(EnumSystemEvents.PLUGIN_LISTENER_LOAD, listeners.size()));
     }
 
-    public void loadAllPlugins(AbstractRobot botInstance){
+    public void loadAllPlugins(AbstractRobot botInstance) throws Exception{
         if(!this.registeredPlugins.isEmpty()){
             for (AbstractPlugin plugin : this.registeredPlugins.values()) {
                 enable(plugin, botInstance);
@@ -147,7 +149,8 @@ public void disableAllPlugins(AbstractRobot botInstance){
     }
     @Override
     public void disable(AbstractRobot botInstance, String pluginName){
-        Plugin target = this.registeredPlugins.get(pluginName);
+        Plugin target = this.registeredPlugins.get(pluginName.toLowerCase());
+        target.setEnabled(false);
         List<SessionListener> pluginListeners = target.getListeners();
 
         for (SessionListener listener : pluginListeners) {
@@ -157,10 +160,9 @@ public void disable(AbstractRobot botInstance, String pluginName){
             }
         }
         target.onDisable();
-        target.setEnabled(false);
 
-        if (target instanceof AbstractPlugin) {
-            ClassLoader classLoader = ((AbstractPlugin) target).getClassLoader();
+        if (target instanceof AbstractPlugin plugin) {
+            ClassLoader classLoader = plugin.getClassLoader();
             if (classLoader instanceof URLClassLoader) {
                 try {
                     ((URLClassLoader) classLoader).close();
diff --git a/src/main/java/org/angellock/impl/util/strings/UStringHelper.java b/src/main/java/org/angellock/impl/util/strings/UStringHelper.java
@@ -18,10 +18,10 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
+@SuppressWarnings("unused")
 public class UStringHelper {
     private static final Map<Character, String> charMap = new HashMap<>();
-    private static final String intArray = "˦ϨՅϤƼδ7θƍO";
+    private static final String intArray = "O˦ϨՅϤƼδ7θƍ";
 
     static {
         charMap.put('a', "\uD835\uDCEA");charMap.put('b', "\uD835\uDCEB");charMap.put('c', "\uD835\uDCEC");charMap.put('d', "\uD835\uDCED");charMap.put('e', "\uD835\uDCEE");
diff --git a/src/main/java/org/angellock/impl/util/wrapper/LoggerWrapper.java b/src/main/java/org/angellock/impl/util/wrapper/LoggerWrapper.java
@@ -0,0 +1,49 @@
+/*
+ * DolphinBot - https://github.com/NeonAngelThreads/DolphinBot
+ * Copyright (C) 2025 NeonAngelThreads (https://github.com/NeonAngelThreads)
+ *
+ *    This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
+ *    License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any
+ *    later version.
+ *
+ *    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ *    implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ *    License for more details. You should have received a copy of the GNU General Public License along with this
+ *    program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * https://space.bilibili.com/386644641
+ */
+
+package org.angellock.impl.util.wrapper;
+
+import lombok.Setter;
+import org.angellock.impl.AbstractRobot;
+import org.angellock.impl.util.ConsoleTokens;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoggerWrapper {
+
+    protected Logger log;
+    @Setter
+    private AbstractRobot bot;
+    public LoggerWrapper() {
+        log = LoggerFactory.getLogger(ConsoleTokens.colorizeText("&6Plugin"));
+    }
+
+    public void setLoggerName(String name){
+        log = LoggerFactory.getLogger(name);
+    }
+
+    public void info(String s, Object...obj){
+        log.info(bot.getBotLabel(), s, obj);
+    }
+
+    public void warn(String s, Object...obj){
+        log.warn(bot.getBotLabel(), s, obj);
+    }
+    public void error(String s, Object...obj){
+        log.error(bot.getBotLabel(), s, obj);
+    }
+
+}
diff --git a/src/main/java/org/angellock/impl/win32terminal/SystemTabCompleter.java b/src/main/java/org/angellock/impl/win32terminal/SystemTabCompleter.java
@@ -59,19 +59,25 @@ public void complete(LineReader lineReader, ParsedLine parsedLine, List<Candidat
             }
         }
         for (TerminalCommand cmd : commands.values()) {
+            appendCandidate(list, cmd.getName(), cmd.getDescription());
             for (String alias : cmd.getAliases()) {
-                if (alias.contains(line)) {
-                    list.add(new Candidate( "/" + alias, new AttributedStringBuilder()
-                            .style(AttributedStyle.DEFAULT.foreground(AttributedStyle.CYAN))
-                            .append(alias)
-                            .toAnsi(),
-                            cmd.getName(),
-                            null,
-                            null,
-                            null,
-                            true));
+                if (alias.contains(line.replaceFirst("/", ""))) {
+                    appendCandidate(list, alias, cmd.getDescription());
                 }
             }
         }
     }
+
+    private static void appendCandidate(List<Candidate> list, String name, String desc) {
+        Candidate candidate = new Candidate('/' + name, new AttributedStringBuilder()
+                .style(AttributedStyle.DEFAULT.foreground(AttributedStyle.CYAN))
+                .append(name)
+                .toAnsi(),
+                name,
+                desc,
+                null,
+                null,
+                true);
+        list.add(candidate);
+    }
 }
diff --git a/src/main/resources/locale_en.properties b/src/main/resources/locale_en.properties
@@ -23,6 +23,7 @@ server.player.gamemode=&a[{0}] &9Current game mode: {1}
 chat.message.send=&7Sending in-game chat message: &b&l&o{0}
 chat.command.send=&6Sending chat Command: &b&l&o{0}
 packet.error=&7Packet error occurred: {0}
+plugin.error=&7Plugin error occurred: {0}
 dolphin.timing.reset=&aTiming reset.
 plugin.load=&7[&bEventBus&7] &eRegistering Listener From Plugin &6{0}
 plugin.event.handler.load=&7[&bEventBus&7] &eInjecting Event Handler Object &l&7{0}
diff --git a/src/main/resources/locale_zh.properties b/src/main/resources/locale_zh.properties
@@ -23,6 +23,7 @@ server.player.gamemode=&a[{0}] &9当前游戏模式: {1}
 chat.message.send=&7发送聊天消息: &b&l&o{0}
 chat.command.send=&6发送聊天命令: &b&l&o{0}
 dolphin.timing.reset=&a冷却重置
+plugin.error=&7发生插件错误: {0}
 dolphin.statemachine.login.transit=&l登录状态: &b{0}
 plugin.load.command=&7[&9命令系统&7] &e成功注册 {1} 个聊天命令: &6{0}
 plugin.load.terminal.command=&7[&1终端命令系统&7] &5成功注册 &d{1} &5个终端命令: &d{0}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public void putMessage(String msg){`
`44`	`44`	`this.chatMessageQueue.offer(msg);`
`45`	`45`	`}`
`46`	`46`
`47`		`- public boolean pollMessage() {`
	`47`	`+ public boolean pollMessage() throws Exception{`
`48`	`48`	`String removal = this.chatMessageQueue.poll();`
`49`	`49`	`if(removal != null) {`
`50`	`50`	`this.sendMessagePacket(removal);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class MessageBroadcastEvent extends AbstractEvent {`
`25`	`25`	`private static final HandlerMapper HANDLERS = new HandlerMapper();`
`26`	`26`	`@Override`
`27`	`27`	`public HandlerMapper getMapper() {`
`28`		`- return null;`
	`28`	`+ return HANDLERS;`
`29`	`29`	`}`
`30`	`30`	`private final BotMessage message;`
`31`	`31`	`public MessageBroadcastEvent(BotMessage message){`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public void registerListeners(IListener listener, Plugin plugin) {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`- public void callEvent(AbstractEvent event) {`
	`64`	`+ public void callEvent(AbstractEvent event) throws Exception{`
`65`	`65`	`HandlerMapper list = event.getMapper();`
`66`	`66`	`for (ActiveListener registeredListener : list.getRegisteredListenersInOrder()) {`
`67`	`67`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,10 @@`
`16`	`16`
`17`	`17`	`package org.angellock.impl.managers;`
`18`	`18`
	`19`	`+import org.angellock.impl.EnumSystemEvents;`
`19`	`20`	`import org.angellock.impl.events.EventDispatcher;`
`20`	`21`	`import org.angellock.impl.events.bukkit.AbstractEvent;`
	`22`	`+import org.angellock.impl.util.TranslatableUtil;`
`21`	`23`
`22`	`24`	`public class EventManager {`
`23`	`25`	`private final EventDispatcher dispatcher = new EventDispatcher();`
`@@ -27,6 +29,10 @@ public EventDispatcher dispatcher(){`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`public void broadcastEvent(AbstractEvent event){`
`30`		`- this.dispatcher.callEvent(event);`
	`32`	`+ try {`
	`33`	`+ this.dispatcher.callEvent(event);`
	`34`	`+ } catch (Exception e) {`
	`35`	`+ TranslatableUtil.errorTranslatableOf(EnumSystemEvents.PLUGIN_ERROR, e);`
	`36`	`+ }`
`31`	`37`	`}`
`32`	`38`	`}`