Remove all deprecated content

This commit is contained in:
Chicken Bones committed 2013-09-22 14:23:08 +10:00
1 parent 1b71ee5e3d
commit b1057544a7
6 files changed
+5 -64

No files matched your search

+1 -8
View File
@@ -41,14 +41,7 @@ public abstract class Colour
{
GL11.glColor4ub(r, g, b, (byte) a);
}
@SideOnly(Side.CLIENT)
@Deprecated
public void glColour(byte a)
{
GL11.glColor4ub(r, g, b, a);
}
public abstract int pack();
@Override
-7
View File
@@ -107,11 +107,4 @@ public class LangUtil
return this;
}
@Deprecated
@SideOnly(Side.CLIENT)
public static void loadBaseLangDir(ResourceLocation dir)
{
instance.addLangDir(dir);
}
}
-3
View File
@@ -28,9 +28,6 @@ public class RayTracer
private int s_side;
private IndexedCuboid6 c_cuboid;
@Deprecated//not threadsafe
public static RayTracer instance = new RayTracer();
private static ThreadLocal<RayTracer> t_inst = new ThreadLocal<RayTracer>();
public static RayTracer instance()
+4 -34
View File
@@ -49,12 +49,6 @@ public class RenderUtils
entityItem.hoverStart = 0;
}
@Deprecated
public static void renderLiquidQuad(Vector3 point1, Vector3 point2, Vector3 point3, Vector3 point4, Icon icon, double res)
{
renderFluidQuad(point1, point2, point3, point4, icon, res);
}
public static void renderFluidQuad(Vector3 point1, Vector3 point2, Vector3 point3, Vector3 point4, Icon icon, double res)
{
double u1 = icon.getMinU();
@@ -109,12 +103,6 @@ public class RenderUtils
GL11.glTranslated(-interpPosX, -interpPosY, -interpPosZ);
}
@Deprecated
public static void drawOutlinedBoundingBox(AxisAlignedBB aabb)
{
drawCuboidOutline(new Cuboid6(aabb));
}
public static void drawCuboidOutline(Cuboid6 c)
{
Tessellator var2 = Tessellator.instance;
@@ -144,12 +132,6 @@ public class RenderUtils
var2.draw();
}
@Deprecated
public static void renderLiquidCuboid(Cuboid6 bound, Icon tex, double res)
{
renderFluidCuboid(bound, tex, res);
}
public static void renderFluidCuboid(Cuboid6 bound, Icon tex, double res)
{
renderFluidQuad(//bottom
@@ -235,12 +217,6 @@ public class RenderUtils
break;
}
}
@Deprecated
public static boolean shouldRenderLiquid(FluidStack stack)
{
return shouldRenderFluid(stack);
}
public static boolean shouldRenderFluid(FluidStack stack)
{
@@ -272,12 +248,6 @@ public class RenderUtils
GL11.glDisable(GL11.GL_BLEND);
}
@Deprecated
public static void renderLiquidCuboid(FluidStack stack, Cuboid6 bound, double density, double res)
{
renderFluidCuboid(stack, bound, density, res);
}
public static double fluidDensityToAlpha(double density)
{
return Math.pow(density, 0.4);
@@ -295,7 +265,7 @@ public class RenderUtils
*/
public static void renderFluidCuboid(FluidStack stack, Cuboid6 bound, double density, double res)
{
if(!shouldRenderLiquid(stack))
if(!shouldRenderFluid(stack))
return;
int alpha = 255;
@@ -306,14 +276,14 @@ public class RenderUtils
Icon tex = prepareFluidRender(stack, alpha);
CCRenderState.startDrawing(7);
renderLiquidCuboid(bound, tex, res);
renderFluidCuboid(bound, tex, res);
CCRenderState.draw();
postFluidRender();
}
public static void renderFluidGauge(FluidStack stack, Rectangle4i rect, double density, double res)
{
if(!shouldRenderLiquid(stack))
if(!shouldRenderFluid(stack))
return;
int alpha = 255;
@@ -328,7 +298,7 @@ public class RenderUtils
Icon tex = prepareFluidRender(stack, alpha);
CCRenderState.startDrawing(7);
renderLiquidQuad(
renderFluidQuad(
new Vector3(rect.x, rect.y, 0),
new Vector3(rect.x, rect.y+rect.h, 0),
new Vector3(rect.x+rect.w, rect.y+rect.h, 0),
-6
View File
@@ -135,12 +135,6 @@ public class Cuboid6
return this;
}
@Deprecated
public Cuboid6 transform(Transformation t)
{
return apply(t);
}
public Cuboid6 apply(Transformation t)
{
t.apply(min);
-6
View File
@@ -76,12 +76,6 @@ public class Vector3
return new Vector3(e.xCoord + 0.5, e.yCoord + 0.5, e.zCoord + 0.5);
}
@Deprecated
public static Vector3 fromVec3D(Vec3 vec)
{
return new Vector3(vec);
}
public Vector3 set(double d, double d1, double d2)
{
x = d;