From 702785476e6e2a14aed7952947fa9b4aeccf6aff Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Thu, 29 Feb 2024 20:33:29 -0500
Subject: [PATCH] Better Advanced GUI Organization

---
 .../client/gui/mainmenu/GuiNpcAdvanced.java   | 20 +++++++++----------
 .../assets/customnpcs/lang/en_US.lang         |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java
index 51ff99278..d05e8a0a5 100644
--- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java
+++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java
@@ -28,25 +28,25 @@ public class GuiNpcAdvanced extends GuiNPCInterface2 implements IGuiData
     public void initGui(){
     	super.initGui();
 		int y = guiTop + 10;
-		int gap = 21;
     	this.addButton(new GuiNpcButton(3, guiLeft + 85 + 160, y, 52, 20, "selectServer.edit"));
     	this.addButton(new GuiNpcButton(8, guiLeft + 85, y,155,20, new String[]{"role.none","role.trader","role.follower","role.bank","role.transporter", "role.mailman", NoppesStringUtils.translate("role.companion", "(WIP)")},npc.advanced.role.ordinal()));
     	getButton(3).setEnabled(npc.advanced.role != EnumRoleType.None && npc.advanced.role != EnumRoleType.Postman);
 
-    	this.addButton(new GuiNpcButton(4, guiLeft + 85 + 160, y += gap, 52, 20, "selectServer.edit"));
+    	this.addButton(new GuiNpcButton(4, guiLeft + 85 + 160, y += 22, 52, 20, "selectServer.edit"));
     	this.addButton(new GuiNpcButton(5, guiLeft + 85, y,155,20, new String[]{"job.none","job.bard","job.healer","job.guard","job.itemgiver","role.follower", "job.spawner", "job.conversation", "job.chunkloader"},npc.advanced.job.ordinal()));
 
    		getButton(4).setEnabled(npc.advanced.job != EnumJobType.None && npc.advanced.job != EnumJobType.ChunkLoader);
 
-    	this.addButton(new GuiNpcButton(7, guiLeft + 85, y += gap, 214, 20, "advanced.lines"));
-    	this.addButton(new GuiNpcButton(9, guiLeft + 85, y += gap, 214, 20, "menu.factions"));
-    	this.addButton(new GuiNpcButton(10, guiLeft + 85, y += gap, 214, 20, "dialog.dialogs"));
-    	this.addButton(new GuiNpcButton(11, guiLeft + 85, y += gap, 214, 20, "advanced.sounds"));
-    	this.addButton(new GuiNpcButton(12, guiLeft + 85, y += gap, 214, 20, "advanced.night"));
-    	this.addButton(new GuiNpcButton(13, guiLeft + 85, y += gap, 214, 20, "global.linked"));
-		this.addButton(new GuiNpcButton(14, guiLeft + 85, y += gap, 214, 20, "menu.tags"));
+    	this.addButton(new GuiNpcButton(7, guiLeft + 15, y += 22, 190, 20, "advanced.lines"));
+    	this.addButton(new GuiNpcButton(9, guiLeft + 208, y, 190, 20, "menu.factions"));
 
-        // FIX THIS KAM
+        this.addButton(new GuiNpcButton(10, guiLeft + 15, y += 22, 190, 20, "dialog.dialogs"));
+    	this.addButton(new GuiNpcButton(11, guiLeft + 208, y, 190, 20, "advanced.sounds"));
+
+        this.addButton(new GuiNpcButton(12, guiLeft + 15, y += 22, 190, 20, "advanced.night"));
+    	this.addButton(new GuiNpcButton(13, guiLeft + 208, y, 190, 20, "global.linked"));
+
+        this.addButton(new GuiNpcButton(14, guiLeft + 15, y += 22, 190, 20, "menu.tags"));
         this.addButton(new GuiNpcButton(15, guiLeft + 208, y, 190, 20, "advanced.marks"));
     }
 
diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang
index f8ee18cda..733af8f63 100644
--- a/src/main/resources/assets/customnpcs/lang/en_US.lang
+++ b/src/main/resources/assets/customnpcs/lang/en_US.lang
@@ -421,6 +421,7 @@ advanced.editingmode=EditingMode
 advanced.loadday=Load Day
 advanced.loadnight=Load Night
 advanced.haspitch=Has Pitch
+advanced.marks=Marks
 
 faction.hostiles=Hostile Factions
 faction.unfriendly=Unfriendly