LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

fix restone torch, torch orientations + lit state

Browse Source
This commit is contained in:
Danial Nickford
2018-09-20 08:29:23 +12:00
parent 9b5f03bb2a
commit ed57c751e2
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
overviewer_core/world.py
View File

@@ -439,8 +439,8 @@ class RegionSet(object):
'minecraft:iron_door': (71, 0), 'minecraft:iron_door': (71, 0),
'minecraft:oak_pressure_plate': (72, 0), 'minecraft:oak_pressure_plate': (72, 0),
'minecraft:redstone_ore': (73, 0), 'minecraft:redstone_ore': (73, 0),
'minecraft:redstone_wall_torch': (75, 0), #not rendering 'minecraft:redstone_wall_torch': (75, 0),
'minecraft:redstone_torch': (76, 0), #not rendering 'minecraft:redstone_torch': (75, 5),
'minecraft:stone_button': (77, 0), 'minecraft:stone_button': (77, 0),
'minecraft:snow': (78, 0), 'minecraft:snow': (78, 0),
'minecraft:ice': (79, 0), 'minecraft:ice': (79, 0),
@@ -741,7 +741,6 @@ class RegionSet(object):
data |= 0x08 data |= 0x08
elif key == 'minecraft_wheat': elif key == 'minecraft_wheat':
data = int(palette_entry['Properties']['age']) data = int(palette_entry['Properties']['age'])
elif key == 'minecraft:wall_torch':
elif key in ['minecraft:ladder', 'minecraft:chest', 'minecraft:ender_chest', 'minecraft:trapped_chest']: elif key in ['minecraft:ladder', 'minecraft:chest', 'minecraft:ender_chest', 'minecraft:trapped_chest']:
facing = palette_entry['Properties']['facing'] facing = palette_entry['Properties']['facing']
data = {'north': 2, 'south': 3, 'west': 4, 'east': 5}[facing] data = {'north': 2, 'south': 3, 'west': 4, 'east': 5}[facing]
@@ -756,6 +755,11 @@ class RegionSet(object):
data |= 4 data |= 4
elif axis == 'z': elif axis == 'z':
data |= 8 data |= 8
elif key in ['minecraft:redstone_torch','minecraft:redstone_wall_torch', 'minecraft:wall_torch']:
if palette_entry['Properties']['lit'] == 'true':
block += 1
facing = palette_entry['Properties'].get('facing', 'up')
data = {'east': 1, 'west': 2, 'south': 3, 'north': 4, 'up': 5}[facing]
elif key == 'minecraft:vine': elif key == 'minecraft:vine':
p = palette_entry['Properties'] p = palette_entry['Properties']
if p['south'] == 'true': data |= 1 if p['south'] == 'true': data |= 1