From 3f5c2db1b75cdaf0e839b06870d44ca66e5617dc Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Sat, 17 Jan 2015 12:28:43 +0800
Subject: [PATCH] Removed unused branch code and tests

---
 .../transformer/ElectricTransformerNode.scala |  2 +-
 .../electrical/wire/flat/PartFlatWire.scala   | 46 +++++++++----------
 .../wire/framed/PartFramedWire.scala          |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala b/src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala
index b57df03f3..f03aef6f9 100644
--- a/src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala
+++ b/src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala
@@ -2,7 +2,7 @@ package edx.electrical.transformer
 
 import net.minecraftforge.common.util.ForgeDirection
 import resonant.api.tile.INodeProvider
-import resonant.lib.grid.electric.NodeDC
+import resonant.lib.grid.energy.electric.NodeDC
 
 /**
  * Created by robert on 8/11/2014.
diff --git a/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala b/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala
index 41bfd9421..6cff9eb8e 100644
--- a/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala
+++ b/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala
@@ -21,7 +21,7 @@ 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.electric.{NodeDC, NodeDCWire}
+import resonant.lib.grid.energy.electric.{NodeDC, NodeDCWire}
 
 import scala.collection.convert.wrapAll._
 
@@ -222,6 +222,28 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
     super.onChunkLoad()
   }
 
+  def dropIfCantStay: Boolean =
+  {
+    if (!canStay)
+    {
+      drop
+      return true
+    }
+    return false
+  }
+
+  def canStay: Boolean =
+  {
+    val pos: BlockCoord = new BlockCoord(tile).offset(side)
+    return MultipartUtil.canPlaceWireOnSide(world, pos.x, pos.y, pos.z, ForgeDirection.getOrientation(side ^ 1), false)
+  }
+
+  def drop
+  {
+    TileMultipart.dropItem(getItem, world, Vector3.fromTileEntityCenter(tile))
+    tile.remPart(this)
+  }
+
   override def onAdded()
   {
     super.onAdded()
@@ -250,28 +272,6 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
       sendPacket(3)
   }
 
-  def dropIfCantStay: Boolean =
-  {
-    if (!canStay)
-    {
-      drop
-      return true
-    }
-    return false
-  }
-
-  def canStay: Boolean =
-  {
-    val pos: BlockCoord = new BlockCoord(tile).offset(side)
-    return MultipartUtil.canPlaceWireOnSide(world, pos.x, pos.y, pos.z, ForgeDirection.getOrientation(side ^ 1), false)
-  }
-
-  def drop
-  {
-    TileMultipart.dropItem(getItem, world, Vector3.fromTileEntityCenter(tile))
-    tile.remPart(this)
-  }
-
   def maskOpen(r: Int): Boolean =
   {
     return (connectionMask & 0x1000 << r) != 0
diff --git a/src/main/scala/edx/electrical/wire/framed/PartFramedWire.scala b/src/main/scala/edx/electrical/wire/framed/PartFramedWire.scala
index 8b25d3f1e..b6db2560f 100644
--- a/src/main/scala/edx/electrical/wire/framed/PartFramedWire.scala
+++ b/src/main/scala/edx/electrical/wire/framed/PartFramedWire.scala
@@ -10,7 +10,7 @@ import edx.electrical.wire.base.TWire
 import net.minecraft.client.renderer.RenderBlocks
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.common.util.ForgeDirection
-import resonant.lib.grid.electric.NodeDC
+import resonant.lib.grid.energy.electric.NodeDC
 import resonant.lib.wrapper.BitmaskWrapper._
 
 /**