From 0bb98b17810b531ce83e9a3c94a4d0a500872ec1 Mon Sep 17 00:00:00 2001 From: Tntrololol Date: Sun, 24 May 2015 13:51:41 -0500 Subject: [PATCH] Enabled Grinder to take an extra input in place of fluidstack --- .../java/techreborn/api/recipe/machines/GrinderRecipe.java | 4 +++- src/main/java/techreborn/init/ModRecipes.java | 4 +++- src/main/java/techreborn/tiles/TileGrinder.java | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java b/src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java index bfbd9f4ea..ff120d012 100644 --- a/src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java @@ -11,10 +11,12 @@ public class GrinderRecipe extends BaseRecipe { public FluidStack fluidStack; - public GrinderRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick) { + public GrinderRecipe(ItemStack input1, ItemStack input2, FluidStack fluidStack, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick) { super("grinderRecipe", tickTime, euPerTick); if (input1 != null) inputs.add(input1); + if( input2 != null) + inputs.add(input2); if (output1 != null) outputs.add(output1); if (output2 != null) diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 0586f54ee..f94579bb5 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -1,5 +1,6 @@ package techreborn.init; +import cpw.mods.fml.common.Mod; import ic2.api.item.IC2Items; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -211,7 +212,8 @@ public class ModRecipes { //TODO RecipeHanderer.addRecipe(new ChemicalReactorRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); - RecipeHanderer.addRecipe(new GrinderRecipe(new ItemStack(Items.diamond), new FluidStack(ModFluids.fluidMercury, 500), new ItemStack(Blocks.brick_block), null, null, null, 400, 5)); + RecipeHanderer.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1), null, new FluidStack(ModFluids.fluidMercury, 500), IC2Items.getItem("iridiumOre"), new ItemStack(ModItems.smallDusts, 6, 39), new ItemStack(ModItems.dusts, 6, 58), null, 400, 5)); + RecipeHanderer.addRecipe(new GrinderRecipe(new ItemStack(ModBlocks.ore, 1, 1), new ItemStack(ModItems.cells, 1, 16), null, IC2Items.getItem("iridiumOre"), new ItemStack(ModItems.smallDusts, 6, 39), new ItemStack(ModItems.dusts, 6, 58), null, 400, 5)); RecipeHanderer.addRecipe(new CentrifugeRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), new ItemStack(Items.emerald), new ItemStack(Items.apple), new ItemStack(Items.arrow), 1, 10)); LogHelper.info("Machine Recipes Added"); diff --git a/src/main/java/techreborn/tiles/TileGrinder.java b/src/main/java/techreborn/tiles/TileGrinder.java index 8c0cfdf80..805ba20d8 100644 --- a/src/main/java/techreborn/tiles/TileGrinder.java +++ b/src/main/java/techreborn/tiles/TileGrinder.java @@ -24,11 +24,11 @@ public class TileGrinder extends TileMachineBase implements IWrenchable, IEnergy public TileGrinder() { //TODO configs - energy = new BasicSink(this, 1000, - ConfigTechReborn.CentrifugeTier); + energy = new BasicSink(this, 1000, ConfigTechReborn.CentrifugeTier); - int[] inputs = new int[1]; + int[] inputs = new int[2]; inputs[0] = 0; + inputs[1] = 1; int[] outputs = new int[4]; outputs[0] = 2; outputs[1] = 3;