Migration to protocol class

src/engine/net/CheckNetMsgFactoryJob.java

@@ -8,8 +8,8 @@
 
 package engine.net;
 
-import engine.gameManager.ConfigManager;
 import engine.job.AbstractJob;
+import engine.net.client.Protocol;
 import engine.net.client.msg.ClientNetMsg;
 import org.pmw.tinylog.Logger;
 
@@ -40,7 +40,7 @@ public class CheckNetMsgFactoryJob extends AbstractJob {
             }
 
             if (msg instanceof engine.net.client.msg.ClientNetMsg) {
-                ConfigManager.handler.handleClientMsg((ClientNetMsg) msg);
+                Protocol.handleClientMsg((ClientNetMsg) msg);
 
             } else {
                 Logger.error("Unrouteable message of type '" + msg.getClass().getSimpleName() + '\'');

src/engine/net/client/ClientConnection.java

@@ -296,7 +296,7 @@ public class ClientConnection extends AbstractConnection {
         if (MBServerStatics.DEBUG_PROTOCOL)
             applicationProtocolLogger(msg, MessageSource.SOURCE_CLIENT);
 
-        return ConfigManager.handler.handleClientMsg(msg); // *** Refactor : Null check then call
+        return Protocol.handleClientMsg(msg);
     }
 
     private void applicationProtocolLogger(AbstractNetMsg msg, MessageSource origin) {

src/engine/net/client/ClientMessagePump.java

@@ -1,102 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.net.client;
-
-import engine.gameManager.SessionManager;
-import engine.net.NetMsgHandler;
-import engine.net.client.handlers.AbstractClientMsgHandler;
-import engine.net.client.msg.ClientNetMsg;
-import engine.server.world.WorldServer;
-import engine.session.Session;
-import engine.util.StringUtils;
-import org.pmw.tinylog.Logger;
-
-/**
- * @author:
- * @summary: This class is the mainline router for application protocol
- * messages received by the client.
- */
-
-public class ClientMessagePump implements NetMsgHandler {
-
-    // Instance variable declaration
-
-    private final WorldServer server;
-
-    public ClientMessagePump(WorldServer server) {
-        super();
-        this.server = server;
-    }
-
-    //Handle RepairObject Window and RepairObject Requests
-
-    @Override
-    public boolean handleClientMsg(ClientNetMsg msg) {
-
-        if (msg == null) {
-            Logger.error("handleClientMsg", "Recieved null msg. Returning.");
-            return false;
-        }
-
-        ClientConnection origin;
-        Protocol protocolMsg = Protocol.NONE;
-        Session s;
-
-        try {
-
-            // Try registered opcodes first as we take a hatchet to this GodObject
-
-            AbstractClientMsgHandler msgHandler = msg.getProtocolMsg().handler;
-
-            if (msgHandler != null)
-                return msgHandler.handleNetMsg(msg);
-
-            // Any remaining opcodes fall through and are routed
-            // through this ungodly switch of doom.
-
-            origin = (ClientConnection) msg.getOrigin();
-            s = SessionManager.getSession(origin);
-
-            protocolMsg = msg.getProtocolMsg();
-
-            switch (protocolMsg) {
-
-                case READYTOENTER:
-                    break;
-                case OPENVAULT:
-                    break;
-                case CHANNELMUTE:
-                    break;
-                case KEEPALIVESERVERCLIENT:
-                    break;
-                case UNKNOWN:
-                    break;
-
-                case CONFIRMPROMOTE:
-                    break;
-
-                default:
-                    String ocHex = StringUtils.toHexString(protocolMsg.opcode);
-                    Logger.error("Cannot handle Opcode: " + ocHex + " " + protocolMsg.name());
-                    return false;
-
-            }
-
-        } catch (Exception e) {
-            Logger.error("handler for " + protocolMsg + " failed:  " + e);
-            return false;
-        }
-
-        return true;
-    }
-
-
-
-}