Inventory Management

Data Asset Sources.md

@@ -38,15 +38,15 @@ This file has been dumped from a BDS server using [CloudburstMC/ProxyPass](https
 ### data/bedrock/item_tags.json
 [PMMP/BedrockData](https://github.com/pmmp/BedrockData/blob/7e91146842837b2267a8e4d8bf8b8dab5e482970/item_tags.json)
 
+### data/bedrock/items.json
+[AllayMC/BedrockData](https://github.com/AllayMC/BedrockData/blob/986a7f06bfa6d012d6c39b0c0d0acef25a9535ce/1.26.12.2/items.json)
+
 ### data/bedrock/level_sound_event_mappings.json
 This file has been generated using `BedrockSoundListGenerator` using data from the official bedrock client's assets folder.
 
 ### data/bedrock/particles.json
 This file has been generated using `BedrockParticleListGenerator` using data from the official bedrock client's assets folder.
 
-### data/bedrock/runtime_item_states.json
-This file has been dumped from a BDS server using [CloudburstMC/ProxyPass](https://github.com/CloudburstMC/ProxyPass).
-
 ### data/bedrock/sounds.json
 This file has been generated using `BedrockSoundListGenerator` using data from the official bedrock client's assets folder.
 

src/main/java/net/raphimc/viabedrock/api/resourcepack/definition/ItemDefinitions.java

@@ -69,6 +69,14 @@ public void addFromNetworkTag(final String identifier, final CompoundTag tag) {
                         }
                     }
                 }
+
+                if (itemProperties.contains("minecraft:max_stack_size")) {
+                    itemDefinition.maxStackSize = itemProperties.getInt("minecraft:max_stack_size");
+                }
+
+                if (itemProperties.contains("minecraft:allow_offhand")) {
+                    itemDefinition.allowOffhand = itemProperties.getBoolean("minecraft:allow_offhand");
+                }
             }
             if (components.get("minecraft:display_name") instanceof CompoundTag displayName) {
                 if (displayName.get("value") instanceof StringTag value) {
@@ -92,6 +100,8 @@ public static class ItemDefinition {
         private final String identifier;
         private String iconComponent;
         private String displayNameComponent;
+        private Integer maxStackSize;
+        private boolean allowOffhand = false;
 
         public ItemDefinition(final String identifier) {
             this.identifier = identifier;
@@ -109,6 +119,14 @@ public String displayNameComponent() {
             return this.displayNameComponent;
         }
 
+        public Integer maxStackSize() {
+            return this.maxStackSize;
+        }
+
+        public boolean allowOffhand() {
+            return this.allowOffhand;
+        }
+
     }
 
 }

src/main/java/net/raphimc/viabedrock/experimental/ExperimentalPacketFactory.java

@@ -21,8 +21,13 @@
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.protocols.v1_21_9to1_21_11.packet.ClientboundPackets1_21_11;
+import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
+import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPackets26_1;
 import net.raphimc.viabedrock.api.model.entity.Entity;
+import net.raphimc.viabedrock.experimental.model.container.ExperimentalContainer;
+import net.raphimc.viabedrock.experimental.model.inventory.ItemStackRequestInfo;
+import net.raphimc.viabedrock.experimental.storage.ExperimentalInventoryTracker;
+import net.raphimc.viabedrock.experimental.types.ExperimentalBedrockTypes;
 import net.raphimc.viabedrock.protocol.BedrockProtocol;
 import net.raphimc.viabedrock.protocol.ServerboundBedrockPackets;
 import net.raphimc.viabedrock.protocol.data.enums.bedrock.generated.InteractPacket_Action;
@@ -32,6 +37,20 @@
 
 public class ExperimentalPacketFactory {
 
+    public static void sendJavaContainerSetContent(final UserConnection user, final ExperimentalContainer container) {
+        final PacketWrapper containerSetContent = PacketWrapper.create(ClientboundPackets26_1.CONTAINER_SET_CONTENT, user);
+        writeJavaContainerSetContent(containerSetContent, container);
+        containerSetContent.send(BedrockProtocol.class);
+    }
+
+    public static void sendJavaContainerProperties(final UserConnection user, final ExperimentalContainer container, final short property, final short value) {
+        final PacketWrapper containerSetProperty = PacketWrapper.create(ClientboundPackets26_1.CONTAINER_SET_DATA, user);
+        containerSetProperty.write(Types.VAR_INT, (int) container.javaContainerId()); // container id
+        containerSetProperty.write(Types.SHORT, property); // property id
+        containerSetProperty.write(Types.SHORT, value); // property value
+        containerSetProperty.send(BedrockProtocol.class);
+    }
+
     public static void sendBedrockPlayerAction(final UserConnection user, long entityId, PlayerActionType actionType, BlockPosition position, BlockPosition resultPosition, int face) {
         final PacketWrapper startItemUseOn = PacketWrapper.create(ServerboundBedrockPackets.PLAYER_ACTION, user);
         startItemUseOn.write(BedrockTypes.UNSIGNED_VAR_LONG, entityId); // entity runtime id
@@ -42,6 +61,19 @@ public static void sendBedrockPlayerAction(final UserConnection user, long entit
         startItemUseOn.sendToServer(BedrockProtocol.class);
     }
 
+    public static void sendBedrockInventoryRequest(final UserConnection user, ItemStackRequestInfo[] info) {
+        final PacketWrapper inventoryRequest = PacketWrapper.create(ServerboundBedrockPackets.ITEM_STACK_REQUEST, user);
+        inventoryRequest.write(ExperimentalBedrockTypes.ITEM_STACK_REQUESTS, info);
+        inventoryRequest.sendToServer(BedrockProtocol.class);
+    }
+
+    public static void writeJavaContainerSetContent(final PacketWrapper wrapper, final ExperimentalContainer container) {
+        wrapper.write(Types.VAR_INT, (int) container.javaContainerId()); // container id
+        wrapper.write(Types.VAR_INT, 0); // revision
+        wrapper.write(VersionedTypes.V26_1.itemArray, container.getJavaItems()); // items
+        wrapper.write(VersionedTypes.V26_1.item, wrapper.user().get(ExperimentalInventoryTracker.class).getHudContainer().getJavaItem(0)); // cursor item
+    }
+
     public static void sendBedrockDismount(final UserConnection user, long entityRId) {
         final PacketWrapper dismountPacket = PacketWrapper.create(ServerboundBedrockPackets.INTERACT, user);
         dismountPacket.write(Types.UNSIGNED_BYTE, (short) InteractPacket_Action.StopRiding.getValue()); // action
@@ -52,7 +84,7 @@ public static void sendBedrockDismount(final UserConnection user, long entityRId
 
     public static void sendJavaSetPassengers(final UserConnection user, Entity vehicle) {
         final EntityTracker entityTracker = user.get(EntityTracker.class);
-        final PacketWrapper setPassengersPacket = PacketWrapper.create(ClientboundPackets1_21_11.SET_PASSENGERS, user);
+        final PacketWrapper setPassengersPacket = PacketWrapper.create(ClientboundPackets26_1.SET_PASSENGERS, user);
         setPassengersPacket.write(Types.VAR_INT, vehicle.javaId()); // vehicle
         setPassengersPacket.write(Types.VAR_INT, vehicle.passengers().size()); // number of passengers
         for (long passengerUid : vehicle.passengers()) {