Fix #2355 (#2367)

If a fluid uses NBT tags, then when we construct our NBT-less
FluidStack, then the fluid does not match and will not be transferred.
Instead, we search the source tank for a matching FluidStack, and use
that directly.

This is a bit limiting if a tank contains multiple versions of the fluid
with different NBT, but hopefully that's not too common.

Fixes #2355

Author: UQuark

projects/forge/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/FluidMethods.java

@@ -12,6 +12,7 @@
 import dan200.computercraft.shared.platform.RegistryWrappers;
 import dan200.computercraft.shared.util.CapabilityUtil;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.material.Fluid;
 import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import net.minecraftforge.fluids.FluidStack;
@@ -63,7 +64,7 @@ public int pushFluid(
 
         return fluid == null
             ? moveFluid(from, actualLimit, to)
-            : moveFluid(from, new FluidStack(fluid, actualLimit), to);
+            : moveFluid(from, fluid, actualLimit, to);
     }
 
     @Override
@@ -88,7 +89,7 @@ public int pullFluid(
 
         return fluid == null
             ? moveFluid(from, actualLimit, to)
-            : moveFluid(from, new FluidStack(fluid, actualLimit), to);
+            : moveFluid(from, fluid, actualLimit, to);
     }
 
     @Nullable
@@ -108,7 +109,7 @@ private static IFluidHandler extractHandler(IPeripheral peripheral) {
     }
 
     /**
-     * Move fluid from one handler to another.
+     * Move any fluid from one handler to another.
      *
      * @param from  The handler to move from.
      * @param limit The maximum amount of fluid to move.
@@ -120,15 +121,26 @@ private static int moveFluid(IFluidHandler from, int limit, IFluidHandler to) {
     }
 
     /**
-     * Move fluid from one handler to another.
+     * Move a specific fluid from one handler to another.
      *
      * @param from  The handler to move from.
-     * @param fluid The fluid and limit to move.
+     * @param fluid The fluid to move.
+     * @param limit The maximum amount of fluid to move.
      * @param to    The handler to move to.
      * @return The amount of fluid moved.
      */
-    private static int moveFluid(IFluidHandler from, FluidStack fluid, IFluidHandler to) {
-        return moveFluid(from, from.drain(fluid, IFluidHandler.FluidAction.SIMULATE), fluid.getAmount(), to);
+    private static int moveFluid(IFluidHandler from, Fluid fluid, int limit, IFluidHandler to) {
+        // Rather than constructing the FluidStack directly, we try to find a matching fluid (but with possibly
+        // different NBT components) in the tank.
+        for (int i = 0, len = from.getTanks(); i < len; i++) {
+            var currentFluid = from.getFluidInTank(i);
+            if (currentFluid.getFluid() != fluid) continue;
+
+            var extracted = from.drain(currentFluid, IFluidHandler.FluidAction.SIMULATE);
+            if (!extracted.isEmpty()) return moveFluid(from, extracted, limit, to);
+        }
+
+        return 0;
     }
 
     /**
@@ -141,7 +153,7 @@ private static int moveFluid(IFluidHandler from, FluidStack fluid, IFluidHandler
      * @return The amount of fluid moved.
      */
     private static int moveFluid(IFluidHandler from, FluidStack extracted, int limit, IFluidHandler to) {
-        if (extracted.getAmount() <= 0) return 0;
+        if (extracted.isEmpty()) return 0;
 
         // Limit the amount to extract.
         extracted = extracted.copy();