upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 03:47:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
luisc committed 2022-01-20 20:27:39 -06:00
2 parents 83756381e4 52f342302c
commit b9bc1e5ed7
4 files changed
+7 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/CustomNpcs.java
+1 -1
View File
@@ -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")
src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java
+1 -1
View File
@@ -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){
src/main/java/noppes/npcs/controllers/Dialog.java
+4 -1
View File
@@ -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<Integer,DialogOption> newoptions = new HashMap<Integer,DialogOption>();
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);