Skip to content

Fix: Shelf block entity items rendered in wrong slot for Bedrock clients #6225

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
onebeastchris merged 2 commits into from
Mar 12, 2026
+24 −5
Merged

Fix: Shelf block entity items rendered in wrong slot for Bedrock clients #6225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eabb929
Fix: Shelf block entity items rendered in wrong slot for Bedrock clients
LPettay Mar 8, 2026
27b0cb0
Move static final EMPTY_ITEM variable to BedrockItemBuilder, add comm…
onebeastchris Mar 12, 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
3 changes: 3 additions & 0 deletions core/src/main/java/org/geysermc/geyser/translator/item/BedrockItemBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
* An intermediary class made to allow easy access to work-in-progress NBT, such as lore and display.
*/
public final class BedrockItemBuilder {

public static final NbtMap EMPTY_ITEM = BedrockItemBuilder.createItemNbt("", 0, 0).build();

// All Bedrock-style
@Nullable
private String customName;
Expand Down
26 changes: 21 additions & 5 deletions ...in/java/org/geysermc/geyser/translator/level/block/entity/ShelfBlockEntityTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,35 @@
import org.geysermc.geyser.item.parser.ItemStackParser;
import org.geysermc.geyser.level.block.type.BlockState;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.translator.item.BedrockItemBuilder;
import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityType;

import java.util.Comparator;
import java.util.Arrays;
import java.util.List;

@BlockEntity(type = BlockEntityType.SHELF)
public class ShelfBlockEntityTranslator extends BlockEntityTranslator {

private static final int SLOT_COUNT = 3;

@Override
public void translateTag(GeyserSession session, NbtMapBuilder bedrockNbt, NbtMap javaNbt, BlockState blockState) {
// We can't translate align_items_to_bottom, I think :(
bedrockNbt.putList("Items", NbtType.COMPOUND, javaNbt.getList("Items", NbtType.COMPOUND).stream()
.sorted(Comparator.comparingInt(stack -> stack.getByte("Slot")))
.map(stack -> ItemStackParser.javaItemStackToBedrock(session, stack).build())
.toList());

// Bedrock determines shelf item position by list index, so we must produce
// a dense list with empty items for unoccupied slots.
// Verified with BDS 1.26.0.2
NbtMap[] items = new NbtMap[SLOT_COUNT];
Arrays.fill(items, BedrockItemBuilder.EMPTY_ITEM);

List<NbtMap> javaItems = javaNbt.getList("Items", NbtType.COMPOUND);
for (NbtMap stack : javaItems) {
int slot = stack.getByte("Slot");
if (slot >= 0 && slot < SLOT_COUNT) {
items[slot] = ItemStackParser.javaItemStackToBedrock(session, stack).build();
}
}

bedrockNbt.putList("Items", NbtType.COMPOUND, Arrays.asList(items));
}
}
Loading