Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed mech node to do a connection rebuild every 5 secs for testing

Browse source
This commit is contained in:
Robert S 2014-06-06 07:15:26 -04:00
parent e86b2daa6d
commit 7f075a0c03
1 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import resonant.api.grid.INode;
import resonant.api.grid.INodeProvider; import resonant.api.grid.INodeProvider;
import resonant.lib.utility.nbt.ISaveObj; import resonant.lib.utility.nbt.ISaveObj;
import resonantinduction.core.interfaces.IMechanicalNode; import resonantinduction.core.interfaces.IMechanicalNode;
@ -36,6 +37,7 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
private double power = 0; private double power = 0;
private INodeProvider parent; private INodeProvider parent;
private long ticks = 0;
private final AbstractMap<MechanicalNode, ForgeDirection> connections = new WeakHashMap<MechanicalNode, ForgeDirection>(); private final AbstractMap<MechanicalNode, ForgeDirection> connections = new WeakHashMap<MechanicalNode, ForgeDirection>();
@ -77,10 +79,23 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
@Override @Override
public void update(float deltaTime) public void update(float deltaTime)
{ {
ticks++;
if (ticks >= Long.MAX_VALUE)
{
ticks = 1;
}
//temp, TODO find a better way to trigger this
if (ticks % 100 == 0)
{
this.recache();
}
//-----------------------------------
// Render Update
//-----------------------------------
debug("Node->Update"); debug("Node->Update");
prevAngularVelocity = angularVelocity; prevAngularVelocity = angularVelocity;
debug("\tNode :" + toString()); debug("\tNode :" + toString());
//Update
if (angularVelocity >= 0) if (angularVelocity >= 0)
{ {
renderAngle += Math.min(angularVelocity, this.maxDeltaAngle) * deltaTime; renderAngle += Math.min(angularVelocity, this.maxDeltaAngle) * deltaTime;
@ -97,11 +112,16 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
renderAngle = renderAngle % (Math.PI * 2); renderAngle = renderAngle % (Math.PI * 2);
} }
//-----------------------------------
// Server side Update
//-----------------------------------
if (world() != null && !world().isRemote) if (world() != null && !world().isRemote)
{ {
final double acceleration = this.acceleration * deltaTime; final double acceleration = this.acceleration * deltaTime;
/** Energy loss */ //-----------------------------------
// Loss calculations
//-----------------------------------
double torqueLoss = Math.min(Math.abs(getTorque()), (Math.abs(getTorque() * getTorqueLoad()) + getTorqueLoad() / 10) * deltaTime); double torqueLoss = Math.min(Math.abs(getTorque()), (Math.abs(getTorque() * getTorqueLoad()) + getTorqueLoad() / 10) * deltaTime);
if (torque > 0) if (torque > 0)
@ -131,6 +151,9 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
power = getEnergy() / deltaTime; power = getEnergy() / deltaTime;
//-----------------------------------
// Connection application of force and speed
//-----------------------------------
debug("Node->Connections"); debug("Node->Connections");
synchronized (getConnections()) synchronized (getConnections())
{ {
@ -308,11 +331,15 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj
if (tile instanceof INodeProvider) if (tile instanceof INodeProvider)
{ {
MechanicalNode check = (MechanicalNode) ((INodeProvider) tile).getNode(MechanicalNode.class, dir.getOpposite()); INode node = ((INodeProvider) tile).getNode(MechanicalNode.class, dir.getOpposite());
if (node instanceof MechanicalNode)
if (check != null && canConnect(dir, check) && check.canConnect(dir.getOpposite(), this))
{ {
getConnections().put(check, dir); MechanicalNode check = (MechanicalNode) node;
if (check != null && canConnect(dir, check) && check.canConnect(dir.getOpposite(), this))
{
getConnections().put(check, dir);
}
} }
} }
} }