From 3cf6a7b4d5a17428382cfa4b0e08103c5e5b9148 Mon Sep 17 00:00:00 2001 From: f3shqt <30647065+f3shqt@users.noreply.github.com> Date: Fri, 10 May 2024 15:22:17 +0100 Subject: Fixed Config and Added Glacite Tunnels Section --- src/main/resources/assets/skyblocker/lang/en_us.json | 5 +++++ 1 file changed, 5 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 4304ff3d..a56e5e1c 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -419,6 +419,11 @@ "skyblocker.config.mining.crystalsWaypoints.findInChat.@Tooltip": "When in crystal hollows read the chat to see if coordinates are sent and extract these to show as waypoint or on the map", "skyblocker.config.mining.crystalsWaypoints.shareFail": "Can only share waypoints you have found.", + "skyblocker.config.mining.glacite.coldOverlay": "Glacite Tunnels", + "skyblocker.config.mining.glacite.coldOverlay.enabled": "Cold Overlay", + "skyblocker.config.mining.glacite.coldOverlay.enabled.@Tooltip": "Shows a frosty overlay in the Glacite mines that gets stronger as you get colder.", + + "skyblocker.config.mining.dwarvenHud": "Dwarven HUD", "skyblocker.config.mining.dwarvenHud.enabledCommissions": "Enable Commissions", "skyblocker.config.mining.dwarvenHud.enabledPowder": "Enable Powder", -- cgit From 39be66bb1a613ced28687a130254360850f85a12 Mon Sep 17 00:00:00 2001 From: f3shqt <30647065+f3shqt@users.noreply.github.com> Date: Fri, 10 May 2024 20:49:12 +0100 Subject: Fix formatting --- .../de/hysky/skyblocker/config/categories/MiningCategory.java | 8 ++++---- .../java/de/hysky/skyblocker/config/configs/MiningConfig.java | 2 +- .../de/hysky/skyblocker/skyblock/dwarven/GlaciteColdOverlay.java | 4 ++-- src/main/resources/assets/skyblocker/lang/en_us.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/main/resources/assets/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java index 5fba3dd7..e5a34dc2 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java @@ -213,14 +213,14 @@ public class MiningCategory { //Glacite Tunnels .group(OptionGroup.createBuilder() - .name(Text.translatable("skyblocker.config.mining.glacite.coldOverlay")) + .name(Text.translatable("skyblocker.config.mining.glacite")) .collapsed(false) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.mining.glacite.coldOverlay.enabled")) .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.glacite.coldOverlay.enabled.@Tooltip"))) - .binding(defaults.mining.glacite.ColdOverlay, - () -> config.mining.glacite.ColdOverlay, - newValue -> config.mining.glacite.ColdOverlay = newValue) + .binding(defaults.mining.glacite.coldOverlay, + () -> config.mining.glacite.coldOverlay, + newValue -> config.mining.glacite.coldOverlay = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java index 241893ac..a2a9bcf7 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java @@ -124,7 +124,7 @@ public class MiningConfig { public static class Glacite { @SerialEntry - public boolean ColdOverlay = true; + public boolean coldOverlay = true; } public enum DwarvenHudStyle { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/GlaciteColdOverlay.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/GlaciteColdOverlay.java index 1dd7cac9..454d275f 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/GlaciteColdOverlay.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/GlaciteColdOverlay.java @@ -38,7 +38,7 @@ public class GlaciteColdOverlay { } public static void update() { - if (!Utils.isInDwarvenMines() || System.currentTimeMillis() - resetTime < 3000 || !SkyblockerConfigManager.get().mining.glacite.ColdOverlay) { + if (!Utils.isInDwarvenMines() || System.currentTimeMillis() - resetTime < 3000 || !SkyblockerConfigManager.get().mining.glacite.coldOverlay) { cold = 0; return; } @@ -66,7 +66,7 @@ public class GlaciteColdOverlay { } public static void render(DrawContext context, float tickDelta) { - if (Utils.isInDwarvenMines() && SkyblockerConfigManager.get().mining.glacite.ColdOverlay) { + if (Utils.isInDwarvenMines() && SkyblockerConfigManager.get().mining.glacite.coldOverlay) { renderOverlay(context, POWDER_SNOW_OUTLINE, cold / 100f); } } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index a56e5e1c..7d644947 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -419,7 +419,7 @@ "skyblocker.config.mining.crystalsWaypoints.findInChat.@Tooltip": "When in crystal hollows read the chat to see if coordinates are sent and extract these to show as waypoint or on the map", "skyblocker.config.mining.crystalsWaypoints.shareFail": "Can only share waypoints you have found.", - "skyblocker.config.mining.glacite.coldOverlay": "Glacite Tunnels", + "skyblocker.config.mining.glacite": "Glacite Tunnels", "skyblocker.config.mining.glacite.coldOverlay.enabled": "Cold Overlay", "skyblocker.config.mining.glacite.coldOverlay.enabled.@Tooltip": "Shows a frosty overlay in the Glacite mines that gets stronger as you get colder.", -- cgit From 7a410265e257924747fdb565b5bf2fb5772f9e3f Mon Sep 17 00:00:00 2001 From: f3shqt <30647065+f3shqt@users.noreply.github.com> Date: Fri, 10 May 2024 21:34:29 +0100 Subject: Moved Strings down --- src/main/resources/assets/skyblocker/lang/en_us.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 7d644947..80c28863 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -419,11 +419,6 @@ "skyblocker.config.mining.crystalsWaypoints.findInChat.@Tooltip": "When in crystal hollows read the chat to see if coordinates are sent and extract these to show as waypoint or on the map", "skyblocker.config.mining.crystalsWaypoints.shareFail": "Can only share waypoints you have found.", - "skyblocker.config.mining.glacite": "Glacite Tunnels", - "skyblocker.config.mining.glacite.coldOverlay.enabled": "Cold Overlay", - "skyblocker.config.mining.glacite.coldOverlay.enabled.@Tooltip": "Shows a frosty overlay in the Glacite mines that gets stronger as you get colder.", - - "skyblocker.config.mining.dwarvenHud": "Dwarven HUD", "skyblocker.config.mining.dwarvenHud.enabledCommissions": "Enable Commissions", "skyblocker.config.mining.dwarvenHud.enabledPowder": "Enable Powder", @@ -439,6 +434,10 @@ "skyblocker.config.mining.enableDrillFuel": "Enable Drill Fuel", + "skyblocker.config.mining.glacite": "Glacite Tunnels", + "skyblocker.config.mining.glacite.coldOverlay.enabled": "Cold Overlay", + "skyblocker.config.mining.glacite.coldOverlay.enabled.@Tooltip": "Shows a frosty overlay in the Glacite mines that gets stronger as you get colder.", + "skyblocker.config.misc": "Misc", "skyblocker.config.misc.richPresence": "Discord RPC", -- cgit From 2e48d6529f17334a2a50b45563dac72d7f4b7dfe Mon Sep 17 00:00:00 2001 From: f3shqt <30647065+f3shqt@users.noreply.github.com> Date: Fri, 10 May 2024 23:41:46 +0100 Subject: Removed .enabled --- .../java/de/hysky/skyblocker/config/categories/MiningCategory.java | 4 ++-- src/main/resources/assets/skyblocker/lang/en_us.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/resources/assets/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java index e5a34dc2..e77e9f4b 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java @@ -216,8 +216,8 @@ public class MiningCategory { .name(Text.translatable("skyblocker.config.mining.glacite")) .collapsed(false) .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.mining.glacite.coldOverlay.enabled")) - .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.glacite.coldOverlay.enabled.@Tooltip"))) + .name(Text.translatable("skyblocker.config.mining.glacite.coldOverlay")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.glacite.coldOverlay@Tooltip"))) .binding(defaults.mining.glacite.coldOverlay, () -> config.mining.glacite.coldOverlay, newValue -> config.mining.glacite.coldOverlay = newValue) diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 80c28863..650da1f8 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -435,8 +435,8 @@ "skyblocker.config.mining.enableDrillFuel": "Enable Drill Fuel", "skyblocker.config.mining.glacite": "Glacite Tunnels", - "skyblocker.config.mining.glacite.coldOverlay.enabled": "Cold Overlay", - "skyblocker.config.mining.glacite.coldOverlay.enabled.@Tooltip": "Shows a frosty overlay in the Glacite mines that gets stronger as you get colder.", + "skyblocker.config.mining.glacite.coldOverlay": "Cold Overlay", + "skyblocker.config.mining.glacite.coldOverlay@Tooltip": "Shows a frosty overlay in the Glacite mines that gets stronger as you get colder.", "skyblocker.config.misc": "Misc", -- cgit