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

Add "Remove Tags" commands to Find/Replace NBT results

Browse Source
This commit is contained in:
David Vierra 2016-09-07 14:33:20 -10:00
parent 64eb73dd63
commit 34ec62bae1
3 changed files with 303 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/mcedit2/editorcommands/find_replace/nbt.py
View File

@ -35,7 +35,7 @@ nbtReplaceSettings.replaceValueTagType = nbtReplaceSettings.getOption("replaceVa
class NBTResultsEntry(object): class NBTResultsEntry(object):
# namedtuple("NBTResultsEntry", "tagName value id path position uuid resultType")): # namedtuple("NBTResultsEntry", "tagName value id path position uuid resultType")):
def __init__(self, model, tagNameIndex, tagName, value, ID, path, position, uuid, resultType): def __init__(self, model, tagNameIndex, tagName, value, ID, path, position, uuid, resultType, dimension):
self.model = model self.model = model
self.tagNameIndex = tagNameIndex # xxx REALLY SHOULD change model data through the model itself self.tagNameIndex = tagNameIndex # xxx REALLY SHOULD change model data through the model itself
self.tagName = tagName self.tagName = tagName
@ -45,6 +45,7 @@ class NBTResultsEntry(object):
self.position = position self.position = position
self.uuid = uuid self.uuid = uuid
self.resultType = resultType self.resultType = resultType
self.dimension = dimension
EntityResult = "ENTITY" EntityResult = "ENTITY"
TileEntityResult = "TILE_ENTITY" TileEntityResult = "TILE_ENTITY"
@ -57,13 +58,26 @@ class NBTResultsEntry(object):
self.tagName = value self.tagName = value
self.model.dataChanged.emit(self.tagNameIndex, self.tagNameIndex) self.model.dataChanged.emit(self.tagNameIndex, self.tagNameIndex)
def getEntity(self, dim): def getEntity(self):
assert self.resultType == self.EntityResult assert self.resultType == self.EntityResult
dim = self.dimension
box = BoundingBox(self.position.intfloor(), (1, 1, 1)).chunkBox(dim) box = BoundingBox(self.position.intfloor(), (1, 1, 1)).chunkBox(dim)
entities = dim.getEntities(box, UUID=self.uuid) entities = dim.getEntities(box, UUID=self.uuid)
for entity in entities: for entity in entities:
return entity return entity
return None return None
def getTargetRef(self):
dim = self.dimension
if self.resultType == self.TileEntityResult:
return dim.getTileEntity(self.position)
if self.resultType == self.EntityResult:
return self.getEntity()
# if result.resultType == result.ItemResult: # xxx
class NBTResultsModel(QtCore.QAbstractItemModel): class NBTResultsModel(QtCore.QAbstractItemModel):
@ -78,7 +92,12 @@ class NBTResultsModel(QtCore.QAbstractItemModel):
self.results.append(entry) self.results.append(entry)
self.endInsertRows() self.endInsertRows()
return entry return entry
def removeEntries(self, entries):
self.beginResetModel()
self.results = [r for r in self.results if r not in entries]
self.endResetModel()
# --- Shape --- # --- Shape ---
def rowCount(self, parent): def rowCount(self, parent):
@ -144,6 +163,9 @@ class NBTResultsModel(QtCore.QAbstractItemModel):
# return "Unknown value %s" % value # return "Unknown value %s" % value
# else: # else:
# return value # return value
if role == Qt.UserRole:
return entry
def addResults(self, results): def addResults(self, results):
size = len(self.results) size = len(self.results)
@ -215,6 +237,9 @@ class FindReplaceNBT(QtGui.QWidget, Ui_findNBTWidget):
self.resultsWidget.replaceSelectedButton.clicked.connect(self.replaceSelected) self.resultsWidget.replaceSelectedButton.clicked.connect(self.replaceSelected)
self.resultsWidget.replaceAllButton.clicked.connect(self.replaceAll) self.resultsWidget.replaceAllButton.clicked.connect(self.replaceAll)
self.resultsWidget.removeSelectedButton.clicked.connect(self.removeSelected)
self.resultsWidget.removeAllButton.clicked.connect(self.removeAll)
self.searchNameCheckbox.toggled.connect(self.searchForToggled) self.searchNameCheckbox.toggled.connect(self.searchForToggled)
self.searchValueCheckbox.toggled.connect(self.searchForToggled) self.searchValueCheckbox.toggled.connect(self.searchForToggled)
self.findTimer = None self.findTimer = None
@ -317,7 +342,7 @@ class FindReplaceNBT(QtGui.QWidget, Ui_findNBTWidget):
row = modelIndex.row() row = modelIndex.row()
result = self.resultsModel.results[row] result = self.resultsModel.results[row]
if result.resultType == result.EntityResult: if result.resultType == result.EntityResult:
entity = result.getEntity(self.editorSession.currentDimension) entity = result.getEntity()
if entity is not None: if entity is not None:
self.editorSession.zoomAndInspectEntity(entity) # xxxxxxx!!! self.editorSession.zoomAndInspectEntity(entity) # xxxxxxx!!!
else: else:
@ -395,7 +420,8 @@ class FindReplaceNBT(QtGui.QWidget, Ui_findNBTWidget):
path=[], path=[],
position=entity.Position, position=entity.Position,
uuid=uuid, uuid=uuid,
resultType=NBTResultsEntry.EntityResult) resultType=NBTResultsEntry.EntityResult,
dimension=self.editorSession.currentDimension)
continue continue
tag = entity.raw_tag() tag = entity.raw_tag()
@ -411,7 +437,8 @@ class FindReplaceNBT(QtGui.QWidget, Ui_findNBTWidget):
path=path, path=path,
position=entity.Position, position=entity.Position,
uuid=uuid, uuid=uuid,
resultType=NBTResultsEntry.EntityResult) resultType=NBTResultsEntry.EntityResult,
dimension=self.editorSession.currentDimension)
def _findTileEntitiesInChunk(chunk): def _findTileEntitiesInChunk(chunk):
for tileEntity in chunk.TileEntities: for tileEntity in chunk.TileEntities:
@ -428,7 +455,8 @@ class FindReplaceNBT(QtGui.QWidget, Ui_findNBTWidget):
path=[], path=[],
position=tileEntity.Position, position=tileEntity.Position,
uuid=None, uuid=None,
resultType=NBTResultsEntry.TileEntityResult) resultType=NBTResultsEntry.TileEntityResult,
dimension=self.editorSession.currentDimension)
continue continue
tag = tileEntity.raw_tag() tag = tileEntity.raw_tag()
@ -443,7 +471,8 @@ class FindReplaceNBT(QtGui.QWidget, Ui_findNBTWidget):
path=path, path=path,
position=tileEntity.Position, position=tileEntity.Position,
uuid=None, uuid=None,
resultType=NBTResultsEntry.TileEntityResult) resultType=NBTResultsEntry.TileEntityResult,
dimension=self.editorSession.currentDimension)
def _find(): def _find():
self.resultsDockWidget.show() self.resultsDockWidget.show()
@ -518,30 +547,21 @@ class FindReplaceNBT(QtGui.QWidget, Ui_findNBTWidget):
else: else:
value = newValue value = newValue
subtag.value = value subtag.value = value
result.value = value
def _replace(): def _replace():
for result in entries: for result in entries:
if result.resultType == result.TileEntityResult: ref = result.getTargetRef()
tileEntity = self.editorSession.currentDimension.getTileEntity(result.position)
if tileEntity: tag = ref.raw_tag()
tag = tileEntity.raw_tag() _replaceInTag(result, tag)
_replaceInTag(result, tag) ref.dirty = True
tileEntity.dirty = True
if result.resultType == result.EntityResult:
entity = result.getEntity(self.editorSession.currentDimension) # xxx put dimension in result!!!!
if entity:
tag = entity.raw_tag()
_replaceInTag(result, tag)
entity.dirty = True
# if result.resultType == result.ItemResult: # xxx
yield yield
command = NBTReplaceCommand(self.editorSession, "Replace NBT data") # xxx replace details command = NBTReplaceCommand(self.editorSession, "Replace NBT data") # xxx replace details
with command.begin(): with command.begin():
replacer = _replace() showProgress("Replacing NBT data...", _replace())
showProgress("Replacing NBT data...", replacer)
self.editorSession.pushCommand(command) self.editorSession.pushCommand(command)
@ -549,4 +569,40 @@ class FindReplaceNBT(QtGui.QWidget, Ui_findNBTWidget):
self.replaceEntries(self.resultsModel.results) self.replaceEntries(self.resultsModel.results)
def replaceSelected(self): def replaceSelected(self):
pass entries = []
for index in self.resultsWidget.resultsView.selectedIndices():
entries.append(self.resultsModel.data(index, role=Qt.UserRole))
self.replaceEntries(entries)
def removeEntries(self, entries):
def _remove():
for result in entries:
ref = result.getTargetRef()
tag = ref.raw_tag()
for component in result.path[:-1]:
tag = tag[component]
del tag[result.tagName]
ref.dirty = True
yield
self.resultsModel.removeEntries(entries)
command = NBTReplaceCommand(self.editorSession, "Remove NBT tags")
with command.begin():
showProgress("Removing NBT tags...", _remove())
self.editorSession.pushCommand(command)
def removeAll(self):
self.removeEntries(self.resultsModel.results)
def removeSelected(self):
entries = []
for index in self.resultsWidget.resultsView.selectedIndices():
entries.append(self.resultsModel.data(index, role=Qt.UserRole))
self.removeEntries(entries)

