Removed fluid tank from IndustrialElectrolyzer closes #58

This commit is contained in:
gigabit101 2015-07-02 23:39:36 +01:00
parent b7a9824cd3
commit 26eff9bcbf
7 changed files with 14 additions and 186 deletions

View file

@ -8,9 +8,7 @@ import techreborn.tiles.TileIndustrialElectrolyzer;
public class IndustrialElectrolyzerRecipe extends BaseRecipe {
public FluidStack fluidStack;
public IndustrialElectrolyzerRecipe(ItemStack inputCells, ItemStack input2, FluidStack fluidStack, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick)
public IndustrialElectrolyzerRecipe(ItemStack inputCells, ItemStack input2, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick)
{
super("industrialElectrolyzerRecipe", tickTime, euPerTick);
if (inputCells != null)
@ -25,26 +23,6 @@ public class IndustrialElectrolyzerRecipe extends BaseRecipe {
addOutput(output3);
if (output4 != null)
addOutput(output4);
this.fluidStack = fluidStack;
}
public IndustrialElectrolyzerRecipe(boolean userOreDic, ItemStack inputCells, ItemStack input2, FluidStack fluidStack, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick)
{
super("industrialElectrolyzerRecipe", tickTime, euPerTick);
this.useOreDictionary = userOreDic;
if (inputCells != null)
inputs.add(inputCells);
if( input2 != null)
inputs.add(input2);
if (output1 != null)
addOutput(output1);
if (output2 != null)
addOutput(output2);
if (output3 != null)
addOutput(output3);
if (output4 != null)
addOutput(output4);
this.fluidStack = fluidStack;
}
@Override
@ -52,49 +30,6 @@ public class IndustrialElectrolyzerRecipe extends BaseRecipe {
return "Industrial Electrolyzer";
}
@Override
public boolean canCraft(TileEntity tile) {
if (fluidStack == null) {
return true;
}
if (tile instanceof TileIndustrialElectrolyzer) {
TileIndustrialElectrolyzer grinder = (TileIndustrialElectrolyzer) tile;
if (grinder.tank.getFluid() == null) {
return false;
}
if (grinder.tank.getFluid().getFluidID() == fluidStack.getFluidID()) {
if (grinder.tank.getFluidAmount() >= fluidStack.amount) {
return true;
}
}
}
return false;
}
@Override
public boolean onCraft(TileEntity tile) {
if (fluidStack == null) {
return true;
}
if (tile instanceof TileIndustrialElectrolyzer) {
TileIndustrialElectrolyzer grinder = (TileIndustrialElectrolyzer) tile;
if (grinder.tank.getFluid() == null) {
return false;
}
if (grinder.tank.getFluid().getFluidID() == fluidStack.getFluidID()) {
if (grinder.tank.getFluidAmount() >= fluidStack.amount) {
if (grinder.tank.getFluidAmount() > 0) {
grinder.tank.setFluid(new FluidStack(fluidStack.getFluid(), grinder.tank.getFluidAmount() - fluidStack.amount));
} else {
grinder.tank.setFluid(null);
}
return true;
}
}
}
return false;
}
@Override
public boolean useOreDic()
{