From b1057544a775f691e388bd145a740f8ee2e2e78b Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Sun, 22 Sep 2013 14:23:08 +1000 Subject: [PATCH] Remove all deprecated content --- codechicken/lib/colour/Colour.java | 9 +----- codechicken/lib/lang/LangUtil.java | 7 ----- codechicken/lib/raytracer/RayTracer.java | 3 -- codechicken/lib/render/RenderUtils.java | 38 +++--------------------- codechicken/lib/vec/Cuboid6.java | 6 ---- codechicken/lib/vec/Vector3.java | 6 ---- 6 files changed, 5 insertions(+), 64 deletions(-) diff --git a/codechicken/lib/colour/Colour.java b/codechicken/lib/colour/Colour.java index 83a95c0..8960c07 100644 --- a/codechicken/lib/colour/Colour.java +++ b/codechicken/lib/colour/Colour.java @@ -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 diff --git a/codechicken/lib/lang/LangUtil.java b/codechicken/lib/lang/LangUtil.java index 70749ce..767887b 100644 --- a/codechicken/lib/lang/LangUtil.java +++ b/codechicken/lib/lang/LangUtil.java @@ -107,11 +107,4 @@ public class LangUtil return this; } - - @Deprecated - @SideOnly(Side.CLIENT) - public static void loadBaseLangDir(ResourceLocation dir) - { - instance.addLangDir(dir); - } } diff --git a/codechicken/lib/raytracer/RayTracer.java b/codechicken/lib/raytracer/RayTracer.java index 7273d77..4161d84 100644 --- a/codechicken/lib/raytracer/RayTracer.java +++ b/codechicken/lib/raytracer/RayTracer.java @@ -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 t_inst = new ThreadLocal(); public static RayTracer instance() diff --git a/codechicken/lib/render/RenderUtils.java b/codechicken/lib/render/RenderUtils.java index 581ccc3..a867002 100644 --- a/codechicken/lib/render/RenderUtils.java +++ b/codechicken/lib/render/RenderUtils.java @@ -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), diff --git a/codechicken/lib/vec/Cuboid6.java b/codechicken/lib/vec/Cuboid6.java index 237504f..9233cf7 100644 --- a/codechicken/lib/vec/Cuboid6.java +++ b/codechicken/lib/vec/Cuboid6.java @@ -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); diff --git a/codechicken/lib/vec/Vector3.java b/codechicken/lib/vec/Vector3.java index 675e9ad..8a2c502 100644 --- a/codechicken/lib/vec/Vector3.java +++ b/codechicken/lib/vec/Vector3.java @@ -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;