[+] Added Logging file recording.

[+] Exposed currentState getter to plugin system.
[#] Moved the login state machine to the bot class.
[#] Changed Plugin onEnable(AbstractRobot) to onEnable(RobotPlayer).
[#] Moved the event loop logic to RobotPlayer.mainTickingEventLoop.

Author: NeonAngelThreads

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

@@ -77,8 +77,6 @@ public abstract class AbstractRobot implements ISendable, SessionProvider, IOpti
     @Setter
     protected @Getter GameMode serverGamemode = GameMode.ADVENTURE;
     @Getter
-    private ChatMessageManager messageManager;
-    @Getter
     private BotManager botManager = BotManager.getInstance();
     protected ProxyInfo proxyInfo;
     protected @Getter ProfileObject infoHelper = new ProfileObject();
@@ -159,7 +157,6 @@ public void connect(){
             this.serverSession = new TcpClientSession(serverIP, serverPort, minecraftProtocol);
         }
 
-        this.messageManager = new ChatMessageManager(this);
         this.serverSession.addListener((IConnectListener) event -> onJoin());
         this.serverSession.addListener(new DisconnectReasonHandler(this));
         this.serverSession.addListener(new ServerChatCommandHandler(this.commands));
@@ -172,45 +169,12 @@ public void connect(){
         this.serverSession.connect(true, false);
 
         this.connectDuration = System.currentTimeMillis();
-        try {
-            boolean connect = true;
-            boolean shouldWait = false;
-
-            while (true) {
-                try {
-                    Thread.sleep(20L);
-                    if (!this.serverSession.isConnected()){
-                        this.connectDuration = System.currentTimeMillis();
-                        break;
-                    } else if (connect) {
-                        if (System.currentTimeMillis() - this.connectDuration > 100L){
-                            this.pluginManager.loadAllPlugins(this);
-                            connect = false;
-                        }
-                    } else if (!shouldWait) {
-                        if (this.messageManager.pollMessage()) {
-                            shouldWait = true;
-                        }
-                    } else if (canSendMessages()) {
-                        shouldWait = false;
-                    }
-                }
-                catch (InterruptedException e){
-                    continue;
-                } catch (IllegalArgumentException e) {
-                    TranslatableUtil.warnTranslatableOf(EnumSystemEvents.PACKET_ERROR, e);
-                } catch (Exception e) {
-                    TranslatableUtil.warnTranslatableOf(EnumSystemEvents.PLUGIN_ERROR, e);
-                }
-            }
-        } finally {
-            this.serverSession.disconnect("");
-            if (BotManager.getBotByProfileName(getProfileName()) != null){
-                scheduleReconnect();
-            }
-        }
+
+        this.mainTickingEventLoop();
     }
 
+    public abstract void mainTickingEventLoop();
+
     public abstract boolean canSendMessages();
 
     public void scheduleReconnect() {

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

@@ -34,9 +34,9 @@ public class ChatMessageManager{
     protected static final Logger log = LoggerFactory.getLogger(ConsoleTokens.colorizeText("&7ChatMessageManager"));
     @Getter
     private final Queue<String> chatMessageQueue = new ArrayDeque<>();
-    private final AbstractRobot instance;
+    private final RobotPlayer instance;
 
-    public ChatMessageManager(AbstractRobot bot) {
+    public ChatMessageManager(RobotPlayer bot) {
         this.instance = bot;
     }
 

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

@@ -16,7 +16,10 @@
 
 package org.angellock.impl;
 
+import lombok.Getter;
 import lombok.Setter;
+import org.angellock.impl.api.state.LoginState;
+import org.angellock.impl.api.state.LoginStateMachine;
 import org.angellock.impl.events.bukkit.AbstractEvent;
 import org.angellock.impl.ingame.IPlayer;
 import org.angellock.impl.managers.BotManager;
@@ -38,18 +41,63 @@ public class RobotPlayer extends AbstractRobot implements IPlayer {
     private long lastMsgTime = 0L;
     private final long msgDelay;
     private volatile @Setter boolean shouldReconnect = true;
+    @Getter
+    private ChatMessageManager messageManager;
+    @Getter
+    private final LoginStateMachine loginStateMachine = new LoginStateMachine(LoginState.DISCONNECTED);
     protected @Setter Position loginPos = new Position();
 
     public RobotPlayer(ConfigManager configManager, PluginManager pluginManager) {
         super(configManager, pluginManager);
-
+        this.messageManager = new ChatMessageManager(this);
         this.msgDelay = Long.parseLong(Optional
                 .ofNullable(
                         this.globalConfig.getConfigValue("msg-send-delay"))
                 .orElse("3000")
         );
     }
 
+    @Override
+    public void mainTickingEventLoop() {
+        try {
+            boolean connect = true;
+            boolean shouldWait = false;
+
+            while (true) {
+                try {
+                    Thread.sleep(20L);
+                    if (!this.serverSession.isConnected()){
+                        this.connectDuration = System.currentTimeMillis();
+                        break;
+                    } else if (connect) {
+                        if (System.currentTimeMillis() - this.connectDuration > 100L){
+                            this.pluginManager.loadAllPlugins(this);
+                            connect = false;
+                        }
+                    } else if (!shouldWait) {
+                        if (this.getMessageManager().pollMessage()) {
+                            shouldWait = true;
+                        }
+                    } else if (canSendMessages()) {
+                        shouldWait = false;
+                    }
+                }
+                catch (InterruptedException e){
+                    continue;
+                } catch (IllegalArgumentException e) {
+                    TranslatableUtil.warnTranslatableOf(EnumSystemEvents.PACKET_ERROR, e);
+                } catch (Exception e) {
+                    TranslatableUtil.warnTranslatableOf(EnumSystemEvents.PLUGIN_ERROR, e);
+                }
+            }
+        } finally {
+            this.serverSession.disconnect("");
+            if (BotManager.getBotByProfileName(getProfileName()) != null){
+                scheduleReconnect();
+            }
+        }
+    }
+
     @Override
     public boolean canSendMessages() {
         long t = System.currentTimeMillis();

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

@@ -118,7 +118,7 @@ public static void main(String[] args) {
 
     }
 
-    private static void getTerminal(AbstractRobot dolphinBot) {
+    private static void getTerminal(RobotPlayer dolphinBot) {
         LineReader reader = AnsiEscapes.getReader();
         terminalInput = new Thread(() -> {
             while (true) {

src/main/java/org/angellock/impl/api/state/LoginStateMachine.java

@@ -17,13 +17,15 @@
 package org.angellock.impl.api.state;
 
 import it.unimi.dsi.fastutil.Pair;
+import lombok.Getter;
 import org.angellock.impl.EnumSystemEvents;
 import org.angellock.impl.util.TranslatableUtil;
 import org.angellock.impl.util.reason.IReason;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class LoginStateMachine extends StateMachine<String> {
+    @Getter
     private LoginState currentState;
     private final LoginState initialState;
     private String message;

src/main/java/org/angellock/impl/api/state/StateAction.java

@@ -17,10 +17,11 @@
 package org.angellock.impl.api.state;
 
 import org.angellock.impl.AbstractRobot;
+import org.angellock.impl.RobotPlayer;
 
 public abstract class StateAction {
-    protected AbstractRobot entityBot;
-    public StateAction(AbstractRobot botInstance) {
+    protected RobotPlayer entityBot;
+    public StateAction(RobotPlayer botInstance) {
         this.entityBot = botInstance;
     }
     public abstract void execute();

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

@@ -19,6 +19,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.angellock.impl.AbstractRobot;
+import org.angellock.impl.RobotPlayer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,5 +53,5 @@ public boolean isAnAliasOf(String alias) {
         return this.aliases.contains(alias);
     }
 
-    public abstract boolean activate(CommandResponse entity, AbstractRobot bot);
+    public abstract boolean activate(CommandResponse entity, RobotPlayer bot);
 }

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

@@ -17,6 +17,7 @@
 package org.angellock.impl.commands;
 
 import org.angellock.impl.AbstractRobot;
+import org.angellock.impl.RobotPlayer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,7 +40,7 @@ public void setAction(ICommandAction action){
     }
 
     @Override
-    public boolean activate(CommandResponse entity, AbstractRobot bot) {
+    public boolean activate(CommandResponse entity, RobotPlayer bot) {
         if (users.contains(entity.getSender()) || users.isEmpty()) {
             this.action.onCommand(entity, bot);
             return true;

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

@@ -19,6 +19,7 @@
 import lombok.Getter;
 import org.angellock.impl.AbstractRobot;
 import org.angellock.impl.EnumSystemEvents;
+import org.angellock.impl.RobotPlayer;
 import org.angellock.impl.util.ConsoleTokens;
 import org.angellock.impl.util.TranslatableUtil;
 import org.jetbrains.annotations.Nullable;
@@ -32,10 +33,10 @@
 public class CommandSpec {
     protected static final Logger log = LoggerFactory.getLogger(ConsoleTokens.colorizeText("&9&lDolphinCommandExecutor"));
     private final @Getter Map<String, Command> registeredCommands = new HashMap<>();
-    private final AbstractRobot bot;
+    private final RobotPlayer bot;
 
     public CommandSpec(AbstractRobot bot) {
-        this.bot = bot;
+        this.bot = (RobotPlayer) bot;
     }
 
     public void register(Command command){
@@ -49,7 +50,7 @@ public void register(Command command){
 
     public void executeCommand(CommandResponse response) {
         if (response != null) {
-            log.info(TranslatableUtil.getFormattedMessage(EnumSystemEvents.CHAT_COMMAND_DETECTED, Arrays.toString(response.getCommandList()), response.getSender()));
+            log.info(bot.getBotLabel(), TranslatableUtil.getFormattedMessage(EnumSystemEvents.CHAT_COMMAND_DETECTED, Arrays.toString(response.getCommandList()), response.getSender()));
             Command cmd = this.getCommand(response.getCommandList()[0]);
             if (cmd != null) {
                 boolean success = cmd.activate(response, bot);

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

@@ -17,7 +17,8 @@
 package org.angellock.impl.commands;
 
 import org.angellock.impl.AbstractRobot;
+import org.angellock.impl.RobotPlayer;
 
 public interface ICommandAction {
-    void onCommand(CommandResponse responseEntity, AbstractRobot bot);
+    void onCommand(CommandResponse responseEntity, RobotPlayer bot);
 }