Added recipe for void versions of my jars

2 files changed, 48 insertions, 25 deletions

diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index e02dcea7b1..a9670c4c06 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -393,7 +393,46 @@ public class Recipes {
 	}
 	
 	private static void registerRecipes_Jars() {
-		
+
+		// Thaumium Reinforced Jar
+		final ItemStack[] recipe_jarthaumiumreinforced = {
+				GameRegistry.makeItemStack("Thaumcraft:ItemResource", 15, 1, null),
+				GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
+				new ItemStack(net.minecraft.init.Blocks.glass_pane),
+				GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
+				new ItemStack(net.minecraft.init.Blocks.glass_pane),
+				GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1),
+				GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
+				new ItemStack(net.minecraft.init.Blocks.glass_pane),
+				GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
+				new ItemStack(net.minecraft.init.Blocks.glass_pane),
+		};
+		final AspectList aspects_jarthaumiumreinforced = new AspectList()
+				.add(Aspect.ARMOR, 64)
+				.add(Aspect.ORDER, 32)
+				.add(Aspect.WATER, 32)
+				.add(Aspect.GREED, 16)
+				.add(Aspect.VOID, 16)
+				.add(Aspect.AIR, 8);
+		infusionRecipes.put("THAUMIUMREINFORCEDJAR",
+				ThaumcraftApi.addInfusionCraftingRecipe("THAUMIUMREINFORCEDJAR", new ItemStack(Blocks.jarThaumiumReinforced, 1, 0),
+						5, aspects_jarthaumiumreinforced, ItemApi.getBlock("blockJar",  0), recipe_jarthaumiumreinforced));
+		// Thaumium Reinforced Void Jar
+		final ItemStack[] recipe_voidjarupgrade = {
+				GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.Obsidian, 1),
+				GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1),
+				GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderEye, 1),
+				GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Mercury, 1),
+		};
+		final AspectList aspects_voidjarupgrade = new AspectList()
+				.add(Aspect.VOID, 14)
+				.add(Aspect.MAGIC, 14)
+				.add(Aspect.ENTROPY, 14)
+				.add(Aspect.WATER, 14);
+		infusionRecipes.put("THAUMIUMREINFORCEDVOIDJAR",
+				ThaumcraftApi.addInfusionCraftingRecipe("THAUMIUMREINFORCEDJAR", new ItemStack(Blocks.jarThaumiumReinforced, 1, 3),
+						2, aspects_voidjarupgrade, new ItemStack(Blocks.jarThaumiumReinforced, 1, 0), recipe_voidjarupgrade));
+
 		final ItemStack[] recipe_jarichor = {
 				GT_ModHandler.getModItem("ThaumicTinkerer", "kamiResource", 1, 0),
 				GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
@@ -419,29 +458,11 @@ public class Recipes {
 		infusionRecipes.put("ICHORJAR", 
 				ThaumcraftApi.addInfusionCraftingRecipe("ICHORJAR", new ItemStack(Blocks.jarIchor, 1, 0),
 				15, aspects_jarichor, ItemApi.getBlock("blockJar", 0), recipe_jarichor));
-		
-		final ItemStack[] recipe_jarthaumiumreinforced = {
-				GameRegistry.makeItemStack("Thaumcraft:ItemResource", 15, 1, null),
-				GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
-				new ItemStack(net.minecraft.init.Blocks.glass_pane),
-				GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
-				new ItemStack(net.minecraft.init.Blocks.glass_pane),
-				GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1), 
-				GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
-				new ItemStack(net.minecraft.init.Blocks.glass_pane),
-				GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
-				new ItemStack(net.minecraft.init.Blocks.glass_pane),
-			};
-		final AspectList aspects_jarthaumiumreinforced = new AspectList()
-				.add(Aspect.ARMOR, 64)
-				.add(Aspect.ORDER, 32)
-				.add(Aspect.WATER, 32)
-				.add(Aspect.GREED, 16)
-				.add(Aspect.VOID, 16)
-				.add(Aspect.AIR, 8);
-		infusionRecipes.put("THAUMIUMREINFORCEDJAR", 
-				ThaumcraftApi.addInfusionCraftingRecipe("THAUMIUMREINFORCEDJAR", new ItemStack(Blocks.jarThaumiumReinforced, 1, 0),
-						5, aspects_jarthaumiumreinforced, ItemApi.getBlock("blockJar",  0), recipe_jarthaumiumreinforced));
+		// Ichor Void Jar
+		infusionRecipes.put("ICHORVOIDJAR",
+				ThaumcraftApi.addInfusionCraftingRecipe("ICHORJAR", new ItemStack(Blocks.jarIchor, 1, 3),
+						5, aspects_voidjarupgrade, new ItemStack(Blocks.jarIchor, 1, 0), recipe_voidjarupgrade));
+
 	}
 
 	private static void registerRecipes_LSC(){
diff --git a/src/main/java/common/Researches.java b/src/main/java/common/Researches.java
index b901a1588f..8982a4c583 100644
--- a/src/main/java/common/Researches.java
+++ b/src/main/java/common/Researches.java
@@ -32,6 +32,7 @@ public class Researches {
                 .setPages(
                         new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.0"),
                         new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDJAR")),
+                        new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDVOIDJAR")),
                         new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.1")
                 )
                 .setConcealed()
@@ -48,7 +49,8 @@ public class Researches {
         final ResearchItem jar_ichor = new ResearchItem("ICHORJAR", "ALCHEMY", aspects_jarichor, 2, -5, 3, new ItemStack(Blocks.jarIchor, 1))
                 .setPages(
                         new ResearchPage("kekztech.research_page.ICHORJAR.0"),
-                        new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR"))
+                        new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR")),
+                        new ResearchPage(Recipes.infusionRecipes.get("ICHORVOIDJAR"))
                 )
                 .setConcealed()
                 .setParents("THAUMIUMREINFORCEDJAR")