+ 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, 169 insertions, 43 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
index d0b9d9287f..9a12acaaf1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
@@ -1,5 +1,8 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
+import gregtech.api.enums.ItemList;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -7,6 +10,8 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ControlCore;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler_Adv;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Naquadah;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SuperBus_Input;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SuperBus_Output;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GT_MetaTileEntity_Hatch_CustomFluidBase;
 
 public class GregtechCustomHatches {
@@ -15,79 +20,158 @@ public class GregtechCustomHatches {
 		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Logger.INFO("Gregtech5u Content | Registering Custom Fluid Hatches.");
 			run1();
-			
+
 			//No pollution in 5.08
-			if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK)
-			run2();
+			if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+				run2();
+			}
+			
+			run3();
 		}
 	}
 
 	private static void run1() {
 
 		GregtechItemList.Hatch_Input_Cryotheum
-				.set(new GT_MetaTileEntity_Hatch_CustomFluidBase(FluidUtils.getFluidStack("cryotheum", 1).getFluid(), // Fluid
-																														// to
-																														// resitrct
-																														// hatch
-																														// to
-						128000, // Capacity
-						967, // ID
-						"hatch.cryotheum.input.tier.00", // unlocal name
-						"Cryotheum Cooling Hatch" // Local name
-		).getStackForm(1L));
+		.set(new GT_MetaTileEntity_Hatch_CustomFluidBase(FluidUtils.getFluidStack("cryotheum", 1).getFluid(), // Fluid
+				// to
+				// resitrct
+				// hatch
+				// to
+				128000, // Capacity
+				967, // ID
+				"hatch.cryotheum.input.tier.00", // unlocal name
+				"Cryotheum Cooling Hatch" // Local name
+				).getStackForm(1L));
 
 		GregtechItemList.Hatch_Input_Pyrotheum
-				.set(new GT_MetaTileEntity_Hatch_CustomFluidBase(FluidUtils.getFluidStack("pyrotheum", 1).getFluid(), // Fluid
-																														// to
-																														// resitrct
-																														// hatch
-																														// to
-						128000, // Capacity
-						968, // ID
-						"hatch.pyrotheum.input.tier.00", // unlocal name
-						"Pyrotheum Heating Vent" // Local name
-		).getStackForm(1L));
+		.set(new GT_MetaTileEntity_Hatch_CustomFluidBase(FluidUtils.getFluidStack("pyrotheum", 1).getFluid(), // Fluid
+				// to
+				// resitrct
+				// hatch
+				// to
+				128000, // Capacity
+				968, // ID
+				"hatch.pyrotheum.input.tier.00", // unlocal name
+				"Pyrotheum Heating Vent" // Local name
+				).getStackForm(1L));
 
 		GregtechItemList.Hatch_Input_Naquadah.set(new GT_MetaTileEntity_Hatch_Naquadah(969, // ID
 				"hatch.naquadah.input.tier.00", // unlocal name
 				"Naquadah Reactor Input hatch" // Local name
-		).getStackForm(1L));
+				).getStackForm(1L));
 
 	}
 
 	private static void run2() {
 		GregtechItemList.Hatch_Muffler_Adv_LV
-				.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30001, "hatch.muffler.adv.tier.01", "Advanced Muffler Hatch (LV)", 1))
-						.getStackForm(1L));
+		.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30001, "hatch.muffler.adv.tier.01", "Advanced Muffler Hatch (LV)", 1))
+				.getStackForm(1L));
 		GregtechItemList.Hatch_Muffler_Adv_MV
-				.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30002, "hatch.muffler.adv.tier.02", "Advanced Muffler Hatch (MV)", 2))
-						.getStackForm(1L));
+		.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30002, "hatch.muffler.adv.tier.02", "Advanced Muffler Hatch (MV)", 2))
+				.getStackForm(1L));
 		GregtechItemList.Hatch_Muffler_Adv_HV
-				.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30003, "hatch.muffler.adv.tier.03", "Advanced Muffler Hatch (HV)", 3))
-						.getStackForm(1L));
+		.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30003, "hatch.muffler.adv.tier.03", "Advanced Muffler Hatch (HV)", 3))
+				.getStackForm(1L));
 		GregtechItemList.Hatch_Muffler_Adv_EV
-				.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30004, "hatch.muffler.adv.tier.04", "Advanced Muffler Hatch (EV)", 4))
-						.getStackForm(1L));
+		.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30004, "hatch.muffler.adv.tier.04", "Advanced Muffler Hatch (EV)", 4))
+				.getStackForm(1L));
 		GregtechItemList.Hatch_Muffler_Adv_IV
