summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/bingo
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/bingo')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt4
2 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt
index e960ec4b6..5950f484d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.bingo
import at.hannibal2.skyhanni.config.storage.PlayerSpecificStorage.BingoSession
import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoData
import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoJson
import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoRanksJson
import at.hannibal2.skyhanni.events.DebugDataCollectEvent
@@ -23,7 +24,7 @@ import java.time.ZoneOffset
object BingoAPI {
private var ranks = mapOf<String, Int>()
- private var data: Map<String, BingoJson.BingoData> = emptyMap()
+ private var data: Map<String, BingoData> = emptyMap()
val bingoGoals get() = bingoStorage.goals
val personalGoals get() = bingoGoals.values.filter { it.type == GoalType.PERSONAL }
@@ -69,7 +70,7 @@ object BingoAPI {
@SubscribeEvent
fun onRepoReload(event: RepositoryReloadEvent) {
ranks = event.getConstant<BingoRanksJson>("BingoRanks").ranks
- data = event.getConstant<BingoJson>("Bingo").bingo_tips
+ data = event.getConstant<BingoJson>("Bingo").bingoTips
}
fun getRankFromScoreboard(text: String) = if (detectionPattern.matches(text)) getRank(text) else null
@@ -84,7 +85,7 @@ object BingoAPI {
fun getData(itemName: String) =
data.filter { itemName.startsWith(it.key.split(" (Community Goal)")[0]) }.values.firstOrNull()
- fun BingoGoal.getData(): BingoJson.BingoData? = if (type == GoalType.COMMUNITY) {
+ fun BingoGoal.getData(): BingoData? = if (type == GoalType.COMMUNITY) {
getData(displayName)
} else {
data[displayName]
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt
index 67326faea..6d4a45789 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt
@@ -1,7 +1,7 @@
package at.hannibal2.skyhanni.features.bingo.card
import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoJson
+import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoData
import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
import at.hannibal2.skyhanni.events.LorenzChatEvent
import at.hannibal2.skyhanni.events.bingo.BingoCardUpdateEvent
@@ -166,5 +166,5 @@ object BingoCardReader {
BingoCardUpdateEvent().postAndCatch()
}
- private fun BingoJson.BingoData.getDescriptionLine() = "§7" + note.joinToString(" ")
+ private fun BingoData.getDescriptionLine() = "§7" + note.joinToString(" ")
}