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 8da3d089c..7e1bfa0e1 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java @@ -27,7 +27,6 @@ import noppes.npcs.constants.ScriptContext; import noppes.npcs.controllers.data.ForgeDataScript; import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.controllers.data.IScriptUnit; -import noppes.npcs.controllers.data.SingleScriptHandler; import noppes.npcs.scripted.item.ScriptCustomItem; import org.lwjgl.opengl.Display; @@ -92,9 +91,9 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb * Create a GuiScriptInterface for a single script without a handler. * Wraps the script in a SingleScriptHandler automatically. */ - public static GuiScriptInterface create(GuiScreen parent, IScriptUnit script) { + public static GuiScriptInterface create(GuiScreen parent, IScriptHandler handler) { GuiScriptInterface gui = new GuiScriptInterface(); - gui.handler = new SingleScriptHandler(script); + gui.handler = handler; gui.parent = parent; gui.singleContainer = true; gui.displayGuiScreen(gui); diff --git a/src/main/java/noppes/npcs/controllers/data/DataScript.java b/src/main/java/noppes/npcs/controllers/data/DataScript.java index 6e07223a8..cd6f4bb54 100644 --- a/src/main/java/noppes/npcs/controllers/data/DataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/DataScript.java @@ -222,24 +222,6 @@ public class DataScript implements IScriptHandler { return map; } - public Map getConsoleText() { - TreeMap map = new TreeMap<>(); - int tab = 0; - for (IScriptUnit script : this.getScripts()) { - ++tab; - - for (Map.Entry longStringEntry : script.getConsole().entrySet()) { - map.put(longStringEntry.getKey(), " tab " + tab + ":\n" + longStringEntry.getValue()); - } - } - return map; - } - - public void clearConsole() { - for (IScriptUnit script : this.getScripts()) { - script.clearConsole(); - } - } @Override public void callScript(EnumScriptType type, Event event) { diff --git a/src/main/java/noppes/npcs/controllers/data/SingleScriptHandler.java b/src/main/java/noppes/npcs/controllers/data/SingleScriptHandler.java deleted file mode 100644 index 165952090..000000000 --- a/src/main/java/noppes/npcs/controllers/data/SingleScriptHandler.java +++ /dev/null @@ -1,95 +0,0 @@ -package noppes.npcs.controllers.data; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; -import noppes.npcs.constants.EnumScriptType; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Simple IScriptHandler implementation for single scripts that don't have their own handler. - * Useful for standalone scripts like OverlayScript that need to be edited in GuiScriptInterface. - */ -public class SingleScriptHandler implements IScriptHandler { - private final IScriptUnit script; - private final List scripts = new ArrayList<>(); - - public SingleScriptHandler(IScriptUnit script) { - this.script = script; - this.scripts.add(script); - } - - @Override - public void callScript(EnumScriptType type, Event event) { - // No-op: single scripts don't respond to standard hook calls - } - - @Override - public void callScript(String hookName, Event event) { - // No-op: single scripts don't respond to standard hook calls - } - - public boolean isClient() { - return FMLCommonHandler.instance() - .getEffectiveSide() - .isClient(); - } - - @Override - public boolean getEnabled() { - return true; - } - - @Override - public void setEnabled(boolean enabled) { - // No-op: single scripts are always enabled - } - - @Override - public String getLanguage() { - return script.getLanguage(); - } - - @Override - public void setLanguage(String language) { - // No-op: language is determined by script type - } - - @Override - public void setScripts(List list) { - // No-op: single script handler only manages one script - } - - @Override - public List getScripts() { - return scripts; - } - - @Override - public String noticeString() { - return ""; - } - - @Override - public Map getConsoleText() { - return script.getConsole(); - } - - @Override - public void clearConsole() { - script.clearConsole(); - } - - @Override - public IScriptUnit createJaninoScriptUnit() { - return null; // Single script handlers don't create new scripts - } - - @Override - public boolean supportsJanino() { - return script.isJanino(); - } -}