finalize

KtFTW · Apr 3, 2022 · 0330345 · 0330345
1 parent 617dbc7
commit 0330345
Show file tree

Hide file tree

Showing 5 changed files with 473 additions and 17 deletions.
diff --git a/src/main/kotlin/net/stckoverflw/pluginjam/action/impl/fightphase/FightPhaseWavesAction.kt b/src/main/kotlin/net/stckoverflw/pluginjam/action/impl/fightphase/FightPhaseWavesAction.kt
@@ -40,7 +40,7 @@ class FightPhaseWavesAction : Action(), ListenerHolder {
     private var totalWaves: Int = max(2, min(playersWithoutSpectators.size, 5))
     private var currentWave: Int = 1
     private val bossbar: BossBar = BossBar.bossBar(
-        mini("<green><tr:wave_bossbar:'<red>$currentWave</red>':'<red>$totalWaves</red>'>"),
+        mini("<green>Wave <red>$currentWave</red><gray>/</gray><red>$totalWaves</red>"),
         0f, BossBar.Color.GREEN, BossBar.Overlay.PROGRESS
     )
 
@@ -138,7 +138,7 @@ class FightPhaseWavesAction : Action(), ListenerHolder {
 
     private fun updateBossbar() {
         bossbar.progress((currentWave - 1).toFloat() / totalWaves.toFloat())
-        bossbar.name(mini("<green><tr:wave_bossbar:<red>$currentWave:<red>$totalWaves>"))
+        bossbar.name(mini("<green>Wave <red>$currentWave</red><gray>/</gray><red>$totalWaves</red>"))
     }
 
     private fun giveItems(player: Player) {

diff --git a/src/main/kotlin/net/stckoverflw/pluginjam/gamephase/impl/StartingPhase.kt b/src/main/kotlin/net/stckoverflw/pluginjam/gamephase/impl/StartingPhase.kt
@@ -50,7 +50,7 @@ object StartingPhase : GamePhase(PrisonPhase), ListenerHolder {
                         postionsConfig.getLocation("starting_gamemaster_house_1")
                     )
                     task(period = 5) {
-                        playersWithoutSpectators.forEach { player -> player.sendActionBar(mini("<tr:go_to_house>")) }
+                        playersWithoutSpectators.forEach { player -> player.sendActionBar(mini("<green><tr:go_to_house>")) }
                         if (playersWithoutSpectators.all { player -> area.isInArea(player.location) }) {
 
                             val door0 = postionsConfig.getLocation("starting_door_0").add(0.0, 1.0, 0.0).block

diff --git a/src/main/kotlin/net/stckoverflw/pluginjam/gamephase/impl/TwistPhase.kt b/src/main/kotlin/net/stckoverflw/pluginjam/gamephase/impl/TwistPhase.kt
@@ -105,8 +105,8 @@ object TwistPhase : GamePhase(DestroyPhase), TaskHolder, ListenerHolder {
         addTask(
             task(period = 5) {
                 val message = when (state) {
-                    State.FIND_GAMEMASTER -> "<tr:twist_find_gamemaster>"
-                    State.GET_AMETHYST -> "<tr:twist_steal_amethysts>"
+                    State.FIND_GAMEMASTER -> "<green><tr:twist_find_gamemaster>"
+                    State.GET_AMETHYST -> "<green><tr:twist_steal_amethysts>"
                     else -> null
                 }