From 0e079b579e83d8fad4560c582b8d0c9328e009da Mon Sep 17 00:00:00 2001 From: Robert S Date: Sat, 29 Mar 2014 12:05:58 -0400 Subject: [PATCH] Created a network for belts --- .../mechanical/belt/BeltNetwork.java | 14 ++++++++++++++ .../mechanical/belt/BeltNode.java | 11 ++++++++--- .../mechanical/belt/TileConveyorBelt.java | 4 ++-- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 mechanical/src/main/scala/resonantinduction/mechanical/belt/BeltNetwork.java diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/belt/BeltNetwork.java b/mechanical/src/main/scala/resonantinduction/mechanical/belt/BeltNetwork.java new file mode 100644 index 000000000..93c02db48 --- /dev/null +++ b/mechanical/src/main/scala/resonantinduction/mechanical/belt/BeltNetwork.java @@ -0,0 +1,14 @@ +package resonantinduction.mechanical.belt; + +import calclavia.lib.grid.TickingGrid; + +/** @author Darkguardsman */ +public class BeltNetwork extends TickingGrid +{ + + public BeltNetwork(BeltNode node) + { + super(node, BeltNode.class); + } + +} diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/belt/BeltNode.java b/mechanical/src/main/scala/resonantinduction/mechanical/belt/BeltNode.java index a116bcb0f..ce944cacc 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/belt/BeltNode.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/belt/BeltNode.java @@ -6,12 +6,11 @@ import resonantinduction.mechanical.belt.TileConveyorBelt.BeltType; import resonantinduction.mechanical.energy.grid.MechanicalNode; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorWorld; -import calclavia.lib.grid.INodeProvider; /** @author Darkguardsman */ public class BeltNode extends MechanicalNode { - public BeltNode(INodeProvider parent) + public BeltNode(TileConveyorBelt parent) { super(parent); } @@ -66,6 +65,12 @@ public class BeltNode extends MechanicalNode @Override public boolean canConnect(ForgeDirection from, Object source) { - return source instanceof TileConveyorBelt && (from == ((TileConveyorBelt) parent).getDirection() || from == ((TileConveyorBelt) parent).getDirection().getOpposite()); + return from != ((TileConveyorBelt) parent).getDirection() && from != ((TileConveyorBelt) parent).getDirection().getOpposite(); + } + + @Override + public BeltNetwork newGrid() + { + return new BeltNetwork(this); } } diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java b/mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java index 90a4d3856..1eb311043 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java @@ -80,8 +80,8 @@ public class TileConveyorBelt extends TileBase implements IBelt, IRotatable, INo it.remove(); } } - this.node.torque = 1; - this.node.angularVelocity = 1; + //this.node.torque = 1; + //this.node.angularVelocity = 1; /* DO ANIMATION AND EFFECTS */ if (this.worldObj.isRemote && (node.angularVelocity != 0))