Skip to content

Properly handle equipment updates in containers #734

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
roccodev wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Properly handle equipment updates in containers #734

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
4bfdb84
Properly handle equipment updates in containers
roccodev Oct 20, 2026
70ac883
Properly handle undersized window items
roccodev Oct 20, 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
11 changes: 2 additions & 9 deletions common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/Protocol1_9To1_8.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,7 @@
import com.viaversion.viarewind.protocol.v1_9to1_8.rewriter.EntityPacketRewriter1_9;
import com.viaversion.viarewind.protocol.v1_9to1_8.rewriter.PlayerPacketRewriter1_9;
import com.viaversion.viarewind.protocol.v1_9to1_8.rewriter.WorldPacketRewriter1_9;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.BlockPlaceDestroyTracker;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.BossBarStorage;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.CommandBlockStateStorage;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.CooldownStorage;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.EntityTracker1_9;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.LevitationStorage;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.PlayerPositionTracker;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.LastTitle;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.WindowTracker;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.*;
import com.viaversion.viarewind.protocol.v1_9to1_8.task.CooldownIndicatorTask;
import com.viaversion.viarewind.protocol.v1_9to1_8.task.LevitationUpdateTask;
import com.viaversion.viaversion.api.Via;
Expand Down Expand Up @@ -95,6 +87,7 @@ public void init(UserConnection connection) {
connection.put(new BlockPlaceDestroyTracker());
connection.put(new BossBarStorage(connection));
connection.put(new CommandBlockStateStorage());
connection.put(new ContainerEquipmentTracker());
}

@Override
Expand Down
20 changes: 20 additions & 0 deletions ...java/com/viaversion/viarewind/protocol/v1_9to1_8/rewriter/BlockItemPacketRewriter1_9.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.viaversion.viarewind.protocol.v1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viarewind.protocol.v1_9to1_8.data.PotionIdMappings1_8;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.CommandBlockStateStorage;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.ContainerEquipmentTracker;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.WindowTracker;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
Expand Down Expand Up @@ -95,6 +96,11 @@ protected void registerPackets() {
tracker.clearEnchantmentProperties();
}
tracker.remove(windowId);

if (windowId != 0) {
final ContainerEquipmentTracker equipment = wrapper.user().get(ContainerEquipmentTracker.class);
equipment.sendAll(wrapper.user());
}
});

