Possibly fixed underflow problem with fluids?

Author: MartinSVK12

fluids/src/main/java/sunsetsatellite/catalyst/fluids/impl/tiles/TileEntityFluidContainer.java

@@ -16,9 +16,8 @@
 import sunsetsatellite.catalyst.fluids.api.IMassFluidInventory;
 import sunsetsatellite.catalyst.fluids.util.FluidStack;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class TileEntityFluidContainer extends TileEntity
     implements IFluidInventory, IFluidTransfer {
@@ -54,8 +53,9 @@ public void take(@NotNull FluidStack fluidStack, Direction dir){
                 if(fluidTransfer.getConnection(dir.getOpposite()) == Connection.OUTPUT || fluidTransfer.getConnection(dir.getOpposite()) == Connection.BOTH){
                     int maxFlow = Math.min(transferSpeed,fluidInv.getTransferSpeed());
                     if(acceptedFluids.get(activeFluidSlots.get(dir)).contains(fluidStack.getLiquid())) {
-                        if (canInsertFluid(activeFluidSlots.get(dir), new FluidStack(fluidStack.liquid, maxFlow))) {
-                            FluidStack transferablePortion = fluidStack.splitStack(maxFlow);
+						int maxAmount = Math.min(fluidStack.amount, maxFlow);
+                        if (canInsertFluid(activeFluidSlots.get(dir), new FluidStack(fluidStack.liquid, maxAmount))) {
+                            FluidStack transferablePortion = fluidStack.splitStack(maxAmount);
                             if (fluidContents[activeFluidSlots.get(dir)] == null) {
                                 fluidContents[activeFluidSlots.get(dir)] = transferablePortion;
                             } else {
@@ -81,16 +81,18 @@ public void give(Direction dir){
                     if(tile instanceof IMassFluidInventory){
                         IMassFluidInventory massFluidInv = (IMassFluidInventory) tile;
                         if(fluidStack.isFluidEqual(massFluidInv.getFilter(dir.getOpposite())) || massFluidInv.getFilter(dir.getOpposite()) == null){
-                            if(massFluidInv.canInsertFluid(new FluidStack(fluidStack.liquid,maxFlow))){
-                                FluidStack transferablePortion = fluidStack.splitStack(maxFlow);
+							int maxAmount = Math.min(fluidStack.amount, maxFlow);
+                            if(massFluidInv.canInsertFluid(new FluidStack(fluidStack.liquid,maxAmount))){
+                                FluidStack transferablePortion = fluidStack.splitStack(maxAmount);
                                 massFluidInv.insertFluid(transferablePortion);
                             }
                         }
                     } else {
                         int otherSlot = fluidInv.getActiveFluidSlot(dir.getOpposite());
                         if(fluidInv.getAllowedFluidsForSlot(otherSlot).contains(fluidStack.getLiquid())){
-                            if(fluidInv.canInsertFluid(otherSlot,new FluidStack(fluidStack.liquid,maxFlow))){
-                                FluidStack transferablePortion = fluidStack.splitStack(maxFlow);
+							int maxAmount = Math.min(fluidStack.amount, maxFlow);
+                            if(fluidInv.canInsertFluid(otherSlot,new FluidStack(fluidStack.liquid,maxAmount))){
+                                FluidStack transferablePortion = fluidStack.splitStack(maxAmount);
                                 fluidInv.insertFluid(otherSlot,transferablePortion);
                             }
                             /*if(fluidInv.getFluidInSlot(otherSlot) == null){
@@ -109,7 +111,7 @@ public void give(Direction dir){
     public FluidStack insertFluid(int slot, FluidStack fluidStack) {
         FluidStack stack = fluidContents[slot];
         FluidStack split = fluidStack.splitStack(Math.min(fluidStack.amount,getRemainingCapacity(slot)));
-        if(stack != null){
+        if(stack != null && split.amount > 0){
             fluidContents[slot].amount += split.amount;
         } else {
             fluidContents[slot] = split;
@@ -169,6 +171,7 @@ public void readFromNBT(CompoundTag CompoundTag1) {
     @Override
     public void tick() {
         super.tick();
+		fluidContents = Arrays.stream(fluidContents).map((F)-> (F != null && F.amount <= 0) ? null : F).toArray(FluidStack[]::new);
         if(!worldObj.isClientSide){
             for (EntityPlayer player : worldObj.players) {
                 if(player instanceof EntityPlayerMP){

fluids/src/main/java/sunsetsatellite/catalyst/fluids/impl/tiles/TileEntityMassFluidContainer.java

@@ -179,8 +179,9 @@ public void take(@NotNull FluidStack fluidStack, Direction dir) {
                     int maxFlow = Math.min(transferSpeed,fluidInv.getTransferSpeed());
                     if(acceptedFluids.contains(fluidStack.getLiquid())){
                         if(fluidStack.isFluidEqual(fluidFilters.get(dir)) || fluidFilters.get(dir) == null) {
-                            if (canInsertFluid(new FluidStack(fluidStack.liquid, maxFlow))) {
-                                FluidStack transferablePortion = fluidStack.splitStack(maxFlow);
+							int maxAmount = Math.min(fluidStack.amount, maxFlow);
+                            if (canInsertFluid(new FluidStack(fluidStack.liquid, maxAmount))) {
+                                FluidStack transferablePortion = fluidStack.splitStack(maxAmount);
                                 insertFluid(transferablePortion);
                             }
                         }
@@ -205,15 +206,16 @@ public void give(Direction dir) {
                         if (filter == getFilter(dir)) {
                             FluidStack fluidStack = filter == null ? fluidContents.get(0) : findStack(filter);
                             if (fluidStack != null) {
-                                FluidStack transferablePortion = fluidStack.splitStack(maxFlow);
+								int maxAmount = Math.min(fluidStack.amount, maxFlow);
+                                FluidStack transferablePortion = fluidStack.splitStack(maxAmount);
                                 massFluidInv.insertFluid(transferablePortion);
                             }
                         }
                     } else {
                         int otherSlot = fluidInv.getActiveFluidSlot(dir.getOpposite());
                         BlockFluid filter = getFilter(dir);
                         if(fluidInv.getAllowedFluidsForSlot(otherSlot).contains(filter) || filter == null){
-                            if(fluidContents.size() > 0 && fluidContents.get(0) != null){
+                            if(!fluidContents.isEmpty() && fluidContents.get(0) != null){
                                 FluidStack fluidStack = filter == null ? (fluidContents.get(0)) : findStack(filter);
                             /*if(filter == null){
                                 for (BlockFluid blockFluid : fluidInv.getAllowedFluidsForSlot(otherSlot)) {
@@ -225,9 +227,9 @@ public void give(Direction dir) {
                                 fluidStack = findStack(filter);
                             }*/
                                 if(fluidStack != null){
-                                    //FluidAPI.LOGGER.info(fluidStack.toString());
-                                    if(fluidInv.canInsertFluid(otherSlot,new FluidStack(fluidStack.liquid,maxFlow))){
-                                        FluidStack transferablePortion = fluidStack.splitStack(maxFlow);
+									int maxAmount = Math.min(fluidStack.amount, maxFlow);
+                                    if(fluidInv.canInsertFluid(otherSlot,new FluidStack(fluidStack.liquid,maxAmount))){
+                                        FluidStack transferablePortion = fluidStack.splitStack(maxAmount);
                                         fluidInv.insertFluid(otherSlot,transferablePortion);
                                     }
                                 }