- Finished up with classic packets

src/main/java/github/openautonomousconnection/protocol/ProtocolBridge.java

@@ -1,17 +1,21 @@
 package github.openautonomousconnection.protocol;
 
-import github.openautonomousconnection.protocol.handle.ClassicHandlerServer;
+import github.openautonomousconnection.protocol.listeners.ClientListener;
+import github.openautonomousconnection.protocol.listeners.ServerListener;
+import github.openautonomousconnection.protocol.packets.OACPacket;
+import github.openautonomousconnection.protocol.versions.ProtocolVersion;
+import github.openautonomousconnection.protocol.versions.v1_0_0.classic.ClassicHandlerClient;
+import github.openautonomousconnection.protocol.versions.v1_0_0.classic.ClassicHandlerServer;
 import github.openautonomousconnection.protocol.packets.v1_0_0.classic.Classic_DomainPacket;
-import github.openautonomousconnection.protocol.packets.v1_0_0.classic.Classic_MessagePacket;
-import github.openautonomousconnection.protocol.packets.v1_0_0.classic.Classic_PingPacket;
-import github.openautonomousconnection.protocol.side.ProtocolClient;
-import github.openautonomousconnection.protocol.side.ProtocolServer;
+import github.openautonomousconnection.protocol.side.client.ProtocolClient;
+import github.openautonomousconnection.protocol.side.server.ProtocolServer;
 import lombok.Getter;
 import lombok.Setter;
 import me.finn.unlegitlibrary.utils.Logger;
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 
 public class ProtocolBridge {
 
@@ -32,11 +36,13 @@ public class ProtocolBridge {
 
     @Getter @Setter
     private ClassicHandlerServer classicHandlerServer;
+    @Getter @Setter
+    private ClassicHandlerClient classicHandlerClient;
 
     @Getter
     private static ProtocolBridge instance;
 
-    public ProtocolBridge(ProtocolServer protocolServer, ProtocolSettings protocolSettings, ProtocolVersion protocolVersion, File logFolder) {
+    public ProtocolBridge(ProtocolServer protocolServer, ProtocolSettings protocolSettings, ProtocolVersion protocolVersion, File logFolder) throws InvocationTargetException, InstantiationException, IllegalAccessException, NoSuchMethodException {
         this.protocolServer = protocolServer;
         this.protocolSettings = protocolSettings;
         this.protocolVersion = protocolVersion;
@@ -51,8 +57,10 @@ public class ProtocolBridge {
         }
 
         this.logger = tmpLogger;
+        protocolSettings.eventManager.registerListener(new ServerListener());
+        protocolSettings.eventManager.unregisterListener(new ClientListener());
 
-        if (!validateProtocolVersion()) {
+        if (!validateProtocolSide()) {
             this.logger.error("Invalid protocol version '" + protocolVersion.toString() + "'!");
             System.exit(1);
         }
@@ -60,7 +68,7 @@ public class ProtocolBridge {
         instance = this;
     }
 
-    public ProtocolBridge(ProtocolClient protocolClient, ProtocolSettings protocolSettings, ProtocolVersion protocolVersion, File logFolder) {
+    public ProtocolBridge(ProtocolClient protocolClient, ProtocolSettings protocolSettings, ProtocolVersion protocolVersion, File logFolder) throws InvocationTargetException, InstantiationException, IllegalAccessException, NoSuchMethodException {
         this.protocolClient = protocolClient;
         this.protocolSettings = protocolSettings;
         this.protocolVersion = protocolVersion;
@@ -75,21 +83,31 @@ public class ProtocolBridge {
         }
 
         this.logger = tmpLogger;
+        protocolSettings.eventManager.registerListener(new ClientListener());
+        protocolSettings.eventManager.unregisterListener(new ServerListener());
 
-        if (!validateProtocolVersion()) {
+        if (!validateProtocolSide()) {
             this.logger.error("Invalid protocol version '" + protocolVersion.toString() + "'!");
             System.exit(1);
         }
 
         if (isClassicSupported()) {
-            protocolSettings.packetHandler.registerPacket(new Classic_DomainPacket());
-            protocolSettings.packetHandler.registerPacket(new Classic_MessagePacket());
-            protocolSettings.packetHandler.registerPacket(new Classic_PingPacket());
+            Classic_DomainPacket cDomainPacket = new Classic_DomainPacket();
+            Classic_DomainPacket cMessagePacket = new Classic_DomainPacket();
+            Classic_DomainPacket cPingPacket = new Classic_DomainPacket();
+
+            if (isPacketSupported(cDomainPacket)) protocolSettings.packetHandler.registerPacket(cDomainPacket);
+            if (isPacketSupported(cMessagePacket)) protocolSettings.packetHandler.registerPacket(cMessagePacket);
+            if (isPacketSupported(cPingPacket)) protocolSettings.packetHandler.registerPacket(cPingPacket);
         }
 
         instance = this;
     }
 
+    public boolean isPacketSupported(OACPacket packet) {
+        return isVersionSupported(packet.getProtocolVersion());
+    }
+
     public boolean isClassicSupported() {
         boolean yes = false;
         for (ProtocolVersion compatibleVersion : protocolVersion.getCompatibleVersions()) {
@@ -108,12 +126,12 @@ public class ProtocolBridge {
         return protocolClient != null;
     }
 
-    private boolean validateProtocolVersion() {
+    private boolean validateProtocolSide() {
         return (isRunningAsServer() && protocolVersion.getProtocolSide() != ProtocolVersion.ProtocolSide.CLIENT) ||
                 (isRunningAsClient() && protocolVersion.getProtocolSide() != ProtocolVersion.ProtocolSide.SERVER);
     }
 
-    public boolean validateProtocolVersion(ProtocolVersion targetVersion) {
+    public boolean isVersionSupported(ProtocolVersion targetVersion) {
         return protocolVersion == targetVersion || protocolVersion.getCompatibleVersions().contains(targetVersion);
     }
 }