Recipe fixes.

This commit is contained in:
Dragon2488 2016-07-16 22:17:44 +07:00
parent 33df1d3319
commit 25c581e129

View file

@ -389,11 +389,11 @@ public class ModRecipes
static void addExtractorRecipes() static void addExtractorRecipes()
{ {
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new ExtractorRecipe(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber", 3), 400, new ExtractorRecipe(ItemParts.getPartByName("rubberSap"),
2)); ItemParts.getPartByName("rubber", 3), 400, 2));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new ExtractorRecipe(new ItemStack(ModBlocks.rubberLog), ItemParts.getPartByName("rubber"), 400, 2, new ExtractorRecipe(new ItemStack(ModBlocks.rubberLog),
false)); ItemParts.getPartByName("rubber"), 400, 2, true));
} }
static void addIc2ReplacementReicpes() static void addIc2ReplacementReicpes()
@ -519,7 +519,7 @@ public class ModRecipes
{ {
FusionReactorRecipeHelper.registerRecipe( FusionReactorRecipeHelper.registerRecipe(
new FusionReactorRecipe(ItemCells.getCellByName("helium3"), ItemCells.getCellByName("deuterium"), new FusionReactorRecipe(ItemCells.getCellByName("helium3"), ItemCells.getCellByName("deuterium"),
ItemCells.getCellByName("helium"), 40000000, 32768, 1024)); ItemCells.getCellByName("heliumplasma"), 40000000, 32768, 1024));
FusionReactorRecipeHelper.registerRecipe( FusionReactorRecipeHelper.registerRecipe(
new FusionReactorRecipe(ItemCells.getCellByName("tritium"), ItemCells.getCellByName("deuterium"), new FusionReactorRecipe(ItemCells.getCellByName("tritium"), ItemCells.getCellByName("deuterium"),
ItemCells.getCellByName("helium3"), 60000000, 32768, 2048)); ItemCells.getCellByName("helium3"), 60000000, 32768, 2048));
@ -628,7 +628,7 @@ public class ModRecipes
"ingotCopper", 'W', ItemStandaloneCables.getCableByName("insulatedcopper")); "ingotCopper", 'W', ItemStandaloneCables.getCableByName("insulatedcopper"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 0), "RRR", "CAC", "RRR", 'R', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 0), "RRR", "CAC", "RRR", 'R',
ItemIngots.getIngotByName("refinedIron"), 'C', ItemParts.getPartByName("electronicCircuit"), 'A', ItemIngots.getIngotByName("refinedIron"), 'C', "circuitBasic", 'A',
BlockMachineFrame.getFrameByName("machine", 1)); BlockMachineFrame.getFrameByName("machine", 1));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 1), "RRR", "CAC", "RRR", 'R', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 1), "RRR", "CAC", "RRR", 'R',
@ -636,19 +636,18 @@ public class ModRecipes
BlockMachineFrame.getFrameByName("advancedMachine", 1)); BlockMachineFrame.getFrameByName("advancedMachine", 1));
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("dataOrb"), "DDD", "DID", "DDD", 'D', CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("dataOrb"), "DDD", "DID", "DDD", 'D',
"circuitElite", 'I', ItemParts.getPartByName("dataControlCircuit")); "circuitData", 'I', "circuitElite");
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("dataControlCircuit", 4), "CDC", "DID", "CDC", 'I', CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("dataControlCircuit", 4), "CDC", "DID", "CDC", 'I',
ItemPlates.getPlateByName("iridium"), 'D', "circuitElite", 'C', ItemPlates.getPlateByName("iridium"), 'D', "circuitData", 'C', "circuitAdvanced");
"circuitAdvanced");
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.thermalGenerator), "III", "IRI", "CGC", 'I', "ingotInvar", .addShapedOreRecipe(new ItemStack(ModBlocks.thermalGenerator), "III", "IRI", "CGC", 'I', "ingotInvar",
'R', ModBlocks.reinforcedglass, 'G', ModBlocks.Generator, 'C', 'R', ModBlocks.reinforcedglass, 'G', ModBlocks.Generator, 'C',
ItemParts.getPartByName("electronicCircuit")); "circuitBasic");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.recycler), "XEX", "DCD", "GDG", 'D', Blocks.DIRT, 'C', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.recycler), "XEX", "DCD", "GDG", 'D', Blocks.DIRT, 'C',
ModBlocks.Compressor, 'G', Items.GLOWSTONE_DUST, 'E', ItemParts.getPartByName("electronicCircuit")); ModBlocks.Compressor, 'G', Items.GLOWSTONE_DUST, 'E', "circuitBasic");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.batBox), "WCW", "BBB", "WWW", 'W', "plankWood", 'B', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.batBox), "WCW", "BBB", "WWW", 'W', "plankWood", 'B',
batteryStack, 'C', ItemStandaloneCables.getCableByName("insulatedcopper")); batteryStack, 'C', ItemStandaloneCables.getCableByName("insulatedcopper"));
@ -806,15 +805,14 @@ public class ModRecipes
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.Extractor), "TMT", "TCT", "XXX", 'T', ModItems.treeTap, 'M', .addShapedOreRecipe(new ItemStack(ModBlocks.Extractor), "TMT", "TCT", "XXX", 'T', ModItems.treeTap, 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'C', BlockMachineFrame.getFrameByName("machine", 1), 'C',
ItemParts.getPartByName("electronicCircuit")); "circuitBasic");
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), "RCR", "AEA", "RCR", 'R', "ingotRefinedIron", .addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), "RCR", "AEA", "RCR", 'R', "ingotRefinedIron",
'E', new ItemStack(ModBlocks.Extractor), 'A', "machineBlockAdvanced", 'C', "circuitBasic"); 'E', new ItemStack(ModBlocks.Extractor), 'A', "machineBlockAdvanced", 'C', "circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("advancedCircuit"), "RGR", "LCL", "RGR", 'R', CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("advancedCircuit"), "RGR", "LCL", "RGR", 'R',
Items.REDSTONE, 'G', Items.GLOWSTONE_DUST, 'L', "dyeBlue", 'C', Items.REDSTONE, 'G', Items.GLOWSTONE_DUST, 'L', "dyeBlue", 'C', "circuitBasic");
ItemParts.getPartByName("electronicCircuit"));
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModItems.energyCrystal), "RRR", "RDR", "RRR", 'R', Items.REDSTONE, .addShapedOreRecipe(new ItemStack(ModItems.energyCrystal), "RRR", "RDR", "RRR", 'R', Items.REDSTONE,
@ -822,7 +820,7 @@ public class ModRecipes
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModItems.lapotronCrystal), "LCL", "LEL", "LCL", 'L', "dyeBlue", 'E', .addShapedOreRecipe(new ItemStack(ModItems.lapotronCrystal), "LCL", "LEL", "LCL", 'L', "dyeBlue", 'E',
new ItemStack(ModItems.energyCrystal), 'C', ItemParts.getPartByName("electronicCircuit")); "energyCrystal", 'C',"circuitBasic");
CraftingHelper.addShapelessOreRecipe(new ItemStack(ModBlocks.Generator), batteryStack, CraftingHelper.addShapelessOreRecipe(new ItemStack(ModBlocks.Generator), batteryStack,
BlockMachineFrame.getFrameByName("machine", 1), Blocks.FURNACE); BlockMachineFrame.getFrameByName("machine", 1), Blocks.FURNACE);
@ -835,8 +833,8 @@ public class ModRecipes
ItemIngots.getIngotByName("advancedAlloy"), 'C', ItemPlates.getPlateByName("carbon"), 'M', ItemIngots.getIngotByName("advancedAlloy"), 'C', ItemPlates.getPlateByName("carbon"), 'M',
BlockMachineFrame.getFrameByName("machine", 1)); BlockMachineFrame.getFrameByName("machine", 1));
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("dataControlCircuit"), "EEE", "ECE", "EEE", 'E', CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("dataStorageCircuit", 8), "EEE", "ECE", "EEE", 'E',
new ItemStack(Items.EMERALD), 'C', ItemParts.getPartByName("electronicCircuit")); new ItemStack(Items.EMERALD), 'C', "circuitBasic");
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 8), "DSD", "S S", "DSD", 'D', "dustDiamond", 'S', .addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 8), "DSD", "S S", "DSD", 'D', "dustDiamond", 'S',
@ -877,7 +875,7 @@ public class ModRecipes
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModItems.rockCutter), "DT ", "DT ", "DCB", 'D', "dustDiamond", 'T', .addShapedOreRecipe(new ItemStack(ModItems.rockCutter), "DT ", "DT ", "DCB", 'D', "dustDiamond", 'T',
"ingotTitanium", 'C', ItemParts.getPartByName("electronicCircuit"), 'B', batteryStack); "ingotTitanium", 'C', "circuitBasic", 'B', batteryStack);
for (String part : ItemParts.types) for (String part : ItemParts.types)
{ {
@ -948,25 +946,25 @@ public class ModRecipes
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock"), "TTT", "WCW", 'T', CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock"), "TTT", "WCW", 'T',
ItemParts.getPartByName("CoolantSimple"), 'W', ItemStandaloneCables.getCableByName("insulatedcopper"), ItemParts.getPartByName("CoolantSimple"), 'W', ItemStandaloneCables.getCableByName("insulatedcopper"),
'C', ItemParts.getPartByName("electronicCircuit")); 'C', "circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T', CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T',
ItemParts.getPartByName("heliumCoolantSimple"), 'W', ItemParts.getPartByName("heliumCoolantSimple"), 'W',
ItemStandaloneCables.getCableByName("insulatedcopper"), 'C', ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
ItemParts.getPartByName("electronicCircuit")); "circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T', CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T',
ItemParts.getPartByName("NaKCoolantSimple"), 'W', ItemParts.getPartByName("NaKCoolantSimple"), 'W',
ItemStandaloneCables.getCableByName("insulatedcopper"), 'C', ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
ItemParts.getPartByName("electronicCircuit")); "circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Transformer"), "GGG", "WTW", "GCG", 'G', CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Transformer"), "GGG", "WTW", "GCG", 'G',
"blockGlass", 'W', ItemStandaloneCables.getCableByName("insulatedgold"), 'C', "blockGlass", 'W', ItemStandaloneCables.getCableByName("insulatedgold"), 'C',
ItemParts.getPartByName("electronicCircuit"), 'T', ModBlocks.mvt); "circuitBasic", 'T', ModBlocks.mvt);
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("EnergyStorage"), "PPP", "WBW", "PCP", 'P', CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("EnergyStorage"), "PPP", "WBW", "PCP", 'P',
"plankWood", 'W', ItemStandaloneCables.getCableByName("insulatedcopper"), 'C', "plankWood", 'W', ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
ItemParts.getPartByName("electronicCircuit"), 'B', ModItems.reBattery); "circuitBasic", 'B', ModItems.reBattery);
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemParts.getPartByName("CoolantSimple"), " T ", "TWT", " T ", 'T', "ingotTin", 'W', .addShapedOreRecipe(ItemParts.getPartByName("CoolantSimple"), " T ", "TWT", " T ", 'T', "ingotTin", 'W',
@ -1031,8 +1029,8 @@ public class ModRecipes
} }
CraftingHelper.addShapelessRecipe(new ItemStack(ModBlocks.rubberPlanks, 4), ModBlocks.rubberLog); CraftingHelper.addShapelessRecipe(new ItemStack(ModBlocks.rubberPlanks, 4), ModBlocks.rubberLog);
CraftingHelper.addShapelessRecipe(new ItemStack(ModItems.frequencyTransmitter), CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.frequencyTransmitter),
ItemStandaloneCables.getCableByName("insulatedcopper"), ItemParts.getPartByName("electronicCircuit")); ItemStandaloneCables.getCableByName("insulatedcopper"), "circuitBasic");
for (String name : ItemDustsSmall.types) for (String name : ItemDustsSmall.types)
{ {
@ -1065,12 +1063,12 @@ public class ModRecipes
ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor")); ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AlloySmelter), "XCX", "FMF", "XXX", 'C', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AlloySmelter), "XCX", "FMF", "XXX", 'C',
ItemParts.getPartByName("electronicCircuit"), 'F', new ItemStack(ModBlocks.ElectricFurnace), 'M', "circuitBasic", 'F', new ItemStack(ModBlocks.ElectricFurnace), 'M',
BlockMachineFrame.getFrameByName("machine", 1)); BlockMachineFrame.getFrameByName("machine", 1));
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.LesuStorage), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C', .addShapedOreRecipe(new ItemStack(ModBlocks.LesuStorage), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C',
ItemParts.getPartByName("electronicCircuit")); "circuitBasic");
TechRebornAPI TechRebornAPI
.addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil"), "NCN", "C C", "NCN", .addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil"), "NCN", "C C", "NCN",
@ -1078,8 +1076,13 @@ public class ModRecipes
RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hotTungstensteel"), RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hotTungstensteel"),
ItemIngots.getIngotByName("tungstensteel"), 440, 128)); ItemIngots.getIngotByName("tungstensteel"), 440, 128));
RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemCells.getCellByName("heliumplasma"),
ItemCells.getCellByName("helium"), 440, 128));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new VacuumFreezerRecipe(ItemCells.getCellByName("water"), ItemCells.getCellByName("cell"), 60, 128)); new VacuumFreezerRecipe(ItemCells.getCellByName("water"),
ItemCells.getCellByName("cell"), 60, 128));
} }
static void addSmeltingRecipes() static void addSmeltingRecipes()
@ -2265,20 +2268,20 @@ public class ModRecipes
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.Semifluidgenerator), "III", "IHI", "CGC", 'I', "plateIron", .addShapedOreRecipe(new ItemStack(ModBlocks.Semifluidgenerator), "III", "IHI", "CGC", 'I', "plateIron",
'H', ModBlocks.reinforcedglass, 'C', ItemParts.getPartByName("electronicCircuit"), 'G', 'H', ModBlocks.reinforcedglass, 'C', "circuitBasic", 'G',
ModBlocks.Generator); ModBlocks.Generator);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Semifluidgenerator), "AAA", "AHA", "CGC", 'A', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Semifluidgenerator), "AAA", "AHA", "CGC", 'A',
"plateAluminum", 'H', ModBlocks.reinforcedglass, 'C', ItemParts.getPartByName("electronicCircuit"), 'G', "plateAluminum", 'H', ModBlocks.reinforcedglass, 'C', "circuitBasic", 'G',
ModBlocks.Generator); ModBlocks.Generator);
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), "III", "I I", "CGC", 'I', "refinedIron", .addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), "III", "I I", "CGC", 'I', "refinedIron",
'C', ItemParts.getPartByName("electronicCircuit"), 'G', ModBlocks.Generator); 'C', "circuitBasic", 'G', ModBlocks.Generator);
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), "AAA", "A A", "CGC", 'A', "ingotAluminum", .addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), "AAA", "A A", "CGC", 'A', "ingotAluminum",
'C', ItemParts.getPartByName("electronicCircuit"), 'G', ModBlocks.Generator); 'C', "circuitBasic", 'G', ModBlocks.Generator);
// CraftingHelper.addShapedOreRecipe(new // CraftingHelper.addShapedOreRecipe(new
// ItemStack(ModBlocks.MagicalAbsorber), // ItemStack(ModBlocks.MagicalAbsorber),
@ -2299,7 +2302,7 @@ public class ModRecipes
// 'T', TechRebornAPI.recipeCompact.getItem("teleporter")); // 'T', TechRebornAPI.recipeCompact.getItem("teleporter"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Dragoneggenergysiphoner), "CTC", "ISI", "CBC", 'I', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Dragoneggenergysiphoner), "CTC", "ISI", "CBC", 'I',
"plateIridium", 'C', ItemParts.getPartByName("electronicCircuit"), "plateIridium", 'C', "circuitBasic",
'B', ModItems.lithiumBattery, 'S', ModBlocks.Supercondensator, 'T', ModBlocks.Extractor); 'B', ModItems.lithiumBattery, 'S', ModBlocks.Supercondensator, 'T', ModBlocks.Extractor);
CraftingHelper CraftingHelper
@ -2518,9 +2521,9 @@ public class ModRecipes
// Rubber Wood Yields // Rubber Wood Yields
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(getOre("rubberWood").getItem(), 16), new CentrifugeRecipe(new ItemStack(getOre("rubberWood").getItem(), 16),
ItemCells.getCellByName("empty", 5), new ItemStack(ModItems.parts, 8, 41), ItemCells.getCellByName("empty", 5), ItemParts.getPartByName("rubber", 8),
new ItemStack(Blocks.SAPLING, 6), ItemCells.getCellByName("methane", 1), new ItemStack(Blocks.SAPLING, 6), ItemCells.getCellByName("methane", 1),
ItemCells.getCellByName("carbon", 4), 5000, 5, false)); ItemCells.getCellByName("carbon", 4), 5000, 5, true));
// Soul Sand Byproducts // Soul Sand Byproducts
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
@ -3471,7 +3474,7 @@ public class ModRecipes
.addShapedOreRecipe(new ItemStack(ModItems.lapotronpack, 1, OreDictionary.WILDCARD_VALUE), "FOF", "SPS", .addShapedOreRecipe(new ItemStack(ModItems.lapotronpack, 1, OreDictionary.WILDCARD_VALUE), "FOF", "SPS",
"FIF", 'F', "circuitMaster", 'O', "FIF", 'F', "circuitMaster", 'O',
new ItemStack(ModItems.lapotronicOrb), 'S', ItemParts.getPartByName("superConductor"), 'I', new ItemStack(ModItems.lapotronicOrb), 'S', ItemParts.getPartByName("superConductor"), 'I',
"ingotIridium", 'P', new ItemStack(ModItems.lapotronpack)); "ingotIridium", 'P', new ItemStack(ModItems.lithiumBatpack));
} }
static void addGemToolRecipes(ItemStack gemsword, ItemStack gempick, ItemStack gemaxe, ItemStack gemHoe, static void addGemToolRecipes(ItemStack gemsword, ItemStack gempick, ItemStack gemaxe, ItemStack gemHoe,