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

Move walkNBT to nbt.walk

Browse Source
This commit is contained in:
David Vierra 2015-05-08 19:23:01 -10:00
parent 7f6e9bb9ef
commit 45c8a970d6
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mcedit2/editorcommands/find_replace.py
View File

@ -493,7 +493,7 @@ class FindReplaceNBT(QtCore.QObject):
tag = entity.raw_tag()
for name, subtag, path in walkNBT(tag):
for name, subtag, path in nbt.walk(tag):
result = _findTag(name, subtag, path)
if result:
name, path, value = result
@ -527,7 +527,7 @@ class FindReplaceNBT(QtCore.QObject):
continue
tag = tileEntity.raw_tag()
for name, subtag, path in walkNBT(tag):
for name, subtag, path in nbt.walk(tag):
result = _findTag(name, subtag, path)
if result:
name, path, value = result
@ -647,20 +647,6 @@ class FindReplaceNBT(QtCore.QObject):
def replaceSelected(self):
pass
def walkNBT(tag, path=None):
if path is None:
path = []
if tag.isCompound():
for name, subtag in tag.iteritems():
yield (name, subtag, path)
for result in walkNBT(subtag, path + [name]):
yield result
if tag.isList():
for i, subtag in enumerate(tag):
yield (i, subtag, path)
for result in walkNBT(subtag, path + [i]):
yield result
class FindReplaceDialog(QtGui.QDialog):

15
src/mceditlib/nbt.pyx
View File

@ -935,3 +935,18 @@ def nested_string(tag, indent_string=" ", indent=0):
result += "%s(%r)" % (tag.__class__.__name__, tag.value)
return result
def walk(tag, path=None):
if path is None:
path = []
if tag.isCompound():
for name, subtag in tag.iteritems():
yield (name, subtag, path)
for result in walk(subtag, path + [name]):
yield result
if tag.isList():
for i, subtag in enumerate(tag):
yield (i, subtag, path)
for result in walk(subtag, path + [i]):
yield result