From d181b226aef5f526204e50f98962d5e00f2c1860 Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Sun, 22 Sep 2013 14:25:15 +1000 Subject: [PATCH] Clean deprecation update --- codechicken/microblock/CornerMicroblock.scala | 2 +- codechicken/microblock/EdgeMicroblock.scala | 4 ++-- codechicken/microblock/FaceMicroblock.scala | 2 +- codechicken/microblock/HolloMicroblock.scala | 6 +++--- codechicken/microblock/handler/Proxies.scala | 7 ------- dependancies.info | 2 +- 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/codechicken/microblock/CornerMicroblock.scala b/codechicken/microblock/CornerMicroblock.scala index 15af852..ac76162 100644 --- a/codechicken/microblock/CornerMicroblock.scala +++ b/codechicken/microblock/CornerMicroblock.scala @@ -28,7 +28,7 @@ object CornerMicroClass extends MicroblockClass for(t <- 1 until 8) { val d = t/8D - aBounds(t<<4|s) = new Cuboid6(0, 0, 0, d, d, d).transform(transform) + aBounds(t<<4|s) = new Cuboid6(0, 0, 0, d, d, d).apply(transform) } } diff --git a/codechicken/microblock/EdgeMicroblock.scala b/codechicken/microblock/EdgeMicroblock.scala index 280b28e..03a7c0d 100644 --- a/codechicken/microblock/EdgeMicroblock.scala +++ b/codechicken/microblock/EdgeMicroblock.scala @@ -81,7 +81,7 @@ object EdgeMicroClass extends MicroblockClass for(t <- 1 until 8) { val d = t/8D - aBounds(t<<4|s) = new Cuboid6(0, 0, 0, d, 1, d).transform(transform) + aBounds(t<<4|s) = new Cuboid6(0, 0, 0, d, 1, d).apply(transform) } } @@ -131,7 +131,7 @@ object PostMicroClass { val d1 = 0.5-t/16D val d2 = 0.5+t/16D - aBounds(t<<4|s) = new Cuboid6(d1, 0, d1, d2, 1, d2).transform(transform) + aBounds(t<<4|s) = new Cuboid6(d1, 0, d1, d2, 1, d2).apply(transform) } } diff --git a/codechicken/microblock/FaceMicroblock.scala b/codechicken/microblock/FaceMicroblock.scala index 89013b4..7b3682a 100644 --- a/codechicken/microblock/FaceMicroblock.scala +++ b/codechicken/microblock/FaceMicroblock.scala @@ -51,7 +51,7 @@ object FaceMicroClass extends MicroblockClass for(t <- 1 until 8) { val d = t/8D - aBounds(t<<4|s) = new Cuboid6(0, 0, 0, 1, d, 1).transform(transform) + aBounds(t<<4|s) = new Cuboid6(0, 0, 0, 1, d, 1).apply(transform) } } diff --git a/codechicken/microblock/HolloMicroblock.scala b/codechicken/microblock/HolloMicroblock.scala index 73ef76c..3a2f68b 100644 --- a/codechicken/microblock/HolloMicroblock.scala +++ b/codechicken/microblock/HolloMicroblock.scala @@ -54,8 +54,8 @@ object HollowMicroClass extends MicroblockClass new Cuboid6(1-w1, 0, 0, 1, d, 1), new Cuboid6(w1, 0, 0, 1-w1, d, w1), new Cuboid6(w1, 0, 1-w1, 1-w1, d, 1)) - .map(_.transform(transform)) - occBounds(t<<4|s) = new Cuboid6(1/8D, 0, 1/8D, 7/8D, d, 7/8D).transform(transform) + .map(_.apply(transform)) + occBounds(t<<4|s) = new Cuboid6(1/8D, 0, 1/8D, 7/8D, d, 7/8D).apply(transform) } } @@ -270,7 +270,7 @@ class HollowMicroblock(shape$:Byte = 0, material$:Int = 0) extends CommonMicrobl new Cuboid6(0, 0, d2, 1, t, 1), new Cuboid6(0, 0, d1, d1, t, d2), new Cuboid6(d2, 0, d1, 1, t, d2)) - .map(c => c.transform(tr)) + .map(c => c.apply(tr)) } override def getSubParts = getCollisionBoxes.map(c => new IndexedCuboid6(0, c)) diff --git a/codechicken/microblock/handler/Proxies.scala b/codechicken/microblock/handler/Proxies.scala index 2f02917..41b5149 100644 --- a/codechicken/microblock/handler/Proxies.scala +++ b/codechicken/microblock/handler/Proxies.scala @@ -101,13 +101,6 @@ class MicroblockProxy_clientImpl extends MicroblockProxy_serverImpl _renderBlocks } - @SideOnly(Side.CLIENT) - override def preInit() - { - super.preInit() - LangUtil.loadBaseLangDir(new ResourceLocation("microblock:lang")) - } - @SideOnly(Side.CLIENT) override def postInit() { diff --git a/dependancies.info b/dependancies.info index a3f08ba..0895c4b 100644 --- a/dependancies.info +++ b/dependancies.info @@ -3,5 +3,5 @@ "file": "CodeChickenLib-universal-@MCVERSION@-@VERSION@.jar", "dev": "CodeChickenLib-dev-@MCVERSION@-@VERSION@.jar", "class": "codechicken.lib.asm.ASMHelper", - "version": "1.0.0.35" + "version": "1.0.0.36" } \ No newline at end of file