From 092669a2b431dc17f553da3fa895f57d0bf5c898 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Thu, 15 Jan 2015 22:50:14 +0800 Subject: [PATCH] More work on DC Grid --- .../scala/edx/electrical/wire/flat/PartFlatWire.scala | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala b/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala index daf2ab780..db6ff5595 100644 --- a/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala +++ b/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala @@ -21,7 +21,6 @@ import net.minecraft.util.{IIcon, MovingObjectPosition} import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 import resonant.api.tile.INodeProvider -import resonant.lib.grid.UpdateTicker import resonant.lib.grid.electric.NodeDC import scala.collection.convert.wrapAll._ @@ -287,10 +286,10 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc override def getSubParts: JIterable[IndexedCuboid6] = Seq(new IndexedCuboid6(0, PartFlatWire.selectionBounds(getThickness)(side))) - def getThickness: Int = if (insulated) 2 else 1 - def getOcclusionBoxes: JIterable[Cuboid6] = Seq(PartFlatWire.occlusionBounds(getThickness)(side)) + def getThickness: Int = if (insulated) 2 else 1 + override def solid(arg0: Int) = false /** @@ -312,6 +311,8 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc return false } + def useStaticRenderer: Boolean = true + @SideOnly(Side.CLIENT) override def renderDynamic(pos: Vector3, frame: Float, pass: Int) { @@ -327,8 +328,6 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc } } - def useStaticRenderer: Boolean = true - @SideOnly(Side.CLIENT) override def drawBreaking(renderBlocks: RenderBlocks) { @@ -345,8 +344,6 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc { override def reconstruct() { - UpdateTicker.threaded.addUpdater(this) - if (!world.isRemote) { directionMap.clear()