Merge pull request #7 from NeonAngelThreads/1.3.1

1.3.1

Author: NeonAngelThreads

README.md

@@ -60,7 +60,7 @@
 ## Screenshots:
 ### Running on Windows server 2019:
 <p align="center">
-   <img src="assets/dolphinbot1.png">
+   <img src="assets/dev2.png">
 </p>
 
 ## Introduction:
@@ -82,10 +82,13 @@
 - You can send in-game messages or execute commands form the dolphin bot terminal.
 - Built-in commands:
 - 
-  | Terminal Commands                            | Description                      |
-  |----------------------------------------------|----------------------------------|
-  | `reload <Plugin Name> <bot name (optional)>` | Hot-reloading a specified plugin |
-  | `load <PLugin Name> <bot name (optional)>`   | Hot-loading a specified plugin   |
+  |              Terminal Commands               | Description                                         |
+  |:--------------------------------------------:|-----------------------------------------------------|
+  | `reload <Plugin Name> <bot name (optional)>` | Hot-reloading a specified plugin                    |
+  |  `load <PLugin Name> <bot name (optional)>`  | Hot-loading a specified plugin                      |
+  |                  `respawn`                   | Respawn the bot when in game.                       |
+  |          `license`    (`l`, `lic`)           | Show the license on the terminal                    |
+  |               `help`   (`h`, `?`)              | Show the Command menu and usages for each command   |
 
 - For these commands, you can press `TAB` to complete automatically.
 ## Getting Started
@@ -281,14 +284,14 @@ each profile name, should be split with ";".
    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:
-   ```json
-   {
-      "server": "2b2t.xin",
-      "port": 25565,
+```json
+{
+  "server": "2b2t.xin",
+  "port": 25565,
   "auto-reconnect": true,
   "packet-filter-delay": 0,
   "msg-send-delay": 0,
-      "max-chunk-view": 12,
+  "max-chunk-view": 12,
   "anti-AFK": true,
   "language": "zh",
   "connect-timing-out": 2000,
@@ -301,7 +304,7 @@ each profile name, should be split with ";".
     "enable-skin-recorder": false
   }
 }
-   ```   
+```   
    ### Config Options:
    
    | Config                 | Description                                                                |

assets/dev2.png

@@ -22,7 +22,7 @@
 
     <groupId>org.angellock.impl</groupId>
     <artifactId>DolphinBot</artifactId>
-    <version>1.3.0-ALPHA-full</version>
+    <version>1.3.1-RELEASE-full</version>
     <packaging>
         jar
     </packaging>

pom.xml

@@ -22,9 +22,10 @@
 import lombok.Setter;
 import org.angellock.impl.commands.CommandSpec;
 import org.angellock.impl.events.IConnectListener;
-import org.angellock.impl.events.IDisconnectListener;
-import org.angellock.impl.events.TranslatableBundle;
-import org.angellock.impl.events.handlers.*;
+import org.angellock.impl.events.handlers.ChatCommandHandler;
+import org.angellock.impl.events.handlers.DisconnectReasonHandler;
+import org.angellock.impl.events.handlers.PlayerEmergeHandler;
+import org.angellock.impl.events.handlers.ServerChatCommandHandler;
 import org.angellock.impl.events.packets.EntityMovePacket;
 import org.angellock.impl.events.packets.PlayerPositionPacket;
 import org.angellock.impl.events.packets.debugger.PacketDebugger;
@@ -34,11 +35,11 @@
 import org.angellock.impl.managers.ConfigManager;
 import org.angellock.impl.managers.ProfileObject;
 import org.angellock.impl.managers.TerminalCommandManager;
-import org.angellock.impl.plugin.Plugin;
+import org.angellock.impl.plugin.AbstractPlugin;
 import org.angellock.impl.plugin.PluginManager;
 import org.angellock.impl.plugin.SessionProvider;
 import org.angellock.impl.util.ConsoleTokens;
-import org.angellock.impl.util.PlainTextSerializer;
+import org.angellock.impl.util.TranslatableUtil;
 import org.geysermc.mcprotocollib.network.BuiltinFlags;
 import org.geysermc.mcprotocollib.network.ProxyInfo;
 import org.geysermc.mcprotocollib.network.Session;
