2.8.0

Fix annotations shade location in plugin jar
Update License stuff
2026-11-13 20:32:00 -05:00 · 2021-06-11 15:39:27 +02:00 · 2021-06-11 15:21:29 +02:00 · 2021-06-11 15:19:15 +02:00 · 2021-06-11 14:21:52 +02:00 · 2021-06-11 14:14:34 +02:00
42 changed files with 961 additions and 261 deletions
@@ -139,6 +139,7 @@
      "avatar_url": "https://www.spigotmc.org/data/avatars/l/88/88296.jpg?1563463602",
      "profile": "https://www.spigotmc.org/members/lonedev.88296",
      "contributions": [
+        "code",
        "ideas",
        "financial"
      ],
@@ -0,0 +1,14 @@
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: com.github.ekryd.sortpom:sortpom-maven-plugin
+    versions:
+    - 2.13.1
+    - 2.14.0
+    - 2.14.1
+    - 2.15.0
@@ -1,6 +0,0 @@
-language: java
-addons:
-  sonarcloud:
-    organization: "tr7zw-github"
-script:
- - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015 tr7zw
+Copyright (c) 2015 - 2021, tr7zw

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,14 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
@@ -5,16 +5,21 @@ Add custom NBT tags to Items/Tiles/Entities without NMS! Modify NBT and store it
 ### Build/Maven/Sonar Status
 [![Build Status](https://ci.codemc.org/buildStatus/icon?job=Tr7zw%2FItem-NBT-API)](https://ci.codemc.org/job/Tr7zw/job/Item-NBT-API/)[![](https://sonarcloud.io/api/project_badges/measure?project=de.tr7zw%3Aitem-nbt-parent&metric=alert_status)](https://sonarcloud.io/dashboard?id=de.tr7zw%3Aitem-nbt-parent)[![](https://sonarcloud.io/api/project_badges/measure?project=de.tr7zw%3Aitem-nbt-parent&metric=ncloc)](https://sonarcloud.io/dashboard?id=de.tr7zw%3Aitem-nbt-parent)[![](https://sonarcloud.io/api/project_badges/measure?project=de.tr7zw%3Aitem-nbt-parent&metric=duplicated_lines_density)](https://sonarcloud.io/dashboard?id=de.tr7zw%3Aitem-nbt-parent)[![](https://sonarcloud.io/api/project_badges/measure?project=de.tr7zw%3Aitem-nbt-parent&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=de.tr7zw%3Aitem-nbt-parent)
 [![Discord](https://img.shields.io/discord/342814924310970398?color=%237289DA&label=Discord&logo=discord&logoColor=white)](https://discordapp.com/invite/yk4caxM)
-[![Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.herokuapp.com%2Ftr7zw%2Fpledges&style=for-the-badge)](https://www.patreon.com/tr7zw)
+[![Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dtr7zw%26type%3Dpatrons&style=for-the-badge)](https://www.patreon.com/tr7zw)

 ### SpigotMC Status
 [![Version](https://badges.spiget.org/resources/version/Version-yellow-7939.svg)](https://www.spigotmc.org/resources/item-entity-tile-nbt-api.7939/)[![Rating](https://badges.spiget.org/resources/rating/Rating-yellow-7939.svg)](https://www.spigotmc.org/resources/item-entity-tile-nbt-api.7939/)[![Rating](https://badges.spiget.org/resources/downloads/SpigotDownloads-yellow-7939.svg)](https://www.spigotmc.org/resources/item-entity-tile-nbt-api.7939/)[![bStats Servers](https://img.shields.io/bstats/servers/1058.svg?color=green&label=OnlineServers&style=plastic)](https://bstats.org/plugin/bukkit/ItemNBTAPI)[![bStats Players](https://img.shields.io/bstats/players/1058.svg?color=green&label=OnlinePlayers&style=plastic)](https://bstats.org/plugin/bukkit/ItemNBTAPI)[![All Contributors](https://img.shields.io/badge/all_contributors-13-green.svg?style=plastic)](#contributors-%e2%9c%a8)

-[![bStats Stats](https://bstats.org/signatures/bukkit/ItemNBTAPI.svg)](https://bstats.org/plugin/bukkit/ItemNBTAPI)
-
 ## Getting started
 Import the API [using Maven](https://github.com/tr7zw/Item-NBT-API/wiki/Using-Maven), then check out the [basic usage](https://github.com/tr7zw/Item-NBT-API/wiki/Using-the-NBT-API) or code examples like [working with Skulls](https://github.com/tr7zw/Item-NBT-API/wiki/Set-a-skull's-skin-using-NBT-API).

+### bStats
+
+[![bStats Stats](https://bstats.org/signatures/bukkit/ItemNBTAPI.svg)](https://bstats.org/plugin/bukkit/ItemNBTAPI)
+
+### Github Stargazers
+<img src="https://starchart.cc/tr7zw/Item-NBT-API.svg" alt="stargazers" width="800"/>
+
 ## Contributors ✨

 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -36,7 +41,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
    <td align="center"><a href="https://github.com/MrDienns"><img src="https://avatars3.githubusercontent.com/u/15938901?s=460&v=4" width="100px;" alt=""/><br /><sub><b>Dennis van der Veeke</b></sub></a><br /><a href="https://tr7zw.dev/donate/" title="Financial Support">💵</a></td>
    <td align="center"><a href="https://github.com/iGabyTM"><img src="https://avatars2.githubusercontent.com/u/32105478?s=460&v=4" width="100px;" alt=""/><br /><sub><b>Gabriel Dumitru</b></sub></a><br /><a href="#discord-iGabyTM" title="Discord help">🤝</a></td>
    <td align="center"><a href="https://github.com/TauCubed"><img src="https://avatars0.githubusercontent.com/u/35522873?s=460&v=4" width="100px;" alt=""/><br /><sub><b>TauCubed</b></sub></a><br /><a href="#discord-TauCubed" title="Discord help">🤝</a></td>
-    <td align="center"><a href="https://www.spigotmc.org/members/lonedev.88296"><img src="https://www.spigotmc.org/data/avatars/l/88/88296.jpg?1563463602" width="100px;" alt=""/><br /><sub><b>LoneDev</b></sub></a><br /><a href="https://www.spigotmc.org/threads/nbt-api.70503/page-7#post-3652832" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://tr7zw.dev/donate/" title="Financial Support">💵</a></td>
+    <td align="center"><a href="https://www.spigotmc.org/members/lonedev.88296"><img src="https://www.spigotmc.org/data/avatars/l/88/88296.jpg?1563463602" width="100px;" alt=""/><br /><sub><b>LoneDev</b></sub></a><br /><a href="https://github.com/tr7zw/Item-NBT-API/commits?author=LoneDev" title="Code">💻</a> <a href="https://www.spigotmc.org/threads/nbt-api.70503/page-7#post-3652832" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://tr7zw.dev/donate/" title="Financial Support">💵</a></td>
    <td align="center"><a href="https://www.spigotmc.org/members/gc.25090"><img src="https://www.spigotmc.org/data/avatars/l/25/25090.jpg?1502396477" width="100px;" alt=""/><br /><sub><b>GC.</b></sub></a><br /><a href="https://tr7zw.dev/donate/" title="Financial Support">💵</a></td>
    <td align="center"><a href="https://www.spigotmc.org/members/peaches_mlg100.194338/"><img src="https://www.spigotmc.org/data/avatars/l/194/194338.jpg?1561235996" width="100px;" alt=""/><br /><sub><b>Peaches_MLG</b></sub></a><br /><a href="https://tr7zw.dev/donate/" title="Financial Support">💵</a></td>
  </tr>
@@ -0,0 +1,17 @@
+# (Item)-NBT-API
+Add custom NBT tags to Items/Tiles/Entities without NMS! Modify NBT and store it Files, other NBT or as String in yaml/json/SQL/Redis.
+[Server Owner/Developer Wiki](https://github.com/tr7zw/Item-NBT-API/wiki)
+
+### Build/Maven/Sonar Status
+[![Build Status](https://github.com/tr7zw/Item-NBT-API/workflows/Java%20CI/badge.svg)](https://ci.codemc.org/job/Tr7zw/job/Item-NBT-API/)[![](https://sonarcloud.io/api/project_badges/measure?project=de.tr7zw%3Aitem-nbt-parent&metric=alert_status)](https://sonarcloud.io/dashboard?id=de.tr7zw%3Aitem-nbt-parent)[![](https://sonarcloud.io/api/project_badges/measure?project=de.tr7zw%3Aitem-nbt-parent&metric=ncloc)](https://sonarcloud.io/dashboard?id=de.tr7zw%3Aitem-nbt-parent)[![](https://sonarcloud.io/api/project_badges/measure?project=de.tr7zw%3Aitem-nbt-parent&metric=duplicated_lines_density)](https://sonarcloud.io/dashboard?id=de.tr7zw%3Aitem-nbt-parent)[![](https://sonarcloud.io/api/project_badges/measure?project=de.tr7zw%3Aitem-nbt-parent&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=de.tr7zw%3Aitem-nbt-parent)
+Discord:[![Discord](https://img.shields.io/discord/342814924310970398?color=%237289DA&label=Discord&logo=discord&logoColor=white)](https://discordapp.com/invite/yk4caxM)
+[![Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dtr7zw%26type%3Dpatrons&style=for-the-badge)](https://www.patreon.com/tr7zw)
+
+### SpigotMC Status
+[![Version](https://badges.spiget.org/resources/version/Version-yellow-7939.svg)](https://www.spigotmc.org/resources/item-entity-tile-nbt-api.7939/)[![Rating](https://badges.spiget.org/resources/rating/Rating-yellow-7939.svg)](https://www.spigotmc.org/resources/item-entity-tile-nbt-api.7939/)[![Rating](https://badges.spiget.org/resources/downloads/SpigotDownloads-yellow-7939.svg)](https://www.spigotmc.org/resources/item-entity-tile-nbt-api.7939/)[![bStats Servers](https://img.shields.io/bstats/servers/1058.svg?color=green&label=OnlineServers&style=plastic)](https://bstats.org/plugin/bukkit/ItemNBTAPI)[![bStats Players](https://img.shields.io/bstats/players/1058.svg?color=green&label=OnlinePlayers&style=plastic)](https://bstats.org/plugin/bukkit/ItemNBTAPI)
+
+## Getting started
+Import the API [using Maven](https://github.com/tr7zw/Item-NBT-API/wiki/Using-Maven), then check out the [basic usage](https://github.com/tr7zw/Item-NBT-API/wiki/Using-the-NBT-API) or code examples like [working with Skulls](https://github.com/tr7zw/Item-NBT-API/wiki/Set-a-skull's-skin-using-NBT-API).
+
+### bStats
+[![bStats Stats](https://bstats.org/signatures/bukkit/ItemNBTAPI.svg)](https://bstats.org/plugin/bukkit/ItemNBTAPI)
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015 tr7zw
+Copyright (c) 2015 - 2021, tr7zw

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,14 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
@@ -1,60 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>

-	<parent>
-		<groupId>de.tr7zw</groupId>
-		<artifactId>item-nbt-parent</artifactId>
-		<version>2.5.0</version>
-	</parent>
+  <parent>
+    <groupId>de.tr7zw</groupId>
+    <artifactId>item-nbt-parent</artifactId>
+    <version>2.8.0</version>
+  </parent>

-	<artifactId>item-nbt-api</artifactId>
-	<packaging>jar</packaging>
+  <artifactId>item-nbt-api</artifactId>
+  <packaging>jar</packaging>

-	<dependencies>
-		<dependency>
-			<groupId>de.tr7zw</groupId>
-			<artifactId>functional-annotations</artifactId>
-			<version>0.1-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>de.tr7zw</groupId>
+      <artifactId>functional-annotations</artifactId>
+      <version>0.1-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>

-	<build>
-		<defaultGoal>clean install javadoc:javadoc</defaultGoal>
-		<resources>
-			<resource>
-				<filtering>true</filtering>
-				<directory>src/main/resources</directory>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.2.4</version>
-				<executions>
-					<execution>
-						<id>shade</id>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<createDependencyReducedPom>false</createDependencyReducedPom>
-					<relocations>
-						<relocation>
-							<pattern>de.tr7zw.annotations</pattern>
-							<shadedPattern>de.tr7zw.changeme.nbtapi.utils.annotations</shadedPattern>
-						</relocation>
-					</relocations>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <defaultGoal>clean install javadoc:javadoc</defaultGoal>
+    <resources>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.4</version>
+        <configuration>
+          <createDependencyReducedPom>false</createDependencyReducedPom>
+          <relocations>
+            <relocation>
+              <pattern>de.tr7zw.annotations</pattern>
+              <shadedPattern>de.tr7zw.changeme.nbtapi.utils.annotations</shadedPattern>
+            </relocation>
+          </relocations>
+          <transformers>
+            <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+              <resource>LICENSE</resource>
+            </transformer>
+          </transformers>
+        </configuration>
+        <executions>
+          <execution>
+            <id>shade</id>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <phase>package</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>

 </project>
@@ -0,0 +1,26 @@
+package de.tr7zw.changeme.nbtapi;
+
+import org.bukkit.block.Block;
+
+import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
+
+public class NBTBlock {
+
+	private final Block block;
+	private final NBTChunk nbtChunk;
+	
+	public NBTBlock(Block block) {
+		this.block = block;
+		if(!MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_16_R3)) {
+			throw new NbtApiException("NBTBlock is only working for 1.16.4+!");
+		}
+		nbtChunk = new NBTChunk(block.getChunk());
+	}
+	
+	
+	public NBTCompound getData() {
+		return nbtChunk.getPersistentDataContainer().getOrCreateCompound("blocks").getOrCreateCompound(block.getX() + "_" + block.getY() + "_" + block.getZ());
+	}
+
+
+}
@@ -0,0 +1,30 @@
+package de.tr7zw.changeme.nbtapi;
+
+import org.bukkit.Chunk;
+
+import de.tr7zw.annotations.FAUtil;
+import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
+import de.tr7zw.changeme.nbtapi.utils.annotations.AvailableSince;
+import de.tr7zw.changeme.nbtapi.utils.annotations.CheckUtil;
+
+public class NBTChunk {
+
+	private final Chunk chunk;
+	
+	public NBTChunk(Chunk chunk) {
+		this.chunk = chunk;
+	}
+	
+	/**
+	 * Gets the NBTCompound used by spigots PersistentDataAPI. This method is only
+	 * available for 1.16.4+!
+	 * 
+	 * @return NBTCompound containing the data of the PersistentDataAPI
+	 */
+	@AvailableSince(version = MinecraftVersion.MC1_16_R3)
+	public NBTCompound getPersistentDataContainer() {
+		FAUtil.check(this::getPersistentDataContainer, CheckUtil::isAvaliable);
+		return new NBTPersistentDataContainer(chunk.getPersistentDataContainer());
+	}
+	
+}
@@ -2,6 +2,8 @@ package de.tr7zw.changeme.nbtapi;

 import java.io.OutputStream;
 import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.locks.Lock;
@@ -544,7 +546,7 @@ public class NBTCompound {
 	}

 	/**
-	 * Creates a subCompound
+	 * Creates a subCompound, or returns it if already provided
 	 * 
 	 * @param name Key to use
 	 * @return The subCompound Object
@@ -582,6 +584,16 @@ public class NBTCompound {
 			readLock.unlock();
 		}
 	}
+	
+	/**
+	 * The same as addCompound, just with a name that better reflects what it does
+	 * 
+	 * @param name
+	 * @return
+	 */
+	public NBTCompound getOrCreateCompound(String name) {
+		return addCompound(name);
+	}

 	/**
 	 * @param name
@@ -657,6 +669,23 @@ public class NBTCompound {
 			writeLock.unlock();
 		}
 	}
+	
+	/**
+	 * Returns the type of the list, null if not a list
+	 * 
+	 * @param name
+	 * @return
+	 */
+	public NBTType getListType(String name) {
+		try {
+			readLock.lock();
+			if (getType(name) != NBTType.NBTTagList)
+				return null;
+			return NBTReflectionUtil.getListType(this, name);
+		} finally {
+			readLock.unlock();
+		}
+	}

 	/**
 	 * @param name
@@ -754,8 +783,7 @@ public class NBTCompound {
 	}

 	/**
-	 * Uses the nbt-string to match this compound with another object. This allows
-	 * two "technically" different Compounds to match, if they have the same content
+	 * Does a deep compare to check if everything is the same
 	 */
 	@Override
 	public boolean equals(Object obj) {
@@ -763,7 +791,49 @@ public class NBTCompound {
 			return true;
 		if (obj == null)
 			return false;
-		return toString().equals(obj.toString());
+		if(obj instanceof NBTCompound) {
+			NBTCompound other = (NBTCompound) obj;
+			if(getKeys().equals(other.getKeys())) {
+				for(String key : getKeys()) {
+					if(!isEqual(this, other, key)) {
+						return false;
+					}
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	protected static boolean isEqual(NBTCompound compA, NBTCompound compB, String key) {
+		if(compA.getType(key) != compB.getType(key))return false;
+		switch(compA.getType(key)) {
+		case NBTTagByte:
+			return compA.getByte(key).equals(compB.getByte(key));
+		case NBTTagByteArray:
+			return Arrays.equals(compA.getByteArray(key), compB.getByteArray(key));
+		case NBTTagCompound:
+			return compA.getCompound(key).equals(compB.getCompound(key));
+		case NBTTagDouble:
+			return compA.getDouble(key).equals(compB.getDouble(key));
+		case NBTTagEnd:
+			return true; //??
+		case NBTTagFloat:
+			return compA.getFloat(key).equals(compB.getFloat(key));
+		case NBTTagInt:
+			return compA.getInteger(key).equals(compB.getInteger(key));
+		case NBTTagIntArray:
+			return Arrays.equals(compA.getIntArray(key), compB.getIntArray(key));
+		case NBTTagList:
+			return NBTReflectionUtil.getEntry(compA, key).toString().equals(NBTReflectionUtil.getEntry(compB, key).toString()); // Just string compare the 2 lists
+		case NBTTagLong:
+			return compA.getLong(key).equals(compB.getLong(key));
+		case NBTTagShort:
+			return compA.getShort(key).equals(compB.getShort(key));
+		case NBTTagString:
+			return compA.getString(key).equals(compB.getString(key));
+		}
+		return false;
 	}

 }
@@ -4,7 +4,7 @@ import org.bukkit.entity.Entity;

 import de.tr7zw.annotations.FAUtil;
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
-import de.tr7zw.changeme.nbtapi.utils.annotations.AvaliableSince;
+import de.tr7zw.changeme.nbtapi.utils.annotations.AvailableSince;
 import de.tr7zw.changeme.nbtapi.utils.annotations.CheckUtil;

 /**
@@ -46,18 +46,10 @@ public class NBTEntity extends NBTCompound {
 	 * 
 	 * @return NBTCompound containing the data of the PersistentDataAPI
 	 */
-	@AvaliableSince(version = MinecraftVersion.MC1_14_R1)
+	@AvailableSince(version = MinecraftVersion.MC1_14_R1)
 	public NBTCompound getPersistentDataContainer() {
 		FAUtil.check(this::getPersistentDataContainer, CheckUtil::isAvaliable);
-		if (hasKey("BukkitValues")) {
-			return getCompound("BukkitValues");
-		} else {
-			NBTContainer container = new NBTContainer();
-			container.addCompound("BukkitValues").setString("__nbtapi",
-					"Marker to make the PersistentDataContainer have content");
-			mergeCompound(container);
-			return getCompound("BukkitValues");
-		}
+		return new NBTPersistentDataContainer(ent.getPersistentDataContainer());
 	}

 }
@@ -0,0 +1,31 @@
+package de.tr7zw.changeme.nbtapi;
+
+import java.util.Map;
+
+import org.bukkit.persistence.PersistentDataContainer;
+
+import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
+
+public class NBTPersistentDataContainer extends NBTCompound {
+
+	private final PersistentDataContainer container;
+	
+	protected NBTPersistentDataContainer(PersistentDataContainer container) {
+		super(null, null);
+		this.container = container;
+	}
+
+	@Override
+	public Object getCompound() {
+		return ReflectionMethod.CRAFT_PERSISTENT_DATA_CONTAINER_TO_TAG.run(container);
+	}
+
+	@Override
+	protected void setCompound(Object compound) {
+		@SuppressWarnings("unchecked")
+		Map<Object, Object> map = (Map<Object, Object>) ReflectionMethod.CRAFT_PERSISTENT_DATA_CONTAINER_GET_MAP.run(container);
+		map.clear();
+		ReflectionMethod.CRAFT_PERSISTENT_DATA_CONTAINER_PUT_ALL.run(container, compound);
+	}
+	
+}
@@ -253,9 +253,11 @@ public class NBTReflectionUtil {
 				Object pos = ObjectCreator.NMS_BLOCKPOSITION.getInstance(tile.getX(), tile.getY(), tile.getZ());
 				o = ReflectionMethod.NMS_WORLD_GET_TILEENTITY.run(nmsworld, pos);
 			}
-			if(MinecraftVersion.getVersion().getVersionId() >= MinecraftVersion.MC1_16_R1.getVersionId()) {
+			if(MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_17_R1)) {
+			    ReflectionMethod.TILEENTITY_SET_NBT.run(o, comp);
+			}else if(MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_16_R1)) {
 				Object blockData = ReflectionMethod.TILEENTITY_GET_BLOCKDATA.run(o);
-				ReflectionMethod.TILEENTITY_SET_NBT.run(o, blockData, comp);
+				ReflectionMethod.TILEENTITY_SET_NBT_LEGACY1161.run(o, blockData, comp);
 			}else {
 				ReflectionMethod.TILEENTITY_SET_NBT_LEGACY1151.run(o, comp);
 			}
@@ -459,6 +461,44 @@ public class NBTReflectionUtil {
 			throw new NbtApiException("Exception while getting a list with the type '" + type + "'!", ex);
 		}
 	}
+	
+	public static NBTType getListType(NBTCompound comp, String key) {
+		Object rootnbttag = comp.getCompound();
+		if (rootnbttag == null) {
+			rootnbttag = ObjectCreator.NMS_NBTTAGCOMPOUND.getInstance();
+		}
+		if (!valideCompound(comp))
+			return null;
+		Object workingtag = gettoCompount(rootnbttag, comp);
+		try {
+			Object nbt = ReflectionMethod.COMPOUND_GET.run(workingtag, key);
+			String fieldname = "type";
+			if(MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_17_R1)) {
+			    fieldname = "w";
+			}
+			Field f = nbt.getClass().getDeclaredField(fieldname);
+			f.setAccessible(true);
+			return NBTType.valueOf(f.getByte(nbt));
+		} catch (Exception ex) {
+			throw new NbtApiException("Exception while getting the list type!", ex);
+		}
+	}
+	
+	public static Object getEntry(NBTCompound comp, String key) {
+		Object rootnbttag = comp.getCompound();
+		if (rootnbttag == null) {
+			rootnbttag = ObjectCreator.NMS_NBTTAGCOMPOUND.getInstance();
+		}
+		if (!valideCompound(comp))
+			return null;
+		Object workingtag = gettoCompount(rootnbttag, comp);
+		try {
+			Object nbt = ReflectionMethod.COMPOUND_GET.run(workingtag, key);
+			return nbt;
+		} catch (Exception ex) {
+			throw new NbtApiException("Exception while getting an Entry!", ex);
+		}
+	}

 	/**
 	 * Uses Gson to set a {@link Serializable} value in a Compound
@@ -4,7 +4,7 @@ import org.bukkit.block.BlockState;

 import de.tr7zw.annotations.FAUtil;
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
-import de.tr7zw.changeme.nbtapi.utils.annotations.AvaliableSince;
+import de.tr7zw.changeme.nbtapi.utils.annotations.AvailableSince;
 import de.tr7zw.changeme.nbtapi.utils.annotations.CheckUtil;

 /**
@@ -47,7 +47,7 @@ public class NBTTileEntity extends NBTCompound {
 	 * 
 	 * @return NBTCompound containing the data of the PersistentDataAPI
 	 */
-	@AvaliableSince(version = MinecraftVersion.MC1_14_R1)
+	@AvailableSince(version = MinecraftVersion.MC1_14_R1)
 	public NBTCompound getPersistentDataContainer() {
 		FAUtil.check(this::getPersistentDataContainer, CheckUtil::isAvaliable);
 		if (hasKey("PublicBukkitValues")) {
@@ -22,7 +22,8 @@ import java.util.TimerTask;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.zip.GZIPOutputStream;
-import static de.tr7zw.changeme.nbtapi.utils.MinecraftVersion.logger;
+
+import static de.tr7zw.changeme.nbtapi.utils.MinecraftVersion.getLogger;

 /**
 * bStats collects some data for plugin authors.
@@ -135,7 +136,7 @@ public class ApiMetricsLite {
 			if(Bukkit.isPrimaryThread()){
 				Bukkit.getServicesManager().register(ApiMetricsLite.class, this, plugin, ServicePriority.Normal);
 				if (!fFound) {
-					logger.info("[NBTAPI] Using the plugin '" + plugin.getName() + "' to create a bStats instance!");
+					getLogger().info("[NBTAPI] Using the plugin '" + plugin.getName() + "' to create a bStats instance!");
 					// We are the first!
 					startSubmitting();
 				}
@@ -143,7 +144,7 @@ public class ApiMetricsLite {
 				Bukkit.getScheduler().runTask(plugin, () -> {
 					Bukkit.getServicesManager().register(ApiMetricsLite.class, this, plugin, ServicePriority.Normal);
 					if (!fFound) {
-						logger.info("[NBTAPI] Using the plugin '" + plugin.getName() + "' to create a bStats instance!");
+						getLogger().info("[NBTAPI] Using the plugin '" + plugin.getName() + "' to create a bStats instance!");
 						// We are the first!
 						startSubmitting();
 					}
@@ -276,7 +277,7 @@ public class ApiMetricsLite {
 							} catch (ClassNotFoundException e) {
 								// minecraft version 1.14+
 								if (logFailedRequests) {
-									logger.log(Level.WARNING, "[NBTAPI][BSTATS] Encountered exception while posting request!", e);
+									getLogger().log(Level.WARNING, "[NBTAPI][BSTATS] Encountered exception while posting request!", e);
 									// Not using the plugins logger since the plugin isn't the plugin containing the NBT-Api most of the time
 									//this.plugin.getLogger().log(Level.SEVERE, "Encountered unexpected exception ", e); 
 								}
@@ -301,7 +302,7 @@ public class ApiMetricsLite {
 				} catch (Exception e) {
 					// Something went wrong! :(
 					if (logFailedRequests) {
-						logger.log(Level.WARNING, "[NBTAPI][BSTATS] Could not submit plugin stats of " + plugin.getName(), e);
+						getLogger().log(Level.WARNING, "[NBTAPI][BSTATS] Could not submit plugin stats of " + plugin.getName(), e);
 						// Not using the plugins logger since the plugin isn't the plugin containing the NBT-Api most of the time
 						//plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
 					}
@@ -360,7 +361,7 @@ public class ApiMetricsLite {
 		}
 		bufferedReader.close();
 		if (logResponseStatusText) {
-			logger.info("[NBTAPI][BSTATS] Sent data to bStats and received response: " + builder.toString());
+			getLogger().info("[NBTAPI][BSTATS] Sent data to bStats and received response: " + builder.toString());
 			// Not using the plugins logger since the plugin isn't the plugin containing the NBT-Api most of the time
 			//plugin.getLogger().info("Sent data to bStats and received response: " + builder.toString());
 		}
@@ -17,7 +17,7 @@ import org.bukkit.Bukkit;
 public enum MinecraftVersion {
 	UNKNOWN(Integer.MAX_VALUE), // Use the newest known mappings
 	MC1_7_R4(174), MC1_8_R3(183), MC1_9_R1(191), MC1_9_R2(192), MC1_10_R1(1101), MC1_11_R1(1111), MC1_12_R1(1121),
-	MC1_13_R1(1131), MC1_13_R2(1132), MC1_14_R1(1141), MC1_15_R1(1151), MC1_16_R1(1161), MC1_16_R2(1162);
+	MC1_13_R1(1131), MC1_13_R2(1132), MC1_14_R1(1141), MC1_15_R1(1151), MC1_16_R1(1161), MC1_16_R2(1162), MC1_16_R3(1163), MC1_17_R1(1171);

 	private static MinecraftVersion version;
 	private static Boolean hasGsonSupport;
@@ -27,10 +27,10 @@ public enum MinecraftVersion {
 	/**
 	 * Logger used by the api
 	 */
-	public static final Logger logger = Logger.getLogger("NBTAPI");
+	private static Logger logger = Logger.getLogger("NBTAPI");

 	// NBT-API Version
-	protected static final String VERSION = "2.5.0";
+	protected static final String VERSION = "2.8.0";

 	private final int versionId;

@@ -54,6 +54,16 @@ public enum MinecraftVersion {
 	public static boolean isAtLeastVersion(MinecraftVersion version) {
 		return getVersion().getVersionId() >= version.getVersionId();
 	}
+	
+	/**
+	 * Returns true if the current versions newer (not equal) than the given version
+	 * 
+	 * @param version The minimum version
+	 * @return
+	 */
+	public static boolean isNewerThan(MinecraftVersion version) {
+		return getVersion().getVersionId() > version.getVersionId();
+	}

 	/**
 	 * Getter for this servers MinecraftVersion. Also init's bStats and checks the
@@ -159,5 +169,22 @@ public enum MinecraftVersion {
 	public static void disablePackageWarning() {
 		disablePackageWarning = true;
 	}
+	
+	/**
+	 * @return Logger used by the NBT-API
+	 */
+	public static Logger getLogger() {
+		return logger;
+	}
+	
+	/**
+	 * Replaces the NBT-API logger with a custom implementation.
+	 * 
+	 * @param logger The new logger(can not be null!)
+	 */
+	public static void replaceLogger(Logger logger) {
+		if(logger == null)throw new NullPointerException("Logger can not be null!");
+		MinecraftVersion.logger = logger;
+	}

 }
@@ -42,24 +42,24 @@ public class VersionChecker {
 			JsonObject latest = (JsonObject) updates.get(updates.size() - 1);
 			int versionDifference = getVersionDifference(latest.get("name").getAsString());
 			if (versionDifference == -1) { // Outdated
-				MinecraftVersion.logger.log(Level.WARNING,
+				MinecraftVersion.getLogger().log(Level.WARNING,
 						"[NBTAPI] The NBT-API at '" + NBTItem.class.getPackage() + "' seems to be outdated!");
-				MinecraftVersion.logger.log(Level.WARNING, "[NBTAPI] Current Version: '" + MinecraftVersion.VERSION
+				MinecraftVersion.getLogger().log(Level.WARNING, "[NBTAPI] Current Version: '" + MinecraftVersion.VERSION
 						+ "' Newest Version: " + latest.get("name").getAsString() + "'");
-				MinecraftVersion.logger.log(Level.WARNING,
+				MinecraftVersion.getLogger().log(Level.WARNING,
 						"[NBTAPI] Please update the nbt-api or the plugin that contains the api!");

 			} else if (versionDifference == 0) {
-				MinecraftVersion.logger.log(Level.INFO, "[NBTAPI] The NBT-API seems to be up-to-date!");
+				MinecraftVersion.getLogger().log(Level.INFO, "[NBTAPI] The NBT-API seems to be up-to-date!");
 			} else if (versionDifference == 1) {
-				MinecraftVersion.logger.log(Level.WARNING, "[NBTAPI] The NBT-API at '" + NBTItem.class.getPackage()
-						+ "' seems to be a future Version, not yet released on Spigot!");
-				MinecraftVersion.logger.log(Level.WARNING, "[NBTAPI] Current Version: '" + MinecraftVersion.VERSION
+				MinecraftVersion.getLogger().log(Level.WARNING, "[NBTAPI] The NBT-API at '" + NBTItem.class.getPackage()
+						+ "' seems to be a future Version, not yet released on Spigot/CurseForge!");
+				MinecraftVersion.getLogger().log(Level.WARNING, "[NBTAPI] Current Version: '" + MinecraftVersion.VERSION
 						+ "' Newest Version: " + latest.get("name").getAsString() + "'");
 			}
 		} else {
 			// wut?!
-			MinecraftVersion.logger.log(Level.WARNING,
+			MinecraftVersion.getLogger().log(Level.WARNING,
 					"[NBTAPI] Error when looking for Updates! Got non Json Array: '" + element.toString() + "'");
 		}
 	}
@@ -10,7 +10,7 @@ import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;

@Retention(RUNTIME)
@Target({ METHOD })
-public @interface AvaliableSince {
+public @interface AvailableSince {

 	MinecraftVersion version();

@@ -8,8 +8,8 @@ import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
 public class CheckUtil {

 	public static boolean isAvaliable(Method method) {
-		if(MinecraftVersion.getVersion().getVersionId() < method.getAnnotation(AvaliableSince.class).version().getVersionId())
-			throw new NbtApiException("The Method '" + method.getName() + "' is only avaliable for the Versions " + method.getAnnotation(AvaliableSince.class).version() + "+, but still got called!");
+		if(MinecraftVersion.getVersion().getVersionId() < method.getAnnotation(AvailableSince.class).version().getVersionId())
+			throw new NbtApiException("The Method '" + method.getName() + "' is only avaliable for the Versions " + method.getAnnotation(AvailableSince.class).version() + "+, but still got called!");
 		return true;
 	}
 	
@@ -4,7 +4,7 @@ import java.util.logging.Level;
 import org.bukkit.Bukkit;

 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
-import static de.tr7zw.changeme.nbtapi.utils.MinecraftVersion.logger;
+import static de.tr7zw.changeme.nbtapi.utils.MinecraftVersion.getLogger;

 /**
 * Wraps NMS and CRAFT classes
@@ -14,84 +14,81 @@ import static de.tr7zw.changeme.nbtapi.utils.MinecraftVersion.logger;
 */
@SuppressWarnings("javadoc")
 public enum ClassWrapper {
-CRAFT_ITEMSTACK(PackageWrapper.CRAFTBUKKIT, "inventory.CraftItemStack"),
-CRAFT_METAITEM(PackageWrapper.CRAFTBUKKIT, "inventory.CraftMetaItem"),
-CRAFT_ENTITY(PackageWrapper.CRAFTBUKKIT, "entity.CraftEntity"),
-CRAFT_WORLD(PackageWrapper.CRAFTBUKKIT, "CraftWorld"),
-NMS_NBTBASE(PackageWrapper.NMS, "NBTBase"),
-NMS_NBTTAGSTRING(PackageWrapper.NMS, "NBTTagString"),
-NMS_NBTTAGINT(PackageWrapper.NMS, "NBTTagInt"),
-NMS_NBTTAGFLOAT(PackageWrapper.NMS, "NBTTagFloat"),
-NMS_NBTTAGDOUBLE(PackageWrapper.NMS, "NBTTagDouble"),
-NMS_NBTTAGLONG(PackageWrapper.NMS, "NBTTagLong"),
-NMS_ITEMSTACK(PackageWrapper.NMS, "ItemStack"),
-NMS_NBTTAGCOMPOUND(PackageWrapper.NMS, "NBTTagCompound"),
-NMS_NBTTAGLIST(PackageWrapper.NMS, "NBTTagList"),
-NMS_NBTCOMPRESSEDSTREAMTOOLS(PackageWrapper.NMS, "NBTCompressedStreamTools"),
-NMS_MOJANGSONPARSER(PackageWrapper.NMS, "MojangsonParser"),
-NMS_TILEENTITY(PackageWrapper.NMS, "TileEntity"),
-NMS_BLOCKPOSITION(PackageWrapper.NMS, "BlockPosition", MinecraftVersion.MC1_8_R3, null),
-NMS_WORLDSERVER(PackageWrapper.NMS, "WorldServer"),
-NMS_MINECRAFTSERVER(PackageWrapper.NMS, "MinecraftServer"),
-NMS_WORLD(PackageWrapper.NMS, "World"),
-NMS_ENTITY(PackageWrapper.NMS, "Entity"),
-NMS_ENTITYTYPES(PackageWrapper.NMS, "EntityTypes"),
-NMS_REGISTRYSIMPLE(PackageWrapper.NMS, "RegistrySimple", MinecraftVersion.MC1_11_R1, MinecraftVersion.MC1_12_R1),
-NMS_REGISTRYMATERIALS(PackageWrapper.NMS, "RegistryMaterials"),
-NMS_IREGISTRY(PackageWrapper.NMS, "IRegistry"),
-NMS_MINECRAFTKEY(PackageWrapper.NMS, "MinecraftKey", MinecraftVersion.MC1_8_R3, null),
-NMS_GAMEPROFILESERIALIZER(PackageWrapper.NMS, "GameProfileSerializer"),
-NMS_IBLOCKDATA(PackageWrapper.NMS, "IBlockData", MinecraftVersion.MC1_8_R3, null),
-GAMEPROFILE("com.mojang.authlib.GameProfile", MinecraftVersion.MC1_8_R3)
-;
-	
+    CRAFT_ITEMSTACK(PackageWrapper.CRAFTBUKKIT, "inventory.CraftItemStack", null, null),
+    CRAFT_METAITEM(PackageWrapper.CRAFTBUKKIT, "inventory.CraftMetaItem", null, null),
+    CRAFT_ENTITY(PackageWrapper.CRAFTBUKKIT, "entity.CraftEntity", null, null),
+    CRAFT_WORLD(PackageWrapper.CRAFTBUKKIT, "CraftWorld", null, null),
+    CRAFT_PERSISTENTDATACONTAINER(PackageWrapper.CRAFTBUKKIT, "persistence.CraftPersistentDataContainer",
+            MinecraftVersion.MC1_14_R1, null),
+    NMS_NBTBASE(PackageWrapper.NMS, "NBTBase", null, null, "net.minecraft.nbt"),
+    NMS_NBTTAGSTRING(PackageWrapper.NMS, "NBTTagString", null, null, "net.minecraft.nbt"),
+    NMS_NBTTAGINT(PackageWrapper.NMS, "NBTTagInt", null, null, "net.minecraft.nbt"),
+    NMS_NBTTAGFLOAT(PackageWrapper.NMS, "NBTTagFloat", null, null, "net.minecraft.nbt"),
+    NMS_NBTTAGDOUBLE(PackageWrapper.NMS, "NBTTagDouble", null, null, "net.minecraft.nbt"),
+    NMS_NBTTAGLONG(PackageWrapper.NMS, "NBTTagLong", null, null, "net.minecraft.nbt"),
+    NMS_ITEMSTACK(PackageWrapper.NMS, "ItemStack", null, null, "net.minecraft.world.item"),
+    NMS_NBTTAGCOMPOUND(PackageWrapper.NMS, "NBTTagCompound", null, null, "net.minecraft.nbt"),
+    NMS_NBTTAGLIST(PackageWrapper.NMS, "NBTTagList", null, null, "net.minecraft.nbt"),
+    NMS_NBTCOMPRESSEDSTREAMTOOLS(PackageWrapper.NMS, "NBTCompressedStreamTools", null, null, "net.minecraft.nbt"),
+    NMS_MOJANGSONPARSER(PackageWrapper.NMS, "MojangsonParser", null, null, "net.minecraft.nbt"),
+    NMS_TILEENTITY(PackageWrapper.NMS, "TileEntity", null, null, "net.minecraft.world.level.block.entity"),
+    NMS_BLOCKPOSITION(PackageWrapper.NMS, "BlockPosition", MinecraftVersion.MC1_8_R3, null, "net.minecraft.core"),
+    NMS_WORLDSERVER(PackageWrapper.NMS, "WorldServer", null, null, "net.minecraft.server.level"),
+    NMS_MINECRAFTSERVER(PackageWrapper.NMS, "MinecraftServer", null, null, "net.minecraft.server"),
+    NMS_WORLD(PackageWrapper.NMS, "World", null, null, "net.minecraft.world.level"),
+    NMS_ENTITY(PackageWrapper.NMS, "Entity", null, null, "net.minecraft.world.entity"),
+    NMS_ENTITYTYPES(PackageWrapper.NMS, "EntityTypes", null, null, "net.minecraft.world.entity"),
+    NMS_REGISTRYSIMPLE(PackageWrapper.NMS, "RegistrySimple", MinecraftVersion.MC1_11_R1, MinecraftVersion.MC1_12_R1),
+    NMS_REGISTRYMATERIALS(PackageWrapper.NMS, "RegistryMaterials", null, null, "net.minecraft.core"),
+    NMS_IREGISTRY(PackageWrapper.NMS, "IRegistry", null, null, "net.minecraft.core"),
+    NMS_MINECRAFTKEY(PackageWrapper.NMS, "MinecraftKey", MinecraftVersion.MC1_8_R3, null, "net.minecraft.resources"),
+    NMS_GAMEPROFILESERIALIZER(PackageWrapper.NMS, "GameProfileSerializer", null, null, "net.minecraft.nbt"),
+    NMS_IBLOCKDATA(PackageWrapper.NMS, "IBlockData", MinecraftVersion.MC1_8_R3, null,
+            "net.minecraft.world.level.block.state"),
+    GAMEPROFILE(PackageWrapper.NONE, "com.mojang.authlib.GameProfile", MinecraftVersion.MC1_8_R3, null);
+
    private Class<?> clazz;
    private boolean enabled = false;
-    
-    ClassWrapper(PackageWrapper packageId, String suffix){
-    	this(packageId, suffix, null, null);
+
+    ClassWrapper(PackageWrapper packageId, String clazzName, MinecraftVersion from, MinecraftVersion to) {
+        this(packageId, clazzName, from, to, null);
    }
-    
-    ClassWrapper(PackageWrapper packageId, String suffix, MinecraftVersion from, MinecraftVersion to){
-    	if(from != null && MinecraftVersion.getVersion().getVersionId() < from.getVersionId()) {
-    		return;
-    	}
-    	if(to != null && MinecraftVersion.getVersion().getVersionId() > to.getVersionId()) {
-    		return;
-    	}
-    	enabled = true;
-        try{
-            String version = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
-            clazz = Class.forName(packageId.getUri() + "." + version + "." + suffix);
-        }catch(Exception ex){
-            logger.log(Level.WARNING, "[NBTAPI] Error while trying to resolve the class '" + suffix + "'!", ex);
+
+    ClassWrapper(PackageWrapper packageId, String clazzName, MinecraftVersion from, MinecraftVersion to,
+            String mojangMap) {
+        if (from != null && MinecraftVersion.getVersion().getVersionId() < from.getVersionId()) {
+            return;
+        }
+        if (to != null && MinecraftVersion.getVersion().getVersionId() > to.getVersionId()) {
+            return;
+        }
+        enabled = true;
+        try {
+            if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_17_R1) && mojangMap != null) {
+                clazz = Class.forName(mojangMap + "." + clazzName);
+            } else if (packageId == PackageWrapper.NONE) {
+                clazz = Class.forName(clazzName);
+            } else {
+                String version = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
+                clazz = Class.forName(packageId.getUri() + "." + version + "." + clazzName);
+            }
+        } catch (Exception ex) {
+            getLogger().log(Level.WARNING, "[NBTAPI] Error while trying to resolve the class '" + clazzName + "'!", ex);
        }
    }
-    
-    ClassWrapper(String path, MinecraftVersion from){
-    	if(from != null && MinecraftVersion.getVersion().getVersionId() < from.getVersionId()) {
-    		return;
-    	}
-    	enabled = true;
-        try{
-            clazz = Class.forName(path);
-        }catch(Exception ex){
-            logger.log(Level.WARNING, "[NBTAPI] Error while trying to resolve the class '" + path + "'!", ex);
-        }
-    }
-    
+
    /**
     * @return The wrapped class
     */
-    public Class<?> getClazz(){
+    public Class<?> getClazz() {
        return clazz;
    }
-    
+
    /**
     * @return Is this class available in this Version
     */
    public boolean isEnabled() {
-    	return enabled;
+        return enabled;
    }
-    
+
 }
@@ -6,7 +6,7 @@ import java.util.logging.Level;
 import de.tr7zw.changeme.nbtapi.NbtApiException;
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;

-import static de.tr7zw.changeme.nbtapi.utils.MinecraftVersion.logger;
+import static de.tr7zw.changeme.nbtapi.utils.MinecraftVersion.getLogger;

 /**
 * This Enum wraps Constructors for NMS classes
@@ -35,7 +35,7 @@ public enum ObjectCreator {
 			construct = clazz.getDeclaredConstructor(args);
 			construct.setAccessible(true);
 		} catch (Exception ex) {
-			logger.log(Level.SEVERE, "Unable to find the constructor for the class '" + clazz.getName() + "'", ex);
+			getLogger().log(Level.SEVERE, "Unable to find the constructor for the class '" + clazz.getName() + "'", ex);
 		}
 	}

@@ -10,6 +10,7 @@ package de.tr7zw.changeme.nbtapi.utils.nmsmappings;
 public enum PackageWrapper {
 	NMS(new String(new byte[] {'n', 'e', 't', '.', 'm', 'i', 'n', 'e', 'c', 'r', 'a', 'f', 't', '.', 's', 'e', 'r', 'v', 'e', 'r'})),
 	CRAFTBUKKIT(new String(new byte[] {'o', 'r', 'g', '.', 'b', 'u', 'k', 'k', 'i', 't', '.', 'c', 'r', 'a', 'f', 't', 'b', 'u', 'k', 'k', 'i', 't'})),
+	NONE("")
 	;
 	
 	private final String uri;
@@ -74,7 +74,7 @@ public enum ReflectionMethod {

    CRAFT_WORLD_GET_HANDLE(ClassWrapper.CRAFT_WORLD.getClazz(), new Class[]{}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getHandle")),
    NMS_WORLD_GET_TILEENTITY(ClassWrapper.NMS_WORLDSERVER.getClazz(), new Class[]{ClassWrapper.NMS_BLOCKPOSITION.getClazz()}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "getTileEntity")),
-    NMS_WORLD_SET_TILEENTITY(ClassWrapper.NMS_WORLDSERVER.getClazz(), new Class[]{ClassWrapper.NMS_BLOCKPOSITION.getClazz(), ClassWrapper.NMS_TILEENTITY.getClazz()}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "setTileEntity")),
+    NMS_WORLD_SET_TILEENTITY(ClassWrapper.NMS_WORLDSERVER.getClazz(), new Class[]{ClassWrapper.NMS_BLOCKPOSITION.getClazz(), ClassWrapper.NMS_TILEENTITY.getClazz()}, MinecraftVersion.MC1_8_R3, MinecraftVersion.MC1_16_R3, new Since(MinecraftVersion.MC1_8_R3, "setTileEntity")),
    NMS_WORLD_REMOVE_TILEENTITY(ClassWrapper.NMS_WORLDSERVER.getClazz(), new Class[]{ClassWrapper.NMS_BLOCKPOSITION.getClazz()}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "t"), new Since(MinecraftVersion.MC1_9_R1, "s"), new Since(MinecraftVersion.MC1_13_R1, "n"),  new Since(MinecraftVersion.MC1_14_R1, "removeTileEntity")),

    NMS_WORLD_GET_TILEENTITY_1_7_10(ClassWrapper.NMS_WORLDSERVER.getClazz(), new Class[]{int.class, int.class, int.class}, MinecraftVersion.MC1_7_R4, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getTileEntity")),
@@ -83,11 +83,12 @@ public enum ReflectionMethod {
    TILEENTITY_LOAD_LEGACY183(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_8_R3, MinecraftVersion.MC1_9_R2, new Since(MinecraftVersion.MC1_8_R3, "c"), new Since(MinecraftVersion.MC1_9_R1, "a"), new Since(MinecraftVersion.MC1_9_R2, "c")), //FIXME: No Spigot mapping!
    TILEENTITY_LOAD_LEGACY1121(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_WORLD.getClazz(), ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_10_R1, MinecraftVersion.MC1_12_R1, new Since(MinecraftVersion.MC1_10_R1, "a"), new Since(MinecraftVersion.MC1_12_R1, "create")),
    TILEENTITY_LOAD_LEGACY1151(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_13_R1, MinecraftVersion.MC1_15_R1, new Since(MinecraftVersion.MC1_12_R1, "create")),
-    TILEENTITY_LOAD(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_IBLOCKDATA.getClazz(), ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_16_R1, new Since(MinecraftVersion.MC1_16_R1, "create")),
+    TILEENTITY_LOAD(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_IBLOCKDATA.getClazz(), ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_16_R1, MinecraftVersion.MC1_16_R3, new Since(MinecraftVersion.MC1_16_R1, "create")),
 	
    TILEENTITY_GET_NBT(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "b"), new Since(MinecraftVersion.MC1_9_R1, "save")),
    TILEENTITY_SET_NBT_LEGACY1151(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_7_R4, MinecraftVersion.MC1_15_R1, new Since(MinecraftVersion.MC1_7_R4, "a"), new Since(MinecraftVersion.MC1_12_R1, "load")),
-    TILEENTITY_SET_NBT(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_IBLOCKDATA.getClazz(), ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_16_R1, new Since(MinecraftVersion.MC1_16_R1, "load")),
+    TILEENTITY_SET_NBT_LEGACY1161(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_IBLOCKDATA.getClazz(), ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_16_R1, MinecraftVersion.MC1_16_R3, new Since(MinecraftVersion.MC1_16_R1, "load")),
+    TILEENTITY_SET_NBT(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_17_R1, new Since(MinecraftVersion.MC1_16_R1, "load")),
    TILEENTITY_GET_BLOCKDATA(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{}, MinecraftVersion.MC1_16_R1, new Since(MinecraftVersion.MC1_16_R1, "getBlock")),

    CRAFT_ENTITY_GET_HANDLE(ClassWrapper.CRAFT_ENTITY.getClazz(), new Class[]{}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getHandle")),
@@ -108,7 +109,12 @@ public enum ReflectionMethod {
    REGISTRYMATERIALS_GETKEY (ClassWrapper.NMS_REGISTRYMATERIALS.getClazz(), new Class[]{Object.class}, MinecraftVersion.MC1_13_R2, new Since(MinecraftVersion.MC1_13_R2, "getKey")),

    GAMEPROFILE_DESERIALIZE (ClassWrapper.NMS_GAMEPROFILESERIALIZER.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "deserialize")),
-    GAMEPROFILE_SERIALIZE (ClassWrapper.NMS_GAMEPROFILESERIALIZER.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), ClassWrapper.GAMEPROFILE.getClazz()}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "serialize"));
+    GAMEPROFILE_SERIALIZE (ClassWrapper.NMS_GAMEPROFILESERIALIZER.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), ClassWrapper.GAMEPROFILE.getClazz()}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "serialize")),
+    
+    CRAFT_PERSISTENT_DATA_CONTAINER_TO_TAG (ClassWrapper.CRAFT_PERSISTENTDATACONTAINER.getClazz(), new Class[]{}, MinecraftVersion.MC1_14_R1, new Since(MinecraftVersion.MC1_14_R1, "toTagCompound")),
+    CRAFT_PERSISTENT_DATA_CONTAINER_GET_MAP (ClassWrapper.CRAFT_PERSISTENTDATACONTAINER.getClazz(), new Class[]{}, MinecraftVersion.MC1_14_R1, new Since(MinecraftVersion.MC1_14_R1, "getRaw")),
+    CRAFT_PERSISTENT_DATA_CONTAINER_PUT_ALL (ClassWrapper.CRAFT_PERSISTENTDATACONTAINER.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_14_R1, new Since(MinecraftVersion.MC1_14_R1, "putAll")),
+    ;
    
    private MinecraftVersion removedAfter;
    private Since targetVersion;
@@ -119,9 +125,9 @@ public enum ReflectionMethod {
    
    ReflectionMethod(Class<?> targetClass, Class<?>[] args, MinecraftVersion addedSince, MinecraftVersion removedAfter, Since... methodnames){
        this.removedAfter = removedAfter;
-    	MinecraftVersion server = MinecraftVersion.getVersion();
-        if(server.compareTo(addedSince) < 0 || (this.removedAfter != null && server.getVersionId() > this.removedAfter.getVersionId()))return;
+        if(!MinecraftVersion.isAtLeastVersion(addedSince) || (this.removedAfter != null && MinecraftVersion.isNewerThan(removedAfter)))return;
        compatible = true;
+    	MinecraftVersion server = MinecraftVersion.getVersion();
        Since target = methodnames[0];
        for(Since s : methodnames){
            if(s.version.getVersionId() <= server.getVersionId() && target.version.getVersionId() < s.version.getVersionId())
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015 tr7zw
+Copyright (c) 2015 - 2021, tr7zw

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,14 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
@@ -4,7 +4,7 @@
  <parent>
    <groupId>de.tr7zw</groupId>
    <artifactId>item-nbt-parent</artifactId>
-    <version>2.5.0</version>
+    <version>2.8.0</version>
  </parent>
  <artifactId>item-nbt-api-plugin</artifactId>
  <packaging>jar</packaging>
@@ -12,19 +12,19 @@
    <dependency>
      <groupId>de.tr7zw</groupId>
      <artifactId>item-nbt-api</artifactId>
-      <version>2.5.0</version>
+      <version>2.8.0</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>de.tr7zw</groupId>
      <artifactId>nbt-injector</artifactId>
-      <version>2.5.0</version>
+      <version>2.8.0</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>de.tr7zw</groupId>
      <artifactId>nbt-data-api</artifactId>
-      <version>2.5.0</version>
+      <version>2.8.0</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
@@ -40,15 +40,6 @@
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-shade-plugin</artifactId>
        <version>3.2.4</version>
-        <executions>
-          <execution>
-            <id>shade</id>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
        <configuration>
          <createDependencyReducedPom>true</createDependencyReducedPom>
          <relocations>
@@ -56,14 +47,54 @@
              <pattern>de.tr7zw.changeme.nbtapi</pattern>
              <shadedPattern>de.tr7zw.nbtapi</shadedPattern>
            </relocation>
+            <relocation>
+              <pattern>javassist</pattern>
+              <shadedPattern>de.tr7zw.nbtinjector.javassist</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>de.tr7zw.annotations</pattern>
+              <shadedPattern>de.tr7zw.nbtapi.utils.annotations</shadedPattern>
+            </relocation>
          </relocations>
+          <transformers>
+            <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+              <resource>LICENSE</resource>
+            </transformer>
+          </transformers>
        </configuration>
+        <executions>
+          <execution>
+            <id>shade</id>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <phase>package</phase>
+          </execution>
+        </executions>
      </plugin>
      <!-- Start and Stop a SpigotMC server automatically before and after the integration-test phase. -->
      <plugin>
        <groupId>de.tr7zw.spigotmc.maven</groupId>
        <artifactId>tr-spigotmc-maven-plugin</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>0.0.3-SNAPSHOT</version>
+        <configuration>
+          <!-- 1.8.8-R0.1-SNAPSHOT-latest, 1.9.2-R0.1-SNAPSHOT-latest, 1.9.4-R0.1-SNAPSHOT-latest, 1.10.2-R0.1-SNAPSHOT-latest,1.11.2,1.12.2,1.13.2,1.14.4,1.15.1,1.16.1,1.16.2 -->
+          <versions>
+            https://repo.codemc.io/repository/nms/org/spigotmc/spigot/1.8.8-R0.1-SNAPSHOT/spigot-1.8.8-R0.1-20190527.160303-7.jar,
+          https://repo.codemc.io/repository/nms/org/spigotmc/spigot/1.9.4-R0.1-SNAPSHOT/spigot-1.9.4-R0.1-20190527.160755-2.jar,
+          https://repo.codemc.io/repository/nms/org/spigotmc/spigot/1.10.2-R0.1-SNAPSHOT/spigot-1.10.2-R0.1-20190527.154910-2.jar,
+          https://repo.codemc.io/repository/nms/org/spigotmc/spigot/1.11.2-R0.1-SNAPSHOT/spigot-1.11.2-R0.1-20191216.091129-1.jar,
+          https://repo.codemc.io/repository/nms/org/spigotmc/spigot/1.12.2-R0.1-SNAPSHOT/spigot-1.12.2-R0.1-20190527.155359-34.jar,
+            <!--https://repo.codemc.io/repository/nms/org/spigotmc/spigot/1.13.2-R0.1-SNAPSHOT/spigot-1.13.2-R0.1-20191113.201242-53.jar,-->
+            https://repo.codemc.io/repository/nms/org/spigotmc/spigot/1.14.4-R0.1-SNAPSHOT/spigot-1.14.4-R0.1-20191224.232152-15.jar,
+          https://repo.codemc.io/repository/nms/org/spigotmc/spigot/1.15.2-R0.1-SNAPSHOT/spigot-1.15.2-R0.1-20200625.172449-18.jar,
+          https://repo.codemc.io/repository/nms/org/spigotmc/spigot/1.16.5-R0.1-SNAPSHOT/spigot-1.16.5-R0.1-20210514.231722-14.jar
+          </versions>
+          <works>Success! This version of NBT-API</works>
+          <error>WARNING! This version of NBT-API</error>
+          <filename>item-nbt-api-plugin-${project.version}.jar</filename>
+          <foldername>item-nbt-plugin</foldername>
+        </configuration>
        <executions>
          <execution>
            <id>start-server</id>
@@ -78,14 +109,6 @@
            </goals>
          </execution>
        </executions>
-        <configuration>
-          <!-- 1.8.8-R0.1-SNAPSHOT-latest, 1.9.2-R0.1-SNAPSHOT-latest, 1.9.4-R0.1-SNAPSHOT-latest, 1.10.2-R0.1-SNAPSHOT-latest,1.11.2,1.12.2,1.13.2,1.14.4,1.15.1,1.16.1,1.16.2 -->
-          <versions>1.8.8-R0.1-SNAPSHOT-latest, 1.9.2-R0.1-SNAPSHOT-latest, 1.9.4-R0.1-SNAPSHOT-latest, 1.10.2-R0.1-SNAPSHOT-latest,1.11.2,1.12.2,1.13.2,1.14.4,1.15.2,1.16.1,1.16.2</versions>
-          <works>Success! This version of NBT-API</works>
-          <error>WARNING! This version of NBT-API</error>
-          <filename>item-nbt-api-plugin-${project.version}.jar</filename>
-          <foldername>item-nbt-plugin</foldername>
-        </configuration>
      </plugin>
    </plugins>
  </build>
@@ -14,6 +14,8 @@ import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ClassWrapper;
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
 import de.tr7zw.nbtapi.plugin.tests.GameprofileTest;
 import de.tr7zw.nbtapi.plugin.tests.NBTFileTest;
+import de.tr7zw.nbtapi.plugin.tests.blocks.BlockNBTTest;
+import de.tr7zw.nbtapi.plugin.tests.chunks.ChunkNBTPersistentTest;
 import de.tr7zw.nbtapi.plugin.tests.compounds.EqualsTest;
 import de.tr7zw.nbtapi.plugin.tests.compounds.ForEachTest;
 import de.tr7zw.nbtapi.plugin.tests.compounds.GetterSetterTest;
@@ -113,6 +115,12 @@ public class NBTAPI extends JavaPlugin {
 		apiTests.add(new TileTest());
 		apiTests.add(new TilesCustomNBTPersistentTest());

+		// Chunks
+		apiTests.add(new ChunkNBTPersistentTest());
+		
+		// Blocks
+		apiTests.add(new BlockNBTTest());
+		
 		// Files
 		apiTests.add(new NBTFileTest());
 		
@@ -0,0 +1,40 @@
+package de.tr7zw.nbtapi.plugin.tests.blocks;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+
+import de.tr7zw.changeme.nbtapi.NBTBlock;
+import de.tr7zw.changeme.nbtapi.NbtApiException;
+import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
+import de.tr7zw.nbtapi.plugin.tests.Test;
+
+public class BlockNBTTest implements Test {
+
+	@Override
+	public void test() throws Exception {
+		if(MinecraftVersion.getVersion().getVersionId() < MinecraftVersion.MC1_16_R3.getVersionId())return;
+		if (!Bukkit.getWorlds().isEmpty()) {
+			World world = Bukkit.getWorlds().get(0);
+			try {
+				if (world.getLoadedChunks().length > 1) {
+					Chunk chunk = world.getLoadedChunks()[0];
+					Block block = chunk.getBlock(0, 254, 0);
+					NBTBlock comp = new NBTBlock(block);
+					comp.getData().removeKey("Too");
+					if(comp.getData().hasKey("Too")) {
+						throw new NbtApiException("Unable to remove key from Block!");
+					}
+					comp.getData().setString("Too", "Bar");
+					if (!new NBTBlock(block).getData().getString("Too").equals("Bar")) {
+						throw new NbtApiException("Custom Data did not save to a Block!");
+					}
+				}
+			} catch (Exception ex) {
+				throw new NbtApiException("Wasn't able to use NBTBlocks!", ex);
+			}
+		}
+	}
+
+}
@@ -0,0 +1,40 @@
+package de.tr7zw.nbtapi.plugin.tests.chunks;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+
+import de.tr7zw.changeme.nbtapi.NBTChunk;
+import de.tr7zw.changeme.nbtapi.NBTCompound;
+import de.tr7zw.changeme.nbtapi.NbtApiException;
+import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
+import de.tr7zw.nbtapi.plugin.tests.Test;
+
+public class ChunkNBTPersistentTest implements Test {
+
+	@Override
+	public void test() throws Exception {
+		if(MinecraftVersion.getVersion().getVersionId() < MinecraftVersion.MC1_16_R3.getVersionId())return;
+		if (!Bukkit.getWorlds().isEmpty()) {
+			World world = Bukkit.getWorlds().get(0);
+			try {
+				if (world.getLoadedChunks().length > 1) {
+					Chunk chunk = world.getLoadedChunks()[0];
+					NBTChunk comp = new NBTChunk(chunk);
+					NBTCompound persistentData = comp.getPersistentDataContainer();
+					persistentData.removeKey("Foo");
+					if(persistentData.hasKey("Foo")) {
+						throw new NbtApiException("Unable to remove key from Chunk!");
+					}
+					persistentData.setString("Foo", "Bar");
+					if (!new NBTChunk(chunk).getPersistentDataContainer().getString("Foo").equals("Bar")) {
+						throw new NbtApiException("Custom Data did not save to the Chunk!");
+					}
+				}
+			} catch (Exception ex) {
+				throw new NbtApiException("Wasn't able to use NBTChunks!", ex);
+			}
+		}
+	}
+
+}
@@ -1,5 +1,7 @@
 package de.tr7zw.nbtapi.plugin.tests.compounds;

+import java.util.Arrays;
+
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;

@@ -17,6 +19,7 @@ public class EqualsTest implements Test{
 		cont.setString("hello", "world");
 		cont.setInteger("theAnswer", 42);
 		cont.addCompound("sub").setString("me", "too");
+		cont.getStringList("somelist").addAll(Arrays.asList("a", "b", "c"));
 		ItemStack item = new ItemStack(Material.STONE);
 		NBTItem nbti = new NBTItem(item);
 		NBTCompound customData = nbti.addCompound("customData");
@@ -24,6 +27,7 @@ public class EqualsTest implements Test{
 		customData.addCompound("sub").setString("me", "too");
 		customData.setInteger("theAnswer", 42);
 		customData.setString("hello", "world");
+		customData.getStringList("somelist").addAll(Arrays.asList("a", "b", "c"));
 		if(!customData.equals(cont)) {
 			throw new NbtApiException("Compounds did not match! " + customData + " " + cont);
 		}
@@ -67,6 +67,10 @@ public class ListTest implements Test {
 		} else {
 			throw new NbtApiException("Taglist is empty! The Item-NBT-API may not work!");
 		}
+		
+		if(comp.getListType("complist") != NBTType.NBTTagCompound) {
+			throw new NbtApiException("complist had the wrong type! The Item-NBT-API may not work!");
+		}

 		// Integer
 		NBTList<Integer> intlist = comp.getIntegerList("inttest");
@@ -77,6 +81,10 @@ public class ListTest implements Test {
 		} else {
 			throw new NbtApiException("IntList is not correct! " + Arrays.toString(intlist.toArray(new Integer[0])));
 		}
+		
+		if(comp.getListType("inttest") != NBTType.NBTTagInt) {
+			throw new NbtApiException("inttest had the wrong type! The Item-NBT-API may not work!");
+		}

 		// Double
 		NBTList<Double> doublelist = comp.getDoubleList("doubletest");
@@ -87,6 +95,10 @@ public class ListTest implements Test {
 		} else {
 			throw new NbtApiException("DoubleList is not correct! " + Arrays.toString(doublelist.toArray(new Double[0])));
 		}
+		
+		if(comp.getListType("doubletest") != NBTType.NBTTagDouble) {
+			throw new NbtApiException("doubletest had the wrong type! The Item-NBT-API may not work!");
+		}

 		// Float
 		NBTList<Float> floatlist = comp.getFloatList("floattest");
@@ -97,6 +109,10 @@ public class ListTest implements Test {
 		} else {
 			throw new NbtApiException("FloatList is not correct! " + Arrays.toString(floatlist.toArray(new Float[0])));
 		}
+		
+		if(comp.getListType("floattest") != NBTType.NBTTagFloat) {
+			throw new NbtApiException("floattest had the wrong type! The Item-NBT-API may not work!");
+		}

 		// Long
 		NBTList<Long> longlist = comp.getLongList("longtest");
@@ -108,6 +124,10 @@ public class ListTest implements Test {
 			throw new NbtApiException("LongList is not correct! " + Arrays.toString(longlist.toArray(new Long[0])));
 		}

+		if(comp.getListType("longtest") != NBTType.NBTTagLong) {
+			throw new NbtApiException("longtest had the wrong type! The Item-NBT-API may not work!");
+		}
+		
 	}

 }
@@ -45,6 +45,12 @@ public class SubCompoundsTest implements Test {
 				|| comp.getBoolean(BOOLEAN_TEST_KEY) == BOOLEAN_TEST_VALUE) {
 			throw new NbtApiException("One key does not equal the original compound value!");
 		}
+		
+		// Using getOrCreateCompound twice
+		comp.getOrCreateCompound("someName").setString("test", "abc");
+		if(!comp.getOrCreateCompound("someName").getString("test").equals("abc")) {
+			throw new NbtApiException("getOrCreateCompound did not return the same compound!");
+		}
 	}

 }
@@ -17,17 +17,17 @@ public class TileTest implements Test {
 		if (!Bukkit.getWorlds().isEmpty()) {
 			World world = Bukkit.getWorlds().get(0);
 			try {
-				Block block = world.getBlockAt(world.getSpawnLocation().getBlockX(), 255,
+				Block block = world.getBlockAt(world.getSpawnLocation().getBlockX(), 254,
 						world.getSpawnLocation().getBlockZ());
 				if (block.getType() == Material.AIR) {
 					block.setType(Material.CHEST);
 					NBTTileEntity tile = new NBTTileEntity(block.getState());
-					if(tile.getInteger("y") != 255) {
+					if(tile.getInteger("y") != 254) {
 						block.setType(Material.AIR);
 						throw new NbtApiException("The Tile Y pos wasn't correct!");
 					}
 					tile.setString("Lock", "test");
-					if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_8_R3) && !tile.hasKey("Lock")) {
+					if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_8_R3) && !tile.hasKey("Lock") && !"test".equals(tile.getString("test"))) {
 						block.setType(Material.AIR);
 						throw new NbtApiException("The Lock wasn't successfully set.");
 					}
@@ -26,7 +26,7 @@ public class TilesCustomNBTPersistentTest implements Test {
 					NBTTileEntity comp = new NBTTileEntity(block.getState());
 					NBTCompound persistentData = comp.getPersistentDataContainer();
 					persistentData.setString("Foo", "Bar");
-					if (!new NBTTileEntity(block.getState()).getPersistentDataContainer().toString().contains("Foo:\"Bar\"")) {
+					if (!new NBTTileEntity(block.getState()).getPersistentDataContainer().getString("Foo").equals("Bar")) {
 						block.setType(Material.AIR);
 						throw new NbtApiException("Custom Data did not save to the Tile!");
 					}
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015 tr7zw
+Copyright (c) 2015 - 2021, tr7zw

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,14 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>

-    <parent>
-        <groupId>de.tr7zw</groupId>
-        <artifactId>item-nbt-parent</artifactId>
-        <version>2.5.0</version>
-    </parent>
+  <parent>
+    <groupId>de.tr7zw</groupId>
+    <artifactId>item-nbt-parent</artifactId>
+    <version>2.8.0</version>
+  </parent>

-    <artifactId>nbt-data-api</artifactId>
-    <packaging>jar</packaging>
+  <artifactId>nbt-data-api</artifactId>
+  <packaging>jar</packaging>
  <dependencies>
    <dependency>
      <groupId>de.tr7zw</groupId>
      <artifactId>item-nbt-api</artifactId>
-      <version>2.5.0</version>
+      <version>2.8.0</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
-	
-    <build>
-        <defaultGoal>clean install javadoc:javadoc</defaultGoal>
-    </build>
+
+  <build>
+    <defaultGoal>clean install javadoc:javadoc</defaultGoal>
+  </build>

 </project>
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015 tr7zw
+Copyright (c) 2015 - 2021, tr7zw

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,14 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
@@ -4,7 +4,7 @@
  <parent>
    <groupId>de.tr7zw</groupId>
    <artifactId>item-nbt-parent</artifactId>
-    <version>2.5.0</version>
+    <version>2.8.0</version>
  </parent>
  <artifactId>nbt-injector</artifactId>
  <packaging>jar</packaging>
@@ -12,13 +12,13 @@
    <dependency>
      <groupId>de.tr7zw</groupId>
      <artifactId>item-nbt-api</artifactId>
-      <version>2.5.0</version>
+      <version>2.8.0</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.javassist</groupId>
      <artifactId>javassist</artifactId>
-      <version>3.27.0-GA</version>
+      <version>3.28.0-GA</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
@@ -22,7 +22,7 @@ import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
 import de.tr7zw.nbtinjector.NBTInjector.Entity;
 import de.tr7zw.nbtinjector.NBTInjector.TileEntity;
 import javassist.ClassPool;
-import static de.tr7zw.changeme.nbtapi.utils.MinecraftVersion.logger;
+import static de.tr7zw.nbtinjector.NBTInjector.logger;

 /**
 * Contains the internal methods for different Minecraft Versions of injecting
@@ -34,7 +34,7 @@ public class NBTInjector {

 	}

-	static Logger logger = Logger.getLogger("NBTInjector");
+	protected static Logger logger = Logger.getLogger("NBTInjector");
 	private static boolean isInjected = false;
 	private static final String NOT_INJECTED_MESSAGE = "The NBTInjector has not been enabled!\n"
 			+ "You need to call 'NBTInjector.inject()' during the Method 'onLoad' of your Plugin!"
@@ -3,12 +3,24 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>de.tr7zw</groupId>
  <artifactId>item-nbt-parent</artifactId>
-  <version>2.5.0</version>
+  <version>2.8.0</version>
  <packaging>pom</packaging>
+  <inceptionYear>2015</inceptionYear>
+  <organization>
+    <name>tr7zw</name>
+    <url>https://github.com/tr7zw/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>MIT License</name>
+      <url>https://opensource.org/licenses/mit-license.php</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
  <modules>
    <module>item-nbt-api</module>
    <module>nbt-injector</module>
-	<module>nbt-data-api</module>
+    <module>nbt-data-api</module>
    <module>item-nbt-plugin</module>
  </modules>
  <properties>
@@ -18,7 +30,7 @@
    <dependency>
      <groupId>org.spigotmc</groupId>
      <artifactId>spigot-api</artifactId>
-      <version>1.14.2-R0.1-SNAPSHOT</version>
+      <version>1.16.4-R0.1-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
@@ -99,7 +111,10 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
+        <configuration>
+          <source>8</source>
+        </configuration>
        <executions>
          <execution>
            <id>attach-javadocs</id>
@@ -108,14 +123,11 @@
            </goals>
          </execution>
        </executions>
-        <configuration>
-          <source>8</source>
-        </configuration>
      </plugin>
      <plugin>
        <groupId>com.github.ekryd.sortpom</groupId>
        <artifactId>sortpom-maven-plugin</artifactId>
-        <version>2.12.0</version>
+        <version>3.0.0</version>
        <executions>
          <execution>
            <id>sortpom</id>
@@ -138,6 +150,16 @@
          </execution>
        </executions>
      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <version>2.0.0</version>
+        <configuration>
+          <licenseName>mit</licenseName>
+          <licenseFile>LICENSE</licenseFile>
+          <force>true</force>
+        </configuration>
+      </plugin>
    </plugins>
  </build>
 </project>
@@ -0,0 +1,289 @@
+[B][SIZE=6](Item/Entity/Tile) NBT API[/SIZE][/B]
+[URL='https://ci.codemc.io/job/Tr7zw/job/Item-NBT-API/'][IMG]https://ci.codemc.org/buildStatus/icon?job=Tr7zw%2FItem-NBT-API[/IMG][/URL]  [URL='https://sonarcloud.io/dashboard?id=de.tr7zw%3Aitem-nbt-parent'][IMG]https://sonarcloud.io/api/project_badges/measure?project=de.tr7zw%3Aitem-nbt-parent&metric=ncloc[/IMG][/URL] [URL='https://bstats.org/plugin/bukkit/ItemNBTAPI'][IMG]https://img.shields.io/bstats/servers/1058.svg?color=green&label=OnlineServers&style=plastic[/IMG][/URL] [URL='https://bstats.org/plugin/bukkit/ItemNBTAPI'][IMG]https://img.shields.io/bstats/players/1058.svg?color=green&label=OnlinePlayers&style=plastic[/IMG] [/URL][URL='https://discordapp.com/invite/yk4caxM'][IMG]https://img.shields.io/discord/342814924310970398?color=%237289DA&label=Discord&logo=discord&logoColor=white[/IMG][/URL] [IMG]https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dtr7zw%26type%3Dpatrons&style=for-the-badge[/IMG]
+The NBT API allows you to add custom NBT tags to Itemstacks, TileEntities and Entities, or modify excisting ones!
+It completely uses reflections to interact with NMS code and works with all the latest versions. On server start the plugin checks all reflections.
+
+Tested on Spigot
+[LIST]
+[*](1.7*)1.8.8-1.16.4
+[*]The NBTInjector will not work with: 1.12.0, 1.12.1, 1.13.0 (Please just update to the final release of your chosen version)
+
+[*]On startup you will get a notification if there is a version problem!
+[/LIST]
+* 1.7 Notes: Use a 1.7 with R4 (1.7.10), NBTLists may not work, everything using Gson is disabled(Add Gson before the NBTAPI loads, to turn it back on), and you can't get the NBTTypes, because 1.7 is missing this feature. TLDR: 1.7.10 is somewhat broken and not everything might work due to 1.7.10 limitations.
+
+[B]What do I have to do as a server owner?[/B]
+Just download the jar and drop it in the plugins folder. Done.
+Note that outdated plugins may ask for "ItemNBTAPI". In this case download version 1.8.3 from the versions tab. The outdated "ItemNBTAPI" and "NBTApi" can be used at the same time.
+[B]Important for version 2.0.0:[/B] Don't reload while using the NBTInjector. Reloading, in general, is a horrible thing and it will break the NBTInjector in horrible ways! When updating plugins/changing configs always restart the server normally!
+
+[B]How can I use the API as developer?[/B]
+Create the NBT Wrapper:
+[CODE]NBTItem nbti = new NBTItem(item);
+NBTEntity nbtent = new NBTEntity(zombie); //Only for vanilla tags!
+NBTTileEntity tent = new NBTTileEntity(block.getState()); //Only for vanilla tags!
+NBTFile file = new NBTFile(new File(getDataFolder(), "test.nbt"));
+NBTContainer container =  new NBTContainer(json); //Parse in json
+[/CODE]
+
+Add/Get/Override NBT tags:
+[CODE]//Set
+nbti.setString("Stringtest", "Teststring");
+nbti.setInteger("Inttest", 42);
+nbti.setDouble("Doubletest", 1.5d);
+nbti.setBoolean("Booleantest", true);
+//More are avaible!
+//Get
+nbti.getString("Stringtest");
+nbti.getInteger("Inttest");
+nbti.getDouble("Doubletest");
+nbti.getBoolean("Booleantest");
+//Get all Tags
+nbti.getKeys();
+//Check for an tag
+nbti.hasKey("Key");
+//Remove a tag
+nbti.removeKey("Key");
+//or
+nbti.setString("Stringtest", null);
+//Create NBTTagCombounds(Imagine folders)
+nbti.addCompound("subtag");
+//Get Compound
+NBTCompound comp = nbti.getCompound("subtag");
+//Get Compound parent(null at root)
+comp.getParent();
+//Save Objects via Gson
+nbti.setObject("myobject", new SimpleJsonTestObject());
+//Get Objects
+SimpleJsonTestObject simpleObject = nbti.getObject("myobject", SimpleJsonTestObject.class);
+//Merge the data from compound A into B (Like the /data merge command)
+B.mergeCompound(A);
+//Get the nbt as json
+comp.asNBTString();
+
+//Access/create lists
+nbtent.getCompoundList("Attributes");
+nbtent.getStringList("Attributes");
+[/CODE]
+
+And finally get back the Bukkit Itemstack(Changes on Tiles/Entities will happen directly):
+[CODE]nbti.getItem();[/CODE]
+Saving the NBTFile:
+[CODE]file.save();[/CODE]
+
+[B]Important note regarding Tiles/Entities
+[B]Starting with 1.14+ you can use the getPersistentDataContainer() (for NBT(Tile)-Entity's) to save custom tags. This replaces the now mentioned NBT-Injector.[/B][/B]
+Non-vanilla tags can't usually be added to to Tiles/Entities. Thanks to
+[URL='https://www.spigotmc.org/members/inventivetalent.6643/'][IMG]https://tr7zw.dev/nbtapi/spigotPeople.php?id=6643[/IMG][/URL] the NBTAPI now includes a tool called "NBTInjector", that compiles custom (Tile-)Entity classes during runtime to allow custom nbt. The custom data will remain during chunk unloads/server restarts. [B]Data will be lost when chunks get loaded without the NBTAPI loaded! Since 2.1.0 the NBTInjector won't be enabled by default! Please enable it during onLoad with NBTInjector.inject(); if you are using it![/B]
+Adding custom nbt to tiles:
+[CODE]
+NBTCompound comp = NBTInjector.getNbtData(block.getState());
+comp.setString("Foo", "Bar");
+[/CODE]
+Adding custom nbt to entities:
+[CODE]
+Entity ent = world.getEntitiesByClasses(Animals.class, Monster.class).iterator().next();
+ent = NBTInjector.patchEntity(ent); //This needs to be called at least once on the entity to enable custom nbt!
+NBTCompound comp = NBTInjector.getNbtData(ent);
+comp.setString("Hello", "World");
+[/CODE]
+[B]Note[/B]: Before NBTInjector.getNbtData can be used on an Entity, NBTInjector.patchEntity has to be used on it at least once. This method will check if the entity is patched, and if not remove the entity and respawn it with the correct class. This destroys the original entity reference(the new one is returned) and the entity will blink once ingame. Bestcase you call this method right when the entity is spawned to prevent unwanted behavior(the blink, entities interacting with the Entity beeing patched like riding/leashes/combat may have problems).
+
+[B]Maven[/B]
+(Historicly it was Jitpack. Don't use it anymore!)
+NBTApi is hosted and compiled by CodeMC.
+[URL='https://ci.codemc.org/job/Tr7zw/job/Item-NBT-API/']JenkinsBuild[/URL] [URL='https://github.com/CodeMC/CI-Documentation']CodeMC-Info[/URL]
+[code]<repositories>
+...
+<!-- CodeMC -->
+<repository>
+<id>codemc-repo</id>
+<url>https://repo.codemc.org/repository/maven-public/</url>
+<layout>default</layout>
+</repository>
+...
+</repositories>
+[/code]
+The API can be used in different ways:
+[SPOILER="Normal Plugin dependency"]
+Just use the Plugin as Maven dependency and remember to add "NBTAPI" as dependency into the plugin.yml. This way server owners will have to install the api and keep it updated.
+[CODE]
+<dependency>
+  <groupId>de.tr7zw</groupId>
+  <artifactId>item-nbt-api-plugin</artifactId>
+  <version>2.6.0</version>
+</dependency>
+[/CODE]
+[/SPOILER]
+[SPOILER="Shading the API into your plugin"]
+Using this method the API gets copied into your plugin. Server owners don't have to install the API on their own, but you need to keep it updated. Also [B]relocating is required[/B]!
+[CODE]
+<dependency>
+  <groupId>de.tr7zw</groupId>
+  <artifactId>item-nbt-api</artifactId>
+  <version>2.6.0</version>
+</dependency>
+...
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <id>shade</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <relocations>
+            <relocation>
+              <pattern>de.tr7zw.changeme.nbtapi</pattern>
+              <shadedPattern>YOUR PACKGE WHERE THE API SHOULD END UP</shadedPattern>
+            </relocation>
+          </relocations>
+        </configuration>
+      </plugin>
+   </plugins>
+[/CODE]
+[/SPOILER]
+
+[B]Example Code[/B]
+[SPOILER="Zombie that will pickup loot and does 0.5 Hearts of damage"]
+[CODE]
+ Zombie z = (Zombie) b.getWorld().spawnEntity(b.getLocation().add(0, 1, 0), EntityType.ZOMBIE);
+                NBTEntity nbtent = new NBTEntity(z);
+                nbtent.setByte("CanPickUpLoot", (byte) 1);
+                NBTList list = nbtent.getCompoundList("Attributes");
+                for(int i = 0; i < list.size(); i++){
+                    NBTListCompound lc = list.getCompound(i);
+                    if(lc.getString("Name").equals("generic.attackDamage")){
+                        lc.setDouble("Base", 0.5d);
+                    }
+                }
+[/CODE]
+[/SPOILER]
+
+[SPOILER="Simulate the command /data merge entity @e[type=zombie] {Silent:1b,Invulnerable:1b,Glowing:1b,IsBaby:1b}"]
+[CODE]
+                NBTEntity nbtent = new NBTEntity(zombie);
+                nbtent.mergeCompound(new NBTContainer("{Silent:1b,Invulnerable:1b,Glowing:1b,IsBaby:1b}"));
+[/CODE]
+[/SPOILER]
+
+[SPOILER="Creating a Head with texture, healthboost and some more tags"]
+[CODE]
+        ItemStack head = new ItemStack(Material.SKULL_ITEM, 1, (short) 3);
+        NBTItem nbti = new NBTItem(head);
+        NBTCompound disp = nbti.addCompound("display");
+        disp.setString("Name", "Testitem");
+        List<String> l = disp.getStringList("Lore");
+        l.add("Some lore");
+        NBTCompound skull = nbti.addCompound("SkullOwner");
+        skull.setString("Name", "tr7zw");
+        skull.setString("Id", "fce0323d-7f50-4317-9720-5f6b14cf78ea");
+        NBTListCompound texture = skull.addCompound("Properties").getCompoundList("textures").addCompound();
+        texture.setString("Signature", "XpRfRz6/vXE6ip7/vq+40H6W70GFB0yjG6k8hG4pmFdnJFR+VQhslE0gXX/i0OAGThcAVSIT+/W1685wUxNofAiy+EhcxGNxNSJkYfOgXEVHTCuugpr+EQCUBI6muHDKms3PqY8ECxdbFTUEuWxdeiJsGt9VjHZMmUukkGhk0IobjQS3hjQ44FiT1tXuUU86oAxqjlKFpXG/iXtpcoXa33IObSI1S3gCKzVPOkMGlHZqRqKKElB54I2Qo4g5CJ+noudIDTzxPFwEEM6XrbM0YBi+SOdRvTbmrlkWF+ndzVWEINoEf++2hkO0gfeCqFqSMHuklMSgeNr/YtFZC5ShJRRv7zbyNF33jZ5DYNVR+KAK9iLO6prZhCVUkZxb1/BjOze6aN7kyN01u3nurKX6n3yQsoQQ0anDW6gNLKzO/mCvoCEvgecjaOQarktl/xYtD4YvdTTlnAlv2bfcXUtc++3UPIUbzf/jpf2g2wf6BGomzFteyPDu4USjBdpeWMBz9PxVzlVpDAtBYClFH/PFEQHMDtL5Q+VxUPu52XlzlUreMHpLT9EL92xwCAwVBBhrarQQWuLjAQXkp3oBdw6hlX6Fj0AafMJuGkFrYzcD7nNr61l9ErZmTWnqTxkJWZfZxmYBsFgV35SKc8rkRSHBNjcdKJZVN4GA+ZQH5B55mi4=");
+        texture.setString("Value", "eyJ0aW1lc3RhbXAiOjE0OTMwNDkwMTcxNTIsInByb2ZpbGVJZCI6ImZjZTAzMjNkN2Y1MDQzMTc5NzIwNWY2YjE0Y2Y3OGVhIiwicHJvZmlsZU5hbWUiOiJ0cjd6dyIsInNpZ25hdHVyZVJlcXVpcmVkIjp0cnVlLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTI3NDZlNWU5OGMwZWRmZTU1YTI3ZGRjNjUxMmJmNjllYzJiYmNlNmM3ZmNhNTQ5YmEzNjZkYThiNTRjZTRkYiJ9fX0=");
+
+        NBTCompoundList attribute = nbti.getCompoundList("AttributeModifiers");
+        NBTListCompound mod1 = attribute.addCompound();
+        mod1.setInteger("Amount", 10);
+        mod1.setString("AttributeName", "generic.maxHealth");
+        mod1.setString("Name", "generic.maxHealth");
+        mod1.setInteger("Operation", 0);
+        mod1.setInteger("UUIDLeast", 59664);
+        mod1.setInteger("UUIDMost", 31453);
+
+        nbti.setInteger("HideFlags", 4);
+        nbti.setBoolean("Unbreakable", true);
+        head = nbti.getItem();
+        e.getPlayer().getInventory().addItem(head);
+[/CODE]
+[/SPOILER]
+
+[SPOILER="Printing the NBT tags"]
+[CODE]
+                Ocelot m = (Ocelot) e.getPlayer().getWorld().spawnEntity(e.getPlayer().getLocation(), EntityType.OCELOT);
+                NBTEntity ent = new NBTEntity(m);
+                System.out.println(ent);
+[/CODE]
+Output:
+[CODE]
+-AgeLocked: 0b
+-HurtByTimestamp: 0
+-CatType: 0
+-Leashed: 0b
+-Health: 10.0f
+-Sitting: 0b
+-Attributes: [0:{Base:10.0d,Name:"generic.maxHealth"},1:{Base:0.0d,Name:"generic.knockbackResistance"},2:{Base:0.30000001192092896d,Name:"generic.movementSpeed"},3:{Base:0.0d,Name:"generic.armor"},4:{Base:0.0d,Name:"generic.armorToughness"},5:{Base:16.0d,Modifiers:[0:{UUIDMost:-8783172028836920024L,UUIDLeast:-6820414278857408689L,Amount:-0.030166473586416633d,Operation:1,Name:"Random spawn bonus"}],Name:"generic.followRange"}]
+-FallFlying: 0b
+-LeftHanded: 0b
+-ForcedAge: 0
+-AbsorptionAmount: 0.0f
+-HandItems: [0:{},1:{}]
+-ArmorDropChances: [0:0.085f,1:0.085f,2:0.085f,3:0.085f]
+-OwnerUUID: ""
+-InLove: 0
+-DeathTime: 0s
+-ArmorItems: [0:{},1:{},2:{},3:{}]
+-CanPickUpLoot: 0b
+-HandDropChances: [0:0.085f,1:0.085f]
+-PersistenceRequired: 0b
+-HurtTime: 0s
+-Age: 0
+[/CODE]
+[/SPOILER]
+
+[SPOILER="Locking Chests"]
+[CODE]                NBTTileEntity tent = new NBTTileEntity(b.getState());
+                tent.setString("Lock", "test");[/CODE]
+[/SPOILER]
+
+[B]More Infos:[/B]
+[LIST]
+[*][URL]https://www.spigotmc.org/threads/override-base-item-attribute-value.236434/#post-2387235[/URL]
+[/LIST]
+
+[B]This API can't be used for:[/B]
+[LIST]
+[*][I][SIZE=4][S]Adding custom tags to TileEntities/Entities[/S] [/SIZE][/I][SIZE=4]Not true anymore, check the NBTInjector examples above[/SIZE]
+[/LIST]
+Git: [URL='https://github.com/tr7zw/Item-NBT-API']Github[/URL]
+Maven Repo: [URL='https://repo.codemc.org/#browse/browse:maven-public:de%2Ftr7zw%2Fitem-nbt-api-plugin']CodeMC[/URL]
+Jenkins: [URL='https://ci.codemc.org/job/Tr7zw/job/Item-NBT-API/']Jenkins[/URL]
+Discord server for help: [URL='https://discord.gg/yk4caxM']Discord[/URL]
+Feel free to create forks for your need! (Send me a message on [S]Spigot[/S] the Discord server if you want stuff to be added/need help)
+Yes you are allowed to integrate the API into your plugin(remember to shade)! (Send me a link to your project so I can check it out ;))
+
+[B][SIZE=5]Projects using the API(That I know of)[/SIZE]
+[U][SIZE=4]Plugins[/SIZE][/U][/B]
+[URL='https://www.spigotmc.org/resources/crazy-enchantments.16470/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=16470&[/IMG][/URL]
+[URL='https://www.spigotmc.org/resources/backpacks.45622/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=45622&[/IMG][/URL]
+[URL='https://www.spigotmc.org/resources/gravy.45288/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=45288&[/IMG][/URL]
+[URL='https://www.spigotmc.org/resources/interactivebooks.45604/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=45604&[/IMG][/URL]
+[URL='https://www.spigotmc.org/resources/vouchers.13654/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=13654&[/IMG][/URL]
+[URL='https://www.spigotmc.org/resources/itemcommands.49543/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=49543&[/IMG][/URL]
+[URL='https://www.spigotmc.org/resources/comparable-hoppers-2.45058/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=45058&[/IMG][/URL]
+[URL='https://www.spigotmc.org/resources/nottooexpensive.62680/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=62680&[/IMG][/URL]
+[URL='https://www.spigotmc.org/resources/papermoney.70361/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=70361&[/IMG][/URL]
+[URL='https://www.spigotmc.org/resources/blockstackerx-plugin-for-askyblock.71514/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=71514&[/IMG][/URL]
+[URL='https://www.spigotmc.org/resources/blockstackerx-recoded.73749/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=73749[/IMG][/URL]
+[URL='https://www.spigotmc.org/resources/63020/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=63020&reload[/IMG][/URL]
+[URL='https://www.spigotmc.org/resources/72810/'][IMG]https://tr7zw.dev/nbtapi/linkedProjects.php?id=72810&reload[/IMG][/URL]
+[U][B]Server/Networks[/B][/U]
+[URL='http://Timolia.de'][IMG]http://status.mclive.eu/Timolia.de/timolia.de/25565/banner.png[/IMG][/URL]
+[U][B]Other[/B][/U]
+- [URL='https://github.com/LogisticsCraft/Logistics-API']Logistics-API[/URL]
+
+If you like this Resource, donate me a Coffee or become a Patreon for cool perks! [URL='https://tr7zw.dev/donate/']Donating[/URL]
+[SIZE=4][SIZE=4][U][B]Donators[/B][/U]
+[U][B][URL='https://www.spigotmc.org/members/mrdienns.35704/'][IMG]https://tr7zw.dev/nbtapi/spigotPeople.php?id=35704[/IMG][/URL] [/B][/U]
+[U][B][URL='https://www.spigotmc.org/members/mraxetv.27720/'][IMG]https://tr7zw.dev/nbtapi/spigotPeople.php?id=27720[/IMG][/URL] [/B][/U]
+[URL='https://www.spigotmc.org/members/lonedev.88296/'][IMG]https://tr7zw.dev/nbtapi/spigotPeople.php?id=88296[/IMG][/URL] 
+[URL='https://www.spigotmc.org/members/gc.25090/'][IMG]https://tr7zw.dev/nbtapi/spigotPeople.php?id=25090[/IMG][/URL]
+[URL='https://www.spigotmc.org/members/peaches_mlg100.194338/'][IMG]https://tr7zw.dev/nbtapi/spigotPeople.php?id=194338[/IMG][/URL][/SIZE][/SIZE]
+[IMG]https://bstats.org/signatures/bukkit/ItemNBTAPI.svg[/IMG]
Author	SHA1	Message	Date
tr7zw	8e96e4cb7d	2.8.0	2021-06-11 15:39:27 +02:00
tr7zw	b08f6c193f	Fix annotations shade location in plugin jar	2021-06-11 15:21:29 +02:00
tr7zw	30d6b7cb01	Update License stuff	2021-06-11 15:19:15 +02:00
tr7zw	d08b2fcb11	Sortpom	2021-06-11 14:21:52 +02:00
tr7zw	fb4ef48d7a	Merge pull request #126 from tr7zw/dependabot/maven/com.github.ekryd.sortpom-sortpom-maven-plugin-3.0.0 Bump sortpom-maven-plugin from 2.12.0 to 3.0.0	2021-06-11 14:14:34 +02:00
tr7zw	441fedf1e8	Merge pull request #124 from tr7zw/dependabot/maven/org.javassist-javassist-3.28.0-GA Bump javassist from 3.27.0-GA to 3.28.0-GA	2021-06-11 14:14:22 +02:00
tr7zw	fe7b04d6d6	Merge pull request #125 from tr7zw/dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.3.0 Bump maven-javadoc-plugin from 3.2.0 to 3.3.0	2021-06-11 14:14:10 +02:00
tr7zw	05826a5ed5	Merge pull request #114 from spnda/fix-available-annotation Fix the spelling of AvailableSince interface	2021-06-11 14:03:27 +02:00
dependabot[bot]	e8a508623b	Bump sortpom-maven-plugin from 2.12.0 to 3.0.0 Bumps [sortpom-maven-plugin](https://github.com/Ekryd/sortpom) from 2.12.0 to 3.0.0. - [Release notes](https://github.com/Ekryd/sortpom/releases) - [Commits](https://github.com/Ekryd/sortpom/compare/sortpom-parent-2.12.0...sortpom-parent-3.0.0) --- updated-dependencies: - dependency-name: com.github.ekryd.sortpom:sortpom-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-11 12:02:43 +00:00
dependabot[bot]	7b65e54ac7	Bump maven-javadoc-plugin from 3.2.0 to 3.3.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.2.0...maven-javadoc-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-11 12:02:34 +00:00
dependabot[bot]	44ff2fa973	Bump javassist from 3.27.0-GA to 3.28.0-GA Bumps [javassist](https://github.com/jboss-javassist/javassist) from 3.27.0-GA to 3.28.0-GA. - [Release notes](https://github.com/jboss-javassist/javassist/releases) - [Commits](https://github.com/jboss-javassist/javassist/commits) --- updated-dependencies: - dependency-name: org.javassist:javassist dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-11 12:02:31 +00:00
tr7zw	595357f4c6	Merge pull request #120 from tr7zw/dependabot/add-v2-config-file Upgrade to GitHub-native Dependabot	2021-06-11 14:01:42 +02:00
tr7zw	03475a3f76	Add 1.17 support	2021-06-11 13:46:05 +02:00
tr7zw	8e05513122	Relocate javassist. 2.8.0-SNAPSHOT	2021-06-11 12:22:34 +02:00
tr7zw	d43447c721	2.7.2 paper hotfix	2021-05-20 11:51:45 +02:00
dependabot-preview[bot]	50edbaeed3	Upgrade to GitHub-native Dependabot	2021-04-29 19:12:43 +00:00
pnda	01afd25131	Fix availability spelling	2021-01-27 15:46:59 +01:00
tr7zw	601cb2f56c	Fix pom issue and release 2.7.1	2020-12-30 14:53:58 +01:00
tr7zw	442a6e935b	2.7.0 Release	2020-12-29 23:36:41 +01:00
tr7zw	2213ab879d	Update pom.xml	2020-12-29 23:26:00 +01:00
tr7zw	00c2ce951b	Reimplement equals method to hopefully be better than before, add getListType method	2020-12-29 23:12:21 +01:00
tr7zw	60d8101b9f	Add NBTBlock for 1.16.4	2020-12-29 20:06:59 +01:00
tr7zw	ef56b44629	Add NBTChunk and NBTPersistentDataContainer	2020-12-29 18:56:44 +01:00
tr7zw	5859276c11	Add getOrCreateCompound and clearify the javadoc of addCompound	2020-12-29 17:24:09 +01:00
tr7zw	f588e6fec9	Start using maven vars for the version. Start NBT-Crafting	2020-12-29 17:06:13 +01:00
tr7zw	413b0f38f4	Update pom.xml	2020-12-29 16:53:04 +01:00
tr7zw	a40eb5b4b4	Start work on 2.7.0-SNAPSHOT	2020-12-29 16:51:30 +01:00
tr7zw	a4deb2a1ee	Release 2.6.1 to fix the spigotmc/curseforge situation	2020-12-20 18:40:07 +01:00
tr7zw	feaf59998f	Putting the src versions of the spigot/curseforge page text into the repo	2020-12-08 21:40:13 +01:00
tr7zw	cc1a88cdc8	Update README.md	2020-12-08 21:17:33 +01:00
tr7zw	b58215d4bf	Merge pull request #108 from LoneDev6/patch-2 Update .all-contributorsrc	2020-12-08 21:15:53 +01:00
tr7zw	689c354443	Bump to 2.6.1-SNAPSHOT	2020-12-08 21:15:23 +01:00
LoneDev	ff3a7c3add	Update .all-contributorsrc Added "Code" icon to user LoneDev6	2020-11-30 12:53:42 +01:00
tr7zw	7d76d3c342	2.6.0 Release	2020-11-03 18:15:20 +01:00
tr7zw	2107d6f53d	Fix >= != >, update readme	2020-11-03 18:02:52 +01:00
tr7zw	f3e912723b	Add 1.16.4 Fixes #106 , Fix issue with the version fallback for unknown future versions	2020-11-03 17:47:53 +01:00
tr7zw	47f29234e3	Fix loggers, allow replacement of the nbt-api logger for shaded plugins. Fixes #99 somewhat	2020-10-28 18:31:30 +01:00
tr7zw	bd1ebac035	Bump to 2.6.0-SNAPSHOT	2020-10-28 18:12:20 +01:00
tr7zw	ea9ccdc077	Add Stargazers graph	2020-10-12 10:53:18 +02:00
tr7zw	f2d13e9b4e	Bump Year	2020-09-28 21:11:31 +00:00