Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9

src/main/java/techreborn/init/ModItems.java

@@ -891,6 +891,9 @@ public class ModItems
 		OreUnifier.registerOre("batteryUltimate", ItemParts.getPartByName("diamondGrindingHead"));
 		OreUnifier.registerOre("blockLapis", ItemParts.getPartByName("lazuriteChunk"));
 
+		OreUnifier.registerOre("containerWater", ItemCells.getCellByName("water"));
+		OreUnifier.registerOre("containerWater", Items.water_bucket);
+
 	}
 
 }

src/main/java/techreborn/init/ModRecipes.java

@@ -548,7 +548,8 @@ public class ModRecipes {
 
 		CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Supercondensator), "EOE", "SAS", "EOE", 'E',
 				ItemParts.getPartByName("energyFlowCircuit"), 'O', ModItems.lapotronicOrb, 'S',
-				ItemParts.getPartByName("superconductor"), 'A', BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
+				ItemParts.getPartByName("superconductor"), 'A',
+				BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
 
 		CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("diamondSawBlade"), "DSD", "S S", "DSD", 'S',
 				"plateSteel", 'D', "dustDiamond");
@@ -638,6 +639,45 @@ public class ModRecipes {
 		CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.scrapBox), "SSS", "SSS", "SSS", 'S',
 				ItemParts.getPartByName("scrap"));
 
+		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock"), "TTT", "WCW", 'T',
+				ItemParts.getPartByName("CoolantSimple"), 'W', ItemStandaloneCables.getCableByName("insulatedcopper"),
+				'C', ItemParts.getPartByName("electronicCircuit"));
+
+		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T',
+				ItemParts.getPartByName("heliumCoolantSimple"), 'W',
+				ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
+				ItemParts.getPartByName("electronicCircuit"));
+
+		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T',
+				ItemParts.getPartByName("NaKCoolantSimple"), 'W',
+				ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
+				ItemParts.getPartByName("electronicCircuit"));
+
+		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Transformer"), "GGG", "WTW", "GCG", 'G',
+				"glass", 'W', ItemStandaloneCables.getCableByName("insulatedgold"), 'C',
+				ItemParts.getPartByName("electronicCircuit"), 'T', ModBlocks.mvt);
+
+		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("EnergyStorage"), "PPP", "WBW", "PCP", 'P',
+				"plankWood", 'W', ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
+				ItemParts.getPartByName("electronicCircuit"), 'B', ModItems.reBattery);
+
+		CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("CoolantSimple"), " T ", "TWT", " T ", 'T',
+				"ingotTin", 'W', "containerWater");
+
+		CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("CoolantTriple"), "TTT", "CCC", "TTT", 'T',
+				"ingotTin", 'C', ItemParts.getPartByName("CoolantSimple"));
+
+		CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("CoolantSix"), "TCT", "TPT", "TCT", 'T', "ingotTin",
+				'C', ItemParts.getPartByName("CoolantTriple"), 'P', ItemPlates.getPlateByName("copper"));
+
+		CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("NaKCoolantSimple"), "TST", "PCP", "TST", 'T',
+				"ingotTin", 'C', ItemParts.getPartByName("CoolantSimple"), 'S', ItemCells.getCellByName("sodium"), 'P',
+				ItemCells.getCellByName("potassium"));
+
+		CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("NaKCoolantSimple"), "TPT", "SCS", "TPT", 'T',
+				"ingotTin", 'C', ItemParts.getPartByName("CoolantSimple"), 'S', ItemCells.getCellByName("sodium"), 'P',
+				ItemCells.getCellByName("potassium"));
+
 		Core.logHelper.info("Shapped Recipes Added");
 	}
 
@@ -670,7 +710,8 @@ public class ModRecipes {
 		}
 
 		GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.rubberPlanks, 4), ModBlocks.rubberLog);
-		GameRegistry.addShapelessRecipe(ItemParts.getPartByName("frequencyTransmitter"), ItemStandaloneCables.getCableByName("insulatedcopper"), ItemParts.getPartByName("electronicCircuit"));
+		GameRegistry.addShapelessRecipe(ItemParts.getPartByName("frequencyTransmitter"),
+				ItemStandaloneCables.getCableByName("insulatedcopper"), ItemParts.getPartByName("electronicCircuit"));
 
 		for (String name : ItemDustsSmall.types) {
 			GameRegistry.addShapelessRecipe(ItemDustsSmall.getSmallDustByName(name, 4), ItemDusts.getDustByName(name));
@@ -1933,8 +1974,9 @@ public class ModRecipes {
 		CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Lesu), " L ", "CBC", " M ", 'L', ModBlocks.lvt, 'C',
 				ItemParts.getPartByName("advancedCircuit"), 'M', ModBlocks.mvt, 'B', ModBlocks.LesuStorage);
 
-		CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT", "CTC", 'C',
+		CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT",
-				"ingotChrome", 'T', "ingotTitanium", 'B', TechRebornAPI.recipeCompact.getItem("advancedMachine"));
+				"CTC", 'C', "ingotChrome", 'T', "ingotTitanium", 'B',
+				TechRebornAPI.recipeCompact.getItem("advancedMachine"));
 
 		CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 0), "III", "CBC", "III", 'I',
 				"plateIron", 'C', "circuitBasic", 'B', TechRebornAPI.recipeCompact.getItem("machine"));
@@ -1947,7 +1989,8 @@ public class ModRecipes {
 
 		CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.quantumChest), "DCD", "ATA", "DQD", 'D',
 				ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor"), 'A',
-				BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'Q', ModBlocks.digitalChest, 'T', ModBlocks.Compressor);
+				BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'Q', ModBlocks.digitalChest, 'T',
+				ModBlocks.Compressor);
 
 		CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.PlasmaGenerator), "PPP", "PTP", "CGC", 'P',
 				ItemPlates.getPlateByName("tungstensteel"), 'T', TechRebornAPI.recipeCompact.getItem("hvTransformer"),
