From a36a917593b7aeb7333fe01350a3be2c800404f1 Mon Sep 17 00:00:00 2001 From: platanobailando Date: Sun, 10 Aug 2025 21:09:08 -0500 Subject: [PATCH 1/3] Renaming packages --- .../dev/koifysh/archipelago/events/Event.java | 4 --- .../network/DataStorageOperation.java | 3 -- .../network/client/SyncPacket.java | 12 ------- .../network/server/JsonPrintPacket.java | 13 ------- .../github/archipelagomw}/Client.java | 27 ++++++++------- .../github/archipelagomw}/ClientStatus.java | 2 +- .../github/archipelagomw}/EventManager.java | 7 ++-- .../github/archipelagomw}/ItemManager.java | 13 +++---- .../archipelagomw}/LocationManager.java | 4 +-- .../github/archipelagomw}/Print/APPrint.java | 4 +-- .../archipelagomw}/Print/APPrintColor.java | 2 +- .../archipelagomw}/Print/APPrintJsonType.java | 2 +- .../archipelagomw}/Print/APPrintPart.java | 2 +- .../archipelagomw}/Print/APPrintType.java | 2 +- .../github/archipelagomw}/Utils.java | 2 +- .../github/archipelagomw}/WebSocket.java | 34 ++++++++++++------- .../archipelagomw}/bounce/BouncedManager.java | 7 ++-- .../bounce/BouncedPacketHandler.java | 7 ++-- .../bounce/DeathLinkHandler.java | 12 +++---- .../events/ArchipelagoEventListener.java | 2 +- .../archipelagomw}/events/BouncedEvent.java | 2 +- .../events/CheckedLocationsEvent.java | 2 +- .../events/ConnectionAttemptEvent.java | 2 +- .../events/ConnectionResultEvent.java | 4 +-- .../archipelagomw}/events/DeathLinkEvent.java | 2 +- .../io/github/archipelagomw/events/Event.java | 4 +++ .../events/InvalidPacketEvent.java | 2 +- .../events/LocationInfoEvent.java | 4 +-- .../archipelagomw}/events/PrintJSONEvent.java | 8 ++--- .../events/ReceiveItemEvent.java | 4 +-- .../archipelagomw}/events/RetrievedEvent.java | 2 +- .../archipelagomw}/events/SetReplyEvent.java | 2 +- .../archipelagomw}/flags/ItemsHandling.java | 4 +-- .../archipelagomw}/flags/NetworkItem.java | 2 +- .../archipelagomw}/flags/NetworkPlayer.java | 2 +- .../archipelagomw}/network/APPacket.java | 3 +- .../archipelagomw}/network/APPacketType.java | 2 +- .../network/ConnectionResult.java | 2 +- .../network/DataStorageOperation.java | 3 ++ .../archipelagomw}/network/Permission.java | 2 +- .../archipelagomw}/network/RemainingMode.java | 2 +- .../network/client/BouncePacket.java | 8 ++--- .../network/client/ConnectPacket.java | 8 ++--- .../network/client/CreateAsHint.java | 2 +- .../network/client/GetDataPackagePacket.java | 6 ++-- .../network/client/GetPacket.java | 11 +++--- .../network/client/HintStatus.java | 2 +- .../network/client/LocationChecks.java | 6 ++-- .../network/client/LocationScouts.java | 6 ++-- .../network/client/SayPacket.java | 6 ++-- .../network/client/SetNotifyPacket.java | 6 ++-- .../network/client/SetPacket.java | 9 +++-- .../network/client/StatusUpdatePacket.java | 8 ++--- .../network/client/SyncPacket.java | 12 +++++++ .../network/client/UpdateHintPacket.java | 6 ++-- .../network/server/BouncedPacket.java | 6 ++-- .../network/server/ConnectUpdatePacket.java | 6 ++-- .../network/server/ConnectedPacket.java | 10 +++--- .../server/ConnectionRefusedPacket.java | 8 ++--- .../network/server/InvalidPacket.java | 6 ++-- .../network/server/JsonPrintPacket.java | 13 +++++++ .../network/server/LocationInfoPacket.java | 8 ++--- .../network/server/PrintPacket.java | 6 ++-- .../network/server/ReceivedItemsPacket.java | 8 ++--- .../network/server/RetrievedPacket.java | 6 ++-- .../network/server/RoomInfoPacket.java | 10 +++--- .../network/server/RoomUpdatePacket.java | 12 +++---- .../network/server/SetReplyPacket.java | 6 ++-- .../archipelagomw}/parts/DataPackage.java | 3 +- .../github/archipelagomw}/parts/Game.java | 2 +- .../archipelagomw}/parts/NetworkItem.java | 4 +-- .../archipelagomw}/parts/NetworkPlayer.java | 2 +- .../archipelagomw}/parts/NetworkSlot.java | 2 +- .../github/archipelagomw}/parts/Version.java | 2 +- .../archipelagomw}/utils/AtomicDouble.java | 2 +- .../github/archipelagomw}/UtilsTest.java | 2 +- 76 files changed, 223 insertions(+), 218 deletions(-) delete mode 100644 src/main/java/dev/koifysh/archipelago/events/Event.java delete mode 100644 src/main/java/dev/koifysh/archipelago/network/DataStorageOperation.java delete mode 100644 src/main/java/dev/koifysh/archipelago/network/client/SyncPacket.java delete mode 100644 src/main/java/dev/koifysh/archipelago/network/server/JsonPrintPacket.java rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/Client.java (96%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/ClientStatus.java (95%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/EventManager.java (94%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/ItemManager.java (85%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/LocationManager.java (96%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/Print/APPrint.java (90%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/Print/APPrintColor.java (94%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/Print/APPrintJsonType.java (97%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/Print/APPrintPart.java (84%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/Print/APPrintType.java (92%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/Utils.java (95%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/WebSocket.java (93%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/bounce/BouncedManager.java (90%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/bounce/BouncedPacketHandler.java (74%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/bounce/DeathLinkHandler.java (83%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/events/ArchipelagoEventListener.java (86%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/events/BouncedEvent.java (96%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/events/CheckedLocationsEvent.java (86%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/events/ConnectionAttemptEvent.java (96%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/events/ConnectionResultEvent.java (92%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/events/DeathLinkEvent.java (91%) create mode 100644 src/main/java/io/github/archipelagomw/events/Event.java rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/events/InvalidPacketEvent.java (94%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/events/LocationInfoEvent.java (72%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/events/PrintJSONEvent.java (78%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/events/ReceiveItemEvent.java (89%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/events/RetrievedEvent.java (97%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/events/SetReplyEvent.java (96%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/flags/ItemsHandling.java (90%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/flags/NetworkItem.java (93%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/flags/NetworkPlayer.java (92%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/APPacket.java (76%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/APPacketType.java (97%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/ConnectionResult.java (75%) create mode 100644 src/main/java/io/github/archipelagomw/network/DataStorageOperation.java rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/Permission.java (84%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/RemainingMode.java (89%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/BouncePacket.java (79%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/ConnectPacket.java (75%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/CreateAsHint.java (80%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/GetDataPackagePacket.java (66%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/GetPacket.java (78%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/HintStatus.java (90%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/LocationChecks.java (67%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/LocationScouts.java (78%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/SayPacket.java (62%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/SetNotifyPacket.java (68%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/SetPacket.java (96%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/StatusUpdatePacket.java (52%) create mode 100644 src/main/java/io/github/archipelagomw/network/client/SyncPacket.java rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/client/UpdateHintPacket.java (73%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/server/BouncedPacket.java (79%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/server/ConnectUpdatePacket.java (64%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/server/ConnectedPacket.java (74%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/server/ConnectionRefusedPacket.java (56%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/server/InvalidPacket.java (70%) create mode 100644 src/main/java/io/github/archipelagomw/network/server/JsonPrintPacket.java rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/server/LocationInfoPacket.java (59%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/server/PrintPacket.java (64%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/server/ReceivedItemsPacket.java (63%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/server/RetrievedPacket.java (69%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/server/RoomInfoPacket.java (83%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/server/RoomUpdatePacket.java (81%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/network/server/SetReplyPacket.java (75%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/parts/DataPackage.java (95%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/parts/Game.java (97%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/parts/NetworkItem.java (82%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/parts/NetworkPlayer.java (88%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/parts/NetworkSlot.java (90%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/parts/Version.java (89%) rename src/main/java/{dev/koifysh/archipelago => io/github/archipelagomw}/utils/AtomicDouble.java (95%) rename src/test/java/{dev/koifysh/archipelago => io/github/archipelagomw}/UtilsTest.java (92%) diff --git a/src/main/java/dev/koifysh/archipelago/events/Event.java b/src/main/java/dev/koifysh/archipelago/events/Event.java deleted file mode 100644 index 51ed3a4..0000000 --- a/src/main/java/dev/koifysh/archipelago/events/Event.java +++ /dev/null @@ -1,4 +0,0 @@ -package dev.koifysh.archipelago.events; - -public interface Event { -} diff --git a/src/main/java/dev/koifysh/archipelago/network/DataStorageOperation.java b/src/main/java/dev/koifysh/archipelago/network/DataStorageOperation.java deleted file mode 100644 index 2346540..0000000 --- a/src/main/java/dev/koifysh/archipelago/network/DataStorageOperation.java +++ /dev/null @@ -1,3 +0,0 @@ -package dev.koifysh.archipelago.network; - - diff --git a/src/main/java/dev/koifysh/archipelago/network/client/SyncPacket.java b/src/main/java/dev/koifysh/archipelago/network/client/SyncPacket.java deleted file mode 100644 index 940b259..0000000 --- a/src/main/java/dev/koifysh/archipelago/network/client/SyncPacket.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.koifysh.archipelago.network.client; - -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; - -public class SyncPacket extends APPacket { - - - public SyncPacket() { - super(APPacketType.Sync); - } -} diff --git a/src/main/java/dev/koifysh/archipelago/network/server/JsonPrintPacket.java b/src/main/java/dev/koifysh/archipelago/network/server/JsonPrintPacket.java deleted file mode 100644 index 6c7b874..0000000 --- a/src/main/java/dev/koifysh/archipelago/network/server/JsonPrintPacket.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.koifysh.archipelago.network.server; - -import dev.koifysh.archipelago.Print.APPrintPart; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; - -public class JsonPrintPacket extends APPacket { - APPrintPart[] parts; - - public JsonPrintPacket() { - super(APPacketType.PrintJSON); - } -} diff --git a/src/main/java/dev/koifysh/archipelago/Client.java b/src/main/java/io/github/archipelagomw/Client.java similarity index 96% rename from src/main/java/dev/koifysh/archipelago/Client.java rename to src/main/java/io/github/archipelagomw/Client.java index c7accdc..636ef17 100644 --- a/src/main/java/dev/koifysh/archipelago/Client.java +++ b/src/main/java/io/github/archipelagomw/Client.java @@ -1,17 +1,20 @@ -package dev.koifysh.archipelago; +package io.github.archipelagomw; -import dev.koifysh.archipelago.bounce.BouncedManager; +import io.github.archipelagomw.bounce.BouncedManager; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import dev.koifysh.archipelago.events.RetrievedEvent; -import dev.koifysh.archipelago.flags.ItemsHandling; -import dev.koifysh.archipelago.bounce.DeathLinkHandler; -import dev.koifysh.archipelago.network.server.ConnectUpdatePacket; -import dev.koifysh.archipelago.network.server.RoomInfoPacket; -import dev.koifysh.archipelago.parts.DataPackage; -import dev.koifysh.archipelago.parts.Game; -import dev.koifysh.archipelago.parts.NetworkSlot; -import dev.koifysh.archipelago.parts.Version; +import io.github.archipelagomw.events.LocationInfoEvent; +import io.github.archipelagomw.events.RetrievedEvent; +import io.github.archipelagomw.flags.ItemsHandling; +import io.github.archipelagomw.bounce.DeathLinkHandler; +import dev.koifysh.archipelagomw.network.client.*; +import io.github.archipelagomw.network.client.*; +import io.github.archipelagomw.network.server.ConnectUpdatePacket; +import io.github.archipelagomw.network.server.RoomInfoPacket; +import io.github.archipelagomw.parts.DataPackage; +import io.github.archipelagomw.parts.Game; +import io.github.archipelagomw.parts.NetworkSlot; +import io.github.archipelagomw.parts.Version; import dev.koifysh.archipelago.network.client.*; import org.apache.hc.core5.net.URIBuilder; @@ -494,7 +497,7 @@ public boolean checkLocations(Collection locationIDs) { } /** - * Ask the server for information about what is in locations. you will get a response in the {@link dev.koifysh.archipelago.events.LocationInfoEvent} event. + * Ask the server for information about what is in locations. you will get a response in the {@link LocationInfoEvent} event. * @param locationIDs List of location ID's to request info on. */ public void scoutLocations(ArrayList locationIDs) { diff --git a/src/main/java/dev/koifysh/archipelago/ClientStatus.java b/src/main/java/io/github/archipelagomw/ClientStatus.java similarity index 95% rename from src/main/java/dev/koifysh/archipelago/ClientStatus.java rename to src/main/java/io/github/archipelagomw/ClientStatus.java index 1dcc8d6..5939ce9 100644 --- a/src/main/java/dev/koifysh/archipelago/ClientStatus.java +++ b/src/main/java/io/github/archipelagomw/ClientStatus.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago; +package io.github.archipelagomw; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/dev/koifysh/archipelago/EventManager.java b/src/main/java/io/github/archipelagomw/EventManager.java similarity index 94% rename from src/main/java/dev/koifysh/archipelago/EventManager.java rename to src/main/java/io/github/archipelagomw/EventManager.java index 2cecb8b..934b643 100644 --- a/src/main/java/dev/koifysh/archipelago/EventManager.java +++ b/src/main/java/io/github/archipelagomw/EventManager.java @@ -1,12 +1,11 @@ -package dev.koifysh.archipelago; +package io.github.archipelagomw; -import dev.koifysh.archipelago.events.ArchipelagoEventListener; -import dev.koifysh.archipelago.events.Event; +import io.github.archipelagomw.events.ArchipelagoEventListener; +import io.github.archipelagomw.events.Event; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/dev/koifysh/archipelago/ItemManager.java b/src/main/java/io/github/archipelagomw/ItemManager.java similarity index 85% rename from src/main/java/dev/koifysh/archipelago/ItemManager.java rename to src/main/java/io/github/archipelagomw/ItemManager.java index 3cf5741..5c9ec45 100644 --- a/src/main/java/dev/koifysh/archipelago/ItemManager.java +++ b/src/main/java/io/github/archipelagomw/ItemManager.java @@ -1,15 +1,12 @@ -package dev.koifysh.archipelago; +package io.github.archipelagomw; -import dev.koifysh.archipelago.events.ReceiveItemEvent; -import dev.koifysh.archipelago.network.client.SyncPacket; -import dev.koifysh.archipelago.parts.DataPackage; -import dev.koifysh.archipelago.parts.NetworkItem; +import io.github.archipelagomw.events.ReceiveItemEvent; +import io.github.archipelagomw.network.client.SyncPacket; +import io.github.archipelagomw.parts.DataPackage; +import io.github.archipelagomw.parts.NetworkItem; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.ConcurrentLinkedDeque; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; public class ItemManager { diff --git a/src/main/java/dev/koifysh/archipelago/LocationManager.java b/src/main/java/io/github/archipelagomw/LocationManager.java similarity index 96% rename from src/main/java/dev/koifysh/archipelago/LocationManager.java rename to src/main/java/io/github/archipelagomw/LocationManager.java index 39bac19..192f9a7 100644 --- a/src/main/java/dev/koifysh/archipelago/LocationManager.java +++ b/src/main/java/io/github/archipelagomw/LocationManager.java @@ -1,6 +1,6 @@ -package dev.koifysh.archipelago; +package io.github.archipelagomw; -import dev.koifysh.archipelago.network.client.LocationChecks; +import io.github.archipelagomw.network.client.LocationChecks; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/dev/koifysh/archipelago/Print/APPrint.java b/src/main/java/io/github/archipelagomw/Print/APPrint.java similarity index 90% rename from src/main/java/dev/koifysh/archipelago/Print/APPrint.java rename to src/main/java/io/github/archipelagomw/Print/APPrint.java index ceca8f6..3364201 100644 --- a/src/main/java/dev/koifysh/archipelago/Print/APPrint.java +++ b/src/main/java/io/github/archipelagomw/Print/APPrint.java @@ -1,7 +1,7 @@ -package dev.koifysh.archipelago.Print; +package io.github.archipelagomw.Print; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.parts.NetworkItem; +import io.github.archipelagomw.parts.NetworkItem; public class APPrint { diff --git a/src/main/java/dev/koifysh/archipelago/Print/APPrintColor.java b/src/main/java/io/github/archipelagomw/Print/APPrintColor.java similarity index 94% rename from src/main/java/dev/koifysh/archipelago/Print/APPrintColor.java rename to src/main/java/io/github/archipelagomw/Print/APPrintColor.java index 36b511d..abd4578 100644 --- a/src/main/java/dev/koifysh/archipelago/Print/APPrintColor.java +++ b/src/main/java/io/github/archipelagomw/Print/APPrintColor.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.Print; +package io.github.archipelagomw.Print; import java.awt.*; diff --git a/src/main/java/dev/koifysh/archipelago/Print/APPrintJsonType.java b/src/main/java/io/github/archipelagomw/Print/APPrintJsonType.java similarity index 97% rename from src/main/java/dev/koifysh/archipelago/Print/APPrintJsonType.java rename to src/main/java/io/github/archipelagomw/Print/APPrintJsonType.java index ce1458c..4c6e6d4 100644 --- a/src/main/java/dev/koifysh/archipelago/Print/APPrintJsonType.java +++ b/src/main/java/io/github/archipelagomw/Print/APPrintJsonType.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.Print; +package io.github.archipelagomw.Print; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/dev/koifysh/archipelago/Print/APPrintPart.java b/src/main/java/io/github/archipelagomw/Print/APPrintPart.java similarity index 84% rename from src/main/java/dev/koifysh/archipelago/Print/APPrintPart.java rename to src/main/java/io/github/archipelagomw/Print/APPrintPart.java index a65dfef..d124eb4 100644 --- a/src/main/java/dev/koifysh/archipelago/Print/APPrintPart.java +++ b/src/main/java/io/github/archipelagomw/Print/APPrintPart.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.Print; +package io.github.archipelagomw.Print; public class APPrintPart { public APPrintType type = APPrintType.text; diff --git a/src/main/java/dev/koifysh/archipelago/Print/APPrintType.java b/src/main/java/io/github/archipelagomw/Print/APPrintType.java similarity index 92% rename from src/main/java/dev/koifysh/archipelago/Print/APPrintType.java rename to src/main/java/io/github/archipelagomw/Print/APPrintType.java index 0a1f680..80d3132 100644 --- a/src/main/java/dev/koifysh/archipelago/Print/APPrintType.java +++ b/src/main/java/io/github/archipelagomw/Print/APPrintType.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.Print; +package io.github.archipelagomw.Print; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/dev/koifysh/archipelago/Utils.java b/src/main/java/io/github/archipelagomw/Utils.java similarity index 95% rename from src/main/java/dev/koifysh/archipelago/Utils.java rename to src/main/java/io/github/archipelagomw/Utils.java index c9bceaf..80db398 100644 --- a/src/main/java/dev/koifysh/archipelago/Utils.java +++ b/src/main/java/io/github/archipelagomw/Utils.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago; +package io.github.archipelagomw; public class Utils { diff --git a/src/main/java/dev/koifysh/archipelago/WebSocket.java b/src/main/java/io/github/archipelagomw/WebSocket.java similarity index 93% rename from src/main/java/dev/koifysh/archipelago/WebSocket.java rename to src/main/java/io/github/archipelagomw/WebSocket.java index bdef99c..4efc845 100644 --- a/src/main/java/dev/koifysh/archipelago/WebSocket.java +++ b/src/main/java/io/github/archipelagomw/WebSocket.java @@ -1,23 +1,31 @@ -package dev.koifysh.archipelago; +package io.github.archipelagomw; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonParser; -import dev.koifysh.archipelago.Print.APPrint; -import dev.koifysh.archipelago.Print.APPrintJsonType; -import dev.koifysh.archipelago.Print.APPrintPart; -import dev.koifysh.archipelago.Print.APPrintType; -import dev.koifysh.archipelago.flags.NetworkPlayer; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.ConnectionResult; +import io.github.archipelagomw.Print.APPrint; +import io.github.archipelagomw.Print.APPrintJsonType; +import io.github.archipelagomw.Print.APPrintPart; +import io.github.archipelagomw.Print.APPrintType; +import dev.koifysh.archipelagomw.events.*; +import io.github.archipelagomw.events.*; +import io.github.archipelagomw.flags.NetworkPlayer; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.ConnectionResult; import dev.koifysh.archipelago.network.client.*; -import dev.koifysh.archipelago.parts.DataPackage; -import dev.koifysh.archipelago.parts.NetworkItem; +import io.github.archipelagomw.network.client.ConnectPacket; +import io.github.archipelagomw.network.client.GetDataPackagePacket; +import io.github.archipelagomw.network.client.LocationScouts; +import io.github.archipelagomw.network.client.SayPacket; +import dev.koifysh.archipelagomw.network.server.*; +import io.github.archipelagomw.network.server.*; +import io.github.archipelagomw.parts.DataPackage; +import io.github.archipelagomw.parts.NetworkItem; import dev.koifysh.archipelago.events.*; import dev.koifysh.archipelago.network.server.*; -import dev.koifysh.archipelago.parts.NetworkSlot; +import io.github.archipelagomw.parts.NetworkSlot; import org.apache.hc.core5.net.URIBuilder; import org.java_websocket.client.WebSocketClient; import org.java_websocket.drafts.Draft; @@ -121,7 +129,7 @@ public void onMessage(String message) { teams = teamsOptional.getAsInt() + 1; } for (int i = 0; i < teams; i++) { - client.getRoomInfo().networkPlayers.add( new dev.koifysh.archipelago.parts.NetworkPlayer(i, 0, "Archipelago")); + client.getRoomInfo().networkPlayers.add( new io.github.archipelagomw.parts.NetworkPlayer(i, 0, "Archipelago")); } client.setAlias(client.getRoomInfo().getPlayer(connectedPacket.team, connectedPacket.slot).alias); @@ -166,7 +174,7 @@ public void onMessage(String message) { if (part.type == APPrintType.playerID) { int playerID = Integer.parseInt(part.text); - dev.koifysh.archipelago.parts.NetworkPlayer player = client.getRoomInfo().getPlayer(client.getTeam(), playerID); + io.github.archipelagomw.parts.NetworkPlayer player = client.getRoomInfo().getPlayer(client.getTeam(), playerID); part.text = player.alias; } else if (part.type == APPrintType.itemID) { diff --git a/src/main/java/dev/koifysh/archipelago/bounce/BouncedManager.java b/src/main/java/io/github/archipelagomw/bounce/BouncedManager.java similarity index 90% rename from src/main/java/dev/koifysh/archipelago/bounce/BouncedManager.java rename to src/main/java/io/github/archipelagomw/bounce/BouncedManager.java index 81447ed..e6bab4a 100644 --- a/src/main/java/dev/koifysh/archipelago/bounce/BouncedManager.java +++ b/src/main/java/io/github/archipelagomw/bounce/BouncedManager.java @@ -1,6 +1,7 @@ -package dev.koifysh.archipelago.bounce; +package io.github.archipelagomw.bounce; -import dev.koifysh.archipelago.network.server.BouncedPacket; +import io.github.archipelagomw.events.BouncedEvent; +import io.github.archipelagomw.network.server.BouncedPacket; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -10,7 +11,7 @@ /** * A handler for managing protocol specific bounce packets. If a handler registered with the BouncedManager * can handle a packet, then the BouncedPacket does not get propagated as - * a {@link dev.koifysh.archipelago.events.BouncedEvent} + * a {@link BouncedEvent} * * This class is intended to help create protocols over the Bounce Packet. */ diff --git a/src/main/java/dev/koifysh/archipelago/bounce/BouncedPacketHandler.java b/src/main/java/io/github/archipelagomw/bounce/BouncedPacketHandler.java similarity index 74% rename from src/main/java/dev/koifysh/archipelago/bounce/BouncedPacketHandler.java rename to src/main/java/io/github/archipelagomw/bounce/BouncedPacketHandler.java index 66cc765..d361038 100644 --- a/src/main/java/dev/koifysh/archipelago/bounce/BouncedPacketHandler.java +++ b/src/main/java/io/github/archipelagomw/bounce/BouncedPacketHandler.java @@ -1,6 +1,7 @@ -package dev.koifysh.archipelago.bounce; +package io.github.archipelagomw.bounce; -import dev.koifysh.archipelago.network.server.BouncedPacket; +import io.github.archipelagomw.events.BouncedEvent; +import io.github.archipelagomw.network.server.BouncedPacket; /** * Used to facilitate protocols over bounce packets. Clients should use this when they want to implement @@ -10,7 +11,7 @@ public interface BouncedPacketHandler { /** * Whether this BouncedPacketHandler can handle the provided packet. If it can, no other - * packet handler will be called, and the {@link dev.koifysh.archipelago.events.BouncedEvent} will not + * packet handler will be called, and the {@link BouncedEvent} will not * be emitted. * @param packet The packet to check * @return true if this handler should process the packet diff --git a/src/main/java/dev/koifysh/archipelago/bounce/DeathLinkHandler.java b/src/main/java/io/github/archipelagomw/bounce/DeathLinkHandler.java similarity index 83% rename from src/main/java/dev/koifysh/archipelago/bounce/DeathLinkHandler.java rename to src/main/java/io/github/archipelagomw/bounce/DeathLinkHandler.java index 38cf6de..1d2ab0f 100644 --- a/src/main/java/dev/koifysh/archipelago/bounce/DeathLinkHandler.java +++ b/src/main/java/io/github/archipelagomw/bounce/DeathLinkHandler.java @@ -1,10 +1,10 @@ -package dev.koifysh.archipelago.bounce; +package io.github.archipelagomw.bounce; -import dev.koifysh.archipelago.Client; -import dev.koifysh.archipelago.events.DeathLinkEvent; -import dev.koifysh.archipelago.network.client.BouncePacket; -import dev.koifysh.archipelago.network.server.BouncedPacket; -import dev.koifysh.archipelago.utils.AtomicDouble; +import io.github.archipelagomw.Client; +import io.github.archipelagomw.events.DeathLinkEvent; +import io.github.archipelagomw.network.client.BouncePacket; +import io.github.archipelagomw.network.server.BouncedPacket; +import io.github.archipelagomw.utils.AtomicDouble; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/dev/koifysh/archipelago/events/ArchipelagoEventListener.java b/src/main/java/io/github/archipelagomw/events/ArchipelagoEventListener.java similarity index 86% rename from src/main/java/dev/koifysh/archipelago/events/ArchipelagoEventListener.java rename to src/main/java/io/github/archipelagomw/events/ArchipelagoEventListener.java index ae75a40..bd38c77 100644 --- a/src/main/java/dev/koifysh/archipelago/events/ArchipelagoEventListener.java +++ b/src/main/java/io/github/archipelagomw/events/ArchipelagoEventListener.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.events; +package io.github.archipelagomw.events; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/dev/koifysh/archipelago/events/BouncedEvent.java b/src/main/java/io/github/archipelagomw/events/BouncedEvent.java similarity index 96% rename from src/main/java/dev/koifysh/archipelago/events/BouncedEvent.java rename to src/main/java/io/github/archipelagomw/events/BouncedEvent.java index 82754bf..bdf55c0 100644 --- a/src/main/java/dev/koifysh/archipelago/events/BouncedEvent.java +++ b/src/main/java/io/github/archipelagomw/events/BouncedEvent.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.events; +package io.github.archipelagomw.events; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/dev/koifysh/archipelago/events/CheckedLocationsEvent.java b/src/main/java/io/github/archipelagomw/events/CheckedLocationsEvent.java similarity index 86% rename from src/main/java/dev/koifysh/archipelago/events/CheckedLocationsEvent.java rename to src/main/java/io/github/archipelagomw/events/CheckedLocationsEvent.java index 1a657d3..8a08ea0 100644 --- a/src/main/java/dev/koifysh/archipelago/events/CheckedLocationsEvent.java +++ b/src/main/java/io/github/archipelagomw/events/CheckedLocationsEvent.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.events; +package io.github.archipelagomw.events; import java.util.ArrayList; diff --git a/src/main/java/dev/koifysh/archipelago/events/ConnectionAttemptEvent.java b/src/main/java/io/github/archipelagomw/events/ConnectionAttemptEvent.java similarity index 96% rename from src/main/java/dev/koifysh/archipelago/events/ConnectionAttemptEvent.java rename to src/main/java/io/github/archipelagomw/events/ConnectionAttemptEvent.java index 30d750e..3ef2398 100644 --- a/src/main/java/dev/koifysh/archipelago/events/ConnectionAttemptEvent.java +++ b/src/main/java/io/github/archipelagomw/events/ConnectionAttemptEvent.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.events; +package io.github.archipelagomw.events; import com.google.gson.Gson; import com.google.gson.JsonElement; diff --git a/src/main/java/dev/koifysh/archipelago/events/ConnectionResultEvent.java b/src/main/java/io/github/archipelagomw/events/ConnectionResultEvent.java similarity index 92% rename from src/main/java/dev/koifysh/archipelago/events/ConnectionResultEvent.java rename to src/main/java/io/github/archipelagomw/events/ConnectionResultEvent.java index 429b3e4..a0cf404 100644 --- a/src/main/java/dev/koifysh/archipelago/events/ConnectionResultEvent.java +++ b/src/main/java/io/github/archipelagomw/events/ConnectionResultEvent.java @@ -1,9 +1,9 @@ -package dev.koifysh.archipelago.events; +package io.github.archipelagomw.events; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.internal.Primitives; -import dev.koifysh.archipelago.network.ConnectionResult; +import io.github.archipelagomw.network.ConnectionResult; public class ConnectionResultEvent implements Event { diff --git a/src/main/java/dev/koifysh/archipelago/events/DeathLinkEvent.java b/src/main/java/io/github/archipelagomw/events/DeathLinkEvent.java similarity index 91% rename from src/main/java/dev/koifysh/archipelago/events/DeathLinkEvent.java rename to src/main/java/io/github/archipelagomw/events/DeathLinkEvent.java index 367f736..3e7d3a2 100644 --- a/src/main/java/dev/koifysh/archipelago/events/DeathLinkEvent.java +++ b/src/main/java/io/github/archipelagomw/events/DeathLinkEvent.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.events; +package io.github.archipelagomw.events; /** * event that is fired whenever you receive a death link from another player. must first enable death links via {@link dev.koifysh.archipelago.helper.DeathLink} diff --git a/src/main/java/io/github/archipelagomw/events/Event.java b/src/main/java/io/github/archipelagomw/events/Event.java new file mode 100644 index 0000000..068454e --- /dev/null +++ b/src/main/java/io/github/archipelagomw/events/Event.java @@ -0,0 +1,4 @@ +package io.github.archipelagomw.events; + +public interface Event { +} diff --git a/src/main/java/dev/koifysh/archipelago/events/InvalidPacketEvent.java b/src/main/java/io/github/archipelagomw/events/InvalidPacketEvent.java similarity index 94% rename from src/main/java/dev/koifysh/archipelago/events/InvalidPacketEvent.java rename to src/main/java/io/github/archipelagomw/events/InvalidPacketEvent.java index fd6ba61..545f581 100644 --- a/src/main/java/dev/koifysh/archipelago/events/InvalidPacketEvent.java +++ b/src/main/java/io/github/archipelagomw/events/InvalidPacketEvent.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.events; +package io.github.archipelagomw.events; public class InvalidPacketEvent implements Event { diff --git a/src/main/java/dev/koifysh/archipelago/events/LocationInfoEvent.java b/src/main/java/io/github/archipelagomw/events/LocationInfoEvent.java similarity index 72% rename from src/main/java/dev/koifysh/archipelago/events/LocationInfoEvent.java rename to src/main/java/io/github/archipelagomw/events/LocationInfoEvent.java index 95a314d..abcaa28 100644 --- a/src/main/java/dev/koifysh/archipelago/events/LocationInfoEvent.java +++ b/src/main/java/io/github/archipelagomw/events/LocationInfoEvent.java @@ -1,6 +1,6 @@ -package dev.koifysh.archipelago.events; +package io.github.archipelagomw.events; -import dev.koifysh.archipelago.parts.NetworkItem; +import io.github.archipelagomw.parts.NetworkItem; import java.util.ArrayList; diff --git a/src/main/java/dev/koifysh/archipelago/events/PrintJSONEvent.java b/src/main/java/io/github/archipelagomw/events/PrintJSONEvent.java similarity index 78% rename from src/main/java/dev/koifysh/archipelago/events/PrintJSONEvent.java rename to src/main/java/io/github/archipelagomw/events/PrintJSONEvent.java index 3ecf040..7a9153a 100644 --- a/src/main/java/dev/koifysh/archipelago/events/PrintJSONEvent.java +++ b/src/main/java/io/github/archipelagomw/events/PrintJSONEvent.java @@ -1,8 +1,8 @@ -package dev.koifysh.archipelago.events; +package io.github.archipelagomw.events; -import dev.koifysh.archipelago.Print.APPrint; -import dev.koifysh.archipelago.Print.APPrintJsonType; -import dev.koifysh.archipelago.parts.NetworkItem; +import io.github.archipelagomw.Print.APPrint; +import io.github.archipelagomw.Print.APPrintJsonType; +import io.github.archipelagomw.parts.NetworkItem; /** * event that is fired when the server wishes to send a message to the user. diff --git a/src/main/java/dev/koifysh/archipelago/events/ReceiveItemEvent.java b/src/main/java/io/github/archipelagomw/events/ReceiveItemEvent.java similarity index 89% rename from src/main/java/dev/koifysh/archipelago/events/ReceiveItemEvent.java rename to src/main/java/io/github/archipelagomw/events/ReceiveItemEvent.java index a3edf71..c3700c7 100644 --- a/src/main/java/dev/koifysh/archipelago/events/ReceiveItemEvent.java +++ b/src/main/java/io/github/archipelagomw/events/ReceiveItemEvent.java @@ -1,6 +1,6 @@ -package dev.koifysh.archipelago.events; +package io.github.archipelagomw.events; -import dev.koifysh.archipelago.parts.NetworkItem; +import io.github.archipelagomw.parts.NetworkItem; public class ReceiveItemEvent implements Event { diff --git a/src/main/java/dev/koifysh/archipelago/events/RetrievedEvent.java b/src/main/java/io/github/archipelagomw/events/RetrievedEvent.java similarity index 97% rename from src/main/java/dev/koifysh/archipelago/events/RetrievedEvent.java rename to src/main/java/io/github/archipelagomw/events/RetrievedEvent.java index 93b29ad..52ea2e9 100644 --- a/src/main/java/dev/koifysh/archipelago/events/RetrievedEvent.java +++ b/src/main/java/io/github/archipelagomw/events/RetrievedEvent.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.events; +package io.github.archipelagomw.events; import com.google.gson.Gson; import com.google.gson.JsonObject; diff --git a/src/main/java/dev/koifysh/archipelago/events/SetReplyEvent.java b/src/main/java/io/github/archipelagomw/events/SetReplyEvent.java similarity index 96% rename from src/main/java/dev/koifysh/archipelago/events/SetReplyEvent.java rename to src/main/java/io/github/archipelagomw/events/SetReplyEvent.java index ff23305..99edd09 100644 --- a/src/main/java/dev/koifysh/archipelago/events/SetReplyEvent.java +++ b/src/main/java/io/github/archipelagomw/events/SetReplyEvent.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.events; +package io.github.archipelagomw.events; import com.google.gson.Gson; import com.google.gson.JsonElement; diff --git a/src/main/java/dev/koifysh/archipelago/flags/ItemsHandling.java b/src/main/java/io/github/archipelagomw/flags/ItemsHandling.java similarity index 90% rename from src/main/java/dev/koifysh/archipelago/flags/ItemsHandling.java rename to src/main/java/io/github/archipelagomw/flags/ItemsHandling.java index 40ee06d..0365b21 100644 --- a/src/main/java/dev/koifysh/archipelago/flags/ItemsHandling.java +++ b/src/main/java/io/github/archipelagomw/flags/ItemsHandling.java @@ -1,6 +1,6 @@ -package dev.koifysh.archipelago.flags; +package io.github.archipelagomw.flags; -import dev.koifysh.archipelago.Client; +import io.github.archipelagomw.Client; /** * Item Flag variables to read {@link Client#getItemsHandlingFlags()} and set {@link Client#setItemsHandlingFlags(int)} diff --git a/src/main/java/dev/koifysh/archipelago/flags/NetworkItem.java b/src/main/java/io/github/archipelagomw/flags/NetworkItem.java similarity index 93% rename from src/main/java/dev/koifysh/archipelago/flags/NetworkItem.java rename to src/main/java/io/github/archipelagomw/flags/NetworkItem.java index a71b068..212d8b6 100644 --- a/src/main/java/dev/koifysh/archipelago/flags/NetworkItem.java +++ b/src/main/java/io/github/archipelagomw/flags/NetworkItem.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.flags; +package io.github.archipelagomw.flags; /** * Flags that will tell you more about the item that was sent.
diff --git a/src/main/java/dev/koifysh/archipelago/flags/NetworkPlayer.java b/src/main/java/io/github/archipelagomw/flags/NetworkPlayer.java similarity index 92% rename from src/main/java/dev/koifysh/archipelago/flags/NetworkPlayer.java rename to src/main/java/io/github/archipelagomw/flags/NetworkPlayer.java index aec898d..3db1b7d 100644 --- a/src/main/java/dev/koifysh/archipelago/flags/NetworkPlayer.java +++ b/src/main/java/io/github/archipelagomw/flags/NetworkPlayer.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.flags; +package io.github.archipelagomw.flags; /** * Flags that will tell you more about the slot type.
diff --git a/src/main/java/dev/koifysh/archipelago/network/APPacket.java b/src/main/java/io/github/archipelagomw/network/APPacket.java similarity index 76% rename from src/main/java/dev/koifysh/archipelago/network/APPacket.java rename to src/main/java/io/github/archipelagomw/network/APPacket.java index e5843e8..cd4e62e 100644 --- a/src/main/java/dev/koifysh/archipelago/network/APPacket.java +++ b/src/main/java/io/github/archipelagomw/network/APPacket.java @@ -1,6 +1,5 @@ -package dev.koifysh.archipelago.network; +package io.github.archipelagomw.network; -import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; public class APPacket { diff --git a/src/main/java/dev/koifysh/archipelago/network/APPacketType.java b/src/main/java/io/github/archipelagomw/network/APPacketType.java similarity index 97% rename from src/main/java/dev/koifysh/archipelago/network/APPacketType.java rename to src/main/java/io/github/archipelagomw/network/APPacketType.java index 89cb354..8d429e2 100644 --- a/src/main/java/dev/koifysh/archipelago/network/APPacketType.java +++ b/src/main/java/io/github/archipelagomw/network/APPacketType.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.network; +package io.github.archipelagomw.network; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/dev/koifysh/archipelago/network/ConnectionResult.java b/src/main/java/io/github/archipelagomw/network/ConnectionResult.java similarity index 75% rename from src/main/java/dev/koifysh/archipelago/network/ConnectionResult.java rename to src/main/java/io/github/archipelagomw/network/ConnectionResult.java index 3ddf920..523c968 100644 --- a/src/main/java/dev/koifysh/archipelago/network/ConnectionResult.java +++ b/src/main/java/io/github/archipelagomw/network/ConnectionResult.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.network; +package io.github.archipelagomw.network; public enum ConnectionResult { Success,InvalidSlot, SlotAlreadyTaken, IncompatibleVersion, InvalidPassword,InvalidGame diff --git a/src/main/java/io/github/archipelagomw/network/DataStorageOperation.java b/src/main/java/io/github/archipelagomw/network/DataStorageOperation.java new file mode 100644 index 0000000..f3619d8 --- /dev/null +++ b/src/main/java/io/github/archipelagomw/network/DataStorageOperation.java @@ -0,0 +1,3 @@ +package io.github.archipelagomw.network; + + diff --git a/src/main/java/dev/koifysh/archipelago/network/Permission.java b/src/main/java/io/github/archipelagomw/network/Permission.java similarity index 84% rename from src/main/java/dev/koifysh/archipelago/network/Permission.java rename to src/main/java/io/github/archipelagomw/network/Permission.java index b8c7c07..514f180 100644 --- a/src/main/java/dev/koifysh/archipelago/network/Permission.java +++ b/src/main/java/io/github/archipelagomw/network/Permission.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.network; +package io.github.archipelagomw.network; public enum Permission { disabled(0b000), diff --git a/src/main/java/dev/koifysh/archipelago/network/RemainingMode.java b/src/main/java/io/github/archipelagomw/network/RemainingMode.java similarity index 89% rename from src/main/java/dev/koifysh/archipelago/network/RemainingMode.java rename to src/main/java/io/github/archipelagomw/network/RemainingMode.java index c1fb5df..8e92dcb 100644 --- a/src/main/java/dev/koifysh/archipelago/network/RemainingMode.java +++ b/src/main/java/io/github/archipelagomw/network/RemainingMode.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.network; +package io.github.archipelagomw.network; public enum RemainingMode { enabled, diff --git a/src/main/java/dev/koifysh/archipelago/network/client/BouncePacket.java b/src/main/java/io/github/archipelagomw/network/client/BouncePacket.java similarity index 79% rename from src/main/java/dev/koifysh/archipelago/network/client/BouncePacket.java rename to src/main/java/io/github/archipelagomw/network/client/BouncePacket.java index 6d822ff..a165ef8 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/BouncePacket.java +++ b/src/main/java/io/github/archipelagomw/network/client/BouncePacket.java @@ -1,10 +1,10 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.events.Event; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.events.Event; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; import java.util.HashMap; diff --git a/src/main/java/dev/koifysh/archipelago/network/client/ConnectPacket.java b/src/main/java/io/github/archipelagomw/network/client/ConnectPacket.java similarity index 75% rename from src/main/java/dev/koifysh/archipelago/network/client/ConnectPacket.java rename to src/main/java/io/github/archipelagomw/network/client/ConnectPacket.java index 99d4b13..7643cb8 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/ConnectPacket.java +++ b/src/main/java/io/github/archipelagomw/network/client/ConnectPacket.java @@ -1,9 +1,9 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; -import dev.koifysh.archipelago.parts.Version; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; +import io.github.archipelagomw.parts.Version; import java.util.Set; diff --git a/src/main/java/dev/koifysh/archipelago/network/client/CreateAsHint.java b/src/main/java/io/github/archipelagomw/network/client/CreateAsHint.java similarity index 80% rename from src/main/java/dev/koifysh/archipelago/network/client/CreateAsHint.java rename to src/main/java/io/github/archipelagomw/network/client/CreateAsHint.java index f03fa34..54b8e15 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/CreateAsHint.java +++ b/src/main/java/io/github/archipelagomw/network/client/CreateAsHint.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; public enum CreateAsHint { NO(0), diff --git a/src/main/java/dev/koifysh/archipelago/network/client/GetDataPackagePacket.java b/src/main/java/io/github/archipelagomw/network/client/GetDataPackagePacket.java similarity index 66% rename from src/main/java/dev/koifysh/archipelago/network/client/GetDataPackagePacket.java rename to src/main/java/io/github/archipelagomw/network/client/GetDataPackagePacket.java index 267a06d..df5918b 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/GetDataPackagePacket.java +++ b/src/main/java/io/github/archipelagomw/network/client/GetDataPackagePacket.java @@ -1,7 +1,7 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; import java.util.Set; diff --git a/src/main/java/dev/koifysh/archipelago/network/client/GetPacket.java b/src/main/java/io/github/archipelagomw/network/client/GetPacket.java similarity index 78% rename from src/main/java/dev/koifysh/archipelago/network/client/GetPacket.java rename to src/main/java/io/github/archipelagomw/network/client/GetPacket.java index 30c23e8..33e1c01 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/GetPacket.java +++ b/src/main/java/io/github/archipelagomw/network/client/GetPacket.java @@ -1,13 +1,12 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.Client; -import dev.koifysh.archipelago.events.RetrievedEvent; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.Client; +import io.github.archipelagomw.events.RetrievedEvent; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; import java.util.Collection; -import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; /** diff --git a/src/main/java/dev/koifysh/archipelago/network/client/HintStatus.java b/src/main/java/io/github/archipelagomw/network/client/HintStatus.java similarity index 90% rename from src/main/java/dev/koifysh/archipelago/network/client/HintStatus.java rename to src/main/java/io/github/archipelagomw/network/client/HintStatus.java index 4935873..87c4753 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/HintStatus.java +++ b/src/main/java/io/github/archipelagomw/network/client/HintStatus.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/dev/koifysh/archipelago/network/client/LocationChecks.java b/src/main/java/io/github/archipelagomw/network/client/LocationChecks.java similarity index 67% rename from src/main/java/dev/koifysh/archipelago/network/client/LocationChecks.java rename to src/main/java/io/github/archipelagomw/network/client/LocationChecks.java index e6bf674..2a0e8f4 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/LocationChecks.java +++ b/src/main/java/io/github/archipelagomw/network/client/LocationChecks.java @@ -1,8 +1,8 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/dev/koifysh/archipelago/network/client/LocationScouts.java b/src/main/java/io/github/archipelagomw/network/client/LocationScouts.java similarity index 78% rename from src/main/java/dev/koifysh/archipelago/network/client/LocationScouts.java rename to src/main/java/io/github/archipelagomw/network/client/LocationScouts.java index f90e5da..3235af0 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/LocationScouts.java +++ b/src/main/java/io/github/archipelagomw/network/client/LocationScouts.java @@ -1,8 +1,8 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; import java.util.ArrayList; diff --git a/src/main/java/dev/koifysh/archipelago/network/client/SayPacket.java b/src/main/java/io/github/archipelagomw/network/client/SayPacket.java similarity index 62% rename from src/main/java/dev/koifysh/archipelago/network/client/SayPacket.java rename to src/main/java/io/github/archipelagomw/network/client/SayPacket.java index 1d53ec8..773c255 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/SayPacket.java +++ b/src/main/java/io/github/archipelagomw/network/client/SayPacket.java @@ -1,8 +1,8 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; public class SayPacket extends APPacket { diff --git a/src/main/java/dev/koifysh/archipelago/network/client/SetNotifyPacket.java b/src/main/java/io/github/archipelagomw/network/client/SetNotifyPacket.java similarity index 68% rename from src/main/java/dev/koifysh/archipelago/network/client/SetNotifyPacket.java rename to src/main/java/io/github/archipelagomw/network/client/SetNotifyPacket.java index aa7ca67..1995aab 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/SetNotifyPacket.java +++ b/src/main/java/io/github/archipelagomw/network/client/SetNotifyPacket.java @@ -1,7 +1,7 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; import java.util.Collection; diff --git a/src/main/java/dev/koifysh/archipelago/network/client/SetPacket.java b/src/main/java/io/github/archipelagomw/network/client/SetPacket.java similarity index 96% rename from src/main/java/dev/koifysh/archipelago/network/client/SetPacket.java rename to src/main/java/io/github/archipelagomw/network/client/SetPacket.java index 93156e6..6ce5468 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/SetPacket.java +++ b/src/main/java/io/github/archipelagomw/network/client/SetPacket.java @@ -1,12 +1,11 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.events.SetReplyEvent; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.events.SetReplyEvent; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; import java.util.ArrayList; -import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; public class SetPacket extends APPacket { diff --git a/src/main/java/dev/koifysh/archipelago/network/client/StatusUpdatePacket.java b/src/main/java/io/github/archipelagomw/network/client/StatusUpdatePacket.java similarity index 52% rename from src/main/java/dev/koifysh/archipelago/network/client/StatusUpdatePacket.java rename to src/main/java/io/github/archipelagomw/network/client/StatusUpdatePacket.java index 32320d8..8b969b7 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/StatusUpdatePacket.java +++ b/src/main/java/io/github/archipelagomw/network/client/StatusUpdatePacket.java @@ -1,8 +1,8 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; -import dev.koifysh.archipelago.ClientStatus; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.ClientStatus; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; public class StatusUpdatePacket extends APPacket { diff --git a/src/main/java/io/github/archipelagomw/network/client/SyncPacket.java b/src/main/java/io/github/archipelagomw/network/client/SyncPacket.java new file mode 100644 index 0000000..d80f968 --- /dev/null +++ b/src/main/java/io/github/archipelagomw/network/client/SyncPacket.java @@ -0,0 +1,12 @@ +package io.github.archipelagomw.network.client; + +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; + +public class SyncPacket extends APPacket { + + + public SyncPacket() { + super(APPacketType.Sync); + } +} diff --git a/src/main/java/dev/koifysh/archipelago/network/client/UpdateHintPacket.java b/src/main/java/io/github/archipelagomw/network/client/UpdateHintPacket.java similarity index 73% rename from src/main/java/dev/koifysh/archipelago/network/client/UpdateHintPacket.java rename to src/main/java/io/github/archipelagomw/network/client/UpdateHintPacket.java index 71b3d5b..5e34c26 100644 --- a/src/main/java/dev/koifysh/archipelago/network/client/UpdateHintPacket.java +++ b/src/main/java/io/github/archipelagomw/network/client/UpdateHintPacket.java @@ -1,9 +1,9 @@ -package dev.koifysh.archipelago.network.client; +package io.github.archipelagomw.network.client; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; public class UpdateHintPacket extends APPacket{ /* diff --git a/src/main/java/dev/koifysh/archipelago/network/server/BouncedPacket.java b/src/main/java/io/github/archipelagomw/network/server/BouncedPacket.java similarity index 79% rename from src/main/java/dev/koifysh/archipelago/network/server/BouncedPacket.java rename to src/main/java/io/github/archipelagomw/network/server/BouncedPacket.java index 6c744ba..bb76159 100644 --- a/src/main/java/dev/koifysh/archipelago/network/server/BouncedPacket.java +++ b/src/main/java/io/github/archipelagomw/network/server/BouncedPacket.java @@ -1,8 +1,8 @@ -package dev.koifysh.archipelago.network.server; +package io.github.archipelagomw.network.server; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/dev/koifysh/archipelago/network/server/ConnectUpdatePacket.java b/src/main/java/io/github/archipelagomw/network/server/ConnectUpdatePacket.java similarity index 64% rename from src/main/java/dev/koifysh/archipelago/network/server/ConnectUpdatePacket.java rename to src/main/java/io/github/archipelagomw/network/server/ConnectUpdatePacket.java index 2871d70..d7a5376 100644 --- a/src/main/java/dev/koifysh/archipelago/network/server/ConnectUpdatePacket.java +++ b/src/main/java/io/github/archipelagomw/network/server/ConnectUpdatePacket.java @@ -1,8 +1,8 @@ -package dev.koifysh.archipelago.network.server; +package io.github.archipelagomw.network.server; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; import java.util.Set; diff --git a/src/main/java/dev/koifysh/archipelago/network/server/ConnectedPacket.java b/src/main/java/io/github/archipelagomw/network/server/ConnectedPacket.java similarity index 74% rename from src/main/java/dev/koifysh/archipelago/network/server/ConnectedPacket.java rename to src/main/java/io/github/archipelagomw/network/server/ConnectedPacket.java index 9049c49..f430863 100644 --- a/src/main/java/dev/koifysh/archipelago/network/server/ConnectedPacket.java +++ b/src/main/java/io/github/archipelagomw/network/server/ConnectedPacket.java @@ -1,10 +1,10 @@ -package dev.koifysh.archipelago.network.server; +package io.github.archipelagomw.network.server; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; -import dev.koifysh.archipelago.parts.NetworkPlayer; -import dev.koifysh.archipelago.parts.NetworkSlot; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; +import io.github.archipelagomw.parts.NetworkPlayer; +import io.github.archipelagomw.parts.NetworkSlot; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/dev/koifysh/archipelago/network/server/ConnectionRefusedPacket.java b/src/main/java/io/github/archipelagomw/network/server/ConnectionRefusedPacket.java similarity index 56% rename from src/main/java/dev/koifysh/archipelago/network/server/ConnectionRefusedPacket.java rename to src/main/java/io/github/archipelagomw/network/server/ConnectionRefusedPacket.java index 0e91e4f..31d03a5 100644 --- a/src/main/java/dev/koifysh/archipelago/network/server/ConnectionRefusedPacket.java +++ b/src/main/java/io/github/archipelagomw/network/server/ConnectionRefusedPacket.java @@ -1,9 +1,9 @@ -package dev.koifysh.archipelago.network.server; +package io.github.archipelagomw.network.server; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; -import dev.koifysh.archipelago.network.ConnectionResult; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; +import io.github.archipelagomw.network.ConnectionResult; public class ConnectionRefusedPacket extends APPacket { diff --git a/src/main/java/dev/koifysh/archipelago/network/server/InvalidPacket.java b/src/main/java/io/github/archipelagomw/network/server/InvalidPacket.java similarity index 70% rename from src/main/java/dev/koifysh/archipelago/network/server/InvalidPacket.java rename to src/main/java/io/github/archipelagomw/network/server/InvalidPacket.java index f5a855e..0c13066 100644 --- a/src/main/java/dev/koifysh/archipelago/network/server/InvalidPacket.java +++ b/src/main/java/io/github/archipelagomw/network/server/InvalidPacket.java @@ -1,8 +1,8 @@ -package dev.koifysh.archipelago.network.server; +package io.github.archipelagomw.network.server; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; public class InvalidPacket extends APPacket { diff --git a/src/main/java/io/github/archipelagomw/network/server/JsonPrintPacket.java b/src/main/java/io/github/archipelagomw/network/server/JsonPrintPacket.java new file mode 100644 index 0000000..096787c --- /dev/null +++ b/src/main/java/io/github/archipelagomw/network/server/JsonPrintPacket.java @@ -0,0 +1,13 @@ +package io.github.archipelagomw.network.server; + +import io.github.archipelagomw.Print.APPrintPart; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; + +public class JsonPrintPacket extends APPacket { + APPrintPart[] parts; + + public JsonPrintPacket() { + super(APPacketType.PrintJSON); + } +} diff --git a/src/main/java/dev/koifysh/archipelago/network/server/LocationInfoPacket.java b/src/main/java/io/github/archipelagomw/network/server/LocationInfoPacket.java similarity index 59% rename from src/main/java/dev/koifysh/archipelago/network/server/LocationInfoPacket.java rename to src/main/java/io/github/archipelagomw/network/server/LocationInfoPacket.java index 309ca7b..379de58 100644 --- a/src/main/java/dev/koifysh/archipelago/network/server/LocationInfoPacket.java +++ b/src/main/java/io/github/archipelagomw/network/server/LocationInfoPacket.java @@ -1,9 +1,9 @@ -package dev.koifysh.archipelago.network.server; +package io.github.archipelagomw.network.server; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; -import dev.koifysh.archipelago.parts.NetworkItem; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; +import io.github.archipelagomw.parts.NetworkItem; import java.util.ArrayList; diff --git a/src/main/java/dev/koifysh/archipelago/network/server/PrintPacket.java b/src/main/java/io/github/archipelagomw/network/server/PrintPacket.java similarity index 64% rename from src/main/java/dev/koifysh/archipelago/network/server/PrintPacket.java rename to src/main/java/io/github/archipelagomw/network/server/PrintPacket.java index 8c7a9ed..c02d5b3 100644 --- a/src/main/java/dev/koifysh/archipelago/network/server/PrintPacket.java +++ b/src/main/java/io/github/archipelagomw/network/server/PrintPacket.java @@ -1,8 +1,8 @@ -package dev.koifysh.archipelago.network.server; +package io.github.archipelagomw.network.server; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; public class PrintPacket extends APPacket { diff --git a/src/main/java/dev/koifysh/archipelago/network/server/ReceivedItemsPacket.java b/src/main/java/io/github/archipelagomw/network/server/ReceivedItemsPacket.java similarity index 63% rename from src/main/java/dev/koifysh/archipelago/network/server/ReceivedItemsPacket.java rename to src/main/java/io/github/archipelagomw/network/server/ReceivedItemsPacket.java index a8925e3..d7dc329 100644 --- a/src/main/java/dev/koifysh/archipelago/network/server/ReceivedItemsPacket.java +++ b/src/main/java/io/github/archipelagomw/network/server/ReceivedItemsPacket.java @@ -1,9 +1,9 @@ -package dev.koifysh.archipelago.network.server; +package io.github.archipelagomw.network.server; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; -import dev.koifysh.archipelago.parts.NetworkItem; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; +import io.github.archipelagomw.parts.NetworkItem; import java.util.ArrayList; diff --git a/src/main/java/dev/koifysh/archipelago/network/server/RetrievedPacket.java b/src/main/java/io/github/archipelagomw/network/server/RetrievedPacket.java similarity index 69% rename from src/main/java/dev/koifysh/archipelago/network/server/RetrievedPacket.java rename to src/main/java/io/github/archipelagomw/network/server/RetrievedPacket.java index 7033406..2eb1b52 100644 --- a/src/main/java/dev/koifysh/archipelago/network/server/RetrievedPacket.java +++ b/src/main/java/io/github/archipelagomw/network/server/RetrievedPacket.java @@ -1,8 +1,8 @@ -package dev.koifysh.archipelago.network.server; +package io.github.archipelagomw.network.server; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; import java.util.HashMap; diff --git a/src/main/java/dev/koifysh/archipelago/network/server/RoomInfoPacket.java b/src/main/java/io/github/archipelagomw/network/server/RoomInfoPacket.java similarity index 83% rename from src/main/java/dev/koifysh/archipelago/network/server/RoomInfoPacket.java rename to src/main/java/io/github/archipelagomw/network/server/RoomInfoPacket.java index 46f2b88..ff58dad 100644 --- a/src/main/java/dev/koifysh/archipelago/network/server/RoomInfoPacket.java +++ b/src/main/java/io/github/archipelagomw/network/server/RoomInfoPacket.java @@ -1,10 +1,10 @@ -package dev.koifysh.archipelago.network.server; +package io.github.archipelagomw.network.server; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; -import dev.koifysh.archipelago.parts.NetworkPlayer; -import dev.koifysh.archipelago.parts.Version; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; +import io.github.archipelagomw.parts.NetworkPlayer; +import io.github.archipelagomw.parts.Version; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/dev/koifysh/archipelago/network/server/RoomUpdatePacket.java b/src/main/java/io/github/archipelagomw/network/server/RoomUpdatePacket.java similarity index 81% rename from src/main/java/dev/koifysh/archipelago/network/server/RoomUpdatePacket.java rename to src/main/java/io/github/archipelagomw/network/server/RoomUpdatePacket.java index 10b677f..f2973ff 100644 --- a/src/main/java/dev/koifysh/archipelago/network/server/RoomUpdatePacket.java +++ b/src/main/java/io/github/archipelagomw/network/server/RoomUpdatePacket.java @@ -1,11 +1,11 @@ -package dev.koifysh.archipelago.network.server; +package io.github.archipelagomw.network.server; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; -import dev.koifysh.archipelago.network.RemainingMode; -import dev.koifysh.archipelago.parts.NetworkPlayer; -import dev.koifysh.archipelago.parts.Version; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; +import io.github.archipelagomw.network.RemainingMode; +import io.github.archipelagomw.parts.NetworkPlayer; +import io.github.archipelagomw.parts.Version; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/dev/koifysh/archipelago/network/server/SetReplyPacket.java b/src/main/java/io/github/archipelagomw/network/server/SetReplyPacket.java similarity index 75% rename from src/main/java/dev/koifysh/archipelago/network/server/SetReplyPacket.java rename to src/main/java/io/github/archipelagomw/network/server/SetReplyPacket.java index 0c20111..8a14128 100644 --- a/src/main/java/dev/koifysh/archipelago/network/server/SetReplyPacket.java +++ b/src/main/java/io/github/archipelagomw/network/server/SetReplyPacket.java @@ -1,8 +1,8 @@ -package dev.koifysh.archipelago.network.server; +package io.github.archipelagomw.network.server; import com.google.gson.annotations.SerializedName; -import dev.koifysh.archipelago.network.APPacket; -import dev.koifysh.archipelago.network.APPacketType; +import io.github.archipelagomw.network.APPacket; +import io.github.archipelagomw.network.APPacketType; public class SetReplyPacket extends APPacket { @SerializedName("key") diff --git a/src/main/java/dev/koifysh/archipelago/parts/DataPackage.java b/src/main/java/io/github/archipelagomw/parts/DataPackage.java similarity index 95% rename from src/main/java/dev/koifysh/archipelago/parts/DataPackage.java rename to src/main/java/io/github/archipelagomw/parts/DataPackage.java index 474a523..2dd347f 100644 --- a/src/main/java/dev/koifysh/archipelago/parts/DataPackage.java +++ b/src/main/java/io/github/archipelagomw/parts/DataPackage.java @@ -1,6 +1,5 @@ -package dev.koifysh.archipelago.parts; +package io.github.archipelagomw.parts; -import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import java.io.Serializable; diff --git a/src/main/java/dev/koifysh/archipelago/parts/Game.java b/src/main/java/io/github/archipelagomw/parts/Game.java similarity index 97% rename from src/main/java/dev/koifysh/archipelago/parts/Game.java rename to src/main/java/io/github/archipelagomw/parts/Game.java index c988cff..fbdd85f 100644 --- a/src/main/java/dev/koifysh/archipelago/parts/Game.java +++ b/src/main/java/io/github/archipelagomw/parts/Game.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.parts; +package io.github.archipelagomw.parts; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/dev/koifysh/archipelago/parts/NetworkItem.java b/src/main/java/io/github/archipelagomw/parts/NetworkItem.java similarity index 82% rename from src/main/java/dev/koifysh/archipelago/parts/NetworkItem.java rename to src/main/java/io/github/archipelagomw/parts/NetworkItem.java index 0031adb..56874b2 100644 --- a/src/main/java/dev/koifysh/archipelago/parts/NetworkItem.java +++ b/src/main/java/io/github/archipelagomw/parts/NetworkItem.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.parts; +package io.github.archipelagomw.parts; import com.google.gson.annotations.SerializedName; @@ -14,7 +14,7 @@ public class NetworkItem { public int playerID; /** - * Bit flags that tell you information about the item. bitwise AND them with {@link dev.koifysh.archipelago.flags.NetworkItem} to read. + * Bit flags that tell you information about the item. bitwise AND them with {@link io.github.archipelagomw.flags.NetworkItem} to read. */ @SerializedName("flags") public int flags; diff --git a/src/main/java/dev/koifysh/archipelago/parts/NetworkPlayer.java b/src/main/java/io/github/archipelagomw/parts/NetworkPlayer.java similarity index 88% rename from src/main/java/dev/koifysh/archipelago/parts/NetworkPlayer.java rename to src/main/java/io/github/archipelagomw/parts/NetworkPlayer.java index bd5e511..16f8ec6 100644 --- a/src/main/java/dev/koifysh/archipelago/parts/NetworkPlayer.java +++ b/src/main/java/io/github/archipelagomw/parts/NetworkPlayer.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.parts; +package io.github.archipelagomw.parts; public class NetworkPlayer { public int team; diff --git a/src/main/java/dev/koifysh/archipelago/parts/NetworkSlot.java b/src/main/java/io/github/archipelagomw/parts/NetworkSlot.java similarity index 90% rename from src/main/java/dev/koifysh/archipelago/parts/NetworkSlot.java rename to src/main/java/io/github/archipelagomw/parts/NetworkSlot.java index c812f94..d80df1a 100644 --- a/src/main/java/dev/koifysh/archipelago/parts/NetworkSlot.java +++ b/src/main/java/io/github/archipelagomw/parts/NetworkSlot.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.parts; +package io.github.archipelagomw.parts; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/dev/koifysh/archipelago/parts/Version.java b/src/main/java/io/github/archipelagomw/parts/Version.java similarity index 89% rename from src/main/java/dev/koifysh/archipelago/parts/Version.java rename to src/main/java/io/github/archipelagomw/parts/Version.java index eed4df7..11c5384 100644 --- a/src/main/java/dev/koifysh/archipelago/parts/Version.java +++ b/src/main/java/io/github/archipelagomw/parts/Version.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.parts; +package io.github.archipelagomw.parts; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/dev/koifysh/archipelago/utils/AtomicDouble.java b/src/main/java/io/github/archipelagomw/utils/AtomicDouble.java similarity index 95% rename from src/main/java/dev/koifysh/archipelago/utils/AtomicDouble.java rename to src/main/java/io/github/archipelagomw/utils/AtomicDouble.java index dbb6606..8f3b738 100644 --- a/src/main/java/dev/koifysh/archipelago/utils/AtomicDouble.java +++ b/src/main/java/io/github/archipelagomw/utils/AtomicDouble.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago.utils; +package io.github.archipelagomw.utils; import java.util.concurrent.atomic.AtomicLong; import java.util.function.DoubleUnaryOperator; diff --git a/src/test/java/dev/koifysh/archipelago/UtilsTest.java b/src/test/java/io/github/archipelagomw/UtilsTest.java similarity index 92% rename from src/test/java/dev/koifysh/archipelago/UtilsTest.java rename to src/test/java/io/github/archipelagomw/UtilsTest.java index f12c326..7754924 100644 --- a/src/test/java/dev/koifysh/archipelago/UtilsTest.java +++ b/src/test/java/io/github/archipelagomw/UtilsTest.java @@ -1,4 +1,4 @@ -package dev.koifysh.archipelago; +package io.github.archipelagomw; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; From 1233f7b5fb45c3adb71fce9fe5c46796b31b32ae Mon Sep 17 00:00:00 2001 From: platanobailando Date: Sun, 10 Aug 2025 21:15:47 -0500 Subject: [PATCH 2/3] Fixing issues in migration --- src/main/java/io/github/archipelagomw/Client.java | 2 -- src/main/java/io/github/archipelagomw/WebSocket.java | 5 ----- 2 files changed, 7 deletions(-) diff --git a/src/main/java/io/github/archipelagomw/Client.java b/src/main/java/io/github/archipelagomw/Client.java index 636ef17..dfd7451 100644 --- a/src/main/java/io/github/archipelagomw/Client.java +++ b/src/main/java/io/github/archipelagomw/Client.java @@ -7,7 +7,6 @@ import io.github.archipelagomw.events.RetrievedEvent; import io.github.archipelagomw.flags.ItemsHandling; import io.github.archipelagomw.bounce.DeathLinkHandler; -import dev.koifysh.archipelagomw.network.client.*; import io.github.archipelagomw.network.client.*; import io.github.archipelagomw.network.server.ConnectUpdatePacket; import io.github.archipelagomw.network.server.RoomInfoPacket; @@ -15,7 +14,6 @@ import io.github.archipelagomw.parts.Game; import io.github.archipelagomw.parts.NetworkSlot; import io.github.archipelagomw.parts.Version; -import dev.koifysh.archipelago.network.client.*; import org.apache.hc.core5.net.URIBuilder; import com.google.gson.Gson; diff --git a/src/main/java/io/github/archipelagomw/WebSocket.java b/src/main/java/io/github/archipelagomw/WebSocket.java index 4efc845..e27aaed 100644 --- a/src/main/java/io/github/archipelagomw/WebSocket.java +++ b/src/main/java/io/github/archipelagomw/WebSocket.java @@ -8,22 +8,17 @@ import io.github.archipelagomw.Print.APPrintJsonType; import io.github.archipelagomw.Print.APPrintPart; import io.github.archipelagomw.Print.APPrintType; -import dev.koifysh.archipelagomw.events.*; import io.github.archipelagomw.events.*; import io.github.archipelagomw.flags.NetworkPlayer; import io.github.archipelagomw.network.APPacket; import io.github.archipelagomw.network.ConnectionResult; -import dev.koifysh.archipelago.network.client.*; import io.github.archipelagomw.network.client.ConnectPacket; import io.github.archipelagomw.network.client.GetDataPackagePacket; import io.github.archipelagomw.network.client.LocationScouts; import io.github.archipelagomw.network.client.SayPacket; -import dev.koifysh.archipelagomw.network.server.*; import io.github.archipelagomw.network.server.*; import io.github.archipelagomw.parts.DataPackage; import io.github.archipelagomw.parts.NetworkItem; -import dev.koifysh.archipelago.events.*; -import dev.koifysh.archipelago.network.server.*; import io.github.archipelagomw.parts.NetworkSlot; import org.apache.hc.core5.net.URIBuilder; From fc3a3d4498c12ec6059c110f3ba82f7e52a576ed Mon Sep 17 00:00:00 2001 From: platanobailando Date: Sun, 10 Aug 2025 21:16:30 -0500 Subject: [PATCH 3/3] Updating version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 15486f5..89e769f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } group = "io.github.archipelagomw" -version = "0.1.21" +version = "0.2.0" repositories { mavenCentral()