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

Add redstone signal support for item conduit. (#265 )
Co-authored-by: M R S E <[email protected]>
2026-11-15 09:34:50 +00:00 · 2026-10-25 19:25:58 +01:00 · 2026-10-06 19:19:44 +02:00 · 2026-09-27 18:08:03 +00:00 · 2026-09-25 17:46:29 +02:00 · 2026-09-20 13:33:30 +02:00
10 changed files with 68 additions and 62 deletions
@@ -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));
@@ -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()));
@@ -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);
            }
@@ -52,7 +52,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt

    @Override
    public boolean isActive() {
-        return currentTask == null ? false : currentTask.getProgress() >= 0 && hasPower() && redstoneCheckPassed;
+        return currentTask != null && currentTask.getProgress() >= 0 && hasPower() && redstoneCheckPassed;
    }

    @Override
@@ -224,7 +224,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt
        ItemStack copy = item.copy();
        // try to add it to existing stacks first
        for (ItemStack outStack : outputStacks) {
-            if (outStack != null && copy != null) {
+            if (outStack != null) {
                int num = getNumCanMerge(outStack, copy);
                outStack.stackSize += num;
                copy.stackSize -= num;
@@ -322,7 +322,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt
    }

    protected int getNumCanMerge(ItemStack itemStack, ItemStack result) {
-        if (!itemStack.isItemEqual(result)) {
+        if (!itemStack.isItemEqual(result) || !ItemStack.areItemStackTagsEqual(itemStack, result)) {
            return 0;
        }
        return Math.min(itemStack.getMaxStackSize() - itemStack.stackSize, result.stackSize);
@@ -15,7 +15,9 @@ import crazypants.enderio.machine.SlotDefinition;

 public class TileEntityPainter extends AbstractPoweredTaskEntity implements ISidedInventory {

-    // private static final short MAX_POWER_USE_PER_TICK = 6;
+    private static final int SLOT_INPUT = 0;
+    private static final int SLOT_PAINT_SOURCE = 1;
+    private static final int SLOT_OUTPUT = 2;

    public TileEntityPainter() {
        // 0 = input slot, 1 = paint source, 2 = output slot
@@ -24,7 +26,8 @@ public class TileEntityPainter extends AbstractPoweredTaskEntity implements ISid

    @Override
    public boolean canExtractItem(int i, ItemStack itemstack, int j) {
-        return super.canExtractItem(i, itemstack, j) && PainterUtil.isMetadataEquivelent(itemstack, inventory[2]);
+        return super.canExtractItem(i, itemstack, j)
+                && PainterUtil.isMetadataEquivelent(itemstack, inventory[SLOT_OUTPUT]);
    }

    @Override
@@ -32,49 +35,44 @@ public class TileEntityPainter extends AbstractPoweredTaskEntity implements ISid
        return "Auto Painter";
    }

-    @Override
-    public boolean hasCustomInventoryName() {
-        return false;
-    }
-
    @Override
    public boolean isMachineItemValidForSlot(int i, ItemStack itemStack) {
-        if (i > 1) {
-            return false;
-        }
-        if (i == 0) {
+        if (i == SLOT_INPUT) {
            List<IMachineRecipe> recipes = MachineRecipeRegistry.instance
                    .getRecipesForInput(getMachineName(), MachineRecipeInput.create(i, itemStack));
-            if (inventory[1] == null) {
+            if (inventory[SLOT_PAINT_SOURCE] == null) {
                return !recipes.isEmpty();
            } else {
                for (IMachineRecipe rec : recipes) {
-                    if (rec instanceof BasicPainterTemplate) {
-                        BasicPainterTemplate temp = (BasicPainterTemplate) rec;
-                        if (temp.isValidPaintSource(inventory[1])) {
+                    if (rec instanceof BasicPainterTemplate temp) {
+                        if (temp.isValidPaintSource(inventory[SLOT_PAINT_SOURCE])) {
                            return true;
                        }
                    }
                }
+                return false;
            }
-            return false;
-        }
-        if (inventory[0] == null) {
-            Map<String, IMachineRecipe> recipes = MachineRecipeRegistry.instance.getRecipesForMachine(getMachineName());
-            for (IMachineRecipe rec : recipes.values()) {
-                if (rec instanceof BasicPainterTemplate) {
-                    BasicPainterTemplate temp = (BasicPainterTemplate) rec;
-                    if (temp.isValidPaintSource(itemStack)) {
-                        return true;
+        } else if (i == SLOT_PAINT_SOURCE) {
+            if (inventory[SLOT_INPUT] == null) {
+                Map<String, IMachineRecipe> recipes = MachineRecipeRegistry.instance
+                        .getRecipesForMachine(getMachineName());
+                for (IMachineRecipe rec : recipes.values()) {
+                    if (rec instanceof BasicPainterTemplate temp) {
+                        if (temp.isValidPaintSource(itemStack)) {
+                            return true;
+                        }
                    }
                }
+                return PaintSourceValidator.instance.isValidSourceDefault(itemStack);
+            } else {
+                return MachineRecipeRegistry.instance.getRecipeForInputs(
+                        getMachineName(),
+                        targetInput(),
+                        MachineRecipeInput.create(SLOT_PAINT_SOURCE, itemStack)) != null;
            }
-            return PaintSourceValidator.instance.isValidSourceDefault(itemStack);
+        } else {
+            return false;
        }
-        return MachineRecipeRegistry.instance.getRecipeForInputs(
-                getMachineName(),
-                i == 0 ? MachineRecipeInput.create(0, itemStack) : targetInput(),
-                i == 1 ? MachineRecipeInput.create(1, itemStack) : paintSource()) != null;
    }

    @Override
@@ -83,27 +81,10 @@ public class TileEntityPainter extends AbstractPoweredTaskEntity implements ISid
    }

    private MachineRecipeInput targetInput() {
-        return MachineRecipeInput.create(0, inventory[0]);
+        return MachineRecipeInput.create(SLOT_INPUT, inventory[SLOT_INPUT]);
    }

    private MachineRecipeInput paintSource() {
-        return MachineRecipeInput.create(1, inventory[1]);
-    }
-
-    @Override
-    protected int getNumCanMerge(ItemStack itemStack, ItemStack result) {
-        if (result == null || !result.isItemEqual(inventory[2])) {
-            // next result is a different item type
-            return 0;
-        } else if (result.hasTagCompound() && inventory[2].hasTagCompound()) {
-            if (inventory[2].getTagCompound().hasKey("Items")) return 0; // presence of internal items
-            String cookedId = result.getTagCompound().getString(BlockPainter.KEY_SOURCE_BLOCK_ID);
-            String invId = inventory[2].getTagCompound().getString(BlockPainter.KEY_SOURCE_BLOCK_ID);
-            if (!cookedId.equals(invId)) {
-                // next result has a different source item than the current one
-                return 0;
-            }
-        }
-        return Math.min(itemStack.getMaxStackSize() - itemStack.stackSize, result.stackSize);
+        return MachineRecipeInput.create(SLOT_PAINT_SOURCE, inventory[SLOT_PAINT_SOURCE]);
    }
 }
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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) {
Author	SHA1	Message	Date
Ressed	c232ea8534	Fix the iteration of getting slot from inventory for existing item filter. (#269 )	2026-10-25 19:25:58 +01:00
Fib4ikandM R S E	d27f30951a	Add redstone signal support for item conduit. (#265 ) Co-authored-by: M R S E <[email protected]>	2026-10-06 19:19:44 +02:00
Mykhailo Balaker	8dcda4e822	Prevent fall-through when clicking on the "Show Range" button in Vacuum Chest GUI (#274 )	2026-09-27 18:08:03 +00:00
fehling135	e337597a3c	Make specialmobs really availale for soul binder (#270 )	2026-09-25 17:46:29 +02:00
Nikolay S.	a8197e0026	Remove broken NBT-matching logic (#268 )	2026-09-20 13:33:30 +02:00