Fix constant list Variable Card deserialization failure after world reload (#1639)

Closes #1639

Author: Copilot

src/main/java/org/cyclops/integrateddynamics/core/evaluate/variable/ValueTypeListProxyMaterializedFactory.java

@@ -1,9 +1,11 @@
 package org.cyclops.integrateddynamics.core.evaluate.variable;
 
 import com.google.common.collect.ImmutableList;
+import net.minecraft.nbt.ByteTag;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.IntTag;
 import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.LongTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.resources.ResourceLocation;
 import org.cyclops.integrateddynamics.Reference;
@@ -67,12 +69,31 @@ public ValueTypeListProxyMaterialized<IValueType<IValue>, IValue> deserialize(Va
         if (!tag.contains("valueType", Tag.TAG_STRING)) {
             throw new IValueTypeListProxyFactoryTypeRegistry.SerializationException(String.format("Could not deserialize the materialized list value '%s' as it is missing a valueType.", value));
         }
-        // This tag rewrite needed for loading variables in advancement icons
+        // These tag rewrites are needed for loading variables in advancement icons,
+        // and also to handle the case where Minecraft's NbtOps codec converts
+        // ListTag<ByteTag> -> ByteArrayTag, ListTag<IntTag> -> IntArrayTag, ListTag<LongTag> -> LongArrayTag
+        // during serialization (e.g. when saving item NBT).
         if (tag.contains("values", Tag.TAG_BYTE_ARRAY)) {
             byte[] byteArray = tag.getByteArray("values");
             ListTag list = new ListTag();
             for (byte b : byteArray) {
-                list.add(IntTag.valueOf(b));
+                list.add(ByteTag.valueOf(b));
+            }
+            tag.put("values", list);
+        }
+        if (tag.contains("values", Tag.TAG_INT_ARRAY)) {
+            int[] intArray = tag.getIntArray("values");
+            ListTag list = new ListTag();
+            for (int i : intArray) {
+                list.add(IntTag.valueOf(i));
+            }
+            tag.put("values", list);
+        }
+        if (tag.contains("values", Tag.TAG_LONG_ARRAY)) {
+            long[] longArray = tag.getLongArray("values");
+            ListTag list = new ListTag();
+            for (long l : longArray) {
+                list.add(LongTag.valueOf(l));
             }
             tag.put("values", list);
         }

src/test/java/org/cyclops/integrateddynamics/core/evaluate/variable/TestValueTypeListProxyFactories.java

@@ -1,7 +1,10 @@
 package org.cyclops.integrateddynamics.core.evaluate.variable;
 
 import com.google.common.collect.Lists;
+import net.minecraft.nbt.ByteArrayTag;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.IntArrayTag;
+import net.minecraft.nbt.LongArrayTag;
 import net.minecraft.nbt.Tag;
 import org.cyclops.cyclopscore.helper.CyclopsCoreInstance;
 import org.cyclops.integrateddynamics.ModBaseMocked;
@@ -62,6 +65,48 @@ public void testMaterialized() throws IValueTypeListProxyFactoryTypeRegistry.Ser
         ));
     }
 
+    @Test
+    public void testMaterializedIntegerListFromIntArrayTag() throws IValueTypeListProxyFactoryTypeRegistry.SerializationException {
+        // Simulate codec round-trip: ListTag<IntTag> -> IntArrayTag (as done by Minecraft's NbtOps)
+        ValueTypeListProxyMaterialized<?, ?> proxy = new ValueTypeListProxyMaterialized<>(
+                ValueTypes.INTEGER,
+                Lists.newArrayList(ValueTypeInteger.ValueInteger.of(42))
+        );
+        Tag serialized = ValueTypeListProxyFactories.REGISTRY.serialize(ValueDeseralizationContextMocked.get(), proxy);
+        CompoundTag tag = (CompoundTag) serialized;
+        tag.put("values", new IntArrayTag(new int[]{42}));
+        IValueTypeListProxy<?, ?> proxyNew = ValueTypeListProxyFactories.REGISTRY.deserialize(ValueDeseralizationContextMocked.get(), tag);
+        assertThat(proxyNew, equalTo(proxy));
+    }
+
+    @Test
+    public void testMaterializedLongListFromLongArrayTag() throws IValueTypeListProxyFactoryTypeRegistry.SerializationException {
+        // Simulate codec round-trip: ListTag<LongTag> -> LongArrayTag (as done by Minecraft's NbtOps)
+        ValueTypeListProxyMaterialized<?, ?> proxy = new ValueTypeListProxyMaterialized<>(
+                ValueTypes.LONG,
+                Lists.newArrayList(ValueTypeLong.ValueLong.of(123L))
+        );
+        Tag serialized = ValueTypeListProxyFactories.REGISTRY.serialize(ValueDeseralizationContextMocked.get(), proxy);
+        CompoundTag tag = (CompoundTag) serialized;
+        tag.put("values", new LongArrayTag(new long[]{123L}));
+        IValueTypeListProxy<?, ?> proxyNew = ValueTypeListProxyFactories.REGISTRY.deserialize(ValueDeseralizationContextMocked.get(), tag);
+        assertThat(proxyNew, equalTo(proxy));
+    }
+
+    @Test
+    public void testMaterializedBooleanListFromByteArrayTag() throws IValueTypeListProxyFactoryTypeRegistry.SerializationException {
+        // Simulate codec round-trip: ListTag<ByteTag> -> ByteArrayTag (as done by Minecraft's NbtOps)
+        ValueTypeListProxyMaterialized<?, ?> proxy = new ValueTypeListProxyMaterialized<>(
+                ValueTypes.BOOLEAN,
+                Lists.newArrayList(ValueTypeBoolean.ValueBoolean.of(true))
+        );
+        Tag serialized = ValueTypeListProxyFactories.REGISTRY.serialize(ValueDeseralizationContextMocked.get(), proxy);
+        CompoundTag tag = (CompoundTag) serialized;
+        tag.put("values", new ByteArrayTag(new byte[]{(byte) 1}));
+        IValueTypeListProxy<?, ?> proxyNew = ValueTypeListProxyFactories.REGISTRY.deserialize(ValueDeseralizationContextMocked.get(), tag);
+        assertThat(proxyNew, equalTo(proxy));
+    }
+
     @Test
     public void testNbtKeys() throws IValueTypeListProxyFactoryTypeRegistry.SerializationException {
         testFactoryType(new ValueTypeListProxyNbtKeys(