From 607e4766c95f448b607c05a7e5170b43f9420ab0 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 9 Feb 2022 19:48:12 +0000 Subject: [PATCH] Added remapped states entries for 1.10 and 1.12 --- upgrade_schema/0001_1.9.0_to_1.10.0.json | 372 ++++++++++ upgrade_schema/0021_1.12.0_to_1.13.0.json | 806 ++++++++++++++++++++++ upgrade_schema/schema.json | 26 + 3 files changed, 1204 insertions(+) diff --git a/upgrade_schema/0001_1.9.0_to_1.10.0.json b/upgrade_schema/0001_1.9.0_to_1.10.0.json index 4aa5ed6..9f4a12f 100644 --- a/upgrade_schema/0001_1.9.0_to_1.10.0.json +++ b/upgrade_schema/0001_1.9.0_to_1.10.0.json @@ -3533,5 +3533,377 @@ } ] } + }, + "remappedStates": { + "minecraft:log": [ + { + "oldState": { + "direction": { + "type": "int", + "value": 1 + }, + "mapped_type": { + "type": "int", + "value": 2 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 1 + }, + "old_log_type": { + "type": "string", + "value": "birch" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 2 + }, + "mapped_type": { + "type": "int", + "value": 2 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 2 + }, + "old_log_type": { + "type": "string", + "value": "birch" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 0 + }, + "mapped_type": { + "type": "int", + "value": 2 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 0 + }, + "old_log_type": { + "type": "string", + "value": "birch" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 2 + }, + "mapped_type": { + "type": "int", + "value": 3 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 2 + }, + "old_log_type": { + "type": "string", + "value": "jungle" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 0 + }, + "mapped_type": { + "type": "int", + "value": 1 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 0 + }, + "old_log_type": { + "type": "string", + "value": "spruce" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 0 + }, + "mapped_type": { + "type": "int", + "value": 0 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 0 + }, + "old_log_type": { + "type": "string", + "value": "oak" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 1 + }, + "mapped_type": { + "type": "int", + "value": 3 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 1 + }, + "old_log_type": { + "type": "string", + "value": "jungle" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 2 + }, + "mapped_type": { + "type": "int", + "value": 0 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 2 + }, + "old_log_type": { + "type": "string", + "value": "oak" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 1 + }, + "mapped_type": { + "type": "int", + "value": 0 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 1 + }, + "old_log_type": { + "type": "string", + "value": "oak" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 1 + }, + "mapped_type": { + "type": "int", + "value": 1 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 1 + }, + "old_log_type": { + "type": "string", + "value": "spruce" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 2 + }, + "mapped_type": { + "type": "int", + "value": 1 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 2 + }, + "old_log_type": { + "type": "string", + "value": "spruce" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 0 + }, + "mapped_type": { + "type": "int", + "value": 3 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 0 + }, + "old_log_type": { + "type": "string", + "value": "jungle" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 3 + }, + "mapped_type": { + "type": "int", + "value": 2 + } + }, + "newName": "minecraft:wood", + "newState": { + "stripped_bit": { + "type": "byte", + "value": 0 + }, + "wood_type": { + "type": "string", + "value": "birch" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 3 + }, + "mapped_type": { + "type": "int", + "value": 1 + } + }, + "newName": "minecraft:wood", + "newState": { + "stripped_bit": { + "type": "byte", + "value": 0 + }, + "wood_type": { + "type": "string", + "value": "spruce" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 3 + }, + "mapped_type": { + "type": "int", + "value": 3 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 3 + }, + "old_log_type": { + "type": "string", + "value": "jungle" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 3 + }, + "mapped_type": { + "type": "int", + "value": 0 + } + }, + "newName": "minecraft:log", + "newState": { + "direction": { + "type": "int", + "value": 3 + }, + "old_log_type": { + "type": "string", + "value": "oak" + } + } + } + ] } } \ No newline at end of file diff --git a/upgrade_schema/0021_1.12.0_to_1.13.0.json b/upgrade_schema/0021_1.12.0_to_1.13.0.json index 0cfcaed..df9ae92 100644 --- a/upgrade_schema/0021_1.12.0_to_1.13.0.json +++ b/upgrade_schema/0021_1.12.0_to_1.13.0.json @@ -2210,5 +2210,811 @@ } ] } + }, + "remappedStates": { + "minecraft:end_rod": [ + { + "oldState": { + "facing_direction": { + "type": "int", + "value": 6 + } + }, + "newName": "minecraft:light_block", + "newState": { + "block_light_level": { + "type": "int", + "value": 14 + } + } + }, + { + "oldState": { + "facing_direction": { + "type": "int", + "value": 7 + } + }, + "newName": "minecraft:light_block", + "newState": { + "block_light_level": { + "type": "int", + "value": 14 + } + } + } + ], + "minecraft:log": [ + { + "oldState": { + "direction": { + "type": "int", + "value": 3 + }, + "old_log_type": { + "type": "string", + "value": "spruce" + } + }, + "newName": "minecraft:wood", + "newState": { + "pillar_axis": { + "type": "string", + "value": "y" + }, + "stripped_bit": { + "type": "byte", + "value": 0 + }, + "wood_type": { + "type": "string", + "value": "spruce" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 3 + }, + "old_log_type": { + "type": "string", + "value": "oak" + } + }, + "newName": "minecraft:wood", + "newState": { + "pillar_axis": { + "type": "string", + "value": "y" + }, + "stripped_bit": { + "type": "byte", + "value": 0 + }, + "wood_type": { + "type": "string", + "value": "oak" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 3 + }, + "old_log_type": { + "type": "string", + "value": "jungle" + } + }, + "newName": "minecraft:wood", + "newState": { + "pillar_axis": { + "type": "string", + "value": "y" + }, + "stripped_bit": { + "type": "byte", + "value": 0 + }, + "wood_type": { + "type": "string", + "value": "jungle" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 3 + }, + "old_log_type": { + "type": "string", + "value": "birch" + } + }, + "newName": "minecraft:wood", + "newState": { + "pillar_axis": { + "type": "string", + "value": "y" + }, + "stripped_bit": { + "type": "byte", + "value": 0 + }, + "wood_type": { + "type": "string", + "value": "birch" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 1 + }, + "old_log_type": { + "type": "string", + "value": "spruce" + } + }, + "newName": "minecraft:log", + "newState": { + "old_log_type": { + "type": "string", + "value": "spruce" + }, + "pillar_axis": { + "type": "string", + "value": "x" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 0 + }, + "old_log_type": { + "type": "string", + "value": "jungle" + } + }, + "newName": "minecraft:log", + "newState": { + "old_log_type": { + "type": "string", + "value": "jungle" + }, + "pillar_axis": { + "type": "string", + "value": "y" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 1 + }, + "old_log_type": { + "type": "string", + "value": "oak" + } + }, + "newName": "minecraft:log", + "newState": { + "old_log_type": { + "type": "string", + "value": "oak" + }, + "pillar_axis": { + "type": "string", + "value": "x" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 0 + }, + "old_log_type": { + "type": "string", + "value": "oak" + } + }, + "newName": "minecraft:log", + "newState": { + "old_log_type": { + "type": "string", + "value": "oak" + }, + "pillar_axis": { + "type": "string", + "value": "y" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 2 + }, + "old_log_type": { + "type": "string", + "value": "spruce" + } + }, + "newName": "minecraft:log", + "newState": { + "old_log_type": { + "type": "string", + "value": "spruce" + }, + "pillar_axis": { + "type": "string", + "value": "z" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 1 + }, + "old_log_type": { + "type": "string", + "value": "birch" + } + }, + "newName": "minecraft:log", + "newState": { + "old_log_type": { + "type": "string", + "value": "birch" + }, + "pillar_axis": { + "type": "string", + "value": "x" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 2 + }, + "old_log_type": { + "type": "string", + "value": "birch" + } + }, + "newName": "minecraft:log", + "newState": { + "old_log_type": { + "type": "string", + "value": "birch" + }, + "pillar_axis": { + "type": "string", + "value": "z" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 0 + }, + "old_log_type": { + "type": "string", + "value": "spruce" + } + }, + "newName": "minecraft:log", + "newState": { + "old_log_type": { + "type": "string", + "value": "spruce" + }, + "pillar_axis": { + "type": "string", + "value": "y" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 2 + }, + "old_log_type": { + "type": "string", + "value": "jungle" + } + }, + "newName": "minecraft:log", + "newState": { + "old_log_type": { + "type": "string", + "value": "jungle" + }, + "pillar_axis": { + "type": "string", + "value": "z" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 0 + }, + "old_log_type": { + "type": "string", + "value": "birch" + } + }, + "newName": "minecraft:log", + "newState": { + "old_log_type": { + "type": "string", + "value": "birch" + }, + "pillar_axis": { + "type": "string", + "value": "y" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 1 + }, + "old_log_type": { + "type": "string", + "value": "jungle" + } + }, + "newName": "minecraft:log", + "newState": { + "old_log_type": { + "type": "string", + "value": "jungle" + }, + "pillar_axis": { + "type": "string", + "value": "x" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 2 + }, + "old_log_type": { + "type": "string", + "value": "oak" + } + }, + "newName": "minecraft:log", + "newState": { + "old_log_type": { + "type": "string", + "value": "oak" + }, + "pillar_axis": { + "type": "string", + "value": "z" + } + } + } + ], + "minecraft:log2": [ + { + "oldState": { + "direction": { + "type": "int", + "value": 3 + }, + "new_log_type": { + "type": "string", + "value": "acacia" + } + }, + "newName": "minecraft:wood", + "newState": { + "pillar_axis": { + "type": "string", + "value": "y" + }, + "stripped_bit": { + "type": "byte", + "value": 0 + }, + "wood_type": { + "type": "string", + "value": "acacia" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 3 + }, + "new_log_type": { + "type": "string", + "value": "dark_oak" + } + }, + "newName": "minecraft:wood", + "newState": { + "pillar_axis": { + "type": "string", + "value": "y" + }, + "stripped_bit": { + "type": "byte", + "value": 0 + }, + "wood_type": { + "type": "string", + "value": "dark_oak" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 3 + }, + "new_log_type": { + "type": "string", + "value": "acacia" + } + }, + "newName": "minecraft:wood", + "newState": { + "pillar_axis": { + "type": "string", + "value": "y" + }, + "stripped_bit": { + "type": "byte", + "value": 0 + }, + "wood_type": { + "type": "string", + "value": "acacia" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 3 + }, + "new_log_type": { + "type": "string", + "value": "acacia" + } + }, + "newName": "minecraft:wood", + "newState": { + "pillar_axis": { + "type": "string", + "value": "y" + }, + "stripped_bit": { + "type": "byte", + "value": 0 + }, + "wood_type": { + "type": "string", + "value": "acacia" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 1 + }, + "new_log_type": { + "type": "string", + "value": "acacia" + } + }, + "newName": "minecraft:log2", + "newState": { + "new_log_type": { + "type": "string", + "value": "acacia" + }, + "pillar_axis": { + "type": "string", + "value": "x" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 0 + }, + "new_log_type": { + "type": "string", + "value": "acacia" + } + }, + "newName": "minecraft:log2", + "newState": { + "new_log_type": { + "type": "string", + "value": "acacia" + }, + "pillar_axis": { + "type": "string", + "value": "y" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 0 + }, + "new_log_type": { + "type": "string", + "value": "dark_oak" + } + }, + "newName": "minecraft:log2", + "newState": { + "new_log_type": { + "type": "string", + "value": "dark_oak" + }, + "pillar_axis": { + "type": "string", + "value": "y" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 0 + }, + "new_log_type": { + "type": "string", + "value": "acacia" + } + }, + "newName": "minecraft:log2", + "newState": { + "new_log_type": { + "type": "string", + "value": "acacia" + }, + "pillar_axis": { + "type": "string", + "value": "y" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 2 + }, + "new_log_type": { + "type": "string", + "value": "acacia" + } + }, + "newName": "minecraft:log2", + "newState": { + "new_log_type": { + "type": "string", + "value": "acacia" + }, + "pillar_axis": { + "type": "string", + "value": "z" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 2 + }, + "new_log_type": { + "type": "string", + "value": "acacia" + } + }, + "newName": "minecraft:log2", + "newState": { + "new_log_type": { + "type": "string", + "value": "acacia" + }, + "pillar_axis": { + "type": "string", + "value": "z" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 2 + }, + "new_log_type": { + "type": "string", + "value": "acacia" + } + }, + "newName": "minecraft:log2", + "newState": { + "new_log_type": { + "type": "string", + "value": "acacia" + }, + "pillar_axis": { + "type": "string", + "value": "z" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 1 + }, + "new_log_type": { + "type": "string", + "value": "dark_oak" + } + }, + "newName": "minecraft:log2", + "newState": { + "new_log_type": { + "type": "string", + "value": "dark_oak" + }, + "pillar_axis": { + "type": "string", + "value": "x" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 2 + }, + "new_log_type": { + "type": "string", + "value": "dark_oak" + } + }, + "newName": "minecraft:log2", + "newState": { + "new_log_type": { + "type": "string", + "value": "dark_oak" + }, + "pillar_axis": { + "type": "string", + "value": "z" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 0 + }, + "new_log_type": { + "type": "string", + "value": "acacia" + } + }, + "newName": "minecraft:log2", + "newState": { + "new_log_type": { + "type": "string", + "value": "acacia" + }, + "pillar_axis": { + "type": "string", + "value": "y" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 1 + }, + "new_log_type": { + "type": "string", + "value": "acacia" + } + }, + "newName": "minecraft:log2", + "newState": { + "new_log_type": { + "type": "string", + "value": "acacia" + }, + "pillar_axis": { + "type": "string", + "value": "x" + } + } + }, + { + "oldState": { + "direction": { + "type": "int", + "value": 1 + }, + "new_log_type": { + "type": "string", + "value": "acacia" + } + }, + "newName": "minecraft:log2", + "newState": { + "new_log_type": { + "type": "string", + "value": "acacia" + }, + "pillar_axis": { + "type": "string", + "value": "x" + } + } + } + ] } } diff --git a/upgrade_schema/schema.json b/upgrade_schema/schema.json index ba7b031..30a65fb 100644 --- a/upgrade_schema/schema.json +++ b/upgrade_schema/schema.json @@ -82,6 +82,32 @@ } } } + }, + "remappedStates": { + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "object", + "properties": { + "oldState": { + "type": "array", + "items": { + "$ref": "#/$defs/blockStateProperty" + } + }, + "newId": { + "type": "string" + }, + "newState": { + "type": "array", + "items": { + "$ref": "#/$defs/blockStateProperty" + } + } + } + } + } } } }