From b0631e8bd77f4593434bd243bd884a7cdab9b520 Mon Sep 17 00:00:00 2001
From: FireInstall <feuerreiter@greensurvivors.de>
Date: Mon, 10 Jun 2024 14:41:00 +0200
Subject: [PATCH] Get Plugin prefix from lang file

---
 Minigames/pom.xml                                         | 8 ++++----
 .../managers/language/MinigameMessageManager.java         | 5 +++--
 .../managers/language/langkeys/MgMiscLangKey.java         | 1 +
 Minigames/src/main/resources/messages.properties          | 2 ++
 Minigames/src/main/resources/messages_en_AU.properties    | 2 ++
 Minigames/src/main/resources/messages_en_US.properties    | 2 ++
 Minigames/src/main/resources/messages_fr_FR.properties    | 2 ++
 7 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Minigames/pom.xml b/Minigames/pom.xml
index 2858ec228..2cd5cb64b 100644
--- a/Minigames/pom.xml
+++ b/Minigames/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>com.github.seeseemelk</groupId>
             <artifactId>MockBukkit-v1.20</artifactId>
-            <version>3.78.0</version>
+            <version>3.87.0</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -88,13 +88,13 @@
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
-            <version>8.3.0</version>
+            <version>8.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.45.2.0</version>
+            <version>3.46.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -129,7 +129,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.15.1</version>
+            <version>2.16.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/managers/language/MinigameMessageManager.java b/Minigames/src/main/java/au/com/mineauz/minigames/managers/language/MinigameMessageManager.java
index 65d2fb1e3..342b44e27 100644
--- a/Minigames/src/main/java/au/com/mineauz/minigames/managers/language/MinigameMessageManager.java
+++ b/Minigames/src/main/java/au/com/mineauz/minigames/managers/language/MinigameMessageManager.java
@@ -3,6 +3,7 @@
 import au.com.mineauz.minigames.Minigames;
 import au.com.mineauz.minigames.events.MinigamesBroadcastEvent;
 import au.com.mineauz.minigames.managers.language.langkeys.LangKey;
+import au.com.mineauz.minigames.managers.language.langkeys.MgMiscLangKey;
 import au.com.mineauz.minigames.managers.language.langkeys.MinigameLangKey;
 import au.com.mineauz.minigames.minigame.Minigame;
 import au.com.mineauz.minigames.objects.MinigamePlayer;
@@ -349,8 +350,8 @@ public static void sendMessage(@NotNull Audience target, MinigameMessageType typ
         target.sendMessage(init.append(message));
     }
 
