LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Misc fixes

Browse Source
This commit is contained in:
gmcnew
2018-08-07 22:52:32 +00:00
parent b7bf62b350
commit 7236aefc94
3 changed files with 52 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
overviewer_core/aux_files/genPOI.py
View File

@@ -175,6 +175,10 @@ def handleEntities(rset, config, config_path, filters, markers):
markers[name]['raw'].append(d) markers[name]['raw'].append(d)
except nbt.CorruptChunkError: except nbt.CorruptChunkError:
logging.warning("Ignoring POIs in corrupt chunk %d,%d", x,z) logging.warning("Ignoring POIs in corrupt chunk %d,%d", x,z)
except world.ChunkDoesntExist:
# iterate_chunks() doesn't inspect chunks and filter out
# placeholder ones. It's okay for this chunk to not exist.
pass
else: else:
buckets = [[] for i in range(numbuckets)]; buckets = [[] for i in range(numbuckets)];

5
overviewer_core/tileset.py
View File

@@ -32,6 +32,7 @@ from PIL import Image
from .util import roundrobin from .util import roundrobin
from . import nbt from . import nbt
from . import world
from .files import FileReplacer, get_fs_caps from .files import FileReplacer, get_fs_caps
from .optimizeimages import optimize_image from .optimizeimages import optimize_image
import rendermodes import rendermodes
@@ -1065,6 +1066,10 @@ class TileSet(object):
# A warning and traceback was already printed by world.py's # A warning and traceback was already printed by world.py's
# get_chunk() # get_chunk()
logging.debug("Skipping the render of corrupt chunk at %s,%s and moving on.", chunkx, chunkz) logging.debug("Skipping the render of corrupt chunk at %s,%s and moving on.", chunkx, chunkz)
except world.ChunkDoesntExist:
# Some chunks are present on disk but not fully initialized.
# This is okay.
pass
except Exception, e: except Exception, e:
logging.error("Could not render chunk %s,%s for some reason. This is likely a render primitive option error.", chunkx, chunkz) logging.error("Could not render chunk %s,%s for some reason. This is likely a render primitive option error.", chunkx, chunkz)
logging.error("Full error was:", exc_info=1) logging.error("Full error was:", exc_info=1)

109
overviewer_core/world.py
View File

