Merge pull request #337 from AzureAaron/yacl3

Fix some HUD options resetting sometimes

3 files changed, 0 insertions, 58 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
index 7b32cb78..c3f54d4d 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -226,20 +226,6 @@ public class DungeonsCategory {
 								newValue -> config.locations.dungeons.mapScaling = newValue)
 						.controller(FloatFieldControllerBuilder::create)
 						.build())
-				.option(Option.<Integer>createBuilder()
-						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mapX"))
-						.binding(defaults.locations.dungeons.mapX,
-								() -> config.locations.dungeons.mapX,
-								newValue -> config.locations.dungeons.mapX = newValue)
-						.controller(IntegerFieldControllerBuilder::create)
-						.build())
-				.option(Option.<Integer>createBuilder()
-						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mapY"))
-						.binding(defaults.locations.dungeons.mapY,
-								() -> config.locations.dungeons.mapY,
-								newValue -> config.locations.dungeons.mapY = newValue)
-						.controller(IntegerFieldControllerBuilder::create)
-						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow"))
 						.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip")))
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java
index 35c91d64..719cbd79 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java
@@ -7,7 +7,6 @@ import dev.isxander.yacl3.api.ConfigCategory;
 import dev.isxander.yacl3.api.Option;
 import dev.isxander.yacl3.api.OptionDescription;
 import dev.isxander.yacl3.api.OptionGroup;
-import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder;
 import de.hysky.skyblocker.skyblock.dwarven.DwarvenHudConfigScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
@@ -74,20 +73,6 @@ public class DwarvenMinesCategory {
 										newValue -> config.locations.dwarvenMines.dwarvenHud.enableBackground = newValue)
 								.controller(ConfigUtils::createBooleanController)
 								.build())
-						.option(Option.<Integer>createBuilder()
-								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x"))
-								.binding(defaults.locations.dwarvenMines.dwarvenHud.x,
-										() -> config.locations.dwarvenMines.dwarvenHud.x,
-										newValue -> config.locations.dwarvenMines.dwarvenHud.x = newValue)
-								.controller(IntegerFieldControllerBuilder::create)
-								.build())
-						.option(Option.<Integer>createBuilder()
-								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y"))
-								.binding(defaults.locations.dwarvenMines.dwarvenHud.y,
-										() -> config.locations.dwarvenMines.dwarvenHud.y,
-										newValue -> config.locations.dwarvenMines.dwarvenHud.y = newValue)
-								.controller(IntegerFieldControllerBuilder::create)
-								.build())
 						.build())
 				.build();
 	}
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
index 635d192f..30bdbd3f 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
@@ -5,7 +5,6 @@ import de.hysky.skyblocker.config.SkyblockerConfig;
 import dev.isxander.yacl3.api.*;
 import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder;
 import dev.isxander.yacl3.api.controller.FloatSliderControllerBuilder;
-import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder;
 import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder;
 import de.hysky.skyblocker.skyblock.shortcut.ShortcutsConfigScreen;
 import de.hysky.skyblocker.utils.render.title.TitleContainerConfigScreen;
@@ -443,34 +442,6 @@ public class GeneralCategory {
 										newValue -> config.general.titleContainer.titleContainerScale = newValue)
 								.controller(opt -> FloatFieldControllerBuilder.create(opt).range(30f, 140f))
 								.build())
-						.option(Option.<Integer>createBuilder()
-								.name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.x"))
-								.binding(defaults.general.titleContainer.x,
-										() -> config.general.titleContainer.x,
-										newValue -> config.general.titleContainer.x = newValue)
-								.controller(IntegerFieldControllerBuilder::create)
-								.build())
-						.option(Option.<Integer>createBuilder()
-								.name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.y"))
-								.binding(defaults.general.titleContainer.y,
-										() -> config.general.titleContainer.y,
-										newValue -> config.general.titleContainer.y = newValue)
-								.controller(IntegerFieldControllerBuilder::create)
-								.build())
-						.option(Option.<SkyblockerConfig.Direction>createBuilder()
-								.name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.direction"))
-								.binding(defaults.general.titleContainer.direction,
-										() -> config.general.titleContainer.direction,
-										newValue -> config.general.titleContainer.direction = newValue)
-								.controller(ConfigUtils::createEnumCyclingListController)
-								.build())
-						.option(Option.<SkyblockerConfig.Alignment>createBuilder()
-								.name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.alignment"))
-								.binding(defaults.general.titleContainer.alignment,
-										() -> config.general.titleContainer.alignment,
-										newValue -> config.general.titleContainer.alignment = newValue)
-								.controller(ConfigUtils::createEnumCyclingListController)
-								.build())
 						.option(ButtonOption.createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.config"))
 								.text(Text.translatable("text.skyblocker.open"))