diff options
| author | jani270 <69345714+jani270@users.noreply.github.com> | 2024-07-26 13:03:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-26 13:03:35 +0200 |
| commit | 4558f7b79dbd6097747e4742e13dcbdec623612f (patch) | |
| tree | 3cae43f22220ad7fc08d76f1ea9ad90a58ec9c3c /src/main/java/at | |
| parent | 19d4d4e1eaa06d4ff2a170cad7ebf9e6441dc048 (diff) | |
| download | skyhanni-4558f7b79dbd6097747e4742e13dcbdec623612f.tar.gz skyhanni-4558f7b79dbd6097747e4742e13dcbdec623612f.tar.bz2 skyhanni-4558f7b79dbd6097747e4742e13dcbdec623612f.zip | |
Improvement: Made Hoppity Egg Waypoint Color customizable (#2259)
Diffstat (limited to 'src/main/java/at')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java | 6 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java index 52aaa8aed..5536d5691 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java @@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.core.config.Position; import com.google.gson.annotations.Expose; import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour; import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider; import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText; import io.github.notenoughupdates.moulconfig.annotations.ConfigLink; @@ -27,6 +28,11 @@ public class HoppityEggsConfig { public boolean waypointsImmediately = false; @Expose + @ConfigOption(name = "Color", desc = "Color of the waypoint.") + @ConfigEditorColour + public String waypointColor = "0:53:46:224:73"; + + @Expose @ConfigOption(name = "Show Line", desc = "Show a line to the waypoint.") @ConfigEditorBoolean @FeatureToggle diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt index aa291eb92..dcf56aac6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt @@ -11,6 +11,7 @@ import at.hannibal2.skyhanni.features.fame.ReminderUtils import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule +import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer @@ -140,7 +141,7 @@ object HoppityEggLocator { if (eyeLocation.distance(it) > 2) { drawWaypointFilled( it, - LorenzColor.GREEN.toColor(), + config.waypointColor.toChromaColor(), seeThroughBlocks = true, ) drawDynamicText(it.add(y = 1), "§aGuess", 1.5) @@ -158,7 +159,7 @@ object HoppityEggLocator { && HoppityEggLocations.hasCollectedEgg(location) val possibleDuplicateLabel = if (shouldMarkDuplicate) "$label §c(Duplicate Location)" else label if (!shouldMarkDuplicate) { - drawWaypointFilled(location, LorenzColor.GREEN.toColor(), seeThroughBlocks = true) + drawWaypointFilled(location, config.waypointColor.toChromaColor(), seeThroughBlocks = true) } else { drawColor(location, LorenzColor.RED.toColor(), false, 0.5f) } |