From 031ea441251ab774baa1889b738f392c2f483afd Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 31 Aug 2016 20:58:56 +0200 Subject: [PATCH] Made the Empowerer actually require all of the 4 items >_> --- .../actuallyadditions/mod/tile/TileEntityEmpowerer.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java index 70b66950e..df6321cea 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java @@ -23,6 +23,7 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldServer; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -84,7 +85,7 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase{ private TileEntityDisplayStand[] getFittingModifiers(EmpowererRecipe recipe, int powerDivider){ TileEntityDisplayStand[] modifierStands = new TileEntityDisplayStand[4]; - List itemsStillNeeded = Arrays.asList(recipe.modifier1, recipe.modifier2, recipe.modifier3, recipe.modifier4); + List itemsStillNeeded = new ArrayList(Arrays.asList(recipe.modifier1, recipe.modifier2, recipe.modifier3, recipe.modifier4)); for(int i = 0; i < EnumFacing.HORIZONTALS.length; i++){ EnumFacing facing = EnumFacing.HORIZONTALS[i]; @@ -94,9 +95,10 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase{ if(tile != null && tile instanceof TileEntityDisplayStand){ TileEntityDisplayStand stand = (TileEntityDisplayStand)tile; ItemStack standItem = stand.getStackInSlot(0); - if(stand.storage.getEnergyStored() >= recipe.energyPerStand/powerDivider && ItemUtil.contains(itemsStillNeeded, standItem, true)){ + int containPlace = ItemUtil.getPlaceAt(itemsStillNeeded, standItem, true); + if(stand.storage.getEnergyStored() >= recipe.energyPerStand/powerDivider && containPlace != -1){ modifierStands[i] = stand; - itemsStillNeeded.remove(standItem); + itemsStillNeeded.remove(containPlace); } else{ return null;