diff --git a/src/main/scala/edx/core/prefab/part/connector/PartFramedNode.scala b/src/main/scala/edx/core/prefab/part/connector/PartFramedNode.scala index 4e85fb3c1..6d2a5e52f 100644 --- a/src/main/scala/edx/core/prefab/part/connector/PartFramedNode.scala +++ b/src/main/scala/edx/core/prefab/part/connector/PartFramedNode.scala @@ -7,10 +7,9 @@ import codechicken.lib.data.{MCDataInput, MCDataOutput} import codechicken.lib.raytracer.IndexedCuboid6 import codechicken.lib.vec.Cuboid6 import codechicken.multipart._ -import cpw.mods.fml.relauncher.{Side, SideOnly} import edx.core.prefab.part.CuboidShapes import net.minecraft.entity.player.EntityPlayer -import net.minecraft.util.{IIcon, MovingObjectPosition} +import net.minecraft.util.MovingObjectPosition import net.minecraftforge.common.util.ForgeDirection import resonant.lib.grid.core.NodeConnector import resonant.lib.wrapper.BitmaskWrapper._ @@ -18,13 +17,12 @@ import resonant.lib.wrapper.BitmaskWrapper._ import scala.collection.convert.wrapAll._ import scala.collection.mutable -abstract class PartFramedNode extends PartAbstract with TPartNodeProvider with TSlottedPart with TNormalOcclusion with TIconHitEffects +abstract class PartFramedNode extends PartAbstract with TPartNodeProvider with TSlottedPart with TNormalOcclusion { protected val node: NodeConnector[_] /** Bitmask connections */ var clientRenderMask = 0x00 - @SideOnly(Side.CLIENT) - protected var breakIcon: IIcon = null + /** Client Side */ protected var testingSide: ForgeDirection = null @@ -33,10 +31,6 @@ abstract class PartFramedNode extends PartAbstract with TPartNodeProvider with T override def getStrength(hit: MovingObjectPosition, player: EntityPlayer): Float = 10f - override def getBounds: Cuboid6 = CuboidShapes.center - - override def getBrokenIcon(side: Int): IIcon = breakIcon - def getOcclusionBoxes: Set[Cuboid6] = getCollisionBoxes /** Rendering and block bounds. */ diff --git a/src/main/scala/edx/mechanical/fluid/pipe/PartPipe.scala b/src/main/scala/edx/mechanical/fluid/pipe/PartPipe.scala index d6598a043..493614bb9 100644 --- a/src/main/scala/edx/mechanical/fluid/pipe/PartPipe.scala +++ b/src/main/scala/edx/mechanical/fluid/pipe/PartPipe.scala @@ -5,7 +5,7 @@ import java.lang.{Iterable => JIterable} import codechicken.lib.data.{MCDataInput, MCDataOutput} import codechicken.lib.raytracer.IndexedCuboid6 import codechicken.lib.render.CCRenderState -import codechicken.lib.vec.{Cuboid6, Vector3} +import codechicken.lib.vec.Vector3 import cpw.mods.fml.relauncher.{Side, SideOnly} import edx.core.prefab.part.CuboidShapes import edx.core.prefab.part.connector.{PartFramedNode, TColorable, TMaterial} @@ -43,8 +43,6 @@ class PartPipe extends PartFramedNode with TMaterial[PipeMaterial] with TColorab node.onConnectionChanged = () => sendPacket(0) node.onFluidChanged = () => markPacket = true - override def getBounds: Cuboid6 = CuboidShapes.thickCenter - override def getSubParts: JIterable[IndexedCuboid6] = { val sideCuboids = CuboidShapes.thickSegment