MJ 6 + MJ 5 Integration.

2014-05-11 16:13:37 -05:00
parent ce561ffbe3
commit be645f3e2f
7 changed files with 289 additions and 23 deletions
@@ -9,9 +9,16 @@ import buildcraft.api.mj.IBatteryProvider;

@InterfaceList(value = { @Interface(iname = "MJ6", iface = "buildcraft.api.mj.IBatteryProvider"),
 		@Interface(iname = "MJ6", iface = "buildcraft.api.mj.IBatteryObject") })
-public abstract class MinecraftJoules6 extends AERootPoweredTile implements IBatteryProvider, IBatteryObject
+public abstract class MinecraftJoules6 extends MinecraftJoules5 implements IBatteryProvider, IBatteryObject
 {

+	@Override
+	@Method(iname = "MJ6")
+	public String kind()
+	{
+		return null;
+	}
+
 	@Override
 	@Method(iname = "MJ6")
 	public double getEnergyRequested()
@@ -23,7 +30,7 @@ public abstract class MinecraftJoules6 extends AERootPoweredTile implements IBat
 	@Method(iname = "MJ6")
 	public double addEnergy(double amount)
 	{
-		double overflow = PowerUnits.MJ.convertTo( PowerUnits.AE, injectExternalPower( PowerUnits.MJ, amount ) );
+		double overflow = injectExternalPower( PowerUnits.MJ, amount );
 		return amount - overflow;
 	}

@@ -31,7 +38,7 @@ public abstract class MinecraftJoules6 extends AERootPoweredTile implements IBat
 	@Method(iname = "MJ6")
 	public double addEnergy(double amount, boolean ignoreCycleLimit)
 	{
-		double overflow = PowerUnits.MJ.convertTo( PowerUnits.AE, injectExternalPower( PowerUnits.MJ, amount ) );
+		double overflow = injectExternalPower( PowerUnits.MJ, amount );
 		return amount - overflow;
 	}

@@ -74,12 +81,12 @@ public abstract class MinecraftJoules6 extends AERootPoweredTile implements IBat
 	@Method(iname = "MJ6")
 	public IBatteryObject reconfigure(double maxCapacity, double maxReceivedPerCycle, double minimumConsumption)
 	{
-		return getMjBattery();
+		return getMjBattery( "" );
 	}

 	@Override
 	@Method(iname = "MJ6")
-	public IBatteryObject getMjBattery()
+	public IBatteryObject getMjBattery(String kind)
 	{
 		return this;
 	}