@@ -59,6 +60,7 @@
 
 public abstract class AbstractRobot implements ISendable, SessionProvider, IOptionalProcedures {
     protected TcpClientSession serverSession;
+    @Getter
     protected static final Logger log = LoggerFactory.getLogger(ConsoleTokens.colorizeText("&aDolphinBot"));
     private final ScheduledExecutorService reconnectScheduler = Executors.newScheduledThreadPool(1);
     @Getter
@@ -117,7 +119,8 @@ public AbstractRobot withPassword(String password){
         this.infoHelper.setPassword(password);
         return this;
     }
-    public AbstractRobot withDefaultPlugins(List<Plugin> plugins){
+
+    public AbstractRobot withDefaultPlugins(List<AbstractPlugin> plugins) {
         this.pluginManager.getDefaultPlugins().addAll(plugins);
         return this;
     }
@@ -187,19 +190,19 @@ public void connect(){
                 catch (InterruptedException e){
                     throw new RuntimeException(e);
                 } catch (IllegalArgumentException e) {
-                    TranslatableBundle.warnTranslatableOf(EnumSystemEvents.PACKET_ERROR, e);
+                    TranslatableUtil.warnTranslatableOf(EnumSystemEvents.PACKET_ERROR, e);
                 }
             }
         } finally {
-            this.serverSession.disconnect("Interrupted");
+            this.serverSession.disconnect("Connection was Interrupted");
             scheduleReconnect();
         }
     }
 
     public abstract boolean canSendMessages();
 
     public void scheduleReconnect() {
-        TranslatableBundle.infoTranslatableOf(EnumSystemEvents.RECONNECT);
+        TranslatableUtil.infoTranslatableOf(EnumSystemEvents.RECONNECT);
         try {
             Thread.sleep(this.config().getReconnectDelay());
         } catch (InterruptedException e) {

src/main/java/org/angellock/impl/AbstractRobot.java

@@ -18,6 +18,7 @@
 
 import lombok.Getter;
 import org.angellock.impl.util.ConsoleTokens;
+import org.angellock.impl.util.TranslatableUtil;
 import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundChatCommandPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundChatPacket;
@@ -59,14 +60,18 @@ private boolean isCommand(String msg){
     private void sendMessagePacket(String message){
         if (!this.isCommand(message)) {
             MinecraftPacket msgPacket = new ServerboundChatPacket(message, Instant.now().toEpochMilli(), System.currentTimeMillis(), null, 0, new BitSet());
-            log.info(ConsoleTokens.colorizeText("&7Sending in-game chat message: &b&l&o{}"), message);
+            log.info(TranslatableUtil.getFormattedMessage(EnumSystemEvents.CHAT_MESSAGE_SEND, message));
             this.instance.sendPacket(msgPacket);
         } else {
-            boolean valid = this.instance.commandManager.callCommand(message, instance);
-            if(!valid){
-                MinecraftPacket cmd = new ServerboundChatCommandPacket(message.replaceFirst("/", ""));
-                log.info(ConsoleTokens.colorizeText("&6Sending chat Command: &b&l&o{}"), message);
-                this.instance.sendPacket(cmd);
+            try {
+                boolean valid = this.instance.commandManager.callCommand(message, instance);
+                if (!valid) {
+                    MinecraftPacket cmd = new ServerboundChatCommandPacket(message.replaceFirst("/", ""));
+                    log.info(TranslatableUtil.getFormattedMessage(EnumSystemEvents.CHAT_COMMAND_SEND, message));
+                    this.instance.sendPacket(cmd);
+                }
+            } catch (Exception e) {
+                log.warn("An exception occurred: &7{}", e.getMessage());
             }
         }
     }

src/main/java/org/angellock/impl/ChatMessageManager.java

@@ -21,17 +21,39 @@
 @Getter
 public enum EnumSystemEvents {
     COMMAND_NOT_FOUND("command.notfound"),
+    COMMAND_NAME("command.name"),
+    COMMAND_ALIASES("command.aliases"),
+    COMMAND_PROVIDER("command.provider"),
+    COMMAND_USAGE("command.usage"),
+    COMMAND_DESCRIPTION("command.description"),
+    PLUGIN_LISTENER_LOAD("plugin.listener.load"),
+    PLUGIN_LOAD("plugin.load"),
+    PLUGIN_EVENT_HANDLER_LOAD("plugin.event.handler.load"),
+    PLUGIN_DISABLE("plugin.disable"),
+    PLUGIN_EVENT_HANDLER_DISABLE("plugin.event.handler.remove"),
     RECONNECT("server.reconnect"),
     CONNECT("server.connect"),
     DISCONNECT("server.disconnect"),
     PACKET_ERROR("packet.error"),
     DOLPHIN_TIMING_RESET("dolphin.timing.reset"),
     SERVER_PLAYER_GAMEMODE("server.player.gamemode"),
+
     SERVER_WORLD_JOIN("server.world.join"),
+    CHAT_MESSAGE_SEND("chat.message.send"),
+    CHAT_COMMAND_SEND("chat.command.send"),
     SERVER_CONNECTION_ESTABLISHED("server.connection.established"),
     LOGIN_STATEMACHINE_TRANSIT("dolphin.statemachine.login.transit"),
+    PLUGIN_LOAD_COMMANDS("plugin.load.command"),
+    PLUGIN_LOAD_TERMINAL_COMMANDS("plugin.load.terminal.command"),
+    PLUGIN_LOAD_COMPLETE("plugin.load.complete"),
     PLAYER_INFO_CRACKED("info.cracked"),
-    PLAYER_INFO_ONLINE("info.online");
+    PLAYER_INFO_ONLINE("info.online"),
+    CHAT_COMMAND_DETECTED("chat.command.detected"),
+    PROXY_CONFIG_INVALID("proxy.config.invalid"),
+    DOLPHIN_BOTS_LOAD("dolphin.bot.load"),
+    PROXY_CONFIG_LOAD("proxy.config.load"),
+    CONFIG_FILE_LOADED("bot.config.file.loaded"),
+    COMMANDLINE_LOADED("commandline.enabled");
 
     private final String spaceName;
 

src/main/java/org/angellock/impl/EnumSystemEvents.java

@@ -17,11 +17,11 @@
 package org.angellock.impl;
 
 import lombok.Setter;
-import org.angellock.impl.events.TranslatableBundle;
 import org.angellock.impl.ingame.IPlayer;
 import org.angellock.impl.managers.ConfigManager;
 import org.angellock.impl.plugin.PluginManager;
 import org.angellock.impl.util.ConsoleTokens;
+import org.angellock.impl.util.TranslatableUtil;
 import org.angellock.impl.util.math.Position;
 import org.cloudburstmc.math.vector.Vector3i;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
@@ -58,19 +58,19 @@ public boolean canSendMessages() {
 
     @Override
     public void onJoin() {
-        log.info(ConsoleTokens.colorizeText("&7[{}] &2Connection was established!"), this.getProfileName());
+        log.info(TranslatableUtil.getFormattedMessage(EnumSystemEvents.SERVER_CONNECTION_ESTABLISHED, this.getProfileName()));
     }
 
     @Override
     public void onQuit(String reason) {
         long millis = System.currentTimeMillis() - this.connectTime;
         log.info(ConsoleTokens.colorizeText("[{}] &7Session Duration: &f{}ms"), this.getProfileName(), millis);
-        TranslatableBundle.infoTranslatableOf(EnumSystemEvents.DISCONNECT, reason);
+        TranslatableUtil.infoTranslatableOf(EnumSystemEvents.DISCONNECT, reason);
         this.getPluginManager().disableAllPlugins(this);
         this.getSession().getChannel().close();
         this.getSession().getChannel().deregister();
         this.getSession().getChannel().closeFuture();
-        TranslatableBundle.infoTranslatableOf(EnumSystemEvents.DOLPHIN_TIMING_RESET);
+        TranslatableUtil.infoTranslatableOf(EnumSystemEvents.DOLPHIN_TIMING_RESET);
     }
 
     @Override
@@ -81,7 +81,7 @@ public void onKicked() {
     @Override
     public void onPreLogin() {
         this.connectTime = System.currentTimeMillis();
-        TranslatableBundle.infoTranslatableOf(EnumSystemEvents.CONNECT, this.config().getServer(), String.valueOf(this.config().getPort()));
+        TranslatableUtil.infoTranslatableOf(EnumSystemEvents.CONNECT, this.config().getServer(), String.valueOf(this.config().getPort()));
     }
 
     @Override

src/main/java/org/angellock/impl/RobotPlayer.java

@@ -24,6 +24,7 @@
 import org.angellock.impl.managers.BotManager;
 import org.angellock.impl.managers.ConfigManager;
 import org.angellock.impl.util.ConsoleTokens;
+import org.angellock.impl.util.TranslatableUtil;
 import org.angellock.impl.win32terminal.AnsiEscapes;
 import org.jetbrains.annotations.Nullable;
 import org.jline.reader.LineReader;
@@ -95,7 +96,7 @@ public static void main(String[] args) {
         } else {
             AnsiEscapes.printArt(ARCHIVE_VERSION);
             config.printConfigSpec();
-            log.info(ConsoleTokens.colorizeText("&8Loading bots..."));
+            log.info(TranslatableUtil.getFormattedMessage(EnumSystemEvents.DOLPHIN_BOTS_LOAD));
             botManager.startAll();
         }
 
@@ -104,23 +105,24 @@ public static void main(String[] args) {
     private static void getTerminal(AbstractRobot dolphinBot) {
         LineReader reader = AnsiEscapes.getReader();
         terminalInput = new Thread(() -> {
-            try {
-                while (true) {
+            while (true) {
+                try {
                     String s = reader.readLine(ConsoleTokens.colorizeText("&lTerminal>&b"));
                     ChatMessageManager messageManager = dolphinBot.getMessageManager();
                     if (messageManager != null) {
                         dolphinBot.getMessageManager().putMessage(s);
                     }
+                } catch (UserInterruptException w) {
+                    if (exit) {
+                        System.exit(0);
+                    } else {
+                        log.warn("To exit DolphinBot, press Ctrl + C again.");
+                        exit = true;
+                    }
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                    log.info(ConsoleTokens.colorizeText("&8Failed to send message: &7{}"), e.getMessage());
                 }
-            } catch (UserInterruptException w) {
-                if (exit){
-                    System.exit(0);
-                } else {
-                    log.warn("To exit DolphinBot, press Ctrl + C again.");
-                    exit = true;
-                }
-            } catch (Throwable e) {
-                log.info(ConsoleTokens.colorizeText("&8Failed to send message: &7{}"), e.getLocalizedMessage());
             }
         });
         terminalInput.start();

src/main/java/org/angellock/impl/Start.java

@@ -16,18 +16,38 @@
 
 package org.angellock.impl.commands;
 
+import org.angellock.impl.plugin.AbstractPlugin;
+
 public abstract class AbstractBuilder<T> {
     protected String commandName = "";
     protected String description;
+    protected AbstractPlugin provider;
+
+    protected String usage;
 
     protected String[] aliases = new String[0];
 
+    public AbstractBuilder<T> withName(String name) {
+        this.commandName = name;
+        return this;
+    }
+
+    public AbstractBuilder<T> withUsage(String name) {
+        this.usage = name;
+        return this;
+    }
+
+    public AbstractBuilder<T> withProvider(AbstractPlugin plugin) {
+        this.provider = plugin;
+        return this;
+    }
+
     public AbstractBuilder<T> withDescription(String description){
         this.description = description;
         return this;
     }
 
-    public AbstractBuilder<T> withAliases(String[] aliases){
+    public AbstractBuilder<T> withAliases(String... aliases) {
         this.aliases = aliases;
         return this;
     }

src/main/java/org/angellock/impl/commands/AbstractBuilder.java

@@ -27,6 +27,7 @@ public abstract class AbstractCommand {
     @Getter
     protected final String name;
     protected ICommandAction action;
+    @Getter
     @Setter
     protected String description;
     @Getter
@@ -47,10 +48,6 @@ public void setAliases(String[] aliases) {
         this.aliases = List.of(aliases);
     }
 
-    public String getDescription() {
-        return description;
-    }
-
     public boolean isAnAliasOf(String alias) {
         return this.aliases.contains(alias);
     }