Migrating code to new packages

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "io.github.archipelagomw"
-version = "0.1.21"
+version = "0.2.0"
 
 repositories {
     mavenCentral()

src/main/java/dev/koifysh/archipelago/Client.java → src/main/java/io/github/archipelagomw/Client.java

@@ -1,18 +1,19 @@
-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 dev.koifysh.archipelago.network.client.*;
+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 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 org.apache.hc.core5.net.URIBuilder;
 
 import com.google.gson.Gson;
@@ -494,7 +495,7 @@ public boolean checkLocations(Collection<Long> 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<Long> locationIDs) {

src/main/java/dev/koifysh/archipelago/ClientStatus.java → 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;
 

src/main/java/dev/koifysh/archipelago/EventManager.java → 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;
 

src/main/java/dev/koifysh/archipelago/ItemManager.java → 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 {

src/main/java/dev/koifysh/archipelago/LocationManager.java → 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;

src/main/java/dev/koifysh/archipelago/Print/APPrint.java → 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 {
 

src/main/java/dev/koifysh/archipelago/Print/APPrintColor.java → 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.*;

src/main/java/dev/koifysh/archipelago/Print/APPrintJsonType.java → 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;
 

src/main/java/dev/koifysh/archipelago/Print/APPrintPart.java → 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;

src/main/java/dev/koifysh/archipelago/Print/APPrintType.java → 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;
 

src/main/java/dev/koifysh/archipelago/Utils.java → src/main/java/io/github/archipelagomw/Utils.java

@@ -1,4 +1,4 @@
-package dev.koifysh.archipelago;
+package io.github.archipelagomw;
 
 public class Utils {
 

src/main/java/dev/koifysh/archipelago/WebSocket.java → src/main/java/io/github/archipelagomw/WebSocket.java

@@ -1,23 +1,26 @@
-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 dev.koifysh.archipelago.network.client.*;
-import dev.koifysh.archipelago.parts.DataPackage;
-import dev.koifysh.archipelago.parts.NetworkItem;
-import dev.koifysh.archipelago.events.*;
-import dev.koifysh.archipelago.network.server.*;
-
-import dev.koifysh.archipelago.parts.NetworkSlot;
+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 io.github.archipelagomw.events.*;
+import io.github.archipelagomw.flags.NetworkPlayer;
+import io.github.archipelagomw.network.APPacket;
+import io.github.archipelagomw.network.ConnectionResult;
+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 io.github.archipelagomw.network.server.*;
+import io.github.archipelagomw.parts.DataPackage;
+import io.github.archipelagomw.parts.NetworkItem;
+
+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 +124,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 +169,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) {

src/main/java/dev/koifysh/archipelago/bounce/BouncedManager.java → 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.
  */

src/main/java/dev/koifysh/archipelago/bounce/BouncedPacketHandler.java → 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

src/main/java/dev/koifysh/archipelago/bounce/DeathLinkHandler.java → 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;

src/main/java/dev/koifysh/archipelago/events/ArchipelagoEventListener.java → 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;

src/main/java/dev/koifysh/archipelago/events/BouncedEvent.java → 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;
 

src/main/java/dev/koifysh/archipelago/events/CheckedLocationsEvent.java → 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;
 

src/main/java/dev/koifysh/archipelago/events/ConnectionAttemptEvent.java → 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;

src/main/java/dev/koifysh/archipelago/events/ConnectionResultEvent.java → 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 {
 

src/main/java/dev/koifysh/archipelago/events/DeathLinkEvent.java → 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}

src/main/java/io/github/archipelagomw/events/Event.java

@@ -0,0 +1,4 @@
+package io.github.archipelagomw.events;
+
+public interface Event {
+}

src/main/java/dev/koifysh/archipelago/events/InvalidPacketEvent.java → 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 {
 

src/main/java/dev/koifysh/archipelago/events/LocationInfoEvent.java → 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;
 

src/main/java/dev/koifysh/archipelago/events/PrintJSONEvent.java → 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.

src/main/java/dev/koifysh/archipelago/events/ReceiveItemEvent.java → 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 {
 

src/main/java/dev/koifysh/archipelago/events/RetrievedEvent.java → 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;

src/main/java/dev/koifysh/archipelago/events/SetReplyEvent.java → 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;

src/main/java/dev/koifysh/archipelago/flags/ItemsHandling.java → 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)}