remove a bunch of errors in the protocol and keep the standard

This commit is contained in:
mhsjlw 2016-06-14 18:00:29 -04:00
commit f07c69176e

View file

@ -352,6 +352,10 @@
"name": "y",
"type": "i8"
},
{
"name": "blockId",
"type": "i8"
},
{
"anon": true,
"type": [
@ -513,7 +517,7 @@
"type": "f32"
},
{
"name": "head_yaw",
"name": "headYaw",
"type": "f32"
},
{
@ -722,11 +726,11 @@
"container",
[
{
"name": "public_key",
"name": "publicKey",
"type": "string"
},
{
"name": "server_token",
"name": "serverToken",
"type": "string"
}
]
@ -752,7 +756,7 @@
"type": "long"
},
{
"name": "body_length",
"name": "bodyLength",
"type": "i32"
},
{
@ -760,7 +764,7 @@
"type": ["pstring", {"countType": "li32"}]
},
{
"name": "client_data",
"name": "clientData",
"type": ["pstring", {"countType": "li32"}]
}
]
@ -883,19 +887,19 @@
"type": "i8"
},
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
"name": "spawn_x",
"name": "spawnX",
"type": "i32"
},
{
"name": "spawn_y",
"name": "spawnY",
"type": "i32"
},
{
"name": "spawn_z",
"name": "spawnZ",
"type": "i32"
},
{
@ -911,15 +915,15 @@
"type": "f32"
},
{
"name": "is_loaded_in_creative",
"name": "isLoadedInCreative",
"type": "bool"
},
{
"name": "day_cycle_stop_time",
"name": "dayCycleStopTime",
"type": "i8"
},
{
"name": "edu_mode",
"name": "eduMode",
"type": "bool"
},
{
@ -940,7 +944,7 @@
"type": "string"
},
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
@ -956,15 +960,15 @@
"type": "f32"
},
{
"name": "speed_x",
"name": "speedX",
"type": "f32"
},
{
"name": "speed_y",
"name": "speedY",
"type": "f32"
},
{
"name": "speed_z",
"name": "speedZ",
"type": "f32"
},
{
@ -972,7 +976,7 @@
"type": "f32"
},
{
"name": "head_yaw",
"name": "headYaw",
"type": "f32"
},
{
@ -993,11 +997,11 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
"name": "client_uuid",
"name": "clientUuid",
"type": "uuid"
}
]
@ -1006,11 +1010,11 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
"name": "entity_type",
"name": "entityType",
"type": "i32"
},
{
@ -1026,15 +1030,15 @@
"type": "f32"
},
{
"name": "speed_x",
"name": "speedX",
"type": "f32"
},
{
"name": "speed_y",
"name": "speedY",
"type": "f32"
},
{
"name": "speed_z",
"name": "speedZ",
"type": "f32"
},
{
@ -1059,7 +1063,7 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
}
]
@ -1068,7 +1072,7 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
@ -1088,15 +1092,15 @@
"type": "f32"
},
{
"name": "speed_x",
"name": "speedX",
"type": "f32"
},
{
"name": "speed_y",
"name": "speedY",
"type": "f32"
},
{
"name": "speed_z",
"name": "speedZ",
"type": "f32"
}
]
@ -1109,7 +1113,7 @@
"type": "i64"
},
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
}
]
@ -1127,7 +1131,7 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
@ -1147,7 +1151,7 @@
"type": "f32"
},
{
"name": "head_yaw",
"name": "headYaw",
"type": "f32"
},
{
@ -1159,7 +1163,7 @@
"type": "i8"
},
{
"name": "on_ground",
"name": "onGround",
"type": "i8"
}
]
@ -1168,7 +1172,7 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
@ -1198,7 +1202,7 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
@ -1252,7 +1256,7 @@
"container",
[
{
"name": "event_id",
"name": "eventId",
"type": "i16"
},
{
@ -1289,11 +1293,11 @@
"type": "i32"
},
{
"name": "case_1",
"name": "case1",
"type": "i32"
},
{
"name": "case_2",
"name": "case2",
"type": "i32"
}
]
@ -1302,11 +1306,11 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
"name": "event_id",
"name": "eventId",
"type": "i8"
}
]
@ -1315,15 +1319,15 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
"name": "event_id",
"name": "eventId",
"type": "i8"
},
{
"name": "effect_id",
"name": "effectId",
"type": "i8"
},
{
@ -1344,7 +1348,7 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
@ -1357,7 +1361,7 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
@ -1369,7 +1373,7 @@
"type": "i8"
},
{
"name": "selected_slot",
"name": "selectedSlot",
"type": "i8"
}
]
@ -1378,7 +1382,7 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
@ -1403,11 +1407,11 @@
"container",
[
{
"name": "action_id",
"name": "actionId",
"type": "i8"
},
{
"name": "target_entity_id",
"name": "targetEntityId",
"type": "i64"
}
]
@ -1445,11 +1449,11 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
"name": "action_id",
"name": "actionId",
"type": "i32"
},
{
@ -1505,15 +1509,15 @@
"container",
[
{
"name": "rider_id",
"name": "riderId",
"type": "i64"
},
{
"name": "ridden_id",
"name": "riddenId",
"type": "i64"
},
{
"name": "link_type",
"name": "linkType",
"type": "i8"
}
]
@ -1548,11 +1552,11 @@
"container",
[
{
"name": "action_id",
"name": "actionId",
"type": "i8"
},
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
}
]
@ -1591,7 +1595,7 @@
"container",
[
{
"name": "window_id",
"name": "windowId",
"type": "i8"
},
{
@ -1599,7 +1603,7 @@
"type": "i8"
},
{
"name": "slot_count",
"name": "slotCount",
"type": "i16"
},
{
@ -1620,7 +1624,7 @@
"container",
[
{
"name": "window_id",
"name": "windowId",
"type": "i8"
}
]
@ -1629,7 +1633,7 @@
"container",
[
{
"name": "window_id",
"name": "windowId",
"type": "i8"
},
{
@ -1650,7 +1654,7 @@
"container",
[
{
"name": "window_id",
"name": "windowId",
"type": "i8"
},
{
@ -1667,19 +1671,19 @@
"container",
[
{
"name": "window_id",
"name": "windowId",
"type": "i8"
},
{
"name": "slot_data",
"name": "slotData",
"type": "itemstacks"
},
{
"name": "hotbar_data",
"name": "hotbarData",
"type": [
"switch",
{
"compareTo": "window_id",
"compareTo": "windowId",
"fields": {
"0": [
"array",
@ -1726,11 +1730,11 @@
{
"compareTo": "entryType",
"fields": {
"0": "shapeless_recipe",
"1": "shaped_recipe",
"2": "furnace_recipe",
"3": "furnace_recipe_data",
"4": "enchant_list"
"0": "shapelessRecipe",
"1": "shapedRecipe",
"2": "furnaceRecipe",
"3": "furnaceRecipeData",
"4": "enchantList"
},
"default":"void"
}
@ -1751,15 +1755,15 @@
"container",
[
{
"name": "window_id",
"name": "windowId",
"type": "i8"
},
{
"name": "recipe_type",
"name": "recipeType",
"type": "i32"
},
{
"name": "recipe_id",
"name": "recipeId",
"type": "uuid"
},
{
@ -1780,11 +1784,11 @@
"type": "i32"
},
{
"name": "user_permission",
"name": "userPermission",
"type": "i32"
},
{
"name": "global_permission",
"name": "globalPermission",
"type": "i32"
}
]
@ -1814,11 +1818,11 @@
"container",
[
{
"name": "motion_x",
"name": "motionX",
"type": "f32"
},
{
"name": "motion_z",
"name": "motionZ",
"type": "f32"
},
{
@ -1831,11 +1835,11 @@
"container",
[
{
"name": "chunk_x",
"name": "chunkX",
"type": "i32"
},
{
"name": "chunk_z",
"name": "chunkZ",
"type": "i32"
},
{
@ -1843,7 +1847,7 @@
"type": "i8"
},
{
"name": "chunk_data",
"name": "chunkData",
"type":["buffer",{"countType":"i32"}]
}
]
@ -1879,15 +1883,15 @@
"container",
[
{
"name": "client_uuid",
"name": "clientUuid",
"type": "uuid"
},
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{
"name": "display_name",
"name": "displayName",
"type": "string"
},
{
@ -1900,7 +1904,7 @@
"container",
[
{
"name": "client_uuid",
"name": "clientUuid",
"type": "uuid"
}
]
@ -1917,7 +1921,7 @@
"container",
[
{
"name": "chunk_radius",
"name": "chunkRadius",
"type": "i32"
}
]
@ -1926,7 +1930,7 @@
"container",
[
{
"name": "chunk_radius",
"name": "chunkRadius",
"type": "i32"
}
]
@ -1944,7 +1948,7 @@
"container",
[
{
"name": "entity_id",
"name": "entityId",
"type": "i64"
},
{