From 66540a054dc6b6568fb6b6a03c7d47b575c2ab7c Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 30 Jul 2023 16:45:49 -0400 Subject: [PATCH] Reverse Default Dialog Alignment --- .../java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java | 2 +- .../noppes/npcs/client/gui/player/GuiDialogInteract.java | 6 +++--- src/main/java/noppes/npcs/controllers/data/Dialog.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java index 126b51751..1ba143bd4 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java @@ -98,7 +98,7 @@ public class SubGuiNpcDialogVisual extends SubGuiInterface implements ISubGuiLis addButton(new GuiNpcButton(10, guiLeft + 70, y += 22, 50, 20, new String[]{"gui.text", "gui.option", "display.fixed"}, dialog.titlePos)); addLabel(new GuiNpcLabel(10, "dialog.titlePos", guiLeft + 4, y + 5)); - addButton(new GuiNpcButton(24, guiLeft + 192, y, 50, 20, new String[]{"display.top", "display.bottom"}, dialog.alignment)); + addButton(new GuiNpcButton(24, guiLeft + 192, y, 50, 20, new String[]{"display.bottom", "display.top"}, dialog.alignment)); addLabel(new GuiNpcLabel(27, "display.alignment", guiLeft + 126, y + 5)); addTextField(new GuiNpcTextField(11, this, guiLeft + 120, y += 25, 40, 20, String.valueOf(dialog.textWidth))); diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java index 4a61e76b4..cb124f778 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java @@ -503,7 +503,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose int height = count - totalRows + lineOffset; int screenPos = optionStart; int y = (height * ClientProxy.Font.height()) + screenPos + scrollY; - if (dialog.alignment == 0) { + if (dialog.alignment == 1) { height = count - totalRows + lineOffset + 1; screenPos = optionStart - dialog.textHeight + ClientProxy.Font.height() + (totalRows - lineOffset); @@ -515,7 +515,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose } if (block.titlePos == 0 || mainDialogText) { - if (dialog.alignment == 0) { + if (dialog.alignment == 1) { if (y < optionStart - dialog.textHeight || y > optionStart - ClientProxy.Font.height()/2f) { return; } @@ -584,7 +584,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose textSoundEnabled = !textSoundEnabled; } - if (dialog.alignment == 0 && totalRows * ClientProxy.Font.height() > dialog.textHeight) { + if (dialog.alignment == 1 && totalRows * ClientProxy.Font.height() > dialog.textHeight) { if ((i == mc.gameSettings.keyBindBack.getKeyCode() || i == 201) && scrollY < totalRows * ClientProxy.Font.height()) {//Page up scrollY += ClientProxy.Font.height() * 2; } diff --git a/src/main/java/noppes/npcs/controllers/data/Dialog.java b/src/main/java/noppes/npcs/controllers/data/Dialog.java index 4260ea109..9f6d40c51 100644 --- a/src/main/java/noppes/npcs/controllers/data/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/data/Dialog.java @@ -39,8 +39,8 @@ public class Dialog implements ICompatibilty, IDialog { public boolean darkenScreen = true; public boolean showOptionLine = true; - //0 - Top, 1 - Bottom, 2 (Not implemented yet) - Center - public byte alignment = 1; + //0 - Bottom, 1 - Top, 2 (Not implemented yet) - Center + public byte alignment = 0; public boolean renderGradual = false; public boolean showPreviousBlocks = true;