Skip to content

Revert the 1.21.6 enum mappers whose ordinals never moved #1292

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 1 commit into
base: master
Choose a base branch
from
Open

Revert the 1.21.6 enum mappers whose ordinals never moved #1292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 5 additions & 32 deletions data/pc/1.21.11/proto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,11 +2055,7 @@
default: void
# MC: ClientboundChangeDifficultyPacket
packet_difficulty:
difficulty: varint =>
0: peaceful
1: easy
2: normal
3: hard
difficulty: u8
difficultyLocked: bool
# MC: ClientboundChunkBatchFinishedPacket
packet_chunk_batch_finished:
Expand Down Expand Up @@ -2221,21 +2217,8 @@
chunkX: i32
# MC: ClientboundGameEventPacket
packet_game_state_change:
reason: u8 =>
0: no_respawn_block_available
1: start_raining
2: stop_raining
3: change_game_mode
4: win_game
5: demo_event
6: play_arrow_hit_sound
7: rain_level_change
8: thunder_level_change
9: puffer_fish_sting
10: guardian_elder_effect
11: immediate_respawn
12: limited_crafting
13: level_chunks_load_start
#TODO: Should be a mapper
reason: u8
gameMode: f32
# MC: ClientboundGameTestHighlightPosPacket
packet_game_test_highlight_pos:
Expand Down Expand Up @@ -2268,13 +2251,7 @@
x: i32
z: i32
heightmaps: []varint
type: varint =>
0: world_surface_wg
1: world_surface
2: ocean_floor_wg
3: ocean_floor
4: motion_blocking
5: motion_blocking_no_leaves
type: varint
data: i64[]varint
chunkData: ByteArray
blockEntities: chunkBlockEntity[]varint
Expand Down Expand Up @@ -3340,11 +3317,7 @@
selectedItemIndex: varint
# MC: ServerboundChangeDifficultyPacket
packet_set_difficulty:
newDifficulty: varint =>
0: peaceful
1: easy
2: normal
3: hard
newDifficulty: u8
# MC: ServerboundChangeGameModePacket
packet_change_gamemode:
mode: varint =>
Expand Down
64 changes: 4 additions & 60 deletions data/pc/1.21.11/protocol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6246,18 +6246,7 @@
[
{
"name": "difficulty",
"type": [
"mapper",
{
"type": "varint",
"mappings": {
"0": "peaceful",
"1": "easy",
"2": "normal",
"3": "hard"
}
}
]
"type": "u8"
},
{
"name": "difficultyLocked",
Expand Down Expand Up @@ -6854,28 +6843,7 @@
[
{
"name": "reason",
"type": [
"mapper",
{
"type": "u8",
"mappings": {
"0": "no_respawn_block_available",
"1": "start_raining",
"2": "stop_raining",
"3": "change_game_mode",
"4": "win_game",
"5": "demo_event",
"6": "play_arrow_hit_sound",
"7": "rain_level_change",
"8": "thunder_level_change",
"9": "puffer_fish_sting",
"10": "guardian_elder_effect",
"11": "immediate_respawn",
"12": "limited_crafting",
"13": "level_chunks_load_start"
}
}
]
"type": "u8"
},
{
"name": "gameMode",
Expand Down Expand Up @@ -6994,20 +6962,7 @@
[
{
"name": "type",
"type": [
"mapper",
{
"type": "varint",
"mappings": {
"0": "world_surface_wg",
"1": "world_surface",
"2": "ocean_floor_wg",
"3": "ocean_floor",
"4": "motion_blocking",
"5": "motion_blocking_no_leaves"
}
}
]
"type": "varint"
},
{
"name": "data",
Expand Down Expand Up @@ -10290,18 +10245,7 @@
[
{
"name": "newDifficulty",
"type": [
"mapper",
{
"type": "varint",
"mappings": {
"0": "peaceful",
"1": "easy",
"2": "normal",
"3": "hard"
}
}
]
"type": "u8"
}
]
],
Expand Down
37 changes: 5 additions & 32 deletions data/pc/1.21.6/proto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,11 +1739,7 @@
default: void
# MC: ClientboundChangeDifficultyPacket
packet_difficulty:
difficulty: varint =>
0: peaceful
1: easy
2: normal
3: hard
difficulty: u8
difficultyLocked: bool
# MC: ClientboundChunkBatchFinishedPacket
packet_chunk_batch_finished:
Expand Down Expand Up @@ -1882,21 +1878,8 @@
chunkX: i32
# MC: ClientboundGameEventPacket
packet_game_state_change:
reason: u8 =>
0: no_respawn_block_available
1: start_raining
2: stop_raining
3: change_game_mode
4: win_game
5: demo_event
6: play_arrow_hit_sound
7: rain_level_change
8: thunder_level_change
9: puffer_fish_sting
10: guardian_elder_effect
11: immediate_respawn
12: limited_crafting
13: level_chunks_load_start
#TODO: Should be a mapper
reason: u8
gameMode: f32
# MC: ClientboundHorseScreenOpenPacket
packet_open_horse_window:
Expand Down Expand Up @@ -1925,13 +1908,7 @@
x: i32
z: i32
heightmaps: []varint
type: varint =>
0: world_surface_wg
1: world_surface
2: ocean_floor_wg
3: ocean_floor
4: motion_blocking
5: motion_blocking_no_leaves
type: varint
data: i64[]varint
chunkData: ByteArray
blockEntities: chunkBlockEntity[]varint
Expand Down Expand Up @@ -2988,11 +2965,7 @@
selectedItemIndex: varint
# MC: ServerboundChangeDifficultyPacket
packet_set_difficulty:
newDifficulty: varint =>
0: peaceful
1: easy
2: normal
3: hard
newDifficulty: u8
# MC: ServerboundChangeGameModePacket
packet_change_gamemode:
mode: varint =>
Expand Down
64 changes: 4 additions & 60 deletions data/pc/1.21.6/protocol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4923,18 +4923,7 @@
[
{
"name": "difficulty",
"type": [
"mapper",
{
"type": "varint",
"mappings": {
"0": "peaceful",
"1": "easy",
"2": "normal",
"3": "hard"
}
}
]
"type": "u8"
},
{
"name": "difficultyLocked",
Expand Down Expand Up @@ -5443,28 +5432,7 @@
[
{
"name": "reason",
"type": [
"mapper",
{
"type": "u8",
"mappings": {
"0": "no_respawn_block_available",
"1": "start_raining",
"2": "stop_raining",
"3": "change_game_mode",
"4": "win_game",
"5": "demo_event",
"6": "play_arrow_hit_sound",
"7": "rain_level_change",
"8": "thunder_level_change",
"9": "puffer_fish_sting",
"10": "guardian_elder_effect",
"11": "immediate_respawn",
"12": "limited_crafting",
"13": "level_chunks_load_start"
}
}
]
"type": "u8"
},
{
"name": "gameMode",
Expand Down Expand Up @@ -5570,20 +5538,7 @@
[
{
"name": "type",
"type": [
"mapper",
{
"type": "varint",
"mappings": {
"0": "world_surface_wg",
"1": "world_surface",
"2": "ocean_floor_wg",
"3": "ocean_floor",
"4": "motion_blocking",
"5": "motion_blocking_no_leaves"
}
}
]
"type": "varint"
},
{
"name": "data",
Expand Down Expand Up @@ -8860,18 +8815,7 @@
[
{
"name": "newDifficulty",
"type": [
"mapper",
{
"type": "varint",
"mappings": {
"0": "peaceful",
"1": "easy",
"2": "normal",
"3": "hard"
}
}
]
"type": "u8"
}
]
],
Expand Down
37 changes: 5 additions & 32 deletions data/pc/1.21.8/proto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,11 +1739,7 @@
default: void
# MC: ClientboundChangeDifficultyPacket
packet_difficulty:
difficulty: varint =>
0: peaceful
1: easy
2: normal
3: hard
difficulty: u8
difficultyLocked: bool
# MC: ClientboundChunkBatchFinishedPacket
packet_chunk_batch_finished:
Expand Down Expand Up @@ -1882,21 +1878,8 @@
chunkX: i32
# MC: ClientboundGameEventPacket
packet_game_state_change:
reason: u8 =>
0: no_respawn_block_available
1: start_raining
2: stop_raining
3: change_game_mode
4: win_game
5: demo_event
6: play_arrow_hit_sound
7: rain_level_change
8: thunder_level_change
9: puffer_fish_sting
10: guardian_elder_effect
11: immediate_respawn
12: limited_crafting
13: level_chunks_load_start
#TODO: Should be a mapper
reason: u8
gameMode: f32
# MC: ClientboundHorseScreenOpenPacket
packet_open_horse_window:
Expand Down Expand Up @@ -1925,13 +1908,7 @@
x: i32
z: i32
heightmaps: []varint
type: varint =>
0: world_surface_wg
1: world_surface
2: ocean_floor_wg
3: ocean_floor
4: motion_blocking
5: motion_blocking_no_leaves
type: varint
data: i64[]varint
chunkData: ByteArray
blockEntities: chunkBlockEntity[]varint
Expand Down Expand Up @@ -2988,11 +2965,7 @@
selectedItemIndex: varint
# MC: ServerboundChangeDifficultyPacket
packet_set_difficulty:
newDifficulty: varint =>
0: peaceful
1: easy
2: normal
3: hard
newDifficulty: u8
# MC: ServerboundChangeGameModePacket
packet_change_gamemode:
mode: varint =>
Expand Down
Loading
Loading