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

Fix some items preventing the storage overlay from saving

Browse Source
This commit is contained in:
Linnea Gräf
2024-06-01 01:29:32 +02:00
parent e630426656
commit aea3652e87
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/VirtualInventory.kt
View File

@@ -9,6 +9,8 @@ package moe.nea.firmament.features.inventory.storageoverlay
import io.ktor.util.decodeBase64Bytes import io.ktor.util.decodeBase64Bytes
import io.ktor.util.encodeBase64 import io.ktor.util.encodeBase64
import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
import kotlinx.serialization.KSerializer import kotlinx.serialization.KSerializer
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.descriptors.PrimitiveKind import kotlinx.serialization.descriptors.PrimitiveKind
@@ -20,10 +22,8 @@ import net.minecraft.item.ItemStack
import net.minecraft.nbt.NbtCompound import net.minecraft.nbt.NbtCompound
import net.minecraft.nbt.NbtIo import net.minecraft.nbt.NbtIo
import net.minecraft.nbt.NbtList import net.minecraft.nbt.NbtList
import java.io.ByteArrayInputStream import net.minecraft.nbt.NbtOps
import java.io.ByteArrayOutputStream
import net.minecraft.nbt.NbtSizeTracker import net.minecraft.nbt.NbtSizeTracker
import moe.nea.firmament.util.MC
@Serializable(with = VirtualInventory.Serializer::class) @Serializable(with = VirtualInventory.Serializer::class)
data class VirtualInventory( data class VirtualInventory(
@@ -46,13 +46,21 @@ data class VirtualInventory(
val s = decoder.decodeString() val s = decoder.decodeString()
val n = NbtIo.readCompressed(ByteArrayInputStream(s.decodeBase64Bytes()), NbtSizeTracker.of(100_000_000)) val n = NbtIo.readCompressed(ByteArrayInputStream(s.decodeBase64Bytes()), NbtSizeTracker.of(100_000_000))
val items = n.getList(INVENTORY, NbtCompound.COMPOUND_TYPE.toInt()) val items = n.getList(INVENTORY, NbtCompound.COMPOUND_TYPE.toInt())
return VirtualInventory(items.map { ItemStack.fromNbtOrEmpty(MC.defaultRegistries, it as NbtCompound) }) return VirtualInventory(items.map {
it as NbtCompound
if (it.isEmpty) ItemStack.EMPTY
else runCatching {
ItemStack.CODEC.parse(NbtOps.INSTANCE, it).orThrow
}.getOrElse { ItemStack.EMPTY }
})
} }
override fun serialize(encoder: Encoder, value: VirtualInventory) { override fun serialize(encoder: Encoder, value: VirtualInventory) {
val list = NbtList() val list = NbtList()
value.stacks.forEach { value.stacks.forEach {
list.add(it.encode(MC.defaultRegistries)) if (it.isEmpty) list.add(NbtCompound())
else list.add(runCatching { ItemStack.CODEC.encode(it, NbtOps.INSTANCE, NbtCompound()).orThrow }
.getOrElse { NbtCompound() })
} }
val baos = ByteArrayOutputStream() val baos = ByteArrayOutputStream()
NbtIo.writeCompressed(NbtCompound().also { it.put(INVENTORY, list) }, baos) NbtIo.writeCompressed(NbtCompound().also { it.put(INVENTORY, list) }, baos)