diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2024-03-23 03:59:15 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-22 17:59:15 +0100 |
| commit | dd99f8ad84abcb08a446a6d02ae471b177326925 (patch) | |
| tree | 3fb5eb194090f355cf8d7081fa4afe50b8daa205 | |
| parent | 3c1076d9f2fe8b6258304a0ff23bed3a6992f34d (diff) | |
| download | skyhanni-dd99f8ad84abcb08a446a6d02ae471b177326925.tar.gz skyhanni-dd99f8ad84abcb08a446a6d02ae471b177326925.tar.bz2 skyhanni-dd99f8ad84abcb08a446a6d02ae471b177326925.zip | |
Backend: Add Mineshaft IslandType (#1235)
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/IslandType.kt | 15 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt index e6a01136c..ff185d5ae 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.data -enum class IslandType(val displayName: String, val modeName: String = "null") { +enum class IslandType(val displayName: String) { // TODO USE SH-REPO (for displayName only) PRIVATE_ISLAND("Private Island"), PRIVATE_ISLAND_GUEST("Private Island Guest"), @@ -8,21 +8,22 @@ enum class IslandType(val displayName: String, val modeName: String = "null") { KUUDRA_ARENA("Kuudra"), CRIMSON_ISLE("Crimson Isle"), DWARVEN_MINES("Dwarven Mines"), - DUNGEON_HUB("Dungeon Hub", "dungeon_hub"), - CATACOMBS("Catacombs", "dungeon"), + DUNGEON_HUB("Dungeon Hub"), + CATACOMBS("Catacombs"), - HUB("Hub", "village"), + HUB("Hub"), DARK_AUCTION("Dark Auction"), THE_FARMING_ISLANDS("The Farming Islands"), CRYSTAL_HOLLOWS("Crystal Hollows"), - THE_PARK("The Park", "floating_islands_1"), - DEEP_CAVERNS("Deep Caverns", "deep_caverns"), - GOLD_MINES("Gold Mine", "gold_mine"),// TODO confirm + THE_PARK("The Park"), + DEEP_CAVERNS("Deep Caverns"), + GOLD_MINES("Gold Mine"), GARDEN("Garden"), GARDEN_GUEST("Garden Guest"), SPIDER_DEN("Spider's Den"), WINTER("Jerry's Workshop"), THE_RIFT("The Rift"), + MINESHAFT("Mineshaft"), NONE(""), UNKNOWN("???"), diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt index a3a9b979f..019104aa8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt @@ -113,7 +113,7 @@ class MiningEventTracker { return } - if (IslandType.CRYSTAL_HOLLOWS.isInIsland() && eventType.dwarvenSpecific) return + if (!IslandType.DWARVEN_MINES.isInIsland() && eventType.dwarvenSpecific) return if (lastSentEvent == eventType) return lastSentEvent = eventType |