Merge branch '1.21' into worldgen-placement-providers

This commit is contained in:
DBotThePony 2025-03-08 19:24:19 +07:00
commit be97560f01
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 29 additions and 13 deletions

View File

@ -22,7 +22,7 @@ mixin_version=0.8.5
neogradle.subsystems.parchment.minecraftVersion=1.21.1
neogradle.subsystems.parchment.mappingsVersion=2024.11.17
kommons_version=3.3.1
kommons_version=3.3.2
caffeine_cache_version=3.1.5
jei_version=19.16.4.171

View File

@ -240,24 +240,40 @@ sealed class Decimal : Number(), Comparable<Decimal> {
return mag.signum()
}
private var intCache = 0
private var intComputed = false
override fun toInt(): Int {
return if (whole > BI_INT_MAX) {
Int.MAX_VALUE
} else if (whole < BI_INT_MIN) {
Int.MIN_VALUE
} else {
whole.toInt()
if (!intComputed) {
intCache = if (whole > BI_INT_MAX) {
Int.MAX_VALUE
} else if (whole < BI_INT_MIN) {
Int.MIN_VALUE
} else {
whole.toInt()
}
intComputed = true
}
return intCache
}
private var longCache = 0L
private var longComputed = false
override fun toLong(): Long {
return if (whole > BI_LONG_MAX) {
Long.MAX_VALUE
} else if (whole < BI_LONG_MIN) {
Long.MIN_VALUE
} else {
whole.toLong()
if (!longComputed) {
longCache = if (whole > BI_LONG_MAX) {
Long.MAX_VALUE
} else if (whole < BI_LONG_MIN) {
Long.MIN_VALUE
} else {
whole.toLong()
}
}
return longCache
}
override fun compareTo(other: Decimal): Int {