tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed #462, 463 - Shaft connection logic

Browse source
This commit is contained in:
Calclavia 2014-03-27 21:17:14 +08:00
parent a847a221b4
commit afc996fae5
2 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGear.java
View file

@ -192,7 +192,7 @@ public class PartGear extends PartMechanical implements IMultiBlockStructure<Par
* Can this gear be connected BY the source? * Can this gear be connected BY the source?
* *
* @param from - Direction source is coming from. * @param from - Direction source is coming from.
* @param source - The source of the connection. * @param with - The source of the connection.
* @return True is so. * @return True is so.
*/ */
@Override @Override

50
mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java
View file

@ -1,15 +1,5 @@
package resonantinduction.mechanical.energy.gear; package resonantinduction.mechanical.energy.gear;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.mechanical.Mechanical;
import resonantinduction.mechanical.energy.grid.MechanicalNode;
import resonantinduction.mechanical.energy.grid.PartMechanical;
import calclavia.api.resonantinduction.IMechanicalNode; import calclavia.api.resonantinduction.IMechanicalNode;
import calclavia.lib.grid.INodeProvider; import calclavia.lib.grid.INodeProvider;
import codechicken.lib.raytracer.IndexedCuboid6; import codechicken.lib.raytracer.IndexedCuboid6;
@ -18,12 +8,21 @@ import codechicken.lib.vec.Vector3;
import codechicken.multipart.PartMap; import codechicken.multipart.PartMap;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.mechanical.Mechanical;
import resonantinduction.mechanical.energy.grid.MechanicalNode;
import resonantinduction.mechanical.energy.grid.PartMechanical;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
/** /**
* We assume all the force acting on the gear is 90 degrees. * We assume all the force acting on the gear is 90 degrees.
* *
* @author Calclavia * @author Calclavia
*
*/ */
public class PartGearShaft extends PartMechanical public class PartGearShaft extends PartMechanical
{ {
@ -40,15 +39,6 @@ public class PartGearShaft extends PartMechanical
sides[6] = new IndexedCuboid6(6, new Cuboid6(0.36, 0.36, 0.36, 0.64, 0.64, 0.64)); sides[6] = new IndexedCuboid6(6, new Cuboid6(0.36, 0.36, 0.36, 0.64, 0.64, 0.64));
} }
@Override
public void preparePlacement(int side, int itemDamage)
{
ForgeDirection dir = ForgeDirection.getOrientation((byte) (side ^ 1));
// Unwind rotation. We can only have "3" axis.
this.placementSide = ForgeDirection.getOrientation(!(dir.ordinal() % 2 == 0) ? dir.ordinal() - 1 : dir.ordinal());
tier = itemDamage;
}
public PartGearShaft() public PartGearShaft()
{ {
super(); super();
@ -132,13 +122,18 @@ public class PartGearShaft extends PartMechanical
@Override @Override
public boolean canConnect(ForgeDirection from, Object source) public boolean canConnect(ForgeDirection from, Object source)
{ {
if (source instanceof PartGear) if (source instanceof MechanicalNode)
{ {
PartGear gear = (PartGear) source; if (((MechanicalNode) source).parent instanceof PartGear)
{
PartGear gear = (PartGear) ((MechanicalNode) source).parent;
if (!(Math.abs(gear.placementSide.offsetX) == Math.abs(placementSide.offsetX) && Math.abs(gear.placementSide.offsetY) == Math.abs(placementSide.offsetY) && Math.abs(gear.placementSide.offsetZ) == Math.abs(placementSide.offsetZ))) if (!(Math.abs(gear.placementSide.offsetX) == Math.abs(placementSide.offsetX) && Math.abs(gear.placementSide.offsetY) == Math.abs(placementSide.offsetY) && Math.abs(gear.placementSide.offsetZ) == Math.abs(placementSide.offsetZ)))
{
return false; return false;
} }
}
}
return from == placementSide || from == placementSide.getOpposite(); return from == placementSide || from == placementSide.getOpposite();
} }
@ -156,6 +151,15 @@ public class PartGearShaft extends PartMechanical
}; };
} }
@Override
public void preparePlacement(int side, int itemDamage)
{
ForgeDirection dir = ForgeDirection.getOrientation((byte) (side ^ 1));
// Unwind rotation. We can only have "3" axis.
this.placementSide = ForgeDirection.getOrientation(!(dir.ordinal() % 2 == 0) ? dir.ordinal() - 1 : dir.ordinal());
tier = itemDamage;
}
@Override @Override
protected ItemStack getItem() protected ItemStack getItem()
{ {
@ -213,9 +217,11 @@ public class PartGearShaft extends PartMechanical
for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{ {
if (side == placementSide || side == placementSide.getOpposite()) if (side == placementSide || side == placementSide.getOpposite())
{
subParts.add(currentSides[side.ordinal()]); subParts.add(currentSides[side.ordinal()]);
} }
} }
}
subParts.add(currentSides[6]); subParts.add(currentSides[6]);
return subParts; return subParts;