Cleanup Fluid deprecations stuff.

This commit is contained in:
cpw committed 2015-11-24 10:05:35 -05:00
1 parent 22e99a2cff
commit b4dc15a9cb
6 files changed
+7 -190

No files matched your search

@@ -42,15 +42,6 @@ public class Fluid
/** The unlocalized name of this fluid. */
protected String unlocalizedName;
/**
* The Icons for this fluid.
* @deprecated use ResourceLocation-based ones instead.
*/
@Deprecated
protected TextureAtlasSprite stillIcon;
@Deprecated
protected TextureAtlasSprite flowingIcon;
protected final ResourceLocation still;
protected final ResourceLocation flowing;
@@ -112,15 +103,6 @@ public class Fluid
*/
protected Block block = null;
/**
* @deprecated use the constructor with texture locations.
*/
@Deprecated
public Fluid(String fluidName)
{
this(fluidName, null, null);
}
public Fluid(String fluidName, ResourceLocation still, ResourceLocation flowing)
{
this.fluidName = fluidName.toLowerCase(Locale.ENGLISH);
@@ -209,15 +191,6 @@ public class Fluid
* Returns the localized name of this fluid.
*/
public String getLocalizedName(FluidStack stack)
{
return getLocalizedName();
}
/**
* Use the FluidStack sensitive version above
*/
@Deprecated
public String getLocalizedName()
{
String s = this.getUnlocalizedName();
return s == null ? "" : StatCollector.translateToLocal(s);
@@ -239,14 +212,6 @@ public class Fluid
return "fluid." + this.unlocalizedName;
}
/**
* Returns 0 for "/terrain.png". ALL FLUID TEXTURES MUST BE ON THIS SHEET.
*/
public final int getSpriteNumber()
{
return 0;
}
/* Default Accessors */
public final int getLuminosity()
{
@@ -293,47 +258,6 @@ public class Fluid
return flowing;
}
@Deprecated
public final Fluid setStillIcon(TextureAtlasSprite stillIcon)
{
this.stillIcon = stillIcon;
return this;
}
@Deprecated
public final Fluid setFlowingIcon(TextureAtlasSprite flowingIcon)
{
this.flowingIcon = flowingIcon;
return this;
}
@Deprecated
public final Fluid setIcons(TextureAtlasSprite stillIcon, TextureAtlasSprite flowingIcon)
{
return this.setStillIcon(stillIcon).setFlowingIcon(flowingIcon);
}
@Deprecated
public final Fluid setIcons(TextureAtlasSprite commonIcon)
{
return this.setStillIcon(commonIcon).setFlowingIcon(commonIcon);
}
@Deprecated
public TextureAtlasSprite getIcon(){ return getStillIcon(); }
@Deprecated
public TextureAtlasSprite getStillIcon()
{
return this.stillIcon;
}
@Deprecated
public TextureAtlasSprite getFlowingIcon()
{
return this.flowingIcon;
}
/* Stack-based Accessors */
public int getLuminosity(FluidStack stack){ return getLuminosity(); }
public int getDensity(FluidStack stack){ return getDensity(); }
@@ -342,8 +266,6 @@ public class Fluid
public boolean isGaseous(FluidStack stack){ return isGaseous(); }
public EnumRarity getRarity(FluidStack stack){ return getRarity(); }
public int getColor(FluidStack stack){ return getColor(); }
@Deprecated
public TextureAtlasSprite getIcon(FluidStack stack){ return getIcon(); }
public ResourceLocation getStill(FluidStack stack) { return getStill(); }
public ResourceLocation getFlowing(FluidStack stack) { return getFlowing(); }
@@ -355,8 +277,6 @@ public class Fluid
public boolean isGaseous(World world, BlockPos pos){ return isGaseous(); }
public EnumRarity getRarity(World world, BlockPos pos){ return getRarity(); }
public int getColor(World world, BlockPos pos){ return getColor(); }
@Deprecated
public TextureAtlasSprite getIcon(World world, BlockPos pos){ return getIcon(); }
public ResourceLocation getStill(World world, BlockPos pos) { return getStill(); }
public ResourceLocation getFlowing(World world, BlockPos pos) { return getFlowing(); }