@@ -1994,8 +2037,7 @@ public class ModRecipes {
 
 		// Blast Furnace
 		RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemCells.getCellByName("silicon", 2), null,
-				ItemPlates.getPlateByName("silicon"),
+				ItemPlates.getPlateByName("silicon"), ItemCells.getCellByName("empty", 2), 1000, 120, 1500));
-				ItemCells.getCellByName("empty", 2), 1000, 120, 1500));
 
 		// CentrifugeRecipes
 
@@ -2018,99 +2060,75 @@ public class ModRecipes {
 
 		// Methane
 		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.mushroom_stew, 16),
-				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null,
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				5000, 5));
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.apple, 32), ItemCells.getCellByName("empty"),
-		RecipeHandler.addRecipe(
+				ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				new CentrifugeRecipe(new ItemStack(Items.apple, 32), ItemCells.getCellByName("empty"),
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.porkchop, 12),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-		RecipeHandler.addRecipe(
-				new CentrifugeRecipe(new ItemStack(Items.porkchop, 12), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
 		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cooked_porkchop, 16),
-				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null,
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				5000, 5));
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.bread, 64), ItemCells.getCellByName("empty"),
-		RecipeHandler.addRecipe(
+				ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				new CentrifugeRecipe(new ItemStack(Items.bread, 64), ItemCells.getCellByName("empty"),
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.fish, 12), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
+				ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-		RecipeHandler.addRecipe(
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cooked_fish, 16),
-				new CentrifugeRecipe(new ItemStack(Items.fish, 12), ItemCells.getCellByName("empty"),
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.beef, 12), ItemCells.getCellByName("empty"),
-		RecipeHandler.addRecipe(
+				ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				new CentrifugeRecipe(new ItemStack(Items.cooked_fish, 16), ItemCells.getCellByName("empty"),
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cooked_beef, 16),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-		RecipeHandler.addRecipe(
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.pumpkin, 16),
-				new CentrifugeRecipe(new ItemStack(Items.beef, 12), ItemCells.getCellByName("empty"),
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-		RecipeHandler.addRecipe(
-				new CentrifugeRecipe(new ItemStack(Items.cooked_beef, 16), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-		RecipeHandler.addRecipe(
-				new CentrifugeRecipe(new ItemStack(Blocks.pumpkin, 16), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
 		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.speckled_melon, 1),
 				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1),
 				new ItemStack(Items.gold_nugget, 6), null, null, 5000, 5));
-		RecipeHandler.addRecipe(
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.spider_eye, 32),
-				new CentrifugeRecipe(new ItemStack(Items.spider_eye, 32), ItemCells.getCellByName("empty"),
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.chicken, 12), ItemCells.getCellByName("empty"),
-		RecipeHandler.addRecipe(
+				ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				new CentrifugeRecipe(new ItemStack(Items.chicken, 12), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
 		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cooked_chicken, 16),
-				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null,
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				5000, 5));
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.rotten_flesh, 16),
-		RecipeHandler.addRecipe(
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				new CentrifugeRecipe(new ItemStack(Items.rotten_flesh, 16), ItemCells.getCellByName("empty"),
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.melon, 64), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
+				ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-		RecipeHandler.addRecipe(
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cookie, 64), ItemCells.getCellByName("empty"),
-				new CentrifugeRecipe(new ItemStack(Items.melon, 64), ItemCells.getCellByName("empty"),
+				ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.cake, 8), ItemCells.getCellByName("empty"),
-		RecipeHandler.addRecipe(
+				ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				new CentrifugeRecipe(new ItemStack(Items.cookie, 64), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-		RecipeHandler.addRecipe(
-				new CentrifugeRecipe(new ItemStack(Items.cake, 8), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
 		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.golden_carrot, 1),
 				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1),
 				new ItemStack(Items.gold_nugget, 6), null, null, 5000, 5));
-		RecipeHandler.addRecipe(
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.carrot, 16), ItemCells.getCellByName("empty"),
-				new CentrifugeRecipe(new ItemStack(Items.carrot, 16), ItemCells.getCellByName("empty"),
+				ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.baked_potato, 24),
-		RecipeHandler.addRecipe(
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				new CentrifugeRecipe(new ItemStack(Items.baked_potato, 24), ItemCells.getCellByName("empty"),
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.potato, 16), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
+				ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-		RecipeHandler.addRecipe(
-				new CentrifugeRecipe(new ItemStack(Items.potato, 16), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
 		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.poisonous_potato, 12),
-				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null,
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				5000, 5));
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.nether_wart, 1),
-		RecipeHandler.addRecipe(
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				new CentrifugeRecipe(new ItemStack(Items.nether_wart, 1), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
 		// Fix with ic2
 		// RecipeHandler.addRecipe(new CentrifugeRecipe(new
 		// ItemStack(TechRebornAPI.recipeCompact.getItem("terraWart").getItem(),
 		// 16), ItemCells.getCellByName("empty"),
 		// ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
 		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.brown_mushroom, 1),
-				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null,
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				5000, 5));
+		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.red_mushroom, 1),
-		RecipeHandler.addRecipe(
+				ItemCells.getCellByName("empty"), ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
-				new CentrifugeRecipe(new ItemStack(Blocks.red_mushroom, 1), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("methane", 1), null, null, null, 5000, 5));
 
 		// Rubber Wood Yields
 		RecipeHandler.addRecipe(
 				new CentrifugeRecipe(new ItemStack(TechRebornAPI.recipeCompact.getItem("rubberWood").getItem(), 16),
-						ItemCells.getCellByName("empty", 5),
+						ItemCells.getCellByName("empty", 5), new ItemStack(ModItems.parts, 8, 41),
-						new ItemStack(ModItems.parts, 8, 41), new ItemStack(Blocks.sapling, 6),
+						new ItemStack(Blocks.sapling, 6), ItemCells.getCellByName("methane", 1),
-						ItemCells.getCellByName("methane", 1), ItemCells.getCellByName("carbon", 4), 5000, 5, false));
+						ItemCells.getCellByName("carbon", 4), 5000, 5, false));
 
 		// Soul Sand Byproducts
