From 54f5efebdd6ea10856e16d88950463ff1cf18862 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Fri, 15 Dec 2017 18:20:40 -1000 Subject: [PATCH] Change ID_SHORT_ARRAY to ID_LONG_ARRAY --- src/mcedit2/widgets/nbttree/nbttreemodel.py | 6 +++--- tests/test_mceditlib/nbt_test.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mcedit2/widgets/nbttree/nbttreemodel.py b/src/mcedit2/widgets/nbttree/nbttreemodel.py index 388d575..276b82c 100644 --- a/src/mcedit2/widgets/nbttree/nbttreemodel.py +++ b/src/mcedit2/widgets/nbttree/nbttreemodel.py @@ -253,7 +253,7 @@ class NBTTreeItem(object): if column == 0: return self.tag.name or self.childNumber() if column == 1: - if self.tag.tagID in (nbt.ID_BYTE_ARRAY, nbt.ID_SHORT_ARRAY, nbt.ID_INT_ARRAY): + if self.tag.tagID in (nbt.ID_BYTE_ARRAY, nbt.ID_LONG_ARRAY, nbt.ID_INT_ARRAY): size = self.tag.value.size maxsize = min(8, size) hexchars = self.tag.value.dtype.itemsize * 2 @@ -339,7 +339,7 @@ class NBTTreeModel(QtCore.QAbstractItemModel): (index.column() == 1 and self.tagID(index) not in (nbt.ID_BYTE_ARRAY, nbt.ID_INT_ARRAY, - nbt.ID_SHORT_ARRAY, + nbt.ID_LONG_ARRAY, nbt.ID_LIST, nbt.ID_COMPOUND)) or (index.column() == 0 @@ -495,7 +495,7 @@ _NBTTagTypeSortOrder = [ 'TAG_Compound', 'TAG_List', 'TAG_Int_Array', - 'TAG_Short_Array', + 'TAG_Long_Array', 'TAG_Byte_Array', 'TAG_String', 'TAG_Double', diff --git a/tests/test_mceditlib/nbt_test.py b/tests/test_mceditlib/nbt_test.py index 68bb80a..0cde153 100644 --- a/tests/test_mceditlib/nbt_test.py +++ b/tests/test_mceditlib/nbt_test.py @@ -81,7 +81,7 @@ def created_nbt(): # Save a few more tag types for completeness - level["ShortArray"] = nbt.TAG_Short_Array(numpy.zeros((16, 16), dtype='uint16')) + level["LongArray"] = nbt.TAG_Long_Array(numpy.zeros((16, 16), dtype='uint16')) level["IntArray"] = nbt.TAG_Int_Array(numpy.zeros((16, 16), dtype='uint32')) level["Float"] = nbt.TAG_Float(0.3)