From 220a68c8878309b498c7779a21f94de267c28d4f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2026 11:30:39 +0000 Subject: [PATCH 1/3] fix(deps): update aonyx to v0.7.3 --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 5b8863e..d767bf0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,7 +25,7 @@ dependencyResolutionManagement { versionCatalogs { create("libs") { version("shadow", "9.4.2") - version("aonyx", "0.7.1") + version("aonyx", "0.7.3") version("pvp", "2026.05.30-26.1.1") version("cloudnet", "4.0.0-RC17-SNAPSHOT") From a1d60350c04e6d02a04206c060e3926e93f2c629 Mon Sep 17 00:00:00 2001 From: theEvilReaper Date: Fri, 12 Jun 2026 16:38:27 +0200 Subject: [PATCH 2/3] chore(deps): improve logger dependency --- build.gradle.kts | 3 +-- common/build.gradle.kts | 1 + settings.gradle.kts | 2 ++ setup/build.gradle.kts | 3 +-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2a7ac38..7292c34 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,8 +19,7 @@ dependencies { implementation(libs.minestom) implementation(libs.aves) implementation(libs.bundles.cloudnet) - // https://mvnrepository.com/artifact/org.slf4j/slf4j-api - // implementation("org.slf4j:slf4j-api:2.0.17") + implementation(libs.slf4j.api) implementation(libs.xerus) testImplementation(libs.minestom) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 2681da8..dd575bb 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -5,6 +5,7 @@ plugins { dependencies { implementation(platform(libs.aonyx.bom)) + implementation(libs.slf4j.api) compileOnly(libs.adventure) compileOnly(libs.minestom) compileOnly(libs.aves) diff --git a/settings.gradle.kts b/settings.gradle.kts index d767bf0..8ac799d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -28,9 +28,11 @@ dependencyResolutionManagement { version("aonyx", "0.7.3") version("pvp", "2026.05.30-26.1.1") version("cloudnet", "4.0.0-RC17-SNAPSHOT") + version("slf4j", "2.0.18") library("aonyx.bom", "net.onelitefeather", "aonyx-bom").versionRef("aonyx") + library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j") library("pvp", "io.github.togar2", "MinestomPvP").versionRef("pvp") library("minestom", "net.minestom", "minestom").withoutVersion() library("adventure", "net.kyori", "adventure-text-minimessage").withoutVersion() diff --git a/setup/build.gradle.kts b/setup/build.gradle.kts index 83d5529..28086cc 100644 --- a/setup/build.gradle.kts +++ b/setup/build.gradle.kts @@ -15,8 +15,7 @@ dependencies { implementation(libs.pvp) implementation(libs.minestom) implementation(libs.aves) - // https://mvnrepository.com/artifact/org.slf4j/slf4j-api - implementation("org.slf4j:slf4j-simple:2.0.18") + implementation(libs.slf4j.api) implementation(libs.xerus) implementation(libs.guira) From 8e7f1a90c3c628dc5827ec8047d1112a21740d89 Mon Sep 17 00:00:00 2001 From: theEvilReaper Date: Fri, 12 Jun 2026 16:38:37 +0200 Subject: [PATCH 3/3] chore: migrate code parts --- .../net/theevilreaper/bounce/common/map/GameMap.java | 5 +++-- .../theevilreaper/bounce/common/map/GameMapTest.java | 10 ++++++---- .../bounce/setup/builder/GameMapBuilder.java | 2 +- .../bounce/setup/map/SetupMapProvider.java | 2 +- .../bounce/setup/builder/GameMapBuilderTest.java | 9 ++++----- .../theevilreaper/bounce/map/BounceMapProvider.java | 4 ++-- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/common/src/main/java/net/theevilreaper/bounce/common/map/GameMap.java b/common/src/main/java/net/theevilreaper/bounce/common/map/GameMap.java index 1aed166..c29c612 100644 --- a/common/src/main/java/net/theevilreaper/bounce/common/map/GameMap.java +++ b/common/src/main/java/net/theevilreaper/bounce/common/map/GameMap.java @@ -4,6 +4,8 @@ import net.theevilreaper.aves.map.BaseMap; import net.theevilreaper.bounce.common.push.PushData; +import java.util.List; + /** * The {@link GameMap} contains all relevant information about a map which is used in the context of the game. * It holds data about the used positions and other things. @@ -25,11 +27,10 @@ public final class GameMap extends BaseMap { * @param gameSpawn the spawn position during the game * @param pushData the {@link PushData} which includes information about push values */ - public GameMap(String name, Pos spawn, Pos gameSpawn, PushData pushData, String... builders) { + public GameMap(String name, Pos spawn, Pos gameSpawn, PushData pushData, List builders) { super(name, spawn, builders); this.gameSpawn = gameSpawn; this.pushData = pushData; - } /** diff --git a/common/src/test/java/net/theevilreaper/bounce/common/map/GameMapTest.java b/common/src/test/java/net/theevilreaper/bounce/common/map/GameMapTest.java index cd9ef99..8a34c14 100644 --- a/common/src/test/java/net/theevilreaper/bounce/common/map/GameMapTest.java +++ b/common/src/test/java/net/theevilreaper/bounce/common/map/GameMapTest.java @@ -5,19 +5,21 @@ import net.theevilreaper.bounce.common.push.PushData; import org.junit.jupiter.api.Test; +import java.util.List; + import static org.junit.jupiter.api.Assertions.*; class GameMapTest { @Test void testGameMap() { - GameMap gameMap = new GameMap("Test-Map", Pos.ZERO, new Pos(10, 0, 10), PushData.builder().build()); + GameMap gameMap = new GameMap("Test-Map", Pos.ZERO, new Pos(10, 0, 10), PushData.builder().build(), List.of()); assertNotNull(gameMap); assertInstanceOf(BaseMap.class, gameMap, "The GameMap should be rely on the BaseMap"); - assertEquals("Test-Map", gameMap.getName()); - assertEquals(Pos.ZERO, gameMap.getSpawn()); + assertEquals("Test-Map", gameMap.name()); + assertEquals(Pos.ZERO, gameMap.spawn()); assertEquals(new Pos(10, 0, 10), gameMap.getGameSpawn()); - assertNotEquals(gameMap.getGameSpawn(), gameMap.getSpawn()); + assertNotEquals(gameMap.getGameSpawn(), gameMap.spawn()); assertNotNull(gameMap.getPushData()); assertTrue(gameMap.getPushData().push().isEmpty()); } diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/builder/GameMapBuilder.java b/setup/src/main/java/net/theevilreaper/bounce/setup/builder/GameMapBuilder.java index 9f5bca4..1db68f2 100644 --- a/setup/src/main/java/net/theevilreaper/bounce/setup/builder/GameMapBuilder.java +++ b/setup/src/main/java/net/theevilreaper/bounce/setup/builder/GameMapBuilder.java @@ -76,7 +76,7 @@ public void clearBuilders() { */ @Override public @NotNull GameMap build() { - return new GameMap(this.name, this.spawn, this.gameSpawn, pushDataBuilder.build(), this.builders.toArray(String[]::new)); + return new GameMap(this.name, this.spawn, this.gameSpawn, pushDataBuilder.build(), this.builders); } /** diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/map/SetupMapProvider.java b/setup/src/main/java/net/theevilreaper/bounce/setup/map/SetupMapProvider.java index 0f82c12..3ec15fa 100644 --- a/setup/src/main/java/net/theevilreaper/bounce/setup/map/SetupMapProvider.java +++ b/setup/src/main/java/net/theevilreaper/bounce/setup/map/SetupMapProvider.java @@ -16,7 +16,7 @@ public final class SetupMapProvider extends AbstractMapProvider { public SetupMapProvider(@NotNull FileHandler fileHandler, @NotNull Path path) { super(fileHandler, MapFilters::filterMapsForSetup); - this.mapEntries = loadMapEntries(path.resolve("maps")); + this.loadMapEntries(path.resolve("maps")); Optional fetchedEntry = this.mapEntries.stream() .filter(MapEntry::hasMapFile) diff --git a/setup/src/test/java/net/theevilreaper/bounce/setup/builder/GameMapBuilderTest.java b/setup/src/test/java/net/theevilreaper/bounce/setup/builder/GameMapBuilderTest.java index 570f608..c2ed4e8 100644 --- a/setup/src/test/java/net/theevilreaper/bounce/setup/builder/GameMapBuilderTest.java +++ b/setup/src/test/java/net/theevilreaper/bounce/setup/builder/GameMapBuilderTest.java @@ -31,7 +31,6 @@ void testGameMapBuilderInitialization() { assertAll( "Assert null values", () -> assertNull(gameMapBuilder.getGameSpawn()), - () -> assertNull(gameMapBuilder.getName()), () -> assertNull(gameMapBuilder.getSpawn()) ); @@ -52,16 +51,16 @@ void testGameMapBuilderInitializationWithExistingData() { assertNotNull(gameMap, "GameMap should not be null after initialization"); assertEquals(new Pos(1, 2, 3), gameMap.getGameSpawn(), "Game spawn position should match"); - assertEquals("Test Map", gameMap.getName(), "Game map name should match"); - assertEquals(new Pos(4, 5, 6), gameMap.getSpawn(), "Spawn position should match"); + assertEquals("Test Map", gameMap.name(), "Game map name should match"); + assertEquals(new Pos(4, 5, 6), gameMap.spawn(), "Spawn position should match"); assertEquals(1, gameMap.getPushData().getPush(Block.STONE), "Push value for STONE should be 1"); GameMapBuilder anotherBuilder = new GameMapBuilder(gameMap); assertNotNull(anotherBuilder, "GameMapBuilder should not be null after initialization with existing data"); assertEquals(gameMap.getGameSpawn(), anotherBuilder.getGameSpawn(), "Game spawn position should match"); - assertEquals(gameMap.getName(), anotherBuilder.getName(), "Game map name should match"); - assertEquals(gameMap.getSpawn(), anotherBuilder.getSpawn(), "Spawn position should match"); + assertEquals(gameMap.name(), anotherBuilder.getName(), "Game map name should match"); + assertEquals(gameMap.spawn(), anotherBuilder.getSpawn(), "Spawn position should match"); PushData.Builder anotherPushDataBuilder = anotherBuilder.getPushDataBuilder(); assertNotNull(anotherPushDataBuilder, "PushDataBuilder should not be null after initialization with existing data"); diff --git a/src/main/java/net/theevilreaper/bounce/map/BounceMapProvider.java b/src/main/java/net/theevilreaper/bounce/map/BounceMapProvider.java index f3ba881..77a0acf 100644 --- a/src/main/java/net/theevilreaper/bounce/map/BounceMapProvider.java +++ b/src/main/java/net/theevilreaper/bounce/map/BounceMapProvider.java @@ -18,7 +18,7 @@ public class BounceMapProvider extends AbstractMapProvider { public BounceMapProvider(@NotNull Path path) { super(new GsonFileHandler(GsonUtil.GSON), MapFilters::filterMapsForGame); - this.mapEntries = this.loadMapEntries(path.resolve("maps")); + this.loadMapEntries(path.resolve("maps")); this.activeInstance = MinecraftServer.getInstanceManager().createInstanceContainer(); MapEntry mapEntry = this.getEntries().getFirst(); @@ -48,7 +48,7 @@ public void teleportToGameSpawn(@NotNull Player player) { } public String getMapName() { - return this.activeMap.getName(); + return this.activeMap.name(); } public @NotNull GameMap getActiveMap() {