Backend: Change Java to Kotlin for repo files (#1543)

2 files changed, 10 insertions, 14 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt
index 85d06060d..e0045ba76 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt
@@ -2,9 +2,7 @@ package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.ScoreboardData
-import at.hannibal2.skyhanni.data.jsonobjects.repo.TabListJson
 import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -21,19 +19,17 @@ object InGameDateDisplay {
 
     private val config get() = SkyHanniMod.feature.gui.inGameDate
 
-    private val monthAndDatePattern by RepoPattern.pattern(
-        "misc.ingametime.date",
+    private val patternGroup = RepoPattern.group("misc.ingametime")
+    private val monthAndDatePattern by patternGroup.pattern(
+        "date",
         ".*((Early|Late) )?(Winter|Spring|Summer|Autumn) [0-9]{1,2}(nd|rd|th|st)?.*"
     )
-    private var display = ""
-
-    // sun, moon, spooky
-    private var sunMoonIcons = emptyList<String>()
+    private val timeSymbolsPattern by patternGroup.pattern(
+        "symbols",
+        "([☀☽࿇])"
+    )
 
-    @SubscribeEvent
-    fun onRepoReload(event: RepositoryReloadEvent) {
-        sunMoonIcons = event.getConstant<TabListJson>("TabList").sun_moon_symbols
-    }
+    private var display = ""
 
     @SubscribeEvent
     fun onSecondPassed(event: SecondPassedEvent) {
@@ -57,7 +53,7 @@ object InGameDateDisplay {
             val time = list.find { it.lowercase().contains("am ") || it.lowercase().contains("pm ") } ?: "??"
             theBaseString = "$monthAndDate, $year ${time.trim()}".removeColor()
             if (!config.includeSunMoon) {
-                sunMoonIcons.forEach { theBaseString = theBaseString.replace(it, "") }
+                theBaseString = timeSymbolsPattern.matcher(theBaseString).replaceAll("")
             }
         } else {
             theBaseString = date.formatted()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
index 8fb37ee6e..d0e198765 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
@@ -61,7 +61,7 @@ object EstimatedItemValue {
     @SubscribeEvent
     fun onRepoReload(event: RepositoryReloadEvent) {
         val data = event.getConstant<ItemsJson>("Items")
-        bookBundleAmount = data.book_bundle_amount ?: error("book_bundle_amount is missing")
+        bookBundleAmount = data.bookBundleAmount
     }
 
     @SubscribeEvent