DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Use codecs to deserialize pattern state from nbt tags

Browse Source
This commit is contained in:
DBotThePony 2023-07-25 17:01:57 +07:00
parent 2be09fe5d2
commit c8e7cd4c93
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/PatternState.kt
View File

@ -67,27 +67,6 @@ private fun <T : IPatternState> codec(builder: RecordCodecBuilder.Instance<T>):
) )
} }
private fun deserializeNBT(nbt: Tag?, mutable: Boolean): IPatternState? {
if (nbt !is CompoundTag)
return null
if (!nbt.contains("id", "researchPercent", "item"))
return null
val id = nbt.getUUID("id")
val researchPercent = nbt.getDouble("researchPercent")
val item = ForgeRegistries.ITEMS.getValue(ResourceLocation(nbt.getString("item"))) ?: return null
if (item == Items.AIR)
return null
if (mutable) {
return MutablePatternState(id, item, researchPercent)
} else {
return PatternState(id, item, researchPercent)
}
}
private fun read(buff: FriendlyByteBuf, mutable: Boolean): IPatternState? { private fun read(buff: FriendlyByteBuf, mutable: Boolean): IPatternState? {
val id = buff.readUUID() val id = buff.readUUID()
val item = buff.readItemType() val item = buff.readItemType()
@ -121,7 +100,8 @@ data class PatternState(
companion object { companion object {
fun deserializeNBT(tag: Tag?): PatternState? { fun deserializeNBT(tag: Tag?): PatternState? {
return deserializeNBT(tag, false) as PatternState? tag ?: return null
return CODEC.decode(NbtOps.INSTANCE, tag).result().map { it.first }.orElse(null)
} }
fun read(buff: FriendlyByteBuf): PatternState? { fun read(buff: FriendlyByteBuf): PatternState? {
@ -155,7 +135,8 @@ data class MutablePatternState(
companion object { companion object {
fun deserializeNBT(tag: Tag?): MutablePatternState? { fun deserializeNBT(tag: Tag?): MutablePatternState? {
return deserializeNBT(tag, true) as MutablePatternState? tag ?: return null
return CODEC.decode(NbtOps.INSTANCE, tag).result().map { it.first }.orElse(null)
} }
fun read(buff: FriendlyByteBuf): MutablePatternState? { fun read(buff: FriendlyByteBuf): MutablePatternState? {
@ -169,7 +150,3 @@ data class MutablePatternState(
} }
} }
} }
fun FriendlyByteBuf.writePatternState(state: IPatternState) = state.write(this)
fun FriendlyByteBuf.readPatternState() = PatternState.read(this)
fun FriendlyByteBuf.readMutablePatternState() = MutablePatternState.read(this)