From 4f38edc1471f40b44da8ae1931d60668a2eacf79 Mon Sep 17 00:00:00 2001 From: luisc Date: Fri, 14 Jan 2022 17:37:09 -0600 Subject: [PATCH] Limited config NpcNavRange to 96. Added darken screen option to dialogs. --- src/main/java/noppes/npcs/CustomNpcs.java | 6 +++++- .../java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java | 6 ++++++ .../noppes/npcs/client/gui/player/GuiDialogInteract.java | 1 + src/main/java/noppes/npcs/controllers/Dialog.java | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 55fc31c23..cbb271971 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -69,7 +69,7 @@ public class CustomNpcs { private static int NewEntityStartId = 0; - @ConfigProp(info = "Navigation search range for NPCs. Not recommended to increase if you have a slow pc or on a server") + @ConfigProp(info = "Navigation search range for NPCs. Not recommended to increase if you have a slow pc or on a server. Minimum of 16, maximum of 96.") public static int NpcNavRange = 32; @ConfigProp(info = "Set to true if you want the dialog command option to be able to use op commands like tp etc") @@ -167,6 +167,10 @@ public class CustomNpcs { if (NpcNavRange < 16) { NpcNavRange = 16; } + if (NpcNavRange > 96) { + NpcNavRange = 96; + } + EnchantInterface.load(); CustomItems.load(); diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java index df50d234c..27c22153b 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java @@ -55,6 +55,9 @@ public class SubGuiNpcDialogExtra extends SubGuiInterface implements ISubGuiList addButton(new GuiNpcButtonYesNo(15, guiLeft + 120, y += 22, dialog.disableEsc)); addLabel(new GuiNpcLabel(15, "dialog.disableEsc", guiLeft + 4, y + 5)); + + addButton(new GuiNpcButtonYesNo(16, guiLeft + 120, y += 22, dialog.darkenScreen)); + addLabel(new GuiNpcLabel(16, "Darken Screen", guiLeft + 4, y + 5)); this.addButton(new GuiNpcButton(66, guiLeft + 82, guiTop + 192,98, 20, "gui.done")); @@ -76,6 +79,9 @@ public class SubGuiNpcDialogExtra extends SubGuiInterface implements ISubGuiList if(button.id == 15){ dialog.disableEsc = button.getValue() == 1; } + if(button.id == 15){ + dialog.darkenScreen = button.getValue() == 1; + } if(button.id == 13){ setSubGui(new SubGuiMailmanSendSetup(dialog.mail, getParent())); } 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 b6864bb1d..20740533c 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java @@ -64,6 +64,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose grabMouse(dialog.showWheel); guiTop = (height - ySize); calculateRowHeight(); + this.drawDefaultBackground = dialog.darkenScreen; } public void grabMouse(boolean grab){ diff --git a/src/main/java/noppes/npcs/controllers/Dialog.java b/src/main/java/noppes/npcs/controllers/Dialog.java index 4b250ba13..730d36289 100644 --- a/src/main/java/noppes/npcs/controllers/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/Dialog.java @@ -30,6 +30,7 @@ public class Dialog implements ICompatibilty, IDialog { public boolean hideNPC = false; public boolean showWheel = false; public boolean disableEsc = false; + public boolean darkenScreen = true; public boolean hasDialogs(EntityPlayer player) { for(DialogOption option: options.values())