+ Added Super Busses.

+ Added Breaker Boxes.
+ Added Super Jukebox. (framework)
+ Added King Bat. (framework)
+ Added Custom WAILA plugin. (framework)
+ Added lots of simple function calls to CI. (Recipe simplification)
% Rewrote the recipes for Wireless Chargers, they now require assembly.
% Cleaned up some old code.
$ Adjusted bug with pollution scrubbers using no durability and removing LOTS of pollution.
$ Greatly improved code base for pollution scrubbers.
$ Added pollution back to the Cyclotron.

2 files changed, 407 insertions, 48 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 12195c2dc0..e2cfb3516e 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -209,6 +209,7 @@ public class RECIPES_Machines {
 		initModItems();
 		controlCores();
 		energyCores();
+		wirelessChargers();
 	}
 
 	private static void initModItems(){
@@ -1281,53 +1282,6 @@ public class RECIPES_Machines {
 						o_Fermenter, o_Distillery, o_Extractor,
 						GregtechItemList.Industrial_MultiMachine.get(1));
 			}
-			
-			//Wireless Chargers
-			RecipeUtils.addShapedGregtechRecipe(
-					CI.emitter_LV, CI.circuitTier1, CI.emitter_LV,
-					CI.component_Plate[3], CI.machineHull_LV, CI.component_Plate[3],
-					CI.sensor_LV, CI.fieldGenerator_LV, CI.sensor_LV, 
-					GregtechItemList.Charger_LV.get(1));
-			RecipeUtils.addShapedGregtechRecipe(
-					CI.emitter_MV, CI.circuitTier2, CI.emitter_MV,
-					CI.component_Plate[4], CI.machineHull_MV, CI.component_Plate[4],
-					CI.sensor_MV, CI.fieldGenerator_MV, CI.sensor_MV, 
-					GregtechItemList.Charger_MV.get(1));
-			RecipeUtils.addShapedGregtechRecipe(
-					CI.emitter_HV, CI.circuitTier3, CI.emitter_HV,
-					CI.component_Plate[5], CI.machineHull_HV, CI.component_Plate[5],
-					CI.sensor_HV, CI.fieldGenerator_HV, CI.sensor_HV, 
-					GregtechItemList.Charger_HV.get(1));
-			RecipeUtils.addShapedGregtechRecipe(
-					CI.emitter_EV, CI.circuitTier4, CI.emitter_EV,
-					CI.component_Plate[6], CI.machineHull_EV, CI.component_Plate[6],
-					CI.sensor_EV, CI.fieldGenerator_EV, CI.sensor_EV, 
-					GregtechItemList.Charger_EV.get(1));
-			RecipeUtils.addShapedGregtechRecipe(
-					CI.emitter_IV, CI.circuitTier5, CI.emitter_IV,
-					CI.component_Plate[7], CI.machineHull_IV, CI.component_Plate[7],
-					CI.sensor_IV, CI.fieldGenerator_IV, CI.sensor_IV, 
-					GregtechItemList.Charger_IV.get(1));
-			RecipeUtils.addShapedGregtechRecipe(
-					CI.emitter_LuV, CI.circuitTier6, CI.emitter_LuV,
-					CI.component_Plate[8], CI.machineHull_LuV, CI.component_Plate[8],
-					CI.sensor_LuV, CI.fieldGenerator_LuV, CI.sensor_LuV, 
-					GregtechItemList.Charger_LuV.get(1));
-			RecipeUtils.addShapedGregtechRecipe(
-					CI.emitter_ZPM, CI.circuitTier7, CI.emitter_ZPM,
-					CI.component_Plate[9], CI.machineHull_ZPM, CI.component_Plate[9],
-					CI.sensor_ZPM, CI.fieldGenerator_ZPM, CI.sensor_ZPM, 
-					GregtechItemList.Charger_ZPM.get(1));
-			RecipeUtils.addShapedGregtechRecipe(
-					CI.emitter_UV, CI.circuitTier8, CI.emitter_UV,
-					CI.component_Plate[10], CI.machineHull_UV, CI.component_Plate[10],
-					CI.sensor_UV, CI.fieldGenerator_UV, CI.sensor_UV, 
-					GregtechItemList.Charger_UV.get(1));
-			RecipeUtils.addShapedGregtechRecipe(
-					CI.emitter_MAX, CI.circuitTier9, CI.emitter_MAX,
-					CI.component_Plate[11], CI.machineHull_MAX, CI.component_Plate[11],
-					CI.sensor_MAX, CI.fieldGenerator_MAX, CI.sensor_MAX, 
-					GregtechItemList.Charger_MAX.get(1));
 
 
 
