fix: ifNull blocks never get run

My-Name-Is-Jeff · My-Name-Is-Jeff · commit 756bb8ee917b · 2024-02-08T18:00:17.000-05:00
diff --git a/src/main/kotlin/gg/skytils/skytilsmod/commands/impl/SkytilsCommand.kt b/src/main/kotlin/gg/skytils/skytilsmod/commands/impl/SkytilsCommand.kt
@@ -119,7 +119,7 @@ object SkytilsCommand : BaseCommand("skytils", listOf("st")) {
                             DataFetcher.reloadData().invokeOnCompletion {
                                 it?.run {
                                     UChat.chat("$failPrefix §cFailed to reload repository data due to a ${it::class.simpleName ?: "error"}: ${it.message}!")
-                                }?.ifNull {
+                                }.ifNull {
                                     UChat.chat("$prefix §bRepository data has been §freloaded§b successfully.")
                                 }
                             }
@@ -132,7 +132,7 @@ object SkytilsCommand : BaseCommand("skytils", listOf("st")) {
                             }.invokeOnCompletion {
                                 it?.run {
                                     UChat.chat("$failPrefix §cFailed to reload mayor data due to a ${it::class.simpleName ?: "error"}: ${it.message}!")
-                                }?.ifNull {
+                                }.ifNull {
                                     UChat.chat("$prefix §bMayor data has been §freloaded§b successfully.")
                                 }
                             }
diff --git a/src/main/kotlin/gg/skytils/skytilsmod/listeners/DungeonListener.kt b/src/main/kotlin/gg/skytils/skytilsmod/listeners/DungeonListener.kt
@@ -102,16 +102,19 @@ object DungeonListener {
         if (event.packet is S02PacketChat) {
             val text = event.packet.chatComponent.formattedText
             if (event.packet.type == 2.toByte()) {
-                secretsRegex.find(text)?.destructured?.let { (secrets, maxSecrets) ->
-                    val sec = secrets.toInt()
-                    val max = maxSecrets.toInt().coerceAtLeast(sec)
+                if (Skytils.config.dungeonSecretDisplay) {
+                    secretsRegex.find(text)?.destructured?.also { (secrets, maxSecrets) ->
+                        val sec = secrets.toInt()
+                        val max = maxSecrets.toInt().coerceAtLeast(sec)
 
-                    DungeonFeatures.DungeonSecretDisplay.secrets = sec
-                    DungeonFeatures.DungeonSecretDisplay.maxSecrets = max
-                }?.ifNull {
-                    DungeonFeatures.DungeonSecretDisplay.secrets = -1
-                    DungeonFeatures.DungeonSecretDisplay.maxSecrets = -1
+                        DungeonFeatures.DungeonSecretDisplay.secrets = sec
+                        DungeonFeatures.DungeonSecretDisplay.maxSecrets = max
+                    }.ifNull {
+                        DungeonFeatures.DungeonSecretDisplay.secrets = -1
+                        DungeonFeatures.DungeonSecretDisplay.maxSecrets = -1
+                    }
                 }
+
             } else {
                 if (text.stripControlCodes()
                         .trim() == "> EXTRA STATS <"
diff --git a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/item/ItemStackHook.kt b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/item/ItemStackHook.kt
@@ -67,7 +67,7 @@ fun modifyDisplayName(s: String): String {
                         displayName.replace(starPattern, "")
                             .replace(masterStarPattern, "")
                     }§c${count}✪"
-                }?.ifNull {
+                }.ifNull {
                     displayName = "${displayName.replace(starPattern, "")}§6${displayName.countMatches(starPattern)}✪"
                 }
             } else if (Skytils.config.starDisplayType == 1) {

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ object SkytilsCommand : BaseCommand("skytils", listOf("st")) {`
`119`	`119`	`DataFetcher.reloadData().invokeOnCompletion {`
`120`	`120`	`it?.run {`
`121`	`121`	`UChat.chat("$failPrefix §cFailed to reload repository data due to a ${it::class.simpleName ?: "error"}: ${it.message}!")`
`122`		`- }?.ifNull {`
	`122`	`+ }.ifNull {`
`123`	`123`	`UChat.chat("$prefix §bRepository data has been §freloaded§b successfully.")`
`124`	`124`	`}`
`125`	`125`	`}`
`@@ -132,7 +132,7 @@ object SkytilsCommand : BaseCommand("skytils", listOf("st")) {`
`132`	`132`	`}.invokeOnCompletion {`
`133`	`133`	`it?.run {`
`134`	`134`	`UChat.chat("$failPrefix §cFailed to reload mayor data due to a ${it::class.simpleName ?: "error"}: ${it.message}!")`
`135`		`- }?.ifNull {`
	`135`	`+ }.ifNull {`
`136`	`136`	`UChat.chat("$prefix §bMayor data has been §freloaded§b successfully.")`
`137`	`137`	`}`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ fun modifyDisplayName(s: String): String {`
`67`	`67`	`displayName.replace(starPattern, "")`
`68`	`68`	`.replace(masterStarPattern, "")`
`69`	`69`	`}§c${count}✪"`
`70`		`- }?.ifNull {`
	`70`	`+ }.ifNull {`
`71`	`71`	`displayName = "${displayName.replace(starPattern, "")}§6${displayName.countMatches(starPattern)}✪"`
`72`	`72`	`}`
`73`	`73`	`} else if (Skytils.config.starDisplayType == 1) {`