-				.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30005, "hatch.muffler.adv.tier.05", "Advanced Muffler Hatch (IV)", 5))
-						.getStackForm(1L));
+		.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30005, "hatch.muffler.adv.tier.05", "Advanced Muffler Hatch (IV)", 5))
+				.getStackForm(1L));
 		GregtechItemList.Hatch_Muffler_Adv_LuV
-				.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30006, "hatch.muffler.adv.tier.06", "Advanced Muffler Hatch (LuV)", 6))
-						.getStackForm(1L));
+		.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30006, "hatch.muffler.adv.tier.06", "Advanced Muffler Hatch (LuV)", 6))
+				.getStackForm(1L));
 		GregtechItemList.Hatch_Muffler_Adv_ZPM
-				.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30007, "hatch.muffler.adv.tier.07", "Advanced Muffler Hatch (ZPM)", 7))
-						.getStackForm(1L));
+		.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30007, "hatch.muffler.adv.tier.07", "Advanced Muffler Hatch (ZPM)", 7))
+				.getStackForm(1L));
 		GregtechItemList.Hatch_Muffler_Adv_UV
-				.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30008, "hatch.muffler.adv.tier.08", "Advanced Muffler Hatch (UV)", 8))
-						.getStackForm(1L));
+		.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30008, "hatch.muffler.adv.tier.08", "Advanced Muffler Hatch (UV)", 8))
+				.getStackForm(1L));
 		GregtechItemList.Hatch_Muffler_Adv_MAX
-				.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30009, "hatch.muffler.adv.tier.09", "Advanced Muffler Hatch (MAX)", 9))
-						.getStackForm(1L));		
-		
+		.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(30009, "hatch.muffler.adv.tier.09", "Advanced Muffler Hatch (MAX)", 9))
+				.getStackForm(1L));		
+
 		//GT++ multiblock Control Core Bus
 		GregtechItemList.Hatch_Control_Core
 		.set((new GT_MetaTileEntity_Hatch_ControlCore(30020, "hatch.control.adv", "Control Core Module", 1))
 				.getStackForm(1L));
 	}
 
