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

Fake states are now "[meta=%d]" instead of "[%d]"

Browse Source
This commit is contained in:
David Vierra 2015-10-18 10:40:02 -10:00
parent d4f1656e1c
commit 5319da5484
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mcedit2/editorsession.py
View File

@ -588,7 +588,7 @@ class EditorSession(QtCore.QObject):
else: else:
# not automatically created by FML mapping loader # not automatically created by FML mapping loader
ID = blocktypes.IDsByName[internalName] ID = blocktypes.IDsByName[internalName]
fakeState = '[%d]' % blockDef.meta fakeState = '[meta=%d]' % blockDef.meta
nameAndState = internalName + fakeState nameAndState = internalName + fakeState
blocktypes.blockJsons[nameAndState] = { blocktypes.blockJsons[nameAndState] = {
'displayName': internalName, 'displayName': internalName,

4
src/mceditlib/anvil/adapter.py
View File

@ -576,7 +576,7 @@ class AnvilWorldAdapter(object):
# FML IDs should be allowed to override some of them for 1.8 blocks not in 1.7. # FML IDs should be allowed to override some of them for 1.8 blocks not in 1.7.
count += 1 count += 1
replacedIDs.append(ID) replacedIDs.append(ID)
fakeState = '[0]' fakeState = '[meta=0]'
nameAndState = name + fakeState nameAndState = name + fakeState
log.debug("FML1.7: Adding %s = %d", name, ID) log.debug("FML1.7: Adding %s = %d", name, ID)
@ -596,7 +596,7 @@ class AnvilWorldAdapter(object):
blocktypes.blockJsons[nameAndState] = { blocktypes.blockJsons[nameAndState] = {
'displayName': name, 'displayName': name,
'internalName': name, 'internalName': name,
'blockState': '[0]', 'blockState': '[meta=0]',
'unknown': True, 'unknown': True,
} }