Updated to latest UnlegitLibrary Version
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package org.openautonomousconnection.protocol;
|
||||
|
||||
import dev.unlegitdqrk.unlegitlibrary.network.system.utils.ClientAuthMode;
|
||||
import dev.unlegitdqrk.unlegitlibrary.utils.Logger;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
@@ -77,13 +78,17 @@ public final class ProtocolBridge {
|
||||
* @param logFolder The folder to store the log files
|
||||
* @throws Exception if an error occurs while initializing the ProtocolBridge
|
||||
*/
|
||||
@ProtocolInfo(protocolSide = ProtocolVersion.ProtocolSide.CLIENT)
|
||||
public ProtocolBridge(ProtocolCustomServer protocolServer, ProtocolValues protocolValues, ProtocolVersion protocolVersion, File logFolder) throws Exception {
|
||||
// Assign the parameters to the class fields
|
||||
this.protocolServer = protocolServer;
|
||||
this.protocolValues = protocolValues;
|
||||
this.protocolVersion = protocolVersion;
|
||||
|
||||
if (protocolServer instanceof ProtocolINSServer) {
|
||||
protocolServer.attachBridge(this, null, false, ClientAuthMode.NONE);
|
||||
} else
|
||||
protocolServer.attachBridge(this, protocolValues.keyPass, protocolValues.ssl, protocolValues.authMode);
|
||||
|
||||
// Initialize the logger and protocol version
|
||||
initializeLogger(logFolder);
|
||||
initializeProtocolVersion();
|
||||
@@ -91,8 +96,6 @@ public final class ProtocolBridge {
|
||||
// Register the appropriate listeners and packets
|
||||
registerListeners();
|
||||
registerPackets();
|
||||
|
||||
protocolServer.attachBridge(this);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -111,6 +114,8 @@ public final class ProtocolBridge {
|
||||
this.protocolValues = protocolValues;
|
||||
this.protocolVersion = protocolVersion;
|
||||
|
||||
protocolClient.attachBridge(this);
|
||||
|
||||
// Initialize the logger and protocol version
|
||||
initializeLogger(logFolder);
|
||||
initializeProtocolVersion();
|
||||
@@ -118,8 +123,6 @@ public final class ProtocolBridge {
|
||||
// Register the appropriate listeners and packets
|
||||
registerListeners();
|
||||
registerPackets();
|
||||
|
||||
protocolClient.attachBridge(this);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -127,30 +130,17 @@ public final class ProtocolBridge {
|
||||
*/
|
||||
private void registerPackets() {
|
||||
// 1.0.0-BETA packets
|
||||
AuthPacket v100bAuthPath = new AuthPacket();
|
||||
INSQueryPacket v100BINSQueryPacket = new INSQueryPacket();
|
||||
INSResponsePacket v100BINSResponsePacket = new INSResponsePacket(this);
|
||||
WebRequestPacket v100BWebRequestPacket = new WebRequestPacket();
|
||||
WebResponsePacket v100BResponsePacket = new WebResponsePacket();
|
||||
WebStreamChunkPacket v100BStreamChunkPacket = new WebStreamChunkPacket();
|
||||
WebStreamStartPacket v100BStreamStartPacket = new WebStreamStartPacket();
|
||||
WebStreamEndPacket v100BStreamEndPacket = new WebStreamEndPacket();
|
||||
|
||||
if (isPacketSupported(v100bAuthPath)) protocolValues.packetHandler.registerPacket(v100bAuthPath);
|
||||
if (isPacketSupported(v100BINSQueryPacket)) protocolValues.packetHandler.registerPacket(v100BINSQueryPacket);
|
||||
if (isPacketSupported(v100BINSResponsePacket))
|
||||
protocolValues.packetHandler.registerPacket(v100BINSResponsePacket);
|
||||
if (isPacketSupported(v100BWebRequestPacket))
|
||||
protocolValues.packetHandler.registerPacket(v100BWebRequestPacket);
|
||||
if (isPacketSupported(v100BResponsePacket)) protocolValues.packetHandler.registerPacket(v100BResponsePacket);
|
||||
if (isPacketSupported(v100BStreamChunkPacket))
|
||||
protocolValues.packetHandler.registerPacket(v100BStreamChunkPacket);
|
||||
if (isPacketSupported(v100BStreamStartPacket))
|
||||
protocolValues.packetHandler.registerPacket(v100BStreamStartPacket);
|
||||
if (isPacketSupported(v100BStreamEndPacket))
|
||||
protocolValues.packetHandler.registerPacket(v100BStreamEndPacket);
|
||||
if (isPacketSupported(new AuthPacket(this))) protocolValues.packetHandler.registerPacket(() -> new AuthPacket(this));
|
||||
if (isPacketSupported(new INSQueryPacket())) protocolValues.packetHandler.registerPacket(INSQueryPacket::new);
|
||||
if (isPacketSupported(new INSResponsePacket(this))) protocolValues.packetHandler.registerPacket(() -> new INSResponsePacket(this));
|
||||
if (isPacketSupported(new WebRequestPacket())) protocolValues.packetHandler.registerPacket(WebRequestPacket::new);
|
||||
if (isPacketSupported(new WebResponsePacket())) protocolValues.packetHandler.registerPacket(WebResponsePacket::new);
|
||||
if (isPacketSupported(new WebStreamChunkPacket())) protocolValues.packetHandler.registerPacket(WebStreamChunkPacket::new);
|
||||
if (isPacketSupported(new WebStreamStartPacket())) protocolValues.packetHandler.registerPacket(WebStreamStartPacket::new);
|
||||
if (isPacketSupported(new WebStreamEndPacket())) protocolValues.packetHandler.registerPacket(WebStreamEndPacket::new);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Register the appropriate listeners based on the current side
|
||||
*
|
||||
@@ -159,17 +149,13 @@ public final class ProtocolBridge {
|
||||
private void registerListeners() throws Exception {
|
||||
// Client Listeners
|
||||
if (isRunningAsClient()) {
|
||||
ClientListener clientListener = new ClientListener();
|
||||
clientListener.setClient(protocolClient);
|
||||
protocolValues.eventManager.registerListener(clientListener.getClass());
|
||||
protocolValues.eventManager.registerListener(new ClientListener(protocolClient));
|
||||
protocolValues.eventManager.unregisterListener(CustomServerListener.class);
|
||||
}
|
||||
|
||||
// Server Listeners
|
||||
if (isRunningAsServer()) {
|
||||
CustomServerListener serverListener = new CustomServerListener();
|
||||
serverListener.setServer(protocolServer);
|
||||
protocolValues.eventManager.registerListener(serverListener.getClass());
|
||||
protocolValues.eventManager.registerListener(new CustomServerListener(protocolServer));
|
||||
protocolValues.eventManager.unregisterListener(ClientListener.class);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user