From 6b449da96639e948bdec62b1460c13bf9ce5a578 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Wed, 15 Feb 2012 18:20:57 -0500 Subject: [PATCH] added int array support to nbt.py (untested) Also removed an extra import that I forgot about earlier. --- overviewer_core/nbt.py | 6 ++++++ overviewer_core/settingsValidators.py | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/overviewer_core/nbt.py b/overviewer_core/nbt.py index 2d0c946..1c52460 100644 --- a/overviewer_core/nbt.py +++ b/overviewer_core/nbt.py @@ -85,6 +85,7 @@ class NBTFileReader(object): 8: self._read_tag_string, 9: self._read_tag_list, 10:self._read_tag_compound, + 11:self._read_tag_int_array, } # These private methods read the payload only of the following types @@ -121,6 +122,11 @@ class NBTFileReader(object): bytes = self._file.read(length) return bytes + def _read_tag_int_array(self): + length = self._read_tag_int() + int_bytes = self._file.read(length*4) + return struct.unpack(">%ii" % length, int_bytes) + def _read_tag_string(self): length = self._read_tag_short() # Read the string diff --git a/overviewer_core/settingsValidators.py b/overviewer_core/settingsValidators.py index 0937920..6465a0c 100644 --- a/overviewer_core/settingsValidators.py +++ b/overviewer_core/settingsValidators.py @@ -5,7 +5,6 @@ from collections import namedtuple import rendermodes from world import UPPER_LEFT, UPPER_RIGHT, LOWER_LEFT, LOWER_RIGHT -import logging class ValidationException(Exception): pass