diff --git a/src/main/java/noppes/npcs/client/gui/GuiScript.java b/src/main/java/noppes/npcs/client/gui/GuiScript.java index 8b0d7d24a..206526c65 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiScript.java +++ b/src/main/java/noppes/npcs/client/gui/GuiScript.java @@ -105,6 +105,7 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall textArea.init(guiLeft + 74, guiTop + 4, 239, 208, container == null ? "" : container.script); textArea.enableCodeHighlighting(); textArea.setListener(this); + this.closeOnEsc(textArea::closeOnEsc); this.addTextField(textArea); addButton(new GuiNpcButton(102, guiLeft + 315, guiTop + 4, 50, 20, "gui.clear")); 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 f3a4d219d..22db14a2e 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java @@ -118,7 +118,9 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback textArea.init(this.guiLeft + 1 + yoffset, this.guiTop + yoffset, this.xSize - 108 - yoffset, (int) ((double) this.ySize * 0.96) - yoffset * 2, container == null ? "" : container.script); textArea.enableCodeHighlighting(); textArea.setListener(this); + this.closeOnEsc(textArea::closeOnEsc); this.addTextField(textArea); + int left1 = this.guiLeft + this.xSize - 104; this.addButton(new GuiNpcButton(102, left1, this.guiTop + yoffset, 60, 20, "gui.clear")); this.addButton(new GuiNpcButton(101, left1 + 61, this.guiTop + yoffset, 60, 20, "gui.paste")); 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 4afa22144..99fbf7d3e 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java @@ -119,7 +119,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb textArea.enableCodeHighlighting(); textArea.setListener(this); - + this.closeOnEsc(textArea::closeOnEsc); this.addTextField(textArea); int left1 = this.guiLeft + this.xSize - 104; 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 a6803d2c4..8c22c2dd8 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java @@ -129,7 +129,9 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall textArea.init(this.guiLeft + 1 + yoffset, this.guiTop + yoffset, this.xSize - 108 - yoffset, (int) ((double) this.ySize * 0.96) - yoffset * 2, container == null ? "" : container.script); textArea.enableCodeHighlighting(); textArea.setListener(this); + this.closeOnEsc(textArea::closeOnEsc); this.addTextField(textArea); + int left1 = this.guiLeft + this.xSize - 104; this.addButton(new GuiNpcButton(102, left1, this.guiTop + yoffset, 60, 20, "gui.clear")); this.addButton(new GuiNpcButton(101, left1 + 61, this.guiTop + yoffset, 60, 20, "gui.paste")); 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 fd93d8fe3..0215fd403 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java @@ -137,7 +137,9 @@ public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback textArea.init(this.guiLeft + 1 + yoffset, this.guiTop + yoffset, this.xSize - 108 - yoffset, (int) ((double) this.ySize * 0.96) - yoffset * 2, container == null ? "" : container.script); textArea.enableCodeHighlighting(); textArea.setListener(this); + this.closeOnEsc(textArea::closeOnEsc); this.addTextField(textArea); + int left1 = this.guiLeft + this.xSize - 104; this.addButton(new GuiNpcButton(102, left1, this.guiTop + yoffset, 60, 20, "gui.clear")); this.addButton(new GuiNpcButton(101, left1 + 61, this.guiTop + yoffset, 60, 20, "gui.paste")); diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java index 67aa5f748..55cb47cb7 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java @@ -1470,6 +1470,10 @@ public class GuiScriptTextArea extends GuiNpcTextField { setCursor(result.newCursorPosition, false); } + public boolean closeOnEsc(){ + return !searchBar.isVisible() && !goToLineDialog.isVisible(); + } + // ==================== KEYBOARD MODIFIERS ==================== private boolean isAltKeyDown() {