Skip to content

add color options for the dungeon secret waypoints #1850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
viciscat wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add color options for the dungeon secret waypoints #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6283735
add color options for the dungeon secret waypoints
viciscat Nov 21, 2025
7e51b0b
wildcard
viciscat Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 104 additions & 1 deletion src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
newValue -> config.dungeons.onlyHighlightDonatedItems = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Boolean>createBuilder()
.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.sellableItemsHighlighter"))
.description(Text.translatable("skyblocker.config.dungeons.sellableItemsHighlighter.@Tooltip"))
.binding(defaults.dungeons.sellableItemsHighlighter,
Expand Down Expand Up @@ -552,69 +552,149 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
newValue -> config.dungeons.secretWaypoints.enableEntranceWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorEntranceWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorEntranceWaypoints,
() -> config.dungeons.secretWaypoints.colorEntranceWaypoints,
newValue -> config.dungeons.secretWaypoints.colorEntranceWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())

.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableSuperboomWaypoints"))
.binding(defaults.dungeons.secretWaypoints.enableSuperboomWaypoints,
() -> config.dungeons.secretWaypoints.enableSuperboomWaypoints,
newValue -> config.dungeons.secretWaypoints.enableSuperboomWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorSuperboomWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorSuperboomWaypoints,
() -> config.dungeons.secretWaypoints.colorSuperboomWaypoints,
newValue -> config.dungeons.secretWaypoints.colorSuperboomWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())

.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableChestWaypoints"))
.binding(defaults.dungeons.secretWaypoints.enableChestWaypoints,
() -> config.dungeons.secretWaypoints.enableChestWaypoints,
newValue -> config.dungeons.secretWaypoints.enableChestWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorChestWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorChestWaypoints,
() -> config.dungeons.secretWaypoints.colorChestWaypoints,
newValue -> config.dungeons.secretWaypoints.colorChestWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())

.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableItemWaypoints"))
.binding(defaults.dungeons.secretWaypoints.enableItemWaypoints,
() -> config.dungeons.secretWaypoints.enableItemWaypoints,
newValue -> config.dungeons.secretWaypoints.enableItemWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorItemWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorItemWaypoints,
() -> config.dungeons.secretWaypoints.colorItemWaypoints,
newValue -> config.dungeons.secretWaypoints.colorItemWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())

.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableBatWaypoints"))
.binding(defaults.dungeons.secretWaypoints.enableBatWaypoints,
() -> config.dungeons.secretWaypoints.enableBatWaypoints,
newValue -> config.dungeons.secretWaypoints.enableBatWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorBatWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorBatWaypoints,
() -> config.dungeons.secretWaypoints.colorBatWaypoints,
newValue -> config.dungeons.secretWaypoints.colorBatWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())

.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableWitherWaypoints"))
.binding(defaults.dungeons.secretWaypoints.enableWitherWaypoints,
() -> config.dungeons.secretWaypoints.enableWitherWaypoints,
newValue -> config.dungeons.secretWaypoints.enableWitherWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorWitherWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorWitherWaypoints,
() -> config.dungeons.secretWaypoints.colorWitherWaypoints,
newValue -> config.dungeons.secretWaypoints.colorWitherWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())

.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableLeverWaypoints"))
.binding(defaults.dungeons.secretWaypoints.enableLeverWaypoints,
() -> config.dungeons.secretWaypoints.enableLeverWaypoints,
newValue -> config.dungeons.secretWaypoints.enableLeverWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorLeverWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorLeverWaypoints,
() -> config.dungeons.secretWaypoints.colorLeverWaypoints,
newValue -> config.dungeons.secretWaypoints.colorLeverWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())

.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableFairySoulWaypoints"))
.binding(defaults.dungeons.secretWaypoints.enableFairySoulWaypoints,
() -> config.dungeons.secretWaypoints.enableFairySoulWaypoints,
newValue -> config.dungeons.secretWaypoints.enableFairySoulWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorFairySoulWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorFairySoulWaypoints,
() -> config.dungeons.secretWaypoints.colorFairySoulWaypoints,
newValue -> config.dungeons.secretWaypoints.colorFairySoulWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())

.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableStonkWaypoints"))
.binding(defaults.dungeons.secretWaypoints.enableStonkWaypoints,
() -> config.dungeons.secretWaypoints.enableStonkWaypoints,
newValue -> config.dungeons.secretWaypoints.enableStonkWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorStonkWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorStonkWaypoints,
() -> config.dungeons.secretWaypoints.colorStonkWaypoints,
newValue -> config.dungeons.secretWaypoints.colorStonkWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())

