aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin
diff options
context:
space:
mode:
authorLinnea Gräf <nea@nea.moe>2025-03-07 00:21:38 +0100
committerLinnea Gräf <nea@nea.moe>2025-03-08 16:01:00 +0100
commitb4a93bd7515ffd8f1fcbcf5315729ddd36b0166a (patch)
tree0f062d04649ba2df26251d922e27c7cd737f1fc0 /src/main/kotlin
parent6ad259ca405d58f1956d67d7daeb05ae8590ca62 (diff)
downloadFirmament-b4a93bd7515ffd8f1fcbcf5315729ddd36b0166a.tar.gz
Firmament-b4a93bd7515ffd8f1fcbcf5315729ddd36b0166a.tar.bz2
Firmament-b4a93bd7515ffd8f1fcbcf5315729ddd36b0166a.zip
feat: Add block breaking indicators to jade
Diffstat (limited to 'src/main/kotlin')
-rw-r--r--src/main/kotlin/repo/SBItemStack.kt7
-rw-r--r--src/main/kotlin/util/regex.kt7
2 files changed, 11 insertions, 3 deletions
diff --git a/src/main/kotlin/repo/SBItemStack.kt b/src/main/kotlin/repo/SBItemStack.kt
index da34707..e04eec3 100644
--- a/src/main/kotlin/repo/SBItemStack.kt
+++ b/src/main/kotlin/repo/SBItemStack.kt
@@ -81,6 +81,7 @@ data class SBItemStack constructor(
}
val EMPTY = SBItemStack(SkyblockId.NULL, 0)
+ private val BREAKING_POWER_REGEX = "Breaking Power (?<power>[0-9]+)".toPattern()
operator fun invoke(itemStack: ItemStack): SBItemStack {
val skyblockId = itemStack.skyBlockId ?: SkyblockId.NULL
return SBItemStack(
@@ -349,6 +350,12 @@ data class SBItemStack constructor(
private var itemStack_: ItemStack? = null
+ val breakingPower: Int
+ get() =
+ BREAKING_POWER_REGEX.useMatch(asImmutableItemStack().loreAccordingToNbt.firstOrNull()?.string) {
+ group("power").toInt()
+ } ?: 0
+
private val itemStack: ItemStack
get() {
val itemStack = itemStack_ ?: run {
diff --git a/src/main/kotlin/util/regex.kt b/src/main/kotlin/util/regex.kt
index a44435c..f239810 100644
--- a/src/main/kotlin/util/regex.kt
+++ b/src/main/kotlin/util/regex.kt
@@ -16,12 +16,13 @@ import kotlin.time.Duration.Companion.seconds
inline fun <T> String.ifMatches(regex: Regex, block: (MatchResult) -> T): T? =
regex.matchEntire(this)?.let(block)
-inline fun <T> Pattern.useMatch(string: String, block: Matcher.() -> T): T? {
+inline fun <T> Pattern.useMatch(string: String?, block: Matcher.() -> T): T? {
contract {
callsInPlace(block, InvocationKind.AT_MOST_ONCE)
}
- return matcher(string)
- .takeIf(Matcher::matches)
+ return string
+ ?.let(this::matcher)
+ ?.takeIf(Matcher::matches)
?.let(block)
}