lang 19 rework

GreenSurvivors · Feb 12, 2024 · f93f0f1 · f93f0f1
1 parent 9691609
commit f93f0f1
Show file tree

Hide file tree

Showing 158 changed files with 1,254 additions and 921 deletions.
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/Events.java b/Minigames/src/main/java/au/com/mineauz/minigames/Events.java
@@ -46,6 +46,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
+import java.time.Duration;
 import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -276,7 +277,7 @@ public void playerInterract(@NotNull PlayerInteractEvent event) {
                     if ((sign.getLine(1).equalsIgnoreCase(ChatColor.GREEN + "Join") || sign.getLine(1).equalsIgnoreCase(ChatColor.GREEN + "Bet")) && !mgPlayer.isInMinigame()) {
                         Minigame mgm = mdata.getMinigame(sign.getLine(2));
 
-                        if (mgm != null && (!mgm.getUsePermissions() || event.getPlayer().hasPermission("minigame.join." + mgm.getName(false).toLowerCase()))) {
+                        if (mgm != null && (!mgm.getUsePermissions() || event.getPlayer().hasPermission("minigame.join." + mgm.getName().toLowerCase()))) {
                             if (!mgm.isEnabled()) {
                                 MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.INFO, MinigameLangKey.MINIGAME_ERROR_NOTENABLED);
                             } else {
@@ -304,7 +305,8 @@ public void playerInterract(@NotNull PlayerInteractEvent event) {
 
                                 if (mgm.getMinigameTimer() != null) {
                                     MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.NONE, MinigameLangKey.TIME_TIMELEFT,
-                                            Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), MinigameUtils.convertTime(mgm.getMinigameTimer().getTimeLeft())));
+                                            Placeholder.component(MinigamePlaceHolderKey.TIME.getKey(),
+                                                    MinigameUtils.convertTime(Duration.ofSeconds(mgm.getMinigameTimer().getTimeLeft()))));
                                 }
 
                                 if (mgm.isTeamGame()) {
@@ -332,7 +334,7 @@ public void playerInterract(@NotNull PlayerInteractEvent event) {
                                 if (mgm.hasPlayers()) {
                                     players = Component.text(mgm.getPlayers().stream().map(MinigamePlayer::getName).collect(Collectors.joining(", ")));
                                 } else {
-                                    players = MinigameMessageManager.getMgMessage(MinigameLangKey.MINIGAME_INFO_PLAYERS_NONE);
+                                    players = MinigameMessageManager.getMgMessage(MinigameLangKey.QUANTIFIER_NONE);
                                 }
                                 MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.NONE, MinigameLangKey.MINIGAME_INFO_PLAYERS_TITLE,
                                         Placeholder.component(MinigamePlaceHolderKey.PLAYER.getKey(), players));
@@ -342,7 +344,7 @@ public void playerInterract(@NotNull PlayerInteractEvent event) {
                                     Placeholder.component(MinigamePlaceHolderKey.MINIGAME.getKey(), sign.getSide(Side.FRONT).line(2)));
                         } else if (mgm.getUsePermissions()) {
                             MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.ERROR, MinigameLangKey.MINIGAME_ERROR_NOPERMISSION,
-                                    Placeholder.unparsed(MinigamePlaceHolderKey.PERMISSION.getKey(), "minigame.join." + mgm.getName(false).toLowerCase()));
+                                    Placeholder.unparsed(MinigamePlaceHolderKey.PERMISSION.getKey(), "minigame.join." + mgm.getName().toLowerCase()));
                         }
                     }
                 }
