Added win and lose messages

emortalmc · Dec 11, 2023 · 9d6e46b · 9d6e46b
1 parent 95ba827
commit 9d6e46b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation("dev.emortal.minestom:game-sdk:7e04cd0")
+    implementation("dev.emortal.minestom:game-sdk:5fdd697")
 
     implementation("dev.hollowcube:polar:1.3.1")
     implementation("com.github.EmortalMC:MinestomPvP:6aefcba403")

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/src/main/java/dev/emortal/minestom/battle/chest/ChestUpdateHandler.java b/src/main/java/dev/emortal/minestom/battle/chest/ChestUpdateHandler.java
@@ -109,10 +109,11 @@ private void playChestCloseSound(@NotNull Point pos) {
 
     private void registerBackgroundTasks() {
         // Chest periodic refill task
-        this.instance.scheduler().buildTask(() -> {
-            if (game.getEnded().get()) return; // Stop refilling chests once game has been won
-            this.refillChests();
-        })
+        this.instance.scheduler()
+                .buildTask(() -> {
+                    if (this.game.hasEnded()) return; // Stop refilling chests once game has been won
+                    this.refillChests();
+                })
                 .delay(CHEST_REFILL_INTERVAL)
                 .repeat(CHEST_REFILL_INTERVAL)
                 .schedule();

diff --git a/src/main/java/dev/emortal/minestom/battle/game/BattleGame.java b/src/main/java/dev/emortal/minestom/battle/game/BattleGame.java
@@ -7,11 +7,13 @@
 import dev.emortal.minestom.gamesdk.MinestomGameServer;
 import dev.emortal.minestom.gamesdk.config.GameCreationInfo;
 import dev.emortal.minestom.gamesdk.game.Game;
+import dev.emortal.minestom.gamesdk.util.GameWinLoseMessages;
 import io.github.bloepiloepi.pvp.config.DamageConfig;
 import io.github.bloepiloepi.pvp.config.PvPConfig;
 import io.github.bloepiloepi.pvp.potion.PotionListener;
 import net.kyori.adventure.sound.Sound;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.title.Title;
 import net.minestom.server.MinecraftServer;
@@ -89,14 +91,14 @@ void beginTimer() {
     }
 
     public void checkPlayerCounts() {
-        Set<Player> alivePlayers = getAlivePlayers();
+        Set<Player> alivePlayers = this.getAlivePlayers();
 
         if (alivePlayers.isEmpty()) {
             this.finish();
             return;
         }
 
-        if (alivePlayers.size() == 1 && !MinestomGameServer.TEST_MODE) {
+        if (alivePlayers.size() == 1) {
             if (this.started.get()) {
                 this.victory(alivePlayers.iterator().next());
             } else {
@@ -119,12 +121,12 @@ public void victory(@Nullable Player winner) {
 
         Title victoryTitle = Title.title(
                 MINI_MESSAGE.deserialize("<gradient:#ffc570:gold><bold>VICTORY!"),
-                Component.empty(),
+                Component.text(GameWinLoseMessages.randomVictory(), NamedTextColor.GRAY),
                 Title.Times.times(Duration.ZERO, Duration.ofSeconds(3), Duration.ofSeconds(3))
         );
         Title defeatTitle = Title.title(
                 MINI_MESSAGE.deserialize("<gradient:#ff474e:#ff0d0d><bold>DEFEAT!"),
-                Component.empty(),
+                Component.text(GameWinLoseMessages.randomDefeat(), NamedTextColor.GRAY),
                 Title.Times.times(Duration.ZERO, Duration.ofSeconds(3), Duration.ofSeconds(3))
         );
 
@@ -185,7 +187,7 @@ public void cleanUp() {
         return Collections.unmodifiableSet(Sets.filter(this.getPlayers(), player -> player.getGameMode() == GameMode.ADVENTURE));
     }
 
-    public AtomicBoolean getEnded() {
-        return ended;
+    public boolean hasEnded() {
+        return this.ended.get();
     }
 }