fix: Some items not being saved in /firm stoarge

4 files changed, 95 insertions, 36 deletions

diff --git a/src/main/java/moe/nea/firmament/mixins/TolerateFirmamentTolerateRegistryOwners.java b/src/main/java/moe/nea/firmament/mixins/TolerateFirmamentTolerateRegistryOwners.java
new file mode 100644
index 0000000..ac6f614
--- /dev/null
+++ b/src/main/java/moe/nea/firmament/mixins/TolerateFirmamentTolerateRegistryOwners.java
@@ -0,0 +1,18 @@
+package moe.nea.firmament.mixins;
+
+import moe.nea.firmament.util.mc.TolerantRegistriesOps;
+import net.minecraft.registry.entry.RegistryEntryOwner;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(RegistryEntryOwner.class)
+public interface TolerateFirmamentTolerateRegistryOwners<T> {
+	@Inject(method = "ownerEquals", at = @At("HEAD"), cancellable = true)
+	private void equalTolerantRegistryOwners(RegistryEntryOwner<T> other, CallbackInfoReturnable<Boolean> cir) {
+		if (other instanceof TolerantRegistriesOps.TolerantOwner<?>) {
+			cir.setReturnValue(true);
+		}
+	}
+}
diff --git a/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt b/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt
index e07df8a..3b86184 100644
--- a/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt
+++ b/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt
@@ -1,5 +1,3 @@
-
-
 package moe.nea.firmament.features.inventory.storageoverlay
 
 import io.ktor.util.decodeBase64Bytes
@@ -19,47 +17,59 @@ import net.minecraft.nbt.NbtIo
 import net.minecraft.nbt.NbtList
 import net.minecraft.nbt.NbtOps
 import net.minecraft.nbt.NbtSizeTracker
+import net.minecraft.registry.RegistryOps
+import moe.nea.firmament.util.ErrorUtil
+import moe.nea.firmament.util.MC
+import moe.nea.firmament.util.mc.TolerantRegistriesOps
 
 @Serializable(with = VirtualInventory.Serializer::class)
 data class VirtualInventory(
-    val stacks: List<ItemStack>
+	val stacks: List<ItemStack>
 ) {
-    val rows = stacks.size / 9
+	val rows = stacks.size / 9
+
+	init {
+		assert(stacks.size % 9 == 0)
+		assert(stacks.size / 9 in 1..5)
+	}
 
-    init {
-        assert(stacks.size % 9 == 0)
-        assert(stacks.size / 9 in 1..5)
-    }
 
+	object Serializer : KSerializer<VirtualInventory> {
+		const val INVENTORY = "INVENTORY"
+		override val descriptor: SerialDescriptor
+			get() = PrimitiveSerialDescriptor("VirtualInventory", PrimitiveKind.STRING)
 
-    object Serializer : KSerializer<VirtualInventory> {
-        const val INVENTORY = "INVENTORY"
-        override val descriptor: SerialDescriptor
-            get() = PrimitiveSerialDescriptor("VirtualInventory", PrimitiveKind.STRING)
+		override fun deserialize(decoder: Decoder): VirtualInventory {
+			val s = decoder.decodeString()
+			val n = NbtIo.readCompressed(ByteArrayInputStream(s.decodeBase64Bytes()), NbtSizeTracker.of(100_000_000))
+			val items = n.getList(INVENTORY, NbtCompound.COMPOUND_TYPE.toInt())
+			val ops = getOps()
+			return VirtualInventory(items.map {
+				it as NbtCompound
+				if (it.isEmpty) ItemStack.EMPTY
+				else ErrorUtil.catch("Could not deserialize item") {
+					ItemStack.CODEC.parse(ops, it).orThrow
+				}.or { ItemStack.EMPTY }
+			})
+		}
 
-        override fun deserialize(decoder: Decoder): VirtualInventory {
-            val s = decoder.decodeString()
-            val n = NbtIo.readCompressed(ByteArrayInputStream(s.decodeBase64Bytes()), NbtSizeTracker.of(100_000_000))
-            val items = n.getList(INVENTORY, NbtCompound.COMPOUND_TYPE.toInt())
-            return VirtualInventory(items.map {
-                it as NbtCompound
-                if (it.isEmpty) ItemStack.EMPTY
-                else runCatching {
-                    ItemStack.CODEC.parse(NbtOps.INSTANCE, it).orThrow
-                }.getOrElse { ItemStack.EMPTY }
-            })
-        }
+		fun getOps() = TolerantRegistriesOps(NbtOps.INSTANCE, MC.currentOrDefaultRegistries)
 
-        override fun serialize(encoder: Encoder, value: VirtualInventory) {
-            val list = NbtList()
-            value.stacks.forEach {
-                if (it.isEmpty) list.add(NbtCompound())
-                else list.add(runCatching { ItemStack.CODEC.encode(it, NbtOps.INSTANCE, NbtCompound()).orThrow }
-                                  .getOrElse { NbtCompound() })
-            }
-            val baos = ByteArrayOutputStream()
-            NbtIo.writeCompressed(NbtCompound().also { it.put(INVENTORY, list) }, baos)
-            encoder.encodeString(baos.toByteArray().encodeBase64())
-        }
-    }
+		override fun serialize(encoder: Encoder, value: VirtualInventory) {
+			val list = NbtList()
+			val ops = getOps()
+			value.stacks.forEach {
+				if (it.isEmpty) list.add(NbtCompound())
+				else list.add(ErrorUtil.catch("Could not serialize item") {
+					ItemStack.CODEC.encode(it,
+					                       ops,
+					                       NbtCompound()).orThrow
+				}
+					              .or { NbtCompound() })
+			}
+			val baos = ByteArrayOutputStream()
+			NbtIo.writeCompressed(NbtCompound().also { it.put(INVENTORY, list) }, baos)
+			encoder.encodeString(baos.toByteArray().encodeBase64())
+		}
+	}
 }
