Merge pull request #1456 from FlansModReloaded/balance-fuel-consumption-upstream

Balance fuel consumption

Author: ChrisLane

src/main/java/com/flansmod/common/driveables/EntityPlane.java

@@ -466,8 +466,6 @@ world.isRemote && getSeat(0) != null && getSeat(0).getControllingPassenger() ins
 		int numPropsWorking = 0;
 		int numProps = 0;
 
-		float fuelConsumptionMultiplier = 2F;
-		
 		switch(mode)
 		{
 			case HELI:
@@ -509,7 +507,7 @@ world.isRemote && getSeat(0) != null && getSeat(0).getControllingPassenger() ins
 				motionY *= drag;
 				motionZ *= drag;
 
-				data.fuelInTank -= upwardsForce * fuelConsumptionMultiplier * data.engine.fuelConsumption;
+				data.fuelInTank -= upwardsForce * data.engine.fuelConsumption * 2F;
 
 				break;
 
@@ -571,7 +569,7 @@ world.isRemote && getSeat(0) != null && getSeat(0).getControllingPassenger() ins
 				motionY *= drag;
 				motionZ *= drag;
 
-				data.fuelInTank -= throttleScaled * fuelConsumptionMultiplier * data.engine.fuelConsumption;
+				data.fuelInTank -= Math.abs(throttle) * throttleScaled * data.engine.fuelConsumption * 10F;
 				break;
 			default:
 				break;

src/main/java/com/flansmod/common/driveables/EntityVehicle.java

@@ -390,7 +390,7 @@ world.isRemote && getSeat(0) != null && getSeat(0).getControllingPassenger() ins
 			{
 				if (!driverIsCreative())
 				{
-					data.fuelInTank -= data.engine.fuelConsumption * Math.abs(throttle);
+					data.fuelInTank -= data.engine.fuelConsumption * Math.abs(throttle) * 0.05F;
 				}
 
 				if(getVehicleType().tank)

src/main/java/com/flansmod/common/driveables/mechas/EntityMecha.java

@@ -639,7 +639,7 @@ else if(playerDriver == null)
 
 					//If we can't thrust creatively, we must thrust using fuel. Nom.
 					if(!isCreative)
-						data.fuelInTank -= data.engine.fuelConsumption;
+						data.fuelInTank -= data.engine.fuelConsumption * 0.5F;
 				}
 			}