diff --git a/src/main/java/noppes/npcs/client/NoppesUtil.java b/src/main/java/noppes/npcs/client/NoppesUtil.java index 4d5ac603f..40ebb048d 100644 --- a/src/main/java/noppes/npcs/client/NoppesUtil.java +++ b/src/main/java/noppes/npcs/client/NoppesUtil.java @@ -79,6 +79,11 @@ public class NoppesUtil { } public static void openFolder(File dir){ + if (dir == null || !dir.exists() || !dir.isDirectory()) { + // Log an error or simply return if there's nothing to open + return; + } + String s = dir.getAbsolutePath(); if (Util.getOSType() == Util.EnumOS.OSX) 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 b0d837a55..d686ef5f5 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java @@ -128,9 +128,6 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback this.getButton(103).enabled = !this.languages.isEmpty(); this.addLabel(new GuiNpcLabel(2, "gui.enabled", var9, this.guiTop + 36)); this.addButton(new GuiNpcButton(104, var9 + 60, this.guiTop + 31, 50, 20, new String[]{"gui.no", "gui.yes"}, this.scriptHandler.getEnabled() ? 1 : 0)); - if (this.player.worldObj.isRemote) { - this.addButton(new GuiNpcButton(106, var9, this.guiTop + 55, 150, 20, "script.openfolder")); - } this.addButton(new GuiNpcButton(109, var9, this.guiTop + 78, 80, 20, "gui.website")); this.addButton(new GuiNpcButton(112, var9 + 81, this.guiTop + 78, 80, 20, "gui.forum")); @@ -291,10 +288,6 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback this.displayGuiScreen(container1); } - if (guibutton.id == 106) { - NoppesUtil.openFolder(ScriptController.Instance.dir); - } - if (guibutton.id == 107) { ScriptContainer container = this.scriptHandler.container; if (container == null) { 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 4ca6ab9c6..0542a1bf5 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java @@ -139,9 +139,6 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall this.getButton(103).enabled = !this.languages.isEmpty(); this.addLabel(new GuiNpcLabel(2, "gui.enabled", var9, this.guiTop + 36)); this.addButton(new GuiNpcButton(104, var9 + 60, this.guiTop + 31, 50, 20, new String[]{"gui.no", "gui.yes"}, this.scriptHandler.getEnabled() ? 1 : 0)); - if (this.player.worldObj.isRemote) { - this.addButton(new GuiNpcButton(106, var9, this.guiTop + 55, 150, 20, "script.openfolder")); - } this.addButton(new GuiNpcButton(109, var9, this.guiTop + 78, 80, 20, "gui.website")); this.addButton(new GuiNpcButton(112, var9 + 81, this.guiTop + 78, 80, 20, "gui.forum")); @@ -302,10 +299,6 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall this.displayGuiScreen(container1); } - if (guibutton.id == 106) { - NoppesUtil.openFolder(ScriptController.Instance.dir); - } - if (guibutton.id == 107) { ScriptContainer container = this.scriptHandler.container; if (container == null) {