.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableAotvWaypoints"))
.binding(defaults.dungeons.secretWaypoints.enableAotvWaypoints,
() -> config.dungeons.secretWaypoints.enableAotvWaypoints,
newValue -> config.dungeons.secretWaypoints.enableAotvWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorAotvWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorAotvWaypoints,
() -> config.dungeons.secretWaypoints.colorAotvWaypoints,
newValue -> config.dungeons.secretWaypoints.colorAotvWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())

.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enablePearlWaypoints"))
.description(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enablePearlWaypoints.@Tooltip"))
Expand All @@ -623,6 +703,14 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
newValue -> config.dungeons.secretWaypoints.enablePearlWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorPearlWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorPearlWaypoints,
() -> config.dungeons.secretWaypoints.colorPearlWaypoints,
newValue -> config.dungeons.secretWaypoints.colorPearlWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())

.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enablePrinceWaypoints"))
.description(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enablePrinceWaypoints.@Tooltip"))
Expand All @@ -631,6 +719,14 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
newValue -> config.dungeons.secretWaypoints.enablePrinceWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorPrinceWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorPrinceWaypoints,
() -> config.dungeons.secretWaypoints.colorPrinceWaypoints,
newValue -> config.dungeons.secretWaypoints.colorPrinceWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())

.option(Option.<Boolean>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableDefaultWaypoints"))
.description(Text.translatable("skyblocker.config.dungeons.secretWaypoints.enableDefaultWaypoints.@Tooltip"))
Expand All @@ -639,6 +735,13 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
newValue -> config.dungeons.secretWaypoints.enableDefaultWaypoints = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Color>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.colorDefaultWaypoints"))
.binding(defaults.dungeons.secretWaypoints.colorDefaultWaypoints,
() -> config.dungeons.secretWaypoints.colorDefaultWaypoints,
newValue -> config.dungeons.secretWaypoints.colorDefaultWaypoints = newValue)
.controller(ConfigUtils.createColourController(false))
.build())
.build())

// Mimic Message
Expand Down
26 changes: 26 additions & 0 deletions src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,32 @@ public static class SecretWaypoints {
public boolean enablePrinceWaypoints = true;

public boolean enableDefaultWaypoints = true;

public Color colorEntranceWaypoints = new Color(0, 255, 0);

public Color colorSuperboomWaypoints = new Color(255, 0, 0);

public Color colorChestWaypoints = new Color(2, 213, 250);

public Color colorItemWaypoints = new Color(2, 64, 250);

public Color colorBatWaypoints = new Color(142, 66, 0);

public Color colorWitherWaypoints = new Color(30, 30, 30);

public Color colorLeverWaypoints = new Color(250, 217, 2);

public Color colorFairySoulWaypoints = new Color(255, 85, 255);

public Color colorStonkWaypoints = new Color(146, 52, 235);

public Color colorAotvWaypoints = new Color(252, 98, 3);

public Color colorPearlWaypoints = new Color(57, 117, 125);

public Color colorPrinceWaypoints = new Color(133, 21, 13);

public Color colorDefaultWaypoints = new Color(190, 255, 252);
}

