Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix empowerer; Closes #1130

Browse source
This commit is contained in:
Shadows_of_Fire 2018-06-24 14:35:50 -04:00
parent 6a46513844
commit 709b75a043
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/de/ellpeck/actuallyadditions/api/recipe/EmpowererRecipe.java
View file

@ -10,6 +10,9 @@
package de.ellpeck.actuallyadditions.api.recipe;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
@ -45,7 +48,17 @@ public class EmpowererRecipe {
}
public boolean matches(ItemStack base, ItemStack stand1, ItemStack stand2, ItemStack stand3, ItemStack stand4) {
return input.apply(base) && modifier1.apply(stand1) && modifier2.apply(stand2) && modifier3.apply(stand3) && modifier4.apply(stand4);
if (!input.apply(base)) return false;
List<Ingredient> matches = new ArrayList<>();
ItemStack[] stacks = { stand1, stand2, stand3, stand4 };
for (ItemStack s : stacks) {
if (!matches.contains(modifier1) && modifier1.apply(s)) matches.add(modifier1);
else if (!matches.contains(modifier2) && modifier2.apply(s)) matches.add(modifier2);
else if (!matches.contains(modifier3) && modifier3.apply(s)) matches.add(modifier3);
else if (!matches.contains(modifier4) && modifier4.apply(s)) matches.add(modifier4);
}
return matches.size() == 4;
}
public Ingredient getInput() {

1
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java
View file

@ -81,6 +81,7 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase {
if (done) {
stand.inv.getStackInSlot(0).shrink(1);
stand.markDirty();
}
}