-		RecipeHandler.addRecipe(
+		RecipeHandler
-				new CentrifugeRecipe(new ItemStack(Blocks.soul_sand, 16), ItemCells.getCellByName("empty"),
+				.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.soul_sand, 16), ItemCells.getCellByName("empty"),
 						ItemCells.getCellByName("oil", 1), ItemDusts.getDustByName("saltpeter", 4),
 						ItemDusts.getDustByName("coal", 1), new ItemStack(Blocks.sand, 10), 2500, 5));
 
@@ -2121,8 +2139,8 @@ public class ModRecipes {
 		// Dust Byproducts
 
 		RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.glowstone_dust, 16),
-				ItemCells.getCellByName("empty"), new ItemStack(Items.redstone, 8),
+				ItemCells.getCellByName("empty"), new ItemStack(Items.redstone, 8), ItemDusts.getDustByName("gold", 8),
-				ItemDusts.getDustByName("gold", 8), ItemCells.getCellByName("helium", 1), null, 25000, 5));
+				ItemCells.getCellByName("helium", 1), null, 25000, 5));
 		RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("phosphorous", 5),
 				ItemCells.getCellByName("empty", 3), ItemCells.getCellByName("calcium", 3), null, null, null, 1280, 5));
 		RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("ashes", 1),
@@ -2131,10 +2149,10 @@ public class ModRecipes {
 				.addRecipe(new CentrifugeRecipe(new ItemStack(Items.redstone, 10), ItemCells.getCellByName("empty", 4),
 						ItemCells.getCellByName("silicon", 1), ItemDusts.getDustByName("pyrite", 3),
 						ItemDusts.getDustByName("ruby", 1), ItemCells.getCellByName("mercury", 3), 6800, 5));
-		RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16),
+		RecipeHandler.addRecipe(
-				ItemCells.getCellByName("empty", 2),
+				new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), ItemCells.getCellByName("empty", 2),
-				ItemCells.getCellByName("helium3", 1), ItemCells.getCellByName("helium"),
+						ItemCells.getCellByName("helium3", 1), ItemCells.getCellByName("helium"),
-				ItemDustsSmall.getSmallDustByName("Tungsten", 1), new ItemStack(Blocks.sand, 12), 4800, 5));
+						ItemDustsSmall.getSmallDustByName("Tungsten", 1), new ItemStack(Blocks.sand, 12), 4800, 5));
 		RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("cinnabar", 2),
 				ItemCells.getCellByName("empty"), ItemCells.getCellByName("mercury", 1),
 				ItemDusts.getDustByName("sulfur", 1), null, null, 80, 5));
@@ -2143,14 +2161,11 @@ public class ModRecipes {
 
 		// Deuterium/Tritium
 		RecipeHandler.addRecipe(new CentrifugeRecipe(ItemCells.getCellByName("helium", 16), null,
-				ItemCells.getCellByName("deuterium", 1),
+				ItemCells.getCellByName("deuterium", 1), ItemCells.getCellByName("empty", 15), null, null, 10000, 5));
-				ItemCells.getCellByName("empty", 15), null, null, 10000, 5));
 		RecipeHandler.addRecipe(new CentrifugeRecipe(ItemCells.getCellByName("deuterium", 4), null,
-				ItemCells.getCellByName("tritium", 1),
+				ItemCells.getCellByName("tritium", 1), ItemCells.getCellByName("empty", 3), null, null, 3000, 5));
-				ItemCells.getCellByName("empty", 3), null, null, 3000, 5));
 		RecipeHandler.addRecipe(new CentrifugeRecipe(ItemCells.getCellByName("hydrogen", 4), null,
-				ItemCells.getCellByName("deuterium", 1),
+				ItemCells.getCellByName("deuterium", 1), ItemCells.getCellByName("empty", 3), null, null, 3000, 5));
-				ItemCells.getCellByName("empty", 3), null, null, 3000, 5));
 
 		// Lava Cell Byproducts
 		ItemStack lavaCells = TechRebornAPI.recipeCompact.getItem("lavaCell");
@@ -2180,10 +2195,10 @@ public class ModRecipes {
 				ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("gold", 2),
 				ItemDusts.getDustByName("copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1),
 				ItemCells.getCellByName("empty"), 100, 120));
-		RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.gold_ore, 1),
+		RecipeHandler.addRecipe(
-				ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("gold", 3),
+				new IndustrialGrinderRecipe(new ItemStack(Blocks.gold_ore, 1), ItemCells.getCellByName("mercury", 1),
-				ItemDustsSmall.getSmallDustByName("Copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1),
+						null, ItemDusts.getDustByName("gold", 3), ItemDustsSmall.getSmallDustByName("Copper", 1),
-				ItemCells.getCellByName("empty"), 100, 120));
+						ItemDustsSmall.getSmallDustByName("Nickel", 1), ItemCells.getCellByName("empty"), 100, 120));
 		RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.diamond_ore, 1),
 				TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.diamond, 1),
 				ItemDustsSmall.getSmallDustByName("Diamond", 6), ItemDustsSmall.getSmallDustByName("Coal", 2),
@@ -2231,10 +2246,10 @@ public class ModRecipes {
 						TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("tin", 2),
 						ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Zinc", 1),
 						ItemCells.getCellByName("empty"), 100, 120));
