From 8c8f37e75d24c45dfdfee9751715a008c272387e Mon Sep 17 00:00:00 2001
From: bigguy345 <monkeybar3200@gmail.com>
Date: Tue, 13 Jan 2026 19:13:31 +0200
Subject: [PATCH] more merge conflict resolution

---
 src/main/java/noppes/npcs/client/gui/GuiScript.java         | 6 +++---
 .../java/noppes/npcs/client/gui/script/GuiScriptBlock.java  | 1 +
 .../noppes/npcs/client/gui/script/GuiScriptInterface.java   | 2 +-
 .../java/noppes/npcs/client/gui/script/GuiScriptItem.java   | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/noppes/npcs/client/gui/GuiScript.java b/src/main/java/noppes/npcs/client/gui/GuiScript.java
index 4349b1ef6..83f38b011 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiScript.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiScript.java
@@ -184,7 +184,7 @@ public class GuiScript extends GuiScriptInterface {
                 scroll.setList(container.scripts);
             addScroll(scroll);
         }
-    }
+    
     
     private void initSettingsView() {
         addLabel(new GuiNpcLabel(0, "script.console", guiLeft + 4, guiTop + 16));
@@ -323,8 +323,8 @@ public class GuiScript extends GuiScriptInterface {
     public void mouseClicked(int mouseX, int mouseY, int mouseButton) {
         // Check if click is within autocomplete menu bounds and consume it if so
         GuiScriptTextArea activeArea = getActiveScriptArea();
-        boolean isOverAutocomplete = activeArea != null
-                && activeArea.isPointOnAutocompleteMenu(mouseX, mouseY);
+        boolean isOverAutocomplete = activeArea != null;
+              //  && activeArea.isPointOnAutocompleteMenu(mouseX, mouseY);
         if (isOverAutocomplete) {
             activeArea.mouseClicked(mouseX, mouseY, mouseButton);
             return;
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java
index 5b9762a96..b11947ee7 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java
@@ -5,6 +5,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.api.handler.IScriptHookHandler;
 import noppes.npcs.blocks.tiles.TileScripted;
 import noppes.npcs.constants.ScriptContext;
+import noppes.npcs.controllers.ScriptHookController;
 
 import java.util.ArrayList;
 
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 b2da09a40..90e7e7d06 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
@@ -79,7 +79,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
     }
 
     /** Fullscreen toggle button drawn at top-right of viewport */
-    private final FullscreenButton fullscreenButton = new FullscreenButton();
+    public final FullscreenButton fullscreenButton = new FullscreenButton();
     
     public GuiScriptInterface() {
         this.drawDefaultBackground = true;
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java
index 5d23aca89..fceaeb6ed 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java
@@ -6,7 +6,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.CustomItems;
 import noppes.npcs.NBTTags;
+import noppes.npcs.api.handler.IScriptHookHandler;
 import noppes.npcs.constants.ScriptContext;
+import noppes.npcs.controllers.ScriptHookController;
 import noppes.npcs.scripted.item.ScriptCustomItem;
 
 import java.util.*;