@@ -363,18 +365,18 @@ public void playerInterract(@NotNull PlayerInteractEvent event) {
                 if (ChatColor.stripColor(sign.getLine(0)).equalsIgnoreCase("[Minigame]") && ChatColor.stripColor(sign.getLine(1)).equalsIgnoreCase("Join")) {
                     Minigame minigame = mdata.getMinigame(sign.getLine(2));
                     tool.setMinigame(minigame);
-                    MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.INFO, MinigameLangKey.TOOL_SELECTED_MINIGAME,
-                            Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName(true)));
+                    MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.INFO, MinigameLangKey.TOOL_SELECTED_MINIGAME_MSG,
+                            Placeholder.component(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getDisplayName()));
                     event.setCancelled(true);
                 }
             } else {
                 checkTool(tool, mgPlayer);
                 if (tool.getMode() != null && tool.getMinigame() != null) {
                     Minigame mg = tool.getMinigame();
                     if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-                        tool.getMode().onRightClick(mgPlayer, mg, TeamsModule.getMinigameModule(mg).getTeam(tool.getTeam()), event);
+                        tool.getMode().onRightClick(mgPlayer, mg, TeamsModule.getMinigameModule(mg).getTeam(tool.getTeamColor()), event);
                     } else if (event.getAction() == Action.LEFT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_BLOCK) {
-                        tool.getMode().onLeftClick(mgPlayer, mg, TeamsModule.getMinigameModule(mg).getTeam(tool.getTeam()), event);
+                        tool.getMode().onLeftClick(mgPlayer, mg, TeamsModule.getMinigameModule(mg).getTeam(tool.getTeamColor()), event);
                     }
                 }
             }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/MultiplayerTimer.java b/Minigames/src/main/java/au/com/mineauz/minigames/MultiplayerTimer.java
@@ -50,7 +50,7 @@ public MultiplayerTimer(Minigame mg) {
                 startWaitTime = 5;
         }
         oStartWaitTime = startWaitTime;
-        timeMsg.addAll(plugin.getConfig().getIntegerList("multiplayer.timerMessageInterval"));
+        timeMsg.addAll(plugin.getConfig().getLongList("multiplayer.timerMessageInterval"));
     }
 
     public void startTimer() {
@@ -64,22 +64,23 @@ private void doTimer() {
         if (currentLobbyWaitTime != 0 && !paused) {
             if (currentLobbyWaitTime == oLobbyWaitTime) {
 
-                MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_WAITINGFORPLAYERS), MinigameMessageType.INFO);
-                MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_TIME,
-                        Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(currentLobbyWaitTime))), MinigameMessageType.INFO);
+                MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_WAITINGFORPLAYERS,
+                                Placeholder.component(MinigamePlaceHolderKey.TIME.getKey(), MinigameUtils.convertTime(Duration.ofSeconds(currentLobbyWaitTime)))),
+                        MinigameMessageType.INFO);
                 allowInteraction(LobbySettingsModule.getMinigameModule(minigame).canInteractPlayerWait());
                 freezePlayers(!LobbySettingsModule.getMinigameModule(minigame).canMovePlayerWait());
                 minigame.setState(MinigameState.WAITING);
             } else if (timeMsg.contains(currentLobbyWaitTime)) {
-                MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_TIME,
-                        Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(currentLobbyWaitTime))), MinigameMessageType.INFO);
+                MinigameMessageManager.sendMinigameMessage(minigame, MinigameUtils.convertTime(Duration.ofSeconds(currentLobbyWaitTime)),
+                        MinigameMessageType.INFO);
                 PlayMGSound.playSound(minigame, MGSounds.TIMER_TICK.getSound());
             }
         } else if (currentLobbyWaitTime == 0 && startWaitTime != 0 && !paused) {
             //wait time done game will start.
             if (startWaitTime == oStartWaitTime) {
                 minigame.setState(MinigameState.STARTING);
-                MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_MINIGAMESTARTS), MinigameMessageType.INFO);
+                MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_MINIGAMESTARTS),
+                        MinigameMessageType.INFO);
 
                 freezePlayers(!LobbySettingsModule.getMinigameModule(minigame).canMoveStartWait());
                 allowInteraction(LobbySettingsModule.getMinigameModule(minigame).canInteractStartWait());