-				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
+				RecipeHandler
-						ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("tin", 2),
+						.addRecipe(new IndustrialGrinderRecipe(oreStack, ItemCells.getCellByName("sodiumPersulfate", 1),
-						ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("zinc", 1),
+								null, ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1),
-						ItemCells.getCellByName("empty"), 100, 120));
+								ItemDusts.getDustByName("zinc", 1), ItemCells.getCellByName("empty"), 100, 120));
 			} catch (Exception e) {
 				Core.logHelper.info("Failed to Load Grinder Recipe for Tin Ore");
 			}
@@ -2268,10 +2283,10 @@ public class ModRecipes {
 						TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("zinc", 2),
 						ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Tin", 1),
 						ItemCells.getCellByName("empty"), 100, 120));
-				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
+				RecipeHandler
-						ItemCells.getCellByName("sodiumPersulfate", 1), null, ItemDusts.getDustByName("zinc", 2),
+						.addRecipe(new IndustrialGrinderRecipe(oreStack, ItemCells.getCellByName("sodiumPersulfate", 1),
-						ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("iron", 1),
+								null, ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1),
-						ItemCells.getCellByName("empty"), 100, 120));
+								ItemDusts.getDustByName("iron", 1), ItemCells.getCellByName("empty"), 100, 120));
 			} catch (Exception e) {
 				Core.logHelper.info("Failed to Load Grinder Recipe for Zinc Ore");
 			}
@@ -2287,8 +2302,7 @@ public class ModRecipes {
 						ItemCells.getCellByName("empty"), 100, 120));
 				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, ItemCells.getCellByName("mercury", 1),
 						null, ItemDusts.getDustByName("silver", 3), ItemDustsSmall.getSmallDustByName("Lead", 1),
-						ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemCells.getCellByName("empty"),
+						ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemCells.getCellByName("empty"), 100, 120));
-						100, 120));
 			} catch (Exception e) {
 				Core.logHelper.info("Failed to Load Grinder Recipe for Silver Ore");
 			}
@@ -2304,8 +2318,7 @@ public class ModRecipes {
 						ItemCells.getCellByName("empty"), 100, 120));
 				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, ItemCells.getCellByName("mercury", 1),
 						null, ItemDusts.getDustByName("lead", 2), ItemDusts.getDustByName("silver", 1),
-						ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemCells.getCellByName("empty"),
+						ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemCells.getCellByName("empty"), 100, 120));
-						100, 120));
 			} catch (Exception e) {
 				Core.logHelper.info("Failed to Load Grinder Recipe for Lead Ore");
 			}
@@ -2322,9 +2335,9 @@ public class ModRecipes {
 				RecipeHandler.addRecipe(
 						new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000),
 								uranium238Stack, uranium235Stack, null, null, 100, 120));
-				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
+				RecipeHandler.addRecipe(
-						TechRebornAPI.recipeCompact.getItem("waterCell"), null, uranium238Stack, uranium235Stack, null,
+						new IndustrialGrinderRecipe(oreStack, TechRebornAPI.recipeCompact.getItem("waterCell"), null,
-						ItemCells.getCellByName("empty"), 100, 120));
+								uranium238Stack, uranium235Stack, null, ItemCells.getCellByName("empty"), 100, 120));
 				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null,
 						uranium238Stack, uranium235Stack, null, new ItemStack(Items.bucket), 100, 120));
 			} catch (Exception e) {
@@ -2343,9 +2356,9 @@ public class ModRecipes {
 				RecipeHandler.addRecipe(
 						new IndustrialGrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000),
 								uranium238Stack, uranium235Stack, null, null, 100, 120));
-				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
+				RecipeHandler.addRecipe(
-						TechRebornAPI.recipeCompact.getItem("waterCell"), null, uranium238Stack, uranium235Stack, null,
+						new IndustrialGrinderRecipe(oreStack, TechRebornAPI.recipeCompact.getItem("waterCell"), null,
-						ItemCells.getCellByName("empty"), 100, 120));
+								uranium238Stack, uranium235Stack, null, ItemCells.getCellByName("empty"), 100, 120));
 				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null,
 						uranium238Stack, uranium235Stack, null, new ItemStack(Items.bucket), 100, 120));
 			} catch (Exception e) {
@@ -2357,11 +2370,10 @@ public class ModRecipes {
 		if (OreUtil.doesOreExistAndValid("oreAluminum")) {
 			try {
 				ItemStack oreStack = OreDictionary.getOres("oreAluminum").get(0);
-				RecipeHandler.addRecipe(
+				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
-						new IndustrialGrinderRecipe(oreStack, TechRebornAPI.recipeCompact.getItem("waterCell"), null,
+						TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("aluminum", 2),
-								ItemDusts.getDustByName("aluminum", 2), ItemDustsSmall.getSmallDustByName("Bauxite", 1),
+						ItemDustsSmall.getSmallDustByName("Bauxite", 1),
-								ItemDustsSmall.getSmallDustByName("Bauxite", 1),
+						ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemCells.getCellByName("empty"), 100, 120));
-								ItemCells.getCellByName("empty"), 100, 120));
 			} catch (Exception e) {
 				Core.logHelper.info("Failed to Load Grinder Recipe for Lead Ore");
 			}
@@ -2410,11 +2422,10 @@ public class ModRecipes {
 		if (OreUtil.doesOreExistAndValid("oreCadmium")) {
 			try {
 				ItemStack oreStack = OreDictionary.getOres("oreCadmium").get(0);
-				RecipeHandler.addRecipe(
+				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
-						new IndustrialGrinderRecipe(oreStack, TechRebornAPI.recipeCompact.getItem("waterCell"), null,
+						TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("cadmium", 2),
-								ItemDusts.getDustByName("cadmium", 2), ItemDustsSmall.getSmallDustByName("Cadmium", 1),
+						ItemDustsSmall.getSmallDustByName("Cadmium", 1),
-								ItemDustsSmall.getSmallDustByName("Cadmium", 1),
+						ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemCells.getCellByName("empty"), 100, 120));
-								ItemCells.getCellByName("empty"), 100, 120));
 			} catch (Exception e) {
 				Core.logHelper.info("Failed to Load Grinder Recipe for Cadmium Ore");
 			}
@@ -2494,11 +2505,10 @@ public class ModRecipes {
 				ItemStack oreStack = OreDictionary.getOres("oreTeslatite").get(0);
 				ItemStack dustStack = OreDictionary.getOres("dustTeslatite").get(0);
 				dustStack.stackSize = 10;
-				RecipeHandler.addRecipe(
+				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
-						new IndustrialGrinderRecipe(oreStack, TechRebornAPI.recipeCompact.getItem("waterCell"), null,
+						TechRebornAPI.recipeCompact.getItem("waterCell"), null, dustStack,
-								dustStack, ItemDustsSmall.getSmallDustByName("Sodalite", 1),
+						ItemDustsSmall.getSmallDustByName("Sodalite", 1),
-								ItemDustsSmall.getSmallDustByName("Glowstone", 1),
+						ItemDustsSmall.getSmallDustByName("Glowstone", 1), ItemCells.getCellByName("empty"), 100, 120));
-								ItemCells.getCellByName("empty"), 100, 120));
 			} catch (Exception e) {
 				Core.logHelper.info("Failed to Load Grinder Recipe for Teslatite Ore");
 			}
