[-] Removed unsafe reflection in Listeners

NeonAngelThreads · NeonAngelThreads · commit 3f8eae3031fd · 2026-03-03T01:06:03.000+08:00
[#] Improved code quality.
[+] Added submodule `DolphinStudio` in project.
[#] Changed config file name to bot.config.global.json
[#] Updated README
[+] Added Server info display on web dashboard.
[+] Synchronized chinese README_CN.md with README.md
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "DolphinStudio"]
+	path = DolphinStudio
+	url = https://github.com/NeonAngelThreads/DolphinStudio
diff --git a/DolphinStudio b/DolphinStudio
@@ -0,0 +1 @@
+Subproject commit d091230e682ff7e0fb371bd56deadedbfe2343e6
diff --git a/README.md b/README.md
@@ -157,7 +157,7 @@ In this section, you will understand below how-tos:
    `--owner=owner1;owner2;owner3;...`  
 
    ### Config File Setting    
-   Config files include functional config `mc.bot.config.json` and profile config `bot.profiles.json`  
+   Config files include functional config `bot.config.global.json` and profile config `bot.profiles.json`  
       You can also move above profile arguments into config file ``bot.profiles.json`` following below formats, all config values in it will be loaded.
       DolphinBot will apply command-line options first, duplicated options in config file will be ignored.    
       To specify the path of config file is optional, Use option `--config-file` to locate config directory or file.  
@@ -286,7 +286,7 @@ each profile name, should be split with ";".
 }
 ```
 ### Advanced Configurations (optional)
-   If you want to access more advanced configs, you can edit `mc.bot.config.json`.  
+   If you want to access more advanced configs, you can edit `bot.config.global.json`.  
    Every single config option is equilibrium to option that defined by command line, and all config value including
    unrecognized option will be parsed, so you can add your customize config options.  
    An example for configuring this file:
diff --git a/README_CN.md b/README_CN.md
@@ -138,7 +138,7 @@
       您还可以通过添加参数来指定更多选项：  
       `--owner` : 仅指定哪些人可以使用此机器人。  
    2. **配置文件设置**  
-         配置文件包括功能配置文件 `mc.bot.config.json` 和账户配置文件 `bot.profiles.json`  
+         配置文件包括功能配置文件 `bot.config.global.json` 和账户配置文件 `bot.profiles.json`  
          您还可以按照以下格式将上述配置文件参数移至配置文件`bot.profiles.json`中，其中的所有配置值都将被加载。  
          DolphinBot 将首先应用命令行选项，配置文件中重复的选项将被忽略。  
          指定配置文件路径是可选的，使用选项 `--config-file` 来定位配置目录或文件。  
@@ -276,7 +276,7 @@ java -jar "DolphinBot-[version].jar" --profiles="bot#1;bot#2;bot#3;..."
 **Example:**
 `--owner=owner1;owner2;owner3;...`
    1. **高级配置（可选）**  
-      如果你想访问更高级的配置，可以编辑`mc.bot.config.json`。  
+      如果你想访问更高级的配置，可以编辑`bot.config.global.json`。  
       每个配置选项都与命令行定义的选项相对应，所有配置值（包括无法识别的选项）都将被解析，因此您可以添加自定义配置选项。  
       配置此文件的示例:
       ```json
@@ -332,8 +332,8 @@ DolphinBot现在包含内置的Web控制台，支持远程机器人管理和控
 java -jar "DolphinBot-[version]-full.jar" --api [端口]
 ```
 
-API服务器将在指定端口启动（默认：25560），WebSocket日志服务器将在端口+1启动（默认：25561）。
-
+API服务器将在指定端口启动（默认：25560），WebSocket日志服务器将在端口+1启动（默认：25561）。  
+如果`--api`命令行参数缺失，API服务器将开启在默认25560端口。
 ### Web控制台功能
 - **机器人管理仪表板** - 查看所有机器人实例，包括实时状态、游戏模式和位置
 - **独立终端** - 每个机器人拥有自己的终端实例，支持基于标签页的切换
diff --git a/src/main/java/org/angellock/impl/AbstractRobot.java b/src/main/java/org/angellock/impl/AbstractRobot.java
@@ -88,11 +88,11 @@ public abstract class AbstractRobot implements ISendable, SessionProvider, IOpti
     protected final CommandSpec commands = new CommandSpec(this);
 
     public AbstractRobot(ConfigManager configManager, PluginManager pluginManager){
-        this.globalConfig = configManager;
+        this.globalConfig = configManager.buildConfig();
         this.infoHelper.setName(this.globalConfig.getConfigValue("username"));
         this.infoHelper.setPassword(this.globalConfig.getConfigValue("password"));
-        this.infoHelper.setServer(this.globalConfig.getCoreSettings().getServer());
-        this.infoHelper.setPort(this.globalConfig.getCoreSettings().getPort());
+        this.infoHelper.setServer(this.globalConfig.config().getServer());
+        this.infoHelper.setPort(this.globalConfig.config().getPort());
 
         this.pluginManager = pluginManager;
 
@@ -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();// != null ? this.infoHelper.getServer() : this.config().getServer();
+        int serverPort = this.infoHelper.getPort();// != 0 ? this.infoHelper.getPort() : this.config().getPort();
 
         if (this.proxyInfo != null) {
             this.serverSession = new TcpClientSession(serverIP, serverPort, minecraftProtocol, this.proxyInfo);
diff --git a/src/main/java/org/angellock/impl/RobotPlayer.java b/src/main/java/org/angellock/impl/RobotPlayer.java
@@ -94,7 +94,7 @@ public void onPreLogin() {
             } catch (InterruptedException ignored) {}
         }
         this.connectTime = System.currentTimeMillis();
-        log.info(this.getBotLabel(), TranslatableUtil.getFormattedMessage(EnumSystemEvents.CONNECT, this.config().getServer(), String.valueOf(this.config().getPort())));
+        log.info(this.getBotLabel(), TranslatableUtil.getFormattedMessage(EnumSystemEvents.CONNECT, this.getInfoHelper().getServer(), String.valueOf(this.getInfoHelper().getPort())));
     }
 
     @Override
diff --git a/src/main/java/org/angellock/impl/Start.java b/src/main/java/org/angellock/impl/Start.java
@@ -88,7 +88,9 @@ public static void main(String[] args) {
         }
         @Nullable String profiles = (GLOBAL_CONFIG.valueOf(profilesArg));
 
-        ConfigManager config = new ConfigManager(GLOBAL_CONFIG, defaultConfigPath);
+        ConfigManager config = new ConfigManager();
+        ConfigManager.setDefaultPath(defaultConfigPath);
+        ConfigManager.initGlobalSettings();
         BotManager botManager = new BotManager(defaultConfigPath, ".json", config)
                 .globalPluginManager(GLOBAL_CONFIG.valueOf(pluginDir))
                 .loadProfiles(profiles);
diff --git a/src/main/java/org/angellock/impl/api/websocket/handlers/BotsHandler.java b/src/main/java/org/angellock/impl/api/websocket/handlers/BotsHandler.java
@@ -44,6 +44,7 @@ public void handleResponse(HttpExchange exchange) throws IOException {
             Map<String, Object> botInfo = new HashMap<>();
             botInfo.put("name", bot.getInfoHelper().getName());
             botInfo.put("profileName", bot.getProfileName());
+            botInfo.put("address", String.format("%s:%s",bot.getInfoHelper().getServer(), bot.getInfoHelper().getPort()));
             botInfo.put("isConnected", bot.getSession() != null && bot.getSession().isConnected());
             botInfo.put("gameMode", bot.getServerGamemode() != null ? bot.getServerGamemode().name() : "UNKNOWN");
             botInfo.put("position", Map.of(
diff --git a/src/main/java/org/angellock/impl/events/AbstractEventProcessor.java b/src/main/java/org/angellock/impl/events/AbstractEventProcessor.java
@@ -35,7 +35,7 @@ public abstract class AbstractEventProcessor<T extends Packet> extends SessionAd
     private static final Logger log = LoggerFactory.getLogger(ConsoleTokens.colorizeText("&l&9PacketHandlers"));
     private final long DELAY;
     protected List<IActions<T>> actionList = new ArrayList<>();
-    private static final boolean showWarn = ConfigManager.getCoreSettings().getDebugSettings().isShowWarns();
+    private static final boolean showWarn = false;
     protected IActions<T> preAction = (T) -> {
     };
 
diff --git a/src/main/java/org/angellock/impl/events/bukkit/ActiveListener.java b/src/main/java/org/angellock/impl/events/bukkit/ActiveListener.java
@@ -28,7 +28,7 @@ public class ActiveListener {
     private EventPriority priority = EventPriority.NORMAL;
 
     public ActiveListener(Object listenerInstance, Method action, Class<?> eventType) {
-        action.setAccessible(true);
+        // action.setAccessible(true);
         this.listenerInstance = listenerInstance;
         this.action = action;
         this.eventType = eventType;
diff --git a/src/main/java/org/angellock/impl/extensions/BaseDefaultPlugin.java b/src/main/java/org/angellock/impl/extensions/BaseDefaultPlugin.java
@@ -85,7 +85,7 @@ public void onDisable() {
 
     @Override
     public void onLoad() {
-        boolean captureSkins = ConfigManager.getCoreSettings().getOther().isEnableSkinRecorder();
+        boolean captureSkins = ConfigManager.global().getOther().isEnableSkinRecorder();
         this.helper = new PlayerInfoHelper(captureSkins);
     }
 
diff --git a/src/main/java/org/angellock/impl/ingame/PlayerTracker.java b/src/main/java/org/angellock/impl/ingame/PlayerTracker.java
@@ -31,10 +31,6 @@ public class PlayerTracker {
     @Getter
     private final static Map<Integer, UUID> UUIDMapping = new HashMap<>();
     private final static Map<String, UUID> playerUUIDMapping = new HashMap<>();
-    @Getter
-    private static UUID lastLogout;
-    private static long logoutElapse;
-
     public @Nullable
     static Player getPlayerById(int entityID) {
         UUID uuid = UUIDMapping.get(entityID);
@@ -79,8 +75,4 @@ public static Map<String, UUID> getPlayerUUIDMapping() {
         return playerUUIDMapping;
     }
 
-    public static void recordLastLogout(UUID lastLogout) {
-        logoutElapse = System.currentTimeMillis();
-        PlayerTracker.lastLogout = lastLogout;
-    }
 }
diff --git a/src/main/java/org/angellock/impl/managers/ConfigManager.java b/src/main/java/org/angellock/impl/managers/ConfigManager.java
@@ -19,8 +19,10 @@
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
 import lombok.Getter;
+import lombok.Setter;
 import org.angellock.impl.DolphinConfig;
 import org.angellock.impl.EnumSystemEvents;
+import org.angellock.impl.Start;
 import org.angellock.impl.events.AbstractEventProcessor;
 import org.angellock.impl.util.ConsoleTokens;
 import org.angellock.impl.util.TranslatableUtil;
@@ -34,26 +36,44 @@
 public class ConfigManager {
     private static final Logger log = LoggerFactory.getLogger(ConsoleTokens.colorizeText("&6ConfigManager"));
     private final Map<String, Object> commandLineOptions = new HashMap<>();
+    private DolphinConfig coreSettings;
     @Getter
-    private static DolphinConfig coreSettings;
-    private final RobotConfig configHelper;
-    public ConfigManager(OptionSet optionList, @Nullable String defaultPath){
+    private static DolphinConfig globalSettings;
+    private RobotConfig configHelper;
+    @Setter
+    private static String defaultPath = null;
+    private OptionSet optionSet = Start.getGLOBAL_CONFIG()  ;
+    public ConfigManager buildConfig(){
         this.configHelper = new RobotConfig(defaultPath, ".json");
-
-        for (OptionSpec<?> option: optionList.specs()){
+        for (OptionSpec<?> option: this.optionSet.specs()){
             String stringOpt = option.options().get(0);
-            Object valueObject = optionList.valueOf(option);
+            Object valueObject = this.optionSet.valueOf(option);
             this.commandLineOptions.put(stringOpt, valueObject);
         }
-        coreSettings = this.configHelper.loadBotConfig(this.commandLineOptions);
+        this.coreSettings = this.configHelper.loadBotConfig(this.commandLineOptions);
+        return this;
+    }
+
+    public static DolphinConfig global(){
+        if (globalSettings == null){
+            ConfigManager.initGlobalSettings();
+        }
+        return globalSettings;
     }
 
     public void printConfigSpec() {
         log.info(TranslatableUtil.getFormattedMessage(EnumSystemEvents.COMMANDLINE_LOADED, commandLineOptions));
         log.info(TranslatableUtil.getFormattedMessage(EnumSystemEvents.CONFIG_FILE_LOADED, this.config()));
     }
     public ConfigManager(OptionSet optionList){
-        this(optionList, null);
+        this.optionSet = optionList;
+    }
+
+    public static void initGlobalSettings() {
+        ConfigManager.globalSettings = new RobotConfig(defaultPath, ".json").loadBotConfig();
+    }
+
+    public ConfigManager() {
     }
 
     @Deprecated
@@ -64,8 +84,8 @@ public Map<String, Object> getMCBotConfig(){
         return this.commandLineOptions;
     }
 
-    public static DolphinConfig config() {
-        return coreSettings;
+    public DolphinConfig config() {
+        return coreSettings == null ? globalSettings : this.coreSettings;
     }
 
     public String getConfigValue(String key) {
diff --git a/src/main/java/org/angellock/impl/managers/ProfileObject.java b/src/main/java/org/angellock/impl/managers/ProfileObject.java
@@ -23,6 +23,8 @@
 
 @Data
 public class ProfileObject {
+    private String server;
+    private int port;
     private String profileName;
     private String name;
     private String password;
diff --git a/src/main/java/org/angellock/impl/managers/QuestionManager.java b/src/main/java/org/angellock/impl/managers/QuestionManager.java
@@ -29,7 +29,7 @@ public QuestionManager(@Nullable String defaultPath, String fileType) {
     }
 
     public QuestionManager(String filename){
-        super(null, filename);
+        this(null, filename);
     }
 
     @Override
diff --git a/src/main/java/org/angellock/impl/managers/ResourceHelper.java b/src/main/java/org/angellock/impl/managers/ResourceHelper.java
@@ -73,7 +73,7 @@ private void autoCopy(File outFile) throws IOException {
     }
 
     public String getFullFileName(){
-        return getFileName() + this.fileType;
+        return this.getFileName() + this.fileType;
     }
 
 }
diff --git a/src/main/java/org/angellock/impl/managers/RobotConfig.java b/src/main/java/org/angellock/impl/managers/RobotConfig.java
@@ -16,14 +16,19 @@
 
 package org.angellock.impl.managers;
 
+import lombok.Setter;
 import org.angellock.impl.DolphinConfig;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
 import java.util.Map;
 
 
+@Setter
 public class RobotConfig extends ResourceHelper{
-
+    private String fileName;
     public RobotConfig(@Nullable String defaultPath, String fileType) {
         super(defaultPath, fileType);
     }
@@ -33,15 +38,16 @@ public DolphinConfig loadBotConfig() {
                 .Helper
                 .fromJson(this.readDataFrom(this.configPath), DolphinConfig.class);
     }
-    @Override
-    public String getFileName() {
-        return "mc.bot.config";
-    }
 
     public DolphinConfig loadBotConfig(Map<String, Object> commandLineOptions) {
         return this
                 .Helper
                 .fromJson(this.readDataFrom(this.configPath), DolphinConfig.class)
                 .mergeCommandOptions(commandLineOptions);
     }
+
+    @Override
+    public String getFileName() {
+        return "bot.config.global";
+    }
 }
diff --git a/src/main/java/org/angellock/impl/util/TranslatableUtil.java b/src/main/java/org/angellock/impl/util/TranslatableUtil.java
@@ -28,15 +28,7 @@
 
 public class TranslatableUtil {
     private static final Logger log = LoggerFactory.getLogger("EventLogger");
-    public static ResourceBundle bundle = ResourceBundle.getBundle("locale", ConfigManager.getCoreSettings().getLanguage());;
-
-    public TranslatableUtil(RobotPlayer bot) {
-        this(bot.config().getLanguage());
-    }
-
-    public TranslatableUtil(Locale locale) {
-        bundle = ResourceBundle.getBundle("locale", locale);
-    }
+    public static ResourceBundle bundle = ResourceBundle.getBundle("locale", ConfigManager.global().getLanguage());
 
     public static void infoTranslatableOf(EnumSystemEvents translatableEvent, Object... args) {
         log.info(getFormattedMessage(translatableEvent, args));
diff --git a/src/main/resources/bot.config.global.json b/src/main/resources/bot.config.global.json
diff --git a/src/main/resources/bot.profiles.json b/src/main/resources/bot.profiles.json
@@ -12,11 +12,11 @@
         "HumanVerify"
       ],
       "proxy": {
-        "enabled": true,
+        "enabled": false,
         "info": {
           "address": "",
-          "port": 7777,
-          "type": "SOCKS4",
+          "port": 10808,
+          "type": "SOCKS5",
           "username": "",
           "password": ""
         }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "DolphinStudio"]`
	`2`	`+ path = DolphinStudio`
	`3`	`+ url = https://github.com/NeonAngelThreads/DolphinStudio`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public void onPreLogin() {`
`94`	`94`	`} catch (InterruptedException ignored) {}`
`95`	`95`	`}`
`96`	`96`	`this.connectTime = System.currentTimeMillis();`
`97`		`- log.info(this.getBotLabel(), TranslatableUtil.getFormattedMessage(EnumSystemEvents.CONNECT, this.config().getServer(), String.valueOf(this.config().getPort())));`
	`97`	`+ log.info(this.getBotLabel(), TranslatableUtil.getFormattedMessage(EnumSystemEvents.CONNECT, this.getInfoHelper().getServer(), String.valueOf(this.getInfoHelper().getPort())));`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`