Redo all Industrial Grinder recipes, and move them to a separate class (Here starts the great recipe cleanup of 2017!)

This commit is contained in:
ProfessorProspector 2016-12-30 23:45:42 -08:00
parent 9b73f20ad0
commit c24116e259
8 changed files with 270 additions and 1056 deletions

View file

@ -13,11 +13,12 @@ import java.util.List;
*/
public abstract class BaseRecipe implements IBaseRecipeType, Cloneable {
private ArrayList<ItemStack> inputs;
public String name;
public int tickTime;
public int euPerTick;
private ArrayList<ItemStack> inputs;
private ArrayList<ItemStack> outputs;
private boolean oreDict = true;
public BaseRecipe(String name, int tickTime, int euPerTick) {
inputs = new ArrayList<>();
@ -39,7 +40,7 @@ public abstract class BaseRecipe implements IBaseRecipeType, Cloneable {
}
public void addOutput(ItemStack stack) {
if(stack == null || stack.isEmpty()){
if (stack == null || stack.isEmpty()) {
throw new InvalidParameterException("output is invalid!");
}
outputs.add(stack);
@ -86,9 +87,13 @@ public abstract class BaseRecipe implements IBaseRecipeType, Cloneable {
return super.clone();
}
public void setOreDict(boolean oreDict) {
this.oreDict = oreDict;
}
@Override
public boolean useOreDic() {
return true;
return oreDict;
}
@Override
@ -96,8 +101,8 @@ public abstract class BaseRecipe implements IBaseRecipeType, Cloneable {
return outputs;
}
public void addInput(ItemStack inuput){
if(inuput == null || inuput.isEmpty()){
public void addInput(ItemStack inuput) {
if (inuput == null || inuput.isEmpty()) {
throw new InvalidParameterException("input is invalid!");
}
inputs.add(inuput);

View file

@ -8,6 +8,7 @@ import techreborn.api.recipe.BaseRecipe;
public class IndustrialGrinderRecipe extends BaseRecipe {
public FluidStack fluidStack;
boolean useOreDic = true;
public IndustrialGrinderRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1,
ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick) {
@ -25,8 +26,19 @@ public class IndustrialGrinderRecipe extends BaseRecipe {
this.fluidStack = fluidStack;
}
public IndustrialGrinderRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1,
ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick, boolean useOreDict) {
this(input1, fluidStack, output1, output2, output3, output4, tickTime, euPerTick);
this.useOreDic = useOreDict;
}
@Override
public String getUserFreindlyName() {
return "IndustrialGrinder";
}
@Override
public boolean useOreDic() {
return useOreDic;
}
}