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

Fixed battery not resetting their transfer rates

Browse source
This commit is contained in:
Calclavia 2014-02-06 13:17:21 +08:00
parent e1b0163159
commit b40e54afc8
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/resonantinduction/electrical/battery/TileBattery.java
View file

@ -78,7 +78,6 @@ public class TileBattery extends TileElectrical implements IConnector<BatteryNet
}
}
energy.setMaxTransfer((long) Math.min(Math.pow(1000, this.getNetwork().getConnectors().size()), energy.getEnergyCapacity()));
markDistributionUpdate = true;
markClientUpdate = true;
}
@ -91,11 +90,13 @@ public class TileBattery extends TileElectrical implements IConnector<BatteryNet
if (!this.worldObj.isRemote)
{
energy.setMaxTransfer((long) Math.min(Math.pow(1000, this.getNetwork().getConnectors().size()), energy.getEnergyCapacity()));
long produce = this.produce();
if ((markDistributionUpdate || produce > 0) && ticks % 5 == 0)
{
this.getNetwork().redistribute();
getNetwork().redistribute();
markDistributionUpdate = false;
}

2
src/main/java/resonantinduction/electrical/generator/TileGenerator.java
View file

@ -23,7 +23,7 @@ public class TileGenerator extends TileElectrical implements IRotatable
/** Generator turns KE -> EE. Inverted one will turn EE -> KE. */
public boolean isInversed = true;
private int torqueRatio = 8000;
private int torqueRatio = 5000;
public TileGenerator()
{

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

@ -64,13 +64,13 @@ public class PartGear extends PartMechanical implements IMechanical, IMultiBlock
{
if (angularVelocity > 0)
{
torque += 1;
angularVelocity += 0.01f;
torque += 3;
angularVelocity += 0.02f;
}
else
{
torque -= 1;
angularVelocity -= 0.01f;
torque -= 3;
angularVelocity -= 0.02f;
}
manualCrankTime--;
@ -202,7 +202,6 @@ public class PartGear extends PartMechanical implements IMechanical, IMultiBlock
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)
@ -215,8 +214,6 @@ public class PartGear extends PartMechanical implements IMechanical, IMultiBlock
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());
}