Expose potion level for 1.9+, fixes #2205

PikaMug · May 13, 2024 · 94fee10 · 94fee10
1 parent 74a3d09
commit 94fee10
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/core/src/main/java/me/pikamug/quests/player/BukkitQuester.java b/core/src/main/java/me/pikamug/quests/player/BukkitQuester.java
@@ -38,20 +38,20 @@
 import me.pikamug.quests.module.CustomRequirement;
 import me.pikamug.quests.nms.BukkitActionBarProvider;
 import me.pikamug.quests.nms.BukkitTitleProvider;
-import me.pikamug.quests.quests.components.BukkitObjective;
 import me.pikamug.quests.quests.BukkitQuest;
+import me.pikamug.quests.quests.Quest;
+import me.pikamug.quests.quests.components.BukkitObjective;
 import me.pikamug.quests.quests.components.BukkitRequirements;
 import me.pikamug.quests.quests.components.BukkitStage;
 import me.pikamug.quests.quests.components.Objective;
 import me.pikamug.quests.quests.components.Planner;
-import me.pikamug.quests.quests.Quest;
 import me.pikamug.quests.quests.components.Stage;
 import me.pikamug.quests.tasks.BukkitStageTimer;
 import me.pikamug.quests.util.BukkitConfigUtil;
 import me.pikamug.quests.util.BukkitInventoryUtil;
 import me.pikamug.quests.util.BukkitItemUtil;
-import me.pikamug.quests.util.BukkitMiscUtil;
 import me.pikamug.quests.util.BukkitLang;
+import me.pikamug.quests.util.BukkitMiscUtil;
 import me.pikamug.quests.util.RomanNumeral;
 import me.pikamug.unite.api.objects.PartyProvider;
 import net.citizensnpcs.api.CitizensAPI;
@@ -74,6 +74,7 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
+import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.material.Crops;
 import org.jetbrains.annotations.NotNull;
 
@@ -1587,7 +1588,7 @@ public void showCurrentObjectives(final Quest quest, final Quester quester, fina
         }
         for (final Objective obj : q.getCurrentObjectives(quest, false, false)) {
             final BukkitObjective objective = (BukkitObjective) obj;
-            final String message = "- " + BukkitLang.BukkitFormatToken.convertString(quester.getPlayer(),
+            String message = "- " + BukkitLang.BukkitFormatToken.convertString(quester.getPlayer(),
                     objective.getMessage());
             if (objective.getProgressAsItem() != null && objective.getGoalAsItem() != null) {
                 final ItemStack progress = objective.getProgressAsItem();
@@ -1602,6 +1603,18 @@ public void showCurrentObjectives(final Quest quest, final Quester quester, fina
                 } else if (localeManager != null && settings.canTranslateNames() && goal.getItemMeta() != null
                         && !goal.getItemMeta().hasDisplayName() && !goal.getType().equals(Material.WRITTEN_BOOK)) {
                     // Bukkit version is 1.9+ and item lacks custom name
+                    if (goal.getType().equals(Material.POTION) && localeManager.hasBasePotionData()) {
+                        final PotionMeta meta = (PotionMeta) goal.getItemMeta();
+                        if (meta.getBasePotionData().isUpgraded()) {
+                            final int level = meta.getBasePotionData().getType().name().contains("SLOWNESS") ? 4 : 2;
+                            message = message.replace("<level>", ChatColor.GREEN + RomanNumeral.getNumeral(level)
+                                    + ChatColor.RESET);
+                        } else if (meta.getBasePotionData().isExtended()) {
+                            message = message.replace("<level>", ChatColor.GREEN + "+" + ChatColor.RESET);
+                        } else {
+                            message = message.replace(" <level>", "");
+                        }
+                    }
                     localeManager.sendMessage(quester.getPlayer(), message, goal);
                 } else {
                     if (goal.getEnchantments().isEmpty()) {

diff --git a/core/src/main/resources/strings.yml b/core/src/main/resources/strings.yml
@@ -640,7 +640,7 @@ cut: "Shear <item>: <count>"
 craftItem: "Craft <item>: <count>"
 smeltItem: "Smelt <item>: <count>"
 enchItem: "Enchant <enchantment> <level> <item>: <count>"
-brewItem: "Brew <item>: <count>"
+brewItem: "Brew <item> <level>: <count>"
 consumeItem: "Consume <item>: <count>"
 catchFish: "Catch Fish: <count>"
 milkCow: "Milk Cow: <count>"