Error handling for old LDLib tags

GregTechCEu · Sep 24, 2024 · 201cbe9 · 201cbe9
1 parent 8db3256
commit 201cbe9
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/main/java/com/gregtechceu/gtceu/syncdata/FluidStackPayload.java b/src/main/java/com/gregtechceu/gtceu/syncdata/FluidStackPayload.java
@@ -1,5 +1,8 @@
 package com.gregtechceu.gtceu.syncdata;
 
+import com.gregtechceu.gtceu.GTCEu;
+
+import com.lowdragmc.lowdraglib.side.fluid.forge.FluidHelperImpl;
 import com.lowdragmc.lowdraglib.syncdata.payload.ObjectTypedPayload;
 
 import net.minecraft.nbt.CompoundTag;
@@ -29,6 +32,14 @@ public Tag serializeNBT() {
 
     @Override
     public void deserializeNBT(Tag tag) {
-        payload = FluidStack.loadFluidStackFromNBT((CompoundTag) tag);
+        try {
+            payload = FluidStack.loadFluidStackFromNBT((CompoundTag) tag);
+        } catch (ClassCastException exception) {
+            // LDLib FluidStack stores amount as Long tag, which will throw an error
+            // Loads from tag using LDLib FluidStack, then converts it to a Forge FluidStack
+            GTCEu.LOGGER.warn("Old FluidStack Tag Detected");
+            var stack = com.lowdragmc.lowdraglib.side.fluid.FluidStack.loadFromTag((CompoundTag) tag);
+            payload = FluidHelperImpl.toFluidStack(stack);
+        }
     }
 }