Take lower tank's contents into account when attempting to fill stacked tanks (#8157)

Author: pupnewfster

src/main/java/mekanism/common/capabilities/chemical/StackedWasteBarrel.java

@@ -51,7 +51,8 @@ protected StackedWasteBarrel(TileEntityRadioactiveWasteBarrel tile, @Nullable IC
     @Override
     public GasStack insert(GasStack stack, Action action, AutomationType automationType) {
         GasStack remainder = super.insert(stack, action, automationType);
-        if (!remainder.isEmpty()) {
+        //Ensure we have the same type of gas stored as we failed to insert, in which case we want to try to insert to the one above
+        if (!remainder.isEmpty() && GasStack.isSameChemical(stored, remainder)) {
             //If we have any leftover check if we can send it to the tank that is above
             TileEntityRadioactiveWasteBarrel tileAbove = WorldUtils.getTileEntity(TileEntityRadioactiveWasteBarrel.class, tile.getLevel(), tile.getBlockPos().above());
             if (tileAbove != null) {

src/main/java/mekanism/common/capabilities/fluid/FluidTankFluidTank.java

@@ -57,7 +57,8 @@ public FluidStack insert(FluidStack stack, Action action, AutomationType automat
         } else {
             remainder = super.insert(stack, action.combine(!isCreative), automationType);
         }
-        if (!remainder.isEmpty()) {
+        //Ensure we have the same type of fluid stored as we failed to insert, in which case we want to try to insert to the one above
+        if (!remainder.isEmpty() && FluidStack.isSameFluidSameComponents(stored, remainder)) {
             //If we have any leftover check if we can send it to the tank that is above
             TileEntityFluidTank tileAbove = WorldUtils.getTileEntity(TileEntityFluidTank.class, this.tile.getLevel(), this.tile.getBlockPos().above());
             if (tileAbove != null) {