From ced9a4dcbf0d86c45389b51320b17a119a5c0431 Mon Sep 17 00:00:00 2001 From: tgame14 Date: Wed, 16 Apr 2014 15:53:58 +0300 Subject: [PATCH] Abstracted code to use interfaces rather then implementation --- .../electrical/itemrailing/NodeRailing.java | 3 ++- .../electrical/itemrailing/PartRailing.java | 2 +- .../electrical/itemrailing/interfaces/IItemRailing.java | 3 ++- .../itemrailing/interfaces/IItemRailingTransfer.java | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java index 665b24de..eb8922d2 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java @@ -2,12 +2,13 @@ package resonantinduction.electrical.itemrailing; import calclavia.lib.grid.Grid; import calclavia.lib.grid.Node; +import resonantinduction.electrical.itemrailing.interfaces.IItemRailing; /** * @since 18/03/14 * @author tgame14 */ -public class NodeRailing extends Node +public class NodeRailing extends Node { public NodeRailing (PartRailing parent) { diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java index 513ee572..4bf97fa5 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java @@ -25,7 +25,7 @@ import java.lang.reflect.InvocationTargetException; * @since 16/03/14 * @author tgame14 */ -public class PartRailing extends PartFramedConnection implements IConductor, TSlottedPart, JNormalOcclusion, IHollowConnect, IItemRailing, INodeProvider +public class PartRailing extends PartFramedConnection implements IConductor, TSlottedPart, JNormalOcclusion, IHollowConnect, IItemRailing { public enum EnumRailing diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java index 5a8612e6..6a996966 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java @@ -1,5 +1,6 @@ package resonantinduction.electrical.itemrailing.interfaces; +import calclavia.lib.grid.INodeProvider; import calclavia.lib.render.EnumColor; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; @@ -10,7 +11,7 @@ import net.minecraftforge.common.ForgeDirection; * @since 16/03/14 * @author tgame14 */ -public interface IItemRailing +public interface IItemRailing extends INodeProvider { public boolean canItemEnter (IItemRailingTransfer item); diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingTransfer.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingTransfer.java index f3089a1c..4468e75a 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingTransfer.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingTransfer.java @@ -5,7 +5,7 @@ import resonantinduction.electrical.itemrailing.PartRailing; import calclavia.lib.render.EnumColor; /** - * the object that handles the items that flow through Railings + * the object that functions as a Wrapper for items and handles the items that flow through Railings * * @since 16/03/14 * @author tgame14 @@ -18,9 +18,9 @@ public interface IItemRailingTransfer public IItemRailingTransfer setColor(EnumColor color); - public PartRailing getRailing(); + public IItemRailing getRailing(); - public IItemRailingTransfer setRailing(PartRailing railing); + public IItemRailingTransfer setRailing(IItemRailing railing); public IItemRailing getEndGoal();