mirror of
https://github.com/songoda/UltimateTimber.git
synced 2024-09-27 13:22:39 +02:00
Replaces deprecated NBTItem calls
This commit is contained in:
parent
07c6afdad2
commit
5c5f938f3c
@ -4,8 +4,7 @@ import com.google.common.base.Strings;
|
|||||||
import com.songoda.core.compatibility.CompatibleMaterial;
|
import com.songoda.core.compatibility.CompatibleMaterial;
|
||||||
import com.songoda.core.compatibility.ServerVersion;
|
import com.songoda.core.compatibility.ServerVersion;
|
||||||
import com.songoda.core.hooks.McMMOHook;
|
import com.songoda.core.hooks.McMMOHook;
|
||||||
import com.songoda.core.nms.NmsManager;
|
import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem;
|
||||||
import com.songoda.core.nms.nbt.NBTItem;
|
|
||||||
import com.songoda.core.utils.TextUtils;
|
import com.songoda.core.utils.TextUtils;
|
||||||
import com.songoda.ultimatetimber.UltimateTimber;
|
import com.songoda.ultimatetimber.UltimateTimber;
|
||||||
import com.songoda.ultimatetimber.tree.ITreeBlock;
|
import com.songoda.ultimatetimber.tree.ITreeBlock;
|
||||||
@ -236,9 +235,9 @@ public class TreeDefinitionManager extends Manager {
|
|||||||
item.setItemMeta(meta);
|
item.setItemMeta(meta);
|
||||||
|
|
||||||
// Apply NBT
|
// Apply NBT
|
||||||
NBTItem nbtItem = NmsManager.getNbt().of(item);
|
NBTItem nbtItem = new NBTItem(item);
|
||||||
nbtItem.set(requiredAxeKey, true);
|
nbtItem.setBoolean(requiredAxeKey, true);
|
||||||
item = nbtItem.finish();
|
item = nbtItem.getItem();
|
||||||
|
|
||||||
this.requiredAxe = item;
|
this.requiredAxe = item;
|
||||||
}
|
}
|
||||||
@ -325,8 +324,7 @@ public class TreeDefinitionManager extends Manager {
|
|||||||
|
|
||||||
for (TreeDefinition treeDefinition : this.treeDefinitions) {
|
for (TreeDefinition treeDefinition : this.treeDefinitions) {
|
||||||
if (treeDefinition.isRequiredAxe() || isGlobalAxeRequired()) {
|
if (treeDefinition.isRequiredAxe() || isGlobalAxeRequired()) {
|
||||||
NBTItem nbtItem = NmsManager.getNbt().of(tool);
|
if (new NBTItem(tool).hasKey(requiredAxeKey))
|
||||||
if (nbtItem.has(requiredAxeKey))
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -358,8 +356,7 @@ public class TreeDefinitionManager extends Manager {
|
|||||||
|
|
||||||
// If the tree definition requires the custom axe, don't allow any other checks to pass.
|
// If the tree definition requires the custom axe, don't allow any other checks to pass.
|
||||||
if (treeDefinition.isRequiredAxe() || isGlobalAxeRequired()) {
|
if (treeDefinition.isRequiredAxe() || isGlobalAxeRequired()) {
|
||||||
NBTItem nbtItem = NmsManager.getNbt().of(tool);
|
return new NBTItem(tool).hasKey(requiredAxeKey);
|
||||||
return nbtItem.has(requiredAxeKey);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (ItemStack requiredTool : treeDefinition.getRequiredTools())
|
for (ItemStack requiredTool : treeDefinition.getRequiredTools())
|
||||||
|
Loading…
Reference in New Issue
Block a user