@@ -2524,8 +2534,7 @@ public class ModRecipes {
 				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
 						TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("saltpeter", 2),
 						ItemDustsSmall.getSmallDustByName("Saltpeter", 1),
-						ItemDustsSmall.getSmallDustByName("Saltpeter", 1), ItemCells.getCellByName("empty"),
+						ItemDustsSmall.getSmallDustByName("Saltpeter", 1), ItemCells.getCellByName("empty"), 100, 120));
-						100, 120));
 			} catch (Exception e) {
 				Core.logHelper.info("Failed to Load Grinder Recipe for Saltpeter Ore");
 			}
@@ -2553,8 +2562,8 @@ public class ModRecipes {
 				dustStack.stackSize = 4;
 				RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.quartz_ore, 1),
 						TechRebornAPI.recipeCompact.getItem("waterCell"), null, new ItemStack(Items.quartz, 2),
-						dustStack, ItemDustsSmall.getSmallDustByName("Netherrack", 2),
+						dustStack, ItemDustsSmall.getSmallDustByName("Netherrack", 2), ItemCells.getCellByName("empty"),
-						ItemCells.getCellByName("empty"), 100, 120));
+						100, 120));
 			} catch (Exception e) {
 				Core.logHelper.info("Failed to Load Grinder Recipe for Nether Quartz Ore");
 			}
@@ -2705,8 +2714,7 @@ public class ModRecipes {
 		RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1),
 				TechRebornAPI.recipeCompact.getItem("waterCell"), null,
 				TechRebornAPI.recipeCompact.getItem("iridiumOre"), ItemDustsSmall.getSmallDustByName("Iridium", 6),
-				ItemDustsSmall.getSmallDustByName("Platinum", 2), ItemCells.getCellByName("empty"), 100,
+				ItemDustsSmall.getSmallDustByName("Platinum", 2), ItemCells.getCellByName("empty"), 100, 120));
-				120));
 		RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1),
 				new ItemStack(Items.water_bucket), null, TechRebornAPI.recipeCompact.getItem("iridiumOre"),
 				ItemDustsSmall.getSmallDustByName("Iridium", 6), ItemDustsSmall.getSmallDustByName("Platinum", 2),
@@ -2772,10 +2780,10 @@ public class ModRecipes {
 				TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemDusts.getDustByName("platinum", 2),
 				ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Iridium", 1),
 				ItemCells.getCellByName("empty"), 100, 120));
-		RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9),
+		RecipeHandler.addRecipe(
-				ItemCells.getCellByName("mercury", 1), null, ItemDusts.getDustByName("platinum", 3),
+				new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9), ItemCells.getCellByName("mercury", 1),
-				ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Iridium", 1),
+						null, ItemDusts.getDustByName("platinum", 3), ItemDustsSmall.getSmallDustByName("Iridium", 1),
-				ItemCells.getCellByName("empty"), 100, 120));
+						ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemCells.getCellByName("empty"), 100, 120));
 
 		RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 10),
 				TechRebornAPI.recipeCompact.getItem("waterCell"), null, ItemGems.getGemByName("peridot", 1),
@@ -2826,21 +2834,18 @@ public class ModRecipes {
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("sulfuricAcid", 7), null,
 				ItemCells.getCellByName("hydrogen", 2), ItemDusts.getDustByName("sulfur"),
-				ItemCells.getCellByName("empty", 2),
+				ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("empty", 3), 400, 90));
-				ItemCells.getCellByName("empty", 3), 400, 90));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("ruby", 6),
 				ItemCells.getCellByName("empty"), ItemDusts.getDustByName("aluminum", 2),
-				ItemCells.getCellByName("empty", 1),
+				ItemCells.getCellByName("empty", 1), ItemDusts.getDustByName("chrome", 1), null, 140, 90));
-				ItemDusts.getDustByName("chrome", 1), null, 140, 90));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("sapphire", 5),
 				ItemCells.getCellByName("empty"), ItemDusts.getDustByName("aluminum", 2),
 				ItemCells.getCellByName("empty", 5), null, null, 100, 60));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("nitrogenDioxide", 3), null,
