Skip to content
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

Add pc 1.21.1 data #925

Merged
merged 14 commits into from
Oct 26, 2024
Merged

Add pc 1.21.1 data #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6c0e144
Add pc 1.21 protocol data
extremeheat Oct 14, 2024
dbd79a6
fix
extremeheat Oct 14, 2024
865eebe
Update dataPaths.json
extremeheat Oct 15, 2024
57f1c0d
Merge branch 'master' into pc1.21
rom1504 Oct 19, 2024
be90b6b
to 1.21.1
extremeheat Oct 26, 2024
cebd74f
Fix packet_explosion
extremeheat Oct 26, 2024
8142faf
Fix ChatTypes
extremeheat Oct 26, 2024
4debf6c
Fix SlotComponentType missing repair_cost
extremeheat Oct 26, 2024
8d2793f
1.21: Add some data (#927)
GroobleDierne Oct 26, 2024
c45e279
Merge branch 'master' into pc1.21
rom1504 Oct 26, 2024
5b9f5ea
add default in packet explosion switch for sound id
rom1504 Oct 26, 2024
843269e
use empty container instead of void in packet explosion so it works w…
rom1504 Oct 26, 2024
44ab383
also on 1.20.5
rom1504 Oct 26, 2024
7e27d23
recipes should have null not -1
rom1504 Oct 26, 2024
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
29 changes: 28 additions & 1 deletion data/dataPaths.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1421,7 +1421,7 @@
"mapIcons": "pc/1.20.2",
"commands": "pc/1.20.3",
"sounds": "pc/1.20.4",
"proto": "pc/latest"
"proto": "pc/1.20.5"
},
"1.20.6": {
"attributes": "pc/1.17",
Expand All @@ -1448,6 +1448,33 @@
"mapIcons": "pc/1.20.2",
"commands": "pc/1.20.3",
"sounds": "pc/1.20.4",
"proto": "pc/1.20.5"
},
"1.21.1": {
"attributes": "pc/1.17",
"blocks": "pc/1.21.1",
"blockCollisionShapes": "pc/1.20.5",
"biomes": "pc/1.20.5",
"effects": "pc/1.20.5",
"items": "pc/1.21.1",
"enchantments": "pc/1.21.1",
"recipes": "pc/1.21.1",
"instruments": "pc/1.20.5",
"materials": "pc/1.21.1",
"language": "pc/1.21.1",
"entities": "pc/1.20.5",
"protocol": "pc/1.21.1",
"windows": "pc/1.16.1",
"version": "pc/1.21.1",
"foods": "pc/1.21.1",
"particles": "pc/1.20.5",
"blockLoot": "pc/1.20",
"entityLoot": "pc/1.20",
"loginPacket": "pc/1.20.5",
"tints": "pc/1.21.1",
"mapIcons": "pc/1.20.2",
"commands": "pc/1.20.3",
"sounds": "pc/1.21.1",
"proto": "pc/latest"
}
},
Expand Down
9 changes: 7 additions & 2 deletions data/pc/1.20.3/proto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,8 +1104,13 @@
block_interaction_type: varint
small_explosion_particle: particle
large_explosion_particle: particle
explosion_sound_name: string
sound_range?: f32
soundId: varint
_: soundId ?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is super weird; are you sure?

it means sounds id must be 0 or the packet is invalid since there is no default

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

going to add default: void

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No default defaults to void anyway no?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, no default means there is no default: other values are impossible and should crash

if 0:
soundName: string
range?: f32
default:

