From 2db8e30b1d2151fdde5d08a6c06aef55f0c397d2 Mon Sep 17 00:00:00 2001 From: Foghrye4 Date: Fri, 27 Jan 2017 11:32:28 +0300 Subject: License, readme and stuff --- ihl/recipes/UniversalRecipeInput.java | 37 +++++++++++------------------------ 1 file changed, 11 insertions(+), 26 deletions(-) (limited to 'ihl/recipes/UniversalRecipeInput.java') diff --git a/ihl/recipes/UniversalRecipeInput.java b/ihl/recipes/UniversalRecipeInput.java index f0b42e2..1d2b06c 100644 --- a/ihl/recipes/UniversalRecipeInput.java +++ b/ihl/recipes/UniversalRecipeInput.java @@ -15,29 +15,16 @@ import net.minecraftforge.fluids.FluidStack; public class UniversalRecipeInput{ - private final List fluidInputs=new ArrayList(); - private final List itemInputs=new ArrayList(); - private boolean sharp=true; - private int temperatureMin = 273; - private int temperatureMax = Integer.MAX_VALUE; - private float speedFactor=-1.0f;//=-Ea/R (k=k0*exp(-Ea/(RT))) + private final List fluidInputs=new ArrayList(); + private final List itemInputs=new ArrayList(); private int multiplier=Integer.MAX_VALUE; - - public UniversalRecipeInput(List fluidInputs1, List itemInputs1, boolean sharp1) - { - this(fluidInputs1, itemInputs1); - this.sharp=false; - } - - public UniversalRecipeInput(List fluidInputs1, List itemInputs1) + public UniversalRecipeInput(Object[] fluidStacks, Object[] iRecipeInputs) { - if(fluidInputs1!=null) + if(fluidStacks!=null) { - Iterator ifluidInputs1 = fluidInputs1.iterator(); - while(ifluidInputs1.hasNext()) + for(Object material:fluidStacks) { - Object material = ifluidInputs1.next(); if(material==null) { throw new NullPointerException("Recipe input cannot be null!"); @@ -52,12 +39,10 @@ public class UniversalRecipeInput{ } } } - if(itemInputs1!=null) + if(iRecipeInputs!=null) { - Iterator iitemInputs1 = itemInputs1.iterator(); - while(iitemInputs1.hasNext()) + for(Object material:iRecipeInputs) { - Object material = iitemInputs1.next(); if(material==null) { throw new NullPointerException("Recipe input cannot be null!"); @@ -103,13 +88,13 @@ public class UniversalRecipeInput{ public boolean matches(UniversalRecipeInput input) { List rInputs = input.getItemInputs(); Iterator ii = rInputs.iterator(); - List rInputsItems = new ArrayList(); + List rInputsItems = new ArrayList(); while(ii.hasNext()) { IRecipeInput is = ii.next(); rInputsItems.add(is.getInputs().get(0)); } - List rInputsFluids = new ArrayList(); + List rInputsFluids = new ArrayList(); List rInputsF = input.getFluidInputs(); Iterator iiF = rInputsF.iterator(); while(iiF.hasNext()) @@ -226,13 +211,13 @@ public class UniversalRecipeInput{ public boolean adjustAmounts(UniversalRecipeInput input, boolean doAdjustAmounts) { List rInputs = input.getItemInputs(); Iterator ii = rInputs.iterator(); - List rInputsItems = new ArrayList(); + List rInputsItems = new ArrayList(); while(ii.hasNext()) { IRecipeInput is = ii.next(); rInputsItems.add(is.getInputs().get(0)); } - List rInputsFluids = new ArrayList(); + List rInputsFluids = new ArrayList(); List rInputsF = input.getFluidInputs(); Iterator iiF = rInputsF.iterator(); while(iiF.hasNext()) -- cgit v1.2.3