From 27bd7be776605d4e88e52e724bab481cfb957f9c Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Thu, 14 Nov 2024 22:55:03 +0100
Subject: [PATCH] Fix Translations

---
 TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt    | 13 +++----------
 .../de/steamwar/tntleague/events/GlobalListener.kt  |  8 --------
 TNTLeague/src/paper-plugin.yml                      | 11 +++++++----
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
index 9e6e8a34..cf4de2e3 100644
--- a/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
@@ -1,5 +1,6 @@
 package de.steamwar.tntleague
 
+import de.steamwar.kotlin.message.ComponentMessage
 import de.steamwar.tntleague.command.AcceptCommand
 import de.steamwar.tntleague.command.InviteCommand
 import de.steamwar.tntleague.command.LeaveCommand
@@ -14,6 +15,7 @@ import org.bukkit.plugin.java.JavaPlugin
 import java.util.*
 
 lateinit var plugin: TNTLeague
+lateinit var message: ComponentMessage
 
 class TNTLeague : JavaPlugin() {
     init {
@@ -24,16 +26,7 @@ class TNTLeague : JavaPlugin() {
         saveResource("config.yml", false)
         saveDefaultConfig()
 
-        val registry = TranslationRegistry.create(Key.key("steamwar:tntleague"))
-
-        val bundleDe = ResourceBundle.getBundle("de.steamwar.tntleague.TNTLeague", Locale.GERMAN, UTF8ResourceBundleControl())
-        val bundleEn = ResourceBundle.getBundle("de.steamwar.tntleague.TNTLeague", Locale.US, UTF8ResourceBundleControl())
-        registry.defaultLocale(Locale.GERMAN)
-
-        registry.registerAll(Locale.GERMAN, bundleDe, true)
-        registry.registerAll(Locale.US, bundleEn, true)
-
-        GlobalTranslator.translator().addSource(registry)
+        message = ComponentMessage("de.steamwar.tntleague.TNTLeague", classLoader)
 
         server.pluginManager.registerEvents(LobbyListener, this)
         server.pluginManager.registerEvents(GlobalListener, this)
diff --git a/TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt b/TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt
index f2930adb..a2a8fc9f 100644
--- a/TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt
@@ -6,7 +6,6 @@ import de.steamwar.tntleague.game.TNTLeagueTeam
 import de.steamwar.tntleague.inventory.SWInventoryHolder
 import de.steamwar.tntleague.plugin
 import de.steamwar.tntleague.util.*
-import io.papermc.paper.event.player.AsyncChatEvent
 import org.bukkit.GameMode
 import org.bukkit.Material
 import org.bukkit.event.EventHandler
@@ -78,11 +77,4 @@ object GlobalListener: Listener {
             null -> e.respawnLocation = TNTLeagueWorldConfig.lobby
         }
     }
-
-    @EventHandler
-    fun onChat(e: AsyncChatEvent) {
-        e.renderer { source, sourceDisplayName, message, _ ->
-            translate("chat", sourceDisplayName.colorByTeam(TNTLeagueGame.getTeam(source)), message).basic()
-        }
-    }
 }
\ No newline at end of file
diff --git a/TNTLeague/src/paper-plugin.yml b/TNTLeague/src/paper-plugin.yml
index 8687424a..4e740ea9 100644
--- a/TNTLeague/src/paper-plugin.yml
+++ b/TNTLeague/src/paper-plugin.yml
@@ -4,7 +4,10 @@ main: de.steamwar.tntleague.TNTLeague
 load: POSTWORLD
 api-version: '1.21'
 dependencies:
-  - name: SpigotCore
-    required: true
-  - name: KotlinCore
-    required: true
\ No newline at end of file
+  server:
+    SpigotCore:
+      required: true
+      load: BEFORE
+    KotlinCore:
+      required: true
+      load: BEFORE
\ No newline at end of file