From c99a4f8439494c067e9b6dcfbb6446211adcd6e2 Mon Sep 17 00:00:00 2001 From: "Luis C.M" Date: Thu, 9 Jun 2022 02:30:01 -0500 Subject: [PATCH] Server-side dialog data fixes. --- ...ptions.java => SubGuiNpcDialogVisual.java} | 4 ++-- .../gui/global/GuiNPCManageDialogs.java | 2 +- .../noppes/npcs/controllers/data/Dialog.java | 20 ++++++++++++++----- 3 files changed, 18 insertions(+), 8 deletions(-) rename src/main/java/noppes/npcs/client/gui/{SubGuiNpcVisualOptions.java => SubGuiNpcDialogVisual.java} (98%) diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcVisualOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java similarity index 98% rename from src/main/java/noppes/npcs/client/gui/SubGuiNpcVisualOptions.java rename to src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java index 61d79ad58..3cd041fc1 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcVisualOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java @@ -15,7 +15,7 @@ import noppes.npcs.controllers.data.DialogImage; import java.util.ArrayList; import java.util.Collections; -public class SubGuiNpcVisualOptions extends SubGuiInterface implements ISubGuiListener, ITextfieldListener, ICustomScrollListener { +public class SubGuiNpcDialogVisual extends SubGuiInterface implements ISubGuiListener, ITextfieldListener, ICustomScrollListener { private final Dialog dialog; public GuiScreen parent2; @@ -26,7 +26,7 @@ public class SubGuiNpcVisualOptions extends SubGuiInterface implements ISubGuiLi private int selected = -1; private int lastColorClicked = -1; - public SubGuiNpcVisualOptions(Dialog dialog, GuiScreen parent) { + public SubGuiNpcDialogVisual(Dialog dialog, GuiScreen parent) { this.parent2 = parent; this.dialog = dialog; setBackground("menubg.png"); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java index ff3455fd8..5252bc50a 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java @@ -182,7 +182,7 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollData setSubGui(new SubGuiNpcDialogExtra(dialog, this)); } if(id == 11){ - setSubGui(new SubGuiNpcVisualOptions(dialog, this)); + setSubGui(new SubGuiNpcDialogVisual(dialog, this)); } } diff --git a/src/main/java/noppes/npcs/controllers/data/Dialog.java b/src/main/java/noppes/npcs/controllers/data/Dialog.java index 51375ed9a..438250582 100644 --- a/src/main/java/noppes/npcs/controllers/data/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/data/Dialog.java @@ -34,11 +34,6 @@ public class Dialog implements ICompatibilty, IDialog { public boolean disableEsc = false; public boolean darkenScreen = true; - - /** - * Add these variables to NBT reads & writes - */ - public boolean renderGradual = false; public boolean showPreviousBlocks = true; @@ -229,6 +224,21 @@ public class Dialog implements ICompatibilty, IDialog { dialog.showWheel = showWheel; dialog.disableEsc = disableEsc; dialog.darkenScreen = darkenScreen; + dialog.renderGradual = renderGradual; + dialog.showPreviousBlocks = showPreviousBlocks; + dialog.textSound = textSound; + dialog.textPitch = textPitch; + dialog.textWidth = textWidth; + dialog.textHeight = textHeight; + dialog.textOffsetX = textOffsetX; + dialog.textOffsetY = textOffsetY; + dialog.titleOffsetX = titleOffsetX; + dialog.titleOffsetY = titleOffsetY; + dialog.optionOffsetX = optionOffsetX; + dialog.optionOffsetY = optionOffsetY; + dialog.optionSpaceX = optionSpaceX; + dialog.optionSpaceY = optionSpaceY; + dialog.dialogImages = dialogImages; for(int slot : options.keySet()){ DialogOption option = options.get(slot);