Skip to content

pc: fix intangible_projectile NBT and 26.1 item stack templates #1267

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

pc: fix intangible_projectile NBT and 26.1 item stack templates #1267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
675f990
pc: fix intangible_projectile NBT and 26.1 item stack templates
u9g Aug 30, 2026
cc162cb
pc: keep 26.1 entity metadata item_stack as Slot
u9g Aug 30, 2026
8b81a20
pc: trim ItemStackTemplate comment to the invariant
u9g Aug 30, 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
2 changes: 1 addition & 1 deletion data/pc/1.21.11/proto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
if repair_cost: varint
if creative_slot_lock: void
if enchantment_glint_override: bool
if intangible_projectile: void
if intangible_projectile: anonymousNbt
if blocks_attacks:
blockDelaySeconds: f32
disableCooldownScale: f32
Expand Down
2 changes: 1 addition & 1 deletion data/pc/1.21.11/protocol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@
"repair_cost": "varint",
"creative_slot_lock": "void",
"enchantment_glint_override": "bool",
"intangible_projectile": "void",
"intangible_projectile": "anonymousNbt",
"blocks_attacks": [
"container",
[
Expand Down
2 changes: 1 addition & 1 deletion data/pc/1.21.5/proto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
if repair_cost: varint
if creative_slot_lock: void
if enchantment_glint_override: bool
if intangible_projectile: void
if intangible_projectile: anonymousNbt
if blocks_attacks:
blockDelaySeconds: f32
disableCooldownScale: f32
Expand Down
2 changes: 1 addition & 1 deletion data/pc/1.21.5/protocol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@
"repair_cost": "varint",
"creative_slot_lock": "void",
"enchantment_glint_override": "bool",
"intangible_projectile": "void",
"intangible_projectile": "anonymousNbt",
"blocks_attacks": [
"container",
[
Expand Down
2 changes: 1 addition & 1 deletion data/pc/1.21.6/proto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
if repair_cost: varint
if creative_slot_lock: void
if enchantment_glint_override: bool
if intangible_projectile: void
if intangible_projectile: anonymousNbt
if blocks_attacks:
blockDelaySeconds: f32
disableCooldownScale: f32
Expand Down
2 changes: 1 addition & 1 deletion data/pc/1.21.6/protocol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@
"repair_cost": "varint",
"creative_slot_lock": "void",
"enchantment_glint_override": "bool",
"intangible_projectile": "void",
"intangible_projectile": "anonymousNbt",
"blocks_attacks": [
"container",
[
Expand Down
2 changes: 1 addition & 1 deletion data/pc/1.21.8/proto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
if repair_cost: varint
if creative_slot_lock: void
if enchantment_glint_override: bool
if intangible_projectile: void
if intangible_projectile: anonymousNbt
if blocks_attacks:
blockDelaySeconds: f32
disableCooldownScale: f32
Expand Down
2 changes: 1 addition & 1 deletion data/pc/1.21.8/protocol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@
"repair_cost": "varint",
"creative_slot_lock": "void",
"enchantment_glint_override": "bool",
"intangible_projectile": "void",
"intangible_projectile": "anonymousNbt",
"blocks_attacks": [
"container",
[
Expand Down
2 changes: 1 addition & 1 deletion data/pc/1.21.9/proto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
if repair_cost: varint
if creative_slot_lock: void
if enchantment_glint_override: bool
if intangible_projectile: void
if intangible_projectile: anonymousNbt
if blocks_attacks:
blockDelaySeconds: f32
disableCooldownScale: f32
Expand Down
2 changes: 1 addition & 1 deletion data/pc/1.21.9/protocol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@
"repair_cost": "varint",
"creative_slot_lock": "void",
"enchantment_glint_override": "bool",
"intangible_projectile": "void",
"intangible_projectile": "anonymousNbt",
"blocks_attacks": [
"container",
[
Expand Down
68 changes: 60 additions & 8 deletions data/pc/26.1/protocol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@
"repair_cost": "varint",
"creative_slot_lock": "void",
"enchantment_glint_override": "bool",
"intangible_projectile": "void",
"intangible_projectile": "anonymousNbt",
"blocks_attacks": [
"container",
[
Expand Down Expand Up @@ -766,7 +766,7 @@
}
]
],
"use_remainder": "Slot",
"use_remainder": "ItemStackTemplate",
"use_cooldown": [
"container",
[
Expand Down Expand Up @@ -1098,7 +1098,7 @@
"array",
{
"countType": "varint",
"type": "Slot"
"type": "ItemStackTemplate"
}
]
}
Expand All @@ -1113,7 +1113,7 @@
"array",
{
"countType": "varint",
"type": "Slot"
"type": "ItemStackTemplate"
}
]
}
Expand Down Expand Up @@ -1468,7 +1468,10 @@
"array",
{
"countType": "varint",
"type": "Slot"
"type": [
"option",
"ItemStackTemplate"
]
}
]
}
Expand Down Expand Up @@ -2325,6 +2328,55 @@
}
]
],
"ItemStackTemplate": [
"container",
[
{
"name": "itemId",
"type": "varint"
},
{
"name": "itemCount",
"type": "varint"
},
{
"name": "addedComponentCount",
"type": "varint"
},
{
"name": "removedComponentCount",
"type": "varint"
},
{
"name": "components",
"type": [
"array",
{
"count": "addedComponentCount",
"type": "SlotComponent"
}
]
},
{
"name": "removeComponents",
"type": [
"array",
{
"count": "removedComponentCount",
"type": [
"container",
[
{
"name": "type",
"type": "SlotComponentType"
}
]
]
}
]
}
]
],
"HashedSlot": [
"container",
[
Expand Down Expand Up @@ -3467,7 +3519,7 @@
]
],
"entity_effect": "i32",
"item": "Slot",
"item": "ItemStackTemplate",
"sculk_charge": "f32",
"shriek": "varint",
"vibration": [
Expand Down Expand Up @@ -5831,7 +5883,7 @@
]
],
"item": "varint",
"item_stack": "Slot",
"item_stack": "ItemStackTemplate",
"tag": "string",
"dyed_slot_demo": [
"container",
Expand Down Expand Up @@ -9593,7 +9645,7 @@
},
{
"name": "icon",
"type": "Slot"
"type": "ItemStackTemplate"
},
{
"name": "frameType",
Expand Down
26 changes: 18 additions & 8 deletions data/pc/latest/proto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
if repair_cost: varint
if creative_slot_lock: void
if enchantment_glint_override: bool
if intangible_projectile: void
if intangible_projectile: anonymousNbt
if blocks_attacks:
blockDelaySeconds: f32
disableCooldownScale: f32
Expand Down Expand Up @@ -291,7 +291,7 @@
sound: ItemSoundHolder
makes_particles: bool
effects: ItemConsumeEffect[]varint
if use_remainder: Slot
if use_remainder: ItemStackTemplate
if use_cooldown:
seconds: f32
cooldownGroup?: string
Expand Down Expand Up @@ -375,9 +375,9 @@
if map_post_processing: varint
if potion_duration_scale: f32
if charged_projectiles:
projectiles: Slot[]varint
projectiles: ItemStackTemplate[]varint
if bundle_contents:
contents: Slot[]varint
contents: ItemStackTemplate[]varint
if potion_contents:
# True if this potion has an ID in the potion registry--it has the default effects associated with the potion type.
potionId?: varint
Expand Down Expand Up @@ -445,7 +445,7 @@
# The ID of the items in the item registry.
decorations: varint[]varint
if container:
contents: Slot[]varint
contents: ["array", { "countType": "varint", "type": ["option", "ItemStackTemplate"] }]
if block_state:
properties: []varint
name: string
Expand Down Expand Up @@ -686,6 +686,16 @@
removeComponents: []$removedComponentCount
type: SlotComponentType

# Intentionally id-first, unlike the count-first Slot above — vanilla has both codecs.
ItemStackTemplate:
itemId: varint
itemCount: varint
addedComponentCount: varint
removedComponentCount: varint
components: SlotComponent[]$addedComponentCount
removeComponents: []$removedComponentCount
type: SlotComponentType

HashedSlot:
itemId: varint
itemCount: varint
Expand Down Expand Up @@ -1048,7 +1058,7 @@
toGreen: f32
toBlue: f32
if entity_effect: i32
if item: Slot
if item: ItemStackTemplate
if sculk_charge: f32
if shriek: varint
if vibration:
Expand Down Expand Up @@ -1976,7 +1986,7 @@
source: SlotDisplay
component: SlotComponentType
if item: varint
if item_stack: Slot
if item_stack: ItemStackTemplate
if tag: string
if dyed_slot_demo:
dye: SlotDisplay
Expand Down Expand Up @@ -2980,7 +2990,7 @@
displayData?:
title: anonymousNbt
description: anonymousNbt
icon: Slot
icon: ItemStackTemplate
frameType: varint
flags: ["bitfield", [
{ "name": "unused", "size": 29, "signed": false },
Expand Down
Loading