-				ItemCells.getCellByName("nitrogen", 1),
+				ItemCells.getCellByName("nitrogen", 1), ItemCells.getCellByName("empty", 5), null,
-				ItemCells.getCellByName("empty", 5), null,
 				ItemCells.getCellByName("empty"), 160, 60));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("sodiumSulfide", 2), null,
@@ -2852,108 +2857,88 @@ public class ModRecipes {
 				ItemCells.getCellByName("empty", 5), null, null, 100, 60));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("emerald", 29),
-				ItemCells.getCellByName("empty", 18),
+				ItemCells.getCellByName("empty", 18), ItemCells.getCellByName("berylium", 3),
-				ItemCells.getCellByName("berylium", 3), ItemDusts.getDustByName("aluminum", 2),
+				ItemDusts.getDustByName("aluminum", 2), ItemCells.getCellByName("silicon", 6),
-				ItemCells.getCellByName("silicon", 6),
 				ItemCells.getCellByName("empty", 9), 520, 120));
 
-		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(
+		RecipeHandler
-				new ItemStack(TechRebornAPI.recipeCompact.getItem("silicondioxideDust").getItem(), 3, 0),
+				.addRecipe(
-				ItemCells.getCellByName("empty", 2),
+						new IndustrialElectrolyzerRecipe(
-				ItemCells.getCellByName("silicon", 1),
+								new ItemStack(TechRebornAPI.recipeCompact.getItem("silicondioxideDust").getItem(), 3,
-				ItemCells.getCellByName("empty", 1), null, null, 60, 60));
+										0),
+								ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("silicon", 1),
+								ItemCells.getCellByName("empty", 1), null, null, 60, 60));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(new ItemStack(Items.dye, 3, 15),
-				ItemCells.getCellByName("empty", 1), null,
+				ItemCells.getCellByName("empty", 1), null, ItemCells.getCellByName("calcium", 1), null, null, 20, 106));
-				ItemCells.getCellByName("calcium", 1), null, null, 20, 106));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("glyceryl", 20), null,
 				ItemCells.getCellByName("carbon", 3), ItemCells.getCellByName("hydrogen", 5),
-				ItemCells.getCellByName("nitrogen", 3),
+				ItemCells.getCellByName("nitrogen", 3), ItemCells.getCellByName("empty", 9), 800, 90));
-				ItemCells.getCellByName("empty", 9), 800, 90));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("peridot", 9),
-				ItemCells.getCellByName("empty", 4),
+				ItemCells.getCellByName("empty", 4), ItemDusts.getDustByName("magnesium", 2),
-				ItemDusts.getDustByName("magnesium", 2), ItemDusts.getDustByName("iron"),
+				ItemDusts.getDustByName("iron"), ItemCells.getCellByName("silicon", 2),
-				ItemCells.getCellByName("silicon", 2),
 				ItemCells.getCellByName("empty", 2), 200, 120));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("calciumCarbonate", 5), null,
 				ItemCells.getCellByName("carbon"), ItemCells.getCellByName("calcium"),
-				ItemCells.getCellByName("empty", 1),
+				ItemCells.getCellByName("empty", 1), ItemCells.getCellByName("empty", 2), 400, 90));
-				ItemCells.getCellByName("empty", 2), 400, 90));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("sodiumPersulfate", 6), null,
 				ItemCells.getCellByName("sodium"), ItemDusts.getDustByName("sulfur"),
-				ItemCells.getCellByName("empty", 2),
+				ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("empty", 3), 420, 90));
-				ItemCells.getCellByName("empty", 3), 420, 90));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("pyrope", 20),
-				ItemCells.getCellByName("empty", 9),
+				ItemCells.getCellByName("empty", 9), ItemDusts.getDustByName("aluminum", 2),
-				ItemDusts.getDustByName("aluminum", 2), ItemDusts.getDustByName("magnesium", 3),
+				ItemDusts.getDustByName("magnesium", 3), ItemCells.getCellByName("silicon", 3),
-				ItemCells.getCellByName("silicon", 3),
 				ItemCells.getCellByName("empty", 9), 400, 120));
 
 		ItemStack sand = new ItemStack(Blocks.sand);
 		sand.stackSize = 16;
 
-		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(sand,
+		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(sand, ItemCells.getCellByName("empty", 2),
-				ItemCells.getCellByName("empty", 2),
+				ItemCells.getCellByName("silicon", 1), ItemCells.getCellByName("empty", 2), null, null, 1000, 25));
-				ItemCells.getCellByName("silicon", 1),
-				ItemCells.getCellByName("empty", 2), null, null, 1000, 25));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("almandine", 20),
-				ItemCells.getCellByName("empty", 9),
+				ItemCells.getCellByName("empty", 9), ItemDusts.getDustByName("aluminum", 2),
-				ItemDusts.getDustByName("aluminum", 2), ItemDusts.getDustByName("iron", 3),
+				ItemDusts.getDustByName("iron", 3), ItemCells.getCellByName("silicon", 3),
-				ItemCells.getCellByName("silicon", 3),
 				ItemCells.getCellByName("empty", 6), 480, 120));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("spessartine", 20),
-				ItemCells.getCellByName("empty", 9),
+				ItemCells.getCellByName("empty", 9), ItemDusts.getDustByName("aluminum", 2),
-				ItemDusts.getDustByName("aluminum", 2), ItemDusts.getDustByName("manganese", 3),
+				ItemDusts.getDustByName("manganese", 3), ItemCells.getCellByName("silicon", 3),
-				ItemCells.getCellByName("silicon", 3),
 				ItemCells.getCellByName("empty", 6), 480, 120));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("andradite", 20),
