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

Better handling of named/unknown BlockTypeSets in SchematicFileAdapter

Browse Source
This commit is contained in:
David Vierra 2015-09-28 10:52:15 -10:00
parent 41d5214bb9
commit a8169378b1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mceditlib/schematic.py
View File

@ -99,7 +99,8 @@ class SchematicFileAdapter(FakeChunkedLevelAdapter):
if blocktypes in blocktypeClassesByName:
self.blocktypes = blocktypeClassesByName[blocktypes]()
else:
assert(isinstance(blocktypes, BlockTypeSet))
if not isinstance(blocktypes, BlockTypeSet):
raise ValueError("%s is not a recognized BlockTypeSet", blocktypes)
self.blocktypes = blocktypes
if rootTag:
@ -196,8 +197,8 @@ class SchematicFileAdapter(FakeChunkedLevelAdapter):
self.rootTag = rootTag
self.rootTag["BlockIDs"] = blockIDMapping(blocktypes)
itemMapping = itemIDMapping(blocktypes)
self.rootTag["BlockIDs"] = blockIDMapping(self.blocktypes)
itemMapping = itemIDMapping(self.blocktypes)
if itemMapping is not None:
self.rootTag["ItemIDs"] = itemMapping # Only present for Forge 1.7