diff options
9 files changed, 118 insertions, 249 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")) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java index b17fed23..775a0ae1 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java @@ -26,45 +26,45 @@ public class QuickNavigationCategory { //Button 1 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 1)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button1.render, () -> config.quickNav.button1.render, newValue -> config.quickNav.button1.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button1.item.itemName, () -> config.quickNav.button1.item.itemName, newValue -> config.quickNav.button1.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button1.item.count, () -> config.quickNav.button1.item.count, newValue -> config.quickNav.button1.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button1.item.nbt, () -> config.quickNav.button1.item.nbt, newValue -> config.quickNav.button1.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button1.uiTitle, () -> config.quickNav.button1.uiTitle, newValue -> config.quickNav.button1.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button1.clickEvent, () -> config.quickNav.button1.clickEvent, newValue -> config.quickNav.button1.clickEvent = newValue) @@ -74,45 +74,45 @@ public class QuickNavigationCategory { //Button 2 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button2")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 2)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button2.render, () -> config.quickNav.button2.render, newValue -> config.quickNav.button2.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button2.item.itemName, () -> config.quickNav.button2.item.itemName, newValue -> config.quickNav.button2.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button2.item.count, () -> config.quickNav.button2.item.count, newValue -> config.quickNav.button2.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button2.item.nbt, () -> config.quickNav.button2.item.nbt, newValue -> config.quickNav.button2.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button2.uiTitle, () -> config.quickNav.button2.uiTitle, newValue -> config.quickNav.button2.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button2.clickEvent, () -> config.quickNav.button2.clickEvent, newValue -> config.quickNav.button2.clickEvent = newValue) @@ -122,45 +122,45 @@ public class QuickNavigationCategory { //Button 3 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button3")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 3)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button3.render, () -> config.quickNav.button3.render, newValue -> config.quickNav.button3.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button3.item.itemName, () -> config.quickNav.button3.item.itemName, newValue -> config.quickNav.button3.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button3.item.count, () -> config.quickNav.button3.item.count, newValue -> config.quickNav.button3.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button3.item.nbt, () -> config.quickNav.button3.item.nbt, newValue -> config.quickNav.button3.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button3.uiTitle, () -> config.quickNav.button3.uiTitle, newValue -> config.quickNav.button3.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button3.clickEvent, () -> config.quickNav.button3.clickEvent, newValue -> config.quickNav.button3.clickEvent = newValue) @@ -170,45 +170,45 @@ public class QuickNavigationCategory { //Button 4 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button4")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 4)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button4.render, () -> config.quickNav.button4.render, newValue -> config.quickNav.button4.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button4.item.itemName, () -> config.quickNav.button4.item.itemName, newValue -> config.quickNav.button4.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button4.item.count, () -> config.quickNav.button4.item.count, newValue -> config.quickNav.button4.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button4.item.nbt, () -> config.quickNav.button4.item.nbt, newValue -> config.quickNav.button4.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button4.uiTitle, () -> config.quickNav.button4.uiTitle, newValue -> config.quickNav.button4.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button4.clickEvent, () -> config.quickNav.button4.clickEvent, newValue -> config.quickNav.button4.clickEvent = newValue) @@ -218,45 +218,45 @@ public class QuickNavigationCategory { //Button 5 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button5")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 5)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button5.render, () -> config.quickNav.button5.render, newValue -> config.quickNav.button5.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button5.item.itemName, () -> config.quickNav.button5.item.itemName, newValue -> config.quickNav.button5.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button5.item.count, () -> config.quickNav.button5.item.count, newValue -> config.quickNav.button5.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button5.item.nbt, () -> config.quickNav.button5.item.nbt, newValue -> config.quickNav.button5.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button5.uiTitle, () -> config.quickNav.button5.uiTitle, newValue -> config.quickNav.button5.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button5.clickEvent, () -> config.quickNav.button5.clickEvent, newValue -> config.quickNav.button5.clickEvent = newValue) @@ -266,45 +266,45 @@ public class QuickNavigationCategory { //Button 6 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button6")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 6)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button6.render, () -> config.quickNav.button6.render, newValue -> config.quickNav.button6.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button6.item.itemName, () -> config.quickNav.button6.item.itemName, newValue -> config.quickNav.button6.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button6.item.count, () -> config.quickNav.button6.item.count, newValue -> config.quickNav.button6.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button6.item.nbt, () -> config.quickNav.button6.item.nbt, newValue -> config.quickNav.button6.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button6.uiTitle, () -> config.quickNav.button6.uiTitle, newValue -> config.quickNav.button6.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button6.clickEvent, () -> config.quickNav.button6.clickEvent, newValue -> config.quickNav.button6.clickEvent = newValue) @@ -314,45 +314,45 @@ public class QuickNavigationCategory { //Button 7 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button7")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 7)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button7.render, () -> config.quickNav.button7.render, newValue -> config.quickNav.button7.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button7.item.itemName, () -> config.quickNav.button7.item.itemName, newValue -> config.quickNav.button7.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button7.item.count, () -> config.quickNav.button7.item.count, newValue -> config.quickNav.button7.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button7.item.nbt, () -> config.quickNav.button7.item.nbt, newValue -> config.quickNav.button7.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button7.uiTitle, () -> config.quickNav.button7.uiTitle, newValue -> config.quickNav.button7.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button7.clickEvent, () -> config.quickNav.button7.clickEvent, newValue -> config.quickNav.button7.clickEvent = newValue) @@ -362,45 +362,45 @@ public class QuickNavigationCategory { //Button 8 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button8")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 8)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button8.render, () -> config.quickNav.button8.render, newValue -> config.quickNav.button8.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button8.item.itemName, () -> config.quickNav.button8.item.itemName, newValue -> config.quickNav.button8.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button8.item.count, () -> config.quickNav.button8.item.count, newValue -> config.quickNav.button8.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button8.item.nbt, () -> config.quickNav.button8.item.nbt, newValue -> config.quickNav.button8.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button8.uiTitle, () -> config.quickNav.button8.uiTitle, newValue -> config.quickNav.button8.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button8.clickEvent, () -> config.quickNav.button8.clickEvent, newValue -> config.quickNav.button8.clickEvent = newValue) @@ -410,45 +410,45 @@ public class QuickNavigationCategory { //Button 9 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button9")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 9)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button9.render, () -> config.quickNav.button9.render, newValue -> config.quickNav.button9.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button9.item.itemName, () -> config.quickNav.button9.item.itemName, newValue -> config.quickNav.button9.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button9.item.count, () -> config.quickNav.button9.item.count, newValue -> config.quickNav.button9.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button9.item.nbt, () -> config.quickNav.button9.item.nbt, newValue -> config.quickNav.button9.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button9.uiTitle, () -> config.quickNav.button9.uiTitle, newValue -> config.quickNav.button9.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button9.clickEvent, () -> config.quickNav.button9.clickEvent, newValue -> config.quickNav.button9.clickEvent = newValue) @@ -458,45 +458,45 @@ public class QuickNavigationCategory { //Button 10 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button10")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 10)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button10.render, () -> config.quickNav.button10.render, newValue -> config.quickNav.button10.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button10.item.itemName, () -> config.quickNav.button10.item.itemName, newValue -> config.quickNav.button10.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button10.item.count, () -> config.quickNav.button10.item.count, newValue -> config.quickNav.button10.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button10.item.nbt, () -> config.quickNav.button10.item.nbt, newValue -> config.quickNav.button10.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button10.uiTitle, () -> config.quickNav.button10.uiTitle, newValue -> config.quickNav.button10.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button10.clickEvent, () -> config.quickNav.button10.clickEvent, newValue -> config.quickNav.button10.clickEvent = newValue) @@ -506,45 +506,45 @@ public class QuickNavigationCategory { //Button 11 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button11")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 11)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button11.render, () -> config.quickNav.button11.render, newValue -> config.quickNav.button11.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button11.item.itemName, () -> config.quickNav.button11.item.itemName, newValue -> config.quickNav.button11.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button11.item.count, () -> config.quickNav.button11.item.count, newValue -> config.quickNav.button11.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button11.item.nbt, () -> config.quickNav.button11.item.nbt, newValue -> config.quickNav.button11.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button11.uiTitle, () -> config.quickNav.button11.uiTitle, newValue -> config.quickNav.button11.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button11.clickEvent, () -> config.quickNav.button11.clickEvent, newValue -> config.quickNav.button11.clickEvent = newValue) @@ -554,45 +554,45 @@ public class QuickNavigationCategory { //Button 12 .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button12")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 12)) .collapsed(true) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.render")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.render")) .binding(defaults.quickNav.button12.render, () -> config.quickNav.button12.render, newValue -> config.quickNav.button12.render = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.itemName")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.itemName")) .binding(defaults.quickNav.button12.item.itemName, () -> config.quickNav.button12.item.itemName, newValue -> config.quickNav.button12.item.itemName = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.count")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.count")) .binding(defaults.quickNav.button12.item.count, () -> config.quickNav.button12.item.count, newValue -> config.quickNav.button12.item.count = newValue) .controller(opt -> IntegerFieldControllerBuilder.create(opt).range(1, 64)) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.item.nbt")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt")) .binding(defaults.quickNav.button12.item.nbt, () -> config.quickNav.button12.item.nbt, newValue -> config.quickNav.button12.item.nbt = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.uiTitle")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) .binding(defaults.quickNav.button12.uiTitle, () -> config.quickNav.button12.uiTitle, newValue -> config.quickNav.button12.uiTitle = newValue) .controller(StringControllerBuilder::create) .build()) .option(Option.<String>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button1.clickEvent")) + .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.clickEvent")) .binding(defaults.quickNav.button12.clickEvent, () -> config.quickNav.button12.clickEvent, newValue -> config.quickNav.button12.clickEvent = newValue) diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java index 145ee2bc..df5f36ce 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java @@ -57,6 +57,7 @@ public class DungeonMapConfigScreen extends Screen { SkyblockerConfigManager.get().locations.dungeons.mapX = hudX; SkyblockerConfigManager.get().locations.dungeons.mapY = hudY; SkyblockerConfigManager.save(); + this.client.setScreen(parent); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java index 2bb21568..9bd6bef1 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java @@ -62,6 +62,7 @@ public class DwarvenHudConfigScreen extends Screen { SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.x = hudX; SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.y = hudY; SkyblockerConfigManager.save(); + client.setScreen(parent); } } diff --git a/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java b/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java index 5a42eeb4..19d41c91 100644 --- a/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java @@ -3,8 +3,13 @@ package de.hysky.skyblocker.utils.render.title; import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.render.RenderHelper; +import dev.isxander.yacl3.api.ConfigCategory; +import dev.isxander.yacl3.api.Option; +import dev.isxander.yacl3.api.OptionGroup; +import dev.isxander.yacl3.gui.YACLScreen; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.resource.language.I18n; import net.minecraft.client.util.math.Vector2f; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -21,6 +26,7 @@ public class TitleContainerConfigScreen extends Screen { private float hudX = SkyblockerConfigManager.get().general.titleContainer.x; private float hudY = SkyblockerConfigManager.get().general.titleContainer.y; private final Screen parent; + private boolean changedScale; protected TitleContainerConfigScreen() { this(null); @@ -153,17 +159,32 @@ public class TitleContainerConfigScreen extends Screen { } if (keyCode == GLFW.GLFW_KEY_EQUAL) { SkyblockerConfigManager.get().general.titleContainer.titleContainerScale += 10; + changedScale = true; } if (keyCode == GLFW.GLFW_KEY_MINUS) { SkyblockerConfigManager.get().general.titleContainer.titleContainerScale -= 10; + changedScale = true; } return super.keyPressed(keyCode, scanCode, modifiers); } + @Override public void close() { SkyblockerConfigManager.get().general.titleContainer.x = (int) hudX; SkyblockerConfigManager.get().general.titleContainer.y = (int) hudY; + + //TODO Come up with a better, less hacky solution for this in the future (: + if (parent instanceof YACLScreen yaclScreen) { + ConfigCategory category = yaclScreen.config.categories().stream().filter(cat -> cat.name().getString().equals(I18n.translate("text.autoconfig.skyblocker.category.general"))).findFirst().orElseThrow(); + OptionGroup group = category.groups().stream().filter(grp -> grp.name().getString().equals(I18n.translate("text.autoconfig.skyblocker.option.general.titleContainer"))).findFirst().orElseThrow(); + + Option<?> scaleOpt = group.options().get(0); + + // Refresh the value in the config with the bound value + if (changedScale) scaleOpt.forgetPendingValue(); + } + SkyblockerConfigManager.save(); this.client.setScreen(parent); } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index e868e22b..f02eb319 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -95,10 +95,6 @@ "text.autoconfig.skyblocker.option.general.titleContainer": "Title Container", "text.autoconfig.skyblocker.option.general.titleContainer.@Tooltip": "Used to display multiple titles at once, Example use: Vampire Slayer", "text.autoconfig.skyblocker.option.general.titleContainer.titleContainerScale": "Title Container Scale", - "text.autoconfig.skyblocker.option.general.titleContainer.x": "Title Container X Position", - "text.autoconfig.skyblocker.option.general.titleContainer.y": "Title Container Y Position", - "text.autoconfig.skyblocker.option.general.titleContainer.direction": "Title Container Orientation", - "text.autoconfig.skyblocker.option.general.titleContainer.alignment": "Title Container Horizontal Alignment", "text.autoconfig.skyblocker.option.general.titleContainer.config": "Title Container Placement Config...", "text.autoconfig.skyblocker.option.general.teleportOverlay": "Teleport Overlay", "text.autoconfig.skyblocker.option.general.teleportOverlay.enableTeleportOverlays": "Enable Teleport Overlays", @@ -125,104 +121,16 @@ "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "Enabled", "text.autoconfig.skyblocker.option.richPresence.customMessage": "Custom Message", - "text.autoconfig.skyblocker.category.quickNav" : "Quick Navigation", - "text.autoconfig.skyblocker.option.quickNav.enableQuickNav" : "Enable Quick Navigation", - "text.autoconfig.skyblocker.option.quickNav.button1" : "Button 1", - "text.autoconfig.skyblocker.option.quickNav.button1.render" : "Render", - "text.autoconfig.skyblocker.option.quickNav.button1.item" : "Item", - "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName" : "Item name", - "text.autoconfig.skyblocker.option.quickNav.button1.item.count" : "Item Count", - "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt" : "NBT", - "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle" : "UI Title", - "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent" : "Click event", - "text.autoconfig.skyblocker.option.quickNav.button2" : "Button 2", - "text.autoconfig.skyblocker.option.quickNav.button2.render" : "Render", - "text.autoconfig.skyblocker.option.quickNav.button2.item" : "Item", - "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName" : "Item name", - "text.autoconfig.skyblocker.option.quickNav.button2.item.count" : "Item Count", - "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt" : "NBT", - "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle" : "UI Title", - "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent" : "Click event", - "text.autoconfig.skyblocker.option.quickNav.button3" : "Button 3", - "text.autoconfig.skyblocker.option.quickNav.button3.render" : "Render", - "text.autoconfig.skyblocker.option.quickNav.button3.item" : "Item", - "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName" : "Item name", - "text.autoconfig.skyblocker.option.quickNav.button3.item.count" : "Item Count", - "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt" : "NBT", - "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle" : "UI Title", - "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent" : "Click event", - "text.autoconfig.skyblocker.option.quickNav.button4" : "Button 4", - "text.autoconfig.skyblocker.option.quickNav.button4.render" : "Render", - "text.autoconfig.skyblocker.option.quickNav.button4.item" : "Item", - "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName" : "Item name", - "text.autoconfig.skyblocker.option.quickNav.button4.item.count" : "Item Count", - "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt" : "NBT", - "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle" : "UI Title", - "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent" : "Click event", - "text.autoconfig.skyblocker.option.quickNav.button5" : "Button 5", - "text.autoconfig.skyblocker.option.quickNav.button5.render" : "Render", - "text.autoconfig.skyblocker.option.quickNav.button5.item" : "Item", - "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName" : "Item name", - "text.autoconfig.skyblocker.option.quickNav.button5.item.count" : "Item Count", - "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt" : "NBT", - "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle" : "UI Title", - "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent" : "Click event", - "text.autoconfig.skyblocker.option.quickNav.button6" : "Button 6", - "text.autoconfig.skyblocker.option.quickNav.button6.render" : "Render", - "text.autoconfig.skyblocker.option.quickNav.button6.item" : "Item", - "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName" : "Item name", - "text.autoconfig.skyblocker.option.quickNav.button6.item.count" : "Item Count", - "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt" : "NBT", - "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle" : "UI Title", - "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent" : "Click event", - "text.autoconfig.skyblocker.option.quickNav.button7" : "Button 7", - "text.autoconfig.skyblocker.option.quickNav.button7.render" : "Render", - "text.autoconfig.skyblocker.option.quickNav.button7.item" : "Item", - "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName" : "Item name", - "text.autoconfig.skyblocker.option.quickNav.button7.item.count" : "Item Count", - "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt" : "NBT", - "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle" : "UI Title", - "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent" : "Click event", - "text.autoconfig.skyblocker.option.quickNav.button8" : "Button 8", - "text.autoconfig.skyblocker.option.quickNav.button8.render" : "Render", - "text.autoconfig.skyblocker.option.quickNav.button8.item" : "Item", - "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName" : "Item name", - "text.autoconfig.skyblocker.option.quickNav.button8.item.count" : "Item Count", - "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt" : "NBT", - "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle" : "UI Title", - "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent" : "Click event", - "text.autoconfig.skyblocker.option.quickNav.button9" : "Button 9", - "text.autoconfig.skyblocker.option.quickNav.button9.render" : "Render", - "text.autoconfig.skyblocker.option.quickNav.button9.item" : "Item", - "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName" : "Item name", - "text.autoconfig.skyblocker.option.quickNav.button9.item.count" : "Item Count", - "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt" : "NBT", - "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle" : "UI Title", - "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent" : "Click event", - "text.autoconfig.skyblocker.option.quickNav.button10" : "Button 10", - "text.autoconfig.skyblocker.option.quickNav.button10.render" : "Render", - "text.autoconfig.skyblocker.option.quickNav.button10.item" : "Item", - "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName" : "Item name", - "text.autoconfig.skyblocker.option.quickNav.button10.item.count" : "Item Count", - "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt" : "NBT", - "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle" : "UI Title", - "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent" : "Click event", - "text.autoconfig.skyblocker.option.quickNav.button11" : "Button 11", - "text.autoconfig.skyblocker.option.quickNav.button11.render" : "Render", - "text.autoconfig.skyblocker.option.quickNav.button11.item" : "Item", - "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName" : "Item name", - "text.autoconfig.skyblocker.option.quickNav.button11.item.count" : "Item Count", - "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt" : "NBT", - "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle" : "UI Title", - "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent" : "Click event", - "text.autoconfig.skyblocker.option.quickNav.button12" : "Button 12", - "text.autoconfig.skyblocker.option.quickNav.button12.render" : "Render", - "text.autoconfig.skyblocker.option.quickNav.button12.item" : "Item", - "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName" : "Item name", - "text.autoconfig.skyblocker.option.quickNav.button12.item.count" : "Item Count", - "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt" : "NBT", - "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle" : "UI Title", - "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent" : "Click event", + "text.autoconfig.skyblocker.category.quickNav": "Quick Navigation", + "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "Enable Quick Navigation", + "text.autoconfig.skyblocker.option.quickNav.button": "Button %d", + "text.autoconfig.skyblocker.option.quickNav.button.render": "Render", + "text.autoconfig.skyblocker.option.quickNav.button.item": "Item", + "text.autoconfig.skyblocker.option.quickNav.button.item.itemName": "Item ID", + "text.autoconfig.skyblocker.option.quickNav.button.item.count": "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button.item.nbt": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button.uiTitle": "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button.clickEvent": "Click event", "text.autoconfig.skyblocker.option.general.itemList": "Item List", "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Enable Item List", @@ -273,8 +181,6 @@ "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Enable Map", "text.autoconfig.skyblocker.option.locations.dungeons.mapScreen": "Dungeon Map Placement Config...", "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "Map Scaling", - "text.autoconfig.skyblocker.option.locations.dungeons.mapX": "Map X", - "text.autoconfig.skyblocker.option.locations.dungeons.mapY": "Map Y", "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow": "Starred Mob Glow", "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip": "Applies the glowing effect to starred mobs that are visible.", "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Solve Three Weirdos Puzzle", @@ -306,8 +212,6 @@ "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[2]": "\nClassic: Shows name and percentage in a very simple box.", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.screen": "Dwarven HUD Config...", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "Enable Background", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y", "text.autoconfig.skyblocker.option.locations.rift": "The Rift", "text.autoconfig.skyblocker.option.locations.rift.mirrorverseWaypoints": "Enable Mirrorverse Waypoints", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 86481bf3..e5900e76 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -38,7 +38,7 @@ "depends": { "fabricloader": ">=0.14.22", "fabric-api": ">=0.89.1+1.20.2", - "yet_another_config_lib_v3": ">=3.2.0+1.20.2", + "yet_another_config_lib_v3": ">=3.2.1+1.20.2", "minecraft": "~1.20.2" }, "conflicts": { |