Пофикшены устаревшие методы и дюп бутылочек.

Author: trassert

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.trassert</groupId>
     <artifactId>RecallPotion</artifactId>
-    <version>1.6.1</version>
+    <version>1.7.0</version>
     <packaging>jar</packaging>
 
     <name>Return Potion</name>

src/main/java/com/trassert/recallpotion/commands/RecallPotionCommand.java

@@ -20,7 +20,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
             return true;
         }
 
-        String version = plugin.getDescription().getVersion();
+        String version = plugin.getPluginMeta().getVersion();
 
         if (args.length == 0) {
             sender.sendMessage("§6RecallPotion Plugin v" + version);

src/main/java/com/trassert/recallpotion/listeners/PlayerInteractListener.java

@@ -54,7 +54,13 @@ public void onPlayerInteract(PlayerInteractEvent event) {
         player.setLevel(player.getLevel() - xpCost);
 
         ItemStack recallPotion = plugin.getRecipeManager().createRecallPotion();
-        player.getInventory().addItem(recallPotion);
+        if (itemInHand.getAmount() > 1) {
+            itemInHand.setAmount(itemInHand.getAmount() - 1);
+            player.getInventory().setItemInMainHand(itemInHand);
+            player.getInventory().addItem(recallPotion);
+        } else {
+            player.getInventory().setItemInMainHand(recallPotion);
+        }
 
         player.sendMessage(plugin.getConfigManager().getMessage("portal-extract-success"));
         player.playSound(player.getLocation(), plugin.getConfigManager().getSound("portal-extract"), 1.0f, 1.0f);
@@ -69,7 +75,7 @@ public void performRecallTeleport(Player player) {
             return;
         }
 
-        Location home = player.getBedSpawnLocation();
+        Location home = player.getRespawnLocation();
         if (home == null) {
             home = player.getLocation();
             player.sendMessage(plugin.getConfigManager().getMessage("no-home-set"));

src/main/java/com/trassert/recallpotion/managers/AdvancementManager.java

@@ -42,7 +42,7 @@ private void registerAdvancement(NamespacedKey key, String configPath) {
                 cfg.getAdvancementParent(configPath));
 
         try {
-            Bukkit.getUnsafe().loadAdvancement(key, json);
+            unsafeLoadAdvancement(key, json);
             plugin.getLogger().info("Registered advancement: " + key.getKey());
         } catch (IllegalArgumentException e) {
             plugin.getLogger().log(Level.WARNING,
@@ -56,11 +56,21 @@ public void unregisterAdvancements() {
             revokeAdvancement(player, portalExtractKey);
         }
 
-        Bukkit.getUnsafe().removeAdvancement(homeReturnKey);
-        Bukkit.getUnsafe().removeAdvancement(portalExtractKey);
+        unsafeRemoveAdvancement(homeReturnKey);
+        unsafeRemoveAdvancement(portalExtractKey);
         plugin.getLogger().info("Unregistered custom advancements.");
     }
 
+    @SuppressWarnings("deprecation")
+    private void unsafeLoadAdvancement(NamespacedKey key, String json) {
+        plugin.getServer().getUnsafe().loadAdvancement(key, json);
+    }
+
+    @SuppressWarnings("deprecation")
+    private void unsafeRemoveAdvancement(NamespacedKey key) {
+        plugin.getServer().getUnsafe().removeAdvancement(key);
+    }
+
     private String createAdvancementJson(String title, String description, Material icon, String frame, String parent) {
         JsonObject root = new JsonObject();
 

src/main/java/com/trassert/recallpotion/managers/ConfigManager.java

@@ -1,7 +1,7 @@
 package com.trassert.recallpotion.managers;
 
 import com.trassert.recallpotion.RecallPotionPlugin;
-import org.bukkit.ChatColor;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
@@ -109,6 +109,8 @@ public List<String> getPotionLore() {
     }
 
     private String translate(String input) {
-        return ChatColor.translateAlternateColorCodes('&', input);
+        if (input == null) return "";
+        var component = LegacyComponentSerializer.legacyAmpersand().deserialize(input);
+        return LegacyComponentSerializer.legacySection().serialize(component);
     }
 }

src/main/java/com/trassert/recallpotion/managers/RecipeManager.java

@@ -7,6 +7,10 @@
 import org.bukkit.inventory.ShapedRecipe;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionType;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class RecipeManager {
 
@@ -37,9 +41,16 @@ public void unregisterRecipes() {
     public ItemStack createRecallPotion() {
         PotionMeta meta = (PotionMeta) new ItemStack(Material.POTION).getItemMeta();
         meta.setBasePotionType(PotionType.WATER);
-        meta.setDisplayName(plugin.getConfigManager().getPotionName());
-        meta.setLore(plugin.getConfigManager().getPotionLore());
-        meta.setCustomModelData(CUSTOM_MODEL_DATA);
+        Component nameComp = LegacyComponentSerializer.legacyAmpersand()
+            .deserialize(plugin.getConfigManager().getPotionName());
+        meta.displayName(nameComp);
+
+        List<Component> loreComp = plugin.getConfigManager().getPotionLore().stream()
+            .map(s -> LegacyComponentSerializer.legacyAmpersand().deserialize(s))
+            .collect(Collectors.toList());
+        meta.lore(loreComp);
+
+        unsafeSetCustomModelData(meta, CUSTOM_MODEL_DATA);
         ItemStack potion = new ItemStack(Material.POTION);
         potion.setItemMeta(meta);
         return potion;
@@ -51,6 +62,21 @@ public boolean isRecallPotion(ItemStack item) {
         }
 
         var meta = item.getItemMeta();
-        return meta != null && meta.hasCustomModelData() && meta.getCustomModelData() == CUSTOM_MODEL_DATA;
+        return meta != null && unsafeHasCustomModelData(meta) && unsafeGetCustomModelData(meta) == CUSTOM_MODEL_DATA;
+    }
+
+    @SuppressWarnings("deprecation")
+    private void unsafeSetCustomModelData(PotionMeta meta, int value) {
+        meta.setCustomModelData(value);
+    }
+
+    @SuppressWarnings("deprecation")
+    private boolean unsafeHasCustomModelData(org.bukkit.inventory.meta.ItemMeta meta) {
+        return meta.hasCustomModelData();
+    }
+
+    @SuppressWarnings("deprecation")
+    private int unsafeGetCustomModelData(org.bukkit.inventory.meta.ItemMeta meta) {
+        return meta.getCustomModelData();
     }
 }