Fixes, changes and Refactors

TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt

@@ -20,13 +20,19 @@
 package de.steamwar.tntleague
 
 import de.steamwar.kotlin.message.ComponentMessage
+import de.steamwar.kotlin.message.StyleConfig
+import de.steamwar.kotlin.message.darkGray
+import de.steamwar.kotlin.message.gray
 import de.steamwar.tntleague.command.AcceptCommand
 import de.steamwar.tntleague.command.InviteCommand
 import de.steamwar.tntleague.command.LeaveCommand
 import de.steamwar.tntleague.command.RemoveCommand
 import de.steamwar.tntleague.events.GlobalListener
 import de.steamwar.tntleague.events.LobbyListener
+import de.steamwar.tntleague.game.TNTLeagueTeam
 import net.kyori.adventure.key.Key
+import net.kyori.adventure.text.Component
+import net.kyori.adventure.text.format.NamedTextColor
 import net.kyori.adventure.translation.GlobalTranslator
 import net.kyori.adventure.translation.TranslationRegistry
 import net.kyori.adventure.util.UTF8ResourceBundleControl
@@ -36,9 +42,14 @@ import java.util.*
 lateinit var plugin: TNTLeague
 lateinit var message: ComponentMessage
 
+val tntLeaguePrefix = Component.text("TNT").color(NamedTextColor.DARK_RED)
+    .append(Component.text("League").color(NamedTextColor.GOLD))
+
 class TNTLeague : JavaPlugin() {
     init {
         plugin = this
+
+        StyleConfig.prefix = tntLeaguePrefix
     }
 
     override fun onEnable() {
@@ -58,3 +69,8 @@ class TNTLeague : JavaPlugin() {
         LeaveCommand.register()
     }
 }
+
+fun Component.colorByTeam(team: TNTLeagueTeam?) = when (team) {
+    null -> this.gray()
+    else -> this.color(team.color)
+}

TNTLeague/src/de/steamwar/tntleague/command/InviteCommand.kt

@@ -21,8 +21,9 @@ package de.steamwar.tntleague.command
 
 import de.steamwar.command.SWCommand
 import de.steamwar.command.TypeValidator
+import de.steamwar.kotlin.message.*
+import de.steamwar.tntleague.colorByTeam
 import de.steamwar.tntleague.game.TNTLeagueGame
-import de.steamwar.tntleague.util.*
 import net.kyori.adventure.text.event.ClickEvent
 import net.kyori.adventure.text.event.HoverEvent
 import org.bukkit.entity.Player
@@ -37,7 +38,8 @@ object InviteCommand: SWCommand("invite") {
         val team = TNTLeagueGame.getTeam(sender)!!
         team.invites.add(target)
 
-        target.sendMessage(translate("invited", sender.name.yellow(), translate(team.name).colorByTeam(team)).basic().clickEvent(
+        target.sendMessage(
+            translate("invited", sender.name.yellow(), translate(team.name).colorByTeam(team)).basic().clickEvent(
             ClickEvent.callback {
                 if (target !in team.invites) return@callback
 

TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueWorldConfig.kt

@@ -20,13 +20,12 @@
 package de.steamwar.tntleague.config
 
 import de.steamwar.tntleague.plugin
-import de.steamwar.tntleague.util.Area
-import de.steamwar.tntleague.util.translate
+import de.steamwar.kotlin.util.Area
+import de.steamwar.kotlin.message.translate
 import org.bukkit.Location
 import org.bukkit.Material
 import org.bukkit.configuration.ConfigurationSection
 import org.bukkit.configuration.file.YamlConfiguration
-import org.bukkit.entity.Villager
 import org.bukkit.entity.WanderingTrader
 import java.io.File
 

TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt

@@ -19,12 +19,15 @@
 
 package de.steamwar.tntleague.events
 
+import de.steamwar.kotlin.message.basic
+import de.steamwar.kotlin.message.bold
+import de.steamwar.kotlin.message.translate
+import de.steamwar.tntleague.colorByTeam
 import de.steamwar.tntleague.config.TNTLeagueWorldConfig
 import de.steamwar.tntleague.game.TNTLeagueGame
 import de.steamwar.tntleague.game.TNTLeagueTeam
-import de.steamwar.tntleague.inventory.SWInventoryHolder
+import de.steamwar.kotlin.inventory.SWInventoryHolder
 import de.steamwar.tntleague.plugin
-import de.steamwar.tntleague.util.*
 import org.bukkit.GameMode
 import org.bukkit.Material
 import org.bukkit.event.EventHandler
@@ -85,6 +88,7 @@ object GlobalListener: Listener {
     fun onPlayerDeath(e: PlayerDeathEvent) {
         e.deathMessage(null)
         e.drops.clear()
+        e.keepInventory = true
 
         e.itemsToKeep.removeIf { it.type != Material.DIAMOND_PICKAXE }
     }

TNTLeague/src/de/steamwar/tntleague/events/LobbyListener.kt

@@ -41,8 +41,7 @@ object LobbyListener: Listener {
 
     @EventHandler(priority = EventPriority.LOWEST)
     fun onPlayerQuit(e: PlayerQuitEvent) {
-        val team = TNTLeagueGame.getTeam(e.player) ?: return
-        team.leave(e.player)
+        TNTLeagueGame.getTeam(e.player)?.leave(e.player)
     }
 
     @EventHandler

TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueGame.kt

@@ -19,6 +19,8 @@
 
 package de.steamwar.tntleague.game
 
+import de.steamwar.kotlin.message.*
+import de.steamwar.kotlin.util.Area
 import de.steamwar.scoreboard.SWScoreboard
 import de.steamwar.sql.Fight
 import de.steamwar.sql.FightPlayer
@@ -37,12 +39,9 @@ import net.kyori.adventure.sound.Sound
 import org.bukkit.GameMode
 import org.bukkit.Location
 import org.bukkit.Material
-import org.bukkit.block.data.type.TNT
-import org.bukkit.entity.Entity
 import org.bukkit.entity.Item
 import org.bukkit.entity.Player
 import org.bukkit.entity.TNTPrimed
-import org.bukkit.entity.Villager
 import org.bukkit.event.HandlerList
 import org.bukkit.event.Listener
 import org.bukkit.inventory.ItemStack
@@ -181,7 +180,7 @@ object TNTLeagueGame {
         redTeam.invites.remove(player)
         getTeam(player)?.apply {
             members.remove(player)
-            if (leader == player) {
+            if (leader == player && members.isNotEmpty() && state == GameState.RUNNING) {
                 win(this.opposite, WinReason.LEAVE)
             }
         }

TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueTeam.kt

@@ -19,10 +19,11 @@
 
 package de.steamwar.tntleague.game
 
+import de.steamwar.kotlin.message.*
+import de.steamwar.tntleague.colorByTeam
 import de.steamwar.tntleague.config.TNTLeagueWorldConfig
 import de.steamwar.tntleague.config.targetedBlocks
 import de.steamwar.tntleague.plugin
-import de.steamwar.tntleague.util.*
 import net.kyori.adventure.sound.Sound
 import net.kyori.adventure.text.format.NamedTextColor
 import net.kyori.adventure.text.format.TextColor
@@ -31,7 +32,6 @@ import org.bukkit.Material
 import org.bukkit.enchantments.Enchantment
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
-import java.awt.Color.green
 
 data class TNTLeagueTeam(val config: TNTLeagueWorldConfig.TeamConfig, private val team: Team) {
 
@@ -134,9 +134,7 @@ data class TNTLeagueTeam(val config: TNTLeagueWorldConfig.TeamConfig, private va
     }
 
     fun leave(player: Player) {
-        if (TNTLeagueGame.state == TNTLeagueGame.GameState.RUNNING) {
-            TNTLeagueGame.playerLeave(player)
-        } else {
+        if (TNTLeagueGame.state != TNTLeagueGame.GameState.RUNNING) {
             members.remove(player)
 
             if (members.isEmpty()) {
@@ -146,6 +144,10 @@ data class TNTLeagueTeam(val config: TNTLeagueWorldConfig.TeamConfig, private va
             }
             if (leader == player) {
                 leader = members.firstOrNull()
+
+                if (leader == null && TNTLeagueGame.state == TNTLeagueGame.GameState.LOBBY) {
+                    isReady = false
+                }
             }
         }
     }

TNTLeague/src/de/steamwar/tntleague/inventory/DealerInventory.kt

@@ -19,14 +19,13 @@
 
 package de.steamwar.tntleague.inventory
 
+import de.steamwar.kotlin.inventory.SWInventoryHolder
+import de.steamwar.kotlin.message.*
 import de.steamwar.tntleague.config.TNTLeagueConfig
 import de.steamwar.tntleague.game.TNTLeagueGame
 import de.steamwar.tntleague.plugin
-import de.steamwar.tntleague.util.*
 import net.kyori.adventure.sound.Sound
 import net.kyori.adventure.text.Component
-import net.kyori.adventure.text.format.Style
-import net.kyori.adventure.text.format.TextDecoration
 import org.bukkit.Material
 import org.bukkit.NamespacedKey
 import org.bukkit.entity.Player

TNTLeague/src/de/steamwar/tntleague/inventory/SWInventoryHolder.kt

@@ -1,60 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.tntleague.inventory
-
-import org.bukkit.event.inventory.InventoryClickEvent
-import org.bukkit.event.inventory.InventoryCloseEvent
-import org.bukkit.inventory.Inventory
-import org.bukkit.inventory.InventoryHolder
-import org.bukkit.inventory.ItemStack
-
-abstract class SWInventoryHolder: InventoryHolder {
-
-    val _inventory: Inventory by lazy { createInventory() }
-
-    private val callbacks = mutableMapOf<Int, (event: InventoryClickEvent) -> Unit>()
-
-    override fun getInventory(): Inventory = _inventory
-
-    abstract fun createInventory(): Inventory
-
-    open fun handleInventoryClick(event: InventoryClickEvent) {
-        callbacks[event.slot]?.invoke(event)
-    }
-
-    fun addItem(item: ItemStack, slot: Int, callback: (event: InventoryClickEvent) -> Unit) {
-        _inventory.setItem(slot, item)
-        addCallback(slot, callback)
-    }
-
-    fun addCallback(slot: Int, callback: (event: InventoryClickEvent) -> Unit) {
-        callbacks[slot] = callback
-    }
-
-    open fun handleClose(event: InventoryCloseEvent) { }
-
-    operator fun set(slot: Int, item: Pair<ItemStack, (event: InventoryClickEvent) -> Unit>) {
-        addItem(item.first, slot, item.second)
-    }
-
-    operator fun set(slot: Int, item: ItemStack) {
-        addItem(item, slot) { }
-    }
-}

TNTLeague/src/de/steamwar/tntleague/util/Area.kt

@@ -1,65 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.tntleague.util
-
-import org.bukkit.Location
-import org.bukkit.block.Block
-
-class Area(loc1: Location, loc2: Location) {
-
-    val min: Location
-    val max: Location
-
-    init {
-        require(loc1.world == loc2.world) { "Locations must be in the same world" }
-        this.min = loc1 min loc2
-        this.max = loc1 max loc2
-    }
-
-    operator fun contains(loc: Location): Boolean {
-        return loc.world == min.world && loc.x >= min.x && loc.x <= max.x && loc.y >= min.y && loc.y <= max.y && loc.z >= min.z && loc.z <= max.z
-    }
-
-    val blocks: Sequence<Block>
-        inline get() = sequence {
-            for (x in locations) {
-                yield(x.block)
-            }
-    }
-
-    val locations: Sequence<Location>
-        inline get() = sequence {
-            for (x in min.blockX..max.blockX) {
-                for (y in min.blockY..max.blockY) {
-                    for (z in min.blockZ..max.blockZ) {
-                        yield(Location(min.world, x.toDouble(), y.toDouble(), z.toDouble()))
-                    }
-                }
-            }
-    }
-}
-
-infix fun Location.max(other: Location): Location {
-    return Location(world, x.coerceAtLeast(other.x), y.coerceAtLeast(other.y), z.coerceAtLeast(other.z))
-}
-
-infix fun Location.min(other: Location): Location {
-    return Location(world, x.coerceAtMost(other.x), y.coerceAtMost(other.y), z.coerceAtMost(other.z))
-}

TNTLeague/src/de/steamwar/tntleague/util/Style.kt

@@ -1,92 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.tntleague.util
-
-import de.steamwar.tntleague.game.TNTLeagueTeam
-import net.kyori.adventure.text.Component
-import net.kyori.adventure.text.ComponentLike
-import net.kyori.adventure.text.TranslatableComponent
-import net.kyori.adventure.text.format.NamedTextColor
-import net.kyori.adventure.text.format.Style
-import net.kyori.adventure.text.format.TextDecoration
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
-import net.kyori.adventure.translation.GlobalTranslator
-import org.bukkit.entity.Player
-import java.util.Locale
-
-val prefix = Component.text("Steam").yellow()
-    .append(Component.text("War").darkGray())
-    .appendSpace()
-
-val tntLeaguePrefix = Component.text("TNT").color(NamedTextColor.DARK_RED)
-    .append(Component.text("League").color(NamedTextColor.GOLD))
-
-val tntLeagueChatPrefix: Component = tntLeaguePrefix
-    .append(Component.text("»").darkGray())
-    .appendSpace()
-
-fun TranslatableComponent.basic(): Component = tntLeagueChatPrefix.append(this.gray())
-
-fun TranslatableComponent.error(): Component = tntLeagueChatPrefix.append(this.red())
-
-fun TranslatableComponent.success(): Component = tntLeagueChatPrefix.append(this.green())
-
-fun String.component(): Component = Component.text(this)
-
-fun Component.bold(): Component = this.decorate(TextDecoration.BOLD)
-
-fun String.bold(): Component = this.component().bold()
-
-fun Component.yellow(): Component = this.color(NamedTextColor.YELLOW)
-
-fun String.yellow(): Component = this.component().yellow()
-
-fun Component.red(): Component = this.color(NamedTextColor.RED)
-
-fun String.red(): Component = this.component().red()
-
-fun Component.green(): Component = this.color(NamedTextColor.GREEN)
-
-fun String.green(): Component = this.component().green()
-
-fun Component.gray(): Component = this.color(NamedTextColor.GRAY)
-
-fun String.gray(): Component = this.component().gray()
-
-fun Component.darkGray(): Component = this.color(NamedTextColor.DARK_GRAY)
-
-fun String.darkGray(): Component = this.component().darkGray()
-
-fun Component.gold(): Component = this.color(NamedTextColor.GOLD)
-
-fun translate(key: String, vararg args: ComponentLike): TranslatableComponent = Component.translatable(key, *args).decoration(TextDecoration.ITALIC, false)
-
-fun Component.reset(): Component = this.style(Style.empty())
-
-fun Component.colorByTeam(team: TNTLeagueTeam?) = when (team) {
-    null -> this.gray()
-    else -> this.color(team.color)
-}
-
-fun Component.translate(locale: Locale): Component = GlobalTranslator.render(this, locale)
-
-fun Component.translate(p: Player): Component = this.translate(p.locale())
-
-fun Component.toLegacy(): String = LegacyComponentSerializer.legacySection().serialize(this)

TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt

@@ -19,10 +19,13 @@
 
 package de.steamwar.tntleague.util
 
+import de.steamwar.kotlin.message.*
 import de.steamwar.scoreboard.ScoreboardCallback
+import de.steamwar.tntleague.colorByTeam
 import de.steamwar.tntleague.config.targetedBlocks
 import de.steamwar.tntleague.game.TNTLeagueGame
 import de.steamwar.tntleague.game.TNTLeagueTeam
+import de.steamwar.tntleague.tntLeaguePrefix
 import net.kyori.adventure.text.Component
 import org.bukkit.entity.Player
 import kotlin.collections.HashMap
@@ -43,7 +46,8 @@ data class TNTLeagueScoreboard(val p: Player): ScoreboardCallback {
 
         when (val team = TNTLeagueGame.getTeam(p)) {
             is TNTLeagueTeam -> lines.add(translate("scoreboardCoins", team.coins.toString().yellow()).gray())
-            else -> lines.add(translate("scoreboardCoins",
+            else -> lines.add(
+                translate("scoreboardCoins",
                     Component.text(TNTLeagueGame.blueTeam.coins.toString()).colorByTeam(TNTLeagueGame.blueTeam)
                         .append(Component.text("/").darkGray())
                         .append(Component.text(TNTLeagueGame.redTeam.coins.toString()).colorByTeam(TNTLeagueGame.redTeam))