-    private static Component getPluginPrefix(MinigameMessageType type) { //todo get from langfile
-        Component init = Component.text("[Minigames] ");
+    private static Component getPluginPrefix(MinigameMessageType type) {
+        Component init = getMessage(BUNDLE_KEY, MgMiscLangKey.PLUGIN_PREFIX).appendSpace();
         return switch (type) {
             case ERROR, TIE -> init.color(NamedTextColor.RED);
             case WARNING -> init.color(NamedTextColor.GOLD);
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/managers/language/langkeys/MgMiscLangKey.java b/Minigames/src/main/java/au/com/mineauz/minigames/managers/language/langkeys/MgMiscLangKey.java
index f1d93d936..32e8636e5 100644
--- a/Minigames/src/main/java/au/com/mineauz/minigames/managers/language/langkeys/MgMiscLangKey.java
+++ b/Minigames/src/main/java/au/com/mineauz/minigames/managers/language/langkeys/MgMiscLangKey.java
@@ -149,6 +149,7 @@ public enum MgMiscLangKey implements MinigameLangKey { //todo this gets rather b
     PLAYER_TEAM_ASSIGN_JOINTEAM("player.team.assign.joinTeam"),
     PLAYER_TEAM_AUTOBALANCE_MINIGAMEMSG("player.team.autobalance.minigameMsg"),
     PLAYER_TEAM_AUTOBALANCE_PLYMSG("player.team.autobalance.plyMsg"),
+    PLUGIN_PREFIX("minigame.prefix"),
     POSITION("position"),
     PRESET_INFO_NOINFO("preset.info.noInfo"),
     PRESET_LOAD_ERROR_NOTFOUND("preset.load.error.notFound"),
diff --git a/Minigames/src/main/resources/messages.properties b/Minigames/src/main/resources/messages.properties
index 21973ab85..0ff95f0f0 100644
--- a/Minigames/src/main/resources/messages.properties
+++ b/Minigames/src/main/resources/messages.properties
@@ -732,6 +732,8 @@ minigame.lateJoin=You will join in <time>...
 minigame.lateJoinWait=Please wait <time> and try again.
 minigame.lives.error.noLives=The Minigame must have more than 0 lives to use this type.
 minigame.lives.livesLeft=Lives left: <number>
+# this will be colored by the message type send
+minigame.prefix=[Minigames]
 minigame.ressourcePack.apply=Custom Server Resource Pack has been sent to your client.
 minigame.ressourcePack.declined=You can't play this minigame without this ressource pack!
 minigame.ressourcePack.empty.name=empty
diff --git a/Minigames/src/main/resources/messages_en_AU.properties b/Minigames/src/main/resources/messages_en_AU.properties
index 66cf545a5..d4a777db4 100644
--- a/Minigames/src/main/resources/messages_en_AU.properties
+++ b/Minigames/src/main/resources/messages_en_AU.properties
@@ -727,6 +727,8 @@ minigame.lateJoin=You will join in <time> seconds...
 minigame.lateJoinWait=Please wait <time> seconds and try again.
 minigame.lives.error.noLives=The Minigame must have more than 0 lives to use this type.
 minigame.lives.livesLeft=Lives left: <number>
+# this will be colored by the message type send
+minigame.prefix=[Minigames]
 minigame.ressourcePack.apply=Custom Server Resource Pack has been sent to your client.
 minigame.ressourcePack.declined=You can't play this minigame without this ressource pack!
 minigame.ressourcePack.empty.name=empty
diff --git a/Minigames/src/main/resources/messages_en_US.properties b/Minigames/src/main/resources/messages_en_US.properties
index 666b703d0..c34ec2f5b 100644
--- a/Minigames/src/main/resources/messages_en_US.properties
+++ b/Minigames/src/main/resources/messages_en_US.properties
@@ -727,6 +727,8 @@ minigame.lateJoin=You will join in <time> seconds...
 minigame.lateJoinWait=Please wait <time> seconds and try again.
 minigame.lives.error.noLives=The Minigame must have more than 0 lives to use this type.
 minigame.lives.livesLeft=Lives left: <number>
+# this will be colored by the message type send
+minigame.prefix=[Minigames]
 minigame.ressourcePack.apply=Custom Server Resource Pack has been sent to your client.
 minigame.ressourcePack.declined=You can't play this minigame without this ressource pack!
 minigame.ressourcePack.empty.name=empty
diff --git a/Minigames/src/main/resources/messages_fr_FR.properties b/Minigames/src/main/resources/messages_fr_FR.properties
index 870ae31c6..6a23b3a8b 100644
--- a/Minigames/src/main/resources/messages_fr_FR.properties
+++ b/Minigames/src/main/resources/messages_fr_FR.properties
@@ -103,6 +103,8 @@ minigame.join.error.notEnoughMoney=Vous n'avez pas assez d'argent pour rejoindre
 minigame.lateJoin=Vous rejoindrez ce mini-jeu dans %s secondse...
 minigame.lateJoinWait=Merci d'attendre %s secondes puis réessayez.
 minigame.lives.livesLeft=Vies restantes : %s
+# this will be colored by the message type send
+minigame.prefix=[Minigames]
 minigame.resourcepack.command.description=Commandes qui permettent de gérer les pack de ressources personnalisé
 minigame.resourcepack.command.remove=Le pack de ressources personnalisé a été supprimé
 minigame.resourcepack.declined=Vous avez refusé le pack de ressources personnalisé nécessaire à ce mini-jeu