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