From 6690ebe8f498fe33ed6eb513e228b96d772ded3a Mon Sep 17 00:00:00 2001
From: tgame14 <tgameBusiness@gmail.com>
Date: Tue, 18 Mar 2014 14:05:17 +0200
Subject: [PATCH] Additional railing grid work

---
 .../electrical/itemrailing/GridRailing.java   | 15 ++++++++
 .../electrical/itemrailing/PartRailing.java   | 35 ++++++++++++++++---
 .../itemrailing/interfaces/IItemRailing.java  |  2 +-
 3 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 electrical/src/main/java/resonantinduction/electrical/itemrailing/GridRailing.java

diff --git a/electrical/src/main/java/resonantinduction/electrical/itemrailing/GridRailing.java b/electrical/src/main/java/resonantinduction/electrical/itemrailing/GridRailing.java
new file mode 100644
index 000000000..72aa3f01a
--- /dev/null
+++ b/electrical/src/main/java/resonantinduction/electrical/itemrailing/GridRailing.java
@@ -0,0 +1,15 @@
+package resonantinduction.electrical.itemrailing;
+
+import calclavia.lib.grid.Grid;
+
+/**
+ * @since 18/03/14
+ * @author tgame14
+ */
+public class GridRailing extends Grid<PartRailing>
+{
+    public GridRailing (Class type)
+    {
+        super(type);
+    }
+}
diff --git a/electrical/src/main/java/resonantinduction/electrical/itemrailing/PartRailing.java b/electrical/src/main/java/resonantinduction/electrical/itemrailing/PartRailing.java
index 755455f35..9113422f0 100644
--- a/electrical/src/main/java/resonantinduction/electrical/itemrailing/PartRailing.java
+++ b/electrical/src/main/java/resonantinduction/electrical/itemrailing/PartRailing.java
@@ -1,5 +1,6 @@
 package resonantinduction.electrical.itemrailing;
 
+import calclavia.lib.grid.INode;
 import calclavia.lib.render.EnumColor;
 import codechicken.microblock.IHollowConnect;
 import codechicken.multipart.JNormalOcclusion;
@@ -19,8 +20,14 @@ import universalelectricity.api.energy.IEnergyNetwork;
  * @since 16/03/14
  * @author tgame14
  */
-public class PartRailing extends PartFramedConnection<PartRailing.EnumRailing, IConductor, IEnergyNetwork> implements IConductor, TSlottedPart, JNormalOcclusion, IHollowConnect, IItemRailing
+public class PartRailing extends PartFramedConnection<PartRailing.EnumRailing, IConductor, IEnergyNetwork> implements IConductor, TSlottedPart, JNormalOcclusion, IHollowConnect, IItemRailing, INode
 {
+
+    public enum EnumRailing
+    {
+        DEFAULT;
+    }
+
     // default is NULL
     private EnumColor color;
 
@@ -35,13 +42,12 @@ public class PartRailing extends PartFramedConnection<PartRailing.EnumRailing, I
     @Override
     public boolean canItemEnter (IItemRailingTransfer item)
     {
-        return this.color == item.getColor();
+        return this.color != null ? this.color == item.getColor() : false;
     }
 
     @Override
     public boolean canConnectToRailing (IItemRailing railing, ForgeDirection from)
     {
-
         return this.color != null ? this.color == railing.getRailingColor() : true;
     }
 
@@ -64,9 +70,28 @@ public class PartRailing extends PartFramedConnection<PartRailing.EnumRailing, I
         return super.getWorld();
     }
 
-    public enum EnumRailing
+    @Override
+    public void reconstruct ()
     {
-        DEFAULT;
+
+    }
+
+    @Override
+    public void deconstruct ()
+    {
+
+    }
+
+    @Override
+    public void recache ()
+    {
+
+    }
+
+    @Override
+    public void update (float deltaTime)
+    {
+
     }
 
     @Override
diff --git a/electrical/src/main/java/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java b/electrical/src/main/java/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java
index a68d05d33..5a8612e6f 100644
--- a/electrical/src/main/java/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java
+++ b/electrical/src/main/java/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java
@@ -14,7 +14,7 @@ public interface IItemRailing
 {
     public boolean canItemEnter (IItemRailingTransfer item);
 
-    public boolean canConnectToRailing (IItemRailing railing, ForgeDirection from);
+    public boolean canConnectToRailing (IItemRailing railing, ForgeDirection to);
 
     public EnumColor getRailingColor ();