From 6c7a0728eec1951193bb21a852ec85b439b8cfd1 Mon Sep 17 00:00:00 2001 From: Tinglyyy Date: Mon, 29 Sep 2025 18:20:47 +0200 Subject: [PATCH] Revert "- Updated to new repo" This reverts commit d090b1067c5a194924f6a4ae0021ad4789a4be7a. --- .idea/GitLink.xml | 6 ---- .idea/encodings.xml | 2 -- README.MD | 2 +- pom.xml | 20 ++++++------ .../protocol/ProtocolBridge.java | 32 +++++++++---------- .../protocol/ProtocolSettings.java | 14 ++++++++ .../protocol/listeners/ClientListener.java | 14 ++++---- .../protocol/listeners/ServerListener.java | 22 +++++++++++++ .../protocol/packets/OACPacket.java | 10 +++--- .../packets/v1_0_0/beta/AuthPacket.java | 24 +++++++------- .../v1_0_0/beta/GetDestinationPacket.java | 14 ++++---- .../v1_0_0/beta/UnsupportedClassicPacket.java | 12 +++---- .../v1_0_0/beta/ValidateDomainPacket.java | 12 +++---- .../v1_0_0/classic/Classic_DomainPacket.java | 21 ++++++------ .../v1_0_0/classic/Classic_MessagePacket.java | 13 ++++---- .../v1_0_0/classic/Classic_PingPacket.java | 20 ++++++------ .../protocol/side/client/ProtocolClient.java | 22 ++++++------- .../events/ConnectedToProtocolServer.java | 6 ++++ .../side/server/ConnectedProtocolClient.java | 8 ++--- .../protocol/side/server/ProtocolServer.java | 16 +++++----- .../events/ProtocolClientConnected.java | 6 ++-- .../protocol/versions/ProtocolVersion.java | 2 +- .../versions/v1_0_0/beta/DNSResponseCode.java | 2 +- .../protocol/versions/v1_0_0/beta/Domain.java | 4 +-- .../v1_0_0/classic/ClassicConverter.java | 6 ++-- .../v1_0_0/classic/ClassicHandlerClient.java | 2 +- .../v1_0_0/classic/ClassicHandlerServer.java | 4 +-- .../classic/Classic_ClientListener.java | 10 +++--- .../v1_0_0/classic/Classic_Domain.java | 4 +-- .../Classic_DomainPacketReceivedEvent.java | 4 +-- .../v1_0_0/classic/Classic_DomainUtils.java | 4 +-- .../v1_0_0/classic/Classic_LocalDomain.java | 2 +- .../Classic_PingPacketReceivedEvent.java | 4 +-- .../classic/Classic_ProtocolVersion.java | 2 +- .../v1_0_0/classic/Classic_RequestDomain.java | 2 +- .../v1_0_0/classic/Classic_SiteType.java | 2 +- .../classic/Classic_WebsitesContent.java | 4 +-- .../protocol/ProtocolSettings.java | 14 -------- .../protocol/listeners/ServerListener.java | 22 ------------- .../events/ConnectedToProtocolServer.java | 6 ---- 40 files changed, 195 insertions(+), 201 deletions(-) delete mode 100644 .idea/GitLink.xml rename src/main/java/{org => github}/openautonomousconnection/protocol/ProtocolBridge.java (82%) create mode 100644 src/main/java/github/openautonomousconnection/protocol/ProtocolSettings.java rename src/main/java/{org => github}/openautonomousconnection/protocol/listeners/ClientListener.java (55%) create mode 100644 src/main/java/github/openautonomousconnection/protocol/listeners/ServerListener.java rename src/main/java/{org => github}/openautonomousconnection/protocol/packets/OACPacket.java (83%) rename src/main/java/{org => github}/openautonomousconnection/protocol/packets/v1_0_0/beta/AuthPacket.java (87%) rename src/main/java/{org => github}/openautonomousconnection/protocol/packets/v1_0_0/beta/GetDestinationPacket.java (85%) rename src/main/java/{org => github}/openautonomousconnection/protocol/packets/v1_0_0/beta/UnsupportedClassicPacket.java (82%) rename src/main/java/{org => github}/openautonomousconnection/protocol/packets/v1_0_0/beta/ValidateDomainPacket.java (82%) rename src/main/java/{org => github}/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_DomainPacket.java (78%) rename src/main/java/{org => github}/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_MessagePacket.java (79%) rename src/main/java/{org => github}/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_PingPacket.java (81%) rename src/main/java/{org => github}/openautonomousconnection/protocol/side/client/ProtocolClient.java (88%) create mode 100644 src/main/java/github/openautonomousconnection/protocol/side/client/events/ConnectedToProtocolServer.java rename src/main/java/{org => github}/openautonomousconnection/protocol/side/server/ConnectedProtocolClient.java (89%) rename src/main/java/{org => github}/openautonomousconnection/protocol/side/server/ProtocolServer.java (91%) rename src/main/java/{org => github}/openautonomousconnection/protocol/side/server/events/ProtocolClientConnected.java (57%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/ProtocolVersion.java (97%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/beta/DNSResponseCode.java (95%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/beta/Domain.java (96%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicConverter.java (81%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerClient.java (80%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerServer.java (76%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ClientListener.java (91%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_Domain.java (88%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainPacketReceivedEvent.java (88%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainUtils.java (96%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_LocalDomain.java (71%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_PingPacketReceivedEvent.java (89%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ProtocolVersion.java (76%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_RequestDomain.java (77%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_SiteType.java (79%) rename src/main/java/{org => github}/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_WebsitesContent.java (94%) delete mode 100644 src/main/java/org/openautonomousconnection/protocol/ProtocolSettings.java delete mode 100644 src/main/java/org/openautonomousconnection/protocol/listeners/ServerListener.java delete mode 100644 src/main/java/org/openautonomousconnection/protocol/side/client/events/ConnectedToProtocolServer.java diff --git a/.idea/GitLink.xml b/.idea/GitLink.xml deleted file mode 100644 index 5143819..0000000 --- a/.idea/GitLink.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 1187673..aa00ffa 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,7 +3,5 @@ - - \ No newline at end of file diff --git a/README.MD b/README.MD index b135df5..b8cb6e0 100644 --- a/README.MD +++ b/README.MD @@ -47,7 +47,7 @@ This project (OAC) is licensed under the [Open Autonomous Public License (OAPL)] ### Server ```java -import dev.unlegitdqrk.unlegitlibrary.network.system.server.ConnectionHandler; +import me.finn.unlegitlibrary.network.system.server.ConnectionHandler; import me.openautonomousconnection.protocol.ProtocolBridge; import me.openautonomousconnection.protocol.ProtocolSettings; import me.openautonomousconnection.protocol.ProtocolVersion; diff --git a/pom.xml b/pom.xml index af34f80..09ea591 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ Open Autonomous Connection https://open-autonomous-connection.org/ - https://open-autonomous-connection.org/ + https://open-autonomous-connection.org/protocol/ The Protocol for Server and Client @@ -53,14 +53,14 @@ - Issue Tracker - https://repo.open-autonomous-connection.org/open-autonomous-connection/Protocol/issues + GitHub Issue Tracker + https://github.com/Open-Autonomous-Connection/Protocol/issues - repounlegitdqrk - https://repo.unlegitdqrk.dev/api/packages/UnlegitDqrk/maven + github + https://maven.pkg.github.com/unlegitdqrk/unlegitlibrary true @@ -69,23 +69,23 @@ - oac - Protocol - https://repo.open-autonomous-connection.org/api/packages/open-autonomous-connection/maven + github + protocol + https://maven.pkg.github.com/open-autonomous-connection/protocol Open Autonomous Public License - https://repo.open-autonomous-connection.org/Open-Autonomous-Connection/OAPL/ + https://github.com/Open-Autonomous-Connection/OAPL/blob/main/LICENSE repo - me.unlegitdqrk + me.finn.unlegitlibrary unlegitlibrary 1.6.2 diff --git a/src/main/java/org/openautonomousconnection/protocol/ProtocolBridge.java b/src/main/java/github/openautonomousconnection/protocol/ProtocolBridge.java similarity index 82% rename from src/main/java/org/openautonomousconnection/protocol/ProtocolBridge.java rename to src/main/java/github/openautonomousconnection/protocol/ProtocolBridge.java index ce7af43..dbf8003 100644 --- a/src/main/java/org/openautonomousconnection/protocol/ProtocolBridge.java +++ b/src/main/java/github/openautonomousconnection/protocol/ProtocolBridge.java @@ -1,22 +1,22 @@ -package org.openautonomousconnection.protocol; +package github.openautonomousconnection.protocol; -import org.openautonomousconnection.protocol.listeners.ClientListener; -import org.openautonomousconnection.protocol.listeners.ServerListener; -import org.openautonomousconnection.protocol.packets.OACPacket; -import org.openautonomousconnection.protocol.packets.v1_0_0.beta.AuthPacket; -import org.openautonomousconnection.protocol.packets.v1_0_0.beta.GetDestinationPacket; -import org.openautonomousconnection.protocol.packets.v1_0_0.beta.UnsupportedClassicPacket; -import org.openautonomousconnection.protocol.packets.v1_0_0.beta.ValidateDomainPacket; -import org.openautonomousconnection.protocol.packets.v1_0_0.classic.Classic_DomainPacket; -import org.openautonomousconnection.protocol.side.client.ProtocolClient; -import org.openautonomousconnection.protocol.side.server.ProtocolServer; -import org.openautonomousconnection.protocol.versions.ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.classic.ClassicHandlerClient; -import org.openautonomousconnection.protocol.versions.v1_0_0.classic.ClassicHandlerServer; -import org.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_ClientListener; +import github.openautonomousconnection.protocol.listeners.ClientListener; +import github.openautonomousconnection.protocol.listeners.ServerListener; +import github.openautonomousconnection.protocol.packets.OACPacket; +import github.openautonomousconnection.protocol.packets.v1_0_0.beta.AuthPacket; +import github.openautonomousconnection.protocol.packets.v1_0_0.beta.GetDestinationPacket; +import github.openautonomousconnection.protocol.packets.v1_0_0.beta.UnsupportedClassicPacket; +import github.openautonomousconnection.protocol.packets.v1_0_0.beta.ValidateDomainPacket; +import github.openautonomousconnection.protocol.packets.v1_0_0.classic.Classic_DomainPacket; +import github.openautonomousconnection.protocol.side.client.ProtocolClient; +import github.openautonomousconnection.protocol.side.server.ProtocolServer; +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.versions.v1_0_0.classic.Classic_ClientListener; import lombok.Getter; import lombok.Setter; -import dev.unlegitdqrk.unlegitlibrary.utils.Logger; +import me.finn.unlegitlibrary.utils.Logger; import java.io.File; import java.io.IOException; diff --git a/src/main/java/github/openautonomousconnection/protocol/ProtocolSettings.java b/src/main/java/github/openautonomousconnection/protocol/ProtocolSettings.java new file mode 100644 index 0000000..2c56aaf --- /dev/null +++ b/src/main/java/github/openautonomousconnection/protocol/ProtocolSettings.java @@ -0,0 +1,14 @@ +package github.openautonomousconnection.protocol; + +import me.finn.unlegitlibrary.event.EventManager; +import me.finn.unlegitlibrary.network.system.packets.PacketHandler; +import me.finn.unlegitlibrary.utils.DefaultMethodsOverrider; + +public class ProtocolSettings extends DefaultMethodsOverrider { + + public String host; + public int port; + public PacketHandler packetHandler; + public EventManager eventManager; + +} diff --git a/src/main/java/org/openautonomousconnection/protocol/listeners/ClientListener.java b/src/main/java/github/openautonomousconnection/protocol/listeners/ClientListener.java similarity index 55% rename from src/main/java/org/openautonomousconnection/protocol/listeners/ClientListener.java rename to src/main/java/github/openautonomousconnection/protocol/listeners/ClientListener.java index 34a3dd3..f56aa1b 100644 --- a/src/main/java/org/openautonomousconnection/protocol/listeners/ClientListener.java +++ b/src/main/java/github/openautonomousconnection/protocol/listeners/ClientListener.java @@ -1,11 +1,11 @@ -package org.openautonomousconnection.protocol.listeners; +package github.openautonomousconnection.protocol.listeners; -import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.packets.v1_0_0.beta.AuthPacket; -import dev.unlegitdqrk.unlegitlibrary.event.EventListener; -import dev.unlegitdqrk.unlegitlibrary.event.Listener; -import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.ClientConnectedEvent; -import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.ClientDisconnectedEvent; +import github.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.packets.v1_0_0.beta.AuthPacket; +import me.finn.unlegitlibrary.event.EventListener; +import me.finn.unlegitlibrary.event.Listener; +import me.finn.unlegitlibrary.network.system.client.events.ClientConnectedEvent; +import me.finn.unlegitlibrary.network.system.client.events.ClientDisconnectedEvent; import java.io.IOException; diff --git a/src/main/java/github/openautonomousconnection/protocol/listeners/ServerListener.java b/src/main/java/github/openautonomousconnection/protocol/listeners/ServerListener.java new file mode 100644 index 0000000..728b045 --- /dev/null +++ b/src/main/java/github/openautonomousconnection/protocol/listeners/ServerListener.java @@ -0,0 +1,22 @@ +package github.openautonomousconnection.protocol.listeners; + +import github.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.side.server.ConnectedProtocolClient; +import me.finn.unlegitlibrary.event.EventListener; +import me.finn.unlegitlibrary.event.Listener; +import me.finn.unlegitlibrary.network.system.server.events.ConnectionHandlerConnectedEvent; +import me.finn.unlegitlibrary.network.system.server.events.ConnectionHandlerDisconnectedEvent; + +public class ServerListener extends EventListener { + + @Listener + public void onConnect(ConnectionHandlerConnectedEvent event) { + ProtocolBridge.getInstance().getProtocolServer().getClients().add(new ConnectedProtocolClient(event.connectionHandler)); + } + + @Listener + public void onDisconnect(ConnectionHandlerDisconnectedEvent event) { + ProtocolBridge.getInstance().getProtocolServer().getClients().removeIf(client -> client.getConnectionHandler().getClientID() == -1); + } + +} diff --git a/src/main/java/org/openautonomousconnection/protocol/packets/OACPacket.java b/src/main/java/github/openautonomousconnection/protocol/packets/OACPacket.java similarity index 83% rename from src/main/java/org/openautonomousconnection/protocol/packets/OACPacket.java rename to src/main/java/github/openautonomousconnection/protocol/packets/OACPacket.java index 078b0f1..8be6bcb 100644 --- a/src/main/java/org/openautonomousconnection/protocol/packets/OACPacket.java +++ b/src/main/java/github/openautonomousconnection/protocol/packets/OACPacket.java @@ -1,10 +1,10 @@ -package org.openautonomousconnection.protocol.packets; +package github.openautonomousconnection.protocol.packets; -import org.openautonomousconnection.protocol.versions.ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponseCode; +import github.openautonomousconnection.protocol.versions.ProtocolVersion; +import github.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponseCode; import lombok.Getter; -import dev.unlegitdqrk.unlegitlibrary.network.system.packets.Packet; -import dev.unlegitdqrk.unlegitlibrary.network.system.packets.PacketHandler; +import me.finn.unlegitlibrary.network.system.packets.Packet; +import me.finn.unlegitlibrary.network.system.packets.PacketHandler; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/AuthPacket.java b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/beta/AuthPacket.java similarity index 87% rename from src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/AuthPacket.java rename to src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/beta/AuthPacket.java index 572527e..38385ce 100644 --- a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/AuthPacket.java +++ b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/beta/AuthPacket.java @@ -1,16 +1,16 @@ -package org.openautonomousconnection.protocol.packets.v1_0_0.beta; +package github.openautonomousconnection.protocol.packets.v1_0_0.beta; -import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.packets.OACPacket; -import org.openautonomousconnection.protocol.side.client.events.ConnectedToProtocolServer; -import org.openautonomousconnection.protocol.side.server.ConnectedProtocolClient; -import org.openautonomousconnection.protocol.side.server.events.ProtocolClientConnected; -import org.openautonomousconnection.protocol.versions.ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponseCode; -import dev.unlegitdqrk.unlegitlibrary.file.FileUtils; -import dev.unlegitdqrk.unlegitlibrary.network.system.packets.PacketHandler; -import dev.unlegitdqrk.unlegitlibrary.network.system.server.ConnectionHandler; -import dev.unlegitdqrk.unlegitlibrary.network.utils.NetworkUtils; +import github.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.packets.OACPacket; +import github.openautonomousconnection.protocol.side.client.events.ConnectedToProtocolServer; +import github.openautonomousconnection.protocol.side.server.ConnectedProtocolClient; +import github.openautonomousconnection.protocol.side.server.events.ProtocolClientConnected; +import github.openautonomousconnection.protocol.versions.ProtocolVersion; +import github.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponseCode; +import me.finn.unlegitlibrary.file.FileUtils; +import me.finn.unlegitlibrary.network.system.packets.PacketHandler; +import me.finn.unlegitlibrary.network.system.server.ConnectionHandler; +import me.finn.unlegitlibrary.network.utils.NetworkUtils; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/GetDestinationPacket.java b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/beta/GetDestinationPacket.java similarity index 85% rename from src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/GetDestinationPacket.java rename to src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/beta/GetDestinationPacket.java index 226f29b..81cfd58 100644 --- a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/GetDestinationPacket.java +++ b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/beta/GetDestinationPacket.java @@ -1,11 +1,11 @@ -package org.openautonomousconnection.protocol.packets.v1_0_0.beta; +package github.openautonomousconnection.protocol.packets.v1_0_0.beta; -import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.packets.OACPacket; -import org.openautonomousconnection.protocol.versions.ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponseCode; -import org.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain; -import dev.unlegitdqrk.unlegitlibrary.network.system.packets.PacketHandler; +import github.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.packets.OACPacket; +import github.openautonomousconnection.protocol.versions.ProtocolVersion; +import github.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponseCode; +import github.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain; +import me.finn.unlegitlibrary.network.system.packets.PacketHandler; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/UnsupportedClassicPacket.java b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/beta/UnsupportedClassicPacket.java similarity index 82% rename from src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/UnsupportedClassicPacket.java rename to src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/beta/UnsupportedClassicPacket.java index 9a02a08..77180d3 100644 --- a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/UnsupportedClassicPacket.java +++ b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/beta/UnsupportedClassicPacket.java @@ -1,10 +1,10 @@ -package org.openautonomousconnection.protocol.packets.v1_0_0.beta; +package github.openautonomousconnection.protocol.packets.v1_0_0.beta; -import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.packets.OACPacket; -import org.openautonomousconnection.protocol.versions.ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponseCode; -import dev.unlegitdqrk.unlegitlibrary.network.system.packets.PacketHandler; +import github.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.packets.OACPacket; +import github.openautonomousconnection.protocol.versions.ProtocolVersion; +import github.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponseCode; +import me.finn.unlegitlibrary.network.system.packets.PacketHandler; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/ValidateDomainPacket.java b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/beta/ValidateDomainPacket.java similarity index 82% rename from src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/ValidateDomainPacket.java rename to src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/beta/ValidateDomainPacket.java index 85f4289..94927f4 100644 --- a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/ValidateDomainPacket.java +++ b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/beta/ValidateDomainPacket.java @@ -1,10 +1,10 @@ -package org.openautonomousconnection.protocol.packets.v1_0_0.beta; +package github.openautonomousconnection.protocol.packets.v1_0_0.beta; -import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.packets.OACPacket; -import org.openautonomousconnection.protocol.versions.ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain; -import dev.unlegitdqrk.unlegitlibrary.network.system.packets.PacketHandler; +import github.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.packets.OACPacket; +import github.openautonomousconnection.protocol.versions.ProtocolVersion; +import github.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain; +import me.finn.unlegitlibrary.network.system.packets.PacketHandler; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_DomainPacket.java b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_DomainPacket.java similarity index 78% rename from src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_DomainPacket.java rename to src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_DomainPacket.java index de05797..eef920d 100644 --- a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_DomainPacket.java +++ b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_DomainPacket.java @@ -1,20 +1,21 @@ -package org.openautonomousconnection.protocol.packets.v1_0_0.classic; +package github.openautonomousconnection.protocol.packets.v1_0_0.classic; -import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.packets.OACPacket; -import org.openautonomousconnection.protocol.packets.v1_0_0.beta.UnsupportedClassicPacket; -import org.openautonomousconnection.protocol.versions.ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_Domain; -import org.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_DomainPacketReceivedEvent; -import org.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_RequestDomain; -import dev.unlegitdqrk.unlegitlibrary.network.system.packets.PacketHandler; +import github.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.packets.OACPacket; +import github.openautonomousconnection.protocol.packets.v1_0_0.beta.UnsupportedClassicPacket; +import github.openautonomousconnection.protocol.versions.ProtocolVersion; +import github.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_Domain; +import github.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_DomainPacketReceivedEvent; +import github.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_ProtocolVersion; +import github.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_RequestDomain; +import me.finn.unlegitlibrary.network.system.packets.PacketHandler; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.sql.SQLException; +// ProtocolVersion 1.0.0-CLASSIC is ProtocolSide Server only public class Classic_DomainPacket extends OACPacket { private Classic_RequestDomain requestDomain; private Classic_Domain domain; diff --git a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_MessagePacket.java b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_MessagePacket.java similarity index 79% rename from src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_MessagePacket.java rename to src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_MessagePacket.java index 54ff343..dc25c1a 100644 --- a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_MessagePacket.java +++ b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_MessagePacket.java @@ -1,15 +1,16 @@ -package org.openautonomousconnection.protocol.packets.v1_0_0.classic; +package github.openautonomousconnection.protocol.packets.v1_0_0.classic; -import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.packets.OACPacket; -import org.openautonomousconnection.protocol.versions.ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_ProtocolVersion; -import dev.unlegitdqrk.unlegitlibrary.network.system.packets.PacketHandler; +import github.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.packets.OACPacket; +import github.openautonomousconnection.protocol.versions.ProtocolVersion; +import github.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_ProtocolVersion; +import me.finn.unlegitlibrary.network.system.packets.PacketHandler; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +// ProtocolVersion 1.0.0-CLASSIC is ProtocolSide Server only public class Classic_MessagePacket extends OACPacket { private String message; private int clientID; diff --git a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_PingPacket.java b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_PingPacket.java similarity index 81% rename from src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_PingPacket.java rename to src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_PingPacket.java index d1cd609..b90d094 100644 --- a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_PingPacket.java +++ b/src/main/java/github/openautonomousconnection/protocol/packets/v1_0_0/classic/Classic_PingPacket.java @@ -1,14 +1,14 @@ -package org.openautonomousconnection.protocol.packets.v1_0_0.classic; +package github.openautonomousconnection.protocol.packets.v1_0_0.classic; -import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.packets.OACPacket; -import org.openautonomousconnection.protocol.packets.v1_0_0.beta.UnsupportedClassicPacket; -import org.openautonomousconnection.protocol.versions.ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_Domain; -import org.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_PingPacketReceivedEvent; -import org.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_RequestDomain; -import dev.unlegitdqrk.unlegitlibrary.network.system.packets.PacketHandler; +import github.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.packets.OACPacket; +import github.openautonomousconnection.protocol.packets.v1_0_0.beta.UnsupportedClassicPacket; +import github.openautonomousconnection.protocol.versions.ProtocolVersion; +import github.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_Domain; +import github.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_PingPacketReceivedEvent; +import github.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_ProtocolVersion; +import github.openautonomousconnection.protocol.versions.v1_0_0.classic.Classic_RequestDomain; +import me.finn.unlegitlibrary.network.system.packets.PacketHandler; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/openautonomousconnection/protocol/side/client/ProtocolClient.java b/src/main/java/github/openautonomousconnection/protocol/side/client/ProtocolClient.java similarity index 88% rename from src/main/java/org/openautonomousconnection/protocol/side/client/ProtocolClient.java rename to src/main/java/github/openautonomousconnection/protocol/side/client/ProtocolClient.java index 1d6937b..fbec1a9 100644 --- a/src/main/java/org/openautonomousconnection/protocol/side/client/ProtocolClient.java +++ b/src/main/java/github/openautonomousconnection/protocol/side/client/ProtocolClient.java @@ -1,16 +1,16 @@ -package org.openautonomousconnection.protocol.side.client; +package github.openautonomousconnection.protocol.side.client; -import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.packets.OACPacket; -import org.openautonomousconnection.protocol.packets.v1_0_0.beta.ValidateDomainPacket; -import org.openautonomousconnection.protocol.versions.ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponseCode; -import org.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain; +import github.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.packets.OACPacket; +import github.openautonomousconnection.protocol.packets.v1_0_0.beta.ValidateDomainPacket; +import github.openautonomousconnection.protocol.versions.ProtocolVersion; +import github.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponseCode; +import github.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain; import lombok.Getter; -import dev.unlegitdqrk.unlegitlibrary.network.system.client.NetworkClient; -import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.ClientDisconnectedEvent; -import dev.unlegitdqrk.unlegitlibrary.network.utils.NetworkUtils; -import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; +import me.finn.unlegitlibrary.network.system.client.NetworkClient; +import me.finn.unlegitlibrary.network.system.client.events.ClientDisconnectedEvent; +import me.finn.unlegitlibrary.network.utils.NetworkUtils; +import me.finn.unlegitlibrary.utils.DefaultMethodsOverrider; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/github/openautonomousconnection/protocol/side/client/events/ConnectedToProtocolServer.java b/src/main/java/github/openautonomousconnection/protocol/side/client/events/ConnectedToProtocolServer.java new file mode 100644 index 0000000..0ca86e5 --- /dev/null +++ b/src/main/java/github/openautonomousconnection/protocol/side/client/events/ConnectedToProtocolServer.java @@ -0,0 +1,6 @@ +package github.openautonomousconnection.protocol.side.client.events; + +import me.finn.unlegitlibrary.event.impl.Event; + +public class ConnectedToProtocolServer extends Event { +} diff --git a/src/main/java/org/openautonomousconnection/protocol/side/server/ConnectedProtocolClient.java b/src/main/java/github/openautonomousconnection/protocol/side/server/ConnectedProtocolClient.java similarity index 89% rename from src/main/java/org/openautonomousconnection/protocol/side/server/ConnectedProtocolClient.java rename to src/main/java/github/openautonomousconnection/protocol/side/server/ConnectedProtocolClient.java index ec7d611..db190a9 100644 --- a/src/main/java/org/openautonomousconnection/protocol/side/server/ConnectedProtocolClient.java +++ b/src/main/java/github/openautonomousconnection/protocol/side/server/ConnectedProtocolClient.java @@ -1,9 +1,9 @@ -package org.openautonomousconnection.protocol.side.server; +package github.openautonomousconnection.protocol.side.server; -import org.openautonomousconnection.protocol.packets.OACPacket; -import org.openautonomousconnection.protocol.versions.ProtocolVersion; +import github.openautonomousconnection.protocol.packets.OACPacket; +import github.openautonomousconnection.protocol.versions.ProtocolVersion; import lombok.Getter; -import dev.unlegitdqrk.unlegitlibrary.network.system.server.ConnectionHandler; +import me.finn.unlegitlibrary.network.system.server.ConnectionHandler; public class ConnectedProtocolClient { diff --git a/src/main/java/org/openautonomousconnection/protocol/side/server/ProtocolServer.java b/src/main/java/github/openautonomousconnection/protocol/side/server/ProtocolServer.java similarity index 91% rename from src/main/java/org/openautonomousconnection/protocol/side/server/ProtocolServer.java rename to src/main/java/github/openautonomousconnection/protocol/side/server/ProtocolServer.java index 52f14ef..e9d57b6 100644 --- a/src/main/java/org/openautonomousconnection/protocol/side/server/ProtocolServer.java +++ b/src/main/java/github/openautonomousconnection/protocol/side/server/ProtocolServer.java @@ -1,13 +1,13 @@ -package org.openautonomousconnection.protocol.side.server; +package github.openautonomousconnection.protocol.side.server; -import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponseCode; -import org.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain; +import github.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponseCode; +import github.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain; import lombok.Getter; -import dev.unlegitdqrk.unlegitlibrary.file.ConfigurationManager; -import dev.unlegitdqrk.unlegitlibrary.network.system.server.NetworkServer; -import dev.unlegitdqrk.unlegitlibrary.network.utils.NetworkUtils; -import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; +import me.finn.unlegitlibrary.file.ConfigurationManager; +import me.finn.unlegitlibrary.network.system.server.NetworkServer; +import me.finn.unlegitlibrary.network.utils.NetworkUtils; +import me.finn.unlegitlibrary.utils.DefaultMethodsOverrider; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/org/openautonomousconnection/protocol/side/server/events/ProtocolClientConnected.java b/src/main/java/github/openautonomousconnection/protocol/side/server/events/ProtocolClientConnected.java similarity index 57% rename from src/main/java/org/openautonomousconnection/protocol/side/server/events/ProtocolClientConnected.java rename to src/main/java/github/openautonomousconnection/protocol/side/server/events/ProtocolClientConnected.java index 706d9eb..898b6ae 100644 --- a/src/main/java/org/openautonomousconnection/protocol/side/server/events/ProtocolClientConnected.java +++ b/src/main/java/github/openautonomousconnection/protocol/side/server/events/ProtocolClientConnected.java @@ -1,8 +1,8 @@ -package org.openautonomousconnection.protocol.side.server.events; +package github.openautonomousconnection.protocol.side.server.events; -import org.openautonomousconnection.protocol.side.server.ConnectedProtocolClient; +import github.openautonomousconnection.protocol.side.server.ConnectedProtocolClient; import lombok.Getter; -import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; +import me.finn.unlegitlibrary.event.impl.Event; public class ProtocolClientConnected extends Event { diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/ProtocolVersion.java b/src/main/java/github/openautonomousconnection/protocol/versions/ProtocolVersion.java similarity index 97% rename from src/main/java/org/openautonomousconnection/protocol/versions/ProtocolVersion.java rename to src/main/java/github/openautonomousconnection/protocol/versions/ProtocolVersion.java index fd2596e..73433e6 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/ProtocolVersion.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/ProtocolVersion.java @@ -1,4 +1,4 @@ -package org.openautonomousconnection.protocol.versions; +package github.openautonomousconnection.protocol.versions; import lombok.Getter; diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/beta/DNSResponseCode.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/beta/DNSResponseCode.java similarity index 95% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/beta/DNSResponseCode.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/beta/DNSResponseCode.java index 9169563..2080e0b 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/beta/DNSResponseCode.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/beta/DNSResponseCode.java @@ -1,4 +1,4 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.beta; +package github.openautonomousconnection.protocol.versions.v1_0_0.beta; import lombok.Getter; diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/beta/Domain.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/beta/Domain.java similarity index 96% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/beta/Domain.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/beta/Domain.java index 806f957..ed3b54d 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/beta/Domain.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/beta/Domain.java @@ -1,6 +1,6 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.beta; +package github.openautonomousconnection.protocol.versions.v1_0_0.beta; -import org.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.ProtocolBridge; import lombok.Getter; import java.io.Serializable; diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicConverter.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicConverter.java similarity index 81% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicConverter.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicConverter.java index 85b0e4b..d86c4cb 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicConverter.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicConverter.java @@ -1,7 +1,7 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; -import org.openautonomousconnection.protocol.versions.ProtocolVersion; -import org.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain; +import github.openautonomousconnection.protocol.versions.ProtocolVersion; +import github.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain; public class ClassicConverter { diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerClient.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerClient.java similarity index 80% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerClient.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerClient.java index 9698b47..c618933 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerClient.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerClient.java @@ -1,4 +1,4 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; public abstract class ClassicHandlerClient { diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerServer.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerServer.java similarity index 76% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerServer.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerServer.java index a2c4b12..358e93b 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerServer.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/ClassicHandlerServer.java @@ -1,6 +1,6 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; -import org.openautonomousconnection.protocol.side.server.ConnectedProtocolClient; +import github.openautonomousconnection.protocol.side.server.ConnectedProtocolClient; import java.sql.SQLException; diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ClientListener.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ClientListener.java similarity index 91% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ClientListener.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ClientListener.java index 3d58041..f30ebb1 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ClientListener.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ClientListener.java @@ -1,9 +1,9 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; -import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.packets.v1_0_0.classic.Classic_PingPacket; -import dev.unlegitdqrk.unlegitlibrary.event.EventListener; -import dev.unlegitdqrk.unlegitlibrary.event.Listener; +import github.openautonomousconnection.protocol.ProtocolBridge; +import github.openautonomousconnection.protocol.packets.v1_0_0.classic.Classic_PingPacket; +import me.finn.unlegitlibrary.event.EventListener; +import me.finn.unlegitlibrary.event.Listener; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_Domain.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_Domain.java similarity index 88% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_Domain.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_Domain.java index ec689cc..df344d1 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_Domain.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_Domain.java @@ -1,6 +1,6 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; -import org.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain; +import github.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain; import lombok.Getter; import java.io.Serializable; diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainPacketReceivedEvent.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainPacketReceivedEvent.java similarity index 88% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainPacketReceivedEvent.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainPacketReceivedEvent.java index 8da1907..7dc6e77 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainPacketReceivedEvent.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainPacketReceivedEvent.java @@ -1,6 +1,6 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; -import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; +import me.finn.unlegitlibrary.event.impl.Event; public class Classic_DomainPacketReceivedEvent extends Event { diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainUtils.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainUtils.java similarity index 96% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainUtils.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainUtils.java index 9f9b018..de42368 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainUtils.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_DomainUtils.java @@ -1,6 +1,6 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; -import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; +import me.finn.unlegitlibrary.utils.DefaultMethodsOverrider; import java.net.MalformedURLException; import java.net.URI; diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_LocalDomain.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_LocalDomain.java similarity index 71% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_LocalDomain.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_LocalDomain.java index cccd78e..727157a 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_LocalDomain.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_LocalDomain.java @@ -1,4 +1,4 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; public class Classic_LocalDomain extends Classic_Domain { public Classic_LocalDomain(String name, String endName, String path) { diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_PingPacketReceivedEvent.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_PingPacketReceivedEvent.java similarity index 89% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_PingPacketReceivedEvent.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_PingPacketReceivedEvent.java index fdb1f76..26f13bf 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_PingPacketReceivedEvent.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_PingPacketReceivedEvent.java @@ -1,6 +1,6 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; -import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; +import me.finn.unlegitlibrary.event.impl.Event; public class Classic_PingPacketReceivedEvent extends Event { diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ProtocolVersion.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ProtocolVersion.java similarity index 76% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ProtocolVersion.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ProtocolVersion.java index e308033..96dcea9 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ProtocolVersion.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_ProtocolVersion.java @@ -1,4 +1,4 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; import java.io.Serializable; diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_RequestDomain.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_RequestDomain.java similarity index 77% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_RequestDomain.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_RequestDomain.java index ce3a8fe..8cd2798 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_RequestDomain.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_RequestDomain.java @@ -1,4 +1,4 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; import java.io.Serializable; diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_SiteType.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_SiteType.java similarity index 79% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_SiteType.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_SiteType.java index 56816dc..d771ebc 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_SiteType.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_SiteType.java @@ -1,4 +1,4 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; import java.io.Serializable; diff --git a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_WebsitesContent.java b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_WebsitesContent.java similarity index 94% rename from src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_WebsitesContent.java rename to src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_WebsitesContent.java index fada924..0930144 100644 --- a/src/main/java/org/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_WebsitesContent.java +++ b/src/main/java/github/openautonomousconnection/protocol/versions/v1_0_0/classic/Classic_WebsitesContent.java @@ -1,6 +1,6 @@ -package org.openautonomousconnection.protocol.versions.v1_0_0.classic; +package github.openautonomousconnection.protocol.versions.v1_0_0.classic; -import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; +import me.finn.unlegitlibrary.utils.DefaultMethodsOverrider; public class Classic_WebsitesContent extends DefaultMethodsOverrider { diff --git a/src/main/java/org/openautonomousconnection/protocol/ProtocolSettings.java b/src/main/java/org/openautonomousconnection/protocol/ProtocolSettings.java deleted file mode 100644 index 6a9c2fc..0000000 --- a/src/main/java/org/openautonomousconnection/protocol/ProtocolSettings.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.openautonomousconnection.protocol; - -import dev.unlegitdqrk.unlegitlibrary.event.EventManager; -import dev.unlegitdqrk.unlegitlibrary.network.system.packets.PacketHandler; -import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; - -public class ProtocolSettings extends DefaultMethodsOverrider { - - public String host; - public int port; - public PacketHandler packetHandler; - public EventManager eventManager; - -} diff --git a/src/main/java/org/openautonomousconnection/protocol/listeners/ServerListener.java b/src/main/java/org/openautonomousconnection/protocol/listeners/ServerListener.java deleted file mode 100644 index ae3072f..0000000 --- a/src/main/java/org/openautonomousconnection/protocol/listeners/ServerListener.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.openautonomousconnection.protocol.listeners; - -import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.side.server.ConnectedProtocolClient; -import dev.unlegitdqrk.unlegitlibrary.event.EventListener; -import dev.unlegitdqrk.unlegitlibrary.event.Listener; -import dev.unlegitdqrk.unlegitlibrary.network.system.server.events.ConnectionHandlerConnectedEvent; -import dev.unlegitdqrk.unlegitlibrary.network.system.server.events.ConnectionHandlerDisconnectedEvent; - -public class ServerListener extends EventListener { - - @Listener - public void onConnect(ConnectionHandlerConnectedEvent event) { - ProtocolBridge.getInstance().getProtocolServer().getClients().add(new ConnectedProtocolClient(event.connectionHandler)); - } - - @Listener - public void onDisconnect(ConnectionHandlerDisconnectedEvent event) { - ProtocolBridge.getInstance().getProtocolServer().getClients().removeIf(client -> client.getConnectionHandler().getClientID() == -1); - } - -} diff --git a/src/main/java/org/openautonomousconnection/protocol/side/client/events/ConnectedToProtocolServer.java b/src/main/java/org/openautonomousconnection/protocol/side/client/events/ConnectedToProtocolServer.java deleted file mode 100644 index 8d6eb93..0000000 --- a/src/main/java/org/openautonomousconnection/protocol/side/client/events/ConnectedToProtocolServer.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.openautonomousconnection.protocol.side.client.events; - -import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; - -public class ConnectedToProtocolServer extends Event { -}