save transporter stacks size-agnostically

Author: thiakil

src/api/java/mekanism/api/SerializationConstants.java

@@ -35,6 +35,7 @@ private SerializationConstants() {
     public static final String INGREDIENT = "ingredient";
     public static final String INGREDIENTS = "ingredients";
     public static final String ITEM = "item";
+    public static final String ITEM_OVERSIZED = "item_oversized";
     public static final String GAS = "gas";
     public static final String INFUSE_TYPE = "infuse_type";
     public static final String PIGMENT = "pigment";

src/main/java/mekanism/common/content/transporter/TransporterStack.java

@@ -9,6 +9,7 @@
 import java.util.Set;
 import java.util.function.IntFunction;
 import mekanism.api.SerializationConstants;
+import mekanism.api.SerializerHelper;
 import mekanism.api.text.EnumColor;
 import mekanism.common.content.network.transmitter.LogisticalTransporterBase;
 import mekanism.common.content.transporter.TransporterPathfinder.Destination;
@@ -106,7 +107,7 @@ public void writeToUpdateTag(HolderLookup.Provider provider, LogisticalTransport
             updateTag.putLong(SerializationConstants.PREVIOUS, prev);
         }
         if (!itemStack.isEmpty()) {
-            itemStack.save(provider, updateTag);
+            updateTag.put(SerializationConstants.ITEM, SerializerHelper.saveOversized(provider, itemStack));
         }
     }
 
@@ -124,7 +125,10 @@ public void readFromUpdateTag(HolderLookup.Provider provider, CompoundTag update
         NBTUtils.setLongIfPresent(updateTag, SerializationConstants.PREVIOUS, coord -> clientPrev = coord);
         NBTUtils.setBlockPosIfPresent(updateTag, SerializationConstants.PREVIOUS, coord -> clientPrev = coord.asLong());
 
-        itemStack = ItemStack.parseOptional(provider, updateTag);
+        Tag itemTag = updateTag.get(SerializationConstants.ITEM);
+        if (itemTag != null) {
+            itemStack = SerializerHelper.parseOversized(provider, itemTag).orElse(ItemStack.EMPTY);
+        }
     }
 
     public void write(HolderLookup.Provider provider, CompoundTag nbtTags) {
@@ -145,7 +149,7 @@ public void write(HolderLookup.Provider provider, CompoundTag nbtTags) {
             NBTUtils.writeEnum(nbtTags, SerializationConstants.PATH_TYPE, pathType);
         }
         if (!itemStack.isEmpty()) {
-            nbtTags.put(SerializationConstants.ITEM, itemStack.save(provider));
+            nbtTags.put(SerializationConstants.ITEM_OVERSIZED, SerializerHelper.saveOversized(provider, itemStack));
         }
     }
 
@@ -156,7 +160,9 @@ public void read(HolderLookup.Provider provider, CompoundTag nbtTags) {
         NBTUtils.setEnumIfPresent(nbtTags, SerializationConstants.IDLE_DIR, Direction::from3DDataValue, dir -> idleDir = dir);
         NBTUtils.setBlockPosIfPresent(nbtTags, SerializationConstants.HOME_LOCATION, coord -> homeLocation = coord);
         NBTUtils.setEnumIfPresent(nbtTags, SerializationConstants.PATH_TYPE, Path.BY_ID, type -> pathType = type);
-        if (nbtTags.contains(SerializationConstants.ITEM, Tag.TAG_COMPOUND)) {
+        if (nbtTags.contains(SerializationConstants.ITEM_OVERSIZED)) {
+            itemStack = SerializerHelper.parseOversized(provider, nbtTags.get(SerializationConstants.ITEM_OVERSIZED)).orElse(ItemStack.EMPTY);
+        } else if (nbtTags.contains(SerializationConstants.ITEM, Tag.TAG_COMPOUND)) {//TODO - 1.22: Remove this legacy way of loading data
             itemStack = ItemStack.parseOptional(provider, nbtTags.getCompound(SerializationConstants.ITEM));
         } else {//TODO - 1.22: Remove this legacy way of loading data
             itemStack = ItemStack.parseOptional(provider, nbtTags);