diff --git a/overviewer_core/world.py b/overviewer_core/world.py index db6a43f..766c20d 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -351,10 +351,46 @@ class RegionSet(object): 'minecraft:sandstone': (24, 0), 'minecraft:cut_sandstone': (24, 2), 'minecraft:chiseled_sandstone': (24, 3), + + 'minecraft:white_bed': (26, 0), + 'minecraft:orange_bed': (26, 0), + 'minecraft:magenta_bed': (26, 0), + 'minecraft:light_blue_bed': (26, 0), + 'minecraft:yellow_bed': (26, 0), + 'minecraft:lime_bed': (26, 0), + 'minecraft:pink_bed': (26, 0), + 'minecraft:gray_bed': (26, 0), + 'minecraft:light_gray_bed': (26, 0), + 'minecraft:cyan_bed': (26, 0), + 'minecraft:purple_bed': (26, 0), + 'minecraft:blue_bed': (26, 0), + 'minecraft:brown_bed': (26, 0), + 'minecraft:green_bed': (26, 0), + 'minecraft:red_bed': (26, 0), + 'minecraft:black_bed': (26, 0), + 'minecraft:cobweb': (30, 0), 'minecraft:dead_bush': (31, 0), 'minecraft:grass': (31, 1), 'minecraft:fern': (31, 2), + + 'minecraft:white_wool': (35, 0), + 'minecraft:orange_wool': (35, 1), + 'minecraft:magenta_wool': (35, 2), + 'minecraft:light_blue_wool': (35, 3), + 'minecraft:yellow_wool': (35, 4), + 'minecraft:lime_wool': (35, 5), + 'minecraft:pink_wool': (35, 6), + 'minecraft:gray_wool': (35, 7), + 'minecraft:light_gray_wool': (35, 8), + 'minecraft:cyan_wool': (35, 9), + 'minecraft:purple_wool': (35, 10), + 'minecraft:blue_wool': (35, 11), + 'minecraft:brown_wool': (35, 12), + 'minecraft:green_wool': (35, 13), + 'minecraft:red_wool': (35, 14), + 'minecraft:black_wool': (35, 15), + 'minecraft:poppy': (38, 0), 'minecraft:blue_orchid': (38, 1), 'minecraft:allium': (38, 2), @@ -366,6 +402,8 @@ class RegionSet(object): 'minecraft:oxeye_daisy': (38, 8), 'minecraft:dandelion': (38, 9), 'minecraft:brown_mushroom': (39, 0), + 'minecraft:red_mushroom': (40, 0), + 'minecraft:gold_block': (41, 0), 'minecraft:stone_slab': (44, 0), 'minecraft:sandstone_slab': (44, 1), 'minecraft:wood_slab': (44, 2), @@ -374,7 +412,9 @@ class RegionSet(object): 'minecraft:stone_brick_slab': (44, 5), 'minecraft:nether_brick_slab': (44, 6), 'minecraft:quartz_slab': (44, 7), - 'minecraft:red_mushroom': (40, 0), + 'minecraft:bricks': (45, 0), + 'minecraft:tnt': (46, 0), + 'minecraft:bookshelf': (47, 0), 'minecraft:obsidian': (49, 0), 'minecraft:wall_torch': (50, 0), 'minecraft:torch': (50, 5), @@ -387,11 +427,16 @@ class RegionSet(object): 'minecraft:wheat': (59, 0), 'minecraft:farmland': (60, 0), 'minecraft:furnace': (61, 0), + 'minecraft:standing_sign': (63, 0), 'minecraft:oak_door': (64, 0), 'minecraft:ladder': (65, 3), # todo: incorporate facing 'minecraft:rail': (66, 0), + 'minecraft:stone_stairs': (67, 0), 'minecraft:cobblestone_stairs': (67, 0), + 'minecraft:wall_sign': (68, 0), + 'minecraft:stone_pressure_plate': (70, 0), 'minecraft:iron_door': (71, 0), + 'minecraft:oak_pressure_plate': (72, 0), 'minecraft:redstone_ore': (73, 0), 'minecraft:snow': (78, 0), 'minecraft:ice': (79, 0), @@ -404,7 +449,7 @@ class RegionSet(object): 'minecraft:netherrack': (87, 0), 'minecraft:soul_sand': (88, 0), 'minecraft:glowstone': (89, 0), - 'minecraft:portal': (90, 0), + 'minecraft:nether_portal': (90, 0), 'minecraft:jack_o_lantern': (91, 0), 'minecraft:oak_trapdoor': (96, 0), 'minecraft:spruce_trapdoor': (96, 0), #wrong @@ -419,14 +464,17 @@ class RegionSet(object): 'minecraft:chiseled_stone_bricks': (98, 3), 'minecraft:infested_chiseled_stone_bricks': (98, 3), 'minecraft:glass_pane': (20, 0), # wrong + 'minecraft:iron_bars': (101, 0), 'minecraft:attached_melon_stem': (104, 0), 'minecraft:vine': (106, 0), - 'minecraft:red_brick_stairs': (108, 0), + 'minecraft:brick_stairs': (108, 0), 'minecraft:stone_brick_stairs': (109, 0), 'minecraft:lily_pad': (111, 0), + 'minecraft:nether_bricks': (112, 0), 'minecraft:nether_brick_fence': (113, 0), 'minecraft:nether_brick_stairs': (114, 0), 'minecraft:nether_wart': (115, 0), + 'minecraft:enchanting_table': (116, 0), 'minecraft:brewing_stand': (117, 0), 'minecraft:oak_slab': (126, 0), 'minecraft:spruce_slab': (126, 1), @@ -435,12 +483,19 @@ class RegionSet(object): 'minecraft:acacia_slab': (126, 4), 'minecraft:dark_oak_slab': (126, 5), 'minecraft:sandstone_stairs': (128, 0), + 'minecraft:tripwire': (131, 0), 'minecraft:spruce_stairs': (134, 0), 'minecraft:birch_stairs': (135, 0), 'minecraft:jungle_stairs': (136, 0), + 'minecraft:beacon': (138, 0), 'minecraft:mossy_cobblestone': (139, 16), + 'minecraft:carrots': (141, 0), + 'minecraft:potatoes': (142, 0), + 'minecraft:light_weighted_pressure_plate': (147, 0), + 'minecraft:heavy_weighted_pressure_plate': (148, 0), 'minecraft:nether_quartz_ore': (153, 0), 'minecraft:hopper': (154, 0), + 'minecraft:smooth_quartz': (155, 0), 'minecraft:quartz_stairs': (156, 0), 'minecraft:white_terracotta': (159, 0), 'minecraft:orange_terracotta': (159, 1), @@ -463,6 +518,24 @@ class RegionSet(object): 'minecraft:acacia_stairs': (163, 0), 'minecraft:dark_oak_stairs': (164, 0), 'minecraft:iron_trapdoor': (167, 0), + 'minecraft:prismarine': (168, 0), + 'minecraft:sea_lantern': (169, 0), + 'minecraft:white_carpet': (171, 0), + 'minecraft:orange_carpet': (171, 1), + 'minecraft:magenta_carpet': (171, 2), + 'minecraft:light_blue_carpet': (171, 3), + 'minecraft:yellow_carpet': (171, 4), + 'minecraft:lime_carpet': (171, 5), + 'minecraft:pink_carpet': (171, 6), + 'minecraft:gray_carpet': (171, 7), + 'minecraft:light_gray_carpet': (171, 8), + 'minecraft:cyan_carpet': (171, 9), + 'minecraft:purple_carpet': (171, 10), + 'minecraft:blue_carpet': (171, 11), + 'minecraft:brown_carpet': (171, 12), + 'minecraft:green_carpet': (171, 13), + 'minecraft:red_carpet': (171, 14), + 'minecraft:black_carpet': (171, 15), 'minecraft:terracotta': (172, 0), 'minecraft:packed_ice': (174, 0), 'minecraft:blue_ice': (174, 0), # close enough @@ -486,7 +559,48 @@ class RegionSet(object): 'minecraft:dark_oak_door': (197, 0), 'minecraft:purpur_stairs': (203, 0), 'minecraft:grass_path': (208, 0), + 'minecraft:end_rod': (208, 0), 'minecraft:magma_block': (213, 0), + 'minecraft:nether_wart_block': (214, 0), + 'minecraft:red_nether_bricks': (215, 0), + 'minecraft:bone_block': (216, 0), + + 'minecraft:white_glazed_terracotta': (220, 0), + 'minecraft:orange_glazed_terracotta': (221, 0), + 'minecraft:magenta_glazed_terracotta': (222, 0), + 'minecraft:light_blue_glazed_terracotta': (223, 0), + 'minecraft:yellow_glazed_terracotta': (224, 0), + 'minecraft:lime_glazed_terracotta': (225, 0), + 'minecraft:pink_glazed_terracotta': (226, 0), + 'minecraft:gray_glazed_terracotta': (227, 0), + 'minecraft:silver_glazed_terracotta': (228, 0), + 'minecraft:cyan_glazed_terracotta': (229, 0), + 'minecraft:purple_glazed_terracotta': (219, 0), + 'minecraft:blue_glazed_terracotta': (231, 0), + 'minecraft:brown_glazed_terracotta': (232, 0), + 'minecraft:green_glazed_terracotta': (233, 0), + 'minecraft:red_glazed_terracotta': (234, 0), + 'minecraft:black_glazed_terracotta': (235, 0), + + 'minecraft:white_stained_glass': (241, 0), + 'minecraft:orange_stained_glass': (241, 1), + 'minecraft:magenta_stained_glass': (241, 2), + 'minecraft:light_blue_stained_glass': (241, 3), + 'minecraft:yellow_stained_glass': (241, 4), + 'minecraft:lime_stained_glass': (241, 5), + 'minecraft:pink_stained_glass': (241, 6), + 'minecraft:gray_stained_glass': (241, 7), + 'minecraft:light_gray_stained_glass': (241, 8), + 'minecraft:cyan_stained_glass': (241, 9), + 'minecraft:purple_stained_glass': (241, 10), + 'minecraft:blue_stained_glass': (241, 11), + 'minecraft:brown_stained_glass': (241, 12), + 'minecraft:green_stained_glass': (241, 13), + 'minecraft:red_stained_glass': (241, 14), + 'minecraft:black_stained_glass': (241, 15), + + 'minecraft:beetroots': (244, 0), + 'minecraft:white_concrete': (251, 0), 'minecraft:orange_concrete': (251, 1), 'minecraft:magenta_concrete': (251, 2), @@ -503,6 +617,7 @@ class RegionSet(object): 'minecraft:green_concrete': (251, 13), 'minecraft:red_concrete': (251, 14), 'minecraft:black_concrete': (251, 15), + 'minecraft:sign': (323, 0), # The following blocks are underwater and are not yet rendered. # To avoid spurious warnings, we'll treat them as air for now.