fix tribe confirm messages

Up-Mods · Jan 3, 2024 · f19a89b · f19a89b
1 parent e52d1a7
commit f19a89b
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 22 deletions.
diff --git a/src/main/java/io/github/lukegrahamlandry/tribes/commands/DeityCommands.java b/src/main/java/io/github/lukegrahamlandry/tribes/commands/DeityCommands.java
@@ -65,7 +65,7 @@ private static int handleChoose(CommandContext<CommandSourceStack> source) throw
             long hoursToWait = Instant.now().until(lastChange.plus(TribesConfig.daysBetweenDeityChanges(), ChronoUnit.DAYS), ChronoUnit.HOURS);
             source.getSource().sendFailure(TribeError.WAIT_HOURS.getTextWithArgs(hoursToWait));
         } else {
-            player.sendMessage(TribeSuccessType.MUST_CONFIRM.getBlueText(), Util.NIL_UUID);
+            player.sendMessage(TribeSuccessType.MUST_CONFIRM_DEITY.getBlueText(), Util.NIL_UUID);
             ConfirmCommand.add(player, () -> {
                 tribe.setDeityInfo(new DeityInfo(deity.key, Instant.now()));
                 source.getSource().sendSuccess(TribeSuccessType.CHOOSE_DEITY.getText(deity.displayName), true);

diff --git a/src/main/java/io/github/lukegrahamlandry/tribes/commands/HemiAccessCommand.java b/src/main/java/io/github/lukegrahamlandry/tribes/commands/HemiAccessCommand.java
@@ -46,7 +46,7 @@ public static int handleSelect(CommandContext<CommandSourceStack> ctx) throws Co
             return 0;
         }
 
-        player.sendMessage(TribeSuccessType.MUST_CONFIRM.getBlueText(), Util.NIL_UUID);
+        player.sendMessage(TribeSuccessType.MUST_CONFIRM_HEMISPHERE.getBlueText(side), Util.NIL_UUID);
         ConfirmCommand.add(player, () -> {
             if (tribe.selectHemisphere(player, result.value()).success()) {
                 TribeHelper.broadcastMessage(tribe, TribeSuccessType.CHOOSE_HEMISPHERE, player, ctx.getSource().getServer(), side);

diff --git a/src/main/java/io/github/lukegrahamlandry/tribes/commands/LeaveTribeCommand.java b/src/main/java/io/github/lukegrahamlandry/tribes/commands/LeaveTribeCommand.java
@@ -25,7 +25,7 @@ public static int handleLeave(CommandContext<CommandSourceStack> source) throws
 
         Tribe tribe = TribesManager.getTribeOf(player.getUUID());
         if (tribe != null) {
-            player.sendMessage(TribeSuccessType.MUST_CONFIRM.getBlueText(), Util.NIL_UUID);
+            player.sendMessage(TribeSuccessType.MUST_CONFIRM_LEAVE.getBlueText(), Util.NIL_UUID);
             ConfirmCommand.add(player, () -> {
                 TribesManager.leaveTribe(player);
                 source.getSource().sendSuccess(TribeSuccessType.YOU_LEFT.getText(), true);

diff --git a/src/main/java/io/github/lukegrahamlandry/tribes/commands/PromotePlayerCommand.java b/src/main/java/io/github/lukegrahamlandry/tribes/commands/PromotePlayerCommand.java
@@ -47,7 +47,7 @@ public static int handle(CommandContext<CommandSourceStack> context) throws Comm
 
             playerRunning.sendMessage(new TextComponent("make " + OfflinePlayerArgumentType.getPlayerName(playerTarget) + " the leader of your tribe?"), Util.NIL_UUID);
 
-            playerRunning.sendMessage(TribeSuccessType.MUST_CONFIRM.getBlueText(), Util.NIL_UUID);
+            playerRunning.sendMessage(TribeSuccessType.MUST_CONFIRM_GENERIC.getBlueText(), Util.NIL_UUID);
             ConfirmCommand.add(playerRunning, () -> {
                 var result = tribe.promotePlayer(playerRunning.getUUID(), playerTarget);
 

diff --git a/src/main/java/io/github/lukegrahamlandry/tribes/network/PacketLeaveTribe.java b/src/main/java/io/github/lukegrahamlandry/tribes/network/PacketLeaveTribe.java
@@ -30,7 +30,7 @@ public void handle(Supplier<NetworkEvent.Context> ctx) {
         ctx.get().enqueueWork(() -> {
             Tribe tribe = TribesManager.getTribeOf(player.getUUID());
             if (tribe != null) {
-                player.sendMessage(TribeSuccessType.MUST_CONFIRM.getBlueText(), Util.NIL_UUID);
+                player.sendMessage(TribeSuccessType.MUST_CONFIRM_LEAVE.getBlueText(), Util.NIL_UUID);
                 ConfirmCommand.add(player, () -> {
                     TribesManager.leaveTribe(player);
                     player.sendMessage(TribeSuccessType.YOU_LEFT.getText(), Util.NIL_UUID);

diff --git a/src/main/java/io/github/lukegrahamlandry/tribes/tribe_data/TribeSuccessType.java b/src/main/java/io/github/lukegrahamlandry/tribes/tribe_data/TribeSuccessType.java
@@ -1,11 +1,9 @@
 package io.github.lukegrahamlandry.tribes.tribe_data;
 
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.network.chat.*;
+import net.minecraft.world.entity.player.Player;
 
+import java.util.Locale;
 import java.util.UUID;
 
 public enum TribeSuccessType {
@@ -33,7 +31,10 @@ public enum TribeSuccessType {
     SET_INITIALS,
     WHICH_TRIBE,
     WHICH_NO_TRIBE,
-    MUST_CONFIRM,
+    MUST_CONFIRM_GENERIC,
+    MUST_CONFIRM_DEITY,
+    MUST_CONFIRM_HEMISPHERE,
+    MUST_CONFIRM_LEAVE,
     AUTOBAN_NUMBERS,
     YES_AUTOBAN_RANK,
     NO_AUTOBAN_RANK,
@@ -51,37 +52,37 @@ public enum TribeSuccessType {
     ALERT_VICE_LEADER,
     ALERT_JOIN;
 
-    public TranslatableComponent getText(){
-        String langEntry = "success.tribes." + this.name().toLowerCase();
+    public TranslatableComponent getText() {
+        String langEntry = "success.tribes." + this.name().toLowerCase(Locale.ROOT);
         TranslatableComponent text = new TranslatableComponent(langEntry);
         Style style = text.getStyle().withColor(TextColor.fromRgb(0x00FF00));
         text.setStyle(style);
         return text;
     }
 
-    public TranslatableComponent getText(Object... args){
+    public TranslatableComponent getText(Object... args) {
         // convert a passed in tribe to its name string so it can be formated in the lang
-        for (int i=0;i<args.length;i++){
-            if (args[i] instanceof Tribe){
+        for (int i = 0; i < args.length; i++) {
+            if (args[i] instanceof Tribe) {
                 args[i] = (Object) ((Tribe) args[i]).getName();
             }
-            if (args[i] instanceof Player){
+            if (args[i] instanceof Player) {
                 args[i] = ((Player) args[i]).getName().getContents();
             }
         }
 
-        String langEntry = "success.tribes." + this.name().toLowerCase();
+        String langEntry = "success.tribes." + this.name().toLowerCase(Locale.ROOT);
         TranslatableComponent text = new TranslatableComponent(langEntry, args);
         Style style = text.getStyle().withColor(TextColor.fromRgb(0x00FF00));
         text.setStyle(style);
         return text;
     }
 
     // blue
-    public Component getTextPrefixPlayer(UUID causingPlayer, Object... args){
+    public Component getTextPrefixPlayer(UUID causingPlayer, Object... args) {
         // convert a passed in tribe to its name string so it can be formated in the lang
-        for (int i=0;i<args.length;i++){
-            if (args[i] instanceof Tribe){
+        for (int i = 0; i < args.length; i++) {
+            if (args[i] instanceof Tribe) {
                 args[i] = (Object) ((Tribe) args[i]).getName();
             }
         }
@@ -90,7 +91,7 @@ public Component getTextPrefixPlayer(UUID causingPlayer, Object... args){
         Player player = null; //TribeServer.getPlayerByUuid(causingPlayer);
         if (player == null) return getText(args);
 
-        String langEntry = "success.tribes." + this.name().toLowerCase();
+        String langEntry = "success.tribes." + this.name().toLowerCase(Locale.ROOT);
         TranslatableComponent text = new TranslatableComponent(langEntry, args);
         Style style = text.getStyle().withColor(TextColor.fromRgb(0x34e5eb));
         text.setStyle(style);

diff --git a/src/main/resources/assets/tribes/lang/en_us.json b/src/main/resources/assets/tribes/lang/en_us.json
@@ -61,7 +61,10 @@
   "success.tribes.set_initials": "Your tribe initials are now %s.",
   "success.tribes.which_tribe": "%s is in the tribe %s.",
   "success.tribes.which_no_tribe": "%s is not in a tribe.",
-  "success.tribes.must_confirm": "Type \"/tribe confirm\" to follow that deity.",
+  "success.tribes.must_confirm_generic": "Type \"/tribe confirm\" to confirm.",
+  "success.tribes.must_confirm_deity": "Type \"/tribe confirm\" to follow that deity.",
+  "success.tribes.must_confirm_hemisphere": "Type \"/tribe confirm\" to choose the %sern hemisphere.",
+  "success.tribes.must_confirm_leave": "Type \"/tribe confirm\" to leave your tribe.",
   "success.tribes.autoban_numbers": "Your tribe will autoban people who die %d times within %d RL days.",
   "success.tribes.no_autoban_rank": "Your tribe will not autoban %ss if they die too often.",
   "success.tribes.yes_autoban_rank": "Your tribe will autoban %ss if they die too often.",