Add more translatable Strings

AlessioGr · Nov 9, 2021 · 2d6577b · 2d6577b
1 parent b6f7d92
commit 2d6577b
Show file tree

Hide file tree

Showing 23 changed files with 117 additions and 51 deletions.
diff --git a/build/resources/main/plugin.yml b/build/resources/main/plugin.yml
@@ -1,5 +1,5 @@
 name: NotQuests
-version: '1.6.3'
+version: '1.6.4'
 main: rocks.gravili.NotQuests
 api-version: 1.17
 authors: [ NoeX ]

diff --git a/src/main/java/rocks/gravili/Commands/CommandNotQuests.java b/src/main/java/rocks/gravili/Commands/CommandNotQuests.java
@@ -758,7 +758,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                                                             .replaceAll("%ACTIVEOBJECTIVEID%", "" + activeObjective.getObjectiveID())
                                                             .replaceAll("%OBJECTIVENAME%", nameToDisplay)
                                                             .replaceAll("%OBJECTIVEDESCRIPTION%", descriptionToDisplay)
-                                                            .replaceAll("%ACTIVEOBJECTIVEDESCRIPTION%", main.getQuestManager().getObjectiveTaskDescription(activeObjective.getObjective(), false))
+                                                            .replaceAll("%ACTIVEOBJECTIVEDESCRIPTION%", main.getQuestManager().getObjectiveTaskDescription(activeObjective.getObjective(), false, player))
                                                             .replaceAll("%ACTIVEOBJECTIVEPROGRESS%", "" + activeObjective.getCurrentProgress())
                                                             .replaceAll("%OBJECTIVEPROGRESSNEEDED%", "" + activeObjective.getProgressNeeded())
 
@@ -813,7 +813,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                                                         .replaceAll("%ACTIVEOBJECTIVEID%", "" + activeObjective.getObjectiveID())
                                                         .replaceAll("%OBJECTIVENAME%", nameToDisplay)
                                                         .replaceAll("%OBJECTIVEDESCRIPTION%", descriptionToDisplay)
-                                                        .replaceAll("%COMPLETEDOBJECTIVEDESCRIPTION%", main.getQuestManager().getObjectiveTaskDescription(activeObjective.getObjective(), true))
+                                                        .replaceAll("%COMPLETEDOBJECTIVEDESCRIPTION%", main.getQuestManager().getObjectiveTaskDescription(activeObjective.getObjective(), true, player))
                                                         .replaceAll("%ACTIVEOBJECTIVEPROGRESS%", "" + activeObjective.getCurrentProgress())
                                                         .replaceAll("%OBJECTIVEPROGRESSNEEDED%", "" + activeObjective.getProgressNeeded())
 
