diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrame.java index daa7a5237..f32481c8f 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrame.java @@ -12,11 +12,23 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import techreborn.client.TechRebornCreativeTab; +import techreborn.init.ModBlocks; +import java.security.InvalidParameterException; import java.util.List; public class BlockMachineFrame extends Block { + public static ItemStack getFrameByName(String name, int count) + { + for (int i = 0; i < types.length; i++) { + if (types[i].equalsIgnoreCase(name)) { + return new ItemStack(ModBlocks.machineframe, count, i); + } + } + throw new InvalidParameterException("The part " + name + " could not be found."); + } + public static final String[] types = new String[] { "aluminum", "iron", "bronze", "brass", "steel", "titanium" }; diff --git a/src/main/java/techreborn/compat/recipes/RecipesIC2.java b/src/main/java/techreborn/compat/recipes/RecipesIC2.java index 24d738593..0a8e724ae 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesIC2.java +++ b/src/main/java/techreborn/compat/recipes/RecipesIC2.java @@ -60,7 +60,7 @@ public class RecipesIC2 implements ICompatModule { public void addTRRecipes(){ //General CraftingHelper.addShapedOreRecipe( - new ItemStack(ModItems.parts, 16, 13), + ItemParts.getPartByName("machineParts", 16), "CSC", "SCS", "CSC", 'S', "ingotSteel", 'C', IC2Items.getItem("electronicCircuit")); @@ -416,7 +416,11 @@ public class RecipesIC2 implements ICompatModule { RecipeHandler.addRecipe(new AssemblingMachineRecipe(ItemPlates.getPlateByName("aluminum", 4), IC2Items.getItem("generator"), IC2Items.getItem("waterMill"), 120, 5)); - //CentrifugeRecipes + RecipeHandler.addRecipe(new AssemblingMachineRecipe(ItemPlates.getPlateByName("aluminum", 4), IC2Items.getItem("generator"), IC2Items.getItem("waterMill"), 120, 5)); + + + + //CentrifugeRecipes //Plantball/Bio Chaff RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.grass, 16), null, new ItemStack(IC2Items.getItem("biochaff").getItem(), 8), new ItemStack(IC2Items.getItem("plantBall").getItem(), 8), new ItemStack(Items.clay_ball), new ItemStack(Blocks.sand, 8), 2500, 5)); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 9fbd0f42f..23a9053bc 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -22,6 +22,7 @@ import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe; import techreborn.api.recipe.machines.IndustrialSawmillRecipe; import techreborn.api.recipe.machines.LatheRecipe; import techreborn.api.recipe.machines.PlateCuttingMachineRecipe; +import techreborn.blocks.BlockMachineFrame; import techreborn.blocks.BlockOre; import techreborn.blocks.BlockStorage; import techreborn.blocks.BlockStorage2; @@ -913,6 +914,12 @@ public class ModRecipes { //Basic Circuit Board RecipeHandler.addRecipe(new AssemblingMachineRecipe(ItemPlates.getPlateByName("aluminum", 1), ItemPlates.getPlateByName("electrum", 2), ItemParts.getPartByName("basicCircuitBoard", 2), 120, 5)); RecipeHandler.addRecipe(new AssemblingMachineRecipe(ItemPlates.getPlateByName("iron", 1), ItemPlates.getPlateByName("electrum", 2), ItemParts.getPartByName("basicCircuitBoard", 2), 120, 5)); + + + for(String type : BlockMachineFrame.types){ + RecipeHandler.addRecipe(new AssemblingMachineRecipe(ItemParts.getPartByName("machineParts", 1), ItemPlates.getPlateByName(type, 8), BlockMachineFrame.getFrameByName(type, 1), 400, 8)); + } + } static void addIndustrialCentrifugeRecipes() { diff --git a/src/main/java/techreborn/items/ItemParts.java b/src/main/java/techreborn/items/ItemParts.java index e57c73abf..8c39cacf6 100644 --- a/src/main/java/techreborn/items/ItemParts.java +++ b/src/main/java/techreborn/items/ItemParts.java @@ -41,7 +41,7 @@ public class ItemParts extends Item { "bronzeGear", "ironGear", "titaniumGear", "steelGear", "tungstensteelGear", "laserFocus", "ductTape", "lazuriteChunk", "iridiumAlloyIngot", "rockCutterBlade", "superconductor", "thoriumCell", "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell", - "quadPlutoniumCell", "destructoPack", "iridiumNeutronReflector", "massHoleDevice", "computerMonitor" }; + "quadPlutoniumCell", "destructoPack", "iridiumNeutronReflector", "massHoleDevice", "computerMonitor", "machineParts" }; private IIcon[] textures; diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 8ee2eda51..dc007149e 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -665,6 +665,7 @@ item.techreborn.part.destructoPack.name=Destructopack item.techreborn.part.iridiumNeutronReflector.name=Iridium Neutron Reflector item.techreborn.part.massHoleDevice.name=Mass Hole Device item.techreborn.part.computerMonitor.name=Computer Monitor +item.techreborn.part.machineParts.name=Machine Parts #Tools