public static class MimicMessage {
Expand Down
48 changes: 28 additions & 20 deletions src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.awt.Color;
import java.util.List;
import java.util.Objects;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.function.ToDoubleFunction;
Expand All @@ -47,7 +49,7 @@ public class SecretWaypoint extends DistancedNamedWaypoint {
}

SecretWaypoint(int secretIndex, Category category, Text name, BlockPos pos) {
super(pos, name, TYPE_SUPPLIER, category.colorComponents);
super(pos, name, TYPE_SUPPLIER, new float[]{1, 1, 1});
this.secretIndex = secretIndex;
this.category = category;
}
Expand All @@ -69,6 +71,11 @@ public boolean shouldRender() {
return super.shouldRender() && category.isEnabled();
}

@Override
public float[] getRenderColorComponents() {
return category.getColorComponents(colorComponents);
}

boolean needsInteraction() {
return category.needsInteraction();
}
Expand Down Expand Up @@ -115,33 +122,34 @@ SecretWaypoint relativeToActual(Room room) {
}

enum Category implements StringIdentifiable {
ENTRANCE("entrance", secretWaypoints -> secretWaypoints.enableEntranceWaypoints, 0, 255, 0),
SUPERBOOM("superboom", secretWaypoints -> secretWaypoints.enableSuperboomWaypoints, 255, 0, 0),
CHEST("chest", secretWaypoints -> secretWaypoints.enableChestWaypoints, 2, 213, 250),
ITEM("item", secretWaypoints -> secretWaypoints.enableItemWaypoints, 2, 64, 250),
BAT("bat", secretWaypoints -> secretWaypoints.enableBatWaypoints, 142, 66, 0),
WITHER("wither", secretWaypoints -> secretWaypoints.enableWitherWaypoints, 30, 30, 30),
LEVER("lever", secretWaypoints -> secretWaypoints.enableLeverWaypoints, 250, 217, 2),
FAIRYSOUL("fairysoul", secretWaypoints -> secretWaypoints.enableFairySoulWaypoints, 255, 85, 255),
STONK("stonk", secretWaypoints -> secretWaypoints.enableStonkWaypoints, 146, 52, 235),
AOTV("aotv", secretWaypoints -> secretWaypoints.enableAotvWaypoints, 252, 98, 3),
PEARL("pearl", secretWaypoints -> secretWaypoints.enablePearlWaypoints, 57, 117, 125),
PRINCE("prince", secretWaypoints -> secretWaypoints.enablePrinceWaypoints, 133, 21, 13),
DEFAULT("default", secretWaypoints -> secretWaypoints.enableDefaultWaypoints, 190, 255, 252);
ENTRANCE("entrance", secretWaypoints -> secretWaypoints.enableEntranceWaypoints, secretWaypoints -> secretWaypoints.colorEntranceWaypoints),
SUPERBOOM("superboom", secretWaypoints -> secretWaypoints.enableSuperboomWaypoints, secretWaypoints -> secretWaypoints.colorSuperboomWaypoints),
CHEST("chest", secretWaypoints -> secretWaypoints.enableChestWaypoints, secretWaypoints -> secretWaypoints.colorChestWaypoints),
ITEM("item", secretWaypoints -> secretWaypoints.enableItemWaypoints, secretWaypoints -> secretWaypoints.colorItemWaypoints),
BAT("bat", secretWaypoints -> secretWaypoints.enableBatWaypoints, secretWaypoints -> secretWaypoints.colorBatWaypoints),
WITHER("wither", secretWaypoints -> secretWaypoints.enableWitherWaypoints, secretWaypoints -> secretWaypoints.colorWitherWaypoints),
LEVER("lever", secretWaypoints -> secretWaypoints.enableLeverWaypoints, secretWaypoints -> secretWaypoints.colorLeverWaypoints),
FAIRYSOUL("fairysoul", secretWaypoints -> secretWaypoints.enableFairySoulWaypoints, secretWaypoints -> secretWaypoints.colorFairySoulWaypoints),
STONK("stonk", secretWaypoints -> secretWaypoints.enableStonkWaypoints, secretWaypoints -> secretWaypoints.colorStonkWaypoints),
AOTV("aotv", secretWaypoints -> secretWaypoints.enableAotvWaypoints, secretWaypoints -> secretWaypoints.colorAotvWaypoints),
PEARL("pearl", secretWaypoints -> secretWaypoints.enablePearlWaypoints, secretWaypoints -> secretWaypoints.colorPearlWaypoints),
PRINCE("prince", secretWaypoints -> secretWaypoints.enablePrinceWaypoints, secretWaypoints -> secretWaypoints.colorPrinceWaypoints),
DEFAULT("default", secretWaypoints -> secretWaypoints.enableDefaultWaypoints, secretWaypoints -> secretWaypoints.colorDefaultWaypoints);
public static final Codec<Category> CODEC = StringIdentifiable.createCodec(Category::values);
private final String name;
private final Predicate<DungeonsConfig.SecretWaypoints> enabledPredicate;
private final float[] colorComponents;
private final Function<DungeonsConfig.SecretWaypoints, Color> colorFunction;

Category(String name, Predicate<DungeonsConfig.SecretWaypoints> enabledPredicate, int... intColorComponents) {
Category(String name, Predicate<DungeonsConfig.SecretWaypoints> enabledPredicate, Function<DungeonsConfig.SecretWaypoints, Color> colorFunction) {
this.name = name;
this.enabledPredicate = enabledPredicate;
colorComponents = new float[intColorComponents.length];
for (int i = 0; i < intColorComponents.length; i++) {
colorComponents[i] = intColorComponents[i] / 255F;
}
this.colorFunction = colorFunction;
}

private float[] getColorComponents(float[] compArray) {
return colorFunction.apply(SkyblockerConfigManager.get().dungeons.secretWaypoints).getRGBColorComponents(compArray);
}

static Category get(JsonObject waypointJson) {
return CODEC.parse(JsonOps.INSTANCE, waypointJson.get("category")).resultOrPartial(LOGGER::error).orElse(Category.DEFAULT);
}
Expand Down
Loading