mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-13 00:37:52 +00:00
Cleanup Fluid deprecations stuff.
This commit is contained in:
1 parent
22e99a2cff
commit
b4dc15a9cb
6 files changed
+7
-190
No files matched your search
@@ -22,8 +22,6 @@ public class FluidStack
|
||||
* This field will be removed in 1.8. It may be incorrect after a world is loaded. Code should always
|
||||
* use {@link #getFluid()} instead. That will always reflect the correct value.
|
||||
*/
|
||||
@Deprecated
|
||||
public final Fluid fluid;
|
||||
public int amount;
|
||||
public NBTTagCompound tag;
|
||||
private RegistryDelegate<Fluid> fluidDelegate;
|
||||
@@ -42,7 +40,6 @@ public class FluidStack
|
||||
}
|
||||
this.fluidDelegate = FluidRegistry.makeDelegate(fluid);
|
||||
this.amount = amount;
|
||||
this.fluid = fluid;
|
||||
}
|
||||
|
||||
public FluidStack(Fluid fluid, int amount, NBTTagCompound nbt)
|
||||
@@ -60,20 +57,6 @@ public class FluidStack
|
||||
this(stack.getFluid(), amount, stack.tag);
|
||||
}
|
||||
|
||||
// To be removed in 1.8
|
||||
@Deprecated
|
||||
public FluidStack(int fluidID, int amount)
|
||||
{
|
||||
this(FluidRegistry.getFluid(fluidID), amount);
|
||||
}
|
||||
|
||||
// To be removed in 1.8
|
||||
@Deprecated
|
||||
public FluidStack(int fluidID, int amount, NBTTagCompound nbt)
|
||||
{
|
||||
this(FluidRegistry.getFluid(fluidID), amount, nbt);
|
||||
}
|
||||
|
||||
/**
|
||||
* This provides a safe method for retrieving a FluidStack - if the Fluid is invalid, the stack
|
||||
* will return as null.
|
||||
@@ -116,11 +99,6 @@ public class FluidStack
|
||||
return fluidDelegate.get();
|
||||
}
|
||||
|
||||
public final int getFluidID()
|
||||
{
|
||||
return FluidRegistry.getFluidID(getFluid());
|
||||
}
|
||||
|
||||
public String getLocalizedName()
|
||||
{
|
||||
return this.getFluid().getLocalizedName(this);
|
||||
|
||||
Reference in new issue
Block a user