From 5d5bee49928e36d552c8df62bb820af82bd24032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Wed, 23 Sep 2015 01:21:19 +0200 Subject: [PATCH] GH-1238 re-integrate nbt library --- .gitmodules | 3 + CMakeLists.txt | 8 +- depends/libnbtplusplus | 1 + depends/libnbtplusplus/CMakeLists.txt | 50 -- depends/libnbtplusplus/COPYING | 674 ------------------ depends/libnbtplusplus/COPYING.LESSER | 165 ----- depends/libnbtplusplus/PRD.md | 60 -- depends/libnbtplusplus/README.md | 15 - depends/libnbtplusplus/include/crtp_tag.h | 66 -- depends/libnbtplusplus/include/endian_str.h | 113 --- .../libnbtplusplus/include/io/stream_reader.h | 138 ---- .../libnbtplusplus/include/io/stream_writer.h | 122 ---- depends/libnbtplusplus/include/make_unique.h | 37 - depends/libnbtplusplus/include/nbt_tags.h | 29 - depends/libnbtplusplus/include/nbt_visitor.h | 82 --- .../libnbtplusplus/include/primitive_detail.h | 46 -- depends/libnbtplusplus/include/tag.h | 159 ----- depends/libnbtplusplus/include/tag_array.h | 131 ---- depends/libnbtplusplus/include/tag_compound.h | 144 ---- depends/libnbtplusplus/include/tag_list.h | 224 ------ .../libnbtplusplus/include/tag_primitive.h | 109 --- depends/libnbtplusplus/include/tag_string.h | 74 -- depends/libnbtplusplus/include/tagfwd.h | 51 -- .../include/text/json_formatter.h | 48 -- depends/libnbtplusplus/include/value.h | 223 ------ .../include/value_initializer.h | 67 -- depends/libnbtplusplus/src/endian_str.cpp | 284 -------- .../libnbtplusplus/src/io/stream_reader.cpp | 110 --- .../libnbtplusplus/src/io/stream_writer.cpp | 54 -- depends/libnbtplusplus/src/tag.cpp | 105 --- depends/libnbtplusplus/src/tag_array.cpp | 110 --- depends/libnbtplusplus/src/tag_compound.cpp | 109 --- depends/libnbtplusplus/src/tag_list.cpp | 150 ---- depends/libnbtplusplus/src/tag_string.cpp | 44 -- .../src/text/json_formatter.cpp | 195 ----- depends/libnbtplusplus/src/value.cpp | 376 ---------- .../libnbtplusplus/src/value_initializer.cpp | 36 - depends/libnbtplusplus/test/CMakeLists.txt | 22 - depends/libnbtplusplus/test/endian_str_test.h | 175 ----- depends/libnbtplusplus/test/format_test.cpp | 81 --- depends/libnbtplusplus/test/nbttest.h | 476 ------------- depends/libnbtplusplus/test/read_test.h | 216 ------ .../libnbtplusplus/test/testfiles/bigtest.nbt | Bin 561 -> 0 bytes .../test/testfiles/bigtest_uncompr | Bin 1601 -> 0 bytes .../test/testfiles/errortest_eof1 | Bin 43 -> 0 bytes .../test/testfiles/errortest_eof2 | Bin 94 -> 0 bytes .../test/testfiles/errortest_neg_length | Bin 47 -> 0 bytes .../test/testfiles/errortest_noend | Bin 48 -> 0 bytes .../libnbtplusplus/test/testfiles/level.dat.2 | Bin 175521 -> 0 bytes .../test/testfiles/littletest_uncompr | Bin 1601 -> 0 bytes .../test/testfiles/toplevel_string | Bin 165 -> 0 bytes depends/libnbtplusplus/test/write_test.h | 248 ------- logic/CMakeLists.txt | 4 + 53 files changed, 12 insertions(+), 5622 deletions(-) create mode 100644 .gitmodules create mode 160000 depends/libnbtplusplus delete mode 100644 depends/libnbtplusplus/CMakeLists.txt delete mode 100644 depends/libnbtplusplus/COPYING delete mode 100644 depends/libnbtplusplus/COPYING.LESSER delete mode 100644 depends/libnbtplusplus/PRD.md delete mode 100644 depends/libnbtplusplus/README.md delete mode 100644 depends/libnbtplusplus/include/crtp_tag.h delete mode 100644 depends/libnbtplusplus/include/endian_str.h delete mode 100644 depends/libnbtplusplus/include/io/stream_reader.h delete mode 100644 depends/libnbtplusplus/include/io/stream_writer.h delete mode 100644 depends/libnbtplusplus/include/make_unique.h delete mode 100644 depends/libnbtplusplus/include/nbt_tags.h delete mode 100644 depends/libnbtplusplus/include/nbt_visitor.h delete mode 100644 depends/libnbtplusplus/include/primitive_detail.h delete mode 100644 depends/libnbtplusplus/include/tag.h delete mode 100644 depends/libnbtplusplus/include/tag_array.h delete mode 100644 depends/libnbtplusplus/include/tag_compound.h delete mode 100644 depends/libnbtplusplus/include/tag_list.h delete mode 100644 depends/libnbtplusplus/include/tag_primitive.h delete mode 100644 depends/libnbtplusplus/include/tag_string.h delete mode 100644 depends/libnbtplusplus/include/tagfwd.h delete mode 100644 depends/libnbtplusplus/include/text/json_formatter.h delete mode 100644 depends/libnbtplusplus/include/value.h delete mode 100644 depends/libnbtplusplus/include/value_initializer.h delete mode 100644 depends/libnbtplusplus/src/endian_str.cpp delete mode 100644 depends/libnbtplusplus/src/io/stream_reader.cpp delete mode 100644 depends/libnbtplusplus/src/io/stream_writer.cpp delete mode 100644 depends/libnbtplusplus/src/tag.cpp delete mode 100644 depends/libnbtplusplus/src/tag_array.cpp delete mode 100644 depends/libnbtplusplus/src/tag_compound.cpp delete mode 100644 depends/libnbtplusplus/src/tag_list.cpp delete mode 100644 depends/libnbtplusplus/src/tag_string.cpp delete mode 100644 depends/libnbtplusplus/src/text/json_formatter.cpp delete mode 100644 depends/libnbtplusplus/src/value.cpp delete mode 100644 depends/libnbtplusplus/src/value_initializer.cpp delete mode 100644 depends/libnbtplusplus/test/CMakeLists.txt delete mode 100644 depends/libnbtplusplus/test/endian_str_test.h delete mode 100644 depends/libnbtplusplus/test/format_test.cpp delete mode 100644 depends/libnbtplusplus/test/nbttest.h delete mode 100644 depends/libnbtplusplus/test/read_test.h delete mode 100644 depends/libnbtplusplus/test/testfiles/bigtest.nbt delete mode 100644 depends/libnbtplusplus/test/testfiles/bigtest_uncompr delete mode 100644 depends/libnbtplusplus/test/testfiles/errortest_eof1 delete mode 100644 depends/libnbtplusplus/test/testfiles/errortest_eof2 delete mode 100644 depends/libnbtplusplus/test/testfiles/errortest_neg_length delete mode 100644 depends/libnbtplusplus/test/testfiles/errortest_noend delete mode 100644 depends/libnbtplusplus/test/testfiles/level.dat.2 delete mode 100644 depends/libnbtplusplus/test/testfiles/littletest_uncompr delete mode 100644 depends/libnbtplusplus/test/testfiles/toplevel_string delete mode 100644 depends/libnbtplusplus/test/write_test.h diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..db3e347e7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "depends/libnbtplusplus"] + path = depends/libnbtplusplus + url = https://github.com/MultiMC/libnbtplusplus.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 2655379b5..2bf0b8ccf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,6 @@ include(Coverage) include(GenerateExportHeader) set(CMAKE_CXX_FLAGS " -Wall ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type") -set(CMAKE_CXX_VISIBILITY_PRESET hidden) # cmake code needed for the coverity scan upload include(Coverity) @@ -118,10 +117,11 @@ include_directories(${PACK200_INCLUDE_DIR}) add_subdirectory(depends/rainbow) include_directories(${RAINBOW_INCLUDE_DIR}) -# Add color thingy +# Add NBT library - with out preferred options +set(NBT_BUILD_SHARED ON) +set(NBT_USE_ZLIB OFF) +set(NBT_BUILD_TESTS OFF) #FIXME: fix unit tests. add_subdirectory(depends/libnbtplusplus) -include_directories(${LIBNBTPP_INCLUDE_DIR}) -include_directories(${LIBNBTPP_BIN_INCLUDE_DIR}) ######## MultiMC Libs ######## diff --git a/depends/libnbtplusplus b/depends/libnbtplusplus new file mode 160000 index 000000000..9d17b0a9b --- /dev/null +++ b/depends/libnbtplusplus @@ -0,0 +1 @@ +Subproject commit 9d17b0a9b93e684a5ac6cac8f70d9a7909a877cf diff --git a/depends/libnbtplusplus/CMakeLists.txt b/depends/libnbtplusplus/CMakeLists.txt deleted file mode 100644 index 63bd3d416..000000000 --- a/depends/libnbtplusplus/CMakeLists.txt +++ /dev/null @@ -1,50 +0,0 @@ -cmake_minimum_required(VERSION 3.2) -project(libnbt++ VERSION 2.1) - -add_definitions(-std=c++11) -include_directories(include) - -set(nbt_sources - src/endian_str.cpp - src/tag.cpp - src/tag_array.cpp - src/tag_compound.cpp - src/tag_list.cpp - src/tag_string.cpp - src/value.cpp - src/value_initializer.cpp - - src/io/stream_reader.cpp - src/io/stream_writer.cpp - - src/text/json_formatter.cpp - - include/value_initializer.h - include/tag.h - include/io - include/io/stream_writer.h - include/io/stream_reader.h - include/crtp_tag.h - include/tag_string.h - include/value.h - include/tag_primitive.h - include/tag_list.h - include/tagfwd.h - include/make_unique.h - include/primitive_detail.h - include/endian_str.h - include/tag_compound.h - include/nbt_tags.h - include/nbt_visitor.h - include/text - include/text/json_formatter.h - include/tag_array.h -) - -set(LIBNBTPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) -set(LIBNBTPP_BIN_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}" PARENT_SCOPE) - -add_library(nbt++ SHARED ${nbt_sources}) -generate_export_header(nbt++) - -include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/depends/libnbtplusplus/COPYING b/depends/libnbtplusplus/COPYING deleted file mode 100644 index 94a9ed024..000000000 --- a/depends/libnbtplusplus/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/depends/libnbtplusplus/COPYING.LESSER b/depends/libnbtplusplus/COPYING.LESSER deleted file mode 100644 index 65c5ca88a..000000000 --- a/depends/libnbtplusplus/COPYING.LESSER +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/depends/libnbtplusplus/PRD.md b/depends/libnbtplusplus/PRD.md deleted file mode 100644 index f7b46f1a8..000000000 --- a/depends/libnbtplusplus/PRD.md +++ /dev/null @@ -1,60 +0,0 @@ -# libnbt++2 Product Requirements Document - -### Purpose -Provide a C++ interface for working with NBT data, particularly originating -from Minecraft. - -### Scope -External Minecraft utilities that read or manipulate parts of savefiles, -such as: -- (Graphical) NBT editors -- Inventory editors -- Tools for reading or changing world metadata -- Map editors and visualizers - -### Definitions, Acronyms and Abbreviations -- **libnbt++1:** The predecessor of libnbt++2. -- **Minecraft:** A sandbox voxel world game written in Java, developed by - Mojang. -- **Mojang's implementation:** The NBT library written in Java that Mojang - uses in Minecraft. -- **NBT:** Named Binary Tag. A binary serialization format used by Minecraft. -- **Tag:** A data unit in NBT. Can be a number, string, array, list or - compound. - -### Product Functions -- /RF10/ Reading and writing NBT data files/streams with or without - compression. -- /RF20/ Representing NBT data in memory and allowing programs to read or - manipulate it in all the ways that Mojang's implementation and libnbt++1 - provide. -- /RF30/ A shorter syntax than in libnbt++1 and preferrably also Mojang's - implementation. -- /RF35/ Typesafe operations (no possibly unwanted implicit casts), in case - of incompatible types exceptions should be thrown. -- /RF40/ The need for insecure operations and manual memory management should - be minimized; references and `std::unique_ptr` should be preferred before - raw pointers. -- /RF55/ A wrapper for tags that provides syntactic sugar is preferred - before raw `std::unique_ptr` values. -- /RF50/ Move semantics are preferred before copy semantics. -- /RF55/ Copying tags should be possible, but only in an explicit manner. -- /RF60/ Checked conversions are preferred, unchecked conversions may be - possible but discouraged. - -### Product Performance -- /RP10/ All operations on (not too large) NBT data should not be slower - than their counterparts in Mojang's implementation. -- /RP20/ The library must be able to handle all possible NBT data that - Mojang's implementation can create and handle. -- /RP30/ Often used operations on large Lists, Compounds and Arrays must - be of at most O(log n) time complexity if reasonable. Other operations - should be at most O(n). - -### Quality Requirements -- Functionality: good -- Reliability: normal -- Usability: very good -- Efficiency: good -- Changeability: normal -- Transferability: normal diff --git a/depends/libnbtplusplus/README.md b/depends/libnbtplusplus/README.md deleted file mode 100644 index 913c0ee94..000000000 --- a/depends/libnbtplusplus/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# libnbt++ 2 (WIP) - -libnbt++ is a free C++ library for Minecraft's file format Named Binary Tag -(NBT). It can read and write compressed and uncompressed NBT files and -provides a code interface for working with NBT data. - ----------- - -libnbt++2 is a remake of the old libnbt++ library with the goal of making it -more easily usable and fixing some problems. The old libnbt++ especially -suffered from a very convoluted syntax and boilerplate code needed to work -with NBT data. - - -Forked from https://github.com/ljfa-ag/libnbtplusplus at commit 3b7d44aa0b84f9c208d906f4d10517e36220ee80 \ No newline at end of file diff --git a/depends/libnbtplusplus/include/crtp_tag.h b/depends/libnbtplusplus/include/crtp_tag.h deleted file mode 100644 index 82b419077..000000000 --- a/depends/libnbtplusplus/include/crtp_tag.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef CRTP_TAG_H_INCLUDED -#define CRTP_TAG_H_INCLUDED - -#include "tag.h" -#include "nbt_visitor.h" -#include "make_unique.h" - -#include "nbt++_export.h" - -namespace nbt -{ - -namespace detail -{ - - template - class NBT___EXPORT crtp_tag : public tag - { - public: - //Pure virtual destructor to make the class abstract - virtual ~crtp_tag() noexcept = 0; - - tag_type get_type() const noexcept override final { return Sub::type; }; - - std::unique_ptr clone() const& override final { return make_unique(sub_this()); } - std::unique_ptr move_clone() && override final { return make_unique(std::move(sub_this())); } - - tag& assign(tag&& rhs) override final { return sub_this() = dynamic_cast(rhs); } - - void accept(nbt_visitor& visitor) override final { visitor.visit(sub_this()); } - void accept(const_nbt_visitor& visitor) const override final { visitor.visit(sub_this()); } - - private: - bool equals(const tag& rhs) const override final { return sub_this() == static_cast(rhs); } - - Sub& sub_this() { return static_cast(*this); } - const Sub& sub_this() const { return static_cast(*this); } - }; - - template - crtp_tag::~crtp_tag() noexcept {} - -} - -} - -#endif // CRTP_TAG_H_INCLUDED diff --git a/depends/libnbtplusplus/include/endian_str.h b/depends/libnbtplusplus/include/endian_str.h deleted file mode 100644 index 4a3151c30..000000000 --- a/depends/libnbtplusplus/include/endian_str.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef ENDIAN_STR_H_INCLUDED -#define ENDIAN_STR_H_INCLUDED - -#include -#include - -#include "nbt++_export.h" - -/** - * @brief Reading and writing numbers from and to streams - * in binary format with different byte orders. - */ -namespace endian -{ - -enum endian { little, big }; - -///Reads number from stream in specified endian -template -NBT___EXPORT void read(std::istream& is, T& x, endian e); - -///Reads number from stream in little endian -NBT___EXPORT void read_little(std::istream& is, uint8_t& x); -NBT___EXPORT void read_little(std::istream& is, uint16_t& x); -NBT___EXPORT void read_little(std::istream& is, uint32_t& x); -NBT___EXPORT void read_little(std::istream& is, uint64_t& x); -NBT___EXPORT void read_little(std::istream& is, int8_t& x); -NBT___EXPORT void read_little(std::istream& is, int16_t& x); -NBT___EXPORT void read_little(std::istream& is, int32_t& x); -NBT___EXPORT void read_little(std::istream& is, int64_t& x); -NBT___EXPORT void read_little(std::istream& is, float& x); -NBT___EXPORT void read_little(std::istream& is, double& x); - -///Reads number from stream in big endian -NBT___EXPORT void read_big(std::istream& is, uint8_t& x); -NBT___EXPORT void read_big(std::istream& is, uint16_t& x); -NBT___EXPORT void read_big(std::istream& is, uint32_t& x); -NBT___EXPORT void read_big(std::istream& is, uint64_t& x); -NBT___EXPORT void read_big(std::istream& is, int8_t& x); -NBT___EXPORT void read_big(std::istream& is, int16_t& x); -NBT___EXPORT void read_big(std::istream& is, int32_t& x); -NBT___EXPORT void read_big(std::istream& is, int64_t& x); -NBT___EXPORT void read_big(std::istream& is, float& x); -NBT___EXPORT void read_big(std::istream& is, double& x); - -///Writes number to stream in specified endian -template -NBT___EXPORT void write(std::ostream& os, T x, endian e); - -///Writes number to stream in little endian -NBT___EXPORT void write_little(std::ostream& os, uint8_t x); -NBT___EXPORT void write_little(std::ostream& os, uint16_t x); -NBT___EXPORT void write_little(std::ostream& os, uint32_t x); -NBT___EXPORT void write_little(std::ostream& os, uint64_t x); -NBT___EXPORT void write_little(std::ostream& os, int8_t x); -NBT___EXPORT void write_little(std::ostream& os, int16_t x); -NBT___EXPORT void write_little(std::ostream& os, int32_t x); -NBT___EXPORT void write_little(std::ostream& os, int64_t x); -NBT___EXPORT void write_little(std::ostream& os, float x); -NBT___EXPORT void write_little(std::ostream& os, double x); - -///Writes number to stream in big endian -NBT___EXPORT void write_big(std::ostream& os, uint8_t x); -NBT___EXPORT void write_big(std::ostream& os, uint16_t x); -NBT___EXPORT void write_big(std::ostream& os, uint32_t x); -NBT___EXPORT void write_big(std::ostream& os, uint64_t x); -NBT___EXPORT void write_big(std::ostream& os, int8_t x); -NBT___EXPORT void write_big(std::ostream& os, int16_t x); -NBT___EXPORT void write_big(std::ostream& os, int32_t x); -NBT___EXPORT void write_big(std::ostream& os, int64_t x); -NBT___EXPORT void write_big(std::ostream& os, float x); -NBT___EXPORT void write_big(std::ostream& os, double x); - -template -void read(std::istream& is, T& x, endian e) -{ - if(e == little) - read_little(is, x); - else - read_big(is, x); -} - -template -void write(std::ostream& os, T x, endian e) -{ - if(e == little) - write_little(os, x); - else - write_big(os, x); -} - -} - -#endif // ENDIAN_STR_H_INCLUDED diff --git a/depends/libnbtplusplus/include/io/stream_reader.h b/depends/libnbtplusplus/include/io/stream_reader.h deleted file mode 100644 index 812557834..000000000 --- a/depends/libnbtplusplus/include/io/stream_reader.h +++ /dev/null @@ -1,138 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef STREAM_READER_H_INCLUDED -#define STREAM_READER_H_INCLUDED - -#include "endian_str.h" -#include "tag.h" -#include "tag_compound.h" -#include -#include -#include -#include - -#include "nbt++_export.h" - -namespace nbt -{ -namespace io -{ - -///Exception that gets thrown when reading is not successful -class NBT___EXPORT input_error : public std::runtime_error -{ - using std::runtime_error::runtime_error; -}; - -/** -* @brief Reads a named tag from the stream, making sure that it is a compound -* @param is the stream to read from -* @param e the byte order of the source data. The Java edition -* of Minecraft uses Big Endian, the Pocket edition uses Little Endian -* @throw input_error on failure, or if the tag in the stream is not a compound -*/ -NBT___EXPORT std::pair> read_compound(std::istream& is, endian::endian e = endian::big); - -/** -* @brief Reads a named tag from the stream -* @param is the stream to read from -* @param e the byte order of the source data. The Java edition -* of Minecraft uses Big Endian, the Pocket edition uses Little Endian -* @throw input_error on failure -*/ -NBT___EXPORT std::pair> read_tag(std::istream& is, endian::endian e = endian::big); - -/** - * @brief Helper class for reading NBT tags from input streams - * - * Can be reused to read multiple tags - */ -class NBT___EXPORT stream_reader -{ -public: - /** - * @param is the stream to read from - * @param e the byte order of the source data. The Java edition - * of Minecraft uses Big Endian, the Pocket edition uses Little Endian - */ - explicit stream_reader(std::istream& is, endian::endian e = endian::big) noexcept; - - ///Returns the stream - std::istream& get_istr() const; - ///Returns the byte order - endian::endian get_endian() const; - - /** - * @brief Reads a named tag from the stream, making sure that it is a compound - * @throw input_error on failure, or if the tag in the stream is not a compound - */ - std::pair> read_compound(); - - /** - * @brief Reads a named tag from the stream - * @throw input_error on failure - */ - std::pair> read_tag(); - - /** - * @brief Reads a tag of the given type without name from the stream - * @throw input_error on failure - */ - std::unique_ptr read_payload(tag_type type); - - /** - * @brief Reads a tag type from the stream - * @param allow_end whether to consider tag_type::End valid - * @throw input_error on failure - */ - tag_type read_type(bool allow_end = false); - - /** - * @brief Reads a binary number from the stream - * - * On failure, will set the failbit on the stream. - */ - template - void read_num(T& x); - - /** - * @brief Reads an NBT string from the stream - * - * An NBT string consists of two bytes indicating the length, followed by - * the characters encoded in modified UTF-8. - * @throw input_error on failure - */ - std::string read_string(); - -private: - std::istream& is; - const endian::endian endian; -}; - -template -void stream_reader::read_num(T& x) -{ - endian::read(is, x, endian); -} - -} -} - -#endif // STREAM_READER_H_INCLUDED diff --git a/depends/libnbtplusplus/include/io/stream_writer.h b/depends/libnbtplusplus/include/io/stream_writer.h deleted file mode 100644 index 8938b73be..000000000 --- a/depends/libnbtplusplus/include/io/stream_writer.h +++ /dev/null @@ -1,122 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef STREAM_WRITER_H_INCLUDED -#define STREAM_WRITER_H_INCLUDED - -#include "tag.h" -#include "endian_str.h" -#include - -#include "nbt++_export.h" - -namespace nbt -{ -namespace io -{ - -/* Not sure if that is even needed -///Exception that gets thrown when writing is not successful -class output_error : public std::runtime_error -{ - using std::runtime_error::runtime_error; -};*/ - -/** -* @brief Writes a named tag into the stream, including the tag type -* @param key the name of the tag -* @param t the tag -* @param os the stream to write to -* @param e the byte order of the written data. The Java edition -* of Minecraft uses Big Endian, the Pocket edition uses Little Endian -*/ -NBT___EXPORT void write_tag(const std::string& key, const tag& t, std::ostream& os, endian::endian e = endian::big); - -/** - * @brief Helper class for writing NBT tags to output streams - * - * Can be reused to write multiple tags - */ -class NBT___EXPORT stream_writer -{ -public: - ///Maximum length of an NBT string (16 bit unsigned) - static constexpr size_t max_string_len = UINT16_MAX; - ///Maximum length of an NBT list or array (32 bit signed) - static constexpr uint32_t max_array_len = INT32_MAX; - - /** - * @param os the stream to write to - * @param e the byte order of the written data. The Java edition - * of Minecraft uses Big Endian, the Pocket edition uses Little Endian - */ - explicit stream_writer(std::ostream& os, endian::endian e = endian::big) noexcept: - os(os), endian(e) - {} - - ///Returns the stream - std::ostream& get_ostr() const { return os; } - ///Returns the byte order - endian::endian get_endian() const { return endian; } - - /** - * @brief Writes a named tag into the stream, including the tag type - */ - void write_tag(const std::string& key, const tag& t); - - /** - * @brief Writes the given tag's payload into the stream - */ - void write_payload(const tag& t) { t.write_payload(*this); } - - /** - * @brief Writes a tag type to the stream - */ - void write_type(tag_type tt) { write_num(static_cast(tt)); } - - /** - * @brief Writes a binary number to the stream - */ - template - void write_num(T x); - - /** - * @brief Writes an NBT string to the stream - * - * An NBT string consists of two bytes indicating the length, followed by - * the characters encoded in modified UTF-8. - * @throw std::length_error if the string is too long for NBT - */ - void write_string(const std::string& str); - -private: - std::ostream& os; - const endian::endian endian; -}; - -template -void stream_writer::write_num(T x) -{ - endian::write(os, x, endian); -} - -} -} - -#endif // STREAM_WRITER_H_INCLUDED diff --git a/depends/libnbtplusplus/include/make_unique.h b/depends/libnbtplusplus/include/make_unique.h deleted file mode 100644 index 9a929543c..000000000 --- a/depends/libnbtplusplus/include/make_unique.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef MAKE_UNIQUE_H_INCLUDED -#define MAKE_UNIQUE_H_INCLUDED - -#include - -namespace nbt -{ - -///Creates a new object of type T and returns a std::unique_ptr to it -template -std::unique_ptr make_unique(Args&&... args) -{ - return std::unique_ptr(new T(std::forward(args)...)); -} - -} - -#endif // MAKE_UNIQUE_H_INCLUDED diff --git a/depends/libnbtplusplus/include/nbt_tags.h b/depends/libnbtplusplus/include/nbt_tags.h deleted file mode 100644 index 810bf0d66..000000000 --- a/depends/libnbtplusplus/include/nbt_tags.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef NBT_TAGS_H_INCLUDED -#define NBT_TAGS_H_INCLUDED - -#include "tag_primitive.h" -#include "tag_string.h" -#include "tag_array.h" -#include "tag_list.h" -#include "tag_compound.h" - -#endif // NBT_TAGS_H_INCLUDED diff --git a/depends/libnbtplusplus/include/nbt_visitor.h b/depends/libnbtplusplus/include/nbt_visitor.h deleted file mode 100644 index 6cd51f651..000000000 --- a/depends/libnbtplusplus/include/nbt_visitor.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef NBT_VISITOR_H_INCLUDED -#define NBT_VISITOR_H_INCLUDED - -#include "tagfwd.h" - -#include "nbt++_export.h" - -namespace nbt -{ - -/** - * @brief Base class for visitors of tags - * - * Implementing the Visitor pattern - */ -class NBT___EXPORT nbt_visitor -{ -public: - virtual ~nbt_visitor() noexcept = 0; //Abstract class - - virtual void visit(tag_byte&) {} - virtual void visit(tag_short&) {} - virtual void visit(tag_int&) {} - virtual void visit(tag_long&) {} - virtual void visit(tag_float&) {} - virtual void visit(tag_double&) {} - virtual void visit(tag_byte_array&) {} - virtual void visit(tag_string&) {} - virtual void visit(tag_list&) {} - virtual void visit(tag_compound&) {} - virtual void visit(tag_int_array&) {} -}; - -/** - * @brief Base class for visitors of constant tags - * - * Implementing the Visitor pattern - */ -class NBT___EXPORT const_nbt_visitor -{ -public: - virtual ~const_nbt_visitor() noexcept = 0; //Abstract class - - virtual void visit(const tag_byte&) {} - virtual void visit(const tag_short&) {} - virtual void visit(const tag_int&) {} - virtual void visit(const tag_long&) {} - virtual void visit(const tag_float&) {} - virtual void visit(const tag_double&) {} - virtual void visit(const tag_byte_array&) {} - virtual void visit(const tag_string&) {} - virtual void visit(const tag_list&) {} - virtual void visit(const tag_compound&) {} - virtual void visit(const tag_int_array&) {} -}; - -inline nbt_visitor::~nbt_visitor() noexcept {} - -inline const_nbt_visitor::~const_nbt_visitor() noexcept {} - -} - -#endif // NBT_VISITOR_H_INCLUDED diff --git a/depends/libnbtplusplus/include/primitive_detail.h b/depends/libnbtplusplus/include/primitive_detail.h deleted file mode 100644 index 4715ee7ed..000000000 --- a/depends/libnbtplusplus/include/primitive_detail.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef PRIMITIVE_DETAIL_H_INCLUDED -#define PRIMITIVE_DETAIL_H_INCLUDED - -#include - -///@cond -namespace nbt -{ - -namespace detail -{ - ///Meta-struct that holds the tag_type value for a specific primitive type - template struct get_primitive_type - { static_assert(sizeof(T) != sizeof(T), "Invalid type paramter for tag_primitive, can only use types that NBT uses"); }; - - template<> struct get_primitive_type : public std::integral_constant {}; - template<> struct get_primitive_type : public std::integral_constant {}; - template<> struct get_primitive_type : public std::integral_constant {}; - template<> struct get_primitive_type : public std::integral_constant {}; - template<> struct get_primitive_type : public std::integral_constant {}; - template<> struct get_primitive_type : public std::integral_constant {}; -} - -} -///@endcond - -#endif // PRIMITIVE_DETAIL_H_INCLUDED diff --git a/depends/libnbtplusplus/include/tag.h b/depends/libnbtplusplus/include/tag.h deleted file mode 100644 index 9a9f5858f..000000000 --- a/depends/libnbtplusplus/include/tag.h +++ /dev/null @@ -1,159 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef TAG_H_INCLUDED -#define TAG_H_INCLUDED - -#include -#include -#include - -#include "nbt++_export.h" - -namespace nbt -{ - -///Tag type values used in the binary format -enum class tag_type : int8_t -{ - End = 0, - Byte = 1, - Short = 2, - Int = 3, - Long = 4, - Float = 5, - Double = 6, - Byte_Array = 7, - String = 8, - List = 9, - Compound = 10, - Int_Array = 11, - Null = -1 ///< Used to denote empty @ref value s -}; - -/** - * @brief Returns whether the given number falls within the range of valid tag types - * @param allow_end whether to consider tag_type::End (0) valid - */ -NBT___EXPORT bool is_valid_type(int type, bool allow_end = false); - -//Forward declarations -class nbt_visitor; -class const_nbt_visitor; -namespace io -{ - class stream_reader; - class stream_writer; -} - -///Base class for all NBT tag classes -class NBT___EXPORT tag -{ -public: - //Virtual destructor - virtual ~tag() noexcept {} - - ///Returns the type of the tag - virtual tag_type get_type() const noexcept = 0; - - //Polymorphic clone methods - virtual std::unique_ptr clone() const& = 0; - virtual std::unique_ptr move_clone() && = 0; - std::unique_ptr clone() &&; - - /** - * @brief Returns a reference to the tag as an instance of T - * @throw std::bad_cast if the tag is not of type T - */ - template - T& as(); - template - const T& as() const; - - /** - * @brief Move-assigns the given tag if the class is the same - * @throw std::bad_cast if @c rhs is not the same type as @c *this - */ - virtual tag& assign(tag&& rhs) = 0; - - /** - * @brief Calls the appropriate overload of @c visit() on the visitor with - * @c *this as argument - * - * Implementing the Visitor pattern - */ - virtual void accept(nbt_visitor& visitor) = 0; - virtual void accept(const_nbt_visitor& visitor) const = 0; - - /** - * @brief Reads the tag's payload from the stream - * @throw io::stream_reader::input_error on failure - */ - virtual void read_payload(io::stream_reader& reader) = 0; - - /** - * @brief Writes the tag's payload into the stream - */ - virtual void write_payload(io::stream_writer& writer) const = 0; - - /** - * @brief Default-constructs a new tag of the given type - * @throw std::invalid_argument if the type is not valid (e.g. End or Null) - */ - static std::unique_ptr create(tag_type type); - - friend bool operator==(const tag& lhs, const tag& rhs); - friend bool operator!=(const tag& lhs, const tag& rhs); - -private: - /** - * @brief Checks for equality to a tag of the same type - * @param rhs an instance of the same class as @c *this - */ - virtual bool equals(const tag& rhs) const = 0; -}; - -///Output operator for tag types -NBT___EXPORT std::ostream& operator<<(std::ostream& os, tag_type tt); - -/** - * @brief Output operator for tags - * - * Uses @ref text::json_formatter - * @relates tag - */ -NBT___EXPORT std::ostream& operator<<(std::ostream& os, const tag& t); - -template -T& tag::as() -{ - static_assert(std::is_base_of::value, "T must be a subclass of tag"); - return dynamic_cast(*this); -} - -template -const T& tag::as() const -{ - static_assert(std::is_base_of::value, "T must be a subclass of tag"); - return dynamic_cast(*this); -} - -} - -#endif // TAG_H_INCLUDED diff --git a/depends/libnbtplusplus/include/tag_array.h b/depends/libnbtplusplus/include/tag_array.h deleted file mode 100644 index 77b77d7d4..000000000 --- a/depends/libnbtplusplus/include/tag_array.h +++ /dev/null @@ -1,131 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef TAG_ARRAY_H_INCLUDED -#define TAG_ARRAY_H_INCLUDED - -#include "crtp_tag.h" -#include -#include - -#include "nbt++_export.h" - -namespace nbt -{ - -///@cond -namespace detail -{ - ///Meta-struct that holds the tag_type value for a specific array type - template struct get_array_type - { static_assert(sizeof(T) != sizeof(T), "Invalid type paramter for tag_primitive, can only use byte or int"); }; - - template<> struct get_array_type : public std::integral_constant {}; - template<> struct get_array_type : public std::integral_constant {}; -} -///@cond - -/** - * @brief Tag that contains an array of byte or int values - * - * Common class for tag_byte_array and tag_int_array. - */ -template -class NBT___EXPORT tag_array final : public detail::crtp_tag> -{ -public: - //Iterator types - typedef typename std::vector::iterator iterator; - typedef typename std::vector::const_iterator const_iterator; - - ///The type of the contained values - typedef T value_type; - - ///The type of the tag - static constexpr tag_type type = detail::get_array_type::value; - - ///Constructs an empty array - tag_array() {} - - ///Constructs an array with the given values - tag_array(std::initializer_list init): data(init) {} - tag_array(std::vector&& vec) noexcept: data(std::move(vec)) {} - - ///Returns a reference to the vector that contains the values - std::vector& get() { return data; } - const std::vector& get() const { return data; } - - /** - * @brief Accesses a value by index with bounds checking - * @throw std::out_of_range if the index is out of range - */ - T& at(size_t i); - T at(size_t i) const; - - /** - * @brief Accesses a value by index - * - * No bounds checking is performed. - */ - T& operator[](size_t i) { return data[i]; } - T operator[](size_t i) const { return data[i]; } - - ///Appends a value at the end of the array - void push_back(T val) { data.push_back(val); } - - ///Removes the last element from the array - void pop_back() { data.pop_back(); } - - ///Returns the number of values in the array - size_t size() const { return data.size(); } - - ///Erases all values from the array. - void clear() { data.clear(); } - - //Iterators - iterator begin() { return data.begin(); } - iterator end() { return data.end(); } - const_iterator begin() const { return data.begin(); } - const_iterator end() const { return data.end(); } - const_iterator cbegin() const { return data.cbegin(); } - const_iterator cend() const { return data.cend(); } - - void read_payload(io::stream_reader& reader) override; - /** - * @inheritdoc - * @throw std::length_error if the array is too large for NBT - */ - void write_payload(io::stream_writer& writer) const override; - -private: - std::vector data; -}; - -template bool operator==(const tag_array& lhs, const tag_array& rhs) -{ return lhs.get() == rhs.get(); } -template bool operator!=(const tag_array& lhs, const tag_array& rhs) -{ return !(lhs == rhs); } - -//Typedefs that should be used instead of the template tag_array. -typedef tag_array tag_byte_array; -typedef tag_array tag_int_array; - -} - -#endif // TAG_ARRAY_H_INCLUDED diff --git a/depends/libnbtplusplus/include/tag_compound.h b/depends/libnbtplusplus/include/tag_compound.h deleted file mode 100644 index 5ec818a37..000000000 --- a/depends/libnbtplusplus/include/tag_compound.h +++ /dev/null @@ -1,144 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef TAG_COMPOUND_H_INCLUDED -#define TAG_COMPOUND_H_INCLUDED - -#include "crtp_tag.h" -#include "value_initializer.h" -#include -#include - -#include "nbt++_export.h" - -namespace nbt -{ - -///Tag that contains multiple unordered named tags of arbitrary types -class NBT___EXPORT tag_compound final : public detail::crtp_tag -{ - typedef std::map map_t_; - -public: - //Iterator types - typedef map_t_::iterator iterator; - typedef map_t_::const_iterator const_iterator; - - ///The type of the tag - static constexpr tag_type type = tag_type::Compound; - - ///Constructs an empty compound - tag_compound() {} - - ///Constructs a compound with the given key-value pairs - tag_compound(std::initializer_list> init); - - /** - * @brief Accesses a tag by key with bounds checking - * - * Returns a value to the tag with the specified key, or throws an - * exception if it does not exist. - * @throw std::out_of_range if given key does not exist - */ - value& at(const std::string& key); - const value& at(const std::string& key) const; - - /** - * @brief Accesses a tag by key - * - * Returns a value to the tag with the specified key. If it does not exist, - * creates a new uninitialized entry under the key. - */ - value& operator[](const std::string& key) { return tags[key]; } - - /** - * @brief Inserts or assigns a tag - * - * If the given key already exists, assigns the tag to it. - * Otherwise, it is inserted under the given key. - * @return a pair of the iterator to the value and a bool indicating - * whether the key did not exist - */ - std::pair put(const std::string& key, value_initializer&& val); - - /** - * @brief Inserts a tag if the key does not exist - * @return a pair of the iterator to the value with the key and a bool - * indicating whether the value was actually inserted - */ - std::pair insert(const std::string& key, value_initializer&& val); - - /** - * @brief Constructs and assigns or inserts a tag into the compound - * - * Constructs a new tag of type @c T with the given args and inserts - * or assigns it to the given key. - * @note Unlike std::map::emplace, this will overwrite existing values - * @return a pair of the iterator to the value and a bool indicating - * whether the key did not exist - */ - template - std::pair emplace(const std::string& key, Args&&... args); - - /** - * @brief Erases a tag from the compound - * @return true if a tag was erased - */ - bool erase(const std::string& key); - - ///Returns true if the given key exists in the compound - bool has_key(const std::string& key) const; - ///Returns true if the given key exists and the tag has the given type - bool has_key(const std::string& key, tag_type type) const; - - ///Returns the number of tags in the compound - size_t size() const { return tags.size(); } - - ///Erases all tags from the compound - void clear() { tags.clear(); } - - //Iterators - iterator begin() { return tags.begin(); } - iterator end() { return tags.end(); } - const_iterator begin() const { return tags.begin(); } - const_iterator end() const { return tags.end(); } - const_iterator cbegin() const { return tags.cbegin(); } - const_iterator cend() const { return tags.cend(); } - - void read_payload(io::stream_reader& reader) override; - void write_payload(io::stream_writer& writer) const override; - - friend bool operator==(const tag_compound& lhs, const tag_compound& rhs) - { return lhs.tags == rhs.tags; } - friend bool operator!=(const tag_compound& lhs, const tag_compound& rhs) - { return !(lhs == rhs); } - -private: - map_t_ tags; -}; - -template -std::pair tag_compound::emplace(const std::string& key, Args&&... args) -{ - return put(key, value(make_unique(std::forward(args)...))); -} - -} - -#endif // TAG_COMPOUND_H_INCLUDED diff --git a/depends/libnbtplusplus/include/tag_list.h b/depends/libnbtplusplus/include/tag_list.h deleted file mode 100644 index 5b0ba8731..000000000 --- a/depends/libnbtplusplus/include/tag_list.h +++ /dev/null @@ -1,224 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef TAG_LIST_H_INCLUDED -#define TAG_LIST_H_INCLUDED - -#include "crtp_tag.h" -#include "tagfwd.h" -#include "value_initializer.h" -#include -#include - -#include "nbt++_export.h" - -namespace nbt -{ - -/** - * @brief Tag that contains multiple unnamed tags of the same type - * - * All the tags contained in the list have the same type, which can be queried - * with el_type(). The types of the values contained in the list should not - * be changed to mismatch the element type. - * - * If the list is empty, the type can be undetermined, in which case el_type() - * will return tag_type::Null. The type will then be set when the first tag - * is added to the list. - */ -class NBT___EXPORT tag_list final : public detail::crtp_tag -{ -public: - //Iterator types - typedef std::vector::iterator iterator; - typedef std::vector::const_iterator const_iterator; - - ///The type of the tag - static constexpr tag_type type = tag_type::List; - - /** - * @brief Constructs a list of type T with the given values - * - * Example: @code tag_list::of({3, 4, 5}) @endcode - * @param init list of values from which the elements are constructed - */ - template - static tag_list of(std::initializer_list init); - - /** - * @brief Constructs an empty list - * - * The content type is determined when the first tag is added. - */ - tag_list(): tag_list(tag_type::Null) {} - - ///Constructs an empty list with the given content type - explicit tag_list(tag_type type): el_type_(type) {} - - ///Constructs a list with the given contents - tag_list(std::initializer_list init); - tag_list(std::initializer_list init); - tag_list(std::initializer_list init); - tag_list(std::initializer_list init); - tag_list(std::initializer_list init); - tag_list(std::initializer_list init); - tag_list(std::initializer_list init); - tag_list(std::initializer_list init); - tag_list(std::initializer_list init); - tag_list(std::initializer_list init); - tag_list(std::initializer_list init); - - /** - * @brief Constructs a list with the given contents - * @throw std::invalid_argument if the tags are not all of the same type - */ - tag_list(std::initializer_list init); - - /** - * @brief Accesses a tag by index with bounds checking - * - * Returns a value to the tag at the specified index, or throws an - * exception if it is out of range. - * @throw std::out_of_range if the index is out of range - */ - value& at(size_t i); - const value& at(size_t i) const; - - /** - * @brief Accesses a tag by index - * - * Returns a value to the tag at the specified index. No bounds checking - * is performed. - */ - value& operator[](size_t i) { return tags[i]; } - const value& operator[](size_t i) const { return tags[i]; } - - /** - * @brief Assigns a value at the given index - * @throw std::invalid_argument if the type of the value does not match the list's - * content type - * @throw std::out_of_range if the index is out of range - */ - void set(size_t i, value&& val); - - /** - * @brief Appends the tag to the end of the list - * @throw std::invalid_argument if the type of the tag does not match the list's - * content type - */ - void push_back(value_initializer&& val); - - /** - * @brief Constructs and appends a tag to the end of the list - * @throw std::invalid_argument if the type of the tag does not match the list's - * content type - */ - template - void emplace_back(Args&&... args); - - ///Removes the last element of the list - void pop_back() { tags.pop_back(); } - - ///Returns the content type of the list, or tag_type::Null if undetermined - tag_type el_type() const { return el_type_; } - - ///Returns the number of tags in the list - size_t size() const { return tags.size(); } - - ///Erases all tags from the list. Preserves the content type. - void clear() { tags.clear(); } - - /** - * @brief Erases all tags from the list and changes the content type. - * @param type the new content type. Can be tag_type::Null to leave it undetermined. - */ - void reset(tag_type type = tag_type::Null); - - //Iterators - iterator begin() { return tags.begin(); } - iterator end() { return tags.end(); } - const_iterator begin() const { return tags.begin(); } - const_iterator end() const { return tags.end(); } - const_iterator cbegin() const { return tags.cbegin(); } - const_iterator cend() const { return tags.cend(); } - - /** - * @inheritdoc - * In case of a list of tag_end, the content type will be undetermined. - */ - void read_payload(io::stream_reader& reader) override; - /** - * @inheritdoc - * In case of a list of undetermined content type, the written type will be tag_end. - * @throw std::length_error if the list is too long for NBT - */ - void write_payload(io::stream_writer& writer) const override; - - /** - * @brief Equality comparison for lists - * - * Lists are considered equal if their content types and the contained tags - * are equal. - */ - NBT___EXPORT friend bool operator==(const tag_list& lhs, const tag_list& rhs); - NBT___EXPORT friend bool operator!=(const tag_list& lhs, const tag_list& rhs); - -private: - std::vector tags; - tag_type el_type_; - - /** - * Internally used initialization function that initializes the list with - * tags of type T, with the constructor arguments of each T given by il. - * @param il list of values that are, one by one, given to a constructor of T - */ - template - void init(std::initializer_list il); -}; - -template -tag_list tag_list::of(std::initializer_list il) -{ - tag_list result; - result.init(il); - return result; -} - -template -void tag_list::emplace_back(Args&&... args) -{ - if(el_type_ == tag_type::Null) //set content type if undetermined - el_type_ = T::type; - else if(el_type_ != T::type) - throw std::invalid_argument("The tag type does not match the list's content type"); - tags.emplace_back(make_unique(std::forward(args)...)); -} - -template -void tag_list::init(std::initializer_list init) -{ - el_type_ = T::type; - tags.reserve(init.size()); - for(const Arg& arg: init) - tags.emplace_back(make_unique(arg)); -} - -} - -#endif // TAG_LIST_H_INCLUDED diff --git a/depends/libnbtplusplus/include/tag_primitive.h b/depends/libnbtplusplus/include/tag_primitive.h deleted file mode 100644 index 9b5151a11..000000000 --- a/depends/libnbtplusplus/include/tag_primitive.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef TAG_PRIMITIVE_H_INCLUDED -#define TAG_PRIMITIVE_H_INCLUDED - -#include "crtp_tag.h" -#include "primitive_detail.h" -#include "io/stream_reader.h" -#include "io/stream_writer.h" -#include -#include - -#include "nbt++_export.h" - -namespace nbt -{ - -/** - * @brief Tag that contains an integral or floating-point value - * - * Common class for tag_byte, tag_short, tag_int, tag_long, tag_float and tag_double. - */ -template -class tag_primitive final : public detail::crtp_tag> -{ -public: - ///The type of the value - typedef T value_type; - - ///The type of the tag - static constexpr tag_type type = detail::get_primitive_type::value; - - //Constructor - constexpr tag_primitive(T val = 0) noexcept: value(val) {} - - //Getters - operator T&() { return value; } - constexpr operator T() const { return value; } - constexpr T get() const { return value; } - - //Setters - tag_primitive& operator=(T val) { value = val; return *this; } - void set(T val) { value = val; } - - void read_payload(io::stream_reader& reader) override; - void write_payload(io::stream_writer& writer) const override; - -private: - T value; -}; - -template bool operator==(const tag_primitive& lhs, const tag_primitive& rhs) -{ return lhs.get() == rhs.get(); } -template bool operator!=(const tag_primitive& lhs, const tag_primitive& rhs) -{ return !(lhs == rhs); } - -//Typedefs that should be used instead of the template tag_primitive. -typedef tag_primitive tag_byte; -typedef tag_primitive tag_short; -typedef tag_primitive tag_int; -typedef tag_primitive tag_long; -typedef tag_primitive tag_float; -typedef tag_primitive tag_double; - -template class NBT___EXPORT tag_primitive; -template class NBT___EXPORT tag_primitive; -template class NBT___EXPORT tag_primitive; -template class NBT___EXPORT tag_primitive; -template class NBT___EXPORT tag_primitive; -template class NBT___EXPORT tag_primitive; - -template -void tag_primitive::read_payload(io::stream_reader& reader) -{ - reader.read_num(value); - if(!reader.get_istr()) - { - std::ostringstream str; - str << "Error reading tag_" << type; - throw io::input_error(str.str()); - } -} - -template -void tag_primitive::write_payload(io::stream_writer& writer) const -{ - writer.write_num(value); -} - -} - -#endif // TAG_PRIMITIVE_H_INCLUDED diff --git a/depends/libnbtplusplus/include/tag_string.h b/depends/libnbtplusplus/include/tag_string.h deleted file mode 100644 index 6f74fd52a..000000000 --- a/depends/libnbtplusplus/include/tag_string.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef TAG_STRING_H_INCLUDED -#define TAG_STRING_H_INCLUDED - -#include "crtp_tag.h" -#include - -#include "nbt++_export.h" - -namespace nbt -{ - -///Tag that contains a UTF-8 string -class NBT___EXPORT tag_string final : public detail::crtp_tag -{ -public: - ///The type of the tag - static constexpr tag_type type = tag_type::String; - - //Constructors - tag_string() {} - tag_string(const std::string& str): value(str) {} - tag_string(std::string&& str) noexcept: value(std::move(str)) {} - tag_string(const char* str): value(str) {} - - //Getters - operator std::string&() { return value; } - operator const std::string&() const { return value; } - const std::string& get() const { return value; } - - //Setters - tag_string& operator=(const std::string& str) { value = str; return *this; } - tag_string& operator=(std::string&& str) { value = std::move(str); return *this; } - tag_string& operator=(const char* str) { value = str; return *this; } - void set(const std::string& str) { value = str; } - void set(std::string&& str) { value = std::move(str); } - - void read_payload(io::stream_reader& reader) override; - /** - * @inheritdoc - * @throw std::length_error if the string is too long for NBT - */ - void write_payload(io::stream_writer& writer) const override; - -private: - std::string value; -}; - -inline bool operator==(const tag_string& lhs, const tag_string& rhs) -{ return lhs.get() == rhs.get(); } -inline bool operator!=(const tag_string& lhs, const tag_string& rhs) -{ return !(lhs == rhs); } - -} - -#endif // TAG_STRING_H_INCLUDED diff --git a/depends/libnbtplusplus/include/tagfwd.h b/depends/libnbtplusplus/include/tagfwd.h deleted file mode 100644 index 178edd7e4..000000000 --- a/depends/libnbtplusplus/include/tagfwd.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -/** @file - * @brief Provides forward declarations for all tag classes - */ -#ifndef TAGFWD_H_INCLUDED -#define TAGFWD_H_INCLUDED -#include - -namespace nbt -{ - -class tag; - -template class tag_primitive; -typedef tag_primitive tag_byte; -typedef tag_primitive tag_short; -typedef tag_primitive tag_int; -typedef tag_primitive tag_long; -typedef tag_primitive tag_float; -typedef tag_primitive tag_double; - -class tag_string; - -template class tag_array; -typedef tag_array tag_byte_array; -typedef tag_array tag_int_array; - -class tag_list; -class tag_compound; - -} - -#endif // TAGFWD_H_INCLUDED diff --git a/depends/libnbtplusplus/include/text/json_formatter.h b/depends/libnbtplusplus/include/text/json_formatter.h deleted file mode 100644 index ec6537318..000000000 --- a/depends/libnbtplusplus/include/text/json_formatter.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef JSON_FORMATTER_H_INCLUDED -#define JSON_FORMATTER_H_INCLUDED - -#include "tagfwd.h" -#include - -#include "nbt++_export.h" - -namespace nbt -{ -namespace text -{ - -/** - * @brief Prints tags in a JSON-like syntax into a stream - * - * @todo Make it configurable and able to produce actual standard-conformant JSON - */ -class NBT___EXPORT json_formatter -{ -public: - json_formatter() {}; - void print(std::ostream& os, const tag& t) const; -}; - -} -} - -#endif // JSON_FORMATTER_H_INCLUDED diff --git a/depends/libnbtplusplus/include/value.h b/depends/libnbtplusplus/include/value.h deleted file mode 100644 index a2db2957e..000000000 --- a/depends/libnbtplusplus/include/value.h +++ /dev/null @@ -1,223 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef TAG_REF_PROXY_H_INCLUDED -#define TAG_REF_PROXY_H_INCLUDED - -#include "tag.h" -#include -#include - -#include "nbt++_export.h" - -namespace nbt -{ - -/** - * @brief Contains an NBT value of fixed type - * - * This class is a convenience wrapper for @c std::unique_ptr. - * A value can contain any kind of tag or no tag (nullptr) and provides - * operations for handling tags of which the type is not known at compile time. - * Assignment or the set method on a value with no tag will fill in the value. - * - * The rationale for the existance of this class is to provide a type-erasured - * means of storing tags, especially when they are contained in tag_compound - * or tag_list. The alternative would be directly using @c std::unique_ptr - * and @c tag&, which is how it was done in libnbt++1. The main drawback is that - * it becomes very cumbersome to deal with tags of unknown type. - * - * For example, in this case it would not be possible to allow a syntax like - * compound["foo"] = 42. If the key "foo" does not exist beforehand, - * the left hand side could not have any sensible value if it was of type - * @c tag&. - * Firstly, the compound tag would have to create a new tag_int there, but it - * cannot know that the new tag is going to be assigned an integer. - * Also, if the type was @c tag& and it allowed assignment of integers, that - * would mean the tag base class has assignments and conversions like this. - * Which means that all other tag classes would inherit them from the base - * class, even though it does not make any sense to allow converting a - * tag_compound into an integer. Attempts like this should be caught at - * compile time. - * - * This is why all the syntactic sugar for tags is contained in the value class - * while the tag class only contains common operations for all tag types. - */ -class NBT___EXPORT value -{ -public: - //Constructors - value() noexcept {} - explicit value(std::unique_ptr&& t) noexcept: tag_(std::move(t)) {} - explicit value(tag&& t); - - //Moving - value(value&&) noexcept = default; - value& operator=(value&&) noexcept = default; - - //Copying - explicit value(const value& rhs); - value& operator=(const value& rhs); - - /** - * @brief Assigns the given value to the tag if the type matches - * @throw std::bad_cast if the type of @c t is not the same as the type - * of this value - */ - value& operator=(tag&& t); - void set(tag&& t); - - //Conversion to tag - /** - * @brief Returns the contained tag - * - * If the value is uninitialized, the behavior is undefined. - */ - operator tag&() { return get(); } - operator const tag&() const { return get(); } - tag& get() { return *tag_; } - const tag& get() const { return *tag_; } - - /** - * @brief Returns a reference to the contained tag as an instance of T - * @throw std::bad_cast if the tag is not of type T - */ - template - T& as(); - template - const T& as() const; - - //Assignment of primitives and string - /** - * @brief Assigns the given value to the tag if the type is compatible - * @throw std::bad_cast if the value is not convertible to the tag type - * via a widening conversion - */ - value& operator=(int8_t val); - value& operator=(int16_t val); - value& operator=(int32_t val); - value& operator=(int64_t val); - value& operator=(float val); - value& operator=(double val); - - /** - * @brief Assigns the given string to the tag if it is a tag_string - * @throw std::bad_cast if the contained tag is not a tag_string - */ - value& operator=(const std::string& str); - value& operator=(std::string&& str); - - //Conversions to primitives and string - /** - * @brief Returns the contained value if the type is compatible - * @throw std::bad_cast if the tag type is not convertible to the desired - * type via a widening conversion - */ - explicit operator int8_t() const; - explicit operator int16_t() const; - explicit operator int32_t() const; - explicit operator int64_t() const; - explicit operator float() const; - explicit operator double() const; - - /** - * @brief Returns the contained string if the type is tag_string - * - * If the value is uninitialized, the behavior is undefined. - * @throw std::bad_cast if the tag type is not tag_string - */ - explicit operator const std::string&() const; - - ///Returns true if the value is not uninitialized - explicit operator bool() const { return tag_ != nullptr; } - - /** - * @brief In case of a tag_compound, accesses a tag by key with bounds checking - * - * If the value is uninitialized, the behavior is undefined. - * @throw std::bad_cast if the tag type is not tag_compound - * @throw std::out_of_range if given key does not exist - * @sa tag_compound::at - */ - value& at(const std::string& key); - const value& at(const std::string& key) const; - - /** - * @brief In case of a tag_compound, accesses a tag by key - * - * If the value is uninitialized, the behavior is undefined. - * @throw std::bad_cast if the tag type is not tag_compound - * @sa tag_compound::operator[] - */ - value& operator[](const std::string& key); - value& operator[](const char* key); //need this overload because of conflict with built-in operator[] - - /** - * @brief In case of a tag_list, accesses a tag by index with bounds checking - * - * If the value is uninitialized, the behavior is undefined. - * @throw std::bad_cast if the tag type is not tag_list - * @throw std::out_of_range if the index is out of range - * @sa tag_list::at - */ - value& at(size_t i); - const value& at(size_t i) const; - - /** - * @brief In case of a tag_list, accesses a tag by index - * - * No bounds checking is performed. If the value is uninitialized, the - * behavior is undefined. - * @throw std::bad_cast if the tag type is not tag_list - * @sa tag_list::operator[] - */ - value& operator[](size_t i); - const value& operator[](size_t i) const; - - ///Returns a reference to the underlying std::unique_ptr - std::unique_ptr& get_ptr() { return tag_; } - const std::unique_ptr& get_ptr() const { return tag_; } - ///Resets the underlying std::unique_ptr to a different value - void set_ptr(std::unique_ptr&& t) { tag_ = std::move(t); } - - ///@sa tag::get_type - tag_type get_type() const; - - NBT___EXPORT friend bool operator==(const value& lhs, const value& rhs); - NBT___EXPORT friend bool operator!=(const value& lhs, const value& rhs); - -private: - std::unique_ptr tag_; -}; - -template -T& value::as() -{ - return tag_->as(); -} - -template -const T& value::as() const -{ - return tag_->as(); -} - -} - -#endif // TAG_REF_PROXY_H_INCLUDED diff --git a/depends/libnbtplusplus/include/value_initializer.h b/depends/libnbtplusplus/include/value_initializer.h deleted file mode 100644 index 5cda58cdc..000000000 --- a/depends/libnbtplusplus/include/value_initializer.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#ifndef VALUE_INITIALIZER_H_INCLUDED -#define VALUE_INITIALIZER_H_INCLUDED - -#include "value.h" - -#include "nbt++_export.h" - -namespace nbt -{ - -/** - * @brief Helper class for implicitly constructing value objects - * - * This type is a subclass of @ref value. However the only difference to value - * is that this class has additional constructors which allow implicit - * conversion of various types to value objects. These constructors are not - * part of the value class itself because implicit conversions like this - * (especially from @c tag&& to @c value) can cause problems and ambiguities - * in some cases. - * - * value_initializer is especially useful as function parameter type, it will - * allow convenient conversion of various values to tags on function call. - * - * As value_initializer objects are in no way different than value objects, - * they can just be converted to value after construction. - */ -class NBT___EXPORT value_initializer : public value -{ -public: - value_initializer(std::unique_ptr&& t) noexcept: value(std::move(t)) {} - value_initializer(std::nullptr_t) noexcept : value(nullptr) {} - value_initializer(value&& val) noexcept : value(std::move(val)) {} - value_initializer(tag&& t) : value(std::move(t)) {} - - value_initializer(int8_t val); - value_initializer(int16_t val); - value_initializer(int32_t val); - value_initializer(int64_t val); - value_initializer(float val); - value_initializer(double val); - value_initializer(const std::string& str); - value_initializer(std::string&& str); - value_initializer(const char* str); -}; - -} - -#endif // VALUE_INITIALIZER_H_INCLUDED diff --git a/depends/libnbtplusplus/src/endian_str.cpp b/depends/libnbtplusplus/src/endian_str.cpp deleted file mode 100644 index 8d136b09a..000000000 --- a/depends/libnbtplusplus/src/endian_str.cpp +++ /dev/null @@ -1,284 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include "endian_str.h" -#include -#include -#include - -static_assert(CHAR_BIT == 8, "Assuming that a byte has 8 bits"); -static_assert(sizeof(float) == 4, "Assuming that a float is 4 byte long"); -static_assert(sizeof(double) == 8, "Assuming that a double is 8 byte long"); - -namespace endian -{ - -namespace //anonymous -{ - void pun_int_to_float(float& f, uint32_t i) - { - //Yes we need to do it this way to avoid undefined behavior - memcpy(&f, &i, 4); - } - - uint32_t pun_float_to_int(float f) - { - uint32_t ret; - memcpy(&ret, &f, 4); - return ret; - } - - void pun_int_to_double(double& d, uint64_t i) - { - memcpy(&d, &i, 8); - } - - uint64_t pun_double_to_int(double f) - { - uint64_t ret; - memcpy(&ret, &f, 8); - return ret; - } -} - -//------------------------------------------------------------------------------ - -void read_little(std::istream& is, uint8_t& x) -{ - is.get(reinterpret_cast(x)); -} - -void read_little(std::istream& is, uint16_t& x) -{ - uint8_t tmp[2]; - is.read(reinterpret_cast(tmp), 2); - x = uint16_t(tmp[0]) - | (uint16_t(tmp[1]) << 8); -} - -void read_little(std::istream& is, uint32_t& x) -{ - uint8_t tmp[4]; - is.read(reinterpret_cast(tmp), 4); - x = uint32_t(tmp[0]) - | (uint32_t(tmp[1]) << 8) - | (uint32_t(tmp[2]) << 16) - | (uint32_t(tmp[3]) << 24); -} - -void read_little(std::istream& is, uint64_t& x) -{ - uint8_t tmp[8]; - is.read(reinterpret_cast(tmp), 8); - x = uint64_t(tmp[0]) - | (uint64_t(tmp[1]) << 8) - | (uint64_t(tmp[2]) << 16) - | (uint64_t(tmp[3]) << 24) - | (uint64_t(tmp[4]) << 32) - | (uint64_t(tmp[5]) << 40) - | (uint64_t(tmp[6]) << 48) - | (uint64_t(tmp[7]) << 56); -} - -void read_little(std::istream& is, int8_t & x) { read_little(is, reinterpret_cast(x)); } -void read_little(std::istream& is, int16_t& x) { read_little(is, reinterpret_cast(x)); } -void read_little(std::istream& is, int32_t& x) { read_little(is, reinterpret_cast(x)); } -void read_little(std::istream& is, int64_t& x) { read_little(is, reinterpret_cast(x)); } - -void read_little(std::istream& is, float& x) -{ - uint32_t tmp; - read_little(is, tmp); - pun_int_to_float(x, tmp); -} - -void read_little(std::istream& is, double& x) -{ - uint64_t tmp; - read_little(is, tmp); - pun_int_to_double(x, tmp); -} - -//------------------------------------------------------------------------------ - -void read_big(std::istream& is, uint8_t& x) -{ - is.read(reinterpret_cast(&x), 1); -} - -void read_big(std::istream& is, uint16_t& x) -{ - uint8_t tmp[2]; - is.read(reinterpret_cast(tmp), 2); - x = uint16_t(tmp[1]) - | (uint16_t(tmp[0]) << 8); -} - -void read_big(std::istream& is, uint32_t& x) -{ - uint8_t tmp[4]; - is.read(reinterpret_cast(tmp), 4); - x = uint32_t(tmp[3]) - | (uint32_t(tmp[2]) << 8) - | (uint32_t(tmp[1]) << 16) - | (uint32_t(tmp[0]) << 24); -} - -void read_big(std::istream& is, uint64_t& x) -{ - uint8_t tmp[8]; - is.read(reinterpret_cast(tmp), 8); - x = uint64_t(tmp[7]) - | (uint64_t(tmp[6]) << 8) - | (uint64_t(tmp[5]) << 16) - | (uint64_t(tmp[4]) << 24) - | (uint64_t(tmp[3]) << 32) - | (uint64_t(tmp[2]) << 40) - | (uint64_t(tmp[1]) << 48) - | (uint64_t(tmp[0]) << 56); -} - -void read_big(std::istream& is, int8_t & x) { read_big(is, reinterpret_cast(x)); } -void read_big(std::istream& is, int16_t& x) { read_big(is, reinterpret_cast(x)); } -void read_big(std::istream& is, int32_t& x) { read_big(is, reinterpret_cast(x)); } -void read_big(std::istream& is, int64_t& x) { read_big(is, reinterpret_cast(x)); } - -void read_big(std::istream& is, float& x) -{ - uint32_t tmp; - read_big(is, tmp); - pun_int_to_float(x, tmp); -} - -void read_big(std::istream& is, double& x) -{ - uint64_t tmp; - read_big(is, tmp); - pun_int_to_double(x, tmp); -} - -//------------------------------------------------------------------------------ - -void write_little(std::ostream& os, uint8_t x) -{ - os.put(x); -} - -void write_little(std::ostream& os, uint16_t x) -{ - uint8_t tmp[2] { - uint8_t(x), - uint8_t(x >> 8)}; - os.write(reinterpret_cast(tmp), 2); -} - -void write_little(std::ostream& os, uint32_t x) -{ - uint8_t tmp[4] { - uint8_t(x), - uint8_t(x >> 8), - uint8_t(x >> 16), - uint8_t(x >> 24)}; - os.write(reinterpret_cast(tmp), 4); -} - -void write_little(std::ostream& os, uint64_t x) -{ - uint8_t tmp[8] { - uint8_t(x), - uint8_t(x >> 8), - uint8_t(x >> 16), - uint8_t(x >> 24), - uint8_t(x >> 32), - uint8_t(x >> 40), - uint8_t(x >> 48), - uint8_t(x >> 56)}; - os.write(reinterpret_cast(tmp), 8); -} - -void write_little(std::ostream& os, int8_t x) { write_little(os, static_cast(x)); } -void write_little(std::ostream& os, int16_t x) { write_little(os, static_cast(x)); } -void write_little(std::ostream& os, int32_t x) { write_little(os, static_cast(x)); } -void write_little(std::ostream& os, int64_t x) { write_little(os, static_cast(x)); } - -void write_little(std::ostream& os, float x) -{ - write_little(os, pun_float_to_int(x)); -} - -void write_little(std::ostream& os, double x) -{ - write_little(os, pun_double_to_int(x)); -} - -//------------------------------------------------------------------------------ - -void write_big(std::ostream& os, uint8_t x) -{ - os.put(x); -} - -void write_big(std::ostream& os, uint16_t x) -{ - uint8_t tmp[2] { - uint8_t(x >> 8), - uint8_t(x)}; - os.write(reinterpret_cast(tmp), 2); -} - -void write_big(std::ostream& os, uint32_t x) -{ - uint8_t tmp[4] { - uint8_t(x >> 24), - uint8_t(x >> 16), - uint8_t(x >> 8), - uint8_t(x)}; - os.write(reinterpret_cast(tmp), 4); -} - -void write_big(std::ostream& os, uint64_t x) -{ - uint8_t tmp[8] { - uint8_t(x >> 56), - uint8_t(x >> 48), - uint8_t(x >> 40), - uint8_t(x >> 32), - uint8_t(x >> 24), - uint8_t(x >> 16), - uint8_t(x >> 8), - uint8_t(x)}; - os.write(reinterpret_cast(tmp), 8); -} - -void write_big(std::ostream& os, int8_t x) { write_big(os, static_cast(x)); } -void write_big(std::ostream& os, int16_t x) { write_big(os, static_cast(x)); } -void write_big(std::ostream& os, int32_t x) { write_big(os, static_cast(x)); } -void write_big(std::ostream& os, int64_t x) { write_big(os, static_cast(x)); } - -void write_big(std::ostream& os, float x) -{ - write_big(os, pun_float_to_int(x)); -} - -void write_big(std::ostream& os, double x) -{ - write_big(os, pun_double_to_int(x)); -} - -} diff --git a/depends/libnbtplusplus/src/io/stream_reader.cpp b/depends/libnbtplusplus/src/io/stream_reader.cpp deleted file mode 100644 index f6f30a5b4..000000000 --- a/depends/libnbtplusplus/src/io/stream_reader.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include "io/stream_reader.h" -#include "make_unique.h" -#include "tag_compound.h" -#include - -namespace nbt -{ -namespace io -{ - -std::pair> read_compound(std::istream& is, endian::endian e) -{ - return stream_reader(is, e).read_compound(); -} - -std::pair> read_tag(std::istream& is, endian::endian e) -{ - return stream_reader(is, e).read_tag(); -} - -stream_reader::stream_reader(std::istream& is, endian::endian e) noexcept: - is(is), endian(e) -{} - -std::istream& stream_reader::get_istr() const -{ - return is; -} - -endian::endian stream_reader::get_endian() const -{ - return endian; -} - -std::pair> stream_reader::read_compound() -{ - if(read_type() != tag_type::Compound) - { - is.setstate(std::ios::failbit); - throw input_error("Tag is not a compound"); - } - std::string key = read_string(); - auto comp = make_unique(); - comp->read_payload(*this); - return {std::move(key), std::move(comp)}; -} - -std::pair> stream_reader::read_tag() -{ - tag_type type = read_type(); - std::string key = read_string(); - std::unique_ptr t = read_payload(type); - return {std::move(key), std::move(t)}; -} - -std::unique_ptr stream_reader::read_payload(tag_type type) -{ - std::unique_ptr t = tag::create(type); - t->read_payload(*this); - return t; -} - -tag_type stream_reader::read_type(bool allow_end) -{ - int type = is.get(); - if(!is) - throw input_error("Error reading tag type"); - if(!is_valid_type(type, allow_end)) - { - is.setstate(std::ios::failbit); - throw input_error("Invalid tag type: " + std::to_string(type)); - } - return static_cast(type); -} - -std::string stream_reader::read_string() -{ - uint16_t len; - read_num(len); - if(!is) - throw input_error("Error reading string"); - - std::string ret(len, '\0'); - is.read(&ret[0], len); //C++11 allows us to do this - if(!is) - throw input_error("Error reading string"); - return ret; -} - -} -} diff --git a/depends/libnbtplusplus/src/io/stream_writer.cpp b/depends/libnbtplusplus/src/io/stream_writer.cpp deleted file mode 100644 index 036c5d40a..000000000 --- a/depends/libnbtplusplus/src/io/stream_writer.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include "io/stream_writer.h" -#include - -namespace nbt -{ -namespace io -{ - -void write_tag(const std::string& key, const tag& t, std::ostream& os, endian::endian e) -{ - stream_writer(os, e).write_tag(key, t); -} - -void stream_writer::write_tag(const std::string& key, const tag& t) -{ - write_type(t.get_type()); - write_string(key); - write_payload(t); -} - -void stream_writer::write_string(const std::string& str) -{ - if(str.size() > max_string_len) - { - os.setstate(std::ios::failbit); - std::ostringstream sstr; - sstr << "String is too long for NBT (" << str.size() << " > " << max_string_len << ")"; - throw std::length_error(sstr.str()); - } - write_num(static_cast(str.size())); - os.write(str.data(), str.size()); -} - -} -} diff --git a/depends/libnbtplusplus/src/tag.cpp b/depends/libnbtplusplus/src/tag.cpp deleted file mode 100644 index df4d8cb55..000000000 --- a/depends/libnbtplusplus/src/tag.cpp +++ /dev/null @@ -1,105 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include "tag.h" -#include "nbt_tags.h" -#include "text/json_formatter.h" -#include -#include -#include -#include - -namespace nbt -{ - -static_assert(std::numeric_limits::is_iec559 && std::numeric_limits::is_iec559, - "The floating point values for NBT must conform to IEC 559/IEEE 754"); - -bool is_valid_type(int type, bool allow_end) -{ - return (allow_end ? 0 : 1) <= type && type <= 11; -} - -std::unique_ptr tag::clone() && -{ - return std::move(*this).move_clone(); -} - -std::unique_ptr tag::create(tag_type type) -{ - switch(type) - { - case tag_type::Byte: return make_unique(); - case tag_type::Short: return make_unique(); - case tag_type::Int: return make_unique(); - case tag_type::Long: return make_unique(); - case tag_type::Float: return make_unique(); - case tag_type::Double: return make_unique(); - case tag_type::Byte_Array: return make_unique(); - case tag_type::String: return make_unique(); - case tag_type::List: return make_unique(); - case tag_type::Compound: return make_unique(); - case tag_type::Int_Array: return make_unique(); - - default: throw std::invalid_argument("Invalid tag type"); - } -} - -bool operator==(const tag& lhs, const tag& rhs) -{ - if(typeid(lhs) != typeid(rhs)) - return false; - return lhs.equals(rhs); -} - -bool operator!=(const tag& lhs, const tag& rhs) -{ - return !(lhs == rhs); -} - -std::ostream& operator<<(std::ostream& os, tag_type tt) -{ - switch(tt) - { - case tag_type::End: return os << "end"; - case tag_type::Byte: return os << "byte"; - case tag_type::Short: return os << "short"; - case tag_type::Int: return os << "int"; - case tag_type::Long: return os << "long"; - case tag_type::Float: return os << "float"; - case tag_type::Double: return os << "double"; - case tag_type::Byte_Array: return os << "byte_array"; - case tag_type::String: return os << "string"; - case tag_type::List: return os << "list"; - case tag_type::Compound: return os << "compound"; - case tag_type::Int_Array: return os << "int_array"; - case tag_type::Null: return os << "null"; - - default: return os << "invalid"; - } -} - -std::ostream& operator<<(std::ostream& os, const tag& t) -{ - static const text::json_formatter formatter; - formatter.print(os, t); - return os; -} - -} diff --git a/depends/libnbtplusplus/src/tag_array.cpp b/depends/libnbtplusplus/src/tag_array.cpp deleted file mode 100644 index 99e32549b..000000000 --- a/depends/libnbtplusplus/src/tag_array.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include "tag_array.h" -#include "io/stream_reader.h" -#include "io/stream_writer.h" -#include - -namespace nbt -{ - -template -T& tag_array::at(size_t i) -{ - return data.at(i); -} - -template -T tag_array::at(size_t i) const -{ - return data.at(i); -} - -//Slightly different between byte_array and int_array -//Reading -template<> -void tag_array::read_payload(io::stream_reader& reader) -{ - int32_t length; - reader.read_num(length); - if(length < 0) - reader.get_istr().setstate(std::ios::failbit); - if(!reader.get_istr()) - throw io::input_error("Error reading length of tag_byte_array"); - - data.resize(length); - reader.get_istr().read(reinterpret_cast(data.data()), length); - if(!reader.get_istr()) - throw io::input_error("Error reading contents of tag_byte_array"); -} - -template<> -void tag_array::read_payload(io::stream_reader& reader) -{ - int32_t length; - reader.read_num(length); - if(length < 0) - reader.get_istr().setstate(std::ios::failbit); - if(!reader.get_istr()) - throw io::input_error("Error reading length of tag_int_array"); - - data.clear(); - data.reserve(length); - for(int32_t i = 0; i < length; ++i) - { - int32_t val; - reader.read_num(val); - data.push_back(val); - } - if(!reader.get_istr()) - throw io::input_error("Error reading contents of tag_int_array"); -} - -//Writing -template<> -void tag_array::write_payload(io::stream_writer& writer) const -{ - if(size() > io::stream_writer::max_array_len) - { - writer.get_ostr().setstate(std::ios::failbit); - throw std::length_error("Byte array is too large for NBT"); - } - writer.write_num(static_cast(size())); - writer.get_ostr().write(reinterpret_cast(data.data()), data.size()); -} - -template<> -void tag_array::write_payload(io::stream_writer& writer) const -{ - if(size() > io::stream_writer::max_array_len) - { - writer.get_ostr().setstate(std::ios::failbit); - throw std::length_error("Int array is too large for NBT"); - } - writer.write_num(static_cast(size())); - for(int32_t i: data) - writer.write_num(i); -} - -//Enforce template instantiations -template class tag_array; -template class tag_array; - -} diff --git a/depends/libnbtplusplus/src/tag_compound.cpp b/depends/libnbtplusplus/src/tag_compound.cpp deleted file mode 100644 index 4085bb4e0..000000000 --- a/depends/libnbtplusplus/src/tag_compound.cpp +++ /dev/null @@ -1,109 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include "tag_compound.h" -#include "io/stream_reader.h" -#include "io/stream_writer.h" -#include -#include - -namespace nbt -{ - -tag_compound::tag_compound(std::initializer_list> init) -{ - for(const auto& pair: init) - tags.emplace(std::move(pair.first), std::move(pair.second)); -} - -value& tag_compound::at(const std::string& key) -{ - return tags.at(key); -} - -const value& tag_compound::at(const std::string& key) const -{ - return tags.at(key); -} - -std::pair tag_compound::put(const std::string& key, value_initializer&& val) -{ - auto it = tags.find(key); - if(it != tags.end()) - { - it->second = std::move(val); - return {it, false}; - } - else - { - return tags.emplace(key, std::move(val)); - } -} - -std::pair tag_compound::insert(const std::string& key, value_initializer&& val) -{ - return tags.emplace(key, std::move(val)); -} - -bool tag_compound::erase(const std::string& key) -{ - return tags.erase(key) != 0; -} - -bool tag_compound::has_key(const std::string& key) const -{ - return tags.find(key) != tags.end(); -} - -bool tag_compound::has_key(const std::string& key, tag_type type) const -{ - auto it = tags.find(key); - return it != tags.end() && it->second.get_type() == type; -} - -void tag_compound::read_payload(io::stream_reader& reader) -{ - clear(); - tag_type tt; - while((tt = reader.read_type(true)) != tag_type::End) - { - std::string key; - try - { - key = reader.read_string(); - } - catch(io::input_error& ex) - { - std::ostringstream str; - str << "Error reading key of tag_" << tt; - throw io::input_error(str.str()); - } - auto tptr = reader.read_payload(tt); - tags.emplace(std::move(key), value(std::move(tptr))); - } -} - -void tag_compound::write_payload(io::stream_writer& writer) const -{ - for(const auto& pair: tags) - writer.write_tag(pair.first, pair.second); - writer.write_type(tag_type::End); -} - -} diff --git a/depends/libnbtplusplus/src/tag_list.cpp b/depends/libnbtplusplus/src/tag_list.cpp deleted file mode 100644 index 67a3d4c15..000000000 --- a/depends/libnbtplusplus/src/tag_list.cpp +++ /dev/null @@ -1,150 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include "tag_list.h" -#include "nbt_tags.h" -#include "io/stream_reader.h" -#include "io/stream_writer.h" -#include - -namespace nbt -{ - -tag_list::tag_list(std::initializer_list il) { init(il); } -tag_list::tag_list(std::initializer_list il) { init(il); } -tag_list::tag_list(std::initializer_list il) { init(il); } -tag_list::tag_list(std::initializer_list il) { init(il); } -tag_list::tag_list(std::initializer_list il) { init(il); } -tag_list::tag_list(std::initializer_list il) { init(il); } -tag_list::tag_list(std::initializer_list il) { init(il); } -tag_list::tag_list(std::initializer_list il) { init(il); } -tag_list::tag_list(std::initializer_list il) { init(il); } -tag_list::tag_list(std::initializer_list il) { init(il); } -tag_list::tag_list(std::initializer_list il) { init(il); } - -tag_list::tag_list(std::initializer_list init) -{ - if(init.size() == 0) - el_type_ = tag_type::Null; - else - { - el_type_ = init.begin()->get_type(); - for(const value& val: init) - { - if(!val || val.get_type() != el_type_) - throw std::invalid_argument("The values are not all the same type"); - } - tags.assign(init.begin(), init.end()); - } -} - -value& tag_list::at(size_t i) -{ - return tags.at(i); -} - -const value& tag_list::at(size_t i) const -{ - return tags.at(i); -} - -void tag_list::set(size_t i, value&& val) -{ - if(val.get_type() != el_type_) - throw std::invalid_argument("The tag type does not match the list's content type"); - tags.at(i) = std::move(val); -} - -void tag_list::push_back(value_initializer&& val) -{ - if(!val) //don't allow null values - throw std::invalid_argument("The value must not be null"); - if(el_type_ == tag_type::Null) //set content type if undetermined - el_type_ = val.get_type(); - else if(el_type_ != val.get_type()) - throw std::invalid_argument("The tag type does not match the list's content type"); - tags.push_back(std::move(val)); -} - -void tag_list::reset(tag_type type) -{ - clear(); - el_type_ = type; -} - -void tag_list::read_payload(io::stream_reader& reader) -{ - tag_type lt = reader.read_type(true); - - int32_t length; - reader.read_num(length); - if(length < 0) - reader.get_istr().setstate(std::ios::failbit); - if(!reader.get_istr()) - throw io::input_error("Error reading length of tag_list"); - - if(lt != tag_type::End) - { - reset(lt); - tags.reserve(length); - - for(int32_t i = 0; i < length; ++i) - tags.emplace_back(reader.read_payload(lt)); - } - else - { - //In case of tag_end, ignore the length and leave the type undetermined - reset(tag_type::Null); - } -} - -void tag_list::write_payload(io::stream_writer& writer) const -{ - if(size() > io::stream_writer::max_array_len) - { - writer.get_ostr().setstate(std::ios::failbit); - throw std::length_error("List is too large for NBT"); - } - writer.write_type(el_type_ != tag_type::Null - ? el_type_ - : tag_type::End); - writer.write_num(static_cast(size())); - for(const auto& val: tags) - { - //check if the value is of the correct type - if(val.get_type() != el_type_) - { - writer.get_ostr().setstate(std::ios::failbit); - throw std::logic_error("The tags in the list do not all match the content type"); - } - writer.write_payload(val); - } -} - -bool operator==(const tag_list& lhs, const tag_list& rhs) -{ - return lhs.el_type_ == rhs.el_type_ && lhs.tags == rhs.tags; -} - -bool operator!=(const tag_list& lhs, const tag_list& rhs) -{ - return !(lhs == rhs); -} - -} diff --git a/depends/libnbtplusplus/src/tag_string.cpp b/depends/libnbtplusplus/src/tag_string.cpp deleted file mode 100644 index 30347818b..000000000 --- a/depends/libnbtplusplus/src/tag_string.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include "tag_string.h" -#include "io/stream_reader.h" -#include "io/stream_writer.h" - -namespace nbt -{ - -void tag_string::read_payload(io::stream_reader& reader) -{ - try - { - value = reader.read_string(); - } - catch(io::input_error& ex) - { - throw io::input_error("Error reading tag_string"); - } -} - -void tag_string::write_payload(io::stream_writer& writer) const -{ - writer.write_string(value); -} - -} diff --git a/depends/libnbtplusplus/src/text/json_formatter.cpp b/depends/libnbtplusplus/src/text/json_formatter.cpp deleted file mode 100644 index 9b47210c6..000000000 --- a/depends/libnbtplusplus/src/text/json_formatter.cpp +++ /dev/null @@ -1,195 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include "text/json_formatter.h" -#include "nbt_tags.h" -#include "nbt_visitor.h" -#include -#include -#include - -namespace nbt -{ -namespace text -{ - -namespace //anonymous -{ - ///Helper class which uses the Visitor pattern to pretty-print tags - class json_fmt_visitor : public const_nbt_visitor - { - public: - json_fmt_visitor(std::ostream& os, const json_formatter& fmt): - os(os) - {} - - void visit(const tag_byte& b) override - { os << static_cast(b.get()) << "b"; } //We don't want to print a character - - void visit(const tag_short& s) override - { os << s.get() << "s"; } - - void visit(const tag_int& i) override - { os << i.get(); } - - void visit(const tag_long& l) override - { os << l.get() << "l"; } - - void visit(const tag_float& f) override - { - write_float(f.get()); - os << "f"; - } - - void visit(const tag_double& d) override - { - write_float(d.get()); - os << "d"; - } - - void visit(const tag_byte_array& ba) override - { os << "[" << ba.size() << " bytes]"; } - - void visit(const tag_string& s) override - { os << '"' << s.get() << '"'; } //TODO: escape special characters - - void visit(const tag_list& l) override - { - //Wrap lines for lists of lists or compounds. - //Lists of other types can usually be on one line without problem. - const bool break_lines = l.size() > 0 && - (l.el_type() == tag_type::List || l.el_type() == tag_type::Compound); - - os << "["; - if(break_lines) - { - os << "\n"; - ++indent_lvl; - for(unsigned int i = 0; i < l.size(); ++i) - { - indent(); - if(l[i]) - l[i].get().accept(*this); - else - write_null(); - if(i != l.size()-1) - os << ","; - os << "\n"; - } - --indent_lvl; - indent(); - } - else - { - for(unsigned int i = 0; i < l.size(); ++i) - { - if(l[i]) - l[i].get().accept(*this); - else - write_null(); - if(i != l.size()-1) - os << ", "; - } - } - os << "]"; - } - - void visit(const tag_compound& c) override - { - if(c.size() == 0) //No line breaks inside empty compounds please - { - os << "{}"; - return; - } - - os << "{\n"; - ++indent_lvl; - unsigned int i = 0; - for(const auto& kv: c) - { - indent(); - os << kv.first << ": "; - if(kv.second) - kv.second.get().accept(*this); - else - write_null(); - if(i != c.size()-1) - os << ","; - os << "\n"; - ++i; - } - --indent_lvl; - indent(); - os << "}"; - } - - void visit(const tag_int_array& ia) override - { - os << "["; - for(unsigned int i = 0; i < ia.size(); ++i) - { - os << ia[i]; - if(i != ia.size()-1) - os << ", "; - } - os << "]"; - } - - private: - const std::string indent_str = " "; - - std::ostream& os; - int indent_lvl = 0; - - void indent() - { - for(int i = 0; i < indent_lvl; ++i) - os << indent_str; - } - - template - void write_float(T val, int precision = std::numeric_limits::max_digits10) - { - if(std::isfinite(val)) - os << std::setprecision(precision) << val; - else if(std::isinf(val)) - { - if(std::signbit(val)) - os << "-"; - os << "Infinity"; - } - else - os << "NaN"; - } - - void write_null() - { - os << "null"; - } - }; -} - -void json_formatter::print(std::ostream& os, const tag& t) const -{ - json_fmt_visitor v(os, *this); - t.accept(v); -} - -} -} diff --git a/depends/libnbtplusplus/src/value.cpp b/depends/libnbtplusplus/src/value.cpp deleted file mode 100644 index 8376dc9b9..000000000 --- a/depends/libnbtplusplus/src/value.cpp +++ /dev/null @@ -1,376 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include "value.h" -#include "nbt_tags.h" -#include - -namespace nbt -{ - -value::value(tag&& t): - tag_(std::move(t).move_clone()) -{} - -value::value(const value& rhs): - tag_(rhs.tag_ ? rhs.tag_->clone() : nullptr) -{} - -value& value::operator=(const value& rhs) -{ - if(this != &rhs) - { - tag_ = rhs.tag_ ? rhs.tag_->clone() : nullptr; - } - return *this; -} - -value& value::operator=(tag&& t) -{ - set(std::move(t)); - return *this; -} - -void value::set(tag&& t) -{ - if(tag_) - tag_->assign(std::move(t)); - else - tag_ = std::move(t).move_clone(); -} - -//Primitive assignment -//FIXME: Make this less copypaste! -value& value::operator=(int8_t val) -{ - if(!tag_) - set(tag_byte(val)); - else switch(tag_->get_type()) - { - case tag_type::Byte: - static_cast(*tag_).set(val); - break; - case tag_type::Short: - static_cast(*tag_).set(val); - break; - case tag_type::Int: - static_cast(*tag_).set(val); - break; - case tag_type::Long: - static_cast(*tag_).set(val); - break; - case tag_type::Float: - static_cast(*tag_).set(val); - break; - case tag_type::Double: - static_cast(*tag_).set(val); - break; - - default: - throw std::bad_cast(); - } - return *this; -} - -value& value::operator=(int16_t val) -{ - if(!tag_) - set(tag_short(val)); - else switch(tag_->get_type()) - { - case tag_type::Short: - static_cast(*tag_).set(val); - break; - case tag_type::Int: - static_cast(*tag_).set(val); - break; - case tag_type::Long: - static_cast(*tag_).set(val); - break; - case tag_type::Float: - static_cast(*tag_).set(val); - break; - case tag_type::Double: - static_cast(*tag_).set(val); - break; - - default: - throw std::bad_cast(); - } - return *this; -} - -value& value::operator=(int32_t val) -{ - if(!tag_) - set(tag_int(val)); - else switch(tag_->get_type()) - { - case tag_type::Int: - static_cast(*tag_).set(val); - break; - case tag_type::Long: - static_cast(*tag_).set(val); - break; - case tag_type::Float: - static_cast(*tag_).set(val); - break; - case tag_type::Double: - static_cast(*tag_).set(val); - break; - - default: - throw std::bad_cast(); - } - return *this; -} - -value& value::operator=(int64_t val) -{ - if(!tag_) - set(tag_long(val)); - else switch(tag_->get_type()) - { - case tag_type::Long: - static_cast(*tag_).set(val); - break; - case tag_type::Float: - static_cast(*tag_).set(val); - break; - case tag_type::Double: - static_cast(*tag_).set(val); - break; - - default: - throw std::bad_cast(); - } - return *this; -} - -value& value::operator=(float val) -{ - if(!tag_) - set(tag_float(val)); - else switch(tag_->get_type()) - { - case tag_type::Float: - static_cast(*tag_).set(val); - break; - case tag_type::Double: - static_cast(*tag_).set(val); - break; - - default: - throw std::bad_cast(); - } - return *this; -} - -value& value::operator=(double val) -{ - if(!tag_) - set(tag_double(val)); - else switch(tag_->get_type()) - { - case tag_type::Double: - static_cast(*tag_).set(val); - break; - - default: - throw std::bad_cast(); - } - return *this; -} - -//Primitive conversion -value::operator int8_t() const -{ - switch(tag_->get_type()) - { - case tag_type::Byte: - return static_cast(*tag_).get(); - - default: - throw std::bad_cast(); - } -} - -value::operator int16_t() const -{ - switch(tag_->get_type()) - { - case tag_type::Byte: - return static_cast(*tag_).get(); - case tag_type::Short: - return static_cast(*tag_).get(); - - default: - throw std::bad_cast(); - } -} - -value::operator int32_t() const -{ - switch(tag_->get_type()) - { - case tag_type::Byte: - return static_cast(*tag_).get(); - case tag_type::Short: - return static_cast(*tag_).get(); - case tag_type::Int: - return static_cast(*tag_).get(); - - default: - throw std::bad_cast(); - } -} - -value::operator int64_t() const -{ - switch(tag_->get_type()) - { - case tag_type::Byte: - return static_cast(*tag_).get(); - case tag_type::Short: - return static_cast(*tag_).get(); - case tag_type::Int: - return static_cast(*tag_).get(); - case tag_type::Long: - return static_cast(*tag_).get(); - - default: - throw std::bad_cast(); - } -} - -value::operator float() const -{ - switch(tag_->get_type()) - { - case tag_type::Byte: - return static_cast(*tag_).get(); - case tag_type::Short: - return static_cast(*tag_).get(); - case tag_type::Int: - return static_cast(*tag_).get(); - case tag_type::Long: - return static_cast(*tag_).get(); - case tag_type::Float: - return static_cast(*tag_).get(); - - default: - throw std::bad_cast(); - } -} - -value::operator double() const -{ - switch(tag_->get_type()) - { - case tag_type::Byte: - return static_cast(*tag_).get(); - case tag_type::Short: - return static_cast(*tag_).get(); - case tag_type::Int: - return static_cast(*tag_).get(); - case tag_type::Long: - return static_cast(*tag_).get(); - case tag_type::Float: - return static_cast(*tag_).get(); - case tag_type::Double: - return static_cast(*tag_).get(); - - default: - throw std::bad_cast(); - } -} - -value& value::operator=(std::string&& str) -{ - if(!tag_) - set(tag_string(std::move(str))); - else - dynamic_cast(*tag_).set(std::move(str)); - return *this; -} - -value::operator const std::string&() const -{ - return dynamic_cast(*tag_).get(); -} - -value& value::at(const std::string& key) -{ - return dynamic_cast(*tag_).at(key); -} - -const value& value::at(const std::string& key) const -{ - return dynamic_cast(*tag_).at(key); -} - -value& value::operator[](const std::string& key) -{ - return dynamic_cast(*tag_)[key]; -} - -value& value::operator[](const char* key) -{ - return (*this)[std::string(key)]; -} - -value& value::at(size_t i) -{ - return dynamic_cast(*tag_).at(i); -} - -const value& value::at(size_t i) const -{ - return dynamic_cast(*tag_).at(i); -} - -value& value::operator[](size_t i) -{ - return dynamic_cast(*tag_)[i]; -} - -const value& value::operator[](size_t i) const -{ - return dynamic_cast(*tag_)[i]; -} - -tag_type value::get_type() const -{ - return tag_ ? tag_->get_type() : tag_type::Null; -} - -bool operator==(const value& lhs, const value& rhs) -{ - if(lhs.tag_ != nullptr && rhs.tag_ != nullptr) - return *lhs.tag_ == *rhs.tag_; - else - return lhs.tag_ == nullptr && rhs.tag_ == nullptr; -} - -bool operator!=(const value& lhs, const value& rhs) -{ - return !(lhs == rhs); -} - -} diff --git a/depends/libnbtplusplus/src/value_initializer.cpp b/depends/libnbtplusplus/src/value_initializer.cpp deleted file mode 100644 index 3735bfdf0..000000000 --- a/depends/libnbtplusplus/src/value_initializer.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include "value_initializer.h" -#include "nbt_tags.h" - -namespace nbt -{ - -value_initializer::value_initializer(int8_t val) : value(tag_byte(val)) {} -value_initializer::value_initializer(int16_t val) : value(tag_short(val)) {} -value_initializer::value_initializer(int32_t val) : value(tag_int(val)) {} -value_initializer::value_initializer(int64_t val) : value(tag_long(val)) {} -value_initializer::value_initializer(float val) : value(tag_float(val)) {} -value_initializer::value_initializer(double val) : value(tag_double(val)) {} -value_initializer::value_initializer(const std::string& str): value(tag_string(str)) {} -value_initializer::value_initializer(std::string&& str) : value(tag_string(std::move(str))) {} -value_initializer::value_initializer(const char* str) : value(tag_string(str)) {} - -} diff --git a/depends/libnbtplusplus/test/CMakeLists.txt b/depends/libnbtplusplus/test/CMakeLists.txt deleted file mode 100644 index c13f09f2d..000000000 --- a/depends/libnbtplusplus/test/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -enable_testing() -include_directories(${libnbt++_SOURCE_DIR}/include) -include_directories(${CXXTEST_INCLUDE_DIR}) - -CXXTEST_ADD_TEST(nbttest nbttest.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nbttest.h) -target_link_libraries(nbttest nbt++) - -CXXTEST_ADD_TEST(endian_str_test endian_str_test.cpp ${CMAKE_CURRENT_SOURCE_DIR}/endian_str_test.h) -target_link_libraries(endian_str_test nbt++) - -CXXTEST_ADD_TEST(read_test read_test.cpp ${CMAKE_CURRENT_SOURCE_DIR}/read_test.h) -target_link_libraries(read_test nbt++) -add_custom_command(TARGET read_test POST_BUILD - COMMAND ${CMAKE_COMMAND} -E - copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/testfiles ${CMAKE_CURRENT_BINARY_DIR}) - -CXXTEST_ADD_TEST(write_test write_test.cpp ${CMAKE_CURRENT_SOURCE_DIR}/write_test.h) -target_link_libraries(write_test nbt++) - -add_executable(format_test format_test.cpp) -target_link_libraries(format_test nbt++) -add_test(format_test format_test) diff --git a/depends/libnbtplusplus/test/endian_str_test.h b/depends/libnbtplusplus/test/endian_str_test.h deleted file mode 100644 index 5c7897521..000000000 --- a/depends/libnbtplusplus/test/endian_str_test.h +++ /dev/null @@ -1,175 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include -#include "endian_str.h" -#include -#include -#include - -using namespace endian; - -class endian_str_test : public CxxTest::TestSuite -{ -public: - void test_uint() - { - std::stringstream str(std::ios::in | std::ios::out | std::ios::binary); - - write_little(str, uint8_t (0x01)); - write_little(str, uint16_t(0x0102)); - write (str, uint32_t(0x01020304), endian::little); - write_little(str, uint64_t(0x0102030405060708)); - - write_big (str, uint8_t (0x09)); - write_big (str, uint16_t(0x090A)); - write_big (str, uint32_t(0x090A0B0C)); - write (str, uint64_t(0x090A0B0C0D0E0F10), endian::big); - - std::string expected{ - 1, - 2, 1, - 4, 3, 2, 1, - 8, 7, 6, 5, 4, 3, 2, 1, - - 9, - 9, 10, - 9, 10, 11, 12, - 9, 10, 11, 12, 13, 14, 15, 16 - }; - TS_ASSERT_EQUALS(str.str(), expected); - - uint8_t u8; - uint16_t u16; - uint32_t u32; - uint64_t u64; - - read_little(str, u8); - TS_ASSERT_EQUALS(u8, 0x01); - read_little(str, u16); - TS_ASSERT_EQUALS(u16, 0x0102); - read_little(str, u32); - TS_ASSERT_EQUALS(u32, 0x01020304u); - read(str, u64, endian::little); - TS_ASSERT_EQUALS(u64, 0x0102030405060708u); - - read_big(str, u8); - TS_ASSERT_EQUALS(u8, 0x09); - read_big(str, u16); - TS_ASSERT_EQUALS(u16, 0x090A); - read(str, u32, endian::big); - TS_ASSERT_EQUALS(u32, 0x090A0B0Cu); - read_big(str, u64); - TS_ASSERT_EQUALS(u64, 0x090A0B0C0D0E0F10u); - - TS_ASSERT(str); //Check if stream has failed - } - - void test_sint() - { - std::stringstream str(std::ios::in | std::ios::out | std::ios::binary); - - write_little(str, int8_t (-0x01)); - write_little(str, int16_t(-0x0102)); - write_little(str, int32_t(-0x01020304)); - write (str, int64_t(-0x0102030405060708), endian::little); - - write_big (str, int8_t (-0x09)); - write_big (str, int16_t(-0x090A)); - write (str, int32_t(-0x090A0B0C), endian::big); - write_big (str, int64_t(-0x090A0B0C0D0E0F10)); - - std::string expected{ //meh, stupid narrowing conversions - '\xFF', - '\xFE', '\xFE', - '\xFC', '\xFC', '\xFD', '\xFE', - '\xF8', '\xF8', '\xF9', '\xFA', '\xFB', '\xFC', '\xFD', '\xFE', - - '\xF7', - '\xF6', '\xF6', - '\xF6', '\xF5', '\xF4', '\xF4', - '\xF6', '\xF5', '\xF4', '\xF3', '\xF2', '\xF1', '\xF0', '\xF0' - }; - TS_ASSERT_EQUALS(str.str(), expected); - - int8_t i8; - int16_t i16; - int32_t i32; - int64_t i64; - - read_little(str, i8); - TS_ASSERT_EQUALS(i8, -0x01); - read_little(str, i16); - TS_ASSERT_EQUALS(i16, -0x0102); - read(str, i32, endian::little); - TS_ASSERT_EQUALS(i32, -0x01020304); - read_little(str, i64); - TS_ASSERT_EQUALS(i64, -0x0102030405060708); - - read_big(str, i8); - TS_ASSERT_EQUALS(i8, -0x09); - read_big(str, i16); - TS_ASSERT_EQUALS(i16, -0x090A); - read_big(str, i32); - TS_ASSERT_EQUALS(i32, -0x090A0B0C); - read(str, i64, endian::big); - TS_ASSERT_EQUALS(i64, -0x090A0B0C0D0E0F10); - - TS_ASSERT(str); //Check if stream has failed - } - - void test_float() - { - std::stringstream str(std::ios::in | std::ios::out | std::ios::binary); - - //C99 has hexadecimal floating point literals, C++ doesn't... - const float fconst = std::stof("-0xCDEF01p-63"); //-1.46325e-012 - const double dconst = std::stod("-0x1DEF0102030405p-375"); //-1.09484e-097 - //We will be assuming IEEE 754 here - - write_little(str, fconst); - write_little(str, dconst); - write_big (str, fconst); - write_big (str, dconst); - - std::string expected{ - '\x01', '\xEF', '\xCD', '\xAB', - '\x05', '\x04', '\x03', '\x02', '\x01', '\xEF', '\xCD', '\xAB', - - '\xAB', '\xCD', '\xEF', '\x01', - '\xAB', '\xCD', '\xEF', '\x01', '\x02', '\x03', '\x04', '\x05' - }; - TS_ASSERT_EQUALS(str.str(), expected); - - float f; - double d; - - read_little(str, f); - TS_ASSERT_EQUALS(f, fconst); - read_little(str, d); - TS_ASSERT_EQUALS(d, dconst); - - read_big(str, f); - TS_ASSERT_EQUALS(f, fconst); - read_big(str, d); - TS_ASSERT_EQUALS(d, dconst); - - TS_ASSERT(str); //Check if stream has failed - } -}; diff --git a/depends/libnbtplusplus/test/format_test.cpp b/depends/libnbtplusplus/test/format_test.cpp deleted file mode 100644 index 8ea4095c9..000000000 --- a/depends/libnbtplusplus/test/format_test.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -//#include "text/json_formatter.h" -//#include "io/stream_reader.h" -#include -#include -#include -#include "nbt_tags.h" - -using namespace nbt; - -int main() -{ - //TODO: Write that into a file - tag_compound comp{ - {"byte", tag_byte(-128)}, - {"short", tag_short(-32768)}, - {"int", tag_int(-2147483648)}, - {"long", tag_long(-9223372036854775808U)}, - - {"float 1", 1.618034f}, - {"float 2", 6.626070e-34f}, - {"float 3", 2.273737e+29f}, - {"float 4", -std::numeric_limits::infinity()}, - {"float 5", std::numeric_limits::quiet_NaN()}, - - {"double 1", 3.141592653589793}, - {"double 2", 1.749899444387479e-193}, - {"double 3", 2.850825855152578e+175}, - {"double 4", -std::numeric_limits::infinity()}, - {"double 5", std::numeric_limits::quiet_NaN()}, - - {"string 1", "Hello World! \u00E4\u00F6\u00FC\u00DF"}, - {"string 2", "String with\nline breaks\tand tabs"}, - - {"byte array", tag_byte_array{12, 13, 14, 15, 16}}, - {"int array", tag_int_array{0x0badc0de, -0x0dedbeef, 0x1badbabe}}, - - {"list (empty)", tag_list::of({})}, - {"list (float)", tag_list{2.0f, 1.0f, 0.5f, 0.25f}}, - {"list (list)", tag_list::of({ - {}, - {4, 5, 6}, - {tag_compound{{"egg", "ham"}}, tag_compound{{"foo", "bar"}}} - })}, - {"list (compound)", tag_list::of({ - {{"created-on", 42}, {"names", tag_list{"Compound", "tag", "#0"}}}, - {{"created-on", 45}, {"names", tag_list{"Compound", "tag", "#1"}}} - })}, - - {"compound (empty)", tag_compound()}, - {"compound (nested)", tag_compound{ - {"key", "value"}, - {"key with \u00E4\u00F6\u00FC", tag_byte(-1)}, - {"key with\nnewline and\ttab", tag_compound{}} - }}, - - {"null", nullptr} - }; - - std::cout << "----- default operator<<:\n"; - std::cout << comp; - std::cout << "\n-----" << std::endl; -} diff --git a/depends/libnbtplusplus/test/nbttest.h b/depends/libnbtplusplus/test/nbttest.h deleted file mode 100644 index 53327af98..000000000 --- a/depends/libnbtplusplus/test/nbttest.h +++ /dev/null @@ -1,476 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include -#include "nbt_tags.h" -#include "nbt_visitor.h" -#include -#include -#include - -using namespace nbt; - -class nbttest : public CxxTest::TestSuite -{ -public: - void test_tag() - { - TS_ASSERT(!is_valid_type(-1)); - TS_ASSERT(!is_valid_type(0)); - TS_ASSERT(is_valid_type(0, true)); - TS_ASSERT(is_valid_type(1)); - TS_ASSERT(is_valid_type(5, false)); - TS_ASSERT(is_valid_type(7, true)); - TS_ASSERT(is_valid_type(11)); - TS_ASSERT(!is_valid_type(12)); - - //looks like TS_ASSERT_EQUALS can't handle abstract classes... - TS_ASSERT(*tag::create(tag_type::Byte) == tag_byte()); - TS_ASSERT_THROWS(tag::create(tag_type::Null), std::invalid_argument); - TS_ASSERT_THROWS(tag::create(tag_type::End), std::invalid_argument); - - tag_string tstr("foo"); - auto cl = tstr.clone(); - TS_ASSERT_EQUALS(tstr.get(), "foo"); - TS_ASSERT(tstr == *cl); - - cl = std::move(tstr).clone(); - TS_ASSERT(*cl == tag_string("foo")); - TS_ASSERT(*cl != tag_string("bar")); - - cl = std::move(*cl).move_clone(); - TS_ASSERT(*cl == tag_string("foo")); - - tstr.assign(tag_string("bar")); - TS_ASSERT_THROWS(tstr.assign(tag_int(6)), std::bad_cast); - TS_ASSERT_EQUALS(tstr.get(), "bar"); - - TS_ASSERT_EQUALS(&tstr.as(), &tstr); - TS_ASSERT_THROWS(tstr.as(), std::bad_cast); - } - - void test_get_type() - { - TS_ASSERT_EQUALS(tag_byte().get_type() , tag_type::Byte); - TS_ASSERT_EQUALS(tag_short().get_type() , tag_type::Short); - TS_ASSERT_EQUALS(tag_int().get_type() , tag_type::Int); - TS_ASSERT_EQUALS(tag_long().get_type() , tag_type::Long); - TS_ASSERT_EQUALS(tag_float().get_type() , tag_type::Float); - TS_ASSERT_EQUALS(tag_double().get_type() , tag_type::Double); - TS_ASSERT_EQUALS(tag_byte_array().get_type(), tag_type::Byte_Array); - TS_ASSERT_EQUALS(tag_string().get_type() , tag_type::String); - TS_ASSERT_EQUALS(tag_list().get_type() , tag_type::List); - TS_ASSERT_EQUALS(tag_compound().get_type() , tag_type::Compound); - TS_ASSERT_EQUALS(tag_int_array().get_type() , tag_type::Int_Array); - } - - void test_tag_primitive() - { - tag_int tag(6); - TS_ASSERT_EQUALS(tag.get(), 6); - int& ref = tag; - ref = 12; - TS_ASSERT(tag == 12); - TS_ASSERT(tag != 6); - tag.set(24); - TS_ASSERT_EQUALS(ref, 24); - tag = 7; - TS_ASSERT_EQUALS(static_cast(tag), 7); - - TS_ASSERT_EQUALS(tag, tag_int(7)); - TS_ASSERT_DIFFERS(tag_float(2.5), tag_float(-2.5)); - TS_ASSERT_DIFFERS(tag_float(2.5), tag_double(2.5)); - - TS_ASSERT(tag_double() == 0.0); - - TS_ASSERT_EQUALS(tag_byte(INT8_MAX).get(), INT8_MAX); - TS_ASSERT_EQUALS(tag_byte(INT8_MIN).get(), INT8_MIN); - TS_ASSERT_EQUALS(tag_short(INT16_MAX).get(), INT16_MAX); - TS_ASSERT_EQUALS(tag_short(INT16_MIN).get(), INT16_MIN); - TS_ASSERT_EQUALS(tag_int(INT32_MAX).get(), INT32_MAX); - TS_ASSERT_EQUALS(tag_int(INT32_MIN).get(), INT32_MIN); - TS_ASSERT_EQUALS(tag_long(INT64_MAX).get(), INT64_MAX); - TS_ASSERT_EQUALS(tag_long(INT64_MIN).get(), INT64_MIN); - } - - void test_tag_string() - { - tag_string tag("foo"); - TS_ASSERT_EQUALS(tag.get(), "foo"); - std::string& ref = tag; - ref = "bar"; - TS_ASSERT_EQUALS(tag.get(), "bar"); - TS_ASSERT_DIFFERS(tag.get(), "foo"); - tag.set("baz"); - TS_ASSERT_EQUALS(ref, "baz"); - tag = "quux"; - TS_ASSERT_EQUALS("quux", static_cast(tag)); - std::string str("foo"); - tag = str; - TS_ASSERT_EQUALS(tag.get(),str); - - TS_ASSERT_EQUALS(tag_string(str).get(), "foo"); - TS_ASSERT_EQUALS(tag_string().get(), ""); - } - - void test_tag_compound() - { - tag_compound comp{ - {"foo", int16_t(12)}, - {"bar", "baz"}, - {"baz", -2.0}, - {"list", tag_list{16, 17}} - }; - - //Test assignments and conversions, and exceptions on bad conversions - TS_ASSERT_EQUALS(comp["foo"].get_type(), tag_type::Short); - TS_ASSERT_EQUALS(static_cast(comp["foo"]), 12); - TS_ASSERT_EQUALS(static_cast(comp.at("foo")), int16_t(12)); - TS_ASSERT(comp["foo"] == tag_short(12)); - TS_ASSERT_THROWS(static_cast(comp["foo"]), std::bad_cast); - TS_ASSERT_THROWS(static_cast(comp["foo"]), std::bad_cast); - - TS_ASSERT_THROWS(comp["foo"] = 32, std::bad_cast); - comp["foo"] = int8_t(32); - TS_ASSERT_EQUALS(static_cast(comp["foo"]), 32); - - TS_ASSERT_EQUALS(comp["bar"].get_type(), tag_type::String); - TS_ASSERT_EQUALS(static_cast(comp["bar"]), "baz"); - TS_ASSERT_THROWS(static_cast(comp["bar"]), std::bad_cast); - - TS_ASSERT_THROWS(comp["bar"] = -128, std::bad_cast); - comp["bar"] = "barbaz"; - TS_ASSERT_EQUALS(static_cast(comp["bar"]), "barbaz"); - - TS_ASSERT_EQUALS(comp["baz"].get_type(), tag_type::Double); - TS_ASSERT_EQUALS(static_cast(comp["baz"]), -2.0); - TS_ASSERT_THROWS(static_cast(comp["baz"]), std::bad_cast); - - //Test nested access - comp["quux"] = tag_compound{{"Hello", "World"}, {"zero", 0}}; - TS_ASSERT_EQUALS(comp.at("quux").get_type(), tag_type::Compound); - TS_ASSERT_EQUALS(static_cast(comp["quux"].at("Hello")), "World"); - TS_ASSERT_EQUALS(static_cast(comp["quux"]["Hello"]), "World"); - TS_ASSERT(comp["list"][1] == tag_int(17)); - - TS_ASSERT_THROWS(comp.at("nothing"), std::out_of_range); - - //Test equality comparisons - tag_compound comp2{ - {"foo", int16_t(32)}, - {"bar", "barbaz"}, - {"baz", -2.0}, - {"quux", tag_compound{{"Hello", "World"}, {"zero", 0}}}, - {"list", tag_list{16, 17}} - }; - TS_ASSERT(comp == comp2); - TS_ASSERT(comp != dynamic_cast(comp2["quux"].get())); - TS_ASSERT(comp != comp2["quux"]); - TS_ASSERT(dynamic_cast(comp["quux"].get()) == comp2["quux"]); - - //Test whether begin() through end() goes through all the keys and their - //values. The order of iteration is irrelevant there. - std::set keys{"bar", "baz", "foo", "list", "quux"}; - TS_ASSERT_EQUALS(comp2.size(), keys.size()); - unsigned int i = 0; - for(const std::pair& val: comp2) - { - TS_ASSERT_LESS_THAN(i, comp2.size()); - TS_ASSERT(keys.count(val.first)); - TS_ASSERT(val.second == comp2[val.first]); - ++i; - } - TS_ASSERT_EQUALS(i, comp2.size()); - - //Test erasing and has_key - TS_ASSERT_EQUALS(comp.erase("nothing"), false); - TS_ASSERT(comp.has_key("quux")); - TS_ASSERT(comp.has_key("quux", tag_type::Compound)); - TS_ASSERT(!comp.has_key("quux", tag_type::List)); - TS_ASSERT(!comp.has_key("quux", tag_type::Null)); - - TS_ASSERT_EQUALS(comp.erase("quux"), true); - TS_ASSERT(!comp.has_key("quux")); - TS_ASSERT(!comp.has_key("quux", tag_type::Compound)); - TS_ASSERT(!comp.has_key("quux", tag_type::Null)); - - comp.clear(); - TS_ASSERT(comp == tag_compound{}); - - //Test inserting values - TS_ASSERT_EQUALS(comp.put("abc", tag_double(6.0)).second, true); - TS_ASSERT_EQUALS(comp.put("abc", tag_long(-28)).second, false); - TS_ASSERT_EQUALS(comp.insert("ghi", tag_string("world")).second, true); - TS_ASSERT_EQUALS(comp.insert("abc", tag_string("hello")).second, false); - TS_ASSERT_EQUALS(comp.emplace("def", "ghi").second, true); - TS_ASSERT_EQUALS(comp.emplace("def", 4).second, false); - TS_ASSERT((comp == tag_compound{ - {"abc", tag_long(-28)}, - {"def", tag_byte(4)}, - {"ghi", tag_string("world")} - })); - } - - void test_value() - { - value val1; - value val2(make_unique(42)); - value val3(tag_int(42)); - - TS_ASSERT(!val1 && val2 && val3); - TS_ASSERT(val1 == val1); - TS_ASSERT(val1 != val2); - TS_ASSERT(val2 == val3); - TS_ASSERT(val3 == val3); - - value valstr(tag_string("foo")); - TS_ASSERT_EQUALS(static_cast(valstr), "foo"); - valstr = "bar"; - TS_ASSERT_THROWS(valstr = 5, std::bad_cast); - TS_ASSERT_EQUALS(static_cast(valstr), "bar"); - TS_ASSERT(valstr.as() == "bar"); - TS_ASSERT_EQUALS(&valstr.as(), &valstr.get()); - TS_ASSERT_THROWS(valstr.as(), std::bad_cast); - - val1 = int64_t(42); - TS_ASSERT(val2 != val1); - - TS_ASSERT_THROWS(val2 = int64_t(12), std::bad_cast); - TS_ASSERT_EQUALS(static_cast(val2), 42); - tag_int* ptr = dynamic_cast(val2.get_ptr().get()); - TS_ASSERT(*ptr == 42); - val2 = 52; - TS_ASSERT_EQUALS(static_cast(val2), 52); - TS_ASSERT(*ptr == 52); - - TS_ASSERT_THROWS(val1["foo"], std::bad_cast); - TS_ASSERT_THROWS(val1.at("foo"), std::bad_cast); - - val3 = 52; - TS_ASSERT(val2 == val3); - TS_ASSERT(val2.get_ptr() != val3.get_ptr()); - - val3 = std::move(val2); - TS_ASSERT(val3 == tag_int(52)); - TS_ASSERT(!val2); - - tag_int& tag = dynamic_cast(val3.get()); - TS_ASSERT(tag == tag_int(52)); - tag = 21; - TS_ASSERT_EQUALS(static_cast(val3), 21); - val1.set_ptr(std::move(val3.get_ptr())); - TS_ASSERT(val1.as() == 21); - - TS_ASSERT_EQUALS(val1.get_type(), tag_type::Int); - TS_ASSERT_EQUALS(val2.get_type(), tag_type::Null); - TS_ASSERT_EQUALS(val3.get_type(), tag_type::Null); - - val2 = val1; - val1 = val3; - TS_ASSERT(!val1 && val2 && !val3); - TS_ASSERT(val1.get_ptr() == nullptr); - TS_ASSERT(val2.get() == tag_int(21)); - TS_ASSERT(value(val1) == val1); - TS_ASSERT(value(val2) == val2); - val1 = val1; - val2 = val2; - TS_ASSERT(!val1); - TS_ASSERT(val1 == value_initializer(nullptr)); - TS_ASSERT(val2 == tag_int(21)); - - val3 = tag_short(2); - TS_ASSERT_THROWS(val3 = tag_string("foo"), std::bad_cast); - TS_ASSERT(val3.get() == tag_short(2)); - - val2.set_ptr(make_unique("foo")); - TS_ASSERT(val2 == tag_string("foo")); - } - - void test_tag_list() - { - tag_list list; - TS_ASSERT_EQUALS(list.el_type(), tag_type::Null); - TS_ASSERT_THROWS(list.push_back(value(nullptr)), std::invalid_argument); - - list.emplace_back("foo"); - TS_ASSERT_EQUALS(list.el_type(), tag_type::String); - list.push_back(tag_string("bar")); - TS_ASSERT_THROWS(list.push_back(tag_int(42)), std::invalid_argument); - TS_ASSERT_THROWS(list.emplace_back(), std::invalid_argument); - - TS_ASSERT((list == tag_list{"foo", "bar"})); - TS_ASSERT(list[0] == tag_string("foo")); - TS_ASSERT_EQUALS(static_cast(list.at(1)), "bar"); - - TS_ASSERT_EQUALS(list.size(), 2u); - TS_ASSERT_THROWS(list.at(2), std::out_of_range); - TS_ASSERT_THROWS(list.at(-1), std::out_of_range); - - list.set(1, value(tag_string("baz"))); - TS_ASSERT_THROWS(list.set(1, value(nullptr)), std::invalid_argument); - TS_ASSERT_THROWS(list.set(1, value(tag_int(-42))), std::invalid_argument); - TS_ASSERT_EQUALS(static_cast(list[1]), "baz"); - - TS_ASSERT_EQUALS(list.size(), 2u); - tag_string values[] = {"foo", "baz"}; - TS_ASSERT_EQUALS(list.end() - list.begin(), int(list.size())); - TS_ASSERT(std::equal(list.begin(), list.end(), values)); - - list.pop_back(); - TS_ASSERT(list == tag_list{"foo"}); - TS_ASSERT(list == tag_list::of({"foo"})); - TS_ASSERT(tag_list::of({"foo"}) == tag_list{"foo"}); - TS_ASSERT((list != tag_list{2, 3, 5, 7})); - - list.clear(); - TS_ASSERT_EQUALS(list.size(), 0u); - TS_ASSERT_EQUALS(list.el_type(), tag_type::String) - TS_ASSERT_THROWS(list.push_back(tag_short(25)), std::invalid_argument); - TS_ASSERT_THROWS(list.push_back(value(nullptr)), std::invalid_argument); - - list.reset(); - TS_ASSERT_EQUALS(list.el_type(), tag_type::Null); - list.emplace_back(17); - TS_ASSERT_EQUALS(list.el_type(), tag_type::Int); - - list.reset(tag_type::Float); - TS_ASSERT_EQUALS(list.el_type(), tag_type::Float); - list.emplace_back(17.0f); - TS_ASSERT(list == tag_list({17.0f})); - - TS_ASSERT(tag_list() != tag_list(tag_type::Int)); - TS_ASSERT(tag_list() == tag_list()); - TS_ASSERT(tag_list(tag_type::Short) != tag_list(tag_type::Int)); - TS_ASSERT(tag_list(tag_type::Short) == tag_list(tag_type::Short)); - - tag_list short_list = tag_list::of({25, 36}); - TS_ASSERT_EQUALS(short_list.el_type(), tag_type::Short); - TS_ASSERT((short_list == tag_list{int16_t(25), int16_t(36)})); - TS_ASSERT((short_list != tag_list{25, 36})); - TS_ASSERT((short_list == tag_list{value(tag_short(25)), value(tag_short(36))})); - - TS_ASSERT_THROWS((tag_list{value(tag_byte(4)), value(tag_int(5))}), std::invalid_argument); - TS_ASSERT_THROWS((tag_list{value(nullptr), value(tag_int(6))}), std::invalid_argument); - TS_ASSERT_THROWS((tag_list{value(tag_int(7)), value(tag_int(8)), value(nullptr)}), std::invalid_argument); - TS_ASSERT_EQUALS((tag_list(std::initializer_list{})).el_type(), tag_type::Null); - TS_ASSERT_EQUALS((tag_list{2, 3, 5, 7}).el_type(), tag_type::Int); - } - - void test_tag_byte_array() - { - std::vector vec{1, 2, 127, -128}; - tag_byte_array arr{1, 2, 127, -128}; - TS_ASSERT_EQUALS(arr.size(), 4u); - TS_ASSERT(arr.at(0) == 1 && arr[1] == 2 && arr[2] == 127 && arr.at(3) == -128); - TS_ASSERT_THROWS(arr.at(-1), std::out_of_range); - TS_ASSERT_THROWS(arr.at(4), std::out_of_range); - - TS_ASSERT(arr.get() == vec); - TS_ASSERT(arr == tag_byte_array(std::vector(vec))); - - arr.push_back(42); - vec.push_back(42); - - TS_ASSERT_EQUALS(arr.size(), 5u); - TS_ASSERT_EQUALS(arr.end() - arr.begin(), int(arr.size())); - TS_ASSERT(std::equal(arr.begin(), arr.end(), vec.begin())); - - arr.pop_back(); - arr.pop_back(); - TS_ASSERT_EQUALS(arr.size(), 3u); - TS_ASSERT((arr == tag_byte_array{1, 2, 127})); - TS_ASSERT((arr != tag_int_array{1, 2, 127})); - TS_ASSERT((arr != tag_byte_array{1, 2, -1})); - - arr.clear(); - TS_ASSERT(arr == tag_byte_array()); - } - - void test_tag_int_array() - { - std::vector vec{100, 200, INT32_MAX, INT32_MIN}; - tag_int_array arr{100, 200, INT32_MAX, INT32_MIN}; - TS_ASSERT_EQUALS(arr.size(), 4u); - TS_ASSERT(arr.at(0) == 100 && arr[1] == 200 && arr[2] == INT32_MAX && arr.at(3) == INT32_MIN); - TS_ASSERT_THROWS(arr.at(-1), std::out_of_range); - TS_ASSERT_THROWS(arr.at(4), std::out_of_range); - - TS_ASSERT(arr.get() == vec); - TS_ASSERT(arr == tag_int_array(std::vector(vec))); - - arr.push_back(42); - vec.push_back(42); - - TS_ASSERT_EQUALS(arr.size(), 5u); - TS_ASSERT_EQUALS(arr.end() - arr.begin(), int(arr.size())); - TS_ASSERT(std::equal(arr.begin(), arr.end(), vec.begin())); - - arr.pop_back(); - arr.pop_back(); - TS_ASSERT_EQUALS(arr.size(), 3u); - TS_ASSERT((arr == tag_int_array{100, 200, INT32_MAX})); - TS_ASSERT((arr != tag_int_array{100, -56, -1})); - - arr.clear(); - TS_ASSERT(arr == tag_int_array()); - } - - void test_visitor() - { - struct : public nbt_visitor - { - tag_type visited = tag_type::Null; - - void visit(tag_byte& tag) { visited = tag_type::Byte; } - void visit(tag_short& tag) { visited = tag_type::Short; } - void visit(tag_int& tag) { visited = tag_type::Int; } - void visit(tag_long& tag) { visited = tag_type::Long; } - void visit(tag_float& tag) { visited = tag_type::Float; } - void visit(tag_double& tag) { visited = tag_type::Double; } - void visit(tag_byte_array& tag) { visited = tag_type::Byte_Array; } - void visit(tag_string& tag) { visited = tag_type::String; } - void visit(tag_list& tag) { visited = tag_type::List; } - void visit(tag_compound& tag) { visited = tag_type::Compound; } - void visit(tag_int_array& tag) { visited = tag_type::Int_Array; } - } v; - - tag_byte().accept(v); - TS_ASSERT_EQUALS(v.visited, tag_type::Byte); - tag_short().accept(v); - TS_ASSERT_EQUALS(v.visited, tag_type::Short); - tag_int().accept(v); - TS_ASSERT_EQUALS(v.visited, tag_type::Int); - tag_long().accept(v); - TS_ASSERT_EQUALS(v.visited, tag_type::Long); - tag_float().accept(v); - TS_ASSERT_EQUALS(v.visited, tag_type::Float); - tag_double().accept(v); - TS_ASSERT_EQUALS(v.visited, tag_type::Double); - tag_byte_array().accept(v); - TS_ASSERT_EQUALS(v.visited, tag_type::Byte_Array); - tag_string().accept(v); - TS_ASSERT_EQUALS(v.visited, tag_type::String); - tag_list().accept(v); - TS_ASSERT_EQUALS(v.visited, tag_type::List); - tag_compound().accept(v); - TS_ASSERT_EQUALS(v.visited, tag_type::Compound); - tag_int_array().accept(v); - TS_ASSERT_EQUALS(v.visited, tag_type::Int_Array); - } -}; diff --git a/depends/libnbtplusplus/test/read_test.h b/depends/libnbtplusplus/test/read_test.h deleted file mode 100644 index 891c2933d..000000000 --- a/depends/libnbtplusplus/test/read_test.h +++ /dev/null @@ -1,216 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include -#include "io/stream_reader.h" -#include "nbt_tags.h" -#include -#include -#include - -using namespace nbt; - -class read_test : public CxxTest::TestSuite -{ -public: - void test_stream_reader_big() - { - std::string input{ - 1, //tag_type::Byte - 0, //tag_type::End - 11, //tag_type::Int_Array - - 0x0a, 0x0b, 0x0c, 0x0d, //0x0a0b0c0d in Big Endian - - 0x00, 0x06, //String length in Big Endian - 'f', 'o', 'o', 'b', 'a', 'r', - - 0 //tag_type::End (invalid with allow_end = false) - }; - std::istringstream is(input); - nbt::io::stream_reader reader(is); - - TS_ASSERT_EQUALS(&reader.get_istr(), &is); - TS_ASSERT_EQUALS(reader.get_endian(), endian::big); - - TS_ASSERT_EQUALS(reader.read_type(), tag_type::Byte); - TS_ASSERT_EQUALS(reader.read_type(true), tag_type::End); - TS_ASSERT_EQUALS(reader.read_type(false), tag_type::Int_Array); - - int32_t i; - reader.read_num(i); - TS_ASSERT_EQUALS(i, 0x0a0b0c0d); - - TS_ASSERT_EQUALS(reader.read_string(), "foobar"); - - TS_ASSERT_THROWS(reader.read_type(false), io::input_error); - TS_ASSERT(!is); - is.clear(); - - //Test for invalid tag type 12 - is.str("\x0c"); - TS_ASSERT_THROWS(reader.read_type(), io::input_error); - TS_ASSERT(!is); - is.clear(); - - //Test for unexpcted EOF on numbers (input too short for int32_t) - is.str("\x03\x04"); - reader.read_num(i); - TS_ASSERT(!is); - } - - void test_stream_reader_little() - { - std::string input{ - 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, //0x0d0c0b0a09080706 in Little Endian - - 0x06, 0x00, //String length in Little Endian - 'f', 'o', 'o', 'b', 'a', 'r', - - 0x10, 0x00, //String length (intentionally too large) - 'a', 'b', 'c', 'd' //unexpected EOF - }; - std::istringstream is(input); - nbt::io::stream_reader reader(is, endian::little); - - TS_ASSERT_EQUALS(reader.get_endian(), endian::little); - - int64_t i; - reader.read_num(i); - TS_ASSERT_EQUALS(i, 0x0d0c0b0a09080706); - - TS_ASSERT_EQUALS(reader.read_string(), "foobar"); - - TS_ASSERT_THROWS(reader.read_string(), io::input_error); - TS_ASSERT(!is); - } - - //Tests if comp equals an extended variant of Notch's bigtest NBT - void verify_bigtest_structure(const tag_compound& comp) - { - TS_ASSERT_EQUALS(comp.size(), 13u); - - TS_ASSERT(comp.at("byteTest") == tag_byte(127)); - TS_ASSERT(comp.at("shortTest") == tag_short(32767)); - TS_ASSERT(comp.at("intTest") == tag_int(2147483647)); - TS_ASSERT(comp.at("longTest") == tag_long(9223372036854775807)); - TS_ASSERT(comp.at("floatTest") == tag_float(std::stof("0xff1832p-25"))); //0.4982315 - TS_ASSERT(comp.at("doubleTest") == tag_double(std::stod("0x1f8f6bbbff6a5ep-54"))); //0.493128713218231 - - //From bigtest.nbt: "the first 1000 values of (n*n*255+n*7)%100, starting with n=0 (0, 62, 34, 16, 8, ...)" - tag_byte_array byteArrayTest; - for(int n = 0; n < 1000; ++n) - byteArrayTest.push_back((n*n*255 + n*7) % 100); - TS_ASSERT(comp.at("byteArrayTest (the first 1000 values of (n*n*255+n*7)%100, starting with n=0 (0, 62, 34, 16, 8, ...))") == byteArrayTest); - - TS_ASSERT(comp.at("stringTest") == tag_string("HELLO WORLD THIS IS A TEST STRING \u00C5\u00C4\u00D6!")); - - TS_ASSERT(comp.at("listTest (compound)") == tag_list::of({ - {{"created-on", tag_long(1264099775885)}, {"name", "Compound tag #0"}}, - {{"created-on", tag_long(1264099775885)}, {"name", "Compound tag #1"}} - })); - TS_ASSERT(comp.at("listTest (long)") == tag_list::of({11, 12, 13, 14, 15})); - TS_ASSERT(comp.at("listTest (end)") == tag_list()); - - TS_ASSERT((comp.at("nested compound test") == tag_compound{ - {"egg", tag_compound{{"value", 0.5f}, {"name", "Eggbert"}}}, - {"ham", tag_compound{{"value", 0.75f}, {"name", "Hampus"}}} - })); - - TS_ASSERT(comp.at("intArrayTest") == tag_int_array( - {0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f})); - } - - void test_read_bigtest() - { - //Uses an extended variant of Notch's original bigtest file - std::ifstream file("bigtest_uncompr", std::ios::binary); - TS_ASSERT(file); - - auto pair = nbt::io::read_compound(file); - TS_ASSERT_EQUALS(pair.first, "Level"); - verify_bigtest_structure(*pair.second); - } - - void test_read_littletest() - { - //Same as bigtest, but little endian - std::ifstream file("littletest_uncompr", std::ios::binary); - TS_ASSERT(file); - - auto pair = nbt::io::read_compound(file, endian::little); - TS_ASSERT_EQUALS(pair.first, "Level"); - TS_ASSERT_EQUALS(pair.second->get_type(), tag_type::Compound); - verify_bigtest_structure(*pair.second); - } - - void test_read_errors() - { - std::ifstream file; - nbt::io::stream_reader reader(file); - - //EOF within a tag_double payload - file.open("errortest_eof1", std::ios::binary); - TS_ASSERT(file); - TS_ASSERT_THROWS(reader.read_tag(), io::input_error); - TS_ASSERT(!file); - - //EOF within a key in a compound - file.close(); - file.open("errortest_eof2", std::ios::binary); - TS_ASSERT(file); - TS_ASSERT_THROWS(reader.read_tag(), io::input_error); - TS_ASSERT(!file); - - //Missing tag_end - file.close(); - file.open("errortest_noend", std::ios::binary); - TS_ASSERT(file); - TS_ASSERT_THROWS(reader.read_tag(), io::input_error); - TS_ASSERT(!file); - - //Negative list length - file.close(); - file.open("errortest_neg_length", std::ios::binary); - TS_ASSERT(file); - TS_ASSERT_THROWS(reader.read_tag(), io::input_error); - TS_ASSERT(!file); - } - - void test_read_misc() - { - std::ifstream file; - nbt::io::stream_reader reader(file); - - //Toplevel tag other than compound - file.open("toplevel_string", std::ios::binary); - TS_ASSERT(file); - TS_ASSERT_THROWS(reader.read_compound(), io::input_error); - TS_ASSERT(!file); - - //Rewind and try again with read_tag - file.clear(); - TS_ASSERT(file.seekg(0)); - auto pair = reader.read_tag(); - TS_ASSERT_EQUALS(pair.first, "Test (toplevel tag_string)"); - TS_ASSERT(*pair.second == tag_string( - "Even though unprovided for by NBT, the library should also handle " - "the case where the file consists of something else than tag_compound")); - } -}; diff --git a/depends/libnbtplusplus/test/testfiles/bigtest.nbt b/depends/libnbtplusplus/test/testfiles/bigtest.nbt deleted file mode 100644 index de1a91268b9406085714e9c1634530e8bf30396c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 561 zcmb2|=HNKTa43|8At^JxB(=CCzBDg6KewPLwYWGnh2ia#^ZrtfBFE=%;6B}ypksJM z;&YZR<1SThSCwN*Q5!PMG7^$|4Uf3CwU*s9-QC=~JnmNV<>>!2<$g+6z1#YqRd$+u z+^u5$JwBiA?fH4G=H3|LjOv)s=U?DihX( zi9F@GKlkcXqg7WYvu!Hu$XdEE$$9PkEB79KIQ`-Chu^_+OtObB-3jhm9C3~N-#pKB z8No$r+@8|;YyZtPHMs3@GlnHU{5AK1nNjl_*01{do{f+H&)zhi6ONn=Gn!uf@_D%a zMOF8W61~QatO`kAWTv-vetbJg=JY3njSsH0FRQD3bvRg_^T6ceZ#RFMq!j(>%#MlX zpI4d6&Oa&BvEA(AjoP>{l|Ik&(*U+W$TUzxs|MrWLo&uq4RfMox5pY8f38{_V)B zE&HU7{yBQAQmdx8@@c1N)XfQ1TeipNuA9F2>z{AO(pHrS?>}|4MwcU3mh*SE@6wu> z=i9PpUtd~cGtv6%N$z7!8x#J-xA7m@W||?H*KYaa>)XTq7k{S-IIRgk|C=YC}2QGD(X`0Z*ZsyMPSFaQ8;Di*&0 diff --git a/depends/libnbtplusplus/test/testfiles/bigtest_uncompr b/depends/libnbtplusplus/test/testfiles/bigtest_uncompr deleted file mode 100644 index dc1c9c113f79552caa693efd2fe79cadbc60417c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1601 zcmd;LVD(8YOU+?n;K<3(OAkpcE~)#TofUB@i(V2Cm|gqD+Vq22BrFA0K~( zaQ`457ljZH&tL`5Uxx~4o_2LW#CN9$xj5EV)tLdh?#*s zGY`xI*~7&kl9yUslA5BBoS$2eUz(SqP?B0)!o|Rxk(kTDz>=4ko65lEk(gUhTFlD8 zT9%konriRBz`(%8z?_<%4pYJInx3ANT2um8!TG(f)7WMN=nUG(RVUFhV=bd74}d3=B*#d-P&Qy;;7Tq^O)N=G(aq0e zU|>`WGQZl(fJ3z*cGa8=dSQvFfdR62UD>^ewurcgk*TS6o|d_$s-b~_jzV!sVo^zEUb;egW=V!Z zo~?m`hJlWPnURiyv5Ag?p_z_?g^q%ro}Q*A0|WC520JAI4lXerA0amdmN3777(TrS z4JI!O10%Z-0V^&K9VsCZ1+y@j04=_Rh$torizFkS5GN}ek2on8ksvb_896P71hps= z3AQ8#9wjFZ8?iVa7q=i56+gKc2R$_n6E8M{Q9DM%YBXI9Z2n+l;7Z9aP09h6F!uNR nvv>c`isNSB$;>N(mop3u3@i+cOw25-Z0sDIT--doeEbXm)U0CX diff --git a/depends/libnbtplusplus/test/testfiles/errortest_eof1 b/depends/libnbtplusplus/test/testfiles/errortest_eof1 deleted file mode 100644 index abb7ac564f04a6291e0310df90f78a340667e846..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 ycmd;L5DiH!E>X}Z%}cE)NKGzDO;K?5chh8J;4aS3O;t$AFHOoxwZGq=y&C`X}Z%}cE)NKGzDO;K?5chlr#a0$-OO;yOrEG|(f&qyswRVc|wRme-s xO;s;e$VtshFUe5IELJEl%Fj#ZVqjok;$UDdE-7MQj9_47U`eVhN&U~j003TH8-M@+ diff --git a/depends/libnbtplusplus/test/testfiles/errortest_neg_length b/depends/libnbtplusplus/test/testfiles/errortest_neg_length deleted file mode 100644 index 228de8954532aab9f3d1b2525b505f5e10d99fda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47 zcmd;LkPb;LE>Y0POHEHK$t+7%$jK}&QOHTnOE1aLY0P%`7g?%u81&NlcGV%}dc_VPMJ0&r4@ic1`bGefB*U150v#ZUF-T DX@n0` diff --git a/depends/libnbtplusplus/test/testfiles/level.dat.2 b/depends/libnbtplusplus/test/testfiles/level.dat.2 deleted file mode 100644 index 8c118c7e445e513729cf999438971007b9043c1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175521 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%0DDpr%c`9ul%xdd!6AGFzJ4etF)tORE@Fk0UlNSI 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

