Comment out fluids until King gets his hands on it

This commit is contained in:
Lex Manos committed 2013-12-12 23:32:18 -08:00
1 parent 6eb9915690
commit 9cf0a5b68b
13 files changed
+114 -65

No files matched your search

@@ -18,6 +18,7 @@ import net.minecraft.nbt.NBTTagCompound;
*/
public class FluidStack
{
/*
public int fluidID;
public int amount;
public NBTTagCompound tag;
@@ -52,7 +53,7 @@ public class FluidStack
/**
* This provides a safe method for retrieving a FluidStack - if the Fluid is invalid, the stack
* will return as null.
*/
* /
public static FluidStack loadFluidStackFromNBT(NBTTagCompound nbt)
{
if (nbt == null)
@@ -102,7 +103,7 @@ public class FluidStack
/**
* @return A copy of this FluidStack
*/
* /
public FluidStack copy()
{
return new FluidStack(fluidID, amount, tag);
@@ -114,7 +115,7 @@ public class FluidStack
* @param other
* The FluidStack for comparison
* @return true if the Fluids (IDs and NBT Tags) are the same
*/
* /
public boolean isFluidEqual(FluidStack other)
{
return other != null && fluidID == other.fluidID && isFluidStackTagEqual(other);
@@ -127,7 +128,7 @@ public class FluidStack
/**
* Determines if the NBT Tags are equal. Useful if the FluidIDs are known to be equal.
*/
* /
public static boolean areFluidStackTagsEqual(FluidStack stack1, FluidStack stack2)
{
return stack1 == null && stack2 == null ? true : stack1 == null || stack2 == null ? false : stack1.isFluidStackTagEqual(stack2);
@@ -138,7 +139,7 @@ public class FluidStack
*
* @param other
* @return true if this FluidStack contains the other FluidStack (same fluid and >= amount)
*/
* /
public boolean containsFluid(FluidStack other)
{
return isFluidEqual(other) && amount >= other.amount;
@@ -150,7 +151,7 @@ public class FluidStack
* @param other
* - the FluidStack for comparison
* @return true if the two FluidStacks are exactly the same
*/
* /
public boolean isFluidStackIdentical(FluidStack other)
{
return isFluidEqual(other) && amount == other.amount;
@@ -163,7 +164,7 @@ public class FluidStack
* @param other
* The ItemStack for comparison
* @return true if the Fluids (IDs and NBT Tags) are the same
*/
* /
public boolean isFluidEqual(ItemStack other)
{
if (other == null)
@@ -189,7 +190,7 @@ public class FluidStack
* Default equality comparison for a FluidStack. Same functionality as isFluidEqual().
*
* This is included for use in data structures.
*/
* /
@Override
public final boolean equals(Object o)
{
@@ -200,4 +201,5 @@ public class FluidStack
return isFluidEqual((FluidStack) o);
}
*/
}