Skip to content

Toolbelt capability passthrough #2901

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

Merged
M-W-K merged 3 commits into from
Dec 18, 2025
Merged

Toolbelt capability passthrough #2901

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5eacd29
Toolbelt capability passthrough
M-W-K Dec 9, 2025
b458724
Move toolbelt container to unique capability
M-W-K Dec 11, 2025
43297d7
sadness
M-W-K Dec 11, 2025
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
25 changes: 16 additions & 9 deletions src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager
(newItem, onlyAmountChanged, client, init) -> handler
.onContentsChanged(index)))
.background(GTGuiTextures.SLOT, GTGuiTextures.TOOL_SLOT_OVERLAY)
.debugName("slot_" + index))
.debugName("toolbelt_inventory"))
.name("slot_" + index))
.name("toolbelt_inventory"))
.bindPlayerInventory();
}

Expand Down Expand Up @@ -265,7 +265,7 @@ public boolean shouldCauseReequipAnimation(@NotNull ItemStack oldStack, @NotNull
}

@Override
public int getMetadata(ItemStack stack) {
public int getMetadata(@NotNull ItemStack stack) {
ItemStack selected = getHandler(stack).getSelectedStack();
if (!selected.isEmpty()) {
return selected.getItem().getMetadata(selected);
Expand Down Expand Up @@ -420,7 +420,8 @@ public boolean supportsTool(ItemStack stack, ItemStack tool) {
}

private ToolStackHandler getHandler(ItemStack stack) {
IItemHandler handler = stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
// use the very rarely used sidedness of item capabilities to signal that we want to ignore passthrough
Comment thread
M-W-K marked this conversation as resolved.
Outdated
IItemHandler handler = stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP);
if (handler instanceof ToolStackHandler h) return h;
else return FALLBACK;
}
Expand All @@ -441,8 +442,7 @@ public void changeSelectedToolMousewheel(int direction, ItemStack stack) {
@SideOnly(Side.CLIENT)
public void changeSelectedToolHotkey(int slot, ItemStack stack) {
ToolStackHandler handler = getHandler(stack);
if (slot < 0 || slot >= handler.getSlots()) handler.selectedSlot = -1;
else handler.selectedSlot = slot;
handler.setSelectedSlot(slot);
PacketToolbeltSelectionChange.toServer(handler.selectedSlot);
}

Expand Down Expand Up @@ -569,12 +569,18 @@ public ToolbeltCapabilityProvider(ItemStack stack) {

@Override
public boolean hasCapability(@NotNull Capability<?> capability, EnumFacing facing) {
return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY;
ItemStack selected = getHandler().getSelectedStack();
if (!selected.isEmpty() && facing != EnumFacing.UP) {
Comment thread
M-W-K marked this conversation as resolved.
Outdated
return selected.hasCapability(capability, facing);
} else return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY;
}

@Override
public <T> T getCapability(@NotNull Capability<T> capability, EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
ItemStack selected = getHandler().getSelectedStack();
if (!selected.isEmpty() && facing != EnumFacing.UP) {
return selected.getCapability(capability, facing);
} else if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(this.getHandler());
else return null;
}
Expand Down Expand Up @@ -646,7 +652,8 @@ public int getSelectedSlot() {
}

public void setSelectedSlot(int selectedSlot) {
this.selectedSlot = Math.min(getSlots() - 1, Math.max(selectedSlot, -1));
if (selectedSlot >= getSlots() || selectedSlot < 0) this.selectedSlot = -1;
else this.selectedSlot = selectedSlot;
}

public void enablePassthrough() {
Expand Down
Loading