406
src/mcedit2/ui/find_replace_nbt.ui
View File

@ -6,14 +6,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>741</width> <width>429</width>
<height>394</height> <height>390</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
@ -21,22 +21,18 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_9"> <layout class="QFormLayout" name="formLayout_2">
<item> <item row="0" column="0">
<widget class="QCheckBox" name="searchNameCheckbox"> <widget class="QCheckBox" name="searchNameCheckbox">
<property name="text"> <property name="text">
<string>Tag Names</string> <string>Tag Names</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QLineEdit" name="nameField"/> <widget class="QLineEdit" name="nameField"/>
</item> </item>
</layout> <item row="1" column="0">
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_23">
<item>
<widget class="QCheckBox" name="searchValueCheckbox"> <widget class="QCheckBox" name="searchValueCheckbox">
<property name="text"> <property name="text">
<string>Values</string> <string>Values</string>
@ -46,129 +42,133 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="1">
<widget class="QLineEdit" name="valueField"/> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLineEdit" name="valueField"/>
</item>
<item>
<widget class="QLabel" name="label_9">
<property name="text">
<string>Tag Type:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="tagTypeComboBox">
<item>
<property name="text">
<string>Any</string>
</property>
</item>
<item>
<property name="text">
<string>Any Numeric</string>
</property>
</item>
<item>
<property name="text">
<string>Any Integer</string>
</property>
</item>
<item>
<property name="text">
<string>Any Floating-Point</string>
</property>
</item>
<item>
<property name="text">
<string>Any Array</string>
</property>
</item>
<item>
<property name="text">
<string>String</string>
</property>
</item>
<item>
<property name="text">
<string>Byte</string>
</property>
</item>
<item>
<property name="text">
<string>Short</string>
</property>
</item>
<item>
<property name="text">
<string>Int</string>
</property>
</item>
<item>
<property name="text">
<string>Long</string>
</property>
</item>
<item>
<property name="text">
<string>Float</string>
</property>
</item>
<item>
<property name="text">
<string>Double</string>
</property>
</item>
<item>
<property name="text">
<string>List</string>
</property>
</item>
<item>
<property name="text">
<string>Compound</string>
</property>
</item>
<item>
<property name="text">
<string>Byte Array</string>
</property>
</item>
<item>
<property name="text">
<string>Int Array</string>
</property>
</item>
<item>
<property name="text">
<string>Short Array</string>
</property>
</item>
</widget>
</item>
</layout>
</item> </item>
<item> <item row="2" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Tag Type:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="tagTypeComboBox">
<item>
<property name="text">
<string>Any</string>
</property>
</item>
<item>
<property name="text">
<string>Any Numeric</string>
</property>
</item>
<item>
<property name="text">
<string>Any Integer</string>
</property>
</item>
<item>
<property name="text">
<string>Any Floating-Point</string>
</property>
</item>
<item>
<property name="text">
<string>Any Array</string>
</property>
</item>
<item>
<property name="text">
<string>String</string>
</property>
</item>
<item>
<property name="text">
<string>Byte</string>
</property>
</item>
<item>
<property name="text">
<string>Short</string>
</property>
</item>
<item>
<property name="text">
<string>Int</string>
</property>
</item>
<item>
<property name="text">
<string>Long</string>
</property>
</item>
<item>
<property name="text">
<string>Float</string>
</property>
</item>
<item>
<property name="text">
<string>Double</string>
</property>
</item>
<item>
<property name="text">
<string>List</string>
</property>
</item>
<item>
<property name="text">
<string>Compound</string>
</property>
</item>
<item>
<property name="text">
<string>Byte Array</string>
</property>
</item>
<item>
<property name="text">
<string>Int Array</string>
</property>
</item>
<item>
<property name="text">
<string>Short Array</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>Tag Path:</string> <string>Tag Path:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="1">
<widget class="QLineEdit" name="tagPathBox"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="placeholderText"> <item>
<string>Path to search in, such as 'Data/Player/Inventory'</string> <widget class="QLineEdit" name="tagPathBox">
</property> <property name="placeholderText">
</widget> <string>Path to search in, such as 'Data/Player/Inventory'</string>
</item> </property>
<item> </widget>
<widget class="QToolButton" name="tagPathHelpButton"> </item>
<property name="text"> <item>
<string>?</string> <widget class="QToolButton" name="tagPathHelpButton">
</property> <property name="text">
</widget> <string>?</string>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
@ -182,81 +182,84 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_26"> <layout class="QFormLayout" name="formLayout">
<item> <property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="replaceNameCheckbox"> <widget class="QCheckBox" name="replaceNameCheckbox">
<property name="text"> <property name="text">
<string>Replace Name With:</string> <string>Replace Name With:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QLineEdit" name="replaceNameField"/> <widget class="QLineEdit" name="replaceNameField"/>
</item> </item>
</layout> <item row="1" column="0">
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_27">
<item>
<widget class="QCheckBox" name="replaceValueCheckbox"> <widget class="QCheckBox" name="replaceValueCheckbox">
<property name="text"> <property name="text">
<string>Replace Value With:</string> <string>Replace Value With:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="1">
<widget class="QLineEdit" name="replaceValueField"/> <layout class="QHBoxLayout" name="horizontalLayout">
</item>
<item>
<widget class="QLabel" name="label_12">
<property name="text">
<string>Tag Type:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="replaceValueTagTypeComboBox">
<item> <item>
<property name="text"> <widget class="QLineEdit" name="replaceValueField"/>
<string>Existing</string>
</property>
</item> </item>
<item> <item>
<property name="text"> <widget class="QLabel" name="label_12">
<string>String</string> <property name="text">
</property> <string>Tag Type:</string>
</property>
</widget>
</item> </item>
<item> <item>
<property name="text"> <widget class="QComboBox" name="replaceValueTagTypeComboBox">
<string>Byte</string> <item>
</property> <property name="text">
<string>Existing</string>
</property>
</item>
<item>
<property name="text">
<string>String</string>
</property>
</item>
<item>
<property name="text">
<string>Byte</string>
</property>
</item>
<item>
<property name="text">
<string>Short</string>
</property>
</item>
<item>
<property name="text">
<string>Int</string>
</property>
</item>
<item>
<property name="text">
<string>Long</string>
</property>
</item>
<item>
<property name="text">
<string>Float</string>
</property>
</item>
<item>
<property name="text">
<string>Double</string>
</property>
</item>
</widget>
</item> </item>
<item> </layout>
<property name="text">
<string>Short</string>
</property>
</item>
<item>
<property name="text">
<string>Int</string>
</property>
</item>
<item>
<property name="text">
<string>Long</string>
</property>
</item>
<item>
<property name="text">
<string>Float</string>
</property>
</item>
<item>
<property name="text">
<string>Double</string>
</property>
</item>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
@ -268,54 +271,52 @@
<property name="title"> <property name="title">
<string>Search in...</string> <string>Search in...</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_19"> <layout class="QFormLayout" name="formLayout_3">
<item> <item row="0" column="0">
<widget class="QCheckBox" name="searchEntitiesCheckbox"> <widget class="QCheckBox" name="searchEntitiesCheckbox">
<property name="text"> <property name="text">
<string>Search Entities</string> <string>Search Entities</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QLineEdit" name="entityIDField"> <widget class="QLineEdit" name="entityIDField">
<property name="placeholderText"> <property name="placeholderText">
<string>Entity IDs, separted by ';'</string> <string>Entity IDs, separted by ';'</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="1" column="0">
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_24">
<item>
<widget class="QCheckBox" name="searchTileEntitiesCheckbox"> <widget class="QCheckBox" name="searchTileEntitiesCheckbox">
<property name="text"> <property name="text">
<string>Search Tile Entities</string> <string>Search Tile Entities</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="1">
<widget class="QLineEdit" name="tileEntityIDField"> <widget class="QLineEdit" name="tileEntityIDField">
<property name="placeholderText"> <property name="placeholderText">
<string>TileEntity IDs, separted by ';'</string> <string>TileEntity IDs, separted by ';'</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="2" column="0">
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_22">
<item>
<widget class="QCheckBox" name="searchItemsCheckbox"> <widget class="QCheckBox" name="searchItemsCheckbox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Search Items</string> <string>Search Items</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="1">
<widget class="QLineEdit" name="itemIDField"> <widget class="QLineEdit" name="itemIDField">
<property name="enabled">
<bool>false</bool>
</property>
<property name="placeholderText"> <property name="placeholderText">
<string>Item IDs, separated by ';'</string> <string>Item IDs, separated by ';'</string>
</property> </property>
@ -327,6 +328,9 @@
<layout class="QHBoxLayout" name="horizontalLayout_20"> <layout class="QHBoxLayout" name="horizontalLayout_20">
<item> <item>
<widget class="QCheckBox" name="searchPlayersCheckbox"> <widget class="QCheckBox" name="searchPlayersCheckbox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Search Players</string> <string>Search Players</string>
</property> </property>
@ -334,6 +338,9 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="searchChunksCheckbox"> <widget class="QCheckBox" name="searchChunksCheckbox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Search Chunks</string> <string>Search Chunks</string>
</property> </property>
@ -341,6 +348,9 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="searchOtherDatsCheckbox"> <widget class="QCheckBox" name="searchOtherDatsCheckbox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Search other .dat files</string> <string>Search other .dat files</string>
</property> </property>

14
src/mcedit2/ui/find_replace_nbt_results.ui
View File

@ -132,6 +132,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="removeAllButton">
<property name="text">
<string>Remove Tags</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeSelectedButton">
<property name="text">
<string>Remove Selected</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="stopButton"> <widget class="QPushButton" name="stopButton">
<property name="text"> <property name="text">