-				ItemCells.getCellByName("empty", 12),
+				ItemCells.getCellByName("empty", 12), ItemCells.getCellByName("calcium", 3),
-				ItemCells.getCellByName("calcium", 3), ItemDusts.getDustByName("iron", 2),
+				ItemDusts.getDustByName("iron", 2), ItemCells.getCellByName("silicon", 3),
-				ItemCells.getCellByName("silicon", 3),
 				ItemCells.getCellByName("empty", 6), 480, 120));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("grossular", 20),
-				ItemCells.getCellByName("empty", 12),
+				ItemCells.getCellByName("empty", 12), ItemCells.getCellByName("calcium", 3),
-				ItemCells.getCellByName("calcium", 3), ItemDusts.getDustByName("aluminum", 2),
+				ItemDusts.getDustByName("aluminum", 2), ItemCells.getCellByName("silicon", 3),
-				ItemCells.getCellByName("silicon", 3),
 				ItemCells.getCellByName("empty", 6), 440, 120));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("Uvarovite", 20),
-				ItemCells.getCellByName("empty", 12),
+				ItemCells.getCellByName("empty", 12), ItemCells.getCellByName("calcium", 3),
-				ItemCells.getCellByName("calcium", 3), ItemDusts.getDustByName("chrome", 2),
+				ItemDusts.getDustByName("chrome", 2), ItemCells.getCellByName("silicon", 3),
-				ItemCells.getCellByName("silicon", 3),
 				ItemCells.getCellByName("empty", 6), 480, 120));
 
-		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(
+		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("empty", 6), null,
-				ItemCells.getCellByName("empty", 6), null,
+				ItemCells.getCellByName("hydrogen", 4), ItemCells.getCellByName("empty", 5),
-				ItemCells.getCellByName("hydrogen", 4),
-				ItemCells.getCellByName("empty", 5),
 				ItemCells.getCellByName("empty", 1), null, 100, 30));
 
 		RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("darkAshes"),
-				ItemCells.getCellByName("empty", 2),
+				ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("carbon", 2), null, null, null, 20, 30));
-				ItemCells.getCellByName("carbon", 2), null, null, null, 20, 30));
 
 		if (OreUtil.doesOreExistAndValid("dustSalt")) {
 			ItemStack salt = OreDictionary.getOres("dustSalt").get(0);
 			salt.stackSize = 2;
-			RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(salt,
+			RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(salt, ItemCells.getCellByName("empty", 2),
-					ItemCells.getCellByName("empty", 2),
 					ItemCells.getCellByName("sodium"), ItemCells.getCellByName("chlorine"), null, null, 40, 60));
 		}
 
-		CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("NaKCoolantSimple"), "TST", "PCP", "TST", 'T',
-				"ingotTin", 'S', ItemCells.getCellByName("sodium"), 'P', ItemCells.getCellByName("potassium"), 'C',
-				TechRebornAPI.recipeCompact.getItem("reactorCoolantSimple"));
-
 		Item drill = TechRebornAPI.recipeCompact.getItem("miningDrill").getItem();
 		ItemStack drillStack = new ItemStack(drill, 1, OreDictionary.WILDCARD_VALUE);
 

src/main/java/techreborn/items/ItemParts.java

@@ -14,8 +14,7 @@ import techreborn.client.TechRebornCreativeTab;
 import techreborn.init.ModItems;
 import techreborn.lib.ModInfo;
 
