From cce4e7bcc70fd5b5c6e03576b44ab2995099ae8f Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Thu, 8 Jun 2023 12:00:45 -0400
Subject: [PATCH] Fix Sound Selection

---
 .../npcs/client/gui/GuiNpcSoundSelection.java   | 17 +++++++++++++----
 .../client/gui/SubGuiNpcAvailabilityQuest.java  |  1 -
 .../noppes/npcs/client/gui/SubGuiNpcDialog.java |  9 ++++++++-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcSoundSelection.java b/src/main/java/noppes/npcs/client/gui/GuiNpcSoundSelection.java
index 9a3e3012b..be8ecce9d 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNpcSoundSelection.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNpcSoundSelection.java
@@ -11,13 +11,15 @@ import net.minecraft.util.StatCollector;
 import noppes.npcs.client.controllers.MusicController;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.entity.EntityNPCInterface;
+import org.lwjgl.Sys;
 
 import java.util.*;
 
 public class GuiNpcSoundSelection extends SubGuiInterface {
 
 	public GuiNPCStringSlot slot;
-	private String domain;
+	public String domain;
+	private final GuiScreen parent;
 
 	
 	private String up = "..<" + StatCollector.translateToLocal("gui.up") + ">..";
@@ -86,13 +88,14 @@ public class GuiNpcSoundSelection extends SubGuiInterface {
 			initGui();
 		}
 		else{
+			System.out.println("OK");
     		if(parent instanceof GuiNPCInterface){
     			((GuiNPCInterface)parent).elementClicked();
     		}
-    		else if(parent instanceof GuiNPCInterface2){
+    		else if(this.parent instanceof GuiNPCInterface2){
     			((GuiNPCInterface2)parent).elementClicked();
     		}
-			displayGuiScreen(parent);
+			close();
 		}
 	}
 
@@ -118,7 +121,13 @@ public class GuiNpcSoundSelection extends SubGuiInterface {
 	public void save() {
 		
 	}
-	
+	public void close() {
+		this.save();
+		super.close();
+	}
+
+
+
 	public String getSelected(){
 		if(slot.selected == null || slot.selected.isEmpty())
 			return "";
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java
index 2bb6b4319..bb7ed59b0 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java
@@ -12,7 +12,6 @@ import noppes.npcs.controllers.data.Quest;
 
 public class SubGuiNpcAvailabilityQuest extends SubGuiInterface implements GuiSelectionListener, IGuiData {
 	private Availability availabitily;
-	private boolean selectFaction = false;
 	private int slot = 0;
 	
     public SubGuiNpcAvailabilityQuest(Availability availabitily){
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java
index d8fd92fcd..abfac5824 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java
@@ -16,6 +16,7 @@ public class SubGuiNpcDialog extends SubGuiInterface implements ISubGuiListener,
 	public int dialogCategoryID;
 	public Dialog dialog;
 	private final GuiNPCManageDialogs parent;
+	private GuiNpcSoundSelection gui;
 
 	public SubGuiNpcDialog(GuiNPCManageDialogs parent, Dialog dialog, int catId)
 	{
@@ -92,7 +93,7 @@ public class SubGuiNpcDialog extends SubGuiInterface implements ISubGuiListener,
 			initGui();
 		}
 		if(id == 9 && dialog.id >= 0){
-			setSubGui(new GuiNpcSoundSelection(this, getTextField(2).getText()));
+			setSubGui(gui = new GuiNpcSoundSelection(this, getTextField(2).getText()));
 		}
 		if(id == 10){
 			setSubGui(new SubGuiNpcDialogExtra(dialog));
@@ -138,6 +139,12 @@ public class SubGuiNpcDialog extends SubGuiInterface implements ISubGuiListener,
 		}
 	}
 
+	@Override
+	public void elementClicked(){
+		getTextField(2).setText(gui.getSelected());
+		unFocused(getTextField(2));
+	}
+
 	@Override
 	public void selected(int ob, String name) {
 		dialog.quest = ob;