From dff9049ea2d0e6fbd06bc8175c56f4ddad039936 Mon Sep 17 00:00:00 2001 From: tgame14 Date: Thu, 17 Apr 2014 13:15:41 +0300 Subject: [PATCH] made ItemRailingTransfer accept node instead of Part --- .../electrical/itemrailing/ItemRailingTransfer.java | 2 +- .../electrical/itemrailing/NodeRailing.java | 1 + .../electrical/itemrailing/PartRailing.java | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/ItemRailingTransfer.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/ItemRailingTransfer.java index f95876cd6..e8ad9addb 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/ItemRailingTransfer.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/ItemRailingTransfer.java @@ -22,7 +22,7 @@ public class ItemRailingTransfer implements IItemRailingTransfer { this.stack = stack.copy(); this.color = EnumColor.ORANGE; - this.railing = railing; + this.railing = railing.getNode(); } public ItemRailingTransfer(Item item, PartRailing railing) diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java index ee8df22bb..cf7d1005e 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java @@ -29,6 +29,7 @@ public class NodeRailing extends Node imp { super(parent); this.itemNodeSet = new HashSet(); + this.color = null; } @Override diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java index ddab71722..02b53de27 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java @@ -38,7 +38,12 @@ public class PartRailing extends PartFramedConnection