From 23c44cc5d4f3fff64474b8a1f9791edc79fbaad5 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 14 Jan 2026 03:52:04 +0200 Subject: [PATCH] Refactor --- .../npcs/client/gui/script/GuiScriptEffect.java | 2 +- .../npcs/client/gui/script/GuiScriptInterface.java | 12 ++++++------ .../npcs/client/gui/script/GuiScriptLinkedItem.java | 2 +- .../npcs/client/gui/script/GuiScriptRecipe.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java index e50b31ade..22c51b207 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java @@ -36,7 +36,7 @@ public class GuiScriptEffect extends GuiScriptInterface { return ScriptContext.GLOBAL; } - protected void setHandlerContainer(IScriptUnit container) { + protected void setHandlerUnit(IScriptUnit container) { this.scriptHandler.container = container; } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java index c20c653d5..69dcbb1b2 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java @@ -442,7 +442,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb } if (i == 10) { if (singleContainer) - setHandlerContainer(null); + setHandlerUnit(null); else this.handler.getScripts().remove(this.activeTab - 1); this.activeTab = 0; @@ -530,7 +530,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb if (guibutton.id == scriptLimit) { if (singleContainer) { if (getFirst() == null) - setHandlerContainer(new ScriptContainer(handler)); + setHandlerUnit(new ScriptContainer(handler)); else this.setScript(); this.activeTab = 1; @@ -595,7 +595,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb if (container == null) { container = new ScriptContainer(this.handler); if (singleContainer) - setHandlerContainer(container); + setHandlerUnit(container); else this.handler.getScripts().add(container); } @@ -646,7 +646,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb if (container == null && singleScript == null) { container = new ScriptContainer(this.handler); if (singleContainer) - setHandlerContainer(container); + setHandlerUnit(container); else this.handler.getScripts().add(container); } @@ -711,7 +711,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb int tab = compound.getInteger("Tab"); NBTTagCompound scriptCompound = compound.getCompoundTag("Script"); IScriptUnit container = IScriptUnit.createFromNBT(scriptCompound, this.handler); - this.setHandlerContainer(container); + this.setHandlerUnit(container); this.initGui(); } } @@ -743,7 +743,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb /** * Set the handler's container. Override if handler is not IScriptHandler. */ - protected void setHandlerContainer(IScriptUnit container) { + protected void setHandlerUnit(IScriptUnit container) { // Default implementation - subclasses may need to cast and set differently // e.g., ((LinkedItemScript) handler).container = container; } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java index 2a001b732..881e3dd6b 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java @@ -35,7 +35,7 @@ public class GuiScriptLinkedItem extends GuiScriptInterface { return ScriptContext.ITEM; } - protected void setHandlerContainer(IScriptUnit container) { + protected void setHandlerUnit(IScriptUnit container) { ((LinkedItemScript) handler).container = container; } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java index 176294f7e..83316a48d 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java @@ -49,7 +49,7 @@ public class GuiScriptRecipe extends GuiScriptInterface { return ScriptContext.GLOBAL; } - protected void setHandlerContainer(IScriptUnit container) { + protected void setHandlerUnit(IScriptUnit container) { ((RecipeScript) handler).container = container; }