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

Fixed #206 - Gear connection on edge

Browse source
This commit is contained in:
Calclavia 2014-02-06 12:52:39 +08:00
parent 2845be6bdf
commit 2e9873d940
2 changed files with 35 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/main/java/resonantinduction/mechanical/gear/PartGear.java
View file

@ -125,7 +125,7 @@ public class PartGear extends PartMechanical implements IMechanical, IMultiBlock
{
if (!world().isRemote)
{
getMultiBlock().get().angularVelocity = -angularVelocity;
getMultiBlock().get().angularVelocity = -getMultiBlock().get().angularVelocity;
player.addChatMessage("Flipped gear to rotate " + (angularVelocity > 0 ? "clockwise" : "anticlockwise") + ".");
}
}
@ -143,7 +143,7 @@ public class PartGear extends PartMechanical implements IMechanical, IMultiBlock
{
if (!world().isRemote)
{
getMultiBlock().get().angularVelocity = -angularVelocity;
getMultiBlock().get().angularVelocity = -getMultiBlock().get().angularVelocity;
player.addChatMessage("Flipped gear to rotate " + (angularVelocity > 0 ? "clockwise" : "anticlockwise") + ".");
}
}
@ -189,28 +189,38 @@ public class PartGear extends PartMechanical implements IMechanical, IMultiBlock
}
// TODO: Make bending with large gears work.
if (!getMultiBlock().isConstructed())
/**
* Look for gears that are internal and adjacent to this gear. (The 4 sides + the internal
* center)
*/
for (int i = 0; i < 6; i++)
{
/** Look for gears that are internal and adjacent to this gear. (The 4 sides) */
for (int i = 0; i < 6; i++)
{
ForgeDirection checkDir = ForgeDirection.getOrientation(i);
ForgeDirection checkDir = ForgeDirection.getOrientation(i);
TileEntity tile = tile();
if (getMultiBlock().isConstructed() && checkDir != placementSide && checkDir != placementSide.getOpposite())
{
tile = new universalelectricity.api.vector.Vector3(tile()).translate(checkDir).getTileEntity(world());
System.out.println("MOIFIED" + checkDir);
}
if (tile instanceof IMechanical)
{
/**
* If we're checking for the block that is opposite to the gear's placement side
* (the center), then we try to look for a gear shaft in the center.
*/
IMechanical instance = ((IMechanical) tile()).getInstance(checkDir == placementSide.getOpposite() ? ForgeDirection.UNKNOWN : checkDir);
IMechanical instance = ((IMechanical) tile).getInstance(checkDir == placementSide.getOpposite() ? ForgeDirection.UNKNOWN : checkDir);
if (connections[checkDir.ordinal()] == null && instance != this && checkDir != placementSide && instance != null && instance.canConnect(checkDir.getOpposite(), this))
{
System.out.println("F" + instance);
connections[checkDir.ordinal()] = instance;
getNetwork().merge(instance.getNetwork());
}
}
}
int displaceCheck = 1;
@ -425,8 +435,14 @@ public class PartGear extends PartMechanical implements IMechanical, IMultiBlock
{
return true;
}
else if (((PartGear) source).tile() == tile() && !getMultiBlock().isConstructed())
else if (source instanceof PartGear)
{
if (((PartGear) source).tile() == tile() && !getMultiBlock().isConstructed())
{
return true;
}
// For large gear to small gear on edge connection.
return true;
}
}

12
src/main/java/resonantinduction/mechanical/network/PartMechanical.java
View file

@ -58,11 +58,13 @@ public abstract class PartMechanical extends JCuboidPart implements JNormalOcclu
{
if (!world().isRemote)
{
System.out.println(this + ":" + getNetwork());
/*
* for (Object obj : connections)
* System.out.println(obj);
*/
int i = 0;
for (Object obj : connections)
if (obj != null)
i++;
System.out.println("Connected with: " + i + ":" + getNetwork());
}
return false;