diff --git a/src/main/kotlin/util/mc/TolerantRegistriesOps.kt b/src/main/kotlin/util/mc/TolerantRegistriesOps.kt
new file mode 100644
index 0000000..ce596a0
--- /dev/null
+++ b/src/main/kotlin/util/mc/TolerantRegistriesOps.kt
@@ -0,0 +1,29 @@
+package moe.nea.firmament.util.mc
+
+import com.mojang.serialization.DynamicOps
+import java.util.Optional
+import net.minecraft.registry.Registry
+import net.minecraft.registry.RegistryKey
+import net.minecraft.registry.RegistryOps
+import net.minecraft.registry.RegistryWrapper
+import net.minecraft.registry.entry.RegistryEntryOwner
+
+class TolerantRegistriesOps<T>(
+	delegate: DynamicOps<T>,
+	registryInfoGetter: RegistryInfoGetter
+) : RegistryOps<T>(delegate, registryInfoGetter) {
+	constructor(delegate: DynamicOps<T>, registry: RegistryWrapper.WrapperLookup) :
+		this(delegate, CachedRegistryInfoGetter(registry))
+
+	class TolerantOwner<E> : RegistryEntryOwner<E> {
+		override fun ownerEquals(other: RegistryEntryOwner<E>?): Boolean {
+			return true
+		}
+	}
+
+	override fun <E : Any?> getOwner(registryRef: RegistryKey<out Registry<out E>>?): Optional<RegistryEntryOwner<E>> {
+		return super.getOwner(registryRef).map {
+			TolerantOwner()
+		}
+	}
+}
diff --git a/src/main/resources/firmament.accesswidener b/src/main/resources/firmament.accesswidener
index cfa8e90..b280087 100644
--- a/src/main/resources/firmament.accesswidener
+++ b/src/main/resources/firmament.accesswidener
@@ -4,6 +4,8 @@ accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
 accessible class net/minecraft/client/font/TextRenderer$Drawer
 accessible field net/minecraft/client/gui/hud/InGameHud SCOREBOARD_ENTRY_COMPARATOR Ljava/util/Comparator;
 accessible field net/minecraft/client/network/ClientPlayNetworkHandler combinedDynamicRegistries Lnet/minecraft/registry/DynamicRegistryManager$Immutable;
+accessible method net/minecraft/registry/RegistryOps <init> (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/registry/RegistryOps$RegistryInfoGetter;)V
+accessible class net/minecraft/registry/RegistryOps$CachedRegistryInfoGetter
 
 accessible field net/minecraft/client/render/item/HeldItemRenderer itemRenderer Lnet/minecraft/client/render/item/ItemRenderer;
 accessible field net/minecraft/client/render/item/ItemModels missingModelSupplier Ljava/util/function/Supplier;