Merge branch 'Prototik-mjapi' into 6.0.x

api/buildcraft/api/mj/MjAPI.java

@@ -14,57 +14,72 @@ import java.util.HashMap;
 import java.util.Map;
 
 import buildcraft.api.core.JavaTools;
-import buildcraft.api.power.PowerHandler;
 
 public final class MjAPI {
-
+	private static Map<Class, BatteryField> MjBatteries = new HashMap<Class, BatteryField>();
-	static Map<Class, BatteryField> MjBatteries = new HashMap<Class, BatteryField>();
 
 	private enum BatteryKind {
 		Value, Container
 	}
 
 	private static class BatteryField {
-		public Field field;
+		Field field;
-		public MjBattery battery;
+		MjBattery battery;
-		public BatteryKind kind;
+		BatteryKind kind;
+	}
+
+	public interface IBatteryProvider {
+		BatteryObject getMjBattery();
 	}
 
 	public static class BatteryObject {
-		Field f;
+		private Field f;
-		Object o;
+		private Object o;
-		MjBattery b;
+		private MjBattery b;
 
+		/**
+		 * @return Current energy requirement for keeping machine state
+		 */
 		public double getEnergyRequested() {
 			try {
 				double contained = f.getDouble(o);
-
-				double left = contained + b.maxReceivedPerCycle() > b
-						.maxCapacity() ? b.maxCapacity() - contained : b
-						.maxReceivedPerCycle();
-
-				if (left > 0) {
-					return left;
-				} else {
-					return b.minimumConsumption();
-				}
-			} catch (IllegalAccessException e) {
-				e.printStackTrace();
-			}
-
-			return 0;
-		}
-
-		public double addEnergy(double watts) {
-			try {
-				double e = f.getDouble(o);
 				double max = b.maxCapacity();
+				return Math.max(Math.min(max - contained, b.maxReceivedPerCycle()), b.minimumConsumption());
+			} catch (IllegalAccessException e) {
+				e.printStackTrace();
+			}
+			return 0;
+		}
 
-				double used = e + watts <= max ? watts : max - e;
+		/**
-
+		 * Add energy to this battery
-				f.setDouble(o, e + used);
+		 *
+		 * @param mj Energy amount
+		 * @return Used energy
+		 */
+		public double addEnergy(double mj) {
+			return addEnergy(mj, false);
+		}
 
+		/**
+		 * Add energy to this battery
+		 *
+		 * @param mj               Energy amount
+		 * @param ignoreCycleLimit Force add all energy even if "maxReceivedPerCycle" limit is reached
+		 * @return Used energy
+		 */
+		public double addEnergy(double mj, boolean ignoreCycleLimit) {
+			try {
+				double contained = f.getDouble(o);
+				double maxAccepted = b.maxCapacity() - contained + b.minimumConsumption();
+				if (!ignoreCycleLimit && maxAccepted > b.maxReceivedPerCycle()) {
+					maxAccepted = b.maxReceivedPerCycle();
+				}
+				double used = Math.min(maxAccepted, mj);
+				if (used > 0) {
+					f.setDouble(o, Math.min(contained + used, b.maxCapacity()));
 					return used;
+				}
 			} catch (IllegalAccessException e) {
 				e.printStackTrace();
 			}
@@ -72,6 +87,9 @@ public final class MjAPI {
 			return 0;
 		}
 
+		/**
+		 * @return Current stored energy amount in this battery
+		 */
 		public double getEnergyStored() {
 			try {
 				return f.getDouble(o);
@@ -81,26 +99,56 @@ public final class MjAPI {
 			}
 		}
 
-		public void setEnergyStored(double watts) {
+		/**
+		 * Set current stored energy amount.
+		 * Doesn't use it for your machines! Decrease your battery field directly.
+		 *
+		 * @param mj New energy amount
+		 */
+		public void setEnergyStored(double mj) {
 			try {
-				f.setDouble(o, watts);
+				f.setDouble(o, mj);
 			} catch (IllegalAccessException e) {
 				throw new RuntimeException(e);
 			}
 		}
 
+		/**
+		 * Can be overrided via {@link #reconfigure(double, double, double)}
+		 *
+		 * @return Maximal energy amount for this battery.
+		 */
 		public double maxCapacity() {
 			return b.maxCapacity();
 		}
 
+		/**
+		 * Can be overrided via {@link #reconfigure(double, double, double)}
+		 *
+		 * @return Minimal energy amount for keep your machine in active state
+		 */
 		public double minimumConsumption() {
 			return b.minimumConsumption();
 		}
 
+		/**
+		 * Can be overrided via {@link #reconfigure(double, double, double)}
+		 *
+		 * @return Maximal energy received per one tick
+		 */
 		public double maxReceivedPerCycle() {
 			return b.maxReceivedPerCycle();
 		}
 
+		/**
+		 * Allow to dynamically reconfigure your battery.
+		 * Usually it's not very good change battery parameters for already present machines, but if you want...
+		 *
+		 * @param maxCapacity         {@link #maxCapacity()}
+		 * @param maxReceivedPerCycle {@link #maxReceivedPerCycle()}
+		 * @param minimumConsumption  {@link #minimumConsumption()}
+		 * @return Current battery object instance
+		 */
 		public BatteryObject reconfigure(final double maxCapacity, final double maxReceivedPerCycle, final double minimumConsumption) {
 			b = new MjBattery() {
 				@Override
@@ -138,11 +186,14 @@ public final class MjAPI {
 			return null;
 		}
 
-		if (o.getClass() == PowerHandler.class) {
+		if (o instanceof IBatteryProvider) {
-			return ((PowerHandler) o).getMjBattery();
+			BatteryObject battery = ((IBatteryProvider) o).getMjBattery();
+			if (battery != null) {
+				return battery;
+			}
 		}
 
-		BatteryField f = getMjBattery(o.getClass());
+		BatteryField f = getMjBatteryField(o.getClass());
 
 		if (f == null) {
 			return null;
@@ -151,7 +202,6 @@ public final class MjAPI {
 			obj.o = o;
 			obj.f = f.field;
 			obj.b = f.battery;
-
 			return obj;
 		} else {
 			try {
@@ -163,14 +213,15 @@ public final class MjAPI {
 		}
 	}
 
-	private static BatteryField getMjBattery(Class c) {
+	private static BatteryField getMjBatteryField(Class c) {
-		if (!MjBatteries.containsKey(c)) {
+		BatteryField bField = MjBatteries.get(c);
+		if (bField == null) {
 			for (Field f : JavaTools.getAllFields(c)) {
 				MjBattery battery = f.getAnnotation(MjBattery.class);
 
 				if (battery != null) {
 					f.setAccessible(true);
-					BatteryField bField = new BatteryField();
+					bField = new BatteryField();
 					bField.field = f;
 					bField.battery = battery;
 
@@ -188,13 +239,9 @@ public final class MjAPI {
 					return bField;
 				}
 			}
-
 			MjBatteries.put(c, null);
-
-			return null;
-		} else {
-			return MjBatteries.get(c);
 		}
+		return bField;
 	}
 
 }

api/buildcraft/api/mj/MjBattery.java

@@ -17,12 +17,12 @@ import java.lang.annotation.Target;
 /**
  * This annotation is used for tiles that need to interface with BuildCraft
  * energy framework, a.k.a MinecraftJoule or MJ. In order to receive power,
- * tiles, need to declare a *public* double field, with the annotation
+ * tiles, need to declare a double field, with the annotation
  * MjBattery. BuildCraft machines able to provide power will then connect to
- * these tiles, and feed energy up to max capacity. It's the responsibilty
+ * these tiles, and feed energy up to max capacity. It's the responsibility
  * of the implementer to manually decrease the value of the energy, as he
  * simulates energy consumption. On each cycle, per power input, machines can
- * receive up to "maxReceivedPerCyle" units of energy. As an optional behavior,
+ * receive up to "maxReceivedPerCycle" units of energy. As an optional behavior,
  * the system can have a minimum amount of energy consumed even if the system
  * is at max capacity, modelized by the "minimumConsumption" value.
  *
@@ -34,11 +34,18 @@ import java.lang.annotation.Target;
 @Target(ElementType.FIELD)
 @Inherited
 public @interface MjBattery {
-
+	/**
+	 * @return Max energy capacity of battery
+	 */
 	double maxCapacity() default 100.0;
 
+	/**
+	 * @return Max energy received per one tick
+	 */
 	double maxReceivedPerCycle() default 10.0;
 
+	/**
+	 * @return Minimal energy for keep machine is active
+	 */
 	double minimumConsumption() default 0.1;
-
 }

api/buildcraft/api/power/PowerHandler.java

@@ -32,7 +32,7 @@ import buildcraft.api.mj.MjBattery;
  * @see IPowerReceptor
  * @see IPowerEmitter
  */
-public final class PowerHandler {
+public final class PowerHandler implements MjAPI.IBatteryProvider {
 
 	public static enum Type {
 
@@ -181,6 +181,7 @@ public final class PowerHandler {
 		return battery.getEnergyStored();
 	}
 
+	@Override
 	public MjAPI.BatteryObject getMjBattery() {
 		return battery;
 	}