# MC: ClientboundForgetLevelChunkPacket
packet_unload_chunk:
chunkZ: i32
Expand Down
34 changes: 29 additions & 5 deletions data/pc/1.20.3/protocol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2942,14 +2942,38 @@
"type": "particle"
},
{
"name": "explosion_sound_name",
"type": "string"
"name": "soundId",
"type": "varint"
},
{
"name": "sound_range",
"anon": true,
"type": [
"option",
"f32"
"switch",
{
"compareTo": "soundId",
"fields": {
"0": [
"container",
[
{
"name": "soundName",
"type": "string"
},
{
"name": "range",
"type": [
"option",
"f32"
]
}
]
]
},
"default": [
"container",
[]
]
}
]
}
]
Expand Down
56 changes: 28 additions & 28 deletions data/pc/1.20.5/enchantments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"treasureOnly": false,
"curse": false,
"exclude": [],
"category": "tagkey[minecraft:item / minecraft:enchantable/foot_armor]",
"category": "foot_armor",
"weight": 5,
"tradeable": true,
"discoverable": true
Expand Down Expand Up @@ -136,7 +136,7 @@
"treasureOnly": false,
"curse": false,
"exclude": [],
"category": "tagkey[minecraft:item / minecraft:enchantable/head_armor]",
"category": "head_armor",
"weight": 2,
"tradeable": true,
"discoverable": true
Expand All @@ -157,7 +157,7 @@
"treasureOnly": false,
"curse": false,
"exclude": [],
"category": "tagkey[minecraft:item / minecraft:enchantable/head_armor]",
"category": "head_armor",
"weight": 2,
"tradeable": true,
"discoverable": true
Expand Down Expand Up @@ -201,7 +201,7 @@
"exclude": [
"frost_walker"
],
"category": "tagkey[minecraft:item / minecraft:enchantable/foot_armor]",
"category": "foot_armor",
"weight": 2,
"tradeable": true,
"discoverable": true
Expand All @@ -224,7 +224,7 @@
"exclude": [
"depth_strider"
],
"category": "tagkey[minecraft:item / minecraft:enchantable/foot_armor]",
"category": "foot_armor",
"weight": 2,
"tradeable": true,
"discoverable": true
Expand All @@ -245,7 +245,7 @@
"treasureOnly": true,
"curse": true,
"exclude": [],
"category": "wearable",
"category": "equippable",
"weight": 1,
"tradeable": true,
"discoverable": true
Expand All @@ -266,7 +266,7 @@
"treasureOnly": true,
"curse": false,
"exclude": [],
"category": "tagkey[minecraft:item / minecraft:enchantable/foot_armor]",
"category": "foot_armor",
"weight": 1,
"tradeable": false,
"discoverable": false
Expand All @@ -287,7 +287,7 @@
"treasureOnly": true,
"curse": false,
"exclude": [],
"category": "tagkey[minecraft:item / minecraft:enchantable/leg_armor]",
"category": "leg_armor",
"weight": 1,
"tradeable": false,
"discoverable": false
Expand All @@ -312,7 +312,7 @@
"bane_of_arthropods",
"impaling"
],
"category": "tagkey[minecraft:item / minecraft:enchantable/sharp_weapon]",
"category": "sharp_weapon",
"weight": 10,
"tradeable": true,
"discoverable": true
Expand Down Expand Up @@ -383,7 +383,7 @@
"treasureOnly": false,
"curse": false,
"exclude": [],
"category": "tagkey[minecraft:item / minecraft:enchantable/sword]",
"category": "sword",
"weight": 5,
"tradeable": true,
"discoverable": true
Expand All @@ -404,7 +404,7 @@
"treasureOnly": false,
"curse": false,
"exclude": [],
"category": "tagkey[minecraft:item / minecraft:enchantable/fire_aspect]",
"category": "fire_aspect",
"weight": 2,
"tradeable": true,
"discoverable": true
Expand All @@ -427,7 +427,7 @@
"exclude": [
"silk_touch"
],
"category": "tagkey[minecraft:item / minecraft:enchantable/sword]",
"category": "sword",
"weight": 2,
"tradeable": true,
"discoverable": true
Expand All @@ -448,8 +448,8 @@
"treasureOnly": false,
"curse": false,
"exclude": [],
"category": "tagkey[minecraft:item / minecraft:enchantable/sword]",
"weight": 3,
"category": "sword",
"weight": 2,
"tradeable": true,
"discoverable": true
},
Expand All @@ -469,7 +469,7 @@
"treasureOnly": false,
"curse": false,
"exclude": [],
"category": "digger",
"category": "mining",
"weight": 10,
"tradeable": true,
"discoverable": true
Expand All @@ -494,7 +494,7 @@
"fortune",
"luck_of_the_sea"
],
"category": "tagkey[minecraft:item / minecraft:enchantable/mining_loot]",
"category": "mining_loot",
"weight": 1,
"tradeable": true,
"discoverable": true
Expand All @@ -515,7 +515,7 @@
"treasureOnly": false,
"curse": false,
"exclude": [],
"category": "breakable",
"category": "durability",
"weight": 5,
"tradeable": true,
"discoverable": true
Expand All @@ -538,7 +538,7 @@
"exclude": [
"silk_touch"
],
"category": "tagkey[minecraft:item / minecraft:enchantable/mining_loot]",
"category": "mining_loot",
"weight": 2,
"tradeable": true,
"discoverable": true
Expand Down Expand Up @@ -647,7 +647,7 @@
"exclude": [
"silk_touch"
],
"category": "fishing_rod",
"category": "fishing",
"weight": 2,
"tradeable": true,
"discoverable": true
Expand All @@ -668,7 +668,7 @@
"treasureOnly": false,
"curse": false,
"exclude": [],
"category": "fishing_rod",
"category": "fishing",
"weight": 2,
"tradeable": true,
"discoverable": true
Expand Down Expand Up @@ -851,8 +851,8 @@
"treasureOnly": false,
"curse": false,
"exclude": [],
"category": "tagkey[minecraft:item / minecraft:enchantable/mace]",
"weight": 5,
"category": "mace",
"weight": 10,
"tradeable": true,
"discoverable": true
},
Expand All @@ -872,8 +872,8 @@
"treasureOnly": false,
"curse": false,
"exclude": [],
"category": "tagkey[minecraft:item / minecraft:enchantable/mace]",
"weight": 4,
"category": "mace",
"weight": 2,
"tradeable": true,
"discoverable": true
},
Expand All @@ -893,8 +893,8 @@
"treasureOnly": false,
"curse": false,
"exclude": [],
"category": "tagkey[minecraft:item / minecraft:enchantable/mace]",
"weight": 3,
"category": "mace",
"weight": 2,
"tradeable": false,
"discoverable": false
},
Expand All @@ -916,7 +916,7 @@
"exclude": [
"infinity"
],
"category": "breakable",
"category": "durability",
"weight": 2,
"tradeable": true,
"discoverable": true
Expand All @@ -937,7 +937,7 @@
"treasureOnly": true,
"curse": true,
"exclude": [],
"category": "vanishable",
"category": "vanishing",
"weight": 1,
"tradeable": true,
"discoverable": true
Expand Down
Loading
Loading