diff options
| author | Foghrye4 <foghrye4@gmail.com> | 2017-05-24 20:13:22 +0300 |
|---|---|---|
| committer | Foghrye4 <foghrye4@gmail.com> | 2017-05-24 20:13:22 +0300 |
| commit | 8ed8c659da9496bf49fec94c049b0abae21746a8 (patch) | |
| tree | e8fd775699a2255c17a804b26b4a0a6f43d857a0 /ihl/recipes | |
| parent | b67ac617dc9c5f43b911158a281c3c61ced5ea5a (diff) | |
fixing bugs with Iron workbench and fractionator
Diffstat (limited to 'ihl/recipes')
| -rw-r--r-- | ihl/recipes/IRecipeInputFluid.java | 1 | ||||
| -rw-r--r-- | ihl/recipes/IronWorkbenchRecipe.java | 12 | ||||
| -rw-r--r-- | ihl/recipes/RecipeInputDetonator.java | 2 | ||||
| -rw-r--r-- | ihl/recipes/RecipeInputFluidDictionary.java | 2 | ||||
| -rw-r--r-- | ihl/recipes/RecipeInputObjectInstance.java | 2 | ||||
| -rw-r--r-- | ihl/recipes/UniversalRecipeInput.java | 11 | ||||
| -rw-r--r-- | ihl/recipes/UniversalRecipeManager.java | 2 |
7 files changed, 20 insertions, 12 deletions
diff --git a/ihl/recipes/IRecipeInputFluid.java b/ihl/recipes/IRecipeInputFluid.java index 823c0ae..774973c 100644 --- a/ihl/recipes/IRecipeInputFluid.java +++ b/ihl/recipes/IRecipeInputFluid.java @@ -1,6 +1,7 @@ package ihl.recipes; import java.util.List; + import net.minecraftforge.fluids.FluidStack; public interface IRecipeInputFluid { diff --git a/ihl/recipes/IronWorkbenchRecipe.java b/ihl/recipes/IronWorkbenchRecipe.java index f0bd81f..e471811 100644 --- a/ihl/recipes/IronWorkbenchRecipe.java +++ b/ihl/recipes/IronWorkbenchRecipe.java @@ -3,12 +3,13 @@ package ihl.recipes; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import net.minecraft.item.ItemStack;
+
import ic2.api.recipe.IRecipeInput;
import ic2.api.recipe.RecipeInputItemStack;
import ic2.api.recipe.RecipeInputOreDict;
import ihl.interfaces.IWire;
import ihl.utils.IHLUtils;
+import net.minecraft.item.ItemStack;
public class IronWorkbenchRecipe {
public List<ItemStack> workspaceElements=new ArrayList<ItemStack>();
@@ -70,7 +71,14 @@ public class IronWorkbenchRecipe { }
}
- this.outputs.addAll(output1_1);
+ Iterator<ItemStack> iOutput = output1_1.iterator();
+ while(iOutput.hasNext())
+ {
+ ItemStack outputStack = iOutput.next();
+ if(outputStack==null)
+ throw new NullPointerException("Output shall not contain null.");
+ this.outputs.add(outputStack);
+ }
if(tools.size()>8 || materials.size()>12)
{
throw new IllegalArgumentException("Iron workbench recipe cannot contain more than 8 tools or more than 12 materials!");
diff --git a/ihl/recipes/RecipeInputDetonator.java b/ihl/recipes/RecipeInputDetonator.java index efef075..15030fd 100644 --- a/ihl/recipes/RecipeInputDetonator.java +++ b/ihl/recipes/RecipeInputDetonator.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Arrays;
import java.util.List;
-import ic2.api.recipe.IRecipeInput;
+import ic2.api.recipe.IRecipeInput;
import ihl.utils.IHLUtils;
import net.minecraft.item.ItemStack;
diff --git a/ihl/recipes/RecipeInputFluidDictionary.java b/ihl/recipes/RecipeInputFluidDictionary.java index e1581c3..eb5b057 100644 --- a/ihl/recipes/RecipeInputFluidDictionary.java +++ b/ihl/recipes/RecipeInputFluidDictionary.java @@ -2,8 +2,8 @@ package ihl.recipes; import java.util.List; -import net.minecraftforge.fluids.FluidStack; import ihl.IHLMod; +import net.minecraftforge.fluids.FluidStack; public class RecipeInputFluidDictionary implements IRecipeInputFluid { diff --git a/ihl/recipes/RecipeInputObjectInstance.java b/ihl/recipes/RecipeInputObjectInstance.java index 8648e72..42fdc26 100644 --- a/ihl/recipes/RecipeInputObjectInstance.java +++ b/ihl/recipes/RecipeInputObjectInstance.java @@ -3,9 +3,9 @@ package ihl.recipes; import java.util.Arrays; import java.util.List; -import net.minecraft.item.ItemStack; import ic2.api.recipe.IRecipeInput; import ihl.utils.IHLUtils; +import net.minecraft.item.ItemStack; public class RecipeInputObjectInstance implements IRecipeInput { diff --git a/ihl/recipes/UniversalRecipeInput.java b/ihl/recipes/UniversalRecipeInput.java index d2c25b6..2ed546a 100644 --- a/ihl/recipes/UniversalRecipeInput.java +++ b/ihl/recipes/UniversalRecipeInput.java @@ -1,15 +1,14 @@ package ihl.recipes;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import ic2.api.recipe.IRecipeInput;
import ic2.api.recipe.RecipeInputItemStack;
import ic2.api.recipe.RecipeInputOreDict;
import ihl.interfaces.IWire;
import ihl.utils.IHLUtils;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
@@ -106,7 +105,7 @@ public class UniversalRecipeInput { ItemStack is1 = getMatchedItemStack(is, itemInputs1);
if (is1 == null || !is.matches(is1)) {
return false;
- } else if (doCheckAmounts && is1.stackSize < is.getAmount()) {
+ } else if (doCheckAmounts && IHLUtils.getAmountOf(is1) < is.getAmount()) {
return false;
}
}
diff --git a/ihl/recipes/UniversalRecipeManager.java b/ihl/recipes/UniversalRecipeManager.java index 6c09bb1..cddc252 100644 --- a/ihl/recipes/UniversalRecipeManager.java +++ b/ihl/recipes/UniversalRecipeManager.java @@ -7,9 +7,9 @@ import java.util.Map; import java.util.Map.Entry;
import ic2.api.recipe.IRecipeInput;
+import ihl.utils.IHLUtils;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
-import ihl.utils.IHLUtils;
public class UniversalRecipeManager {
|