From 64e0d9969651527cad1cf9915193043456e9fa3b Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Thu, 26 Jul 2018 22:49:58 +1000 Subject: [PATCH] Improvements to the legacy mapper. Still a lot of work. --- .../worldedit/world/registry/legacy.json | 70 ++++++++++--------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/legacy.json b/worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/legacy.json index 08fbfb150..ac0766b63 100644 --- a/worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/legacy.json +++ b/worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/legacy.json @@ -8,10 +8,10 @@ "1:4": "minecraft:polished_diorite", "1:5": "minecraft:andesite", "1:6": "minecraft:polished_andesite", - "2:0": "minecraft:grass[snowy=false]", - "3:0": "minecraft:dirt[variant=dirt,snowy=false]", - "3:1": "minecraft:dirt[variant=coarse_dirt,snowy=false]", - "3:2": "minecraft:dirt[variant=podzol,snowy=false]", + "2:0": "minecraft:grass_block[snowy=false]", + "3:0": "minecraft:dirt", + "3:1": "minecraft:coarse_dirt", + "3:2": "minecraft:podzol[snowy=false]", "4:0": "minecraft:cobblestone", "5:0": "minecraft:oak_planks", "5:1": "minecraft:spruce_planks", @@ -102,22 +102,22 @@ "14:0": "minecraft:gold_ore", "15:0": "minecraft:iron_ore", "16:0": "minecraft:coal_ore", - "17:0": "minecraft:log[variant=oak,axis=y]", - "17:1": "minecraft:log[variant=spruce,axis=y]", - "17:2": "minecraft:log[variant=birch,axis=y]", - "17:3": "minecraft:log[variant=jungle,axis=y]", - "17:4": "minecraft:log[variant=oak,axis=x]", - "17:5": "minecraft:log[variant=spruce,axis=x]", - "17:6": "minecraft:log[variant=birch,axis=x]", - "17:7": "minecraft:log[variant=jungle,axis=x]", - "17:8": "minecraft:log[variant=oak,axis=z]", - "17:9": "minecraft:log[variant=spruce,axis=z]", - "17:10": "minecraft:log[variant=birch,axis=z]", - "17:11": "minecraft:log[variant=jungle,axis=z]", - "17:12": "minecraft:log[variant=oak,axis=none]", - "17:13": "minecraft:log[variant=spruce,axis=none]", - "17:14": "minecraft:log[variant=birch,axis=none]", - "17:15": "minecraft:log[variant=jungle,axis=none]", + "17:0": "minecraft:oak_log[axis=y]", + "17:1": "minecraft:spruce_log[axis=y]", + "17:2": "minecraft:birch_log[axis=y]", + "17:3": "minecraft:jungle_log[axis=y]", + "17:4": "minecraft:oak_log[axis=x]", + "17:5": "minecraft:spruce_log[axis=x]", + "17:6": "minecraft:birch_log[axis=x]", + "17:7": "minecraft:jungle_log[axis=x]", + "17:8": "minecraft:oak_log[axis=z]", + "17:9": "minecraft:spruce_log[axis=z]", + "17:10": "minecraft:birch_log[axis=z]", + "17:11": "minecraft:jungle_log[axis=z]", + "17:12": "minecraft:oak_log[axis=none]", + "17:13": "minecraft:spruce_log[axis=none]", + "17:14": "minecraft:birch_log[axis=none]", + "17:15": "minecraft:jungle_log[axis=none]", "18:0": "minecraft:oak_leaves[check_decay=false,decayable=true]", "18:1": "minecraft:spruce_leaves[check_decay=false,decayable=true]", "18:2": "minecraft:birch_leaves[check_decay=false,decayable=true]", @@ -155,18 +155,22 @@ "24:1": "minecraft:chiseled_sandstone", "24:2": "minecraft:cut_sandstone", "25:0": "minecraft:note_block", - "26:0": "minecraft:bed[part=foot,facing=south,occupied=false]", - "26:1": "minecraft:bed[part=foot,facing=west,occupied=false]", - "26:2": "minecraft:bed[part=foot,facing=north,occupied=false]", - "26:3": "minecraft:bed[part=foot,facing=east,occupied=false]", - "26:8": "minecraft:bed[part=head,facing=south,occupied=false]", - "26:9": "minecraft:bed[part=head,facing=west,occupied=false]", - "26:10": "minecraft:bed[part=head,facing=north,occupied=false]", - "26:11": "minecraft:bed[part=head,facing=east,occupied=false]", - "26:12": "minecraft:bed[part=head,facing=south,occupied=true]", - "26:13": "minecraft:bed[part=head,facing=west,occupied=true]", - "26:14": "minecraft:bed[part=head,facing=north,occupied=true]", - "26:15": "minecraft:bed[part=head,facing=east,occupied=true]", + "26:0": "minecraft:red_bed[part=foot,facing=south,occupied=false]", + "26:1": "minecraft:red_bed[part=foot,facing=west,occupied=false]", + "26:2": "minecraft:red_bed[part=foot,facing=north,occupied=false]", + "26:3": "minecraft:red_bed[part=foot,facing=east,occupied=false]", + "26:4": "minecraft:red_bed[part=foot,facing=south,occupied=true]", + "26:5": "minecraft:red_bed[part=foot,facing=west,occupied=true]", + "26:6": "minecraft:red_bed[part=foot,facing=north,occupied=true]", + "26:7": "minecraft:red_bed[part=foot,facing=east,occupied=true]", + "26:8": "minecraft:red_bed[part=head,facing=south,occupied=false]", + "26:9": "minecraft:red_bed[part=head,facing=west,occupied=false]", + "26:10": "minecraft:red_bed[part=head,facing=north,occupied=false]", + "26:11": "minecraft:red_bed[part=head,facing=east,occupied=false]", + "26:12": "minecraft:red_bed[part=head,facing=south,occupied=true]", + "26:13": "minecraft:red_bed[part=head,facing=west,occupied=true]", + "26:14": "minecraft:red_bed[part=head,facing=north,occupied=true]", + "26:15": "minecraft:red_bed[part=head,facing=east,occupied=true]", "27:0": "minecraft:golden_rail[shape=north_south,powered=false]", "27:1": "minecraft:golden_rail[shape=east_west,powered=false]", "27:2": "minecraft:golden_rail[shape=ascending_east,powered=false]", @@ -333,7 +337,7 @@ "51:13": "minecraft:fire[east=false,south=false,north=false,west=false,up=false,age=13]", "51:14": "minecraft:fire[east=false,south=false,north=false,west=false,up=false,age=14]", "51:15": "minecraft:fire[east=false,south=false,north=false,west=false,up=false,age=15]", - "52:0": "minecraft:mob_spawner", + "52:0": "minecraft:spawner", "53:0": "minecraft:oak_stairs[half=bottom,shape=outer_right,facing=east]", "53:1": "minecraft:oak_stairs[half=bottom,shape=outer_right,facing=west]", "53:2": "minecraft:oak_stairs[half=bottom,shape=outer_right,facing=south]",