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/UniversalRecipeOutput.java | 48 ++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 22 deletions(-) (limited to 'ihl/recipes/UniversalRecipeOutput.java') diff --git a/ihl/recipes/UniversalRecipeOutput.java b/ihl/recipes/UniversalRecipeOutput.java index bda2bcf..17c20e4 100644 --- a/ihl/recipes/UniversalRecipeOutput.java +++ b/ihl/recipes/UniversalRecipeOutput.java @@ -9,24 +9,22 @@ import net.minecraftforge.fluids.FluidStack; public class UniversalRecipeOutput{ - private final List fluidOutputs=new ArrayList(); - private final List itemOutputs=new ArrayList(); + private final List fluidOutputs=new ArrayList(); + private final List itemOutputs=new ArrayList(); private final int time; public final boolean specialConditions; - public UniversalRecipeOutput(List fluidOutputs1, List itemOutputs1, int time1) + public UniversalRecipeOutput(FluidStack[] fluidOutputs1, Object[] itemOutputs1, int time1) { this(fluidOutputs1, itemOutputs1, time1,false); } - public UniversalRecipeOutput(List fluidOutputs1, List itemOutputs1, int time1, boolean specialConditions1) + public UniversalRecipeOutput(FluidStack[] fluidStacks, Object[] recipeOutputItemStacks, int time1, boolean specialConditions1) { - if(fluidOutputs1!=null) + if(fluidStacks!=null) { - Iterator ioi = fluidOutputs1.iterator(); - while(ioi.hasNext()) + for(FluidStack fStack:fluidStacks) { - FluidStack fStack = ioi.next(); if(fStack==null) { throw new NullPointerException("Recipe cannot contain null elements!"); @@ -34,12 +32,10 @@ public class UniversalRecipeOutput{ fluidOutputs.add(fStack); } } - if(itemOutputs1!=null) + if(recipeOutputItemStacks!=null) { - Iterator ioi = itemOutputs1.iterator(); - while(ioi.hasNext()) + for(Object io:recipeOutputItemStacks) { - Object io = ioi.next(); if(io==null) { throw new NullPointerException("Recipe output cannot be null!"); @@ -58,6 +54,14 @@ public class UniversalRecipeOutput{ time=time1; } + public UniversalRecipeOutput(List recipeOutputsFluids, + List recipeOutputsRecipeOut, int time1) { + this.fluidOutputs.addAll(recipeOutputsFluids); + this.itemOutputs.addAll(recipeOutputsRecipeOut); + this.time=time1; + this.specialConditions=false; + } + public boolean matches(List fluidOutputs1, List itemOutputs1) { if(fluidOutputs.size()!=fluidOutputs1.size()||itemOutputs.size()!=itemOutputs.size()) @@ -98,27 +102,27 @@ public class UniversalRecipeOutput{ } public UniversalRecipeOutput copyWithMultiplier(int mulipier) { - ArrayList fluidStacks = new ArrayList(); - ArrayList itemStacks = new ArrayList(); + FluidStack[] fluidStacks = null; + RecipeOutputItemStack[] itemStacks = null; if(fluidOutputs!=null && !fluidOutputs.isEmpty()) { - Iterator fi = fluidOutputs.iterator(); - while(fi.hasNext()) + fluidStacks = new FluidStack[fluidOutputs.size()]; + for(int i=0;i ii = itemOutputs.iterator(); - while(ii.hasNext()) + itemStacks = new RecipeOutputItemStack[itemOutputs.size()]; + for(int i=0;i