From 482282f913cceb3011b6e6fd7b258630880d40ef Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sat, 1 Feb 2025 22:00:36 +0100
Subject: [PATCH] Make TNTLeague Event System Capable

---
 .../src/de/steamwar/message/Message.java      |  7 ++---
 .../src/de/steamwar/message/SubMessage.java   | 29 +++++--------------
 .../steamwar/tntleague/TNTLeague.properties   |  1 +
 .../tntleague/config/TNTLeagueConfig.kt       |  8 ++---
 4 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java
index f953ce8d..b9ae84b7 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java
@@ -72,12 +72,9 @@ public class Message {
         pattern += fromRB(resourceBundle, message);
 
         for (int i = 0; i < params.length; i++) {
-            if (params[i] instanceof SubMessage.Translatable) {
-                SubMessage.Translatable smsg = (SubMessage.Translatable) params[i];
+            if (params[i] instanceof SubMessage) {
+                SubMessage smsg = (SubMessage) params[i];
                 params[i] = parse(smsg.getMessage(), sender, smsg.getParams());
-            } else if (params[i] instanceof SubMessage.Literal) {
-                SubMessage.Literal smsg = (SubMessage.Literal) params[i];
-                params[i] = smsg.getMessage();
             }
         }
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/message/SubMessage.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/message/SubMessage.java
index 4c302689..e40b74a5 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/message/SubMessage.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/message/SubMessage.java
@@ -19,33 +19,20 @@
 
 package de.steamwar.message;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
-public abstract class SubMessage {
+public class SubMessage {
     private final String message;
+    private final Object[] params;
 
-    @Getter
-    public static class Translatable extends SubMessage {
-        private final Object[] params;
-
-        public Translatable(String message, Object... params) {
-            super(message);
-            this.params = params;
-        }
-
-        public Translatable(String message) {
-            super(message);
-            this.params = new Object[0];
-        }
+    public SubMessage(String message, Object... params) {
+        this.message = message;
+        this.params = params;
     }
 
-    @Getter
-    public static class Literal extends SubMessage {
-        public Literal(String message) {
-            super(message);
-        }
+    public SubMessage(String message) {
+        this.message = message;
+        this.params = new Object[0];
     }
 }
diff --git a/TNTLeague/src/de/steamwar/tntleague/TNTLeague.properties b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.properties
index 05d998e2..73e3b416 100644
--- a/TNTLeague/src/de/steamwar/tntleague/TNTLeague.properties
+++ b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.properties
@@ -18,6 +18,7 @@
 #
 
 PREFIX=§eTNT§7League§8»
+PLAIN_STRING={0}
 JOIN=§e{0} §7joined the game!
 JOIN_TEAM={0} §7joined the {1} §7team!
 QUIT={0} §7left the game!
diff --git a/TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueConfig.kt b/TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueConfig.kt
index e5bccb08..7b1e865a 100644
--- a/TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueConfig.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueConfig.kt
@@ -60,11 +60,11 @@ data class TNTLeagueConfig(
             eventTeamBlue = Team.get(eventFight.teamBlue)
             eventTeamRed = Team.get(eventFight.teamRed)
 
-            blueTeam = TeamConfig(TNTLeagueWorldConfig.blueTeam, SubMessage.Literal("§${eventTeamBlue.teamColor}${eventTeamBlue.teamName}"), eventTeamBlue.teamColor[0])
-            redTeam = TeamConfig(TNTLeagueWorldConfig.redTeam, SubMessage.Literal("§${eventTeamRed.teamColor}${eventTeamRed.teamName}"), eventTeamRed.teamColor[0])
+            blueTeam = TeamConfig(TNTLeagueWorldConfig.blueTeam, SubMessage("PLAIN_STRING", "§${eventTeamBlue.teamColor}${eventTeamBlue.teamName}"), eventTeamBlue.teamColor[0])
+            redTeam = TeamConfig(TNTLeagueWorldConfig.redTeam, SubMessage("PLAIN_STRING", "§${eventTeamRed.teamColor}${eventTeamRed.teamName}"), eventTeamRed.teamColor[0])
         } else {
-            blueTeam = TeamConfig(TNTLeagueWorldConfig.blueTeam, SubMessage.Translatable("BLUE"), '3')
-            redTeam = TeamConfig(TNTLeagueWorldConfig.redTeam, SubMessage.Translatable("RED"), 'c')
+            blueTeam = TeamConfig(TNTLeagueWorldConfig.blueTeam, SubMessage("BLUE"), '3')
+            redTeam = TeamConfig(TNTLeagueWorldConfig.redTeam, SubMessage("RED"), 'c')
         }
     }