From 62f0a4f39e410928d3aeaea847922f44335faeef Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 9 May 2024 22:07:05 +0100 Subject: fix conflicts with new config --- src/main/resources/assets/skyblocker/lang/en_us.json | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/main/resources/assets/skyblocker') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 283175d0..493f14ec 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -537,6 +537,13 @@ "skyblocker.config.uiAndVisuals.searchOverlay.maxSuggestions": "Maximum Suggestions", "skyblocker.config.uiAndVisuals.searchOverlay.maxSuggestions.@Tooltip": "The maximum number of suggested items to show.", + "text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator": "Input Calculator", + "text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.enabled": "Enable Sign Calculator", + "text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.enabled.@Tooltip": "Enables the ability for you to do calculations when inputting values such as price for the ah.\n Key:\n S = 64\n E = 160\n K = 1,000\n M = 1,000,000\n B = 1,000,000,000\n\n purse/P = current purse value", + "text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.requiresEquals": "Only show with \"=\".", + "text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.requiresEquals.@Tooltip": "Only show the calculator when the message start with \"=\".", + "text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.invalidEquation": "Invalid Equation", + "skyblocker.config.uiAndVisuals.tabHud": "Fancy tab HUD (Temporarily disabled outside dungeons)", "skyblocker.config.uiAndVisuals.tabHud.enableHudBackground": "Enable HUD Background", "skyblocker.config.uiAndVisuals.tabHud.enableHudBackground.@Tooltip": "Enables the background of the non-tab HUD.", -- cgit From 0c0b11c80ca38b4631a0828358667bd64f05abdf Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 9 May 2024 23:14:23 +0100 Subject: fix text name --- .../skyblocker/config/categories/UIAndVisualsCategory.java | 10 +++++----- src/main/resources/assets/skyblocker/lang/en_us.json | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/main/resources/assets/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java index a613ebf1..e6cd3c54 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java @@ -335,19 +335,19 @@ public class UIAndVisualsCategory { //Input Calculator .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator")) + .name(Text.translatable("skyblocker.config.uiAndVisuals.inputCalculator")) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.enabled")) - .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.enabled.@Tooltip"))) + .name(Text.translatable("skyblocker.config.uiAndVisuals.inputCalculator.enabled")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.uiAndVisuals.inputCalculator.enabled.@Tooltip"))) .binding(defaults.uiAndVisuals.inputCalculator.enabled, () -> config.uiAndVisuals.inputCalculator.enabled, newValue -> config.uiAndVisuals.inputCalculator.enabled = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.requiresEquals")) - .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.requiresEquals.@Tooltip"))) + .name(Text.translatable("skyblocker.config.uiAndVisuals.inputCalculator.requiresEquals")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.uiAndVisuals.inputCalculator.requiresEquals.@Tooltip"))) .binding(defaults.uiAndVisuals.inputCalculator.requiresEquals, () -> config.uiAndVisuals.inputCalculator.requiresEquals, newValue -> config.uiAndVisuals.inputCalculator.requiresEquals = newValue) diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 493f14ec..49ba3653 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -537,12 +537,12 @@ "skyblocker.config.uiAndVisuals.searchOverlay.maxSuggestions": "Maximum Suggestions", "skyblocker.config.uiAndVisuals.searchOverlay.maxSuggestions.@Tooltip": "The maximum number of suggested items to show.", - "text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator": "Input Calculator", - "text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.enabled": "Enable Sign Calculator", - "text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.enabled.@Tooltip": "Enables the ability for you to do calculations when inputting values such as price for the ah.\n Key:\n S = 64\n E = 160\n K = 1,000\n M = 1,000,000\n B = 1,000,000,000\n\n purse/P = current purse value", - "text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.requiresEquals": "Only show with \"=\".", - "text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.requiresEquals.@Tooltip": "Only show the calculator when the message start with \"=\".", - "text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.invalidEquation": "Invalid Equation", + "skyblocker.config.uiAndVisuals.inputCalculator": "Input Calculator", + "skyblocker.config.uiAndVisuals.inputCalculator.enabled": "Enable Sign Calculator", + "skyblocker.config.uiAndVisuals.inputCalculator.enabled.@Tooltip": "Enables the ability for you to do calculations when inputting values such as price for the ah.\n Key:\n S = 64\n E = 160\n K = 1,000\n M = 1,000,000\n B = 1,000,000,000\n\n purse/P = current purse value", + "skyblocker.config.uiAndVisuals.inputCalculator.requiresEquals": "Only show with \"=\".", + "skyblocker.config.uiAndVisuals.inputCalculator.requiresEquals.@Tooltip": "Only show the calculator when the message start with \"=\".", + "skyblocker.config.uiAndVisuals.inputCalculator.invalidEquation": "Invalid Equation", "skyblocker.config.uiAndVisuals.tabHud": "Fancy tab HUD (Temporarily disabled outside dungeons)", "skyblocker.config.uiAndVisuals.tabHud.enableHudBackground": "Enable HUD Background", -- cgit From 2d77a7265176fd5fb7e728e362c0c3c2d59bf25d Mon Sep 17 00:00:00 2001 From: olim Date: Fri, 10 May 2024 21:48:43 +0100 Subject: fix text order make text for pr in correct order in file --- src/main/resources/assets/skyblocker/lang/en_us.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main/resources/assets/skyblocker') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 49ba3653..33eb723b 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -520,6 +520,13 @@ "skyblocker.config.uiAndVisuals.flameOverlay.flameOpacity": "Flame Opacity", "skyblocker.config.uiAndVisuals.flameOverlay.flameOpacity.@Tooltip": "100% default opacity\n0% off", + "skyblocker.config.uiAndVisuals.inputCalculator": "Input Calculator", + "skyblocker.config.uiAndVisuals.inputCalculator.enabled": "Enable Sign Calculator", + "skyblocker.config.uiAndVisuals.inputCalculator.enabled.@Tooltip": "Enables the ability for you to do calculations when inputting values such as price for the ah.\n Key:\n S = 64\n E = 160\n K = 1,000\n M = 1,000,000\n B = 1,000,000,000\n\n purse/P = current purse value", + "skyblocker.config.uiAndVisuals.inputCalculator.requiresEquals": "Only show with \"=\".", + "skyblocker.config.uiAndVisuals.inputCalculator.requiresEquals.@Tooltip": "Only show the calculator when the message start with \"=\".", + "skyblocker.config.uiAndVisuals.inputCalculator.invalidEquation": "Invalid Equation", + "skyblocker.config.uiAndVisuals.itemCooldown": "Item Cooldown", "skyblocker.config.uiAndVisuals.itemCooldown.enableItemCooldowns": "Enable Item Cooldown", @@ -537,13 +544,6 @@ "skyblocker.config.uiAndVisuals.searchOverlay.maxSuggestions": "Maximum Suggestions", "skyblocker.config.uiAndVisuals.searchOverlay.maxSuggestions.@Tooltip": "The maximum number of suggested items to show.", - "skyblocker.config.uiAndVisuals.inputCalculator": "Input Calculator", - "skyblocker.config.uiAndVisuals.inputCalculator.enabled": "Enable Sign Calculator", - "skyblocker.config.uiAndVisuals.inputCalculator.enabled.@Tooltip": "Enables the ability for you to do calculations when inputting values such as price for the ah.\n Key:\n S = 64\n E = 160\n K = 1,000\n M = 1,000,000\n B = 1,000,000,000\n\n purse/P = current purse value", - "skyblocker.config.uiAndVisuals.inputCalculator.requiresEquals": "Only show with \"=\".", - "skyblocker.config.uiAndVisuals.inputCalculator.requiresEquals.@Tooltip": "Only show the calculator when the message start with \"=\".", - "skyblocker.config.uiAndVisuals.inputCalculator.invalidEquation": "Invalid Equation", - "skyblocker.config.uiAndVisuals.tabHud": "Fancy tab HUD (Temporarily disabled outside dungeons)", "skyblocker.config.uiAndVisuals.tabHud.enableHudBackground": "Enable HUD Background", "skyblocker.config.uiAndVisuals.tabHud.enableHudBackground.@Tooltip": "Enables the background of the non-tab HUD.", -- cgit