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

Fix type errors in _matchTag, fix walkNBT not actually recursing, fix copy-paste error in targetTileEntityIDs

Browse Source
This commit is contained in:
David Vierra 2015-03-23 21:53:58 -10:00
parent 28839b6d96
commit 00c06831d5
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,7 +429,7 @@ class FindReplaceNBT(QtCore.QObject):
searchTileEntities = self.widget.searchTileEntitiesCheckbox.isChecked()
targetTileEntityIDs = self.widget.tileEntityIDField.text()
if len(targetTileEntityIDs):
targetTileEntityIDs = targetEntityIDs.split(';')
targetTileEntityIDs = targetTileEntityIDs.split(';')
if not searchNames and not searchValues:
return
@ -444,18 +444,21 @@ class FindReplaceNBT(QtCore.QObject):
selection = dim.bounds
def _matchTag(name_or_index, tag):
if not tag.isCompound() and not tag.isList() and searchValues and targetValue in tag.value:
return True
if searchNames and targetName in name_or_index:
if searchValues and not tag.isCompound() and not tag.isList():
if tag.tagID == nbt.ID_STRING and targetValue in tag.value:
return True
elif targetValue == tag.value:
return True
if searchNames and isinstance(name_or_index, basestring) and targetName in name_or_index:
return True
return False
def _findTag(name_or_index, tag, path):
if _matchTag(name_or_index, tag):
if tag.isCompound():
value = "Compound"
value = "Compound" # describeCompound
elif tag.isList():
value = "List"
value = "List" # describeList
else:
value = str(tag.value)
@ -624,12 +627,14 @@ def walkNBT(tag, path=None):
if tag.isCompound():
for name, subtag in tag.iteritems():
yield (name, subtag, path)
walkNBT(subtag, path + [name])
for result in walkNBT(subtag, path + [name]):
yield result
if tag.isList():
for i, subtag in enumerate(tag):
yield (i, subtag, path)
walkNBT(subtag, path + [i])
for result in walkNBT(subtag, path + [i]):
yield result
class FindReplaceDialog(QtGui.QDialog):