LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge remote-tracking branch 'softer/minecraft113' into minecraft113

Browse Source
This commit is contained in:
Aaron Griffith
2018-08-18 23:01:42 -04:00
parent 203715d05e 60f712ca25
commit 724796959d
2 changed files with 240 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -35,3 +35,6 @@ overviewer_core/src/primitives.h
#Script files, as users may want their own scripts.
*.sh
*.bat
# PyCharm directory
.idea

240
overviewer_core/world.py
View File

@@ -335,15 +335,57 @@ class RegionSet(object):
'minecraft:jungle_leaves': (18, 3),
'minecraft:acacia_leaves': (18, 4),
'minecraft:dark_oak_leaves': (18, 5),
'minecraft:sponge': (19, 0),
'minecraft:wet_sponge': (19, 1),
'minecraft:glass': (20, 0),
'minecraft:lapis_ore': (21, 0),
'minecraft:lapis_block': (22, 0),
'minecraft:dispenser': (23, 0),
'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:detector_rail': (28, 0),
'minecraft:sticky_piston': (29, 0),
'minecraft:cobweb': (30, 0),
'minecraft:dead_bush': (31, 0),
'minecraft:grass': (31, 1),
'minecraft:fern': (31, 2),
'minecraft:piston': (33, 0),
'minecraft:piston_head': (34, 0),
'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),
@@ -355,6 +397,9 @@ 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:iron_block': (42, 0),
'minecraft:stone_slab': (44, 0),
'minecraft:sandstone_slab': (44, 1),
'minecraft:wood_slab': (44, 2),
@@ -363,7 +408,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),
@@ -371,73 +418,142 @@ class RegionSet(object):
'minecraft:spawner': (52, 0),
'minecraft:oak_stairs': (53, 0),
'minecraft:chest': (54, 0),
'minecraft:redstone_wire': (55, 0),
'minecraft:diamond_ore': (56, 0),
'minecraft:diamond_block': (57, 0),
'minecraft:crafting_table': (58, 0),
'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:lever': (69, 0),
'minecraft:stone_pressure_plate': (70, 0),
'minecraft:iron_door': (71, 0),
'minecraft:oak_pressure_plate': (72, 0),
'minecraft:redstone_ore': (73, 0),
'minecraft:redstone_torch': (76, 0),
'minecraft:stone_button': (77, 0),
'minecraft:snow': (78, 0),
'minecraft:ice': (79, 0),
'minecraft:snow_block': (80, 0),
'minecraft:cactus': (81, 0),
'minecraft:clay': (82, 0),
'minecraft:sugar_cane': (83, 0),
'minecraft:jukebox': (84, 0),
'minecraft:oak_fence': (85, 0),
'minecraft:pumpkin': (86, 0),
'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:cake': (92, 0),
'minecraft:oak_trapdoor': (96, 0),
'minecraft:spruce_trapdoor': (96, 0), #wrong
'minecraft:birch_trapdoor': (96, 0),
'minecraft:jungle_trapdoor': (96, 0),
'minecraft:acacia_trapdoor': (96, 0),
'minecraft:dark_oak_trapdoor': (96, 0),
'minecraft:infested_stone': (97, 0),
'minecraft:stone_bricks': (98, 0),
'minecraft:infested_stone_bricks': (98, 0),
'minecraft:mossy_stone_bricks': (98, 1),
'minecraft:cracked_stone_bricks': (98, 2),
'minecraft:chiseled_stone_bricks': (98, 3),
'minecraft:infested_chiseled_stone_bricks': (98, 3),
'minecraft:brown_mushroom_block': (99, 0),
'minecraft:glass_pane': (20, 0), # wrong
'minecraft:red_mushroom_block': (100, 0),
'minecraft:iron_bars': (101, 0),
'minecraft:glass_pane': (102, 0),
'minecraft:attached_melon_stem': (104, 0),
'minecraft:pumpkin_stem': (104, 0),
'minecraft:melon_stem': (105, 0),
'minecraft:vine': (106, 0),
'minecraft:red_brick_stairs': (108, 0),
'minecraft:brick_stairs': (108, 0),
'minecraft:stone_brick_stairs': (109, 0),
'minecraft:mycelium': (110, 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:end_portal': (119, 0),
'minecraft:end_portal_frame': (120, 0),
'minecraft:end_stone': (121, 0),
'minecraft:redstone_lamp': (123, 0),
'minecraft:oak_slab': (126, 0),
'minecraft:spruce_slab': (126, 1),
'minecraft:birch_slab': (126, 2),
'minecraft:jungle_slab': (126, 3),
'minecraft:acacia_slab': (126, 4),
'minecraft:dark_oak_slab': (126, 5),
'minecraft:cocoa': (127, 0),
'minecraft:sandstone_stairs': (128, 0),
'minecraft:emerald_ore': (129, 0),
'minecraft:ender_chest': (130, 0),
'minecraft:tripwire': (131, 0),
'minecraft:tripwire_hook': (132, 0),
'minecraft:emerald_block': (133, 0),
'minecraft:spruce_stairs': (134, 0),
'minecraft:birch_stairs': (135, 0),
'minecraft:jungle_stairs': (136, 0),
'minecraft:command_block': (137, 0),
'minecraft:beacon': (138, 0),
'minecraft:mossy_cobblestone': (139, 16),
'minecraft:cobblestone_wall': (139, 0),
'minecraft:flower_pot': (140, 0),
'minecraft:carrots': (141, 0),
'minecraft:potatoes': (142, 0),
'minecraft:anvil': (145, 0),
'minecraft:trapped_chest': (146, 0),
'minecraft:light_weighted_pressure_plate': (147, 0),
'minecraft:heavy_weighted_pressure_plate': (148, 0),
'minecraft:daylight_detector': (151, 0),
'minecraft:redstone_block': (152, 0),
'minecraft:nether_quartz_ore': (153, 0),
'minecraft:hopper': (154, 0),
'minecraft:smooth_quartz': (155, 0),
'minecraft:quartz_block': (155, 0),
'minecraft:quartz_stairs': (156, 0),
'minecraft:activator_rail': (157, 0),
'minecraft:dropper': (158, 0),
'minecraft:acacia_log': (162, 0),
'minecraft:dark_oak_log': (162, 1),
'minecraft:acacia_stairs': (163, 0),
'minecraft:dark_oak_stairs': (164, 0),
'minecraft:iron_trapdoor': (167, 0),
'minecraft:prismarine': (168, 0),
'minecraft:dark_prismarine': (168, 0),
'minecraft:prismarine_bricks': (168, 0),
'minecraft:sea_lantern': (169, 0),
'minecraft:hay_block': (170, 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:coal_block': (173, 0),
'minecraft:packed_ice': (174, 0),
'minecraft:blue_ice': (174, 0), # close enough
'minecraft:sunflower': (175, 0),
@@ -448,6 +564,11 @@ class RegionSet(object):
'minecraft:peony': (175, 5),
'minecraft:red_sandstone': (179, 0),
'minecraft:red_sandstone_stairs': (180, 0),
'minecraft:spruce_fence_gate': (183, 0),
'minecraft:birch_fence_gate': (184, 0),
'minecraft:jungle_fence_gate': (185, 0),
'minecraft:dark_oak_fence_gate': (186, 0),
'minecraft:acacia_fence_gate': (187, 0),
'minecraft:spruce_fence': (188, 0),
'minecraft:birch_fence': (189, 0),
'minecraft:jungle_fence': (190, 0),
@@ -458,10 +579,123 @@ class RegionSet(object):
'minecraft:jungle_door': (195, 0),
'minecraft:acacia_door': (196, 0),
'minecraft:dark_oak_door': (197, 0),
'minecraft:chorus_plant': (199, 0),
'minecraft:chorus_flower': (200, 0),
'minecraft:purpur_block': (201, 0),
'minecraft:purpur_stairs': (203, 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: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),
'minecraft:light_blue_concrete': (251, 3),
'minecraft:yellow_concrete': (251, 4),
'minecraft:lime_concrete': (251, 5),
'minecraft:pink_concrete': (251, 6),
'minecraft:gray_concrete': (251, 7),
'minecraft:light_gray_concrete': (251, 8),
'minecraft:cyan_concrete': (251, 9),
'minecraft:purple_concrete': (251, 10),
'minecraft:blue_concrete': (251, 11),
'minecraft:brown_concrete': (251, 12),
'minecraft:green_concrete': (251, 13),
'minecraft:red_concrete': (251, 14),
'minecraft:black_concrete': (251, 15),
'minecraft:structure_block': (255, 0),
'minecraft:sign': (323, 0),
'minecraft:comparator': (404, 0),
'minecraft:prismarine_shard': (409, 0),
'minecraft:prismarine_crystals': (410, 0),
'minecraft:rabbit_stew': (413, 0),
'minecraft:rabbit_foot': (414, 0),
'minecraft:rabbit_hide': (415, 0),
'minecraft:armor_stand': (416, 0),
'minecraft:mutton': (423, 0),
# The following blocks are underwater and are not yet rendered.
# To avoid spurious warnings, we'll treat them as air for now.
'minecraft:brain_coral': (0, 0),
'minecraft:brain_coral_block': (0, 0),
'minecraft:brain_coral_fan': (0, 0),
'minecraft:brain_coral_wall_fan': (0, 0),
'minecraft:bubble_column': (0, 0),
'minecraft:bubble_coral': (0, 0),
'minecraft:bubble_coral_block': (0, 0),
'minecraft:bubble_coral_fan': (0, 0),
'minecraft:bubble_coral_wall_fan': (0, 0),
'minecraft:fire_coral': (0, 0),
'minecraft:fire_coral_block': (0, 0),
'minecraft:fire_coral_fan': (0, 0),
'minecraft:fire_coral_wall_fan': (0, 0),
'minecraft:horn_coral': (0, 0),
'minecraft:horn_coral_block': (0, 0),
'minecraft:horn_coral_fan': (0, 0),
'minecraft:horn_coral_wall_fan': (0, 0),
'minecraft:kelp': (0, 0),
'minecraft:kelp_plant': (0, 0),
'minecraft:sea_pickle': (0, 0),
'minecraft:seagrass': (0, 0),
'minecraft:tall_seagrass': (0, 0),
'minecraft:tube_coral': (0, 0),
'minecraft:tube_coral_block': (0, 0),
'minecraft:tube_coral_fan': (0, 0),
'minecraft:tube_coral_wall_fan': (0, 0),
}