diff --git a/src/main/java/net/knarcraft/blacksmith/BlacksmithPlugin.java b/src/main/java/net/knarcraft/blacksmith/BlacksmithPlugin.java index 50ad7fa..623bb60 100644 --- a/src/main/java/net/knarcraft/blacksmith/BlacksmithPlugin.java +++ b/src/main/java/net/knarcraft/blacksmith/BlacksmithPlugin.java @@ -30,10 +30,6 @@ import net.knarcraft.knarlib.plugin.ConfigCommentPlugin; import net.knarcraft.knarlib.util.ConfigHelper; import net.knarcraft.knarlib.util.UpdateChecker; import org.bukkit.Bukkit; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.PluginCommand; -import org.bukkit.command.TabCompleter; -import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.event.Event; import org.bukkit.plugin.PluginDescriptionFile; diff --git a/src/main/java/net/knarcraft/blacksmith/command/blacksmith/BlackSmithConfigCommand.java b/src/main/java/net/knarcraft/blacksmith/command/blacksmith/BlackSmithConfigCommand.java index 04287b5..ed7abd7 100644 --- a/src/main/java/net/knarcraft/blacksmith/command/blacksmith/BlackSmithConfigCommand.java +++ b/src/main/java/net/knarcraft/blacksmith/command/blacksmith/BlackSmithConfigCommand.java @@ -157,6 +157,8 @@ public class BlackSmithConfigCommand implements CommandExecutor { return false; } ItemType itemType = ItemType.ENCHANTMENT; + // Note: While depreciated in Spigot, the new method is not available for Paper + @SuppressWarnings("deprecation") String itemChanged = enchantment.getKey().getKey(); settings.setEnchantmentCost(enchantment, newPrice); Translatable.getItemValueChangedMessage(blacksmithSetting.getCommandName(), itemType, itemChanged, newValue).success(sender); diff --git a/src/main/java/net/knarcraft/blacksmith/config/blacksmith/GlobalBlacksmithSettings.java b/src/main/java/net/knarcraft/blacksmith/config/blacksmith/GlobalBlacksmithSettings.java index 25f4590..ffd8c2e 100644 --- a/src/main/java/net/knarcraft/blacksmith/config/blacksmith/GlobalBlacksmithSettings.java +++ b/src/main/java/net/knarcraft/blacksmith/config/blacksmith/GlobalBlacksmithSettings.java @@ -523,6 +523,8 @@ public class GlobalBlacksmithSettings implements Settings { //Load all enchantment prices ConfigurationSection enchantmentCostNode = getAndCreateSection(fileConfiguration, getBase(BlacksmithSetting.ENCHANTMENT_COST.getPath())); for (Enchantment enchantment : this.enchantmentCosts.keySet()) { + // Note: While depreciated in Spigot, the new method is not available for Paper + //noinspection deprecation enchantmentCostNode.set(unNormalizeName(enchantment.getKey().getKey()), this.enchantmentCosts.get(enchantment)); } diff --git a/src/main/java/net/knarcraft/blacksmith/container/ActionCost.java b/src/main/java/net/knarcraft/blacksmith/container/ActionCost.java index 4c9b384..3d72942 100644 --- a/src/main/java/net/knarcraft/blacksmith/container/ActionCost.java +++ b/src/main/java/net/knarcraft/blacksmith/container/ActionCost.java @@ -72,7 +72,7 @@ public record ActionCost(double monetaryCost, int expCost, @Nullable ItemStack i /** * Displays this action cost as a string - * + * * @param player

The player to calculate the cost for

* @return

The string representation of this action cost

