resolved merge conflicts with dev

This commit is contained in:
bigguy345 committed 2026-01-13 18:25:37 +02:00
1 parent c3e032dcf2
commit cd92c340c7
8 files changed
+81 -22

No files matched your search

@@ -2,6 +2,7 @@ package noppes.npcs.client.gui.script;
import kamkeel.npcs.network.packets.request.script.item.LinkedItemScriptPacket;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.client.gui.global.GuiNPCManageLinked;
import noppes.npcs.constants.EnumScriptType;
import noppes.npcs.constants.ScriptContext;
@@ -10,6 +11,8 @@ import noppes.npcs.controllers.ScriptHookController;
import noppes.npcs.controllers.data.LinkedItem;
import noppes.npcs.controllers.data.LinkedItemScript;
import java.util.ArrayList;
public class GuiScriptLinkedItem extends GuiScriptInterface {
public final LinkedItem linkedItem;