+	private static void run3() {
+
+		/*
+		 * Super Input Busses
+		 */
+		
+		int aStartID = 30021;
+
+		GregtechItemList.Hatch_SuperBus_Input_ULV
+				.set((new GT_MetaTileEntity_SuperBus_Input(aStartID++, "hatch.superbus.input.tier.00", "Super Bus (I) (ULV)", 0))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Input_LV
+				.set((new GT_MetaTileEntity_SuperBus_Input(aStartID++, "hatch.superbus.input.tier.01", "Super Bus (I) (LV)", 1))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Input_MV
+				.set((new GT_MetaTileEntity_SuperBus_Input(aStartID++, "hatch.superbus.input.tier.02", "Super Bus (I) (MV)", 2))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Input_HV
+				.set((new GT_MetaTileEntity_SuperBus_Input(aStartID++, "hatch.superbus.input.tier.03", "Super Bus (I) (HV)", 3))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Input_EV
+				.set((new GT_MetaTileEntity_SuperBus_Input(aStartID++, "hatch.superbus.input.tier.04", "Super Bus (I) (EV)", 4))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Input_IV
+				.set((new GT_MetaTileEntity_SuperBus_Input(aStartID++, "hatch.superbus.input.tier.05", "Super Bus (I) (IV)", 5))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Input_LuV
+				.set((new GT_MetaTileEntity_SuperBus_Input(aStartID++, "hatch.superbus.input.tier.06", "Super Bus (I) (LuV)", 6))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Input_ZPM
+				.set((new GT_MetaTileEntity_SuperBus_Input(aStartID++, "hatch.superbus.input.tier.07", "Super Bus (I) (ZPM)", 7))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Input_UV
+				.set((new GT_MetaTileEntity_SuperBus_Input(aStartID++, "hatch.superbus.input.tier.08", "Super Bus (I) (UV)", 8))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Input_MAX
+				.set((new GT_MetaTileEntity_SuperBus_Input(aStartID++, "hatch.superbus.input.tier.09", "Super Bus (I) (MAX)", 9))
+						.getStackForm(1L));
+
+		/*
+		 * Super Output Busses
+		 */
+
+		GregtechItemList.Hatch_SuperBus_Output_ULV
+				.set((new GT_MetaTileEntity_SuperBus_Output(aStartID++, "hatch.superbus.output.tier.00", "Super Bus (O) (ULV)", 0))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Output_LV
+				.set((new GT_MetaTileEntity_SuperBus_Output(aStartID++, "hatch.superbus.output.tier.01", "Super Bus (O) (LV)", 1))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Output_MV
+				.set((new GT_MetaTileEntity_SuperBus_Output(aStartID++, "hatch.superbus.output.tier.02", "Super Bus (O) (MV)", 2))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Output_HV
+				.set((new GT_MetaTileEntity_SuperBus_Output(aStartID++, "hatch.superbus.output.tier.03", "Super Bus (O) (HV)", 3))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Output_EV
+				.set((new GT_MetaTileEntity_SuperBus_Output(aStartID++, "hatch.superbus.output.tier.04", "Super Bus (O) (EV)", 4))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Output_IV
+				.set((new GT_MetaTileEntity_SuperBus_Output(aStartID++, "hatch.superbus.output.tier.05", "Super Bus (O) (IV)", 5))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Output_LuV
+				.set((new GT_MetaTileEntity_SuperBus_Output(aStartID++, "hatch.superbus.output.tier.06", "Super Bus (O) (LuV)", 6))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Output_ZPM
+				.set((new GT_MetaTileEntity_SuperBus_Output(aStartID++, "hatch.superbus.output.tier.07", "Super Bus (O) (ZPM)", 7))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Output_UV
+				.set((new GT_MetaTileEntity_SuperBus_Output(aStartID++, "hatch.superbus.output.tier.08", "Super Bus (O) (UV)", 8))
+						.getStackForm(1L));
+		GregtechItemList.Hatch_SuperBus_Output_MAX
+				.set((new GT_MetaTileEntity_SuperBus_Output(aStartID++, "hatch.superbus.output.tier.09", "Super Bus (O) (MAX)", 9))
+						.getStackForm(1L));
+
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java
new file mode 100644
index 0000000000..3e9582b80a
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java
@@ -0,0 +1,42 @@
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBreaker;
+
+public class GregtechPowerBreakers {
+
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
+			Logger.INFO("Gregtech5u Content | Registering Power Breakers.");			
+			run1();
+		}
+
+	}
+
+	private static void run1() {		
+		//30200
+		int aStartID = 30400;		
+		GregtechItemList.BreakerBox_ULV.set((new GT_MetaTileEntity_BasicBreaker(aStartID++, "breaker.tier.00",
+				"Ultra Low Voltage Breaker Box", 0, "", 16)).getStackForm(1L));
+		GregtechItemList.BreakerBox_LV.set((new GT_MetaTileEntity_BasicBreaker(aStartID++, "breaker.tier.01",
+				"Low Voltage Breaker Box", 1, "", 16)).getStackForm(1L));
+		GregtechItemList.BreakerBox_MV.set((new GT_MetaTileEntity_BasicBreaker(aStartID++, "breaker.tier.02",
+				"Medium Voltage Breaker Box", 2, "", 16)).getStackForm(1L));
+		GregtechItemList.BreakerBox_HV.set((new GT_MetaTileEntity_BasicBreaker(aStartID++, "breaker.tier.03",
+				"High Voltage Breaker Box", 3, "", 16)).getStackForm(1L));
+		GregtechItemList.BreakerBox_EV.set((new GT_MetaTileEntity_BasicBreaker(aStartID++, "breaker.tier.04",
+				"Extreme Voltage Breaker Box", 16, "", 16)).getStackForm(1L));
+		GregtechItemList.BreakerBox_IV.set((new GT_MetaTileEntity_BasicBreaker(aStartID++, "breaker.tier.05",
+				"Insane Voltage Breaker Box", 5, "", 16)).getStackForm(1L));
+		GregtechItemList.BreakerBox_LuV.set((new GT_MetaTileEntity_BasicBreaker(aStartID++, "breaker.tier.06",
+				"Ludicrous Voltage Breaker Box", 6, "", 16)).getStackForm(1L));
+		GregtechItemList.BreakerBox_ZPM.set((new GT_MetaTileEntity_BasicBreaker(aStartID++, "breaker.tier.07",
+				"ZPM Voltage Breaker Box", 7, "", 16)).getStackForm(1L));
+		GregtechItemList.BreakerBox_UV.set((new GT_MetaTileEntity_BasicBreaker(aStartID++, "breaker.tier.08",
+				"Ultimate Voltage Breaker Box", 8, "", 16)).getStackForm(1L));
+		GregtechItemList.BreakerBox_MAX.set((new GT_MetaTileEntity_BasicBreaker(aStartID++, "breaker.tier.09",
+				"MAX Voltage Breaker Box", 9, "", 16)).getStackForm(1L));
+
+	}
+}
\ No newline at end of file