mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-22 05:02:25 +00:00
Made my balls show up in NEI.
This commit is contained in:
1 parent
737cce6919
commit
44e4bebe46
2 files changed
+31
-6
No files matched your search
@@ -164,4 +164,10 @@ public class CrusherRecipeManager {
|
||||
return recipe.getInputs()[0].getInput();
|
||||
}
|
||||
|
||||
public List<GrindingBall> getBalls() {
|
||||
return balls;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -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<PositionedStack> input;
|
||||
private PositionedStack output;
|
||||
private ArrayList<PositionedStack> 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<PositionedStack> 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<IRecipeOutput> outputs) {
|
||||
this.energy = energy;
|
||||
input = new PositionedStack(getInputs(ingredient), 80 - offset.x, 12 - offset.y);
|
||||
|
||||
input = new ArrayList<PositionedStack>(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<PositionedStack>();
|
||||
if(outputs.size() > 1) {
|
||||
@@ -240,6 +250,15 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private List<ItemStack> getBalls() {
|
||||
List<GrindingBall> daBalls = CrusherRecipeManager.getInstance().getBalls();
|
||||
List<ItemStack> res = new ArrayList<ItemStack>();
|
||||
for(GrindingBall ball : daBalls) {
|
||||
res.add(ball.getInput());
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
private class RecipeComparator implements Comparator<MillRecipe> {
|
||||
|
||||
Reference in new issue
Block a user