Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash for buggy-ish repo items

Browse Source
This commit is contained in:
Linnea Gräf
2024-05-18 14:26:18 +02:00
parent a7a1e099d5
commit ad09808c25
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/kotlin/moe/nea/firmament/util/SkyblockId.kt
View File

@@ -11,10 +11,9 @@ package moe.nea.firmament.util
import io.github.moulberry.repo.data.NEUItem import io.github.moulberry.repo.data.NEUItem
import io.github.moulberry.repo.data.Rarity import io.github.moulberry.repo.data.Rarity
import java.util.* import java.util.UUID
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.UseSerializers import kotlinx.serialization.UseSerializers
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import net.minecraft.component.DataComponentTypes import net.minecraft.component.DataComponentTypes
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
@@ -31,7 +30,15 @@ import moe.nea.firmament.util.json.DashlessUUIDSerializer
@JvmInline @JvmInline
@Serializable @Serializable
value class SkyblockId(val neuItem: String) { value class SkyblockId(val neuItem: String) {
val identifier get() = Identifier("skyblockitem", neuItem.lowercase().replace(";", "__").replace(":", "___")) val identifier
get() = Identifier("skyblockitem",
neuItem.lowercase().replace(";", "__")
.replace(":", "___")
.replace(illlegalPathRegex) {
it.value.toCharArray()
.joinToString("") { "__" + it.code.toString(16).padStart(4, '0') }
})
override fun toString(): String { override fun toString(): String {
return neuItem return neuItem
} }
@@ -58,6 +65,7 @@ value class SkyblockId(val neuItem: String) {
private val bazaarEnchantmentRegex = "ENCHANTMENT_(\\D*)_(\\d+)".toRegex() private val bazaarEnchantmentRegex = "ENCHANTMENT_(\\D*)_(\\d+)".toRegex()
val NULL: SkyblockId = SkyblockId("null") val NULL: SkyblockId = SkyblockId("null")
val PET_NULL: SkyblockId = SkyblockId("null_pet") val PET_NULL: SkyblockId = SkyblockId("null_pet")
private val illlegalPathRegex = "[^a-z0-9_.-/]".toRegex()
} }
} }