From 454fb9d72508cd258771c2d6492dc2d304b0ebc5 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 10 Feb 2022 13:11:22 +0000 Subject: [PATCH] Regenerate schemas including 1.16.0 beta versions this includes some changes that weren't covered by the handwritten schema, such as some types of cobblestone_wall getting remapped. --- ...son => 0041_1.14.0_to_1.16.0.57_beta.json} | 18 +---- .../0042_1.16.0_beta_to_1.16.0.json | 30 -------- ...0051_1.16.0.57_beta_to_1.16.0.59_beta.json | 17 +++++ ...0061_1.16.0.59_beta_to_1.16.0.68_beta.json | 74 +++++++++++++++++++ ....100.json => 0071_1.16.0_to_1.16.100.json} | 28 +++---- ...10.json => 0081_1.16.200_to_1.16.210.json} | 0 ...7.30.json => 0091_1.17.10_to_1.17.30.json} | 0 ...7.40.json => 0101_1.17.30_to_1.17.40.json} | 0 ...18.10.json => 0111_1.18.0_to_1.18.10.json} | 2 +- 9 files changed, 109 insertions(+), 60 deletions(-) rename upgrade_schema/{0041_1.14.0_to_1.16.0.json => 0041_1.14.0_to_1.16.0.57_beta.json} (73%) delete mode 100644 upgrade_schema/0042_1.16.0_beta_to_1.16.0.json create mode 100644 upgrade_schema/0051_1.16.0.57_beta_to_1.16.0.59_beta.json create mode 100644 upgrade_schema/0061_1.16.0.59_beta_to_1.16.0.68_beta.json rename upgrade_schema/{0051_1.16.0_to_1.16.100.json => 0071_1.16.0_to_1.16.100.json} (100%) rename upgrade_schema/{0061_1.16.200_to_1.16.210.json => 0081_1.16.200_to_1.16.210.json} (100%) rename upgrade_schema/{0071_1.17.10_to_1.17.30.json => 0091_1.17.10_to_1.17.30.json} (100%) rename upgrade_schema/{0081_1.17.30_to_1.17.40.json => 0101_1.17.30_to_1.17.40.json} (100%) rename upgrade_schema/{0091_1.18.0_to_1.18.10.json => 0111_1.18.0_to_1.18.10.json} (99%) diff --git a/upgrade_schema/0041_1.14.0_to_1.16.0.json b/upgrade_schema/0041_1.14.0_to_1.16.0.57_beta.json similarity index 73% rename from upgrade_schema/0041_1.14.0_to_1.16.0.json rename to upgrade_schema/0041_1.14.0_to_1.16.0.57_beta.json index 0ae0fdd..110c59b 100644 --- a/upgrade_schema/0041_1.14.0_to_1.16.0.json +++ b/upgrade_schema/0041_1.14.0_to_1.16.0.57_beta.json @@ -2,20 +2,8 @@ "maxVersionMajor": 1, "maxVersionMinor": 16, "maxVersionPatch": 0, - "maxVersionRevision": 14, + "maxVersionRevision": 0, "addedProperties": { - "minecraft:melon_stem": { - "facing_direction": { - "type": "int", - "value": 0 - } - }, - "minecraft:jigsaw": { - "rotation": { - "type": "int", - "value": 0 - } - }, "minecraft:cobblestone_wall": { "wall_connection_type_east": { "type": "string", @@ -38,8 +26,8 @@ "value": 0 } }, - "minecraft:pumpkin_stem": { - "facing_direction": { + "minecraft:jigsaw": { + "rotation": { "type": "int", "value": 0 } diff --git a/upgrade_schema/0042_1.16.0_beta_to_1.16.0.json b/upgrade_schema/0042_1.16.0_beta_to_1.16.0.json deleted file mode 100644 index 4f8f00b..0000000 --- a/upgrade_schema/0042_1.16.0_beta_to_1.16.0.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "maxVersionMajor": 1, - "maxVersionMinor": 16, - "maxVersionPatch": 0, - "maxVersionRevision": 14, - "renamedIds": { - "minecraft:blue_fire": "minecraft:soul_fire", - "minecraft:blue_nether_wart_block": "minecraft:warped_wart_block", - "minecraft:shroomlight_block": "minecraft:shroomlight", - "minecraft:weeping_vines_block": "minecraft:weeping_vines", - "minecraft:basalt_block": "minecraft:basalt", - "minecraft:polished_basalt_block": "minecraft:polished_basalt", - "minecraft:soul_soil_block": "minecraft:soul_soil", - "minecraft:target_block": "minecraft:target", - "minecraft:crimson_trap_door": "minecraft:crimson_trapdoor", - "minecraft:lodestone_block": "minecraft:lodestone", - "minecraft:twisting_vines_block": "minecraft:twisting_vines" - }, - "removedProperties": { - "minecraft:blackstone_wall": [ - "wall_block_type" - ], - "minecraft:polished_blackstone_brick_wall": [ - "wall_block_type" - ], - "minecraft:polished_blackstone_wall": [ - "wall_block_type" - ] - } -} diff --git a/upgrade_schema/0051_1.16.0.57_beta_to_1.16.0.59_beta.json b/upgrade_schema/0051_1.16.0.57_beta_to_1.16.0.59_beta.json new file mode 100644 index 0000000..fe4917c --- /dev/null +++ b/upgrade_schema/0051_1.16.0.57_beta_to_1.16.0.59_beta.json @@ -0,0 +1,17 @@ +{ + "maxVersionMajor": 1, + "maxVersionMinor": 16, + "maxVersionPatch": 0, + "maxVersionRevision": 9, + "renamedIds": { + "minecraft:basalt_block": "minecraft:basalt", + "minecraft:blue_fire": "minecraft:soul_fire", + "minecraft:blue_nether_wart_block": "minecraft:warped_wart_block", + "minecraft:crimson_trap_door": "minecraft:crimson_trapdoor", + "minecraft:polished_basalt_block": "minecraft:polished_basalt", + "minecraft:shroomlight_block": "minecraft:shroomlight", + "minecraft:soul_soil_block": "minecraft:soul_soil", + "minecraft:target_block": "minecraft:target", + "minecraft:weeping_vines_block": "minecraft:weeping_vines" + } +} diff --git a/upgrade_schema/0061_1.16.0.59_beta_to_1.16.0.68_beta.json b/upgrade_schema/0061_1.16.0.59_beta_to_1.16.0.68_beta.json new file mode 100644 index 0000000..daf2eee --- /dev/null +++ b/upgrade_schema/0061_1.16.0.59_beta_to_1.16.0.68_beta.json @@ -0,0 +1,74 @@ +{ + "maxVersionMajor": 1, + "maxVersionMinor": 16, + "maxVersionPatch": 0, + "maxVersionRevision": 14, + "renamedIds": { + "minecraft:lodestone_block": "minecraft:lodestone", + "minecraft:twisting_vines_block": "minecraft:twisting_vines" + }, + "addedProperties": { + "minecraft:melon_stem": { + "facing_direction": { + "type": "int", + "value": 0 + } + }, + "minecraft:pumpkin_stem": { + "facing_direction": { + "type": "int", + "value": 0 + } + } + }, + "removedProperties": { + "minecraft:blackstone_wall": [ + "wall_block_type" + ], + "minecraft:polished_blackstone_brick_wall": [ + "wall_block_type" + ], + "minecraft:polished_blackstone_wall": [ + "wall_block_type" + ] + }, + "remappedPropertyValues": { + "minecraft:cobblestone_wall": { + "wall_block_type": "wall_block_type_00" + } + }, + "remappedPropertyValuesIndex": { + "wall_block_type_00": [ + { + "old": { + "type": "string", + "value": "blackstone" + }, + "new": { + "type": "string", + "value": "cobblestone" + } + }, + { + "old": { + "type": "string", + "value": "polished_blackstone_brick" + }, + "new": { + "type": "string", + "value": "cobblestone" + } + }, + { + "old": { + "type": "string", + "value": "polished_blackstone" + }, + "new": { + "type": "string", + "value": "cobblestone" + } + } + ] + } +} diff --git a/upgrade_schema/0051_1.16.0_to_1.16.100.json b/upgrade_schema/0071_1.16.0_to_1.16.100.json similarity index 100% rename from upgrade_schema/0051_1.16.0_to_1.16.100.json rename to upgrade_schema/0071_1.16.0_to_1.16.100.json index 97cbd91..a20869e 100644 --- a/upgrade_schema/0051_1.16.0_to_1.16.100.json +++ b/upgrade_schema/0071_1.16.0_to_1.16.100.json @@ -3,14 +3,6 @@ "maxVersionMinor": 16, "maxVersionPatch": 0, "maxVersionRevision": 16, - "renamedProperties": { - "minecraft:beehive": { - "facing_direction": "direction" - }, - "minecraft:bee_nest": { - "facing_direction": "direction" - } - }, "addedProperties": { "minecraft:chain": { "pillar_axis": { @@ -19,11 +11,19 @@ } } }, - "remappedPropertyValues": { + "renamedProperties": { + "minecraft:bee_nest": { + "facing_direction": "direction" + }, "minecraft:beehive": { + "facing_direction": "direction" + } + }, + "remappedPropertyValues": { + "minecraft:bee_nest": { "facing_direction": "facing_direction_00" }, - "minecraft:bee_nest": { + "minecraft:beehive": { "facing_direction": "facing_direction_00" } }, @@ -32,11 +32,11 @@ { "old": { "type": "int", - "value": 1 + "value": 4 }, "new": { "type": "int", - "value": 0 + "value": 1 } }, { @@ -62,11 +62,11 @@ { "old": { "type": "int", - "value": 4 + "value": 1 }, "new": { "type": "int", - "value": 1 + "value": 0 } } ] diff --git a/upgrade_schema/0061_1.16.200_to_1.16.210.json b/upgrade_schema/0081_1.16.200_to_1.16.210.json similarity index 100% rename from upgrade_schema/0061_1.16.200_to_1.16.210.json rename to upgrade_schema/0081_1.16.200_to_1.16.210.json diff --git a/upgrade_schema/0071_1.17.10_to_1.17.30.json b/upgrade_schema/0091_1.17.10_to_1.17.30.json similarity index 100% rename from upgrade_schema/0071_1.17.10_to_1.17.30.json rename to upgrade_schema/0091_1.17.10_to_1.17.30.json diff --git a/upgrade_schema/0081_1.17.30_to_1.17.40.json b/upgrade_schema/0101_1.17.30_to_1.17.40.json similarity index 100% rename from upgrade_schema/0081_1.17.30_to_1.17.40.json rename to upgrade_schema/0101_1.17.30_to_1.17.40.json diff --git a/upgrade_schema/0091_1.18.0_to_1.18.10.json b/upgrade_schema/0111_1.18.0_to_1.18.10.json similarity index 99% rename from upgrade_schema/0091_1.18.0_to_1.18.10.json rename to upgrade_schema/0111_1.18.0_to_1.18.10.json index dd7f1eb..6d3a6bf 100644 --- a/upgrade_schema/0091_1.18.0_to_1.18.10.json +++ b/upgrade_schema/0111_1.18.0_to_1.18.10.json @@ -500,4 +500,4 @@ } ] } -} \ No newline at end of file +}