Make FluidStack hold a delegate for the fluid. This can then float based on what is "live" at present.

This commit is contained in:
cpw committed 2015-04-20 09:06:23 -04:00
1 parent 7e9d2fb509
commit 0543828603
3 files changed
+70 -14

No files matched your search

@@ -50,7 +50,7 @@ public abstract class FluidContainerRegistry
code = 31*code + container.getItem().hashCode();
code = 31*code + container.getItemDamage();
if (stack != null)
code = 31*code + stack.fluid.hashCode();
code = 31*code + stack.getFluid().hashCode();
return code;
}
@Override
@@ -63,7 +63,7 @@ public abstract class FluidContainerRegistry
if (stack == null && ck.stack != null) return false;
if (stack != null && ck.stack == null) return false;
if (stack == null && ck.stack == null) return true;
if (stack.fluid != ck.stack.fluid) return false;
if (stack.getFluid() != ck.stack.getFluid()) return false;
return true;
}
}