From 823b9bbb276fafa2f72089e05c6b05d06b12e944 Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 8 Jun 2023 11:28:14 -0400 Subject: [PATCH] Fix Sound Selection menu to be SubGui --- .../java/noppes/npcs/client/gui/GuiNPCLinesEdit.java | 2 +- .../noppes/npcs/client/gui/GuiNpcSoundSelection.java | 9 ++++----- .../java/noppes/npcs/client/gui/SubGuiNpcDialog.java | 5 +++-- .../noppes/npcs/client/gui/SubGuiNpcRangeProperties.java | 2 +- .../npcs/client/gui/advanced/GuiNPCSoundsMenu.java | 2 +- .../npcs/client/gui/global/GuiNPCQuestSelection.java | 2 -- .../java/noppes/npcs/client/gui/roles/GuiNpcBard.java | 4 ++-- .../npcs/client/gui/roles/SubGuiNpcConversationLine.java | 2 +- 8 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java index 9598495c0..e4bef9e2b 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java @@ -50,7 +50,7 @@ public class GuiNPCLinesEdit extends GuiNPCInterface2 implements IGuiData { GuiNpcButton button = (GuiNpcButton) guibutton; field = getTextField(button.id + 8); - NoppesUtil.openGUI(player, gui = new GuiNpcSoundSelection(npc, this, field.getText())); + setSubGui(gui = new GuiNpcSoundSelection(this, field.getText())); } @Override diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcSoundSelection.java b/src/main/java/noppes/npcs/client/gui/GuiNpcSoundSelection.java index 58961e34d..9a3e3012b 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcSoundSelection.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcSoundSelection.java @@ -14,19 +14,18 @@ import noppes.npcs.entity.EntityNPCInterface; import java.util.*; -public class GuiNpcSoundSelection extends GuiNPCInterface{ +public class GuiNpcSoundSelection extends SubGuiInterface { public GuiNPCStringSlot slot; private String domain; - private GuiScreen parent; + private String up = "..<" + StatCollector.translateToLocal("gui.up") + ">.."; private HashMap> domains = new HashMap>(); - public GuiNpcSoundSelection(EntityNPCInterface npc, GuiScreen parent, String sound) + public GuiNpcSoundSelection(GuiScreen parent, String sound) { - super(npc); SoundHandler handler = Minecraft.getMinecraft().getSoundHandler(); SoundRegistry registry = ObfuscationReflectionHelper.getPrivateValue(SoundHandler.class, handler, 4); @@ -39,7 +38,7 @@ public class GuiNpcSoundSelection extends GuiNPCInterface{ domains.put(location.getResourceDomain(), list); } drawDefaultBackground = false; - this.parent = parent; + this.parent = parent; } public void initGui() diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java index 65c6f681d..d8fd92fcd 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java @@ -84,14 +84,15 @@ public class SubGuiNpcDialog extends SubGuiInterface implements ISubGuiListener, setSubGui(new SubGuiNpcDialogOptions(dialog)); } if(id == 7 && dialog.id >= 0){ - this.setSubGui(new GuiNPCQuestSelection(this, dialog.quest)); + setSubGui(new GuiNPCQuestSelection(this, dialog.quest)); } if(id == 8 && dialog.id >= 0){ dialog.quest = -1; + parent.dialogQuestName = ""; initGui(); } if(id == 9 && dialog.id >= 0){ - NoppesUtil.openGUI(player, new GuiNpcSoundSelection(npc, this, getTextField(2).getText())); + setSubGui(new GuiNpcSoundSelection(this, getTextField(2).getText())); } if(id == 10){ setSubGui(new SubGuiNpcDialogExtra(dialog)); diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java index a859f9e05..9142eeca3 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java @@ -115,7 +115,7 @@ public class SubGuiNpcRangeProperties extends SubGuiInterface implements ITextfi int id = guibutton.id; if(id == 7) { - NoppesUtil.openGUI(player, gui = new GuiNpcSoundSelection(npc, parent, getTextField(7).getText())); + setSubGui(gui = new GuiNpcSoundSelection(parent, getTextField(7).getText())); } if(id == 66) { diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java index ab4bbefbb..16132285c 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java @@ -50,7 +50,7 @@ public class GuiNPCSoundsMenu extends GuiNPCInterface2 implements ITextfieldList npc.advanced.disablePitch =((GuiNpcButton)button).getValue() == 0; else{ selectedField = getTextField(button.id); - NoppesUtil.openGUI(player, gui = new GuiNpcSoundSelection(npc, this, selectedField.getText())); + setSubGui(gui = new GuiNpcSoundSelection(this, selectedField.getText())); } } diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCQuestSelection.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCQuestSelection.java index 0872533e9..9d956f786 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCQuestSelection.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCQuestSelection.java @@ -12,7 +12,6 @@ import java.util.Vector; public class GuiNPCQuestSelection extends SubGuiInterface implements IScrollData { private GuiNPCStringSlot slot; - private final GuiScreen parent; private HashMap data; private boolean selectCategory = true; public GuiSelectionListener listener; @@ -22,7 +21,6 @@ public class GuiNPCQuestSelection extends SubGuiInterface implements IScrollData { drawDefaultBackground = false; title = "Select Quest Category"; - this.parent = parent; data = new HashMap(); this.quest = quest; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java index d79ea5025..2c2fc76db 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java @@ -64,8 +64,8 @@ public class GuiNpcBard extends GuiNPCInterface2 GuiNpcButton button = (GuiNpcButton) guibutton; if(button.id == 0) { - gui = new GuiNpcSoundSelection(npc, this, job.song); - NoppesUtil.openGUI(player, gui); + + setSubGui(gui = new GuiNpcSoundSelection(this, job.song)); job.song = ""; MusicController.Instance.stopMusic(); } diff --git a/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java b/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java index 44dbb739d..db8dbb9d1 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java +++ b/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java @@ -44,7 +44,7 @@ public class SubGuiNpcConversationLine extends SubGuiInterface implements ITextf protected void actionPerformed(GuiButton guibutton){ int id = guibutton.id; if(id == 1){ - NoppesUtil.openGUI(player, gui = new GuiNpcSoundSelection(npc, parent, sound)); + setSubGui(gui = new GuiNpcSoundSelection(parent, sound)); } if(id == 2){ sound = "";