Merge remote-tracking branch 'origin/less-fluidstack-copying-and-hashmap-lookups' into dev

Author: Dream-Master

src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java

@@ -85,37 +85,38 @@ public boolean extractFrom(AbstractEnderLiquidConduit con, ForgeDirection conDir
             return false;
         }
 
-        if (tank.externalTank.getTankInfo(conDir.getOpposite()) != null) {
-            for (FluidTankInfo tankInfo : tank.externalTank.getTankInfo(conDir.getOpposite())) {
-                if (tankInfo == null || tankInfo.fluid == null) {
-                    continue;
-                }
-                FluidStack tryDrain = tankInfo.fluid.copy();
-                tryDrain.amount = type.getMaxExtractPerTick();
-                FluidStack drained = tank.externalTank.drain(conDir.getOpposite(), tryDrain, false);
-                if (drained == null || drained.amount <= 0
-                        || !matchedFilter(drained, con, conDir, true)
-                        || !tryDrain.isFluidEqual(drained)) {
-                    continue;
-                }
-                int amountAccepted = fillFrom(tank, drained.copy(), true);
-                if (amountAccepted <= 0) {
-                    continue;
-                }
-                tryDrain.amount = amountAccepted;
-                drained = tank.externalTank.drain(conDir.getOpposite(), tryDrain, true);
-                if (drained == null || drained.amount <= 0) {
-                    continue;
-                }
-                return true;
+        for (FluidTankInfo tankInfo : tank.externalTank.getTankInfo(conDir.getOpposite())) {
+            if (tankInfo == null || tankInfo.fluid == null) {
+                continue;
+            }
+
+            FluidStack tryDrain = tankInfo.fluid.copy();
+            tryDrain.amount = type.getMaxExtractPerTick();
+            FluidStack drained = tank.externalTank.drain(conDir.getOpposite(), tryDrain, false);
+            if (drained == null || drained.amount <= 0
+                    || !matchedFilter(drained, con, conDir, true)
+                    || !tryDrain.isFluidEqual(drained)) {
+                continue;
+            }
+
+            int amountAccepted = fillFrom(tank, drained, true);
+            if (amountAccepted <= 0) {
+                continue;
             }
+
+            tryDrain.amount = amountAccepted;
+            drained = tank.externalTank.drain(conDir.getOpposite(), tryDrain, true);
+            if (drained == null || drained.amount <= 0) {
+                continue;
+            }
+            return true;
         }
 
         FluidStack drained = tank.externalTank.drain(conDir.getOpposite(), type.getMaxExtractPerTick(), false);
         if (drained == null || drained.amount <= 0 || !matchedFilter(drained, con, conDir, true)) {
             return false;
         }
-        int amountAccepted = fillFrom(tank, drained.copy(), true);
+        int amountAccepted = fillFrom(tank, drained, true);
         if (amountAccepted <= 0) {
             return false;
         }

src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java

@@ -58,7 +58,7 @@ public boolean isTop(ForgeDirection side) {
         }
     }
 
-    static final FluidStack WATER_BUCKET = FluidRegistry.getFluidStack("water", BUCKET_VOLUME);
+    static final FluidStack WATER_BUCKET = new FluidStack(FluidRegistry.WATER, BUCKET_VOLUME);
 
     BlockCoord[] multiblock = null;
 
@@ -156,7 +156,7 @@ public boolean canFill(ForgeDirection from, Fluid fluid) {
         if (tank.getFluid() == null) {
             return true;
         }
-        if (fluid != null && fluid.getID() == tank.getFluid().getFluidID()) {
+        if (fluid != null && fluid == tank.getFluid().getFluid()) {
             return true;
         }
         return false;
@@ -167,7 +167,7 @@ public boolean canDrain(ForgeDirection from, Fluid fluid) {
         if (tank.getFluid() == null || fluid == null) {
             return false;
         }
-        return tank.getFluid().getFluid().getID() == fluid.getID();
+        return tank.getFluid().getFluid() == fluid;
     }
 
     @Override

src/main/java/crazypants/enderio/tool/SmartTank.java

@@ -53,7 +53,7 @@ public boolean canDrainFluidType(Fluid fl) {
         if (fl == null || fluid == null) {
             return false;
         }
-        return fl.getID() == fluid.getFluidID();
+        return fl == fluid.getFluid();
     }
 
     public FluidStack drain(FluidStack resource, boolean doDrain) {
@@ -67,17 +67,17 @@ public boolean canFill(FluidStack resource) {
         if (fluid != null) {
             return fluid.isFluidEqual(resource);
         } else if (restriction != null) {
-            return resource.getFluid() != null && restriction.getID() == resource.getFluid().getID();
+            return resource.getFluid() != null && restriction == resource.getFluid();
         } else {
             return true;
         }
     }
 
     public boolean canFill(Fluid fl) {
         if (fluid != null) {
-            return fluid.getFluid().getID() == fl.getID();
+            return fluid.getFluid() == fl;
         } else if (restriction != null) {
-            return restriction.getID() == fl.getID();
+            return restriction == fl;
         } else {
             return true;
         }