CYb~wo8*uRJV={A0DOKfe5OkT(z8Wds{tBE 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 diff --git a/depends/libnbtplusplus/test/testfiles/littletest_uncompr b/depends/libnbtplusplus/test/testfiles/littletest_uncompr deleted file mode 100644 index 86619e9654e964cdf540e493226981c55f895507..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1601 zcmd;LW$;NYOU+^7V93eOOAkpcF8L1u^-P=$#TofUC1A074lah`lA=tA5={mVS05jL zg>e5M9~XrX56@r)&tL^dg%H=^5QX57AWuJcg~P3fTMkcCWaVT?%gIj!n_?vK-;SA` zAu|um`~UxcJ(mbWUTSekYKlT~er`d2X@LtbKTDjS1GVs1fc zF)J%WSz=CUDg%RqJp&grLuz_DR0TVOYkGQ8YEcP734=WY11CR2PG&LKE(Hyc?=)Fh z85kJ286bcMLNV|{X+9{;52ZPUk+j2{r^&^{z`y{tm!H8I?&`#J1!V&kE{5cy)Wnk1 z6y5y1-mB(8YK*v58)8?@$%kZZYF>&a*g1?G3`vzGsi3&1XHNyQ9gB(*D?tJZ8YLO2 z3Tc@|#U%=c1_lNS;9x3N$WK$y$kWQxGBP#Q&eJm2R5dg(&`~HZNh~VK%u81&&n(GM z$g?$2&@j+ZFf-CoFgDRqFf`Lqu+UM^)6>(`e8J4Xz+k5&z`-S^<0Iszz!K&c5W}Yz zp~2*3VPIqzB4EYkp(7BVUc9S6XIlL;}Iw2A`)b#A|t2ekf0W2 zBEgo#z@y~EVIvmj8a`5x<@-P4Z?}cLL diff --git a/depends/libnbtplusplus/test/testfiles/toplevel_string b/depends/libnbtplusplus/test/testfiles/toplevel_string deleted file mode 100644 index 996cc78d0b1c54a52b6edaaa579ac64c1db9d7a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmd;JkP1mHE>X}Z$uG!BElbT&C`n9@FD@y{%uCl~Xmc$~%~L4J$S+OLP$D9K1w$jMA9N-U~WD9*?)%}G&6%qh-S$Vkjf$w>uECnpxC zDwJoW7D2danK`Kn$@zK3nZ+f=3i)XY#re6ZB^jA{=?bYi#UM3_d0=NG=jRsWm*%Aa E0Pn3k%m4rY diff --git a/depends/libnbtplusplus/test/write_test.h b/depends/libnbtplusplus/test/write_test.h deleted file mode 100644 index 424e6344a..000000000 --- a/depends/libnbtplusplus/test/write_test.h +++ /dev/null @@ -1,248 +0,0 @@ -/* - * libnbt++ - A library for the Minecraft Named Binary Tag format. - * Copyright (C) 2013, 2015 ljfa-ag - * - * This file is part of libnbt++. - * - * libnbt++ is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * libnbt++ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnbt++. If not, see . - */ -#include -#include "io/stream_writer.h" -#include "io/stream_reader.h" -#include "nbt_tags.h" -#include -#include -#include - -using namespace nbt; - -class read_test : public CxxTest::TestSuite -{ -public: - void test_stream_writer_big() - { - std::ostringstream os; - nbt::io::stream_writer writer(os); - - TS_ASSERT_EQUALS(&writer.get_ostr(), &os); - TS_ASSERT_EQUALS(writer.get_endian(), endian::big); - - writer.write_type(tag_type::End); - writer.write_type(tag_type::Long); - writer.write_type(tag_type::Int_Array); - - writer.write_num(int64_t(0x0102030405060708)); - - writer.write_string("foobar"); - - TS_ASSERT(os); - std::string expected{ - 0, //tag_type::End - 4, //tag_type::Long - 11, //tag_type::Int_Array - - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, //0x0102030405060708 in Big Endian - - 0x00, 0x06, //string length in Big Endian - 'f', 'o', 'o', 'b', 'a', 'r' - }; - TS_ASSERT_EQUALS(os.str(), expected); - - //too long for NBT - TS_ASSERT_THROWS(writer.write_string(std::string(65536, '.')), std::length_error); - TS_ASSERT(!os); - } - - void test_stream_writer_little() - { - std::ostringstream os; - nbt::io::stream_writer writer(os, endian::little); - - TS_ASSERT_EQUALS(writer.get_endian(), endian::little); - - writer.write_num(int32_t(0x0a0b0c0d)); - - writer.write_string("foobar"); - - TS_ASSERT(os); - std::string expected{ - 0x0d, 0x0c, 0x0b, 0x0a, //0x0a0b0c0d in Little Endian - - 0x06, 0x00, //string length in Little Endian - 'f', 'o', 'o', 'b', 'a', 'r' - }; - TS_ASSERT_EQUALS(os.str(), expected); - - TS_ASSERT_THROWS(writer.write_string(std::string(65536, '.')), std::length_error); - TS_ASSERT(!os); - } - - void test_write_payload_big() - { - std::ostringstream os; - nbt::io::stream_writer writer(os); - - //tag_primitive - writer.write_payload(tag_byte(127)); - writer.write_payload(tag_short(32767)); - writer.write_payload(tag_int(2147483647)); - writer.write_payload(tag_long(9223372036854775807)); - - //Same values as in endian_str_test - writer.write_payload(tag_float(std::stof("-0xCDEF01p-63"))); - writer.write_payload(tag_double(std::stod("-0x1DEF0102030405p-375"))); - - TS_ASSERT_EQUALS(os.str(), (std::string{ - '\x7F', - '\x7F', '\xFF', - '\x7F', '\xFF', '\xFF', '\xFF', - '\x7F', '\xFF', '\xFF', '\xFF', '\xFF', '\xFF', '\xFF', '\xFF', - - '\xAB', '\xCD', '\xEF', '\x01', - '\xAB', '\xCD', '\xEF', '\x01', '\x02', '\x03', '\x04', '\x05' - })); - os.str(""); //clear and reuse the stream - - //tag_string - writer.write_payload(tag_string("barbaz")); - TS_ASSERT_EQUALS(os.str(), (std::string{ - 0x00, 0x06, //string length in Big Endian - 'b', 'a', 'r', 'b', 'a', 'z' - })); - TS_ASSERT_THROWS(writer.write_payload(tag_string(std::string(65536, '.'))), std::length_error); - TS_ASSERT(!os); - os.clear(); - - //tag_byte_array - os.str(""); - writer.write_payload(tag_byte_array{0, 1, 127, -128, -127}); - TS_ASSERT_EQUALS(os.str(), (std::string{ - 0x00, 0x00, 0x00, 0x05, //length in Big Endian - 0, 1, 127, -128, -127 - })); - os.str(""); - - //tag_int_array - writer.write_payload(tag_int_array{0x01020304, 0x05060708, 0x090a0b0c}); - TS_ASSERT_EQUALS(os.str(), (std::string{ - 0x00, 0x00, 0x00, 0x03, //length in Big Endian - 0x01, 0x02, 0x03, 0x04, - 0x05, 0x06, 0x07, 0x08, - 0x09, 0x0a, 0x0b, 0x0c - })); - os.str(""); - - //tag_list - writer.write_payload(tag_list()); //empty list with undetermined type, should be written as list of tag_end - writer.write_payload(tag_list(tag_type::Int)); //empty list of tag_int - writer.write_payload(tag_list{ //nested list - tag_list::of({0x3456, 0x789a}), - tag_list::of({0x0a, 0x0b, 0x0c, 0x0d}) - }); - TS_ASSERT_EQUALS(os.str(), (std::string{ - 0, //tag_type::End - 0x00, 0x00, 0x00, 0x00, //length - - 3, //tag_type::Int - 0x00, 0x00, 0x00, 0x00, //length - - 9, //tag_type::List - 0x00, 0x00, 0x00, 0x02, //length - //list 0 - 2, //tag_type::Short - 0x00, 0x00, 0x00, 0x02, //length - '\x34', '\x56', - '\x78', '\x9a', - //list 1 - 1, //tag_type::Byte - 0x00, 0x00, 0x00, 0x04, //length - 0x0a, - 0x0b, - 0x0c, - 0x0d - })); - os.str(""); - - //tag_compound - /* Testing if writing compounds works properly is problematic because the - order of the tags is not guaranteed. However with only two tags in a - compound we only have two possible orderings. - See below for a more thorough test that uses writing and re-reading. */ - writer.write_payload(tag_compound{}); - writer.write_payload(tag_compound{ - {"foo", "quux"}, - {"bar", tag_int(0x789abcde)} - }); - - std::string endtag{0x00}; - std::string subtag1{ - 8, //tag_type::String - 0x00, 0x03, //key length - 'f', 'o', 'o', - 0x00, 0x04, //string length - 'q', 'u', 'u', 'x' - }; - std::string subtag2{ - 3, //tag_type::Int - 0x00, 0x03, //key length - 'b', 'a', 'r', - '\x78', '\x9A', '\xBC', '\xDE' - }; - - TS_ASSERT(os.str() == endtag + subtag1 + subtag2 + endtag - || os.str() == endtag + subtag2 + subtag1 + endtag); - - //Now for write_tag: - os.str(""); - writer.write_tag("foo", tag_string("quux")); - TS_ASSERT_EQUALS(os.str(), subtag1); - TS_ASSERT(os); - - //too long key for NBT - TS_ASSERT_THROWS(writer.write_tag(std::string(65536, '.'), tag_long(-1)), std::length_error); - TS_ASSERT(!os); - } - - void test_write_bigtest() - { - /* Like already stated above, because no order is guaranteed for - tag_compound, we cannot simply test it by writing into a stream and directly - comparing the output to a reference value. - Instead, we assume that reading already works correctly and re-read the - written tag. - Smaller-grained tests are already done above. */ - std::ifstream file("bigtest_uncompr", std::ios::binary); - const auto orig_pair = io::read_compound(file); - std::stringstream sstr; - - //Write into stream in Big Endian - io::write_tag(orig_pair.first, *orig_pair.second, sstr); - TS_ASSERT(sstr); - - //Read from stream in Big Endian and compare - auto written_pair = io::read_compound(sstr); - TS_ASSERT_EQUALS(orig_pair.first, written_pair.first); - TS_ASSERT(*orig_pair.second == *written_pair.second); - - sstr.str(""); //Reset and reuse stream - //Write into stream in Little Endian - io::write_tag(orig_pair.first, *orig_pair.second, sstr, endian::little); - TS_ASSERT(sstr); - - //Read from stream in Little Endian and compare - written_pair = io::read_compound(sstr, endian::little); - TS_ASSERT_EQUALS(orig_pair.first, written_pair.first); - TS_ASSERT(*orig_pair.second == *written_pair.second); - } -}; diff --git a/logic/CMakeLists.txt b/logic/CMakeLists.txt index 183c8269a..f16f054ac 100644 --- a/logic/CMakeLists.txt +++ b/logic/CMakeLists.txt @@ -314,6 +314,10 @@ endif() # Add common library add_library(MultiMC_logic SHARED ${LOGIC_SOURCES}) +set_target_properties(MultiMC_logic PROPERTIES + CXX_VISIBILITY_PRESET hidden + VISIBILITY_INLINES_HIDDEN 1) + generate_export_header(MultiMC_logic) # Use system zlib on unix and Qt ZLIB on Windows