From a588857ed0783712a581030807642f54f3d01d3c Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 21 Jul 2018 00:04:35 +0200 Subject: NBT: add support for LongArray tags --- src/NBT/LongArrayTag.hpp | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ src/NBT/Tag.cpp | 11 +++++++ src/NBT/Tag.hpp | 1 + 3 files changed, 86 insertions(+) create mode 100644 src/NBT/LongArrayTag.hpp diff --git a/src/NBT/LongArrayTag.hpp b/src/NBT/LongArrayTag.hpp new file mode 100644 index 0000000..6cd910f --- /dev/null +++ b/src/NBT/LongArrayTag.hpp @@ -0,0 +1,74 @@ +/* + Copyright (c) 2015-2018, Matthias Schiffer + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +#pragma once + +#include "Tag.hpp" + +#include + + +namespace MinedMap { +namespace NBT { + +class LongArrayTag : public Tag { +private: + friend class Tag; + + uint32_t len; + const uint8_t *ptr; + + LongArrayTag(Buffer *buffer) { + len = buffer->get32(); + ptr = buffer->get(8*len); + } + +public: + virtual Type getType() const { + return Type::LongArray; + } + + virtual void print(std::ostream& os, const std::string &indent) const { + os << "(" << len << ") [" << std::endl; + + std::string inner = indent + " "; + + for (size_t i = 0; i < len; i++) { + uint64_t v = Buffer::parse64(&ptr[4*i]); + + os << inner + << v << " / " + << (int64_t)v << " / " + << std::hex << "0x" << v << std::dec + << std::endl; + } + + os << indent << "]"; + } +}; + +} +} diff --git a/src/NBT/Tag.cpp b/src/NBT/Tag.cpp index c75cb9f..33dac83 100644 --- a/src/NBT/Tag.cpp +++ b/src/NBT/Tag.cpp @@ -38,6 +38,7 @@ #include "ListTag.hpp" #include "CompoundTag.hpp" #include "IntArrayTag.hpp" +#include "LongArrayTag.hpp" #include @@ -84,6 +85,9 @@ std::shared_ptr Tag::readTag(Type type, Buffer *buffer) { case Type::IntArray: return std::shared_ptr(new IntArrayTag(buffer)); + case Type::LongArray: + return std::shared_ptr(new LongArrayTag(buffer)); + default: throw std::runtime_error("Tag::readTag: unknown tag type"); } @@ -129,6 +133,9 @@ std::shared_ptr Tag::readList(Buffer *buffer) { case Type::IntArray: return std::shared_ptr(new ListTag(type, buffer)); + case Type::LongArray: + return std::shared_ptr(new ListTag(type, buffer)); + default: throw std::runtime_error("Tag::readList: unknown tag type"); } @@ -195,6 +202,10 @@ std::ostream& operator<<(std::ostream& os, Tag::Type type) { os << "IntArray"; break; + case Tag::Type::LongArray: + os << "LongArray"; + break; + default: os.setstate(std::ios_base::failbit); } diff --git a/src/NBT/Tag.hpp b/src/NBT/Tag.hpp index bb71b23..b0c20af 100644 --- a/src/NBT/Tag.hpp +++ b/src/NBT/Tag.hpp @@ -54,6 +54,7 @@ public: List = 9, Compound = 10, IntArray = 11, + LongArray = 12, }; static std::shared_ptr readTag(Type type, Buffer *buffer); -- cgit v1.2.3