AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be more lenient when a block model fails to parse

Browse Source
This commit is contained in:
David Vierra 2016-03-27 04:10:17 -10:00
parent 20533b63c1
commit 98c6f685d6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mcedit2/rendering/blockmodels.pyx
View File

@ -318,11 +318,12 @@ cdef class BlockModels(object):
break break
try: try:
modelDict = self._getBlockModel(parentName) modelDict = self._getBlockModel(parentName)
except ValueError as e: except Exception as e:
log.exception("Error parsing json for block/%s: %s", parentName, e) log.exception("Error parsing json for block/%s: %s", parentName, e)
raise return
else: else:
raise ValueError("Parent loop detected in block model for %s" % block.nameAndState) log.error("Parent loop detected in block model for %s" % block.nameAndState)
return
if block.forcedModelTextures: # user-configured model textures if block.forcedModelTextures: # user-configured model textures
for var, tex in block.forcedModelTextures.iteritems(): for var, tex in block.forcedModelTextures.iteritems():
@ -362,9 +363,7 @@ cdef class BlockModels(object):
except Exception as e: except Exception as e:
log.error("Failed to parse variant of block %s\nelements:\n%s\ntextures:\n%s", log.error("Failed to parse variant of block %s\nelements:\n%s\ntextures:\n%s",
block.nameAndState, allElements, textureVars) block.nameAndState, allElements, textureVars)
raise return
def loadResourceVariant(self, resourcePath, resourceVariant): def loadResourceVariant(self, resourcePath, resourceVariant):
# variants is a dict with each key a resourceVariant value (from the block's ModelResourceLocation) # variants is a dict with each key a resourceVariant value (from the block's ModelResourceLocation)
@ -399,7 +398,7 @@ cdef class BlockModels(object):
except ResourceNotFound as e: except ResourceNotFound as e:
# if block.internalName.startswith("minecraft:"): # if block.internalName.startswith("minecraft:"):
# log.warn("Could not get blockstates resource for %s, skipping... (%r)", block, e) # log.warn("Could not get blockstates resource for %s, skipping... (%r)", block, e)
log.info("Could not get blockstates resource for %s#%s, skipping... (%r)", resourcePath, resourceVariant, e) log.warn("Could not get blockstates resource for %s#%s, skipping... (%r)", resourcePath, resourceVariant, e)
return None return None
if 'variants' not in statesJson: if 'variants' not in statesJson: