Skip to content

Output bus filtering #4337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zetrock1 wants to merge 3 commits into
base: 1.20.1
Choose a base branch
from
Open

Output bus filtering #4337

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb08e6f
add item filter support for ItemBusPartMachine and kinda work (have u…
zetrock1 Dec 11, 2025
7cf1b1b
Merge branch '1.20.1' into itembuspartmachine-filter
zetrock1 Jan 14, 2026
219164f
Merge branch '1.20.1' into itembuspartmachine-filter
zetrock1 Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

import com.gregtechceu.gtceu.api.blockentity.IPaintable;
import com.gregtechceu.gtceu.api.capability.recipe.IO;
import com.gregtechceu.gtceu.api.cover.filter.FilterHandler;
import com.gregtechceu.gtceu.api.cover.filter.FilterHandlers;
import com.gregtechceu.gtceu.api.cover.filter.ItemFilter;
import com.gregtechceu.gtceu.api.gui.GuiTextures;
import com.gregtechceu.gtceu.api.gui.fancy.ConfiguratorPanel;
import com.gregtechceu.gtceu.api.gui.widget.SlotWidget;
Expand Down Expand Up @@ -78,12 +81,17 @@ public class ItemBusPartMachine extends TieredIOPartMachine
@Persisted
@DescSynced
private boolean isDistinct = false;
@Persisted
@DescSynced
@Getter
protected final FilterHandler<ItemStack, ItemFilter> filterHandler;

public ItemBusPartMachine(IMachineBlockEntity holder, int tier, IO io, Object... args) {
super(holder, tier, io);
this.inventory = createInventory(args);
this.circuitSlotEnabled = true;
this.circuitInventory = createCircuitItemHandler(io).shouldSearchContent(false);
filterHandler = FilterHandlers.item(this);
}

//////////////////////////////////////
Expand All @@ -99,8 +107,14 @@ protected int getInventorySize() {
return sizeRoot * sizeRoot;
}

protected boolean matchesFilter(ItemStack stack) {
if (filterHandler.isFilterPresent())
return filterHandler.getFilter().test(stack);
return true;
}

protected NotifiableItemStackHandler createInventory(Object... args) {
return new NotifiableItemStackHandler(this, getInventorySize(), io);
return new NotifiableItemStackHandler(this, getInventorySize(), io).setFilter(this::matchesFilter);
}

protected NotifiableItemStackHandler createCircuitItemHandler(Object... args) {
Expand Down Expand Up @@ -318,6 +332,8 @@ public Widget createUIWidget() {
var group = new WidgetGroup(0, 0, 18 * rowSize + 16, 18 * colSize + 16);
var container = new WidgetGroup(4, 4, 18 * rowSize + 8, 18 * colSize + 8);
int index = 0;
group.addWidget(filterHandler.createFilterSlotUI(-115 + (18 * rowSize) / 2, 35 + 11 * rowSize));
// group.addWidget(filterHandler.createFilterConfigUI(-100, 100, 156, 60));
for (int y = 0; y < colSize; y++) {
for (int x = 0; x < rowSize; x++) {
container.addWidget(
Expand All @@ -329,7 +345,6 @@ public Widget createUIWidget() {

container.setBackground(GuiTextures.BACKGROUND_INVERSE);
group.addWidget(container);

return group;
}
}