diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 011718d..b0dc261 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -4,6 +4,7 @@ plugins { dependencies { implementation(platform(libs.aonyx.bom)) + implementation(libs.slf4j.api) compileOnly(libs.adventure) compileOnly(libs.minestom) compileOnly(libs.aves) diff --git a/common/src/main/java/net/onelitefeather/cygnus/common/map/GameMap.java b/common/src/main/java/net/onelitefeather/cygnus/common/map/GameMap.java index e4c1657..02cf5b6 100644 --- a/common/src/main/java/net/onelitefeather/cygnus/common/map/GameMap.java +++ b/common/src/main/java/net/onelitefeather/cygnus/common/map/GameMap.java @@ -4,6 +4,7 @@ import net.minestom.server.coordinate.Pos; import net.onelitefeather.cygnus.common.page.PageResource; +import java.util.List; import java.util.Set; /** @@ -30,7 +31,7 @@ public final class GameMap extends BaseMap { * @param survivorSpawns the spawn positions for the survivors * @param builders the builders for the map */ - public GameMap(String name, Pos spawn, Pos slenderSpawn, Set pageFaces, Set survivorSpawns, String... builders) { + public GameMap(String name, Pos spawn, Pos slenderSpawn, Set pageFaces, Set survivorSpawns, List builders) { super(name, spawn, builders); this.slenderSpawn = slenderSpawn; this.pageFaces = pageFaces; diff --git a/common/src/main/java/net/onelitefeather/cygnus/common/map/GameMapBuilder.java b/common/src/main/java/net/onelitefeather/cygnus/common/map/GameMapBuilder.java index eea8ce4..baf1fda 100644 --- a/common/src/main/java/net/onelitefeather/cygnus/common/map/GameMapBuilder.java +++ b/common/src/main/java/net/onelitefeather/cygnus/common/map/GameMapBuilder.java @@ -77,7 +77,7 @@ public void setSlenderSpawn(@Nullable Pos slenderSpawn) { */ @Override public GameMap build() { - return new GameMap(name, spawn, slenderSpawn, pageFaces, survivorSpawns, builders.toArray(new String[0])); + return new GameMap(name, spawn, slenderSpawn, pageFaces, survivorSpawns, builders); } /** diff --git a/common/src/test/java/net/onelitefeather/cygnus/common/map/GameMapTest.java b/common/src/test/java/net/onelitefeather/cygnus/common/map/GameMapTest.java index 2ffa203..badb7dc 100644 --- a/common/src/test/java/net/onelitefeather/cygnus/common/map/GameMapTest.java +++ b/common/src/test/java/net/onelitefeather/cygnus/common/map/GameMapTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import java.util.List; import java.util.Set; import static org.junit.jupiter.api.Assertions.assertArrayEquals; @@ -25,15 +26,15 @@ void testMapCreationWithGivenData() { Pos slenderPos = new Pos(1, 1, 1); Set pages = Set.of(); Set survivorPos = Set.of(new Pos(2, 2, 2), new Pos(3, 3, 3)); - GameMap gameMap = new GameMap(name, spawnPos, slenderPos, pages, survivorPos, "Test"); + GameMap gameMap = new GameMap(name, spawnPos, slenderPos, pages, survivorPos, List.of("Test")); assertNotNull(gameMap); - assertEquals(name, gameMap.getName()); - assertEquals(spawnPos, gameMap.getSpawn()); + assertEquals(name, gameMap.name()); + assertEquals(spawnPos, gameMap.spawn()); assertEquals(slenderPos, gameMap.getSlenderSpawn()); assertTrue(gameMap.getPageFaces().isEmpty()); assertEquals(survivorPos, gameMap.getSurvivorSpawns()); - assertArrayEquals(new String[]{"Test"}, gameMap.getBuilders()); + assertEquals(List.of("Test"), gameMap.builders()); } @Test diff --git a/game/build.gradle.kts b/game/build.gradle.kts index 2ea55b3..12e38e6 100644 --- a/game/build.gradle.kts +++ b/game/build.gradle.kts @@ -11,6 +11,7 @@ application { dependencies { implementation(platform(libs.aonyx.bom)) implementation(project(":common")) + implementation(libs.slf4j.api) implementation(libs.minestom) implementation(libs.aves) implementation(libs.xerus) diff --git a/game/src/main/java/net/onelitefeather/cygnus/map/GameMapProvider.java b/game/src/main/java/net/onelitefeather/cygnus/map/GameMapProvider.java index 2e06d4a..7f9de47 100644 --- a/game/src/main/java/net/onelitefeather/cygnus/map/GameMapProvider.java +++ b/game/src/main/java/net/onelitefeather/cygnus/map/GameMapProvider.java @@ -21,7 +21,7 @@ public final class GameMapProvider extends AbstractMapProvider { public GameMapProvider(Path path) { super(GsonHelper.FILE_HANDLER, MapFilters::filterMapsForGame); - this.mapEntries = this.loadMapEntries(path.resolve("maps")); + this.loadMapEntries(path.resolve("maps")); if (this.mapEntries.isEmpty()) { throw new IllegalStateException("No maps found in the given path"); diff --git a/game/src/test/java/net/onelitefeather/cygnus/utils/TeamHelperTest.java b/game/src/test/java/net/onelitefeather/cygnus/utils/TeamHelperTest.java index 8f6415e..416598a 100644 --- a/game/src/test/java/net/onelitefeather/cygnus/utils/TeamHelperTest.java +++ b/game/src/test/java/net/onelitefeather/cygnus/utils/TeamHelperTest.java @@ -29,6 +29,7 @@ import java.nio.file.Paths; import java.util.HashSet; +import java.util.List; import java.util.Set; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -112,7 +113,7 @@ void testSlenderTeleport(@NotNull Env env) { }; teamCreator.createTeams(gameConfig, teamService, ambientProvider); Pos slenderSpawn = new Pos(10, 10, 10); - GameMap gameMap = new GameMap("Test", Pos.ZERO, slenderSpawn, Set.of(), Set.of(), ""); + GameMap gameMap = new GameMap("Test", Pos.ZERO, slenderSpawn, Set.of(), Set.of(), List.of()); assertNotNull(gameMap); assertEquals(slenderSpawn, gameMap.getSlenderSpawn()); diff --git a/settings.gradle.kts b/settings.gradle.kts index 549dbd6..68593fe 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,11 +25,14 @@ dependencyResolutionManagement { create("libs") { version("shadow", "9.4.2") version("cloudnet", "4.0.0-RC16") - version("aonyx", "0.7.1") + version("aonyx", "0.7.3") version("cyclonedx", "3.2.4") version("pica", "0.0.3") + version("slf4j", "2.0.18") library("aonyx.bom", "net.onelitefeather", "aonyx-bom").versionRef("aonyx") + library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j") + library("minestom", "net.minestom", "minestom").withoutVersion() library("adventure", "net.kyori", "adventure-text-minimessage").withoutVersion() library("cyano", "net.onelitefeather", "cyano").withoutVersion() diff --git a/setup/build.gradle.kts b/setup/build.gradle.kts index b3dd5b0..e19edd5 100644 --- a/setup/build.gradle.kts +++ b/setup/build.gradle.kts @@ -13,6 +13,7 @@ application { dependencies { implementation(platform(libs.aonyx.bom)) implementation(project(":common")) + implementation(libs.slf4j.api) implementation(libs.minestom) implementation(libs.aves) implementation(libs.xerus) diff --git a/setup/src/main/java/net/onelitefeather/cygnus/setup/map/SetupMapProvider.java b/setup/src/main/java/net/onelitefeather/cygnus/setup/map/SetupMapProvider.java index e752a7d..413294f 100644 --- a/setup/src/main/java/net/onelitefeather/cygnus/setup/map/SetupMapProvider.java +++ b/setup/src/main/java/net/onelitefeather/cygnus/setup/map/SetupMapProvider.java @@ -15,7 +15,7 @@ public final class SetupMapProvider extends AbstractMapProvider { public SetupMapProvider(Path path) { super(GsonHelper.FILE_HANDLER, MapFilters::filterMapsForSetup); - this.mapEntries = loadMapEntries(path.resolve("maps")); + this.loadMapEntries(path.resolve("maps")); Optional lobbyOptional = this.mapEntries.stream().filter(MapEntry::hasMapFile) .filter(mapEntry -> mapEntry.getDirectoryRoot().equals("lobby"))