Items - change PDC methods

Author: ShaneBeee

src/main/java/com/shanebeestudios/hg/api/util/ItemUtils.java

@@ -33,10 +33,8 @@ public static boolean isCursed(ItemStack itemStack) {
 
     public static ItemStack getTrackingStick() {
         ItemStack itemStack = ItemType.STICK.createItemStack();
-        ItemMeta itemMeta = itemStack.getItemMeta();
-        PersistentDataContainer pdc = itemMeta.getPersistentDataContainer();
-        pdc.set(Constants.TRACKING_STICK_KEY, PersistentDataType.BOOLEAN, true);
-        itemStack.setItemMeta(itemMeta);
+        itemStack.editPersistentDataContainer(pdc ->
+            pdc.set(Constants.TRACKING_STICK_KEY, PersistentDataType.BOOLEAN, true));
 
         itemStack.setData(DataComponentTypes.ITEM_NAME, Util.getMini(LANG.item_tracking_stick_name));
         itemStack.setData(DataComponentTypes.MAX_STACK_SIZE, 1);

src/main/java/com/shanebeestudios/hg/plugin/listeners/GameCompassListener.java

@@ -4,6 +4,7 @@
 import com.shanebeestudios.hg.api.gui.SpectatorGUI;
 import com.shanebeestudios.hg.api.util.Constants;
 import com.shanebeestudios.hg.plugin.HungerGames;
+import io.papermc.paper.persistence.PersistentDataContainerView;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -12,8 +13,6 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
 public class GameCompassListener extends GameListenerBase {
@@ -57,10 +56,8 @@ private boolean isSpectatorCompass(PlayerInteractEvent event) {
 
         ItemStack item = event.getItem();
         if (item == null || item.getType() != Material.COMPASS) return false;
-        ItemMeta itemMeta = item.getItemMeta();
-        if (itemMeta == null) return false;
 
-        PersistentDataContainer pdc = itemMeta.getPersistentDataContainer();
+        PersistentDataContainerView pdc = item.getPersistentDataContainer();
         return pdc.has(Constants.SPECTATOR_COMPASS_KEY, PersistentDataType.BOOLEAN);
     }
 

src/main/java/com/shanebeestudios/hg/plugin/managers/ItemManager.java

@@ -13,7 +13,6 @@
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.Nullable;
 
@@ -116,10 +115,8 @@ public List<ItemStack> loadItems(ConfigurationSection config) {
     public ItemStack getSpectatorCompass() {
         ItemStack compass = new ItemStack(Material.COMPASS);
         compass.setData(DataComponentTypes.ITEM_NAME, Util.getMini(this.lang.spectate_compass_name));
-        compass.editMeta(itemMeta -> {
-            PersistentDataContainer pdc = itemMeta.getPersistentDataContainer();
-            pdc.set(Constants.SPECTATOR_COMPASS_KEY, PersistentDataType.BOOLEAN, true);
-        });
+        compass.editPersistentDataContainer(pdc ->
+            pdc.set(Constants.SPECTATOR_COMPASS_KEY, PersistentDataType.BOOLEAN, true));
         return compass;
     }