+ Added the Generator Array.

3 files changed, 61 insertions, 29 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java
new file mode 100644
index 0000000000..b0b91af528
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java
@@ -0,0 +1,26 @@
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
+
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityGeneratorArray;
+
+public class GregtechIndustrialGeneratorArray {
+
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
+			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Generator Array Multiblock.");
+			//if (CORE.configSwitches.enableMultiblock_IndustrialSifter) { // TODO
+				run1();
+			//}
+		}
+
+	}
+
+	private static void run1() {
+		// Industrial Maceration Stack Multiblock
+		GregtechItemList.Generator_Array_Controller.set(new GregtechMetaTileEntityGeneratorArray(
+				990,
+				"generatorarray.controller.tier.01",
+				"Large Generator Array").getStackForm(1L));
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
index 4d3738f585..954f652b40 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
@@ -15,7 +15,7 @@ public class GregtechRTG {
 
 	private static void run1() {
 		GregtechItemList.RTG.set(
-				new GregtechMetaTileEntity_RTG(869, "rtg.01.tier.single", "Radioisotope Thermoelectric Generator", 3)
+				new GregtechMetaTileEntity_RTG(869, "basicgenerator.rtg.tier.01", "Radioisotope Thermoelectric Generator", 3)
 						.getStackForm(1L));
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
index 688b522c2b..48d516e4cf 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
@@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import gregtech.api.util.GT_ModHandler;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaWirelessCharger;
@@ -9,35 +10,40 @@ import net.minecraftforge.common.MinecraftForge;
 
 public class GregtechWirelessChargers {
 
-	
+
 	public static void run(){
-		
-		long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-				| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED;
-		int mID = 890;		
-
-		FMLCommonHandler.instance().bus().register(new ChargingHelper());
-		MinecraftForge.EVENT_BUS.register(new ChargingHelper());
-		
-		GregtechItemList.Charger_LV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.01.tier.single",
-				"Wireless Charger MK I", 1, "Hopefully won't give you cancer.", 0).getStackForm(1L));
-		GregtechItemList.Charger_MV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.02.tier.single",
-				"Wireless Charger MK II", 2, "Hopefully won't give you cancer.", 0).getStackForm(1L));
-		GregtechItemList.Charger_HV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.03.tier.single",
-				"Wireless Charger MK III", 3, "Hopefully won't give you cancer.", 0).getStackForm(1L));
-		GregtechItemList.Charger_EV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.04.tier.single",
-				"Wireless Charger MK IV", 4, "Hopefully won't give you cancer.", 0).getStackForm(1L));
-		GregtechItemList.Charger_IV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.05.tier.single",
-				"Wireless Charger MK V", 5, "Hopefully won't give you cancer.", 0).getStackForm(1L));
-		GregtechItemList.Charger_LuV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.06.tier.single",
-				"Wireless Charger MK VI", 6, "Hopefully won't give you cancer.", 0).getStackForm(1L));
-		GregtechItemList.Charger_ZPM.set(new GregtechMetaWirelessCharger(mID++, "wificharger.07.tier.single",
-				"Wireless Charger MK VII", 7, "Hopefully won't give you cancer.", 0).getStackForm(1L));
-		GregtechItemList.Charger_UV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.08.tier.single",
-				"Wireless Charger MK VIII", 8, "Hopefully won't give you cancer.", 0).getStackForm(1L));
-		GregtechItemList.Charger_MAX.set(new GregtechMetaWirelessCharger(mID++, "wificharger.09.tier.single",
-				"Wireless Charger MK IX", 9, "Hopefully won't give you cancer.", 0).getStackForm(1L));
 
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
+			Utils.LOG_INFO("Gregtech5u Content | Registering Wireless Chargers.");
+
+
+			long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+					| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED;
+			int mID = 890;		
+
+			FMLCommonHandler.instance().bus().register(new ChargingHelper());
+			MinecraftForge.EVENT_BUS.register(new ChargingHelper());
+
+			GregtechItemList.Charger_LV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.01.tier.single",
+					"Wireless Charger MK I", 1, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+			GregtechItemList.Charger_MV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.02.tier.single",
+					"Wireless Charger MK II", 2, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+			GregtechItemList.Charger_HV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.03.tier.single",
+					"Wireless Charger MK III", 3, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+			GregtechItemList.Charger_EV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.04.tier.single",
+					"Wireless Charger MK IV", 4, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+			GregtechItemList.Charger_IV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.05.tier.single",
+					"Wireless Charger MK V", 5, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+			GregtechItemList.Charger_LuV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.06.tier.single",
+					"Wireless Charger MK VI", 6, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+			GregtechItemList.Charger_ZPM.set(new GregtechMetaWirelessCharger(mID++, "wificharger.07.tier.single",
+					"Wireless Charger MK VII", 7, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+			GregtechItemList.Charger_UV.set(new GregtechMetaWirelessCharger(mID++, "wificharger.08.tier.single",
+					"Wireless Charger MK VIII", 8, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+			GregtechItemList.Charger_MAX.set(new GregtechMetaWirelessCharger(mID++, "wificharger.09.tier.single",
+					"Wireless Charger MK IX", 9, "Hopefully won't give you cancer.", 0).getStackForm(1L));
+
+		}
 	}
-	
+
 }