LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge PR #1941 from buscher

Browse Source
This commit is contained in:
Nicolas F
2021-06-10 19:26:11 +02:00
parent e729addd23 ef56dbcf3b
commit 6097461494
6 changed files with 35 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
overviewer_core/world.py
View File

@@ -973,6 +973,9 @@ class RegionSet(object):
prismarine_slabs = ('minecraft:prismarine_slab','minecraft:dark_prismarine_slab','minecraft:prismarine_brick_slab')
colors = ['white', 'orange', 'magenta', 'light_blue', 'yellow', 'lime', 'pink', 'gray', 'light_gray', 'cyan',
'purple', 'blue', 'brown', 'green', 'red', 'black']
key = palette_entry['Name']
(block, data) = self._blockmap[key]
if key in ['minecraft:redstone_ore', 'minecraft:redstone_lamp']:
@@ -1284,6 +1287,17 @@ class RegionSet(object):
elif key == 'minecraft:bell':
data |= {'floor': 0, 'ceiling': 4, 'single_wall': 8,
'double_wall': 12}[p['attachment']]
elif key in ['minecraft:iron_bars', 'minecraft:glass_pane'] or \
key in ['minecraft:%s_stained_glass_pane' % item for item in colors]:
p = palette_entry['Properties']
if p['north'] == 'true':
data |= (1 << 4)
if p['east'] == 'true':
data |= (2 << 4)
if p['south'] == 'true':
data |= (4 << 4)
if p['west'] == 'true':
data |= (8 << 4)
return (block, data)