LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Add concrete powder and other misc. blocks (#4)

Browse Source 
* Add concrete powder and other blocks.
Add visual studio items to gitignore

* Add concrete powder and other blocks.
Add visual studio items to gitignore

* fix whitespace

* wtf... python?

* Update prismarine block ids

* dedupe dictionary

* Add mushroom items back to dictionary

* Change tabs to spaces
This commit is contained in:
jspanos71
2018-08-24 07:55:36 -05:00
committed by Greg McNew
parent 724796959d
commit e715d491d1
2 changed files with 47 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -37,4 +37,6 @@ overviewer_core/src/primitives.h
*.bat
# PyCharm directory
.idea
.idea
/.vs/Minecraft-Overviewer/v15/.suo
/.vs

101
overviewer_core/world.py
View File

@@ -396,7 +396,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),
@@ -454,6 +454,7 @@ class RegionSet(object):
'minecraft:nether_portal': (90, 0),
'minecraft:jack_o_lantern': (91, 0),
'minecraft:cake': (92, 0),
'minecraft:repeater': (93,0), # temporarily map to inactive repeater
'minecraft:oak_trapdoor': (96, 0),
'minecraft:spruce_trapdoor': (96, 0), #wrong
'minecraft:birch_trapdoor': (96, 0),
@@ -468,7 +469,6 @@ class RegionSet(object):
'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),
@@ -526,14 +526,31 @@ class RegionSet(object):
'minecraft:quartz_stairs': (156, 0),
'minecraft:activator_rail': (157, 0),
'minecraft:dropper': (158, 0),
'minecraft:white_terracotta': (159, 0),
'minecraft:orange_terracotta': (159, 1),
'minecraft:magenta_terracotta': (159, 2),
'minecraft:light_blue_terracotta': (159, 3),
'minecraft:yellow_terracotta': (159, 4),
'minecraft:lime_terracotta': (159, 5),
'minecraft:pink_terracotta': (159, 6),
'minecraft:gray_terracotta': (159, 7),
'minecraft:silver_terracotta': (159, 8),
'minecraft:cyan_terracotta': (159, 9),
'minecraft:purple_terracotta': (159, 10),
'minecraft:blue_terracotta': (159, 11),
'minecraft:brown_terracotta': (159, 12),
'minecraft:green_terracotta': (159, 13),
'minecraft:red_terracotta': (159, 14),
'minecraft:black_terracotta': (159, 15),
'minecraft:acacia_log': (162, 0),
'minecraft:dark_oak_log': (162, 1),
'minecraft:acacia_stairs': (163, 0),
'minecraft:dark_oak_stairs': (164, 0),
'minecraft:slime_block': (165,0),
'minecraft:iron_trapdoor': (167, 0),
'minecraft:prismarine': (168, 0),
'minecraft:dark_prismarine': (168, 0),
'minecraft:prismarine_bricks': (168, 0),
'minecraft:dark_prismarine': (168, 2),
'minecraft:prismarine_bricks': (168, 1),
'minecraft:sea_lantern': (169, 0),
'minecraft:hay_block': (170, 0),
'minecraft:white_carpet': (171, 0),
@@ -606,61 +623,28 @@ class RegionSet(object):
'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:white_glazed_terracotta': (235, 0),
'minecraft:orange_glazed_terracotta': (236, 0),
'minecraft:magenta_glazed_terracotta': (237, 0),
'minecraft:light_blue_glazed_terracotta': (238, 0),
'minecraft:yellow_glazed_terracotta': (239, 0),
'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:cyan_glazed_terracotta': (244, 0),
'minecraft:purple_glazed_terracotta': (245, 0),
'minecraft:blue_glazed_terracotta': (246, 0),
'minecraft:brown_glazed_terracotta': (247, 0),
'minecraft:green_glazed_terracotta': (248, 0),
'minecraft:red_glazed_terracotta': (249, 0),
'minecraft:black_glazed_terracotta': (250, 0),
'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:comparator': (149, 0), # temporary map all comparators to inactive
'minecraft:prismarine_shard': (409, 0),
'minecraft:prismarine_crystals': (410, 0),
'minecraft:rabbit_stew': (413, 0),
@@ -718,8 +702,11 @@ class RegionSet(object):
'light_gray', 'cyan', 'purple', 'blue',
'brown', 'green', 'red', 'black']
for i in range(len(colors)):
self._blockmap['minecraft:%s_terracotta' % colors[i]] = (159, i)
self._blockmap['minecraft:%s_concrete' % colors[i]] = (251, i)
self._blockmap['minecraft:%s_stained_glass_pane' % colors[i]] = (160, i)
self._blockmap['minecraft:%s_concrete_powder' % colors[i]] = (252, i)
self._blockmap['minecraft:%s_stained_glass' % colors[i]] = (95, i)
self._blockmap['minecraft:%s_concrete' % colors[i]] = (251, i)
# Re-initialize upon unpickling
def __getstate__(self):