aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2024-04-27 12:40:11 -0400
committerAaron <51387595+AzureAaron@users.noreply.github.com>2024-04-27 12:40:11 -0400
commit6368f24b87f8a3d6dbd113d1fdf921e394e5a936 (patch)
treeda48a5765155e15371f023a843e3fe56b0eda8be
parent99ebb5257b0630a1098a36ec72a3610162be779d (diff)
downloadSkyblocker-6368f24b87f8a3d6dbd113d1fdf921e394e5a936.tar.gz
Skyblocker-6368f24b87f8a3d6dbd113d1fdf921e394e5a936.tar.bz2
Skyblocker-6368f24b87f8a3d6dbd113d1fdf921e394e5a936.zip
Enable QuickNav NBT editing & add warning about it
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java25
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json1
2 files changed, 14 insertions, 12 deletions
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 4f3bff36..4b3c0dfd 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java
@@ -4,6 +4,7 @@ import de.hysky.skyblocker.config.ConfigUtils;
import de.hysky.skyblocker.config.SkyblockerConfig;
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 dev.isxander.yacl3.api.controller.StringControllerBuilder;
@@ -51,11 +52,11 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button1.item.nbt,
() -> config.quickNav.button1.item.nbt,
newValue -> config.quickNav.button1.item.nbt = newValue)
.controller(StringControllerBuilder::create)
- .available(false)
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle"))
@@ -100,11 +101,11 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button2.item.nbt,
() -> config.quickNav.button2.item.nbt,
newValue -> config.quickNav.button2.item.nbt = newValue)
.controller(StringControllerBuilder::create)
- .available(false)
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle"))
@@ -149,11 +150,11 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button3.item.nbt,
() -> config.quickNav.button3.item.nbt,
newValue -> config.quickNav.button3.item.nbt = newValue)
.controller(StringControllerBuilder::create)
- .available(false)
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle"))
@@ -198,11 +199,11 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button4.item.nbt,
() -> config.quickNav.button4.item.nbt,
newValue -> config.quickNav.button4.item.nbt = newValue)
.controller(StringControllerBuilder::create)
- .available(false)
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle"))
@@ -247,11 +248,11 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button5.item.nbt,
() -> config.quickNav.button5.item.nbt,
newValue -> config.quickNav.button5.item.nbt = newValue)
.controller(StringControllerBuilder::create)
- .available(false)
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle"))
@@ -296,11 +297,11 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button6.item.nbt,
() -> config.quickNav.button6.item.nbt,
newValue -> config.quickNav.button6.item.nbt = newValue)
.controller(StringControllerBuilder::create)
- .available(false)
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle"))
@@ -345,11 +346,11 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button7.item.nbt,
() -> config.quickNav.button7.item.nbt,
newValue -> config.quickNav.button7.item.nbt = newValue)
.controller(StringControllerBuilder::create)
- .available(false)
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle"))
@@ -394,11 +395,11 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button8.item.nbt,
() -> config.quickNav.button8.item.nbt,
newValue -> config.quickNav.button8.item.nbt = newValue)
.controller(StringControllerBuilder::create)
- .available(false)
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle"))
@@ -443,11 +444,11 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button9.item.nbt,
() -> config.quickNav.button9.item.nbt,
newValue -> config.quickNav.button9.item.nbt = newValue)
.controller(StringControllerBuilder::create)
- .available(false)
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle"))
@@ -492,11 +493,11 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button10.item.nbt,
() -> config.quickNav.button10.item.nbt,
newValue -> config.quickNav.button10.item.nbt = newValue)
.controller(StringControllerBuilder::create)
- .available(false)
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle"))
@@ -541,11 +542,11 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button11.item.nbt,
() -> config.quickNav.button11.item.nbt,
newValue -> config.quickNav.button11.item.nbt = newValue)
.controller(StringControllerBuilder::create)
- .available(false)
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle"))
@@ -590,11 +591,11 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button12.item.nbt,
() -> config.quickNav.button12.item.nbt,
newValue -> config.quickNav.button12.item.nbt = newValue)
.controller(StringControllerBuilder::create)
- .available(false)
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle"))
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 96d3d6d8..fb2d4b64 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -195,6 +195,7 @@
"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.item.nbt.@Tooltip": "§c§lWARNING: THIS MUST BE CONFIGURED WITH ITEM NBT NOT ITEM COMPONENTS! \n\n§fIn the future we will automatically migrate your config to use item components!",
"text.autoconfig.skyblocker.option.quickNav.button.uiTitle": "UI Title",
"text.autoconfig.skyblocker.option.quickNav.button.clickEvent": "Click event",