Enabled Grinder to take an extra input in place of fluidstack

This commit is contained in:
Tntrololol 2015-05-24 13:51:41 -05:00
parent 2d17902d03
commit 0bb98b1781
3 changed files with 9 additions and 5 deletions

View file

@ -11,10 +11,12 @@ public class GrinderRecipe extends BaseRecipe {
public FluidStack fluidStack; 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); super("grinderRecipe", tickTime, euPerTick);
if (input1 != null) if (input1 != null)
inputs.add(input1); inputs.add(input1);
if( input2 != null)
inputs.add(input2);
if (output1 != null) if (output1 != null)
outputs.add(output1); outputs.add(output1);
if (output2 != null) if (output2 != null)

View file

@ -1,5 +1,6 @@
package techreborn.init; package techreborn.init;
import cpw.mods.fml.common.Mod;
import ic2.api.item.IC2Items; import ic2.api.item.IC2Items;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
@ -211,7 +212,8 @@ public class ModRecipes {
//TODO //TODO
RecipeHanderer.addRecipe(new ChemicalReactorRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); 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)); 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"); LogHelper.info("Machine Recipes Added");

View file

@ -24,11 +24,11 @@ public class TileGrinder extends TileMachineBase implements IWrenchable, IEnergy
public TileGrinder() { public TileGrinder() {
//TODO configs //TODO configs
energy = new BasicSink(this, 1000, energy = new BasicSink(this, 1000, ConfigTechReborn.CentrifugeTier);
ConfigTechReborn.CentrifugeTier);
int[] inputs = new int[1]; int[] inputs = new int[2];
inputs[0] = 0; inputs[0] = 0;
inputs[1] = 1;
int[] outputs = new int[4]; int[] outputs = new int[4];
outputs[0] = 2; outputs[0] = 2;
outputs[1] = 3; outputs[1] = 3;