@@ -836,9 +836,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                                     gui.show(player);
                                 } else {
                                     sender.sendMessage("§aCompleted Objectives for Quest §b" + requestedActiveQuest.getQuest().getQuestFinalName() + "§e:");
-                                    main.getQuestManager().sendCompletedObjectivesAndProgress(sender, requestedActiveQuest);
+                                    main.getQuestManager().sendCompletedObjectivesAndProgress(player, requestedActiveQuest);
                                     sender.sendMessage("§eActive Objectives for Quest §b" + requestedActiveQuest.getQuest().getQuestFinalName() + "§e:");
-                                    main.getQuestManager().sendActiveObjectivesAndProgress(sender, requestedActiveQuest);
+                                    main.getQuestManager().sendActiveObjectivesAndProgress(player, requestedActiveQuest);
                                 }
 
                             } else {

diff --git a/src/main/java/rocks/gravili/Commands/old/AdminCommands/ObjectivesAdminCommand.java b/src/main/java/rocks/gravili/Commands/old/AdminCommands/ObjectivesAdminCommand.java
@@ -87,7 +87,7 @@ public void handleObjectivesAdminCommand(final CommandSender sender, final Strin
                     sender.sendMessage("§aObjective Type: §b" + main.getObjectiveManager().getObjectiveType(objective.getClass()) );
                     sender.sendMessage("§aObjective Content: ");
 
-                    sender.sendMessage(main.getQuestManager().getObjectiveTaskDescription(objective, false));
+                    sender.sendMessage(main.getQuestManager().getObjectiveTaskDescription(objective, false, null));
 
 
                     sender.sendMessage("§aObjective DisplayName: §b" + objective.getObjectiveDisplayName());

diff --git a/src/main/java/rocks/gravili/Commands/old/CommandNotQuestsAdmin.java b/src/main/java/rocks/gravili/Commands/old/CommandNotQuestsAdmin.java
@@ -1563,10 +1563,10 @@ public void getProgress(CommandSender sender, String playerName, String questNam
                 if (requestedActiveQuest != null) {
 
                     sender.sendMessage("§eCompleted Objectives for Quest §b" + requestedActiveQuest.getQuest().getQuestName() + " §eof player §b" + playerName + " §a(online)§e:");
-                    main.getQuestManager().sendCompletedObjectivesAndProgress(sender, requestedActiveQuest);
+                    main.getQuestManager().sendCompletedObjectivesAndProgress(player, requestedActiveQuest);
 
                     sender.sendMessage("§eActive Objectives for Quest §b" + requestedActiveQuest.getQuest().getQuestName() + " §eof player §b" + playerName + " §a(online)§e:");
-                    main.getQuestManager().sendActiveObjectivesAndProgress(sender, requestedActiveQuest);
+                    main.getQuestManager().sendActiveObjectivesAndProgress(player, requestedActiveQuest);
 
 
                 } else {
@@ -1601,10 +1601,10 @@ public void getProgress(CommandSender sender, String playerName, String questNam
 
 
                     sender.sendMessage("§eCompleted Objectives for Quest §b" + requestedActiveQuest.getQuest().getQuestName() + " §eof player §b" + playerName + " §c(offline)§e:");
-                    main.getQuestManager().sendCompletedObjectivesAndProgress(sender, requestedActiveQuest);
+                    main.getQuestManager().sendCompletedObjectivesAndProgress(player, requestedActiveQuest);
 
                     sender.sendMessage("§eActive Objectives for Quest §b" + requestedActiveQuest.getQuest().getQuestName() + " §eof player §b" + playerName + " §c(offline)§e:");
-                    main.getQuestManager().sendActiveObjectivesAndProgress(sender, requestedActiveQuest);
+                    main.getQuestManager().sendActiveObjectivesAndProgress(player, requestedActiveQuest);
 
 
                 } else {

diff --git a/src/main/java/rocks/gravili/Managers/LanguageManager.java b/src/main/java/rocks/gravili/Managers/LanguageManager.java
@@ -322,6 +322,31 @@ public boolean setupDefaultStrings() {
             valueChanged = true;
         }
 
+        //Chat Objectives
+        if (!getLanguageConfig().isString("chat.objectives.counter")) {
+            getLanguageConfig().set("chat.objectives.counter", "&e%OBJECTIVEID%. %OBJECTIVENAME%:");
+            valueChanged = true;
+        }
+        if (!getLanguageConfig().isString("chat.objectives.hidden")) {
+            getLanguageConfig().set("chat.objectives.hidden", "&e%OBJECTIVEID%. &7&l[HIDDEN]");
+            valueChanged = true;
+        }
+        if (!getLanguageConfig().isString("chat.objectives.description")) {
+            getLanguageConfig().set("chat.objectives.description", "   &9Description: &6%OBJECTIVEDESCRIPTION%");
+            valueChanged = true;
+        }
+        if (!getLanguageConfig().isString("chat.objectives.progress")) {
+            getLanguageConfig().set("chat.objectives.progress", "   §7Progress: §f%ACTIVEOBJECTIVEPROGRESS% &f/ %OBJECTIVEPROGRESSNEEDED%");
+            valueChanged = true;
+        }
+        //Chat Objectives Task Descriptions
+        if (!getLanguageConfig().isString("chat.objectives.taskDescription.breakBlocks")) {
+            getLanguageConfig().set("chat.objectives.taskDescription.breakBlocks", "    &7%EVENTUALCOLOR% Block to break: &f%EVENTUALCOLOR%%BLOCKTOBREAK%");
+            valueChanged = true;
+        }
+
+
+
         //user /q gui - Main
         if (!getLanguageConfig().isString("gui.main.title")) {
             getLanguageConfig().set("gui.main.title", "                &9Quests");

diff --git a/src/main/java/rocks/gravili/Managers/QuestManager.java b/src/main/java/rocks/gravili/Managers/QuestManager.java
@@ -1203,32 +1203,32 @@ public String removeAction(Action actionToDelete) {
     }
 
 
-    public void sendCompletedObjectivesAndProgress(final CommandSender sender, final ActiveQuest activeQuest) {
+    public void sendCompletedObjectivesAndProgress(final Player player, final ActiveQuest activeQuest) {
 
         for (ActiveObjective activeObjective : activeQuest.getCompletedObjectives()) {
 
             final String objectiveDescription = activeObjective.getObjective().getObjectiveDescription();
 
-            sender.sendMessage("§7§m" + activeObjective.getObjective().getObjectiveID() + ". " + activeObjective.getObjective().getObjectiveFinalName() + ":");
+            player.sendMessage("§7§m" + activeObjective.getObjective().getObjectiveID() + ". " + activeObjective.getObjective().getObjectiveFinalName() + ":");
 
 
             if (!objectiveDescription.isBlank()) {
-                sender.sendMessage("   §7§mDescription: §f§m" + objectiveDescription);
+                player.sendMessage("   §7§mDescription: §f§m" + objectiveDescription);
             }
 
-            sender.sendMessage(getObjectiveTaskDescription(activeObjective.getObjective(), true));
-            sender.sendMessage("   §7§mProgress: §f§m" + activeObjective.getCurrentProgress() + " / " + activeObjective.getProgressNeeded());
+            player.sendMessage(getObjectiveTaskDescription(activeObjective.getObjective(), true, player));
+            player.sendMessage("   §7§mProgress: §f§m" + activeObjective.getCurrentProgress() + " / " + activeObjective.getProgressNeeded());
         }
     }
 
 
-    public final String getObjectiveTaskDescription(final Objective objective, boolean completed) {
+    public final String getObjectiveTaskDescription(final Objective objective, boolean completed, final Player player) {
         String toReturn = "";
         String eventualColor = "";
         if (completed) {
             eventualColor = "§m";
         }
-        toReturn += objective.getObjectiveTaskDescription(eventualColor);
+        toReturn += objective.getObjectiveTaskDescription(eventualColor, player);
 
         if (objective.getCompletionNPCID() != -1) {
             if (main.isCitizensEnabled()) {
@@ -1248,41 +1248,46 @@ public final String getObjectiveTaskDescription(final Objective objective, boole
         return toReturn;
     }
 
-    public void sendActiveObjectivesAndProgress(final CommandSender sender, final ActiveQuest activeQuest) {
+    public void sendActiveObjectivesAndProgress(final Player player, final ActiveQuest activeQuest) {
 
         for (ActiveObjective activeObjective : activeQuest.getActiveObjectives()) {
 
             if (activeObjective.isUnlocked()) {
                 final String objectiveDescription = activeObjective.getObjective().getObjectiveDescription();
-                sender.sendMessage("§e" + activeObjective.getObjective().getObjectiveID() + ". " + activeObjective.getObjective().getObjectiveFinalName() + ":");
-
+                player.sendMessage(main.getLanguageManager().getString("chat.objectives.counter", player)
+                        .replaceAll("%OBJECTIVEID%", ""+activeObjective.getObjective().getObjectiveID())
+                        .replaceAll("%OBJECTIVENAME%", ""+activeObjective.getObjective().getObjectiveFinalName()));
 
                 if (!objectiveDescription.isBlank()) {
-                    sender.sendMessage("   §9Description: §6" + objectiveDescription);
+                    player.sendMessage(main.getLanguageManager().getString("chat.objectives.description", player)
+                            .replaceAll("%OBJECTIVEDESCRIPTION%", objectiveDescription));
                 }
 
-                sender.sendMessage(getObjectiveTaskDescription(activeObjective.getObjective(), false));
+                player.sendMessage(getObjectiveTaskDescription(activeObjective.getObjective(), false, player));
 
-                sender.sendMessage("   §7Progress: §f" + activeObjective.getCurrentProgress() + " / " + activeObjective.getProgressNeeded());
+                player.sendMessage(main.getLanguageManager().getString("chat.objectives.progress", player)
+                        .replaceAll("%ACTIVEOBJECTIVEPROGRESS%", ""+activeObjective.getCurrentProgress())
+                        .replaceAll("%OBJECTIVEPROGRESSNEEDED%", ""+activeObjective.getProgressNeeded()));
             } else {
-                sender.sendMessage("§e" + activeObjective.getObjective().getObjectiveID() + ". §7§l[HIDDEN]");
+                player.sendMessage(main.getLanguageManager().getString("chat.objectives.hidden", player)
+                        .replaceAll("%OBJECTIVEID%", ""+activeObjective.getObjective().getObjectiveID()));
 
             }
 
         }
     }
 
-    public void sendObjectives(final CommandSender sender, final Quest quest) {
+    public void sendObjectives(final Player player, final Quest quest) {
         for (final Objective objective : quest.getObjectives()) {
             final String objectiveDescription = objective.getObjectiveDescription();
-            sender.sendMessage("§a" + objective.getObjectiveID() + ". §e" + objective.getObjectiveFinalName());
+            player.sendMessage("§a" + objective.getObjectiveID() + ". §e" + objective.getObjectiveFinalName());
 
 
             if (!objectiveDescription.isBlank()) {
-                sender.sendMessage("   §9Description: §6" + objectiveDescription);
+                player.sendMessage("   §9Description: §6" + objectiveDescription);
             }
 
-            sender.sendMessage(getObjectiveTaskDescription(objective, false));
+            player.sendMessage(getObjectiveTaskDescription(objective, false, player));
 
 
         }
@@ -1312,30 +1317,30 @@ public void sendObjectivesAdmin(final CommandSender sender, final Quest quest) {
                 sender.sendMessage("      §8No depending objectives found!");
             }
 
-            sender.sendMessage(getObjectiveTaskDescription(objective, false));
+            sender.sendMessage(getObjectiveTaskDescription(objective, false, null));
 
         }
     }
 
 
-    public void sendActiveObjective(final CommandSender sender, ActiveObjective activeObjective) {
+    public void sendActiveObjective(final Player player, ActiveObjective activeObjective) {
 
         if (activeObjective.isUnlocked()) {
             final String objectiveDescription = activeObjective.getObjective().getObjectiveDescription();
 
-            sender.sendMessage("§e" + activeObjective.getObjective().getObjectiveID() + ". " + activeObjective.getObjective().getObjectiveFinalName() + ":");
+            player.sendMessage("§e" + activeObjective.getObjective().getObjectiveID() + ". " + activeObjective.getObjective().getObjectiveFinalName() + ":");
 
 
             if (!objectiveDescription.isBlank()) {
-                sender.sendMessage("   §9Description: §6" + objectiveDescription);
+                player.sendMessage("   §9Description: §6" + objectiveDescription);
             }
 
-            sender.sendMessage(getObjectiveTaskDescription(activeObjective.getObjective(), false));
+            player.sendMessage(getObjectiveTaskDescription(activeObjective.getObjective(), false, player));
 
 
-            sender.sendMessage("   §7Progress: §f" + activeObjective.getCurrentProgress() + " / " + activeObjective.getProgressNeeded());
+            player.sendMessage("   §7Progress: §f" + activeObjective.getCurrentProgress() + " / " + activeObjective.getProgressNeeded());
         } else {
-            sender.sendMessage("§e" + activeObjective.getObjective().getObjectiveID() + ". §7§l[HIDDEN]");
+            player.sendMessage("§e" + activeObjective.getObjective().getObjectiveID() + ". §7§l[HIDDEN]");
 
         }
 

diff --git a/src/main/java/rocks/gravili/Structs/Objectives/BreakBlocksObjective.java b/src/main/java/rocks/gravili/Structs/Objectives/BreakBlocksObjective.java
@@ -18,6 +18,7 @@
 
 package rocks.gravili.Structs.Objectives;
 
+import org.bukkit.entity.Player;
 import rocks.gravili.NotQuests;
 import rocks.gravili.Structs.Quest;
 import org.bukkit.Material;
@@ -45,9 +46,10 @@ public BreakBlocksObjective(NotQuests main, Quest quest, int objectiveNumber, in
     }
 
     @Override
-    public String getObjectiveTaskDescription(final String eventualColor) {
-        return "    §7" + eventualColor + "Block to break: §f" + eventualColor + getBlockToBreak().toString();
-
+    public String getObjectiveTaskDescription(final String eventualColor, final Player player) {
+        return main.getLanguageManager().getString("chat.objectives.taskDescription.breakBlocks", player)
+                .replaceAll("%EVENTUALCOLOR%", eventualColor)
+                .replaceAll("%BLOCKTOBREAK%", getBlockToBreak().toString());
     }
 
     @Override

diff --git a/src/main/java/rocks/gravili/Structs/Objectives/BreedObjective.java b/src/main/java/rocks/gravili/Structs/Objectives/BreedObjective.java
@@ -1,6 +1,7 @@
 package rocks.gravili.Structs.Objectives;
 
 
+import org.bukkit.entity.Player;
 import rocks.gravili.NotQuests;
 import rocks.gravili.Structs.Quest;
 
@@ -24,7 +25,7 @@ public BreedObjective(NotQuests main, Quest quest, int objectiveNumber, int prog
     }
 
     @Override
-    public String getObjectiveTaskDescription(String eventualColor) {
+    public String getObjectiveTaskDescription(final String eventualColor, final Player player) {
         return "    §7" + eventualColor + "Mob to breed: §f" + eventualColor + getEntityToBreedType();
     }
 

diff --git a/src/main/java/rocks/gravili/Structs/Objectives/CollectItemsObjective.java b/src/main/java/rocks/gravili/Structs/Objectives/CollectItemsObjective.java
@@ -18,6 +18,7 @@
 
 package rocks.gravili.Structs.Objectives;
 
+import org.bukkit.entity.Player;
 import rocks.gravili.NotQuests;
 import rocks.gravili.Structs.Quest;
 import org.bukkit.inventory.ItemStack;
@@ -42,7 +43,7 @@ public CollectItemsObjective(NotQuests main, Quest quest, int objectiveNumber, i
    }
 
     @Override
-    public String getObjectiveTaskDescription(String eventualColor) {
+    public String getObjectiveTaskDescription(final String eventualColor, final Player player) {
         return "    §7" + eventualColor + "Items to collect: §f" + eventualColor + getItemToCollect().getType() + " (" + getItemToCollect().getItemMeta().getDisplayName() + ")";
     }
 

diff --git a/src/main/java/rocks/gravili/Structs/Objectives/ConsumeItemsObjective.java b/src/main/java/rocks/gravili/Structs/Objectives/ConsumeItemsObjective.java
@@ -18,6 +18,7 @@
 
 package rocks.gravili.Structs.Objectives;
 
+import org.bukkit.entity.Player;
 import rocks.gravili.NotQuests;
 import rocks.gravili.Structs.Quest;
 import org.bukkit.inventory.ItemStack;
@@ -43,7 +44,7 @@ public ConsumeItemsObjective(NotQuests main, Quest quest, int objectiveNumber, i
     }
 
     @Override
-    public String getObjectiveTaskDescription(String eventualColor) {
+    public String getObjectiveTaskDescription(final String eventualColor, final Player player) {
         return "    §7" + eventualColor + "Items to consume: §f" + eventualColor + getItemToConsume().getType() + " (" + getItemToConsume().getItemMeta().getDisplayName() + ")";
     }
 

diff --git a/src/main/java/rocks/gravili/Structs/Objectives/CraftItemsObjective.java b/src/main/java/rocks/gravili/Structs/Objectives/CraftItemsObjective.java
@@ -18,6 +18,7 @@
 
 package rocks.gravili.Structs.Objectives;
 
+import org.bukkit.entity.Player;
 import rocks.gravili.NotQuests;
 import rocks.gravili.Structs.Quest;
 import org.bukkit.inventory.ItemStack;
@@ -43,7 +44,7 @@ public CraftItemsObjective(NotQuests main, Quest quest, int objectiveNumber, int
     }
 
     @Override
-    public String getObjectiveTaskDescription(String eventualColor) {
+    public String getObjectiveTaskDescription(final String eventualColor, final Player player) {
         return "    §7" + eventualColor + "Items to craft: §f" + eventualColor + getItemToCraft().getType() + " (" + getItemToCraft().getItemMeta().getDisplayName() + ")";
     }
 

diff --git a/src/main/java/rocks/gravili/Structs/Objectives/DeliverItemsObjective.java b/src/main/java/rocks/gravili/Structs/Objectives/DeliverItemsObjective.java
@@ -20,6 +20,7 @@
 
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.NPC;
+import org.bukkit.entity.Player;
 import rocks.gravili.NotQuests;
 import rocks.gravili.Structs.Quest;
 import org.bukkit.inventory.ItemStack;
@@ -73,7 +74,7 @@ public DeliverItemsObjective(NotQuests main, Quest quest, int objectiveNumber, i
     }
 
     @Override
-    public String getObjectiveTaskDescription(String eventualColor) {
+    public String getObjectiveTaskDescription(final String eventualColor, final Player player) {
         String toReturn = "    §7" + eventualColor + "Items to deliver: §f" + eventualColor + getItemToDeliver().getType() + " (" + getItemToDeliver().getItemMeta().getDisplayName() + ")\n";
         if (main.isCitizensEnabled() && getRecipientNPCID() != -1) {
             final NPC npc = CitizensAPI.getNPCRegistry().getById(getRecipientNPCID());