Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2025-02-05 22:11:21 +01:00
Code Issues Projects Releases Wiki Activity

Replaces deprecated NBTItem calls

Browse Source
This commit is contained in:
Christian Koop 2022-03-18 21:38:26 +01:00
parent 47110d2ee2
commit cba75610cf
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java
View File

@ -2,8 +2,7 @@ package com.songoda.ultimatestacker.listeners;
import com.songoda.core.compatibility.CompatibleHand;
import com.songoda.core.compatibility.CompatibleMaterial;
import com.songoda.core.nms.NmsManager;
import com.songoda.core.nms.nbt.NBTItem;
import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem;
import com.songoda.ultimatestacker.UltimateStacker;
import com.songoda.ultimatestacker.events.SpawnerBreakEvent;
import com.songoda.ultimatestacker.events.SpawnerPlaceEvent;
@ -252,9 +251,10 @@ public class BlockListeners implements Listener {
}
private int getSpawnerAmount(ItemStack item) {
NBTItem nbtItem = NmsManager.getNbt().of(item);
if (nbtItem.has("spawner_stack_size"))
return nbtItem.getNBTObject("spawner_stack_size").asInt();
NBTItem nbtItem = new NBTItem(item);
if (nbtItem.hasKey("spawner_stack_size"))
return nbtItem.getInteger("spawner_stack_size");
if (!item.hasItemMeta() || !item.getItemMeta().hasDisplayName()) return 1;
if (item.getItemMeta().getDisplayName().contains(":")) {
int amt = NumberUtils.toInt(item.getItemMeta().getDisplayName().replace("\u00A7", "").replace(";", "").split(":")[0], 1);

3
src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java
View File

@ -3,6 +3,7 @@ package com.songoda.ultimatestacker.listeners;
import com.songoda.core.compatibility.CompatibleHand;
import com.songoda.core.compatibility.ServerVersion;
import com.songoda.core.nms.NmsManager;
import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem;
import com.songoda.core.utils.EntityUtils;
import com.songoda.ultimatestacker.UltimateStacker;
import com.songoda.ultimatestacker.settings.Settings;
@ -99,7 +100,7 @@ public class SpawnerListeners implements Listener {
if (!Settings.EGGS_CONVERT_SPAWNERS.getBoolean()
|| (event.getItem().hasItemMeta() && event.getItem().getItemMeta().hasDisplayName()
&& !NmsManager.getNbt().of(event.getItem()).has("UC"))) {
&& !new NBTItem(event.getItem()).hasKey("UC"))) {
return;
}

11
src/main/java/com/songoda/ultimatestacker/utils/Methods.java
View File

@ -1,20 +1,17 @@
package com.songoda.ultimatestacker.utils;
import com.songoda.core.compatibility.CompatibleMaterial;
import com.songoda.core.nms.NmsManager;
import com.songoda.core.nms.nbt.NBTItem;
import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem;
import com.songoda.core.utils.TextUtils;
import com.songoda.ultimatestacker.UltimateStacker;
import com.songoda.ultimatestacker.settings.Settings;
import com.songoda.ultimatestacker.stackable.entity.custom.CustomEntity;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.block.CreatureSpawner;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BlockStateMeta;
@ -139,9 +136,9 @@ public class Methods {
((BlockStateMeta) meta).setBlockState(cs);
item.setItemMeta(meta);
NBTItem nbtItem = NmsManager.getNbt().of(item);
nbtItem.set("spawner_stack_size", amount);
return nbtItem.finish();
NBTItem nbtItem = new NBTItem(item);
nbtItem.setInteger("spawner_stack_size", amount);
return nbtItem.getItem();
}
public static boolean isInt(String number) {