From d76f41a148397b10b2e1f129b7fa7a12311555bb Mon Sep 17 00:00:00 2001 From: Robert S Date: Sun, 8 Jun 2014 09:11:44 -0400 Subject: [PATCH] Simplified Turbine connection logic --- .../mechanical/energy/turbine/TurbineNode.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineNode.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineNode.java index fe2bcc67..09ed9463 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineNode.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineNode.java @@ -1,8 +1,6 @@ package resonantinduction.mechanical.energy.turbine; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import resonant.api.grid.INodeProvider; import resonantinduction.core.interfaces.IMechanicalNode; import resonantinduction.mechanical.energy.grid.MechanicalNode; @@ -24,19 +22,7 @@ public class TurbineNode extends MechanicalNode @Override public boolean canConnect(ForgeDirection from, Object source) { - if (source instanceof MechanicalNode && !(source instanceof TileTurbine)) - { - /** Face to face stick connection. */ - TileEntity sourceTile = position().translate(from).getTileEntity(turbine().getWorld()); - - if (sourceTile instanceof INodeProvider) - { - MechanicalNode sourceInstance = (MechanicalNode) ((INodeProvider) sourceTile).getNode(MechanicalNode.class, from.getOpposite()); - return sourceInstance == source && from == turbine().getDirection().getOpposite(); - } - } - - return false; + return source instanceof MechanicalNode && !(source instanceof TurbineNode) && from == turbine().getDirection().getOpposite(); } @Override