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

Removed debug as gears mostly work now, only need to fix client sync issue

Browse source
This commit is contained in:
Robert S 2014-06-07 04:31:46 -04:00
parent 940681ed82
commit 92b047741e
3 changed files with 5 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java
View file

@ -83,22 +83,6 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
return 0.5;
}
public void debug(String txt)
{
debug(txt, UPDATE_DEBUG);
}
public void debug(String txt, int cue)
{
debug(txt, cue, false);
}
public void debug(String txt, int cue, boolean nextLine)
{
if (doDebug && world() != null && !world().isRemote && cue == debugCue)
System.out.println((nextLine ? "\n" : "") + "[MechMode]" + txt);
}
@Override
public void update(float deltaTime)
{
@ -115,9 +99,7 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
//-----------------------------------
// Render Update
//-----------------------------------
debug("Node->Update");
prevAngularVelocity = angularVelocity;
debug("\tNode :" + toString());
if (angularVelocity >= 0)
{
@ -127,7 +109,6 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
{
renderAngle += Math.max(angularVelocity, -this.maxDeltaAngle) * deltaTime;
}
debug("\tAngle: " + renderAngle + " Vel: " + angularVelocity);
if (renderAngle % (Math.PI * 2) != renderAngle)
{
@ -177,7 +158,6 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
//-----------------------------------
// Connection application of force and speed
//-----------------------------------
debug("Node->Connections");
synchronized (getConnections())
{
Iterator<Entry<MechanicalNode, ForgeDirection>> it = getConnections().entrySet().iterator();
@ -188,7 +168,6 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
ForgeDirection dir = entry.getValue();
MechanicalNode adjacentMech = entry.getKey();
debug("\tConnection: " + adjacentMech + " Side: " + dir);
/** Calculate angular velocity and torque. */
float ratio = adjacentMech.getRatio(dir.getOpposite(), this) / getRatio(dir, adjacentMech);
boolean inverseRotation = inverseRotation(dir, adjacentMech) && adjacentMech.inverseRotation(dir.getOpposite(), this);
@ -295,14 +274,11 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
/** Checks to see if a connection is allowed from side and from a source */
public boolean canConnect(ForgeDirection from, Object source)
{
debug("Node -> Canconnect", CONNECTION_DEBUG);
if (source instanceof MechanicalNode)
{
boolean flag = (connectionMap & (1 << from.ordinal())) != 0;
debug("\t" + flag, CONNECTION_DEBUG);
return flag;
}
debug("\tFalse", CONNECTION_DEBUG);
return false;
}
@ -335,15 +311,12 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
@Override
public void reconstruct()
{
debug("reconstruct", CONNECTION_DEBUG);
debug("reconstruct");
recache();
}
@Override
public void deconstruct()
{
debug("deconstruct");
for (Entry<MechanicalNode, ForgeDirection> entry : getConnections().entrySet())
{
entry.getKey().recache();
@ -354,26 +327,21 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
@Override
public void recache()
{
debug("Node->Recahce", CONNECTION_DEBUG);
getConnections().clear();
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
debug("\tDir: " + dir, CONNECTION_DEBUG);
TileEntity tile = position().translate(dir).getTileEntity(world());
debug("\tTile: " + tile, CONNECTION_DEBUG);
if (tile instanceof INodeProvider)
{
debug("\tTile instanceof INodeProvider", CONNECTION_DEBUG);
INode node = ((INodeProvider) tile).getNode(MechanicalNode.class, dir.getOpposite());
if (node instanceof MechanicalNode)
{
debug("\tNode instanceof MechanicalNode", CONNECTION_DEBUG);
MechanicalNode check = (MechanicalNode) node;
if (check != null && canConnect(dir, check) && check.canConnect(dir.getOpposite(), this))
boolean canConnect = canConnect(dir, check);
boolean canOtherConnect = check.canConnect(dir.getOpposite(), this);
if (canConnect && canOtherConnect)
{
debug("\tCanConnect and added to connections", CONNECTION_DEBUG);
getConnections().put(check, dir);
}
}

6
mechanical/src/main/scala/resonantinduction/mechanical/gear/GearNode.java
View file

@ -81,7 +81,6 @@ public class GearNode extends MechanicalNode
@Override
public void recache()
{
debug("doRecache: " + this);
getConnections().clear();
/** Only call refresh if this is the main block of a multiblock gear or a single gear block. */
@ -162,25 +161,20 @@ public class GearNode extends MechanicalNode
@Override
public boolean canConnect(ForgeDirection from, Object with)
{
debug("Node -> CanConnect");
if (!gear().getMultiBlock().isPrimary())
{
debug("\tFailed: Gear is multiblock and not primary");
return false;
}
if (with instanceof MechanicalNode)
{
debug("\tWith is a mechnical node");
INodeProvider parent = ((MechanicalNode) with).getParent();
/** Check for flat connections (gear face on gear face) */
if (from == gear().placementSide.getOpposite())
{
debug("\tChecking back connection");
if (parent instanceof PartGear)
{
debug("\tconnection is a gear");
if (((PartGear) parent).tile() == gear().tile() && !gear().getMultiBlock().isConstructed())
{
return true;

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

@ -59,7 +59,7 @@ public class PartGear extends PartMechanical implements IMultiBlockStructure<Par
public PartGear()
{
super();
node = new MechanicalNode(this);
node = new GearNode(this);
}
@ -73,7 +73,7 @@ public class PartGear extends PartMechanical implements IMultiBlockStructure<Par
if (manualCrankTime > 0)
{
node.apply(this, isClockwiseCrank ? 15 : -15, isClockwiseCrank ? 0.025f : -0.025f);
//manualCrankTime--;
manualCrankTime--;
}
}
getMultiBlock().update();