+ Added more Sub-Station casing recipes.

4 files changed, 39 insertions, 16 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index c1e4ac9bbd..685d918ae6 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -219,13 +219,15 @@ public final class ModItems {
 	public static Item itemCoalCoke;
 
 	public static CoreItem itemCircuitLFTR;
-	
+
 	public static Item itemDebugAreaClear;
 
 	public static Item itemGemShards;
-	
+
 	public static Item itemHalfCompleteCasings;
 
+	public static Item itemPlateVanadium;
+
 
 
 
@@ -235,14 +237,14 @@ public final class ModItems {
 		//Default item used when recipes fail, handy for debugging.
 		AAA_Broken = new BaseItemIngot_OLD("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 128), 0);
 		ZZZ_Empty = new ItemEmpty();
-		
+
 		itemAlkalusDisk = new BaseItemDamageable("itemAlkalusDisk", AddToCreativeTab.tabMisc, 1, 0, "Unknown Use", EnumRarity.rare, EnumChatFormatting.AQUA, false, null);
 
 		//Debug Loading
 		if (CORE.DEBUG){
 			DEBUG_INIT.registerItems();
 		}
-		
+
 		itemDebugAreaClear = new ItemAreaClear();
 
 
@@ -291,9 +293,9 @@ public final class ModItems {
 		itemBlueprintBase = new ItemBlueprint("itemBlueprint");
 
 		itemGemShards = new ItemGemShards("itemGemShards", "Gem Shards", AddToCreativeTab.tabMisc, 32, 0, "They glitter in the light", EnumRarity.rare, EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(182, 114, 18)).setTextureName(CORE.MODID + ":itemHeliumBlob");
-		itemHalfCompleteCasings = new ItemHalfCompleteCasings("itemHalfCompleteCasings", "Half Complete Casing", AddToCreativeTab.tabMisc, 32, 0, "This isn't quite finished yet.", EnumRarity.common, EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(255, 255, 255)).setTextureName("gregtech" + ":" + "gt.metaitem.01" + "761");
-		
-		
+		itemHalfCompleteCasings = new ItemHalfCompleteCasings("itemHalfCompleteCasings", "Half Complete Casing", AddToCreativeTab.tabMisc, 32, 0, "This isn't quite finished yet.", EnumRarity.common, EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(255, 255, 255)).setTextureName("gregtech" + ":" + "gt.metaitem.01/" + "761");
+
+
 		//Start meta Item Generation
 		ItemsFoods.load();
 
@@ -387,7 +389,7 @@ public final class ModItems {
 			MaterialGenerator.generateNuclearMaterial(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE);
 			MaterialGenerator.generateNuclearMaterial(FLUORIDES.TECHNETIUM_HEXAFLUORIDE);
 			MaterialGenerator.generateNuclearMaterial(FLUORIDES.SELENIUM_HEXAFLUORIDE);
-			
+
 			//Generate Reactor Fuel Salts
 			MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ZrF4U235);
 			MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ZrF4UF4);
@@ -504,7 +506,7 @@ public final class ModItems {
 		//LFTR Control Circuit
 		itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Thorium Reactor Control Circuit", AddToCreativeTab.tabMisc, 1, 0, "Helps your LFTR not explode", EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null);
 
-		
+
 		//Zirconium
 		//Cinter Pellet.
 		itemZirconiumChlorideCinterPellet = new CoreItem("itemZirconiumPellet", "Zirconium Pellet ["+StringUtils.subscript("ZrCl4")+"]", tabMisc).setTextureName(CORE.MODID + ":itemShard");
@@ -609,6 +611,11 @@ public final class ModItems {
 		tI = new BaseItemMisc("Dull", new short[]{64,64,64}, 64, MiscTypes.GEM, null);
 		tI = new BaseItemMisc("Forest", new short[]{130,164,96}, 64, MiscTypes.MUSHROOM, new String[]{"You Found this on the ground.", "Definitely not sure if it's worth eating."});
 
+		//Vanadium
+		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateVanadium", 1) == null){
+			itemPlateVanadium = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Vanadium));
+			}
+
 		//EnderIO Resources
 		if ((LoadedMods.EnderIO || LOAD_ALL_CONTENT) && !CORE.GTNH){
 			Utils.LOG_INFO("EnderIO Found - Loading Resources.");
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java b/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java
index 7d4471d0c5..1ee3febed8 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java
@@ -55,10 +55,10 @@ public class ItemHalfCompleteCasings extends BaseItemColourable{
 	@Override
 	public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
 		if (this.getDamage(stack)==0){
-			return Utils.rgbtoHexValue(150, 150, 220);
+			return Utils.rgbtoHexValue(52, 52, 52);
 		}
 		else if (this.getDamage(stack)==1){
-			return Utils.rgbtoHexValue(175, 182, 75);
+			return Utils.rgbtoHexValue(80, 90, 222);
 		}
 		else if (this.getDamage(stack)==2){
 			return Utils.rgbtoHexValue(182, 77, 177);
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index b974a3f9d5..20c7acc5e4 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -421,13 +421,20 @@ public class RECIPES_GREGTECH {
 
 	private static void assemblerRecipes(){
 		//ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1)
-		addAR(ItemUtils.getItemStackOfAmountFromOreDict("cellVanadium", 32), ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 32), ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 2), 16, 64);
-		addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 4), ItemUtils.getItemStackOfAmountFromOreDict("frameGtVanadiumSteel", 8), ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 2, 8), 32, 64);
-		addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 2, 1), ItemUtils.getItemStackOfAmountFromOreDict("cellNitrogen", 1), ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 64);
-	}
+		addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateVanadium", 32), ItemUtils.getItemStackOfAmountFromOreDict("frameGtVanadiumSteel", 8), FluidUtils.getFluidStack("oxygen", 8000), ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 4), 16, 64);
+		addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 2), ItemUtils.getItemStackOfAmountFromOreDict("plateVanadiumGallium", 8), FluidUtils.getFluidStack("molten.tantalum", 144*4), ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 8), 32, 128);
+		addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1), ItemUtils.getItemStackOfAmountFromOreDict("plateLead", 4), FluidUtils.getFluidStack("nitrogen", 1000), ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 256);
+		addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, GregtechItemList.Casing_Power_SubStation.get(4), 80, 128);
+		}
 	
 	private static boolean addAR(ItemStack inputA, ItemStack inputB, ItemStack outputA, int seconds, int voltage){
-		return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, seconds*20, voltage);
+		//return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, seconds*20, voltage);
+				return addAR(inputA, inputB, null, outputA, seconds*20, voltage);
+	}
+	
+	private static boolean addAR(ItemStack inputA, ItemStack inputB, FluidStack inputFluidA, ItemStack outputA, int seconds, int voltage){
+//return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, seconds*20, voltage);
+		return GT_Values.RA.addAssemblerRecipe(inputA, inputB, inputFluidA, outputA, seconds*20, voltage);
 	}
 
 	private static void distilleryRecipes(){
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index dc4791ca0f..13a2d1445f 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -962,6 +962,15 @@ public class RECIPES_Machines {
 				
 
 			}
+			
+			if (CORE.configSwitches.enableMultiblock_PowerSubstation){
+			RecipeUtils.recipeBuilder(
+					null, "plateIncoloy020", null,
+					"plateIncoloy020", "frameGtIncoloyMA956", "plateIncoloy020",
+					null, "plateIncoloy020", null,
+					GregtechItemList.Casing_Power_SubStation.get(1));
+			}
+			
 		}
 		Utils.LOG_INFO("Done loading recipes for the Various machine blocks.");
 	}