@@ -94,13 +95,14 @@ private void doTimer() {
                     }
                 }
             } else if (timeMsg.contains(startWaitTime)) {
-                MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_TIME,
-                        Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(startWaitTime))), MinigameMessageType.INFO);
+                MinigameMessageManager.sendMinigameMessage(minigame, MinigameUtils.convertTime(Duration.ofSeconds(startWaitTime)),
+                        MinigameMessageType.INFO);
                 PlayMGSound.playSound(minigame, MGSounds.TIMER_TICK.getSound());
             }
         } else if (currentLobbyWaitTime == 0 && startWaitTime == 0) {
-            //game should start..
-            MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_GO), MinigameMessageType.INFO);
+            //game should start...
+            MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_GO),
+                    MinigameMessageType.INFO);
             reclearInventories(minigame);
             if (!LobbySettingsModule.getMinigameModule(minigame).isTeleportOnPlayerWait()) {
                 playerManager.balanceGame(minigame);
@@ -115,7 +117,7 @@ private void doTimer() {
             } else {
                 playerManager.startMPMinigame(minigame);
                 if (!minigame.isPlayersAtStart()) {
-                    Minigames.getCmpnntLogger().info("Minigame started and Players not teleported check configs:" + minigame.getName(false));
+                    Minigames.getCmpnntLogger().info("Minigame started and Players not teleported check configs:" + minigame.getName());
                 }
             }
             freezePlayers(false);
@@ -166,7 +168,7 @@ public long getPlayerWaitTimeLeft() {
         return currentLobbyWaitTime;
     }
 
-    public int getStartWaitTimeLeft() {
+    public long getStartWaitTimeLeft() {
         return startWaitTime;
     }
 

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLBackend.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLBackend.java
@@ -10,7 +10,9 @@
 import au.com.mineauz.minigames.objects.MinigamePlayer;
 import au.com.mineauz.minigames.stats.*;
 import com.google.common.collect.Maps;
+import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.configuration.ConfigurationSection;
 
 import java.sql.ResultSet;
@@ -177,7 +179,7 @@ public long getStat(Minigame minigame, UUID playerId, MinigameStat stat, StatVal
 
     public int getMinigameId(ConnectionHandler handler, Minigame minigame) throws SQLException {
 
-        try (ResultSet rs = handler.executeUpdateWithResults(insertMinigame, minigame.getName(false))) {
+        try (ResultSet rs = handler.executeUpdateWithResults(insertMinigame, minigame.getName())) {
             if (rs.next()) {
                 return rs.getInt(1);
             } else {
@@ -205,7 +207,7 @@ public Map<MinigameStat, StatSettings> loadStatSettings(Minigame minigame) {
                 while (rs.next()) {
                     String statName = rs.getString("stat");
                     String rawFormat = rs.getString("format");
-                    String displayName = rs.getString("display_name");
+                    Component displayName = MiniMessage.miniMessage().deserialize(rs.getString("display_name"));
 
                     MinigameStat stat = MinigameStats.getStat(statName);
                     if (stat == null) {
@@ -251,7 +253,9 @@ public void saveStatSettings(Minigame minigame, Collection<StatSettings> setting
 
             int minigameId = getMinigameId(handler, minigame);
             for (StatSettings setting : settings) {
-                handler.batchUpdate(saveStatSettings, minigameId, setting.getStat().getName(), setting.getDisplayName(), setting.getFormat().name().toUpperCase());
+                handler.batchUpdate(saveStatSettings, minigameId, setting.getStat().getName(),
+                        MiniMessage.miniMessage().serialize(setting.getDisplayName()),
+                        setting.getFormat().name().toUpperCase());
             }
 
             handler.executeBatch(saveStatSettings);

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLStatLoader.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLStatLoader.java
@@ -36,7 +36,7 @@ public MySQLStatLoader(MySQLBackend backend, ComponentLogger logger) {
     }
 
     public List<StoredStat> loadStatValues(Minigame minigame, MinigameStat stat, StatValueField field, ScoreboardOrder order, int offset, int length) {
-        MinigameMessageManager.debugMessage("MySQL beginning stat load for " + minigame.getName(false) + ", " + stat + ", " + field);
+        MinigameMessageManager.debugMessage("MySQL beginning stat load for " + minigame.getName() + ", " + stat + ", " + field);
         ConnectionHandler handler = null;
         try {
             handler = backend.getPool().getConnection();
@@ -50,7 +50,7 @@ public List<StoredStat> loadStatValues(Minigame minigame, MinigameStat stat, Sta
             if (handler != null) {
                 handler.release();
             }
-            MinigameMessageManager.debugMessage("MySQL completed stat load for " + minigame.getName(false));
+            MinigameMessageManager.debugMessage("MySQL completed stat load for " + minigame.getName());
         }
     }
 
@@ -71,7 +71,7 @@ public long loadSingleValue(Minigame minigame, MinigameStat stat, StatValueField
                 }
             }
         } catch (SQLException e) {
-            logger.error("Failed to load stat for " + minigame.getName(false) + " " + playerId, e);
+            logger.error("Failed to load stat for " + minigame.getName() + " " + playerId, e);
             return 0;
         } finally {
             if (handler != null) {

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteBackend.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteBackend.java
@@ -10,7 +10,9 @@
 import au.com.mineauz.minigames.objects.MinigamePlayer;
 import au.com.mineauz.minigames.stats.*;
 import com.google.common.collect.Maps;
+import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.configuration.ConfigurationSection;
 
 import java.io.File;
@@ -208,7 +210,7 @@ public long getStat(Minigame minigame, UUID playerId, MinigameStat stat, StatVal
     }
 
     public int getMinigameId(ConnectionHandler handler, Minigame minigame) throws SQLException {
-        ResultSet rs = handler.executeQuery(getMinigameId, minigame.getName(false));
+        ResultSet rs = handler.executeQuery(getMinigameId, minigame.getName());
         try {
             if (rs.next()) {
                 return rs.getInt("minigame_id");
@@ -217,7 +219,7 @@ public int getMinigameId(ConnectionHandler handler, Minigame minigame) throws SQ
             rs.close();
         }
 
-        rs = handler.executeUpdateWithResults(insertMinigame, minigame.getName(false));
+        rs = handler.executeUpdateWithResults(insertMinigame, minigame.getName());
         try {
             if (rs.next()) {
                 return rs.getInt(1);
@@ -247,7 +249,7 @@ public Map<MinigameStat, StatSettings> loadStatSettings(Minigame minigame) {
                 while (rs.next()) {
                     String statName = rs.getString("stat");
                     String rawFormat = rs.getString("format");
-                    String displayName = rs.getString("display_name");
+                    Component displayName = MiniMessage.miniMessage().deserialize(rs.getString("display_name"));
 
                     MinigameStat stat = MinigameStats.getStat(statName);
                     if (stat == null) {
@@ -293,7 +295,9 @@ public void saveStatSettings(Minigame minigame, Collection<StatSettings> setting
 
             int minigameId = getMinigameId(handler, minigame);
             for (StatSettings setting : settings) {
-                handler.batchUpdate(saveStatSettings, minigameId, setting.getStat().getName(), setting.getDisplayName(), setting.getFormat().name().toUpperCase());
+                handler.batchUpdate(saveStatSettings, minigameId, setting.getStat().getName(),
+                        MiniMessage.miniMessage().serialize(setting.getDisplayName()),
+                        setting.getFormat().name().toUpperCase());
             }
 
             handler.executeBatch(saveStatSettings);

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteStatLoader.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteStatLoader.java
@@ -36,7 +36,7 @@ public SQLiteStatLoader(SQLiteBackend backend, ComponentLogger logger) {
     }
 
     public List<StoredStat> loadStatValues(Minigame minigame, MinigameStat stat, StatValueField field, ScoreboardOrder order, int offset, int length) {
-        MinigameMessageManager.debugMessage("SQLite beginning stat load for " + minigame.getName(false) + ", " + stat + ", " + field);
+        MinigameMessageManager.debugMessage("SQLite beginning stat load for " + minigame.getName() + ", " + stat + ", " + field);
         ConnectionHandler handler = null;
         try {
             handler = backend.getPool().getConnection();
@@ -50,7 +50,7 @@ public List<StoredStat> loadStatValues(Minigame minigame, MinigameStat stat, Sta
             if (handler != null) {
                 handler.release();
             }
-            MinigameMessageManager.debugMessage("SQLite completed stat load for " + minigame.getName(false));
+            MinigameMessageManager.debugMessage("SQLite completed stat load for " + minigame.getName());
         }
     }
 
@@ -71,7 +71,7 @@ public long loadSingleValue(Minigame minigame, MinigameStat stat, StatValueField
                 }
             }
         } catch (SQLException e) {
-            logger.error("Failed to load stat for " + minigame.getName(false) + " " + playerId, e);
+            logger.error("Failed to load stat for " + minigame.getName() + " " + playerId, e);
             return 0;
         } finally {
             if (handler != null) {

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/test/TestBackEnd.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/test/TestBackEnd.java
@@ -64,7 +64,7 @@ public void saveGameStatus(StoredGameStats stats) {
     public List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatValueField field, ScoreboardOrder order) {
         List<StoredStat> result = new ArrayList<>();
         for (StoredGameStats store : playerGameStats) {
-            if (store.hasStat(stat) && store.getMinigame().getName(false).equals(minigame.getName(false))) {
+            if (store.hasStat(stat) && store.getMinigame().getName().equals(minigame.getName())) {
                 result.add(new StoredStat(store.getPlayer().getUUID(), store.getPlayer().getName(), store.getPlayer().getDisplayName(true), store.getStat(stat)));
             }
         }