Revert "Power system re-write, recipe fixes."

This reverts commit d982cc4028.

# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
This commit is contained in:
modmuss50 2016-08-10 00:51:44 +01:00
parent aa05d906f9
commit d96149fc97
47 changed files with 937 additions and 1361 deletions
src/main/java/techreborn/init

View file

@ -77,6 +77,9 @@ import techreborn.tiles.idsu.TileIDSU;
import techreborn.tiles.lesu.TileLesu;
import techreborn.tiles.lesu.TileLesuStorage;
import techreborn.tiles.multiblock.*;
import techreborn.tiles.multiblock.TileImplosionCompressor;
import techreborn.tiles.multiblock.TileIndustrialSawmill;
import techreborn.tiles.multiblock.TileVacuumFreezer;
import techreborn.tiles.storage.TileBatBox;
import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.storage.TileMFSU;

View file

@ -832,10 +832,10 @@ public class ModRecipes
}
}
TechRebornAPI.addRollingOreMachinceRecipe(ItemParts.getPartByName("nichromeHeatingCoil"), " N ", "NCN", " N ", 'N',
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("nichromeHeatingCoil"), " N ", "NCN", " N ", 'N',
"ingotNickel", 'C', "ingotChrome");
TechRebornAPI.addRollingOreMachinceRecipe(ItemParts.getPartByName("kanthalHeatingCoil"), "III", "CAA", "AAA", 'I',
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("kanthalHeatingCoil"), "III", "CAA", "AAA", 'I',
"ingotSteel", 'C', "ingotChrome", 'A', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("heliumCoolantSimple"), " T ", "TCT", " T ", 'T',
@ -1015,8 +1015,19 @@ public class ModRecipes
.addShapedOreRecipe(new ItemStack(ModBlocks.LesuStorage), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C',
"circuitBasic");
TechRebornAPI.addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil"), "NCN", "CAC", "NCN",
'N', "ingotNickel", 'C', "ingotCopper");
TechRebornAPI
.addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil"), "NCN", "C C", "NCN",
'N', "ingotCupronickel", 'C', "ingotCopper");
RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hotTungstensteel"),
ItemIngots.getIngotByName("tungstensteel"), 440, 128));
RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemCells.getCellByName("heliumplasma"),
ItemCells.getCellByName("helium"), 440, 128));
RecipeHandler.addRecipe(
new VacuumFreezerRecipe(ItemCells.getCellByName("water"),
ItemCells.getCellByName("cell"), 60, 128));
}
static void addVacuumFreezerRecipes() {
@ -2141,7 +2152,7 @@ public class ModRecipes
getOre("ic2Extractor"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.BlastFurnace), "CHC", "HBH", "FHF", 'H',
ItemParts.getPartByName("cupronickelHeatingCoil"), 'C', "circuitAdvanced", 'B',
new ItemStack(ModItems.parts, 1, 17), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', ModBlocks.ElectricFurnace);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IndustrialGrinder), "ECP", "GGG", "CBC", 'E',
@ -2174,7 +2185,7 @@ public class ModRecipes
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.RollingMachine), "PCP", "MBM", "PCP", 'P', Blocks.PISTON,
'C', "circuitAdvanced", 'M', ModBlocks.Compressor, 'B',
"machineBlockAdvanced");
BlockMachineFrame.getFrameByName("machine", 1));
// CraftingHelper.addShapedOreRecipe(new
// ItemStack(ModBlocks.ElectricCraftingTable),