From 8919a182c521b22fd57190bc5ba7cd0469e39045 Mon Sep 17 00:00:00 2001 From: luisc Date: Wed, 12 Jan 2022 04:54:07 -0600 Subject: [PATCH] Added removeTags() function to ScriptItemStack and isCustomGUI function to ScriptContainer --- src/main/java/noppes/npcs/scripted/ScriptContainer.java | 5 +++++ src/main/java/noppes/npcs/scripted/ScriptItemStack.java | 6 ++++++ .../java/noppes/npcs/scripted/interfaces/IContainer.java | 2 ++ .../java/noppes/npcs/scripted/interfaces/IItemStack.java | 2 ++ 4 files changed, 15 insertions(+) diff --git a/src/main/java/noppes/npcs/scripted/ScriptContainer.java b/src/main/java/noppes/npcs/scripted/ScriptContainer.java index 34c733a87..4e81ce886 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptContainer.java +++ b/src/main/java/noppes/npcs/scripted/ScriptContainer.java @@ -10,6 +10,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import noppes.npcs.NoppesUtilPlayer; +import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.scripted.interfaces.IContainer; import noppes.npcs.scripted.interfaces.IItemStack; @@ -82,4 +83,8 @@ public class ScriptContainer implements IContainer { return items; } + + public boolean isCustomGUI() { + return this.container instanceof ContainerCustomGui; + } } diff --git a/src/main/java/noppes/npcs/scripted/ScriptItemStack.java b/src/main/java/noppes/npcs/scripted/ScriptItemStack.java index 396c5512a..23764c5c1 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptItemStack.java +++ b/src/main/java/noppes/npcs/scripted/ScriptItemStack.java @@ -134,6 +134,12 @@ public class ScriptItemStack implements IItemStack { return ((NBTTagString)tag).func_150285_a_(); return tag; } + + public INbt removeTags() { + ScriptNbt nbt = (ScriptNbt)NpcAPI.Instance().getINbt(item.stackTagCompound); + item.stackTagCompound = null; + return nbt; + } public boolean isEnchanted(){ return item.isItemEnchanted(); diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IContainer.java b/src/main/java/noppes/npcs/scripted/interfaces/IContainer.java index 915980288..6f0b338a6 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IContainer.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/IContainer.java @@ -22,4 +22,6 @@ public interface IContainer { int count(IItemStack var1, boolean var2, boolean var3); IItemStack[] getItems(); + + boolean isCustomGUI(); } diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IItemStack.java b/src/main/java/noppes/npcs/scripted/interfaces/IItemStack.java index afd04e263..d1b92b6a2 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IItemStack.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/IItemStack.java @@ -63,6 +63,8 @@ public interface IItemStack { */ public Object getTag(String key); + public INbt removeTags(); + public boolean isEnchanted(); /**