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

Allow find/replace to locate all entities and/or tile entities in the selection, if the searchName and searchValue checkboxes are unchecked and the target IDs fields are empty.

Browse Source
This commit is contained in:
David Vierra 2015-04-25 01:28:35 -10:00
parent 5ff44bf0a1
commit 10747080b0
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,8 +359,9 @@ class FindReplaceNBT(QtCore.QObject):
self.widget.inSelectionCheckbox.setChecked(currentSelection is not None and currentSelection.volume > 0) self.widget.inSelectionCheckbox.setChecked(currentSelection is not None and currentSelection.volume > 0)
def searchForToggled(self): def searchForToggled(self):
canSearch = self.widget.searchNameCheckbox.isChecked() or self.widget.searchValueCheckbox.isChecked() #canSearch = self.widget.searchNameCheckbox.isChecked() or self.widget.searchValueCheckbox.isChecked()
self.widget.findButton.setEnabled(canSearch) #self.widget.findButton.setEnabled(canSearch)
pass
def nameFieldChanged(self, value): def nameFieldChanged(self, value):
nbtReplaceSettings.nameField.setValue(value) nbtReplaceSettings.nameField.setValue(value)
@ -432,9 +433,11 @@ class FindReplaceNBT(QtCore.QObject):
if len(targetTileEntityIDs): if len(targetTileEntityIDs):
targetTileEntityIDs = targetTileEntityIDs.split(';') targetTileEntityIDs = targetTileEntityIDs.split(';')
if not searchNames and not searchValues: if not any((searchNames, searchValues, searchEntities, searchTileEntities)):
# Nothing to find
return return
dim = self.editorSession.currentDimension dim = self.editorSession.currentDimension
inSelection = self.widget.inSelectionCheckbox.isChecked() inSelection = self.widget.inSelectionCheckbox.isChecked()
if inSelection: if inSelection:
@ -477,6 +480,17 @@ class FindReplaceNBT(QtCore.QObject):
except KeyError: except KeyError:
uuid = None # Don't want to use find/replace on entities without UUIDs uuid = None # Don't want to use find/replace on entities without UUIDs
if not searchNames and not searchValues:
# Finding entities only
self.resultsModel.addEntry(tagName="id",
value=entity.id,
id=entity.id,
path=[],
position=entity.Position,
uuid=uuid,
resultType=NBTResultsEntry.EntityResult)
continue
tag = entity.raw_tag() tag = entity.raw_tag()
for name, subtag, path in walkNBT(tag): for name, subtag, path in walkNBT(tag):
@ -501,6 +515,17 @@ class FindReplaceNBT(QtCore.QObject):
if len(targetTileEntityIDs) and tileEntity.id not in targetTileEntityIDs: if len(targetTileEntityIDs) and tileEntity.id not in targetTileEntityIDs:
continue continue
if not searchNames and not searchValues:
# Finding tile entities only
self.resultsModel.addEntry(tagName="id",
value=tileEntity.id,
id=tileEntity.id,
path=[],
position=tileEntity.Position,
uuid=None,
resultType=NBTResultsEntry.TileEntityResult)
continue
tag = tileEntity.raw_tag() tag = tileEntity.raw_tag()
for name, subtag, path in walkNBT(tag): for name, subtag, path in walkNBT(tag):
result = _findTag(name, subtag, path) result = _findTag(name, subtag, path)