diff options
author | CalMWolfs <cwolfson58@gmail.com> | 2023-06-19 21:48:45 +1000 |
---|---|---|
committer | CalMWolfs <cwolfson58@gmail.com> | 2023-06-19 21:48:45 +1000 |
commit | 4a12bbd0b780238557cdc2330cf6314015e0de07 (patch) | |
tree | 3ba5d8be8841f6a4d7e75d8e10cd4fe51e5e7de9 | |
parent | da2d2def82ac819dbfa9457b0eb180bba4491278 (diff) | |
download | skyhanni-4a12bbd0b780238557cdc2330cf6314015e0de07.tar.gz skyhanni-4a12bbd0b780238557cdc2330cf6314015e0de07.tar.bz2 skyhanni-4a12bbd0b780238557cdc2330cf6314015e0de07.zip |
renaming
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/Storage.java | 4 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasure.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasures.kt) | 2 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java index 4a95871cb..ca852e482 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java @@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.features.garden.CropAccessory; import at.hannibal2.skyhanni.features.garden.CropType; import at.hannibal2.skyhanni.features.garden.fortuneguide.FarmingItems; import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward; -import at.hannibal2.skyhanni.features.misc.FrozenTreasures; +import at.hannibal2.skyhanni.features.misc.FrozenTreasure; import at.hannibal2.skyhanni.features.misc.GhostCounter.Option; import at.hannibal2.skyhanni.utils.LorenzVec; import com.google.gson.annotations.Expose; @@ -241,7 +241,7 @@ public class Storage { public int compactProcs = 0; @Expose - public Map<FrozenTreasures, Integer> treasureCount = new HashMap<>(); + public Map<FrozenTreasure, Integer> treasureCount = new HashMap<>(); } public long nextCityProjectParticipationTime = 0L; diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasure.kt index d9d936a31..d18b65983 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasure.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.features.misc -enum class FrozenTreasures (val internalName: String, val displayName: String, val defaultAmount: Int, val iceMultiplier: Int = 0){ +enum class FrozenTreasure (val internalName: String, val displayName: String, val defaultAmount: Int, val iceMultiplier: Int = 0){ WHITE_GIFT("WHITE_GIFT", "§fWhite Gift", 1), GREEN_GIFT("GREEN_GIFT", "§aGreen Gift",1), RED_GIFT("RED_GIFT","§9§cRed Gift", 1), diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt index bdb6db48d..93bab63e7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt @@ -31,7 +31,7 @@ class FrozenTreasureTracker { private var missedMinutes = 0 private var compactPattern = "COMPACT! You found an Enchanted Ice!".toPattern() - private var treasureCount = mapOf<FrozenTreasures, Int>() + private var treasureCount = mapOf<FrozenTreasure, Int>() init { fixedRateTimer(name = "skyhanni-dungeon-milestone-display", period = 60_000) { @@ -77,7 +77,7 @@ class FrozenTreasureTracker { if (config.hideMessages) event.isCanceled } - for (treasure in FrozenTreasures.values()) { + for (treasure in FrozenTreasure.values()) { if ("FROZEN TREASURE! You found ${treasure.displayName}!".toRegex().matches(message)) { val old = treasureCount[treasure] ?: 0 treasureCount = treasureCount.editCopy { this[treasure] = old + 1 } @@ -109,7 +109,7 @@ class FrozenTreasureTracker { addAsSingletonList("§e${formatNumber(compactProcs)} Compact Procs") addAsSingletonList("") - for (treasure in FrozenTreasures.values()) { + for (treasure in FrozenTreasure.values()) { val count = treasureCount[treasure] ?: 0 addAsSingletonList("§b${formatNumber(count)} ${treasure.displayName}") } @@ -133,7 +133,7 @@ class FrozenTreasureTracker { private fun calculateIce() { estimatedIce = 0 if (config.countCompact) estimatedIce += compactProcs * 160 - for (treasure in FrozenTreasures.values()) { + for (treasure in FrozenTreasure.values()) { val amount = treasureCount[treasure] ?: 0 estimatedIce += amount * treasure.defaultAmount * treasure.iceMultiplier } |