diff --git a/build.gradle b/build.gradle index 86bf1de90..636927542 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.4" +version = "1.4.2" group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 2a41ab64e..e6fb99756 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -61,7 +61,7 @@ import noppes.npcs.entity.old.EntityNpcNagaMale; import noppes.npcs.entity.old.EntityNpcSkeleton; import noppes.npcs.scripted.wrapper.WrapperNpcAPI; -@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.4") +@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.4.2") public class CustomNpcs { @ConfigProp(info = "Disable Chat Bubbles") diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java index 27c22153b..3c20cc863 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java @@ -79,7 +79,7 @@ public class SubGuiNpcDialogExtra extends SubGuiInterface implements ISubGuiList if(button.id == 15){ dialog.disableEsc = button.getValue() == 1; } - if(button.id == 15){ + if(button.id == 16){ dialog.darkenScreen = button.getValue() == 1; } if(button.id == 13){ diff --git a/src/main/java/noppes/npcs/controllers/Dialog.java b/src/main/java/noppes/npcs/controllers/Dialog.java index 730d36289..8606491ce 100644 --- a/src/main/java/noppes/npcs/controllers/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/Dialog.java @@ -60,7 +60,8 @@ public class Dialog implements ICompatibilty, IDialog { else showWheel = true; disableEsc = compound.getBoolean("DialogDisableEsc"); - + darkenScreen = compound.getBoolean("DialogDarkenScreen"); + NBTTagList options = compound.getTagList("Options", 10); HashMap newoptions = new HashMap(); for(int iii = 0; iii < options.tagCount();iii++){ @@ -91,6 +92,7 @@ public class Dialog implements ICompatibilty, IDialog { compound.setBoolean("DialogHideNPC", hideNPC); compound.setBoolean("DialogShowWheel", showWheel); compound.setBoolean("DialogDisableEsc", disableEsc); + compound.setBoolean("DialogDarkenScreen", darkenScreen); if(sound != null && !sound.isEmpty()) compound.setString("DialogSound", sound); @@ -134,6 +136,7 @@ public class Dialog implements ICompatibilty, IDialog { dialog.hideNPC = hideNPC; dialog.showWheel = showWheel; dialog.disableEsc = disableEsc; + dialog.darkenScreen = darkenScreen; for(int slot : options.keySet()){ DialogOption option = options.get(slot);