*/ @@ -196,7 +196,7 @@ public record ActionCost(double monetaryCost, int expCost, @Nullable ItemStack i continue; } } - output.put(entry.getKey(), (Integer) entry.getValue().getAmount()); + output.put(entry.getKey(), entry.getValue().getAmount()); } return output; diff --git a/src/main/java/net/knarcraft/blacksmith/trait/ReforgeSession.java b/src/main/java/net/knarcraft/blacksmith/trait/ReforgeSession.java index d61f569..90aa2b9 100644 --- a/src/main/java/net/knarcraft/blacksmith/trait/ReforgeSession.java +++ b/src/main/java/net/knarcraft/blacksmith/trait/ReforgeSession.java @@ -59,6 +59,8 @@ public class ReforgeSession extends Session implements Runnable { enchantments = new ArrayList<>(); for (Enchantment enchantment : enchantmentRegistry) { + // Note: While depreciated in Spigot, the new method is not available for Paper + //noinspection deprecation enchantments.add(enchantment.getKey().getKey()); } } diff --git a/src/main/java/net/knarcraft/blacksmith/trait/ScrapperTrait.java b/src/main/java/net/knarcraft/blacksmith/trait/ScrapperTrait.java index e84ddd1..a4482cf 100644 --- a/src/main/java/net/knarcraft/blacksmith/trait/ScrapperTrait.java +++ b/src/main/java/net/knarcraft/blacksmith/trait/ScrapperTrait.java @@ -215,12 +215,12 @@ public class ScrapperTrait extends CustomTrait { } if (!getSettings().splitEnchantedBook()) { - sendNPCMessage(this.npc, player, getSettings().getCannotSalvageEnchantedBookMessage()); + NPCFormatter.sendNPCMessage(this.npc, player, getSettings().getCannotSalvageEnchantedBookMessage()); return new SalvageResult(SalvageMethod.ENCHANTED_BOOK, new ArrayList<>(), SalvageState.NO_SALVAGE, 0); } if (SalvageHelper.getEnchantmentCount(itemInHand) <= 1) { - sendNPCMessage(this.npc, player, getSettings().getCannotSplitEnchantedBookFurtherMessage()); + NPCFormatter.sendNPCMessage(this.npc, player, getSettings().getCannotSplitEnchantedBookFurtherMessage()); return new SalvageResult(SalvageMethod.ENCHANTED_BOOK, new ArrayList<>(), SalvageState.NO_SALVAGE, 0); } diff --git a/src/main/java/net/knarcraft/blacksmith/util/CostHelper.java b/src/main/java/net/knarcraft/blacksmith/util/CostHelper.java index 2078115..e4fc8f1 100644 --- a/src/main/java/net/knarcraft/blacksmith/util/CostHelper.java +++ b/src/main/java/net/knarcraft/blacksmith/util/CostHelper.java @@ -1,9 +1,9 @@ package net.knarcraft.blacksmith.util; -import net.knarcraft.blacksmith.BlacksmithPlugin; import net.knarcraft.blacksmith.container.ActionCost; -import net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage; +import net.knarcraft.blacksmith.formatting.Translatable; import net.knarcraft.blacksmith.property.CostType; +import net.knarcraft.knarlib.formatting.FormatBuilder; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -28,9 +28,9 @@ public final class CostHelper { private static List plugins; private static Map> permissions; - + private CostHelper() { - + } /** @@ -42,7 +42,7 @@ public final class CostHelper { * @throws IllegalArgumentException

If the specified cost is invalid

*/ public static double parseSimpleCost(@NotNull CommandSender commandSender, - @NotNull String costString) throws IllegalArgumentException { + @NotNull String costString) throws IllegalArgumentException { try { double cost = Double.parseDouble(costString); if (cost < 0) { @@ -50,15 +50,14 @@ public final class CostHelper { } return cost; } catch (NumberFormatException exception) { - BlacksmithPlugin.getStringFormatter().displayErrorMessage(commandSender, - BlacksmithTranslatableMessage.DOUBLE_COST_REQUIRED); + new FormatBuilder(Translatable.DOUBLE_COST_REQUIRED).error(commandSender); throw new IllegalArgumentException("Invalid cost given"); } } /** * Shows tab-completion actions for altering a cost - * + * * @param arguments

The arguments given by the user

* @return

The available tab-complete options

*/ @@ -106,7 +105,7 @@ public final class CostHelper { */ @Nullable public static ActionCost modifyActionCost(@NotNull String[] arguments, @NotNull ActionCost oldCost, - @NotNull Player player) { + @NotNull Player player) { CostType costType; if (arguments.length > 2) { costType = CostType.parse(arguments[2]); @@ -156,7 +155,7 @@ public final class CostHelper { */ @Nullable private static ActionCost parseCost(@NotNull CostType costType, @NotNull String[] arguments, @NotNull ActionCost oldCost, - @NotNull Player player) { + @NotNull Player player) { switch (costType) { case ECONOMY: double economyCost = Double.parseDouble(arguments[0]); diff --git a/src/main/java/net/knarcraft/blacksmith/util/SalvageHelper.java b/src/main/java/net/knarcraft/blacksmith/util/SalvageHelper.java index 2bf3f26..ddf9802 100644 --- a/src/main/java/net/knarcraft/blacksmith/util/SalvageHelper.java +++ b/src/main/java/net/knarcraft/blacksmith/util/SalvageHelper.java @@ -136,6 +136,8 @@ public final class SalvageHelper { } else { return null; } + // Note: While depreciated in Spigot, the new method is not available for Paper + @SuppressWarnings("deprecation") Material patternMaterial = Material.matchMaterial(armorTrim.getPattern().getKey().getKey() + "_ARMOR_TRIM_SMITHING_TEMPLATE"); if (patternMaterial != null) { diff --git a/src/main/java/net/knarcraft/blacksmith/util/TabCompleteValuesHelper.java b/src/main/java/net/knarcraft/blacksmith/util/TabCompleteValuesHelper.java index ea9347a..1838fca 100644 --- a/src/main/java/net/knarcraft/blacksmith/util/TabCompleteValuesHelper.java +++ b/src/main/java/net/knarcraft/blacksmith/util/TabCompleteValuesHelper.java @@ -79,6 +79,8 @@ public final class TabCompleteValuesHelper { List enchantments = new ArrayList<>(); for (Enchantment enchantment : enchantmentRegistry) { + // Note: While depreciated in Spigot, the new method is not available for Paper + //noinspection deprecation enchantments.add(enchantment.getKey().getKey()); } return enchantments;