diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2024-08-11 23:02:03 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-11 15:02:03 +0200 |
| commit | 39566c78d07f15e57f0ea9a5fa37f22dd277c97c (patch) | |
| tree | aea2f96312ee14e658d97603254752aedf14fb4f /src/main | |
| parent | 12f434e64c9dc86ccbd1d120e156eae5ec983026 (diff) | |
| download | skyhanni-39566c78d07f15e57f0ea9a5fa37f22dd277c97c.tar.gz skyhanni-39566c78d07f15e57f0ea9a5fa37f22dd277c97c.tar.bz2 skyhanni-39566c78d07f15e57f0ea9a5fa37f22dd277c97c.zip | |
Add copper dye to block visitor rewards (#2329)
Co-authored-by: not-a-cow <kly3aswd@gmail.com>
Diffstat (limited to 'src/main')
4 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt index f274d44f2..25cab54fb 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt @@ -12,7 +12,7 @@ import com.google.gson.JsonPrimitive object ConfigUpdaterMigrator { val logger = LorenzLogger("ConfigMigration") - const val CONFIG_VERSION = 53 + const val CONFIG_VERSION = 54 fun JsonElement.at(chain: List<String>, 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/garden/visitor/RewardWarningConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java index 4b70d5230..7e464d426 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java @@ -53,7 +53,8 @@ public class RewardWarningConfig { VisitorReward.MUSIC_RUNE, VisitorReward.SPACE_HELMET, VisitorReward.CULTIVATING, - VisitorReward.REPLENISH + VisitorReward.REPLENISH, + VisitorReward.COPPER_DYE )); @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt index 73384c9f0..fef28450f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt @@ -729,6 +729,14 @@ object GardenVisitorFeatures { drops } + event.transform(54, "garden.visitors.rewardWarning.drops") { element -> + val drops = JsonArray() + for (entry in element.asJsonArray) { + drops.add(JsonPrimitive(entry.asString)) + } + drops.add(JsonPrimitive(VisitorReward.COPPER_DYE.name)) + drops + } event.transform(15, "garden.visitors.highlightStatus") { element -> ConfigUtils.migrateIntToEnum(element, HighlightMode::class.java) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt index 76ef14237..048876c72 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt @@ -20,6 +20,7 @@ enum class VisitorReward( CULTIVATING("CULTIVATING;1", "§9Cultivating I", legacyId = 6), REPLENISH("REPLENISH;1", "§9Replenish I", legacyId = 7), DELICATE("DELICATE;5", "§9Delicate V"), + COPPER_DYE("DYE_COPPER", "§8Copper Dye"), ; private val internalName by lazy { rawInternalName.asInternalName() } |