diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 768a79d..5babcc6 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -292,6 +292,7 @@ class RegionSet(object): self._blockmap = { 'minecraft:air': (0, 0), 'minecraft:cave_air': (0, 0), + 'minecraft:void_air': (0, 0), 'minecraft:stone': (1, 0), 'minecraft:granite': (1, 1), 'minecraft:polished_granite': (1, 2), @@ -361,6 +362,7 @@ class RegionSet(object): 'minecraft:green_bed': (26, 0), 'minecraft:red_bed': (26, 0), 'minecraft:black_bed': (26, 0), + 'minecraft:powered_rail': (27, 0), 'minecraft:detector_rail': (28, 0), 'minecraft:sticky_piston': (29, 0), 'minecraft:cobweb': (30, 0), @@ -396,7 +398,7 @@ class RegionSet(object): 'minecraft:pink_tulip': (38, 7), 'minecraft:oxeye_daisy': (38, 8), 'minecraft:dandelion': (38, 9), - 'minecraft:brown_mushroom': (39, 0), + 'minecraft:brown_mushroom': (39, 0), 'minecraft:red_mushroom': (40, 0), 'minecraft:gold_block': (41, 0), 'minecraft:iron_block': (42, 0), @@ -437,7 +439,8 @@ class RegionSet(object): 'minecraft:iron_door': (71, 0), 'minecraft:oak_pressure_plate': (72, 0), 'minecraft:redstone_ore': (73, 0), - 'minecraft:redstone_torch': (76, 0), + 'minecraft:redstone_wall_torch': (75, 0), #not rendering + 'minecraft:redstone_torch': (76, 0), #not rendering 'minecraft:stone_button': (77, 0), 'minecraft:snow': (78, 0), 'minecraft:ice': (79, 0), @@ -472,10 +475,12 @@ class RegionSet(object): 'minecraft:red_mushroom_block': (100, 0), 'minecraft:iron_bars': (101, 0), 'minecraft:glass_pane': (102, 0), + 'minecraft:attached_pumpkin_stem': (104, 0), 'minecraft:attached_melon_stem': (104, 0), - 'minecraft:pumpkin_stem': (104, 0), + 'minecraft:pumpkin_stem': (105, 0), 'minecraft:melon_stem': (105, 0), 'minecraft:vine': (106, 0), + 'minecraft:oak_fence_gate': (107, 0), 'minecraft:brick_stairs': (108, 0), 'minecraft:stone_brick_stairs': (109, 0), 'minecraft:mycelium': (110, 0), @@ -596,33 +601,38 @@ class RegionSet(object): 'minecraft:jungle_door': (195, 0), 'minecraft:acacia_door': (196, 0), 'minecraft:dark_oak_door': (197, 0), + 'minecraft:end_rod': (198, 0), #not rendering 'minecraft:chorus_plant': (199, 0), 'minecraft:chorus_flower': (200, 0), 'minecraft:purpur_block': (201, 0), + 'minecraft:purpur_pillar': (202, 0), 'minecraft:purpur_stairs': (203, 0), + 'minecraft:purpur_slab': (205, 0), + 'minecraft:end_stone_bricks': (206, 0), + 'minecraft:beetroots': (207, 0), 'minecraft:grass_path': (208, 0), - 'minecraft:end_rod': (208, 0), 'minecraft:frosted_ice': (212, 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_shulker_box': (218, 0), - 'minecraft:orange_shulker_box': (218, 1), - 'minecraft:magenta_shulker_box': (218, 2), - 'minecraft:light_blue_shulker_box': (218, 3), - 'minecraft:yellow_shulker_box': (218, 4), - 'minecraft:lime_shulker_box': (218, 5), - 'minecraft:pink_shulker_box': (218, 6), - 'minecraft:gray_shulker_box': (218, 7), - 'minecraft:light_gray_shulker_box': (218, 8), - 'minecraft:cyan_shulker_box': (218, 9), - 'minecraft:purple_shulker_box': (218, 10), - 'minecraft:blue_shulker_box': (218, 11), - 'minecraft:brown_shulker_box': (218, 12), - 'minecraft:green_shulker_box': (218, 13), - 'minecraft:red_shulker_box': (218, 14), - 'minecraft:black_shulker_box': (218, 15), + 'minecraft:observer': (218, 0), + 'minecraft:white_shulker_box': (219, 0), + 'minecraft:orange_shulker_box': (220, 0), + 'minecraft:magenta_shulker_box': (221, 0), + 'minecraft:light_blue_shulker_box': (222, 0), + 'minecraft:yellow_shulker_box': (223, 0), + 'minecraft:lime_shulker_box': (224, 0), + 'minecraft:pink_shulker_box': (225, 0), + 'minecraft:gray_shulker_box': (226, 0), + 'minecraft:light_gray_shulker_box': (227, 0), + 'minecraft:cyan_shulker_box': (228, 0), + 'minecraft:purple_shulker_box': (229, 0), + 'minecraft:blue_shulker_box': (230, 0), + 'minecraft:brown_shulker_box': (231, 0), + 'minecraft:green_shulker_box': (232, 0), + 'minecraft:red_shulker_box': (233, 0), + 'minecraft:black_shulker_box': (234, 0), 'minecraft:white_glazed_terracotta': (235, 0), 'minecraft:orange_glazed_terracotta': (236, 0), 'minecraft:magenta_glazed_terracotta': (237, 0), @@ -631,7 +641,7 @@ class RegionSet(object): 'minecraft:lime_glazed_terracotta': (240, 0), 'minecraft:pink_glazed_terracotta': (241, 0), 'minecraft:gray_glazed_terracotta': (242, 0), - 'minecraft:silver_glazed_terracotta': (243, 0), + 'minecraft:light_gray_glazed_terracotta': (243, 0), 'minecraft:cyan_glazed_terracotta': (244, 0), 'minecraft:purple_glazed_terracotta': (245, 0), 'minecraft:blue_glazed_terracotta': (246, 0), @@ -640,8 +650,6 @@ class RegionSet(object): 'minecraft:red_glazed_terracotta': (249, 0), 'minecraft:black_glazed_terracotta': (250, 0), - 'minecraft:beetroots': (244, 0), - 'minecraft:structure_block': (255, 0), 'minecraft:sign': (323, 0), 'minecraft:comparator': (149, 0), # temporary map all comparators to inactive