diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java index aec00590..08bf59d2 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java @@ -164,4 +164,10 @@ public class CrusherRecipeManager { return recipe.getInputs()[0].getInput(); } + public List getBalls() { + return balls; + } + + + } diff --git a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java index 992fe280..58bbfccb 100644 --- a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java @@ -22,6 +22,8 @@ import crazypants.enderio.crafting.IEnderIoRecipe; import crazypants.enderio.crafting.IRecipeInput; import crazypants.enderio.crafting.IRecipeOutput; import crazypants.enderio.crafting.RecipeReigistry; +import crazypants.enderio.machine.crusher.CrusherRecipeManager; +import crazypants.enderio.machine.crusher.GrindingBall; import crazypants.enderio.machine.crusher.GuiCrusher; import crazypants.render.RenderUtil; @@ -171,7 +173,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { protected int numTargetOuput; protected int indexOfTargetOutput; - private PositionedStack input; + private List input; private PositionedStack output; private ArrayList otherOutputs; private float[] outputChance; @@ -183,11 +185,15 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { } public float getChanceForOutput(ItemStack stack) { + if(stack == null) { + return -1; + } if(output.item.equals(stack)) { return outputChance[0]; } for (int i = 0; i < otherOutputs.size(); i++) { - if(otherOutputs.get(i).item.equals(stack)) { + PositionedStack oo = otherOutputs.get(i); + if(oo != null && oo.item.equals(stack) && i+1 < outputChance.length) { return outputChance[i + 1]; } } @@ -195,9 +201,8 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { } @Override - public PositionedStack getIngredient() { - randomRenderPermutation(input, cycleticks / 20); - return input; + public List getIngredients() { + return getCycledIngredients(cycleticks / 20, input); } @Override @@ -216,7 +221,12 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { public MillRecipe(ItemStack targetedResult, float energy, IRecipeInput ingredient, List outputs) { this.energy = energy; - input = new PositionedStack(getInputs(ingredient), 80 - offset.x, 12 - offset.y); + + input = new ArrayList(2); + input.add(new PositionedStack(getInputs(ingredient), 80 - offset.x, 12 - offset.y)); + + input.add(new PositionedStack(getBalls(), 122 - offset.x, 23 - offset.y)); + output = new PositionedStack(outputs.get(0).getItem(), 49 - offset.x, 59 - offset.y); otherOutputs = new ArrayList(); if(outputs.size() > 1) { @@ -240,6 +250,15 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { } } } + + private List getBalls() { + List daBalls = CrusherRecipeManager.getInstance().getBalls(); + List res = new ArrayList(); + for(GrindingBall ball : daBalls) { + res.add(ball.getInput()); + } + return res; + } } private class RecipeComparator implements Comparator {