+ Added some new Fusion Reactor Casings & Coils.

+ Added recipes for the shelves.
% Made the Adv. EBF process 8 parallel recipes, up from 4.
% Made the Fusion Reaction MK IV use the new casings.

1 files changed, 140 insertions, 116 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index 30af8908df..7acefa104c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -149,120 +149,6 @@ public class TexturesGtBlock {
 	public static final CustomIcon OVERLAY_COMPARTMENT_15 = new CustomIcon("TileEntities/Compartment/30");
 	public static final CustomIcon OVERLAY_COMPARTMENT_16 = new CustomIcon("TileEntities/Compartment/31");
 	
-	
-	//Overlay Arrays
-	public static ITexture[] OVERLAYS_ENERGY_OUT_BUFFER = new ITexture[]{
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
-					new short[]{220, 220, 220, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
-					new short[]{220, 220, 220, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
-					new short[]{255, 100, 0, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
-					new short[]{255, 255, 30, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
-					new short[]{128, 128, 128, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
-					new short[]{240, 240, 245, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
-					new short[]{240, 240, 245, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
-					new short[]{240, 240, 245, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
-					new short[]{240, 240, 245, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
-					new short[]{240, 240, 245, 0})}; 
-	
-	public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[]{
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
-					new short[]{220, 220, 220, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
-					new short[]{220, 220, 220, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
-					new short[]{255, 100, 0, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
-					new short[]{255, 255, 30, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
-					new short[]{128, 128, 128, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
-					new short[]{240, 240, 245, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
-					new short[]{240, 240, 245, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
-					new short[]{240, 240, 245, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
-					new short[]{240, 240, 245, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
-					new short[]{240, 240, 245, 0})}; 
-
-	public static ITexture[] OVERLAYS_CABINET_FRONT = new ITexture[]{
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_1,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_2,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_3,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_4,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_5,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_6,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_7,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_8,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_9,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_10,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_11,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_12,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_13,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_14,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_15,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_16,
-					new short[]{255, 255, 255, 0}),}; 
-	
-	public static ITexture[] OVERLAYS_COMPARTMENT_FRONT = new ITexture[]{
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_1,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_2,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_3,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_4,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_5,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_6,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_7,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_8,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_9,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_10,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_11,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_12,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_13,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_14,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_15,
-					new short[]{255, 255, 255, 0}),
-			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_16,
-					new short[]{255, 255, 255, 0}),}; 
-
 	//Controllers
 	private static final CustomIcon Internal_Casing_Fusion_Simple_Front = new CustomIcon("TileEntities/MACHINE_CASING_FUSION_FRONT");
 	public static final CustomIcon Casing_Fusion_Simple_Front = Internal_Casing_Fusion_Simple_Front;
@@ -340,8 +226,8 @@ public class TexturesGtBlock {
 	public static final CustomIcon Casing_Redox_4 = new CustomIcon("redox/redox4");
 	public static final CustomIcon Casing_Redox_5 = new CustomIcon("redox/redox5");
 	public static final CustomIcon Casing_Redox_6 = new CustomIcon("redox/redox6");
-	public static final CustomIcon Casing_Redox_7 = new CustomIcon("redox/redox7");
-	public static final CustomIcon Casing_Redox_8 = new CustomIcon("redox/redox8");
+	//public static final CustomIcon Casing_Redox_7 = new CustomIcon("redox/redox7");
+	//public static final CustomIcon Casing_Redox_8 = new CustomIcon("redox/redox8");
 
 	//Centrifuge Casing
 	private static final CustomIcon Internal_Casing_Centrifuge = new CustomIcon("TileEntities/MACHINE_CASING_CENTRIFUGE");
@@ -381,6 +267,23 @@ public class TexturesGtBlock {
 	public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC = new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC");
 	public static final CustomIcon TEXTURE_CASING_ADVANCED_VOLCNUS = new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS");
 
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II = new CustomIcon("iconsets/MACHINE_CASING_FUSION_3");
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_INNER = new CustomIcon("iconsets/MACHINE_CASING_FUSION_COIL_II");
+	public static final CustomIcon TEXTURE_CASING_FUSION_CASING_ULTRA = new CustomIcon("iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA");
+	//
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_1 = new CustomIcon("iconsets/FUSIONIII_1");
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_2 = new CustomIcon("iconsets/FUSIONIII_2");
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_3 = new CustomIcon("iconsets/FUSIONIII_3");
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_4 = new CustomIcon("iconsets/FUSIONIII_4");
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_5 = new CustomIcon("iconsets/FUSIONIII_5");
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_6 = new CustomIcon("iconsets/FUSIONIII_6");
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_7 = new CustomIcon("iconsets/FUSIONIII_7");
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_8 = new CustomIcon("iconsets/FUSIONIII_8");
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_9 = new CustomIcon("iconsets/FUSIONIII_9");
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_10 = new CustomIcon("iconsets/FUSIONIII_10");
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_11 = new CustomIcon("iconsets/FUSIONIII_11");
+	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_12 = new CustomIcon("iconsets/FUSIONIII_12");
+	
 	//Overlays
 	//Fan Textures
 	private static final CustomIcon Internal_Overlay_Machine_Vent = new CustomIcon("TileEntities/machine_top_vent_rotating");
@@ -471,4 +374,125 @@ public class TexturesGtBlock {
 	public static final CustomIcon TEXTURE_TECH_C = new CustomIcon("metro/TEXTURE_TECH_C");
 	public static final CustomIcon TEXTURE_TECH_PANEL_A = new CustomIcon("metro/TEXTURE_TECH_PANEL_A");
 
+
+	//Overlay Arrays
+	public static ITexture[] OVERLAYS_ENERGY_OUT_BUFFER = new ITexture[]{
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+					new short[]{220, 220, 220, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+					new short[]{220, 220, 220, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+					new short[]{255, 100, 0, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+					new short[]{255, 255, 30, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+					new short[]{128, 128, 128, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+					new short[]{240, 240, 245, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+					new short[]{240, 240, 245, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+					new short[]{240, 240, 245, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+					new short[]{240, 240, 245, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+					new short[]{240, 240, 245, 0})}; 
+	
+	public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[]{
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+					new short[]{220, 220, 220, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+					new short[]{220, 220, 220, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+					new short[]{255, 100, 0, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+					new short[]{255, 255, 30, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+					new short[]{128, 128, 128, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+					new short[]{240, 240, 245, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+					new short[]{240, 240, 245, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+					new short[]{240, 240, 245, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+					new short[]{240, 240, 245, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+					new short[]{240, 240, 245, 0})}; 
+
+	public static ITexture[] OVERLAYS_CABINET_FRONT = new ITexture[]{
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_1,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_2,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_3,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_4,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_5,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_6,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_7,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_8,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_9,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_10,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_11,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_12,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_13,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_14,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_15,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_16,
+					new short[]{255, 255, 255, 0}),}; 
+	
+	public static ITexture[] OVERLAYS_COMPARTMENT_FRONT = new ITexture[]{
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_1,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_2,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_3,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_4,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_5,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_6,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_7,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_8,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_9,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_10,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_11,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_12,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_13,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_14,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_15,
+					new short[]{255, 255, 255, 0}),
+			new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_16,
+					new short[]{255, 255, 255, 0}),}; 
+	
+	public static IIconContainer[] CONNECTED_FUSION_HULLS = new IIconContainer[]{
+			TEXTURE_CASING_FUSION_COIL_II_1, TEXTURE_CASING_FUSION_COIL_II_2, TEXTURE_CASING_FUSION_COIL_II_3,
+			TEXTURE_CASING_FUSION_COIL_II_4, TEXTURE_CASING_FUSION_COIL_II_5,	TEXTURE_CASING_FUSION_COIL_II_6, 
+			TEXTURE_CASING_FUSION_COIL_II_7, TEXTURE_CASING_FUSION_COIL_II_8, TEXTURE_CASING_FUSION_COIL_II_9,
+			TEXTURE_CASING_FUSION_COIL_II_10, TEXTURE_CASING_FUSION_COIL_II_11, TEXTURE_CASING_FUSION_COIL_II_12};
+
+	
 }