maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
modmuss50 2016-03-20 15:32:34 +00:00
commit 431c05161a
2 changed files with 54 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/main/java/techreborn/init/ModRecipes.java
View file

@ -1,6 +1,7 @@
package techreborn.init;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFrostedIce;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@ -248,7 +249,9 @@ public class ModRecipes {
private static void addCompressorRecipes() {
// RecipeHandler.addRecipe(new CompressorRecipe(new ItemStack(Items.diamond), new ItemStack(Items.coal), 400, 20));
RecipeHandler.addRecipe(new CompressorRecipe(ItemParts.getPartByName("mixedmetalingot"), ItemParts.getPartByName("advancedAlloy"), 400, 20));
RecipeHandler.addRecipe(new CompressorRecipe(ItemParts.getPartByName("carbonfiber"), ItemPlates.getPlateByName("carbon"), 400, 20));
}
static void addExtractorRecipes() {
@ -295,6 +298,10 @@ public class ModRecipes {
}
public static ItemStack hammerStack = new ItemStack(ModItems.hammer, 1, OreDictionary.WILDCARD_VALUE);
public static ItemStack batteryStack = new ItemStack(ModItems.reBattery, 1, OreDictionary.WILDCARD_VALUE);
public static ItemStack crystalStack = new ItemStack(ModItems.energyCrystal, 1, OreDictionary.WILDCARD_VALUE);
public static ItemStack lapcrystalStack = new ItemStack(ModItems.lapotronCrystal, 1, OreDictionary.WILDCARD_VALUE);
public static Item hammer = ModItems.hammer;
@ -332,6 +339,45 @@ public class ModRecipes {
'A', "ingot" + name.substring(0, 1).toUpperCase() + name.substring(1));
}
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonmesh"), ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"));
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonfiber"), ItemParts.getPartByName("carbonmesh"), ItemParts.getPartByName("carbonmesh"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.batBox),
"WCW", "BBB", "WWW",
'W', "plankWood",
'B', batteryStack,
'C', ItemStandaloneCables.getCableByName("insulatedcopper"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.mfe),
"GEG", "EME", "GEG",
'M', BlockMachineFrame.getFrameByName("machine", 1),
'E', crystalStack,
'G', ItemStandaloneCables.getCableByName("insulatedgold"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.mfsu),
"LAL", "LML", "LAL",
'A', ItemParts.getPartByName("advancedCircuit"),
'L', lapcrystalStack,
'M', new ItemStack(ModBlocks.mfe));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IndustrialElectrolyzer),
"RER", "CEC", "RER",
'R', ItemIngots.getIngotByName("refinediron"),
'E', new ItemStack(ModBlocks.Extractor),
'C', ItemParts.getPartByName("advancedCircuit"));
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("mixedmetalingot", 2),
"RRR", "BBB", "TTT",
'R', ItemIngots.getIngotByName("refinediron"),
'B', "ingotBronze",
'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Compressor),
"SXS", "SCS", "SMS",
'C', ItemParts.getPartByName("electronicCircuit"),
'M', BlockMachineFrame.getFrameByName("machine", 1),
'S', Blocks.stone);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ElectricFurnace),
"XCX", "RFR", "XXX",
'C', ItemParts.getPartByName("electronicCircuit"),
@ -399,6 +445,12 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("machine", 1),
"AAA", "AXA", "AAA",
'A', ItemIngots.getIngotByName("refinediron"));
CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("advancedMachine", 1),
"XCX", "AMA", "XCX",
'A', ItemParts.getPartByName("advancedAlloy"),
'C', ItemPlates.getPlateByName("carbon"),
'M', BlockMachineFrame.getFrameByName("machine", 1));
CraftingHelper.addShapedOreRecipe(BlockStorage.getStorageBlockByName("sapphire"),
"AAA", "AAA", "AAA",

2
src/main/java/techreborn/items/ItemParts.java
View file

@ -39,7 +39,7 @@ public class ItemParts extends ItemTextureBase {
"thoriumCell", "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell",
"quadPlutoniumCell", "destructoPack", "iridiumNeutronReflector", "massHoleDevice", "computerMonitor"
, "machineParts", "thickNeutronReflector", "neutronReflector", "electronicCircuit", "advancedCircuit"
, "rubberSap", "rubber", "scrap", "pump", "teleporter", "advancedAlloy"};
, "rubberSap", "rubber", "scrap", "pump", "teleporter", "advancedAlloy", "mixedmetalingot", "carbonmesh", "carbonfiber"};
public ItemParts() {