@@ -424,6 +424,7 @@ class RegionSet(object):
'minecraft:red_brick_stairs': (108, 0), 'minecraft:red_brick_stairs': (108, 0),
'minecraft:stone_brick_stairs': (109, 0), 'minecraft:stone_brick_stairs': (109, 0),
'minecraft:lily_pad': (111, 0), 'minecraft:lily_pad': (111, 0),
'minecraft:nether_bricks': (112, 0),
'minecraft:nether_brick_fence': (113, 0), 'minecraft:nether_brick_fence': (113, 0),
'minecraft:nether_brick_stairs': (114, 0), 'minecraft:nether_brick_stairs': (114, 0),
'minecraft:nether_wart': (115, 0), 'minecraft:nether_wart': (115, 0),
@@ -442,22 +443,6 @@ class RegionSet(object):
'minecraft:nether_quartz_ore': (153, 0), 'minecraft:nether_quartz_ore': (153, 0),
'minecraft:hopper': (154, 0), 'minecraft:hopper': (154, 0),
'minecraft:quartz_stairs': (156, 0), 'minecraft:quartz_stairs': (156, 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:light_gray_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:acacia_log': (162, 0),
'minecraft:dark_oak_log': (162, 1), 'minecraft:dark_oak_log': (162, 1),
'minecraft:acacia_stairs': (163, 0), 'minecraft:acacia_stairs': (163, 0),
@@ -487,52 +472,31 @@ class RegionSet(object):
'minecraft:purpur_stairs': (203, 0), 'minecraft:purpur_stairs': (203, 0),
'minecraft:grass_path': (208, 0), 'minecraft:grass_path': (208, 0),
'minecraft:magma_block': (213, 0), 'minecraft:magma_block': (213, 0),
'minecraft:white_concrete': (251, 0), 'minecraft:red_nether_bricks': (215, 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),
# The following blocks are underwater and are not yet rendered. # The following blocks are underwater and are not yet rendered.
# To avoid spurious warnings, we'll treat them as air for now. # To avoid spurious warnings, we'll treat them as water for now.
'minecraft:brain_coral': (0, 0), treat_as_water = [
'minecraft:brain_coral_block': (0, 0), 'brain_coral', 'brain_coral_block', 'brain_coral_fan', 'brain_coral_wall_fan',
'minecraft:brain_coral_fan': (0, 0), 'bubble_coral', 'bubble_coral_block', 'bubble_coral_fan', 'bubble_coral_wall_fan',
'minecraft:brain_coral_wall_fan': (0, 0), 'fire_coral', 'fire_coral_block', 'fire_coral_fan', 'fire_coral_wall_fan',
'minecraft:bubble_column': (0, 0), 'horn_coral', 'horn_coral_block', 'horn_coral_fan', 'horn_coral_wall_fan',
'minecraft:bubble_coral': (0, 0), 'tube_coral', 'tube_coral_block', 'tube_coral_fan', 'tube_coral_wall_fan',
'minecraft:bubble_coral_block': (0, 0), 'kelp', 'kelp_plant', 'sea_pickle', 'seagrass', 'tall_seagrass',
'minecraft:bubble_coral_fan': (0, 0), 'bubble_column',
'minecraft:bubble_coral_wall_fan': (0, 0), ]
'minecraft:fire_coral': (0, 0), for t in treat_as_water:
'minecraft:fire_coral_block': (0, 0), self._blockmap['minecraft:%s' % t] = (8, 0)
'minecraft:fire_coral_fan': (0, 0),
'minecraft:fire_coral_wall_fan': (0, 0), colors = [ 'white', 'orange', 'magenta', 'light_blue',
'minecraft:horn_coral': (0, 0), 'yellow', 'lime', 'pink', 'gray',
'minecraft:horn_coral_block': (0, 0), 'light_gray', 'cyan', 'purple', 'blue',
'minecraft:horn_coral_fan': (0, 0), 'brown', 'green', 'red', 'black']
'minecraft:horn_coral_wall_fan': (0, 0), for i in range(len(colors)):
'minecraft:kelp': (0, 0), self._blockmap['minecraft:%s_terracotta' % colors[i]] = (159, i)
'minecraft:kelp_plant': (0, 0), self._blockmap['minecraft:%s_concrete' % colors[i]] = (251, i)
'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),
}
# Re-initialize upon unpickling # Re-initialize upon unpickling
def __getstate__(self): def __getstate__(self):
@@ -582,10 +546,10 @@ class RegionSet(object):
if p['east'] == 'true': data |= 8 if p['east'] == 'true': data |= 8
elif key.endswith('_stairs'): elif key.endswith('_stairs'):
facing = palette_entry['Properties']['facing'] facing = palette_entry['Properties']['facing']
if facing == 'north': data |= 0x20 | 0x40 if facing == 'south': data |= 0x60
elif facing == 'west': data |= 0x10 | 0x20 elif facing == 'east': data |= 0x30
elif facing == 'south': data |= 0x08 | 0x10 elif facing == 'north': data |= 0x18
elif facing == 'east': data |= 0x08 | 0x40 elif facing == 'west': data |= 0x48
elif key.endswith('_door'): elif key.endswith('_door'):
p = palette_entry['Properties'] p = palette_entry['Properties']
if p['hinge'] == 'left': data |= 0x10 if p['hinge'] == 'left': data |= 0x10
@@ -779,18 +743,27 @@ class RegionSet(object):
# no exception raised: break out of the loop # no exception raised: break out of the loop
break break
if data is None: if data is None:
raise ChunkDoesntExist("Chunk %s,%s doesn't exist" % (x,z)) raise ChunkDoesntExist("Chunk %s,%s doesn't exist" % (x,z))
level = data[1]['Level'] level = data[1]['Level']
chunk_data = level chunk_data = level
# From the interior of a map to the edge, a chunk's status may be one of:
# - postprocessed (interior, or next to fullchunk)
# - fullchunk (next to decorated)
# - decorated (next to liquid_carved)
# - liquid_carved (next to carved)
# - carved (edge of world)
# - empty
# Empty is self-explanatory, and liquid_carved and carved seem to correspond
# to SkyLight not being calculated, which results in mostly-black chunks,
# so we'll just pretend they aren't there.
if chunk_data['Status'] in ("empty", "carved", "liquid_carved"):
raise ChunkDoesntExist("Chunk %s,%s doesn't exist" % (x,z))
# Turn the Biomes array into a 16x16 numpy array # Turn the Biomes array into a 16x16 numpy array
biomes = numpy.asarray(chunk_data['Biomes']) biomes = numpy.asarray(chunk_data['Biomes'])
if len(biomes) == 0:
biomes = numpy.zeros((16, 16), dtype=numpy.uint8)
else:
biomes = biomes.reshape((16,16)) biomes = biomes.reshape((16,16))
chunk_data['Biomes'] = biomes chunk_data['Biomes'] = biomes