Skip to content

Commit cabeaf2

Browse files
authored
Merge pull request #73 from cjmang/main
Migrating code to new packages
2 parents 548d85a + db5dc2c commit cabeaf2

File tree

77 files changed

+222
-224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+222
-224
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
group = "io.github.archipelagomw"
10-
version = "0.1.21"
10+
version = "0.2.0"
1111

1212
repositories {
1313
mavenCentral()

src/main/java/dev/koifysh/archipelago/events/Event.java

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/main/java/dev/koifysh/archipelago/network/DataStorageOperation.java

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/main/java/dev/koifysh/archipelago/network/client/SyncPacket.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/main/java/dev/koifysh/archipelago/network/server/JsonPrintPacket.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
package dev.koifysh.archipelago;
1+
package io.github.archipelagomw;
22

3-
import dev.koifysh.archipelago.bounce.BouncedManager;
3+
import io.github.archipelagomw.bounce.BouncedManager;
44
import com.google.gson.JsonElement;
55
import com.google.gson.JsonObject;
6-
import dev.koifysh.archipelago.events.RetrievedEvent;
7-
import dev.koifysh.archipelago.flags.ItemsHandling;
8-
import dev.koifysh.archipelago.bounce.DeathLinkHandler;
9-
import dev.koifysh.archipelago.network.server.ConnectUpdatePacket;
10-
import dev.koifysh.archipelago.network.server.RoomInfoPacket;
11-
import dev.koifysh.archipelago.parts.DataPackage;
12-
import dev.koifysh.archipelago.parts.Game;
13-
import dev.koifysh.archipelago.parts.NetworkSlot;
14-
import dev.koifysh.archipelago.parts.Version;
15-
import dev.koifysh.archipelago.network.client.*;
6+
import io.github.archipelagomw.events.LocationInfoEvent;
7+
import io.github.archipelagomw.events.RetrievedEvent;
8+
import io.github.archipelagomw.flags.ItemsHandling;
9+
import io.github.archipelagomw.bounce.DeathLinkHandler;
10+
import io.github.archipelagomw.network.client.*;
11+
import io.github.archipelagomw.network.server.ConnectUpdatePacket;
12+
import io.github.archipelagomw.network.server.RoomInfoPacket;
13+
import io.github.archipelagomw.parts.DataPackage;
14+
import io.github.archipelagomw.parts.Game;
15+
import io.github.archipelagomw.parts.NetworkSlot;
16+
import io.github.archipelagomw.parts.Version;
1617
import org.apache.hc.core5.net.URIBuilder;
1718

1819
import com.google.gson.Gson;
@@ -494,7 +495,7 @@ public boolean checkLocations(Collection<Long> locationIDs) {
494495
}
495496

496497
/**
497-
* Ask the server for information about what is in locations. you will get a response in the {@link dev.koifysh.archipelago.events.LocationInfoEvent} event.
498+
* Ask the server for information about what is in locations. you will get a response in the {@link LocationInfoEvent} event.
498499
* @param locationIDs List of location ID's to request info on.
499500
*/
500501
public void scoutLocations(ArrayList<Long> locationIDs) {

src/main/java/dev/koifysh/archipelago/ClientStatus.java renamed to src/main/java/io/github/archipelagomw/ClientStatus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.koifysh.archipelago;
1+
package io.github.archipelagomw;
22

33
import com.google.gson.annotations.SerializedName;
44

src/main/java/dev/koifysh/archipelago/EventManager.java renamed to src/main/java/io/github/archipelagomw/EventManager.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package dev.koifysh.archipelago;
1+
package io.github.archipelagomw;
22

3-
import dev.koifysh.archipelago.events.ArchipelagoEventListener;
4-
import dev.koifysh.archipelago.events.Event;
3+
import io.github.archipelagomw.events.ArchipelagoEventListener;
4+
import io.github.archipelagomw.events.Event;
55

66
import java.lang.reflect.InvocationTargetException;
77
import java.lang.reflect.Method;
88
import java.lang.reflect.Modifier;
9-
import java.util.HashMap;
109
import java.util.Map;
1110
import java.util.concurrent.ConcurrentHashMap;
1211

src/main/java/dev/koifysh/archipelago/ItemManager.java renamed to src/main/java/io/github/archipelagomw/ItemManager.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
package dev.koifysh.archipelago;
1+
package io.github.archipelagomw;
22

3-
import dev.koifysh.archipelago.events.ReceiveItemEvent;
4-
import dev.koifysh.archipelago.network.client.SyncPacket;
5-
import dev.koifysh.archipelago.parts.DataPackage;
6-
import dev.koifysh.archipelago.parts.NetworkItem;
3+
import io.github.archipelagomw.events.ReceiveItemEvent;
4+
import io.github.archipelagomw.network.client.SyncPacket;
5+
import io.github.archipelagomw.parts.DataPackage;
6+
import io.github.archipelagomw.parts.NetworkItem;
77

88
import java.util.ArrayList;
99
import java.util.List;
10-
import java.util.concurrent.ConcurrentLinkedDeque;
11-
import java.util.concurrent.ConcurrentLinkedQueue;
12-
import java.util.concurrent.CopyOnWriteArrayList;
1310
import java.util.concurrent.atomic.AtomicInteger;
1411

1512
public class ItemManager {

src/main/java/dev/koifysh/archipelago/LocationManager.java renamed to src/main/java/io/github/archipelagomw/LocationManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package dev.koifysh.archipelago;
1+
package io.github.archipelagomw;
22

3-
import dev.koifysh.archipelago.network.client.LocationChecks;
3+
import io.github.archipelagomw.network.client.LocationChecks;
44

55
import java.util.*;
66
import java.util.concurrent.ConcurrentHashMap;

0 commit comments

Comments
 (0)