protocol.registerClientbound(ClientboundPackets1_9.OPEN_SCREEN, wrapper -> {
Expand All @@ -116,6 +122,11 @@ protected void registerPackets() {
items[i] = handleItemToClient(wrapper.user(), items[i]);
}

if (windowId == 0 && items.length > 5) {
// 1.8 clients handle it fine even when another container is open, clear equipment to send
wrapper.user().get(ContainerEquipmentTracker.class).invalidate(items.length - 5);
}

if (windowId == 0 && items.length == 46) {
Item[] old = items;
items = new Item[45];
Expand Down Expand Up @@ -154,6 +165,10 @@ protected void registerPackets() {
} else if (slot >= 9 && slot <= 35) {
containerSlot = size + slot - 9;
} else { // armor/offhand: no slot in a foreign container
if (slot <= 39) {
final ContainerEquipmentTracker equipment = wrapper.user().get(ContainerEquipmentTracker.class);
equipment.setEquipment(39 - slot, item);
}
wrapper.cancel();
return;
}
Expand Down Expand Up @@ -201,6 +216,11 @@ protected void registerPackets() {
protocol.registerServerbound(ServerboundPackets1_8.CONTAINER_CLOSE, wrapper -> {
final byte windowId = wrapper.passthrough(Types.BYTE);
wrapper.user().get(WindowTracker.class).remove(windowId);

if (windowId != 0) {
final ContainerEquipmentTracker equipment = wrapper.user().get(ContainerEquipmentTracker.class);
equipment.sendAll(wrapper.user());
}
});

protocol.registerServerbound(ServerboundPackets1_8.CONTAINER_CLICK, new PacketHandlers() {
Expand Down
25 changes: 17 additions & 8 deletions ...in/java/com/viaversion/viarewind/protocol/v1_9to1_8/rewriter/EntityPacketRewriter1_9.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
import com.viaversion.viarewind.api.rewriter.VREntityRewriter;
import com.viaversion.viarewind.protocol.v1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viarewind.protocol.v1_9to1_8.data.EntityDataIndex1_8;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.CooldownStorage;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.EntityTracker1_9;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.LevitationStorage;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.PlayerPositionTracker;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.*;
import com.viaversion.viaversion.api.minecraft.BlockPosition;
import com.viaversion.viaversion.api.minecraft.ClientWorld;
import com.viaversion.viaversion.api.minecraft.EulerAngle;
Expand Down Expand Up @@ -412,11 +409,8 @@ public void register() {
public void register() {
map(Types.VAR_INT); // Entity id
handler(wrapper -> {
// 1.8 clients write their own equipment to armorInventory[slot] without the -1 offset,
// shifting armor up one slot; the window 0 set slot packets already carry it.
final int entityId = wrapper.get(Types.VAR_INT, 0);
int slot = wrapper.read(Types.VAR_INT);
if (slot == 1 || entityId == wrapper.user().getEntityTracker(protocol).clientEntityId()) {
if (slot == 1) {
wrapper.cancel();
} else if (slot > 1) {
slot -= 1;
Expand All @@ -425,6 +419,21 @@ public void register() {
});
map(Types.ITEM1_8); // Item
handler(wrapper -> protocol.getItemRewriter().handleItemToClient(wrapper.user(), wrapper.get(Types.ITEM1_8, 0)));
handler(wrapper -> {
if (wrapper.get(Types.VAR_INT, 0) == tracker(wrapper.user()).clientEntityId()) {
// Vanilla 1.8.9 doesn't properly handle this and Forge handles it differently, use set
// slot packets instead
final Item item = wrapper.get(Types.ITEM1_8, 0);
final int slot = 4 - wrapper.get(Types.SHORT, 0);
wrapper.cancel();
final ContainerEquipmentTracker equipment = wrapper.user().get(ContainerEquipmentTracker.class);
final WindowTracker window = wrapper.user().get(WindowTracker.class);
equipment.setEquipment(slot, item);
if (window.openWindowId() == 0) {
equipment.sendAsSlot(wrapper.user(), slot);
}
}
});
}
});

Expand Down
67 changes: 67 additions & 0 deletions ...n/java/com/viaversion/viarewind/protocol/v1_9to1_8/storage/ContainerEquipmentTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
* Copyright (C) 2018-2026 ViaVersion and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.viaversion.viarewind.protocol.v1_9to1_8.storage;

import com.viaversion.viarewind.protocol.v1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viaversion.api.connection.StorableObject;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Types;
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;

import java.util.Arrays;

/**
* Tracks equipment changes while a foreign container is open.
*/
public class ContainerEquipmentTracker implements StorableObject {
// 0: helmet, 3: boots
private final Slot[] equipment = new Slot[4];

public void setEquipment(final int slot, final Item item) {
equipment[slot] = new Slot(item);
}

public void sendAsSlot(final UserConnection connection, final int slot) {
if (equipment[slot] == null) {
// needs no update
return;
}

final PacketWrapper setSlot = PacketWrapper.create(ClientboundPackets1_8.CONTAINER_SET_SLOT, connection);
setSlot.write(Types.BYTE, (byte) 0);
setSlot.write(Types.SHORT, (short) (5 + slot));
setSlot.write(Types.ITEM1_8, equipment[slot].item);
setSlot.send(Protocol1_9To1_8.class);

equipment[slot] = null;
}

public void sendAll(UserConnection connection) {
for (int slot = 0; slot < equipment.length; slot++) {
sendAsSlot(connection, slot);
}
}

public void invalidate(int count) {
Arrays.fill(equipment, 0, Math.min(count, equipment.length), null);
}

private record Slot(Item item) {}
}