LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Add mushroom block & vine variants

Browse Source 
- Add all possible variants of mushroom blocks introduced in 1.13
- Render mushroom stems similarly to red/brown mushroom blocks
- Add vine variants where vines are on the upwards facing side
This commit is contained in:
Joseph Camp
2020-02-13 23:51:57 +00:00
parent b6716a898a
commit 7e0c880a58
3 changed files with 73 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
overviewer_core/world.py
View File

@@ -470,7 +470,6 @@ class RegionSet(object):
'minecraft:infested_chiseled_stone_bricks': (98, 3),
'minecraft:brown_mushroom_block': (99, 0),
'minecraft:red_mushroom_block': (100, 0),
'minecraft:mushroom_stem': (100,10),
'minecraft:iron_bars': (101, 0),
'minecraft:glass_pane': (102, 0),
'minecraft:melon': (103,0),
@@ -514,6 +513,7 @@ class RegionSet(object):
'minecraft:jungle_stairs': (136, 0),
'minecraft:command_block': (137, 0),
'minecraft:beacon': (138, 0),
'minecraft:mushroom_stem': (139, 0),
'minecraft:flower_pot': (140, 0),
'minecraft:potted_poppy': (140, 0), # Pots not rendering
'minecraft:potted_blue_orchid': (140, 0),
@@ -1064,32 +1064,25 @@ class RegionSet(object):
data = {'east': 1, 'west': 2, 'south': 3, 'north': 4}[facing]
else:
data = 5
elif key in ['minecraft:brown_mushroom_block','minecraft:red_mushroom_block']:
p = palette_entry['Properties']
if p['up'] == 'true': data = 5
else: data = 0
if p['north'] == 'true':
if p['south'] == 'true': data = 14
elif p['east'] == 'true': data = 3
elif p['west'] == 'true': data = 1
else: data = 2
elif p['east'] == 'true':
if p['west'] == 'true': data = 14
elif p['south'] == 'true': data = 9
else: data = 6
elif p['south'] == 'true':
if p['west'] == 'true': data = 7
else: data = 8
elif p['west'] == 'true': data = 4
elif key in ['minecraft:carved_pumpkin', 'minecraft:jack_o_lantern'] or key.endswith('glazed_terracotta'):
facing = palette_entry['Properties']['facing']
data = {'south': 0, 'west': 1, 'north': 2, 'east': 3}[facing]
elif key == 'minecraft:vine':
elif key in ['minecraft:vine', 'minecraft:brown_mushroom_block',
'minecraft:red_mushroom_block', 'minecraft:mushroom_stem']:
p = palette_entry['Properties']
if p['south'] == 'true': data |= 1
if p['west'] == 'true': data |= 2
if p['north'] == 'true': data |= 4
if p['east'] == 'true': data |= 8
if p['south'] == 'true':
data |= 1
if p['west'] == 'true':
data |= 2
if p['north'] == 'true':
data |= 4
if p['east'] == 'true':
data |= 8
if p['up'] == 'true':
data |= 16
# Not all blocks here have the down property, so use dict.get() to avoid errors
if p.get('down', 'false') == 'true':
data |= 32
elif key.endswith('anvil'):
facing = palette_entry['Properties']['facing']
if facing == 'west': data += 1