GUI fixes and small bug fixes to Script GUIs, Overlay GUI, etc

This commit is contained in:
Kam committed 2026-01-22 22:52:04 -05:00
1 parent d560c23241
commit 31aac0d6b3
4 files changed
+55 -28

No files matched your search

@@ -80,16 +80,18 @@ public class GuiScript extends GuiScriptInterface {
public void initGui() {
super.initGui();
this.guiTop += 10;
// ==================== TOP BUTTONS ====================
GuiMenuTopButton top;
addTopButton(top = new GuiMenuTopButton(13, guiLeft + 4, guiTop - 17, "script.scripts"));
addTopButton(new GuiMenuTopButton(16, guiLeft + (xSize - 102), guiTop - 17, "eventscript.eventScripts"));
addTopButton(new GuiMenuTopButton(17, guiLeft + (xSize - 22), guiTop - 17, "X"));
top.active = showScript;
addTopButton(top = new GuiMenuTopButton(14, top, "gui.settings"));
top.active = !showScript;
addTopButton(new GuiMenuTopButton(15, top, "gui.website"));
// ==================== TOP BUTTONS (hidden in fullscreen) ====================
if (!isFullscreen) {
GuiMenuTopButton top;
addTopButton(top = new GuiMenuTopButton(13, guiLeft + 4, guiTop - 17, "script.scripts"));
addTopButton(new GuiMenuTopButton(16, guiLeft + (xSize - 102), guiTop - 17, "eventscript.eventScripts"));
addTopButton(new GuiMenuTopButton(17, guiLeft + (xSize - 22), guiTop - 17, "X"));
top.active = showScript;
addTopButton(top = new GuiMenuTopButton(14, top, "gui.settings"));
top.active = !showScript;
addTopButton(new GuiMenuTopButton(15, top, "gui.website"));
}
if (showScript) {
initScriptView();
@@ -166,10 +168,8 @@ public class GuiScript extends GuiScriptInterface {
int scrollbarOffset = activeArea.hasVerticalScrollbar() ? -8 : -2;
fullscreenButton.initGui(editorX + editorWidth, editorY, scrollbarOffset);
// Set language and script context for proper syntax highlighting and autocomplete
activeArea.setLanguage(script.getLanguage());
activeArea.setScriptContext(ScriptContext.NPC);
// ==================== RIGHT PANEL (hidden in fullscreen) ====================
if (!isFullscreen) {
addButton(new GuiNpcButton(102, guiLeft + 315, guiTop + 4, 50, 20, "gui.clear"));
addButton(new GuiNpcButton(101, guiLeft + 366, guiTop + 4, 50, 20, "gui.paste"));
addButton(new GuiNpcButton(100, guiLeft + 315, guiTop + 25, 50, 20, "gui.copy"));
@@ -183,11 +183,13 @@ public class GuiScript extends GuiScriptInterface {
scroll.setList(container.scripts);
addScroll(scroll);
}
}
private void initSettingsView() {
addLabel(new GuiNpcLabel(0, "script.console", guiLeft + 4, guiTop + 16));
getTopButton(14).active = true;
if (getTopButton(14) != null)
getTopButton(14).active = true;
GuiNpcTextArea consoleArea = new GuiNpcTextArea(2, this, guiLeft + 4, guiTop + 26, 226, 186, getConsoleText());
consoleArea.canEdit = false;
@@ -269,7 +271,7 @@ public class GuiScript extends GuiScriptInterface {
}
if (guibutton.id == 16) {
close();
GuiScriptInterface.open(this, new DataScript(npc));
GuiScriptInterface.open(this, this.script);
}
if (guibutton.id == 17) {
close();
@@ -342,5 +344,24 @@ public class GuiScript extends GuiScriptInterface {
initGui();
}
}
@Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks);
// Draw fullscreen button when in script view (GuiScript uses 0-based activeTab)
if (showScript) {
fullscreenButton.draw(mouseX, mouseY);
}
}
@Override
public void mouseClicked(int mouseX, int mouseY, int mouseButton) {
// Check fullscreen button first when in script view
if (showScript && fullscreenButton.mouseClicked(mouseX, mouseY, mouseButton)) {
return;
}
super.mouseClicked(mouseX, mouseY, mouseButton);
}
}
@@ -354,7 +354,8 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
super.drawScreen(mouseX, mouseY, partialTicks);
// Draw fullscreen button on top of everything when on script editor tab
if (this.activeTab > 0) {
// Skip for useSettingsToggle GUIs (like GuiScript) - they handle this themselves
if (this.activeTab > 0 && !useSettingsToggle && !handler.isSingleContainer()) {
fullscreenButton.draw(mouseX, mouseY);
}
}
@@ -364,7 +365,8 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
@Override
public void mouseClicked(int mouseX, int mouseY, int mouseButton) {
// Check fullscreen button first when on script editor tab
if (this.activeTab > 0 && fullscreenButton.mouseClicked(mouseX, mouseY, mouseButton)) {
// Skip for useSettingsToggle GUIs (like GuiScript) - they handle this themselves
if (this.activeTab > 0 && !useSettingsToggle && !handler.isSingleContainer() && fullscreenButton.mouseClicked(mouseX, mouseY, mouseButton)) {
return;
}
@@ -108,7 +108,7 @@ public abstract class GuiNPCInterface extends GuiScreen {
}
//Important for GuiScriptTextArea
for (GuiNpcTextField tf : textfields.values())
for (GuiNpcTextField tf : textfields.values())
tf.initGui();
}
@@ -264,8 +264,8 @@ public abstract class GuiNPCInterface extends GuiScreen {
else
close();
}
if (subgui != null)
subgui.keyTyped(c, i);
for (GuiNpcTextField tf : textfields.values())
@@ -274,7 +274,7 @@ public abstract class GuiNPCInterface extends GuiScreen {
for (GuiScrollWindow guiScrollableComponent : scrollWindows.values()) {
guiScrollableComponent.keyTyped(c, i);
}
}
public void onGuiClosed() {
@@ -284,7 +284,7 @@ public abstract class GuiNPCInterface extends GuiScreen {
public void closeOnEsc(Supplier<Boolean> close) {
this.closeOnEscSupplier = close;
}
public void close() {
if(GuiNpcTextField.activeTextfield != null)
GuiNpcTextField.unfocus();
@@ -493,12 +493,16 @@ public class GuiScriptTextArea extends GuiNpcTextField {
int maxScroll = Math.max(0, getPaddedLineCount() - container.visibleLines);
// Handle mouse wheel scroll
int wheelDelta = ((GuiNPCInterface) listener).mouseScroll = Mouse.getDWheel();
if (listener instanceof GuiNPCInterface) {
((GuiNPCInterface) listener).mouseScroll = wheelDelta;
// Handle mouse wheel scroll - only consume when mouse is over this text area
boolean isMouseOverTextArea = xMouse >= x && xMouse < x + width && yMouse >= y && yMouse < y + height;
int wheelDelta = 0;
if (isMouseOverTextArea) {
wheelDelta = Mouse.getDWheel();
if (listener instanceof GuiNPCInterface) {
((GuiNPCInterface) listener).mouseScroll = wheelDelta;
}
boolean canScroll = !KEYS_OVERLAY.isVisible() || KEYS_OVERLAY.isVisible() && !KEYS_OVERLAY.aboveOverlay;
if (wheelDelta != 0 && canScroll)
if (wheelDelta != 0 && canScroll)
scroll.applyWheelScroll(wheelDelta, maxScroll);
}