Fix the iteration of getting slot from inventory for existing item filter. (#269)

Co-authored-by: M R S E <[email protected]>

src/main/java/crazypants/enderio/conduit/ConduitUtil.java

@@ -320,7 +320,7 @@ public class ConduitUtil {
         }
 
         int signalStrength = getInternalSignalForColor(bundle, col);
-        if (signalStrength < 15 && DyeColor.RED == col && bundle != null && bundle.getEntity() != null) {
+        if (signalStrength < 15 && bundle != null && bundle.getEntity() != null) {
             TileEntity te = bundle.getEntity();
             signalStrength = Math
                     .max(signalStrength, te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord));

src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java

@@ -175,6 +175,7 @@ public class ItemSettings extends BaseSettingsPanel {
     private void updateButtons() {
         rsB.onGuiInit();
         rsB.setMode(itemConduit.getExtractionRedstoneMode(gui.getDir()));
+        colorB.onGuiInit();
 
         loopB.onGuiInit();
         loopB.setSelected(itemConduit.isSelfFeedEnabled(gui.getDir()));

src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java

@@ -47,8 +47,8 @@ public class ExistingItemFilter implements IItemFilter {
 
     private boolean isStackInInventory(NetworkedInventory ni, ItemStack item) {
         int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide());
-        for (int i = 0; i < slots.length; i++) {
-            ItemStack stack = ni.getInventory().getStackInSlot(i);
+        for (int slot : slots) {
+            ItemStack stack = ni.getInventory().getStackInSlot(slot);
             if (stackEqual(item, stack)) {
                 return true;
             }
@@ -116,8 +116,8 @@ public class ExistingItemFilter implements IItemFilter {
             snapshot = new ArrayList<>();
         }
         int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide());
-        for (int i = 0; i < slots.length; i++) {
-            ItemStack stack = ni.getInventory().getStackInSlot(i);
+        for (int slot : slots) {
+            ItemStack stack = ni.getInventory().getStackInSlot(slot);
             if (stack != null && !isStackInSnapshot(stack)) {
                 snapshot.add(stack);
             }

src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java

@@ -15,8 +15,14 @@ public class SoulBinderEnderCystalRecipe extends AbstractSoulBinderRecipe {
                 Config.soulBinderEnderCystalRF,
                 Config.soulBinderEnderCystalLevels,
                 "SoulBinderEnderCystalRecipe",
-                "SpecialMobs.SpecialEnderman",
-                "Enderman");
+                "Enderman",
+                "SpecialMobs.BlindingEnderman",
+                "SpecialMobs.CursedEnderman",
+                "SpecialMobs.IcyEnderman",
+                "SpecialMobs.LightningEnderman",
+                "SpecialMobs.MiniEnderman",
+                "SpecialMobs.MirageEnderman",
+                "SpecialMobs.ThiefEnderman");
     }
 
     @Override

src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java

@@ -15,8 +15,14 @@ public class SoulBinderPrecientCystalRecipe extends AbstractSoulBinderRecipe {
                 Config.soulBinderPrecientCystalRF,
                 Config.soulBinderPrecientCystalLevels,
                 "SoulBinderPrecientCystalRecipe",
-                "SpecialMobs.SpecialEnderman",
-                "Enderman");
+                "Enderman",
+                "SpecialMobs.BlindingEnderman",
+                "SpecialMobs.CursedEnderman",
+                "SpecialMobs.IcyEnderman",
+                "SpecialMobs.LightningEnderman",
+                "SpecialMobs.MiniEnderman",
+                "SpecialMobs.MirageEnderman",
+                "SpecialMobs.ThiefEnderman");
     }
 
     @Override

src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java

@@ -16,7 +16,12 @@ public class SoulBinderReanimationRecipe extends AbstractSoulBinderRecipe {
                 Config.soulBinderReanimationLevels,
                 "SoulBinderReanimationRecipe",
                 "Zombie",
-                "SpecialMobs.SpecialZombie");
+                "SpecialMobs.BrutishZombie",
+                "SpecialMobs.FireZombie",
+                "SpecialMobs.FishingZombie",
+                "SpecialMobs.GiantZombie",
+                "SpecialMobs.HungryZombie",
+                "SpecialMobs.PlagueZombie");
     }
 
     @Override

src/main/java/crazypants/enderio/machine/soul/SoulBinderSentientRecipe.java

@@ -16,7 +16,13 @@ public class SoulBinderSentientRecipe extends AbstractSoulBinderRecipe {
                 Config.soulBinderReanimationLevels,
                 "SoulBinderSentientRecipe",
                 "Witch",
-                "enderzoo.WitherWitch");
+                "enderzoo.WitherWitch",
+                "SpecialMobs.DominationWitch",
+                "SpecialMobs.RageWitch",
+                "SpecialMobs.ShadowsWitch",
+                "SpecialMobs.UndeadWitch",
+                "SpecialMobs.WildsWitch",
+                "SpecialMobs.WindWitch");
     }
 
     @Override

src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java

@@ -148,6 +148,7 @@ public class GuiVacuumChest extends GuiContainerBaseEIO {
                 break;
             case RANGE_ID:
                 te.setShowRange(showRangeB.isSelected());
+                break;
             case ID_WHITELIST:
                 itemFilter = te.getItemFilter();
                 if (itemFilter != null) {