From f713f9e46c197b16e8b8eb51986a154ba8bbcbb9 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 10 Nov 2014 11:53:00 +0800 Subject: [PATCH] Fixed clientRenderMask being protected --- .../core/prefab/part/connector/PartFramedNode.scala | 2 +- .../mechanical/mech/gear/RenderGear.scala | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/scala/resonantinduction/core/prefab/part/connector/PartFramedNode.scala b/src/main/scala/resonantinduction/core/prefab/part/connector/PartFramedNode.scala index d52a8e2c0..01a416559 100644 --- a/src/main/scala/resonantinduction/core/prefab/part/connector/PartFramedNode.scala +++ b/src/main/scala/resonantinduction/core/prefab/part/connector/PartFramedNode.scala @@ -20,7 +20,7 @@ import scala.collection.mutable abstract class PartFramedNode extends PartAbstract with TPartNodeProvider with TSlottedPart with TNormalOcclusion with TIconHitEffects { /** Bitmask connections */ - protected var clientRenderMask = 0x00 + var clientRenderMask = 0x00 @SideOnly(Side.CLIENT) protected var breakIcon: IIcon = null diff --git a/src/main/scala/resonantinduction/mechanical/mech/gear/RenderGear.scala b/src/main/scala/resonantinduction/mechanical/mech/gear/RenderGear.scala index e04384d60..a8bbf8f02 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/gear/RenderGear.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/gear/RenderGear.scala @@ -39,13 +39,9 @@ object RenderGear extends ISimpleItemRenderer GL11.glRotated(angle, 0, 1, 0) if (isLarge) - { RenderGear.model.renderOnly("LargeGear") - } else - { RenderGear.model.renderOnly("SmallGear") - } } def renderDynamic(part: PartGear, x: Double, y: Double, z: Double, tier: Int) @@ -53,9 +49,9 @@ object RenderGear extends ISimpleItemRenderer if (part.getMultiBlock.isPrimary) { GL11.glPushMatrix() - GL11.glTranslatef(x.asInstanceOf[Float] + 0.5f, y.asInstanceOf[Float] + 0.5f, z.asInstanceOf[Float] + 0.5f) + GL11.glTranslatef(x.toFloat + 0.5f, y.toFloat + 0.5f, z.toFloat + 0.5f) GL11.glPushMatrix() - renderGear(part.placementSide.ordinal, part.tier, part.getMultiBlock.isConstructed, Math.toDegrees(part.mechanicalNode.angle)) + renderGear(part.placementSide.ordinal, part.tier, part.getMultiBlock.isConstructed, Math.toDegrees(part.mechanicalNode.angle) * (part.placementSide.offsetX + part.placementSide.offsetY + part.placementSide.offsetZ)) GL11.glPopMatrix() GL11.glPopMatrix() }