From fb583f4d085e4b34609e24399a72701210bb682c Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 30 Jan 2024 12:28:25 +0000 Subject: start of crystal hollows fetures basic implementation of a map and way-points features for the crystal hollows --- .../hysky/skyblocker/config/SkyblockerConfig.java | 30 ++++++++++++++ .../config/categories/DwarvenMinesCategory.java | 47 +++++++++++++++++++++- 2 files changed, 76 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index a7569adb..886f81fb 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -873,6 +873,12 @@ public class SkyblockerConfig { @SerialEntry public DwarvenHud dwarvenHud = new DwarvenHud(); + + @SerialEntry + public CrystalsHud crystalsHud = new CrystalsHud(); + + @SerialEntry + public CrystalsWaypoints crystalsWaypoints = new CrystalsWaypoints(); } public static class DwarvenHud { @@ -891,6 +897,30 @@ public class SkyblockerConfig { @SerialEntry public int y = 10; } + public static class CrystalsHud { + @SerialEntry + public boolean enabled = true; + + + @SerialEntry + public boolean enableBackground = true; + + @SerialEntry + public int x = 10; + + @SerialEntry + public int y = 50; + } + public static class CrystalsWaypoints { + @SerialEntry + public boolean enabled = true; + + @SerialEntry + public boolean findInChat = true; + + @SerialEntry + public Waypoint.Type waypointType = Waypoint.Type.WAYPOINT; + } public enum DwarvenHudStyle { SIMPLE, FANCY, CLASSIC; 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 80d6485b..4a7e6854 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java @@ -2,6 +2,7 @@ package de.hysky.skyblocker.config.categories; import de.hysky.skyblocker.config.ConfigUtils; import de.hysky.skyblocker.config.SkyblockerConfig; +import de.hysky.skyblocker.skyblock.dwarven.CrystalsHudConfigScreen; import dev.isxander.yacl3.api.ButtonOption; import dev.isxander.yacl3.api.ConfigCategory; import dev.isxander.yacl3.api.Option; @@ -53,7 +54,7 @@ public class DwarvenMinesCategory { .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style")) - .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[0]"), + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[0]"), Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[1]"), Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[2]"))) .binding(defaults.locations.dwarvenMines.dwarvenHud.style, @@ -74,6 +75,50 @@ public class DwarvenMinesCategory { .controller(ConfigUtils::createBooleanController) .build()) .build()) + //crystal HUD + .group(OptionGroup.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud")) //todo i do not know if i need to duplicate text + .collapsed(false) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled")) + .binding(defaults.locations.dwarvenMines.crystalsHud.enabled, + () -> config.locations.dwarvenMines.crystalsHud.enabled, + newValue -> config.locations.dwarvenMines.crystalsHud.enabled = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(ButtonOption.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.screen")) + .text(Text.translatable("text.skyblocker.open")) + .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new CrystalsHudConfigScreen(screen))) + .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground")) + .binding(defaults.locations.dwarvenMines.crystalsHud.enableBackground, + () -> config.locations.dwarvenMines.crystalsHud.enableBackground, + newValue -> config.locations.dwarvenMines.crystalsHud.enableBackground = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .build()) + //crystals waypoints + .group(OptionGroup.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints")) //todo i do not know if i need to duplicate text + .collapsed(false) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled")) + .binding(defaults.locations.dwarvenMines.crystalsWaypoints.enabled, + () -> config.locations.dwarvenMines.crystalsWaypoints.enabled, + newValue -> config.locations.dwarvenMines.crystalsWaypoints.enabled = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints.findInChat")) + .binding(defaults.locations.dwarvenMines.crystalsWaypoints.findInChat, + () -> config.locations.dwarvenMines.crystalsWaypoints.findInChat, + newValue -> config.locations.dwarvenMines.crystalsWaypoints.findInChat = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + + .build()) .build(); } } -- cgit From 4725a42df06d8bf72bc6a901bd24dda25d761623 Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 30 Jan 2024 14:43:42 +0000 Subject: location colors and on map made it so that locations in the crystal hollows can be shown on them map as well as way points. and also add colors for the way points and map. --- .../java/de/hysky/skyblocker/config/SkyblockerConfig.java | 11 +++++++++-- .../skyblocker/config/categories/DwarvenMinesCategory.java | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 886f81fb..6f7db908 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -1,6 +1,7 @@ package de.hysky.skyblocker.config; import de.hysky.skyblocker.SkyblockerMod; +import de.hysky.skyblocker.skyblock.dwarven.CrystalsWaypoint; import de.hysky.skyblocker.skyblock.item.CustomArmorTrims; import de.hysky.skyblocker.utils.chat.ChatFilterResult; import de.hysky.skyblocker.utils.waypoint.Waypoint; @@ -14,7 +15,9 @@ import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class SkyblockerConfig { @SerialEntry @@ -901,10 +904,12 @@ public class SkyblockerConfig { @SerialEntry public boolean enabled = true; - @SerialEntry public boolean enableBackground = true; + @SerialEntry + public boolean showLocations = true; + @SerialEntry public int x = 10; @@ -917,9 +922,11 @@ public class SkyblockerConfig { @SerialEntry public boolean findInChat = true; + @SerialEntry + public Map ActiveWaypoints = new HashMap<>() {}; @SerialEntry - public Waypoint.Type waypointType = Waypoint.Type.WAYPOINT; + public Waypoint.Type waypointType = Waypoint.Type.WAYPOINT; //todo see if best option / give player a choice } public enum DwarvenHudStyle { 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 4a7e6854..7581af4f 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java @@ -98,6 +98,13 @@ public class DwarvenMinesCategory { newValue -> config.locations.dwarvenMines.crystalsHud.enableBackground = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations")) + .binding(defaults.locations.dwarvenMines.crystalsHud.showLocations, + () -> config.locations.dwarvenMines.crystalsHud.showLocations, + newValue -> config.locations.dwarvenMines.crystalsHud.showLocations = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .build()) //crystals waypoints .group(OptionGroup.createBuilder() -- cgit From bc5cf9a37e4241096bd5ec1b2491ad71281593ff Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 30 Jan 2024 19:30:10 +0000 Subject: fixed cwords from chat fixed not being able to get coordinates from chat by using the correct ClientReceiveMessageEvent of GAME instead of CHAT --- .../config/categories/DwarvenMinesCategory.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') 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 7581af4f..c575616a 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java @@ -46,10 +46,10 @@ public class DwarvenMinesCategory { .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud")) .collapsed(false) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled")) - .binding(defaults.locations.dwarvenMines.dwarvenHud.enabled, - () -> config.locations.dwarvenMines.dwarvenHud.enabled, - newValue -> config.locations.dwarvenMines.dwarvenHud.enabled = newValue) + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled"))//todo seperate coms and powder + .binding(defaults.locations.dwarvenMines.dwarvenHud.enabledCommissions, + () -> config.locations.dwarvenMines.dwarvenHud.enabledCommissions, + newValue -> config.locations.dwarvenMines.dwarvenHud.enabledCommissions = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() @@ -91,13 +91,6 @@ public class DwarvenMinesCategory { .text(Text.translatable("text.skyblocker.open")) .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new CrystalsHudConfigScreen(screen))) .build()) - .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground")) - .binding(defaults.locations.dwarvenMines.crystalsHud.enableBackground, - () -> config.locations.dwarvenMines.crystalsHud.enableBackground, - newValue -> config.locations.dwarvenMines.crystalsHud.enableBackground = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations")) .binding(defaults.locations.dwarvenMines.crystalsHud.showLocations, -- cgit From 86035f311b28094daf1ab7dbda7c888259e56723 Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 31 Jan 2024 10:52:37 +0000 Subject: added powder hud added powder to the dwarven hud --- .../de/hysky/skyblocker/config/SkyblockerConfig.java | 20 +++++++++++++------- .../config/categories/DwarvenMinesCategory.java | 9 ++++++++- 2 files changed, 21 insertions(+), 8 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 6f7db908..e84d2d85 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -886,7 +886,10 @@ public class SkyblockerConfig { public static class DwarvenHud { @SerialEntry - public boolean enabled = true; + public boolean enabledCommissions = true; + + @SerialEntry + public boolean enabledPowder = true; @SerialEntry public DwarvenHudStyle style = DwarvenHudStyle.SIMPLE; @@ -895,18 +898,21 @@ public class SkyblockerConfig { public boolean enableBackground = true; @SerialEntry - public int x = 10; + public int commissionsX = 10; @SerialEntry - public int y = 10; + public int commissionsY = 10; + + @SerialEntry + public int powderX = 10; + + @SerialEntry + public int powderY = 70; } public static class CrystalsHud { @SerialEntry public boolean enabled = true; - @SerialEntry - public boolean enableBackground = true; - @SerialEntry public boolean showLocations = true; @@ -914,7 +920,7 @@ public class SkyblockerConfig { public int x = 10; @SerialEntry - public int y = 50; + public int y = 130; } public static class CrystalsWaypoints { @SerialEntry 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 c575616a..4bacc2b6 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java @@ -46,12 +46,19 @@ public class DwarvenMinesCategory { .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud")) .collapsed(false) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled"))//todo seperate coms and powder + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabledCommissions")) .binding(defaults.locations.dwarvenMines.dwarvenHud.enabledCommissions, () -> config.locations.dwarvenMines.dwarvenHud.enabledCommissions, newValue -> config.locations.dwarvenMines.dwarvenHud.enabledCommissions = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabledPowder")) + .binding(defaults.locations.dwarvenMines.dwarvenHud.enabledPowder, + () -> config.locations.dwarvenMines.dwarvenHud.enabledPowder, + newValue -> config.locations.dwarvenMines.dwarvenHud.enabledPowder = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style")) .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[0]"), -- cgit From 913f2d6d31e1648e02ff9b9daeb1020a0ea84727 Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 31 Jan 2024 10:58:23 +0000 Subject: fixed text fixed the text for the config in dwarven mines category --- .../skyblocker/config/categories/DwarvenMinesCategory.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') 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 4bacc2b6..0dc48368 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java @@ -84,17 +84,17 @@ public class DwarvenMinesCategory { .build()) //crystal HUD .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud")) //todo i do not know if i need to duplicate text + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud")) .collapsed(false) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled")) + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.enabled")) .binding(defaults.locations.dwarvenMines.crystalsHud.enabled, () -> config.locations.dwarvenMines.crystalsHud.enabled, newValue -> config.locations.dwarvenMines.crystalsHud.enabled = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(ButtonOption.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.screen")) + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.screen")) .text(Text.translatable("text.skyblocker.open")) .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new CrystalsHudConfigScreen(screen))) .build()) @@ -108,10 +108,10 @@ public class DwarvenMinesCategory { .build()) //crystals waypoints .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints")) //todo i do not know if i need to duplicate text + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints")) .collapsed(false) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled")) + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints.enabled")) .binding(defaults.locations.dwarvenMines.crystalsWaypoints.enabled, () -> config.locations.dwarvenMines.crystalsWaypoints.enabled, newValue -> config.locations.dwarvenMines.crystalsWaypoints.enabled = newValue) -- cgit From 89f38714edc7b0ab06dadf7119c4d4d762191a2f Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 31 Jan 2024 14:35:54 +0000 Subject: map location size configurable and removed unused code removed code that was unused in the new functions. and added a config option for the locations on the crystals map as well as showing certain locations smaller to better fit their size --- src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java | 3 +++ .../skyblocker/config/categories/DwarvenMinesCategory.java | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index e84d2d85..ecf66407 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -916,6 +916,9 @@ public class SkyblockerConfig { @SerialEntry public boolean showLocations = true; + @SerialEntry + public int locationSize = 8; + @SerialEntry public int x = 10; 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 0dc48368..a15424a7 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java @@ -9,6 +9,7 @@ import dev.isxander.yacl3.api.Option; import dev.isxander.yacl3.api.OptionDescription; import dev.isxander.yacl3.api.OptionGroup; import de.hysky.skyblocker.skyblock.dwarven.DwarvenHudConfigScreen; +import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; @@ -82,7 +83,7 @@ public class DwarvenMinesCategory { .controller(ConfigUtils::createBooleanController) .build()) .build()) - //crystal HUD + //crystal HUD //todo add descriptions to features .group(OptionGroup.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud")) .collapsed(false) @@ -105,6 +106,13 @@ public class DwarvenMinesCategory { newValue -> config.locations.dwarvenMines.crystalsHud.showLocations = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.locationSize")) + .binding(defaults.locations.dwarvenMines.crystalsHud.locationSize, + () -> config.locations.dwarvenMines.crystalsHud.locationSize, + newValue -> config.locations.dwarvenMines.crystalsHud.locationSize = newValue) + .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(4, 12).step(2)) + .build()) .build()) //crystals waypoints .group(OptionGroup.createBuilder() -- cgit From 465c46d1f3dde2474fc1595033e2eab4e7286433 Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 31 Jan 2024 14:42:06 +0000 Subject: update waypoints updated waypoints to use the global waypoint option --- src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index ecf66407..a07b0084 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -934,8 +934,7 @@ public class SkyblockerConfig { @SerialEntry public Map ActiveWaypoints = new HashMap<>() {}; - @SerialEntry - public Waypoint.Type waypointType = Waypoint.Type.WAYPOINT; //todo see if best option / give player a choice + } public enum DwarvenHudStyle { -- cgit From 7076875f3b9b513a569760f5890202e260fc6bd7 Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 31 Jan 2024 15:23:53 +0000 Subject: comments and desriptions add more comments to new code and added Tooltips to the new options in the config menu --- .../hysky/skyblocker/config/categories/DwarvenMinesCategory.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') 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 a15424a7..62b0ebf9 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java @@ -83,7 +83,7 @@ public class DwarvenMinesCategory { .controller(ConfigUtils::createBooleanController) .build()) .build()) - //crystal HUD //todo add descriptions to features + //crystal HUD .group(OptionGroup.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud")) .collapsed(false) @@ -101,13 +101,15 @@ public class DwarvenMinesCategory { .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations.@Tooltip"))) .binding(defaults.locations.dwarvenMines.crystalsHud.showLocations, () -> config.locations.dwarvenMines.crystalsHud.showLocations, newValue -> config.locations.dwarvenMines.crystalsHud.showLocations = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.locationSize")) + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations.locationSize")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations.locationSize.@Tooltip"))) .binding(defaults.locations.dwarvenMines.crystalsHud.locationSize, () -> config.locations.dwarvenMines.crystalsHud.locationSize, newValue -> config.locations.dwarvenMines.crystalsHud.locationSize = newValue) @@ -120,6 +122,7 @@ public class DwarvenMinesCategory { .collapsed(false) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints.enabled")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints.enabled.@Tooltip"))) .binding(defaults.locations.dwarvenMines.crystalsWaypoints.enabled, () -> config.locations.dwarvenMines.crystalsWaypoints.enabled, newValue -> config.locations.dwarvenMines.crystalsWaypoints.enabled = newValue) @@ -127,6 +130,7 @@ public class DwarvenMinesCategory { .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints.findInChat")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints.findInChat.@Tooltip"))) .binding(defaults.locations.dwarvenMines.crystalsWaypoints.findInChat, () -> config.locations.dwarvenMines.crystalsWaypoints.findInChat, newValue -> config.locations.dwarvenMines.crystalsWaypoints.findInChat = newValue) -- cgit From 1f991fb10bafc4082c3b75e1b29c57d72e246919 Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 1 Feb 2024 17:46:27 +0000 Subject: fix request changes fixed the issues brought. and also fixed issue that dwarven hud render classic did not have values for powder --- src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index a07b0084..775c70ce 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -898,10 +898,10 @@ public class SkyblockerConfig { public boolean enableBackground = true; @SerialEntry - public int commissionsX = 10; + public int x = 10; @SerialEntry - public int commissionsY = 10; + public int y = 10; @SerialEntry public int powderX = 10; @@ -931,10 +931,6 @@ public class SkyblockerConfig { @SerialEntry public boolean findInChat = true; - @SerialEntry - public Map ActiveWaypoints = new HashMap<>() {}; - - } public enum DwarvenHudStyle { -- cgit From 1ade575c76517a62f8666a57db7072d7b7b6634b Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:38:22 -0500 Subject: Refactor + Other changes - Fix Mines of Divan not showing - Code formatting - Small Optimizations/Changes --- src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 775c70ce..5ca9604c 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -909,6 +909,7 @@ public class SkyblockerConfig { @SerialEntry public int powderY = 70; } + public static class CrystalsHud { @SerialEntry public boolean enabled = true; @@ -925,6 +926,7 @@ public class SkyblockerConfig { @SerialEntry public int y = 130; } + public static class CrystalsWaypoints { @SerialEntry public boolean enabled = true; -- cgit From e5017cf3b6bf1d072033ed79e7b73291d5584650 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Fri, 2 Feb 2024 01:05:14 -0500 Subject: Add map scaling option Also fixed the last few formatting issues I saw --- src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java | 6 +++--- .../hysky/skyblocker/config/categories/DwarvenMinesCategory.java | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 5ca9604c..4acb8064 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -1,7 +1,6 @@ package de.hysky.skyblocker.config; import de.hysky.skyblocker.SkyblockerMod; -import de.hysky.skyblocker.skyblock.dwarven.CrystalsWaypoint; import de.hysky.skyblocker.skyblock.item.CustomArmorTrims; import de.hysky.skyblocker.utils.chat.ChatFilterResult; import de.hysky.skyblocker.utils.waypoint.Waypoint; @@ -15,9 +14,7 @@ import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; public class SkyblockerConfig { @SerialEntry @@ -925,6 +922,9 @@ public class SkyblockerConfig { @SerialEntry public int y = 130; + + @SerialEntry + public float mapScaling = 1f; } public static class CrystalsWaypoints { 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 62b0ebf9..97b48bc4 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java @@ -9,6 +9,7 @@ import dev.isxander.yacl3.api.Option; import dev.isxander.yacl3.api.OptionDescription; import dev.isxander.yacl3.api.OptionGroup; import de.hysky.skyblocker.skyblock.dwarven.DwarvenHudConfigScreen; +import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder; import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; @@ -99,6 +100,13 @@ public class DwarvenMinesCategory { .text(Text.translatable("text.skyblocker.open")) .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new CrystalsHudConfigScreen(screen))) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.mapScaling")) + .binding(defaults.locations.dwarvenMines.crystalsHud.mapScaling, + () -> config.locations.dwarvenMines.crystalsHud.mapScaling, + newValue -> config.locations.dwarvenMines.crystalsHud.mapScaling = newValue) + .controller(FloatFieldControllerBuilder::create) + .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations")) .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsHud.showLocations.@Tooltip"))) -- cgit