From b40e54afc88f5865767e3ca2edfcbf49e98a5de3 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Thu, 6 Feb 2014 13:17:21 +0800
Subject: [PATCH] Fixed battery not resetting their transfer rates

---
 .../electrical/battery/TileBattery.java               |  5 +++--
 .../electrical/generator/TileGenerator.java           |  2 +-
 .../resonantinduction/mechanical/gear/PartGear.java   | 11 ++++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/java/resonantinduction/electrical/battery/TileBattery.java b/src/main/java/resonantinduction/electrical/battery/TileBattery.java
index ad8990c9..134fc259 100644
--- a/src/main/java/resonantinduction/electrical/battery/TileBattery.java
+++ b/src/main/java/resonantinduction/electrical/battery/TileBattery.java
@@ -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;
 			}
 
diff --git a/src/main/java/resonantinduction/electrical/generator/TileGenerator.java b/src/main/java/resonantinduction/electrical/generator/TileGenerator.java
index 907b1548..1bc3a29b 100644
--- a/src/main/java/resonantinduction/electrical/generator/TileGenerator.java
+++ b/src/main/java/resonantinduction/electrical/generator/TileGenerator.java
@@ -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()
 	{
diff --git a/src/main/java/resonantinduction/mechanical/gear/PartGear.java b/src/main/java/resonantinduction/mechanical/gear/PartGear.java
index d1dbe755..73fe1845 100644
--- a/src/main/java/resonantinduction/mechanical/gear/PartGear.java
+++ b/src/main/java/resonantinduction/mechanical/gear/PartGear.java
@@ -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());
 				}