@@ -1819,4 +1773,44 @@ public class RECIPES_Machines {
 
 		
 	}
+	
+	private static void wirelessChargers() {
+
+		ItemStack[] aChargers = new ItemStack[] {
+				null,
+				GregtechItemList.Charger_LV.get(1), 
+				GregtechItemList.Charger_MV.get(1),
+				GregtechItemList.Charger_HV.get(1), 
+				GregtechItemList.Charger_EV.get(1), 
+				GregtechItemList.Charger_IV.get(1), 
+				GregtechItemList.Charger_LuV.get(1), 
+				GregtechItemList.Charger_ZPM.get(1), 
+				GregtechItemList.Charger_UV.get(1),
+				GregtechItemList.Charger_MAX.get(1) 
+			};
+		
+		int aCostMultiplier = GTNH ? 2 : 1;	
+		
+		for (int i = 0; i < 10; i++) {			
+			if (i == 0) {
+				continue;
+			}			
+			int aTier = (i + 1);			
+			ItemStack[] aInputs = new ItemStack[] {
+					CI.getTieredMachineHull(i, 1 * aCostMultiplier),
+					CI.getEmitter(i, 2 * aCostMultiplier),
+					CI.getSensor(i, 2 * aCostMultiplier),
+					CI.getFieldGenerator(i, 1 * aCostMultiplier),
+					CI.getTieredComponent(OrePrefixes.plate, aTier, 4 * aCostMultiplier),
+					CI.getTieredComponent(OrePrefixes.circuit, aTier, 2 * aCostMultiplier),
+			};			
+			CORE.RA.addSixSlotAssemblingRecipe(				
+					aInputs,					
+					CI.getAlternativeTieredFluid(i, (144 * 2 * aTier)), //Input Fluid					
+					aChargers[i],					
+					45 * 10 * 1 * (aTier), 
+					MaterialUtils.getVoltageForTier(i));	
+			
+		}
+	}
 }
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 5f334cdc71..13a30a510c 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -606,10 +606,22 @@ public class CI {
 	
 	
 	public static FluidStack getTieredFluid(int aTier, int aAmount) {
+		return getTieredFluid(aTier, aAmount, 0);
+	}
+	
+	public static FluidStack getAlternativeTieredFluid(int aTier, int aAmount) {
+		return getTieredFluid(aTier, aAmount, 1);
+	}
+	
+	public static FluidStack getTertiaryTieredFluid(int aTier, int aAmount) {
+		return getTieredFluid(aTier, aAmount, 2);
+	}
+
+	public static FluidStack getTieredFluid(int aTier, int aAmount, int aType) {
 		ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1);
 		FluidStack a = GT_Utility.getFluidForFilledItem(aCell, true);
 		if (a == null) {
-			a = aMaster[0][aTier].getFluid(aAmount);
+			a = aMaster[aType][aTier].getFluid(aAmount);
 		}
 		a.amount = aAmount;
 		return a;
@@ -782,5 +794,358 @@ public class CI {
 
 		
 	}
+	
+	public static ItemStack getElectricMotor(int aTier, int aSize) {
+		ItemStack aType;
+		int aLazyTier = 0;
+		if (aTier == aLazyTier++) {
+			aType = CI.electricMotor_ULV;
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricMotor_LV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricMotor_MV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricMotor_HV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricMotor_EV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricMotor_IV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricMotor_LuV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricMotor_ZPM;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricMotor_UV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricMotor_MAX;			
+		}
+		else {
+			aType = CI.electricMotor_LV;			
+		}		
+		return ItemUtils.getSimpleStack(aType, aSize);
+	}
+	
+	public static ItemStack getElectricPiston(int aTier, int aSize) {
+		ItemStack aType;
+		int aLazyTier = 0;
+		if (aTier == aLazyTier++) {
+			aType = CI.electricPiston_ULV;
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPiston_LV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPiston_MV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPiston_HV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPiston_EV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPiston_IV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPiston_LuV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPiston_ZPM;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPiston_UV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPiston_MAX;			
+		}
+		else {
+			aType = CI.electricPiston_LV;			
+		}		
+		return ItemUtils.getSimpleStack(aType, aSize);
+	}
+	
+	public static ItemStack getElectricPump(int aTier, int aSize) {
+		ItemStack aType;
+		int aLazyTier = 0;
+		if (aTier == aLazyTier++) {
+			aType = CI.electricPump_ULV;
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPump_LV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPump_MV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPump_HV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPump_EV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPump_IV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPump_LuV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPump_ZPM;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPump_UV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.electricPump_MAX;			
+		}
+		else {
+			aType = CI.electricPump_LV;			
+		}		
+		return ItemUtils.getSimpleStack(aType, aSize);
+	}
+	
+	public static ItemStack getRobotArm(int aTier, int aSize) {
+		ItemStack aType;
+		int aLazyTier = 0;
+		if (aTier == aLazyTier++) {
+			aType = CI.robotArm_ULV;
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.robotArm_LV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.robotArm_MV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.robotArm_HV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.robotArm_EV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.robotArm_IV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.robotArm_LuV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.robotArm_ZPM;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.robotArm_UV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.robotArm_MAX;			
+		}
+		else {
+			aType = CI.robotArm_LV;			
+		}		
+		return ItemUtils.getSimpleStack(aType, aSize);
+	}
+	
+	public static ItemStack getConveyor(int aTier, int aSize) {
+		ItemStack aType;
+		int aLazyTier = 0;
+		if (aTier == aLazyTier++) {
+			aType = CI.conveyorModule_ULV;
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.conveyorModule_LV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.conveyorModule_MV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.conveyorModule_HV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.conveyorModule_EV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.conveyorModule_IV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.conveyorModule_LuV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.conveyorModule_ZPM;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.conveyorModule_UV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.conveyorModule_MAX;			
+		}
+		else {
+			aType = CI.conveyorModule_LV;			
+		}		
+		return ItemUtils.getSimpleStack(aType, aSize);
+	}
+	
+	public static ItemStack getEmitter(int aTier, int aSize) {
+		ItemStack aType;
+		int aLazyTier = 0;
+		if (aTier == aLazyTier++) {
+			aType = CI.emitter_ULV;
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.emitter_LV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.emitter_MV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.emitter_HV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.emitter_EV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.emitter_IV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.emitter_LuV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.emitter_ZPM;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.emitter_UV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.emitter_MAX;			
+		}
+		else {
+			aType = CI.emitter_LV;			
+		}		
+		return ItemUtils.getSimpleStack(aType, aSize);
+	}
+	
+	public static ItemStack getSensor(int aTier, int aSize) {
+		ItemStack aType;
+		int aLazyTier = 0;
+		if (aTier == aLazyTier++) {
+			aType = CI.sensor_ULV;
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.sensor_LV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.sensor_MV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.sensor_HV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.sensor_EV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.sensor_IV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.sensor_LuV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.sensor_ZPM;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.sensor_UV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.sensor_MAX;			
+		}
+		else {
+			aType = CI.sensor_LV;			
+		}		
+		return ItemUtils.getSimpleStack(aType, aSize);
+	}
+	
+	public static ItemStack getFieldGenerator(int aTier, int aSize) {
+		ItemStack aType;
+		int aLazyTier = 0;
+		if (aTier == aLazyTier++) {
+			aType = CI.fieldGenerator_ULV;
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fieldGenerator_LV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fieldGenerator_MV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fieldGenerator_HV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fieldGenerator_EV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fieldGenerator_IV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fieldGenerator_LuV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fieldGenerator_ZPM;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fieldGenerator_UV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fieldGenerator_MAX;			
+		}
+		else {
+			aType = CI.fieldGenerator_LV;			
+		}		
+		return ItemUtils.getSimpleStack(aType, aSize);
+	}
+	
+
+	
+	public static ItemStack getTieredMachineHull(int aTier, int aSize) {
+		ItemStack aType;
+		int aLazyTier = 0;
+		if (aTier == aLazyTier++) {
+			aType = CI.machineHull_ULV;
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.machineHull_LV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.machineHull_MV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.machineHull_HV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.machineHull_EV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.machineHull_IV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.machineHull_LuV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.machineHull_ZPM;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.machineHull_UV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.machineHull_MAX;			
+		}
+		else {
+			aType = CI.machineHull_LV;			
+		}		
+		return ItemUtils.getSimpleStack(aType, aSize);
+	}
 
 }