From e791dff4d2dff8203f5198fb4d0e90bbf457380a Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Fri, 8 Dec 2023 17:02:57 -0800 Subject: Add Waypoints for 2023 Lobby Presents (#772) Added Waypoints for 2023 Lobby Presents. #772 --- .../skyhanni/config/ConfigUpdaterMigrator.kt | 2 +- .../config/features/event/EventConfig.java | 6 +++--- .../features/event/HalloweenBasketConfig.java | 25 ---------------------- .../event/waypoints/ChristmasPresentConfig.java | 25 ++++++++++++++++++++++ .../event/waypoints/HalloweenBasketConfig.java | 25 ++++++++++++++++++++++ .../event/waypoints/LobbyWaypointsConfig.java | 18 ++++++++++++++++ 6 files changed, 72 insertions(+), 29 deletions(-) delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/HalloweenBasketConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/ChristmasPresentConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/HalloweenBasketConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/LobbyWaypointsConfig.java (limited to 'src/main/java/at/hannibal2/skyhanni/config') diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt index 0f638e22b..d375cad61 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt @@ -9,7 +9,7 @@ import com.google.gson.JsonPrimitive object ConfigUpdaterMigrator { val logger = LorenzLogger("ConfigMigration") - const val CONFIG_VERSION = 12 + const val CONFIG_VERSION = 13 fun JsonElement.at(chain: List, init: Boolean): JsonElement? { if (chain.isEmpty()) return this if (this !is JsonObject) return null diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java index ef27a42bd..0c11c7396 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.config.features.event; import at.hannibal2.skyhanni.config.features.event.bingo.BingoConfig; import at.hannibal2.skyhanni.config.features.event.diana.DianaConfig; +import at.hannibal2.skyhanni.config.features.event.waypoints.LobbyWaypointsConfig; import at.hannibal2.skyhanni.config.features.event.winter.WinterConfig; import com.google.gson.annotations.Expose; import io.github.moulberry.moulconfig.annotations.Accordion; @@ -43,9 +44,8 @@ public class EventConfig { @Expose public CenturyConfig century = new CenturyConfig(); + @Category(name = "Lobby Waypoints", desc = "Lobby Event Waypoint settings") @Expose - @ConfigOption(name = "Main Lobby Halloween Basket Waypoints", desc = "") - @Accordion - public HalloweenBasketConfig halloweenBasket = new HalloweenBasketConfig(); + public LobbyWaypointsConfig lobbyWaypoints = new LobbyWaypointsConfig(); } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/HalloweenBasketConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/HalloweenBasketConfig.java deleted file mode 100644 index 5cb2bfef4..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/event/HalloweenBasketConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -package at.hannibal2.skyhanni.config.features.event; - -import at.hannibal2.skyhanni.config.FeatureToggle; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; - -public class HalloweenBasketConfig { - - @Expose - @ConfigOption(name = "Basket Waypoints", desc = "Show all Halloween Basket waypoints.\nShoutout to §bTobbbb §7for the coordinates.\n(AS OF 2023)") - @ConfigEditorBoolean - @FeatureToggle - public boolean allWaypoints = false; - - @Expose - @ConfigOption(name = "Entrance Waypoints", desc = "Show helper waypoints to Baskets #23, #24, and #25. Coordinates by §bErymanthus§7.") - @ConfigEditorBoolean - public boolean allEntranceWaypoints = false; - - @Expose - @ConfigOption(name = "Only Closest", desc = "Only show the closest waypoint") - @ConfigEditorBoolean - public boolean onlyClosest = true; -} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/ChristmasPresentConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/ChristmasPresentConfig.java new file mode 100644 index 000000000..25da62873 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/ChristmasPresentConfig.java @@ -0,0 +1,25 @@ +package at.hannibal2.skyhanni.config.features.event.waypoints; + +import at.hannibal2.skyhanni.config.FeatureToggle; +import com.google.gson.annotations.Expose; +import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; +import io.github.moulberry.moulconfig.annotations.ConfigOption; + +public class ChristmasPresentConfig { + + @Expose + @ConfigOption(name = "Present Waypoints", desc = "Show all Present waypoints") + @ConfigEditorBoolean + @FeatureToggle + public boolean allWaypoints = false; + + @Expose + @ConfigOption(name = "Entrance Waypoints", desc = "Show helper waypoints to .") + @ConfigEditorBoolean + public boolean allEntranceWaypoints = false; + + @Expose + @ConfigOption(name = "Only Closest", desc = "Only show the closest waypoint") + @ConfigEditorBoolean + public boolean onlyClosest = false; +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/HalloweenBasketConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/HalloweenBasketConfig.java new file mode 100644 index 000000000..93b4d96f3 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/HalloweenBasketConfig.java @@ -0,0 +1,25 @@ +package at.hannibal2.skyhanni.config.features.event.waypoints; + +import at.hannibal2.skyhanni.config.FeatureToggle; +import com.google.gson.annotations.Expose; +import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; +import io.github.moulberry.moulconfig.annotations.ConfigOption; + +public class HalloweenBasketConfig { + + @Expose + @ConfigOption(name = "Basket Waypoints", desc = "Show all Halloween Basket waypoints.\nShoutout to §bTobbbb §7for the coordinates.\n(AS OF 2023)") + @ConfigEditorBoolean + @FeatureToggle + public boolean allWaypoints = false; + + @Expose + @ConfigOption(name = "Entrance Waypoints", desc = "Show helper waypoints to Baskets #23, #24, and #25. Coordinates by §bErymanthus§7.") + @ConfigEditorBoolean + public boolean allEntranceWaypoints = false; + + @Expose + @ConfigOption(name = "Only Closest", desc = "Only show the closest waypoint") + @ConfigEditorBoolean + public boolean onlyClosest = true; +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/LobbyWaypointsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/LobbyWaypointsConfig.java new file mode 100644 index 000000000..6cef4d81c --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/LobbyWaypointsConfig.java @@ -0,0 +1,18 @@ +package at.hannibal2.skyhanni.config.features.event.waypoints; + +import com.google.gson.annotations.Expose; +import io.github.moulberry.moulconfig.annotations.Accordion; +import io.github.moulberry.moulconfig.annotations.ConfigOption; + +public class LobbyWaypointsConfig { + + @Expose + @ConfigOption(name = "Halloween Basket Waypoints", desc = "") + @Accordion + public HalloweenBasketConfig halloweenBasket = new HalloweenBasketConfig(); + + @Expose + @ConfigOption(name = "Christmas Present Waypoints", desc = "") + @Accordion + public ChristmasPresentConfig christmasPresent = new ChristmasPresentConfig(); +} -- cgit