-public class ItemParts extends ItemTextureBase
+public class ItemParts extends ItemTextureBase {
-{
 	public static final String[] types = new String[] { "advancedCircuitParts", "basicCircuitBoard",
 			"advancedCircuitBoard", "processorCircuitBoard", "energyFlowCircuit", "dataControlCircuit", "dataOrb",
 			"dataStorageCircuit", "diamondGrindingHead", "diamondSawBlade", "tungstenGrindingHead",
@@ -25,39 +24,33 @@ public class ItemParts extends ItemTextureBase
 			"doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell", "quadPlutoniumCell",
 			"destructoPack", "iridiumNeutronReflector", "massHoleDevice", "computerMonitor", "machineParts",
 			"thickNeutronReflector", "neutronReflector", "electronicCircuit", "advancedCircuit", "rubberSap", "rubber",
-			"scrap", "pump", "teleporter", "advancedAlloy", "mixedmetalingot", "carbonmesh", "carbonfiber", "frequencyTransmitter" };
+			"scrap", "pump", "teleporter", "advancedAlloy", "mixedmetalingot", "carbonmesh", "carbonfiber",
+			"frequencyTransmitter", "CoolantSimple", "CoolantTriple", "CoolantSix" };
 
-	public ItemParts()
+	public ItemParts() {
-	{
 		setCreativeTab(TechRebornCreativeTab.instance);
 		setHasSubtypes(true);
 		setUnlocalizedName("techreborn.part");
 	}
 
-	public static ItemStack getPartByName(String name, int count)
+	public static ItemStack getPartByName(String name, int count) {
-	{
+		for (int i = 0; i < types.length; i++) {
-		for (int i = 0; i < types.length; i++)
+			if (types[i].equalsIgnoreCase(name)) {
-		{
-			if (types[i].equalsIgnoreCase(name))
-			{
 				return new ItemStack(ModItems.parts, count, i);
 			}
 		}
 		throw new InvalidParameterException("The part " + name + " could not be found.");
 	}
 
-	public static ItemStack getPartByName(String name)
+	public static ItemStack getPartByName(String name) {
-	{
 		return getPartByName(name, 1);
 	}
 
 	@Override
 	// gets Unlocalized Name depending on meta data
-	public String getUnlocalizedName(ItemStack itemStack)
+	public String getUnlocalizedName(ItemStack itemStack) {
-	{
 		int meta = itemStack.getItemDamage();
-		if (meta < 0 || meta >= types.length)
+		if (meta < 0 || meta >= types.length) {
-		{
 			meta = 0;
 		}
 
@@ -65,35 +58,29 @@ public class ItemParts extends ItemTextureBase
 	}
 
 	// Adds Dusts SubItems To Creative Tab
-	public void getSubItems(Item item, CreativeTabs creativeTabs, List list)
+	public void getSubItems(Item item, CreativeTabs creativeTabs, List list) {
-	{
+		for (int meta = 0; meta < types.length; ++meta) {
-		for (int meta = 0; meta < types.length; ++meta)
-		{
 			list.add(new ItemStack(item, 1, meta));
 		}
 	}
 
-	public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player)
+	public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) {
-	{
+		switch (itemStack.getItemDamage()) {
-		switch (itemStack.getItemDamage())
+		case 37: // Destructo pack
-		{
+			player.openGui(Core.INSTANCE, GuiHandler.destructoPackID, world, (int) player.posX, (int) player.posY,
-			case 37: // Destructo pack
+					(int) player.posY);
-				player.openGui(Core.INSTANCE, GuiHandler.destructoPackID, world, (int) player.posX, (int) player.posY,
+			break;
-						(int) player.posY);
-				break;
 		}
 		return itemStack;
 	}
 
 	@Override
-	public String getTextureName(int damage)
+	public String getTextureName(int damage) {
-	{
 		return ModInfo.MOD_ID + ":items/part/" + types[damage];
 	}
 
 	@Override
-	public int getMaxMeta()
+	public int getMaxMeta() {
-	{
 		return types.length;
 	}
 }

src/main/java/techreborn/items/ItemUpgrades.java

@@ -9,6 +9,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.text.TextFormatting;
 import techreborn.api.recipe.RecipeCrafter;
 import techreborn.api.upgrade.IMachineUpgrade;
 import techreborn.client.TechRebornCreativeTabMisc;
@@ -33,7 +34,7 @@ public class ItemUpgrades extends ItemTextureBase implements IMachineUpgrade, IT
 		{
 			if (types[i].equalsIgnoreCase(name))
 			{
-				return new ItemStack(ModItems.plate, count, i);
+				return new ItemStack(ModItems.upgrades, count, i);
 			}
 		}
 		throw new InvalidParameterException("The upgrade " + name + " could not be found.");
@@ -90,6 +91,12 @@ public class ItemUpgrades extends ItemTextureBase implements IMachineUpgrade, IT
 		}
 	}
 
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced)
+	{
+		tooltip.add(TextFormatting.RED + "WIP Coming Soon");
+	}
+	
 	@Override
 	public int getMaxMeta()
 	{

src/main/java/techreborn/parts/EnumStandaloneCableType.java

@@ -3,8 +3,7 @@ package techreborn.parts;
 import net.minecraft.util.IStringSerializable;
 import reborncore.api.power.EnumPowerTier;
 
-public enum EnumStandaloneCableType implements IStringSerializable
+public enum EnumStandaloneCableType implements IStringSerializable {
-{
 	COPPER("copper", "techreborn:blocks/cables/copper_cable", 128, 12.0, true, EnumPowerTier.LOW), TIN("tin",
 			"techreborn:blocks/cables/tin_cable", 32, 12.0, true, EnumPowerTier.MEDIUM), GOLD("gold",
 					"techreborn:blocks/cables/gold_cable", 512, 12.0, true, EnumPowerTier.MEDIUM), HV("hv",
@@ -26,8 +25,7 @@ public enum EnumStandaloneCableType implements IStringSerializable
 	private String friendlyName;
 
 	EnumStandaloneCableType(String friendlyName, String textureName, int transferRate, double cableThickness,
-			boolean canKill, EnumPowerTier tier)
+			boolean canKill, EnumPowerTier tier) {
-	{
 		this.friendlyName = friendlyName;
 		this.textureName = textureName;
 		this.transferRate = transferRate;
@@ -37,8 +35,7 @@ public enum EnumStandaloneCableType implements IStringSerializable
 	}
 
 	@Override
-	public String getName()
+	public String getName() {
-	{
 		return friendlyName.toLowerCase();
 	}
 }

src/main/resources/assets/techreborn/lang/en_US.lang

@@ -435,6 +435,9 @@ item.techreborn.energyCrystal.name=Energy Crystal
 item.techreborn.lapotronCrystal.name=Lapotron Crystal
 item.techreborn.treetap.name=Treetap
 item.techreborn.nanosaber.name=Nanosaber
+item.techreborn.upgrade.Overclock.name=Overclocker Upgrade
+item.techreborn.upgrade.Transformer.name=Tranformer Upgrade
+item.techreborn.upgrade.EnergyStorage.name=Energy Storage Upgrade
 
 #Gems
 item.techreborn.gem.ruby.name=Ruby
@@ -623,9 +626,12 @@ item.techreborn.part.rubber.name=Rubber
 item.techreborn.part.scrap.name=Scrap
 item.techreborn.part.electronicCircuit.name=Electronic Circuit
 item.techreborn.part.advancedCircuit.name=Advanced Electronic Circuit
-item.techreborn.part.pump.name=Pump
-item.techreborn.part.teleporter.name=Teleporter
 item.techreborn.part.advancedAlloy.name=Advanced Alloy
+item.techreborn.part.frequencyTransmitter.name=Frequency Transmitter
+item.techreborn.part.tungstenGrindingHead.name=Tungsten Grinding Head
+item.techreborn.part.CoolantSimple.name=10k Coolant Cell
+item.techreborn.part.CoolantTriple.name=30k Coolant Cell
+item.techreborn.part.CoolantSix.name=60k Coolant Cell
 
 #Tools
 item.techreborn.rockcutter.name=Rockcutter