Functionality Tweaks

5 files changed, 18 insertions, 24 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/categories/GeneralCategory.java b/src/main/java/me/xmrvizzy/skyblocker/config/categories/GeneralCategory.java
index aecf9374..1019703c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/categories/GeneralCategory.java
@@ -12,6 +12,7 @@ import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder;
 import me.xmrvizzy.skyblocker.config.ConfigModel;
 import me.xmrvizzy.skyblocker.config.ConfigUtils;
 import me.xmrvizzy.skyblocker.skyblock.shortcut.ShortcutsConfigScreen;
+import me.xmrvizzy.skyblocker.utils.render.title.TitleContainerConfigScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
 
@@ -424,6 +425,11 @@ public class GeneralCategory {
 										newValue -> config.general.titleContainer.alignment = newValue)
 								.controller(ConfigUtils::createCyclingListController4Enum)
 								.build())
+						.option(ButtonOption.createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.config"))
+								.text(Text.translatable("text.skyblocker.open"))
+								.action((screen, opt) -> MinecraftClient.getInstance().setScreen(new TitleContainerConfigScreen(screen)))
+								.build())
 						.build())
 				
 				//Teleport Overlays
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
index 9f4cc6b7..88a9070e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.skyblock.dungeon;
 
-import me.shedaniel.autoconfig.AutoConfig;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.utils.render.RenderHelper;
 import net.minecraft.client.gui.DrawContext;
@@ -58,13 +57,6 @@ public class DungeonMapConfigScreen extends Screen {
 		SkyblockerConfig.get().locations.dungeons.mapX = hudX;
 		SkyblockerConfig.get().locations.dungeons.mapY = hudY;
 		SkyblockerConfig.save();
-		
-		if (parent != null) {
-			this.client.setScreen(parent);
-			
-			return;
-		}
-		
-		super.close();
+		this.client.setScreen(parent);
 	}
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
index e8684540..ee7c71a2 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
@@ -63,13 +63,6 @@ public class DwarvenHudConfigScreen extends Screen {
         SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x = hudX;
         SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y = hudY;
         SkyblockerConfig.save();
-        
-        if (parent != null) {
-            this.client.setScreen(parent);
-        	
-            return;
-        }
-        
-        super.close();
+        client.setScreen(parent);
     }
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java
index 043582c4..d9fe850b 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java
@@ -95,15 +95,13 @@ public class ShortcutsConfigScreen extends Screen {
         if (client != null && shortcutsConfigListWidget.hasChanges()) {
             client.setScreen(new ConfirmScreen(confirmedAction -> {
                 if (confirmedAction) {
-                	this.client.setScreen(parent);
-                    if (parent == null) super.close();
+                    this.client.setScreen(parent);
                 } else {
                     client.setScreen(this);
                 }
             }, Text.translatable("text.skyblocker.quit_config"), Text.translatable("text.skyblocker.quit_config_sure"), Text.translatable("text.skyblocker.quit_discard"), ScreenTexts.CANCEL));
         } else {
             this.client.setScreen(parent);
-            if (parent == null) super.close();
         }
     }
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainerConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainerConfigScreen.java
index bd5f19f2..d8e3b43c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainerConfigScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainerConfigScreen.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.utils.render.title;
 
-import me.shedaniel.autoconfig.AutoConfig;
 import me.xmrvizzy.skyblocker.config.ConfigModel;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.utils.render.RenderHelper;
@@ -21,9 +20,15 @@ public class TitleContainerConfigScreen extends Screen {
     private final Title example3 = new Title(Text.literal("Testing1234").formatted(Formatting.DARK_GREEN));
     private float hudX = SkyblockerConfig.get().general.titleContainer.x;
     private float hudY = SkyblockerConfig.get().general.titleContainer.y;
-
+    private final Screen parent;
+    
     protected TitleContainerConfigScreen() {
-        super(Text.of("Title Container HUD Config"));
+    	this(null);
+    }
+
+    public TitleContainerConfigScreen(Screen parent) {
+		super(Text.of("Title Container HUD Config"));
+		this.parent = parent;
     }
 
     @Override
@@ -160,6 +165,6 @@ public class TitleContainerConfigScreen extends Screen {
         SkyblockerConfig.get().general.titleContainer.x = (int) hudX;
         SkyblockerConfig.get().general.titleContainer.y = (int) hudY;
         SkyblockerConfig.save();
-        super.close();
+        this.client.setScreen(parent);
     }
 }