2.6.0 Release

Fix >= != >, update readme
Add 1.16.4 Fixes #106 , Fix issue with the version fallback for unknown future versions
2026-11-13 12:31:58 -05:00 · 2020-11-03 18:15:20 +01:00 · 2020-11-03 18:02:52 +01:00 · 2020-11-03 17:47:53 +01:00 · 2020-10-28 18:31:30 +01:00 · 2020-10-28 18:12:20 +01:00
36 changed files with 1122 additions and 364 deletions
@@ -158,6 +158,18 @@
      "links": {
        "financial": "https://tr7zw.dev/donate/"
      }
+    },
+    {
+      "login": "Peaches_MLG",
+      "name": "Peaches_MLG",
+      "avatar_url": "https://www.spigotmc.org/data/avatars/l/194/194338.jpg?1561235996",
+      "profile": "https://www.spigotmc.org/members/peaches_mlg100.194338/",
+      "contributions": [
+        "financial"
+      ],
+      "links": {
+        "financial": "https://tr7zw.dev/donate/"
+      }
    }
  ]
 }
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015 tr7zw
+Copyright (c) 2020 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
@@ -4,12 +4,16 @@ 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.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-12-green.svg?style=plastic)](#contributors-%e2%9c%a8)
+[![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)

+<img src="https://starchart.cc/tr7zw/Item-NBT-API.svg" alt="stargazers" width="800"/>
+
 ## 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).

@@ -36,6 +40,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
    <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/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>
 </table>
 <!-- markdownlint-enable -->
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.tr7zw</groupId>
 		<artifactId>item-nbt-parent</artifactId>
-		<version>2.3.0</version>
+		<version>2.6.0</version>
 	</parent>

 	<artifactId>item-nbt-api</artifactId>
@@ -34,7 +34,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.2.2</version>
+				<version>3.2.4</version>
 				<executions>
 					<execution>
 						<id>shade</id>
@@ -3,6 +3,10 @@ package de.tr7zw.changeme.nbtapi;
 import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;

 import org.bukkit.inventory.ItemStack;

@@ -18,6 +22,10 @@ import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
 */
 public class NBTCompound {

+	private final ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
+	private final Lock readLock = readWriteLock.readLock();
+	private final Lock writeLock = readWriteLock.writeLock();
+
 	private String compundName;
 	private NBTCompound parent;

@@ -26,11 +34,19 @@ public class NBTCompound {
 		this.parent = owner;
 	}

-	protected void saveCompound(){
-		if(parent != null)
+	protected Lock getReadLock() {
+		return readLock;
+	}
+
+	protected Lock getWriteLock() {
+		return writeLock;
+	}
+
+	protected void saveCompound() {
+		if (parent != null)
 			parent.saveCompound();
 	}
-	
+
 	/**
 	 * @return The Compound name
 	 */
@@ -63,8 +79,13 @@ public class NBTCompound {
 	 * @param comp
 	 */
 	public void mergeCompound(NBTCompound comp) {
-		NBTReflectionUtil.mergeOtherNBTCompound(this, comp);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.mergeOtherNBTCompound(this, comp);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -74,8 +95,13 @@ public class NBTCompound {
 	 * @param value
 	 */
 	public void setString(String key, String value) {
-		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_STRING, key, value);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_STRING, key, value);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -85,7 +111,12 @@ public class NBTCompound {
 	 * @return The stored value or NMS fallback
 	 */
 	public String getString(String key) {
-		return (String) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_STRING, key);
+		try {
+			readLock.lock();
+			return (String) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_STRING, key);
+		} finally {
+			readLock.unlock();
+		}
 	}

 	protected String getContent(String key) {
@@ -99,8 +130,13 @@ public class NBTCompound {
 	 * @param value
 	 */
 	public void setInteger(String key, Integer value) {
-		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_INT, key, value);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_INT, key, value);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -110,7 +146,12 @@ public class NBTCompound {
 	 * @return The stored value or NMS fallback
 	 */
 	public Integer getInteger(String key) {
-		return (Integer) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_INT, key);
+		try {
+			readLock.lock();
+			return (Integer) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_INT, key);
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
@@ -120,8 +161,13 @@ public class NBTCompound {
 	 * @param value
 	 */
 	public void setDouble(String key, Double value) {
-		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_DOUBLE, key, value);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_DOUBLE, key, value);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -131,7 +177,12 @@ public class NBTCompound {
 	 * @return The stored value or NMS fallback
 	 */
 	public Double getDouble(String key) {
-		return (Double) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_DOUBLE, key);
+		try {
+			readLock.lock();
+			return (Double) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_DOUBLE, key);
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
@@ -141,8 +192,13 @@ public class NBTCompound {
 	 * @param value
 	 */
 	public void setByte(String key, Byte value) {
-		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_BYTE, key, value);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_BYTE, key, value);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -152,7 +208,12 @@ public class NBTCompound {
 	 * @return The stored value or NMS fallback
 	 */
 	public Byte getByte(String key) {
-		return (Byte) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_BYTE, key);
+		try {
+			readLock.lock();
+			return (Byte) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_BYTE, key);
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
@@ -162,8 +223,13 @@ public class NBTCompound {
 	 * @param value
 	 */
 	public void setShort(String key, Short value) {
-		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_SHORT, key, value);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_SHORT, key, value);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -173,7 +239,12 @@ public class NBTCompound {
 	 * @return The stored value or NMS fallback
 	 */
 	public Short getShort(String key) {
-		return (Short) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_SHORT, key);
+		try {
+			readLock.lock();
+			return (Short) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_SHORT, key);
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
@@ -183,8 +254,13 @@ public class NBTCompound {
 	 * @param value
 	 */
 	public void setLong(String key, Long value) {
-		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_LONG, key, value);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_LONG, key, value);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -194,7 +270,12 @@ public class NBTCompound {
 	 * @return The stored value or NMS fallback
 	 */
 	public Long getLong(String key) {
-		return (Long) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_LONG, key);
+		try {
+			readLock.lock();
+			return (Long) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_LONG, key);
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
@@ -204,8 +285,13 @@ public class NBTCompound {
 	 * @param value
 	 */
 	public void setFloat(String key, Float value) {
-		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_FLOAT, key, value);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_FLOAT, key, value);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -215,7 +301,12 @@ public class NBTCompound {
 	 * @return The stored value or NMS fallback
 	 */
 	public Float getFloat(String key) {
-		return (Float) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_FLOAT, key);
+		try {
+			readLock.lock();
+			return (Float) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_FLOAT, key);
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
@@ -225,8 +316,13 @@ public class NBTCompound {
 	 * @param value
 	 */
 	public void setByteArray(String key, byte[] value) {
-		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_BYTEARRAY, key, value);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_BYTEARRAY, key, value);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -236,7 +332,12 @@ public class NBTCompound {
 	 * @return The stored value or NMS fallback
 	 */
 	public byte[] getByteArray(String key) {
-		return (byte[]) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_BYTEARRAY, key);
+		try {
+			readLock.lock();
+			return (byte[]) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_BYTEARRAY, key);
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
@@ -246,8 +347,13 @@ public class NBTCompound {
 	 * @param value
 	 */
 	public void setIntArray(String key, int[] value) {
-		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_INTARRAY, key, value);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_INTARRAY, key, value);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -257,7 +363,12 @@ public class NBTCompound {
 	 * @return The stored value or NMS fallback
 	 */
 	public int[] getIntArray(String key) {
-		return (int[]) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_INTARRAY, key);
+		try {
+			readLock.lock();
+			return (int[]) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_INTARRAY, key);
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
@@ -267,8 +378,13 @@ public class NBTCompound {
 	 * @param value
 	 */
 	public void setBoolean(String key, Boolean value) {
-		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_BOOLEAN, key, value);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_BOOLEAN, key, value);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	protected void set(String key, Object val) {
@@ -283,7 +399,12 @@ public class NBTCompound {
 	 * @return The stored value or NMS fallback
 	 */
 	public Boolean getBoolean(String key) {
-		return (Boolean) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_BOOLEAN, key);
+		try {
+			readLock.lock();
+			return (Boolean) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_BOOLEAN, key);
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
@@ -293,8 +414,13 @@ public class NBTCompound {
 	 * @param value
 	 */
 	public void setObject(String key, Object value) {
-		NBTReflectionUtil.setObject(this, key, value);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.setObject(this, key, value);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -305,29 +431,75 @@ public class NBTCompound {
 	 * @return The created Object or null if empty
 	 */
 	public <T> T getObject(String key, Class<T> type) {
-		return NBTReflectionUtil.getObject(this, key, type);
+		try {
+			readLock.lock();
+			return NBTReflectionUtil.getObject(this, key, type);
+		} finally {
+			readLock.unlock();
+		}
 	}
-	
+
 	/**
 	 * Save an ItemStack as a compound under a given key
 	 * 
 	 * @param key
 	 * @param item
 	 */
-	public void setItemStack(String key, ItemStack item){
-		removeKey(key);
-		addCompound(key).mergeCompound(NBTItem.convertItemtoNBT(item));
+	public void setItemStack(String key, ItemStack item) {
+		try {
+			writeLock.lock();
+			removeKey(key);
+			addCompound(key).mergeCompound(NBTItem.convertItemtoNBT(item));
+		} finally {
+			writeLock.unlock();
+		}
 	}
-	
+
 	/**
 	 * Get an ItemStack that was saved at the given key
 	 * 
 	 * @param key
 	 * @return
 	 */
-	public ItemStack getItemStack(String key){
-		NBTCompound comp = getCompound(key);
-		return NBTItem.convertNBTtoItem(comp);
+	public ItemStack getItemStack(String key) {
+		try {
+			readLock.lock();
+			NBTCompound comp = getCompound(key);
+			return NBTItem.convertNBTtoItem(comp);
+		} finally {
+			readLock.unlock();
+		}
+	}
+	
+		/**
+	 * Setter
+	 *
+	 * @param key
+	 * @param value
+	 */
+	public void setUUID(String key, UUID value) {
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_UUID, key, value);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
+	}
+
+	/**
+	 * Getter
+	 *
+	 * @param key
+	 * @return The stored value or NMS fallback
+	 */
+	public UUID getUUID(String key) {
+		try {
+			readLock.lock();
+			return (UUID) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_UUID, key);
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
@@ -335,25 +507,40 @@ public class NBTCompound {
 	 * @return True if the key is set
 	 */
 	public Boolean hasKey(String key) {
-		Boolean b = (Boolean) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_HAS_KEY, key);
-		if (b == null)
-			return false;
-		return b;
+		try {
+			readLock.lock();
+			Boolean b = (Boolean) NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_HAS_KEY, key);
+			if (b == null)
+				return false;
+			return b;
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
 	 * @param key Deletes the given Key
 	 */
 	public void removeKey(String key) {
-		NBTReflectionUtil.remove(this, key);
-		saveCompound();
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.remove(this, key);
+			saveCompound();
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
 	 * @return Set of all stored Keys
 	 */
 	public Set<String> getKeys() {
-		return NBTReflectionUtil.getKeys(this);
+		try {
+			readLock.lock();
+			return NBTReflectionUtil.getKeys(this);
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
@@ -363,14 +550,19 @@ public class NBTCompound {
 	 * @return The subCompound Object
 	 */
 	public NBTCompound addCompound(String name) {
-		if (getType(name) == NBTType.NBTTagCompound)
-			return getCompound(name);
-		NBTReflectionUtil.addNBTTagCompound(this, name);
-		NBTCompound comp = getCompound(name);
-		if(comp == null)
-			throw new NbtApiException("Error while adding Compound, got null!");
-		saveCompound();
-		return comp;
+		try {
+			writeLock.lock();
+			if (getType(name) == NBTType.NBTTagCompound)
+				return getCompound(name);
+			NBTReflectionUtil.addNBTTagCompound(this, name);
+			NBTCompound comp = getCompound(name);
+			if (comp == null)
+				throw new NbtApiException("Error while adding Compound, got null!");
+			saveCompound();
+			return comp;
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -378,12 +570,17 @@ public class NBTCompound {
 	 * @return The Compound instance or null
 	 */
 	public NBTCompound getCompound(String name) {
-		if (getType(name) != NBTType.NBTTagCompound)
+		try {
+			readLock.lock();
+			if (getType(name) != NBTType.NBTTagCompound)
+				return null;
+			NBTCompound next = new NBTCompound(this, name);
+			if (NBTReflectionUtil.valideCompound(next))
+				return next;
 			return null;
-		NBTCompound next = new NBTCompound(this, name);
-		if (NBTReflectionUtil.valideCompound(next))
-			return next;
-		return null;
+		} finally {
+			readLock.unlock();
+		}
 	}

 	/**
@@ -391,9 +588,14 @@ public class NBTCompound {
 	 * @return The retrieved String List
 	 */
 	public NBTList<String> getStringList(String name) {
-		NBTList<String> list = NBTReflectionUtil.getList(this, name, NBTType.NBTTagString, String.class);
-		saveCompound();
-		return list;
+		try {
+			writeLock.lock();
+			NBTList<String> list = NBTReflectionUtil.getList(this, name, NBTType.NBTTagString, String.class);
+			saveCompound();
+			return list;
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -401,39 +603,59 @@ public class NBTCompound {
 	 * @return The retrieved Integer List
 	 */
 	public NBTList<Integer> getIntegerList(String name) {
-		NBTList<Integer> list = NBTReflectionUtil.getList(this, name, NBTType.NBTTagInt, Integer.class);
-		saveCompound();
-		return list;
+		try {
+			writeLock.lock();
+			NBTList<Integer> list = NBTReflectionUtil.getList(this, name, NBTType.NBTTagInt, Integer.class);
+			saveCompound();
+			return list;
+		} finally {
+			writeLock.unlock();
+		}
 	}
-	
+
 	/**
 	 * @param name
 	 * @return The retrieved Float List
 	 */
 	public NBTList<Float> getFloatList(String name) {
-		NBTList<Float> list = NBTReflectionUtil.getList(this, name, NBTType.NBTTagFloat, Float.class);
-		saveCompound();
-		return list;
+		try {
+			writeLock.lock();
+			NBTList<Float> list = NBTReflectionUtil.getList(this, name, NBTType.NBTTagFloat, Float.class);
+			saveCompound();
+			return list;
+		} finally {
+			writeLock.unlock();
+		}
 	}
-	
+
 	/**
 	 * @param name
 	 * @return The retrieved Double List
 	 */
 	public NBTList<Double> getDoubleList(String name) {
-		NBTList<Double> list = NBTReflectionUtil.getList(this, name, NBTType.NBTTagDouble, Double.class);
-		saveCompound();
-		return list;
+		try {
+			writeLock.lock();
+			NBTList<Double> list = NBTReflectionUtil.getList(this, name, NBTType.NBTTagDouble, Double.class);
+			saveCompound();
+			return list;
+		} finally {
+			writeLock.unlock();
+		}
 	}
-	
+
 	/**
 	 * @param name
 	 * @return The retrieved Long List
 	 */
 	public NBTList<Long> getLongList(String name) {
-		NBTList<Long> list = NBTReflectionUtil.getList(this, name, NBTType.NBTTagLong, Long.class);
-		saveCompound();
-		return list;
+		try {
+			writeLock.lock();
+			NBTList<Long> list = NBTReflectionUtil.getList(this, name, NBTType.NBTTagLong, Long.class);
+			saveCompound();
+			return list;
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -441,9 +663,15 @@ public class NBTCompound {
 	 * @return The retrieved Compound List
 	 */
 	public NBTCompoundList getCompoundList(String name) {
-		NBTCompoundList list = (NBTCompoundList) NBTReflectionUtil.getList(this, name, NBTType.NBTTagCompound, NBTListCompound.class);
-		saveCompound();
-		return list;
+		try {
+			writeLock.lock();
+			NBTCompoundList list = (NBTCompoundList) NBTReflectionUtil.getList(this, name, NBTType.NBTTagCompound,
+					NBTListCompound.class);
+			saveCompound();
+			return list;
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	/**
@@ -451,25 +679,38 @@ public class NBTCompound {
 	 * @return The type of the given stored key or null
 	 */
 	public NBTType getType(String name) {
-		if (MinecraftVersion.getVersion() == MinecraftVersion.MC1_7_R4)
-			return null;
-		Object o = NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_TYPE, name);
-		if (o == null)
-			return null;
-		return NBTType.valueOf((byte) o);
+		try {
+			readLock.lock();
+			if (MinecraftVersion.getVersion() == MinecraftVersion.MC1_7_R4) {
+				Object nbtbase = NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET, name);
+				if(nbtbase == null)
+					return null;
+				return NBTType.valueOf((byte)ReflectionMethod.COMPOUND_OWN_TYPE.run(nbtbase));
+			}
+			Object o = NBTReflectionUtil.getData(this, ReflectionMethod.COMPOUND_GET_TYPE, name);
+			if (o == null)
+				return null;
+			return NBTType.valueOf((byte) o);
+		} finally {
+			readLock.unlock();
+		}
 	}
-	
+
 	public void writeCompound(OutputStream stream) {
-		NBTReflectionUtil.writeApiNBT(this, stream);
+		try {
+			writeLock.lock();
+			NBTReflectionUtil.writeApiNBT(this, stream);
+		} finally {
+			writeLock.unlock();
+		}
 	}

 	@Override
 	public String toString() {
-		/*StringBuilder result = new StringBuilder();
-		for (String key : getKeys()) {
-			result.append(toString(key));
-		}
-		return result.toString();*/
+		/*
+		 * StringBuilder result = new StringBuilder(); for (String key : getKeys()) {
+		 * result.append(toString(key)); } return result.toString();
+		 */
 		return asNBTString();
 	}

@@ -480,30 +721,31 @@ public class NBTCompound {
 	 */
 	@Deprecated
 	public String toString(String key) {
-		/*StringBuilder result = new StringBuilder();
-		NBTCompound compound = this;
-		while (compound.getParent() != null) {
-			result.append("   ");
-			compound = compound.getParent();
-		}
-		if (this.getType(key) == NBTType.NBTTagCompound) {
-			return this.getCompound(key).toString();
-		} else {
-			return result + "-" + key + ": " + getContent(key) + System.lineSeparator();
-		}*/
+		/*
+		 * StringBuilder result = new StringBuilder(); NBTCompound compound = this;
+		 * while (compound.getParent() != null) { result.append("   "); compound =
+		 * compound.getParent(); } if (this.getType(key) == NBTType.NBTTagCompound) {
+		 * return this.getCompound(key).toString(); } else { return result + "-" + key +
+		 * ": " + getContent(key) + System.lineSeparator(); }
+		 */
 		return asNBTString();
 	}

 	/**
 	 * @deprecated Just use toString()
-	 * @return A json valid nbt string for this Compound
+	 * @return A {@link String} representation of the NBT in Mojang JSON. This is different from normal JSON!
 	 */
 	@Deprecated
 	public String asNBTString() {
-		Object comp = NBTReflectionUtil.gettoCompount(getCompound(), this);
-		if (comp == null)
-			return "{}";
-		return comp.toString();
+		try {
+			readLock.lock();
+			Object comp = NBTReflectionUtil.gettoCompount(getCompound(), this);
+			if (comp == null)
+				return "{}";
+			return comp.toString();
+		} finally {
+			readLock.unlock();
+		}
 	}

 	@Override
@@ -512,8 +754,8 @@ 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
+	 * 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
 	 */
 	@Override
 	public boolean equals(Object obj) {
@@ -24,8 +24,8 @@ public class NBTEntity extends NBTCompound {
 	 */
 	public NBTEntity(Entity entity) {
 		super(null, null);
-		if (entity == null || entity.isDead()) {
-			throw new NullPointerException("Entity can't be null/dead!");
+		if (entity == null) {
+			throw new NullPointerException("Entity can't be null!");
 		}
 		ent = entity;
 	}
@@ -46,13 +46,18 @@ public class NBTFile extends NBTCompound {
 	 * @throws IOException
 	 */
 	public void save() throws IOException {
-		if (!file.exists()) {
-			file.getParentFile().mkdirs();
-			if (!file.createNewFile())
-				throw new IOException("Unable to create file at " + file.getAbsolutePath());
+		try {
+			getWriteLock().lock();
+			if (!file.exists()) {
+				file.getParentFile().mkdirs();
+				if (!file.createNewFile())
+					throw new IOException("Unable to create file at " + file.getAbsolutePath());
+			}
+			FileOutputStream outStream = new FileOutputStream(file);
+			NBTReflectionUtil.writeNBT(nbt, outStream);
+		} finally {
+			getWriteLock().unlock();
 		}
-		FileOutputStream outStream = new FileOutputStream(file);
-		NBTReflectionUtil.writeNBT(nbt, outStream);
 	}

 	/**
@@ -2,6 +2,7 @@ package de.tr7zw.changeme.nbtapi;

 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;

 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;

@@ -15,6 +16,8 @@ import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
 public class NBTItem extends NBTCompound {

 	private ItemStack bukkitItem;
+	private boolean directApply;
+	private ItemStack originalSrcStack = null;

 	/**
 	 * Constructor for NBTItems. The ItemStack will be cloned!
@@ -22,11 +25,27 @@ public class NBTItem extends NBTCompound {
 	 * @param item
 	 */
 	public NBTItem(ItemStack item) {
+		this(item, false);
+	}
+	
+	/**
+	 * Constructor for NBTItems. The ItemStack will be cloned! If directApply is true,
+	 * all changed will be mapped to the original item. Changes to the NBTItem will overwrite changes done
+	 * to the original item in that case.
+	 * 
+	 * @param item
+	 * @param directApply
+	 */
+	public NBTItem(ItemStack item, boolean directApply) {
 		super(null, null);
 		if (item == null || item.getType() == Material.AIR) {
 			throw new NullPointerException("ItemStack can't be null/Air!");
 		}
+		this.directApply = directApply;
 		bukkitItem = item.clone();
+		if(directApply) {
+			this.originalSrcStack = item;
+		}
 	}

 	@Override
@@ -41,6 +60,58 @@ public class NBTItem extends NBTCompound {
 		bukkitItem = (ItemStack) ReflectionMethod.ITEMSTACK_BUKKITMIRROR.run(null, stack);
 	}

+	/**
+	 * Apply stored NBT tags to the provided ItemStack.
+	 * <p>
+	 * Note: This will completely override current item's {@link ItemMeta}.
+	 * If you still want to keep the original item's NBT tags, see
+	 * {@link #mergeNBT(ItemStack)} and {@link #mergeCustomNBT(ItemStack)}.
+	 *
+	 * @param item ItemStack that should get the new NBT data
+	 */
+	public void applyNBT(ItemStack item) {
+		if (item == null || item.getType() == Material.AIR) {
+			throw new NullPointerException("ItemStack can't be null/Air!");
+		}
+		NBTItem nbti = new NBTItem(new ItemStack(item.getType()));
+		nbti.mergeCompound(this);
+		item.setItemMeta(nbti.getItem().getItemMeta());
+	}
+
+	/**
+	 * Merge all NBT tags to the provided ItemStack.
+	 *
+	 * @param item ItemStack that should get the new NBT data
+	 */
+	public void mergeNBT(ItemStack item) {
+		NBTItem nbti = new NBTItem(item);
+		nbti.mergeCompound(this);
+		item.setItemMeta(nbti.getItem().getItemMeta());
+	}
+
+	/**
+	 * Merge only custom (non-vanilla) NBT tags to the provided ItemStack.
+	 *
+	 * @param item ItemStack that should get the new NBT data
+	 */
+	public void mergeCustomNBT(ItemStack item) {
+		if (item == null || item.getType() == Material.AIR) {
+			throw new NullPointerException("ItemStack can't be null/Air!");
+		}
+		ItemMeta meta = item.getItemMeta();
+		NBTReflectionUtil.getUnhandledNBTTags(meta).putAll(NBTReflectionUtil.getUnhandledNBTTags(bukkitItem.getItemMeta()));
+		item.setItemMeta(meta);
+	}
+
+	/**
+	 * Remove all custom (non-vanilla) NBT tags from the NBTItem.
+	 */
+	public void clearCustomNBT() {
+		ItemMeta meta = bukkitItem.getItemMeta();
+		NBTReflectionUtil.getUnhandledNBTTags(meta).clear();
+		bukkitItem.setItemMeta(meta);
+	}
+
 	/**
 	 * @return The modified ItemStack
 	 */
@@ -84,4 +155,11 @@ public class NBTItem extends NBTCompound {
 				NBTReflectionUtil.convertNBTCompoundtoNMSItem(comp));
 	}

+	@Override
+	protected void saveCompound() {
+		if(directApply) {
+			applyNBT(originalSrcStack);
+		}
+	}
+
 }
@@ -31,14 +31,14 @@ public abstract class NBTList<T> implements List<T> {
 		this.type = type;
 		this.listObject = list;
 	}
-	
+
 	/**
 	 * @return Name of this list-compound
 	 */
-	public String getName(){
+	public String getName() {
 		return listName;
 	}
-	
+
 	/**
 	 * @return The Compound's parent Object
 	 */
@@ -55,6 +55,7 @@ public abstract class NBTList<T> implements List<T> {
 	@Override
 	public boolean add(T element) {
 		try {
+			parent.getWriteLock().lock();
 			if (MinecraftVersion.getVersion().getVersionId() >= MinecraftVersion.MC1_14_R1.getVersionId()) {
 				ReflectionMethod.LIST_ADD.run(listObject, size(), asTag(element));
 			} else {
@@ -64,12 +65,15 @@ public abstract class NBTList<T> implements List<T> {
 			return true;
 		} catch (Exception ex) {
 			throw new NbtApiException(ex);
+		} finally {
+			parent.getWriteLock().unlock();
 		}
 	}

 	@Override
 	public void add(int index, T element) {
 		try {
+			parent.getWriteLock().lock();
 			if (MinecraftVersion.getVersion().getVersionId() >= MinecraftVersion.MC1_14_R1.getVersionId()) {
 				ReflectionMethod.LIST_ADD.run(listObject, index, asTag(element));
 			} else {
@@ -78,37 +82,48 @@ public abstract class NBTList<T> implements List<T> {
 			save();
 		} catch (Exception ex) {
 			throw new NbtApiException(ex);
+		} finally {
+			parent.getWriteLock().unlock();
 		}
 	}

 	@Override
 	public T set(int index, T element) {
 		try {
+			parent.getWriteLock().lock();
 			T prev = get(index);
 			ReflectionMethod.LIST_SET.run(listObject, index, asTag(element));
 			save();
 			return prev;
 		} catch (Exception ex) {
 			throw new NbtApiException(ex);
+		} finally {
+			parent.getWriteLock().unlock();
 		}
 	}

 	public T remove(int i) {
 		try {
+			parent.getWriteLock().lock();
 			T old = get(i);
 			ReflectionMethod.LIST_REMOVE_KEY.run(listObject, i);
 			save();
 			return old;
 		} catch (Exception ex) {
 			throw new NbtApiException(ex);
+		} finally {
+			parent.getWriteLock().unlock();
 		}
 	}

 	public int size() {
 		try {
+			parent.getReadLock().lock();
 			return (int) ReflectionMethod.LIST_SIZE.run(listObject);
 		} catch (Exception ex) {
 			throw new NbtApiException(ex);
+		} finally {
+			parent.getReadLock().unlock();
 		}
 	}

@@ -133,89 +148,134 @@ public abstract class NBTList<T> implements List<T> {

 	@Override
 	public boolean contains(Object o) {
-		for (int i = 0; i < size(); i++) {
-			if (o.equals(get(i)))
-				return true;
+		try {
+			parent.getReadLock().lock();
+			for (int i = 0; i < size(); i++) {
+				if (o.equals(get(i)))
+					return true;
+			}
+			return false;
+		} finally {
+			parent.getReadLock().unlock();
 		}
-		return false;
 	}

 	@Override
 	public int indexOf(Object o) {
-		for (int i = 0; i < size(); i++) {
-			if (o.equals(get(i)))
-				return i;
+		try {
+			parent.getReadLock().lock();
+			for (int i = 0; i < size(); i++) {
+				if (o.equals(get(i)))
+					return i;
+			}
+			return -1;
+		} finally {
+			parent.getReadLock().unlock();
 		}
-		return -1;
 	}

 	@Override
 	public boolean addAll(Collection<? extends T> c) {
-		int size = size();
-		for (T ele : c) {
-			add(ele);
+		try {
+			parent.getWriteLock().lock();
+			int size = size();
+			for (T ele : c) {
+				add(ele);
+			}
+			return size != size();
+		} finally {
+			parent.getWriteLock().unlock();
 		}
-		return size != size();
 	}

 	@Override
 	public boolean addAll(int index, Collection<? extends T> c) {
-		int size = size();
-		for (T ele : c) {
-			add(index++, ele);
+		try {
+			parent.getWriteLock().lock();
+			int size = size();
+			for (T ele : c) {
+				add(index++, ele);
+			}
+			return size != size();
+		} finally {
+			parent.getWriteLock().unlock();
 		}
-		return size != size();
 	}

 	@Override
 	public boolean containsAll(Collection<?> c) {
-		for (Object ele : c) {
-			if (!contains(ele))
-				return false;
+		try {
+			parent.getReadLock().lock();
+			for (Object ele : c) {
+				if (!contains(ele))
+					return false;
+			}
+			return true;
+		} finally {
+			parent.getReadLock().unlock();
 		}
-		return true;
 	}

 	@Override
 	public int lastIndexOf(Object o) {
-		int index = -1;
-		for (int i = 0; i < size(); i++) {
-			if (o.equals(get(i)))
-				index = i;
+		try {
+			parent.getReadLock().lock();
+			int index = -1;
+			for (int i = 0; i < size(); i++) {
+				if (o.equals(get(i)))
+					index = i;
+			}
+			return index;
+		} finally {
+			parent.getReadLock().unlock();
 		}
-		return index;
 	}

 	@Override
 	public boolean removeAll(Collection<?> c) {
-		int size = size();
-		for (Object obj : c) {
-			remove(obj);
+		try {
+			parent.getWriteLock().lock();
+			int size = size();
+			for (Object obj : c) {
+				remove(obj);
+			}
+			return size != size();
+		} finally {
+			parent.getWriteLock().unlock();
 		}
-		return size != size();
 	}

 	@Override
 	public boolean retainAll(Collection<?> c) {
-		int size = size();
-		for (Object obj : c) {
-			for (int i = 0; i < size(); i++) {
-				if (!obj.equals(get(i))) {
-					remove(i--);
+		try {
+			parent.getWriteLock().lock();
+			int size = size();
+			for (Object obj : c) {
+				for (int i = 0; i < size(); i++) {
+					if (!obj.equals(get(i))) {
+						remove(i--);
+					}
 				}
 			}
+			return size != size();
+		} finally {
+			parent.getWriteLock().unlock();
 		}
-		return size != size();
 	}

 	@Override
 	public boolean remove(Object o) {
-		int size = size();
-		int id = -1;
-		while ((id = indexOf(o)) != -1) {
-			remove(id);
+		try {
+			parent.getWriteLock().lock();
+			int size = size();
+			int id = -1;
+			while ((id = indexOf(o)) != -1) {
+				remove(id);
+			}
+			return size != size();
+		} finally {
+			parent.getWriteLock().unlock();
 		}
-		return size != size();
 	}

 	@Override
@@ -235,6 +295,12 @@ public abstract class NBTList<T> implements List<T> {
 					throw new NoSuchElementException();
 				return get(++index);
 			}
+
+			@Override
+			public void remove() {
+				NBTList.this.remove(index);
+				index--;
+			}
 		};
 	}

@@ -292,6 +358,7 @@ public abstract class NBTList<T> implements List<T> {
 			@Override
 			public void remove() {
 				list.remove(index);
+				index--;
 			}

 			@Override
@@ -303,41 +370,60 @@ public abstract class NBTList<T> implements List<T> {

 	@Override
 	public Object[] toArray() {
-		Object[] ar = new Object[size()];
-		for (int i = 0; i < size(); i++)
-			ar[i] = get(i);
-		return ar;
+		try {
+			parent.getReadLock().lock();
+			Object[] ar = new Object[size()];
+			for (int i = 0; i < size(); i++)
+				ar[i] = get(i);
+			return ar;
+		} finally {
+			parent.getReadLock().unlock();
+		}
 	}

 	@SuppressWarnings("unchecked")
 	@Override
 	public <E> E[] toArray(E[] a) {
-		E[] ar = Arrays.copyOf(a, size());
-		Arrays.fill(ar, null);
-		Class<?> arrayclass = a.getClass().getComponentType();
-		for (int i = 0; i < size(); i++) {
-			T obj = get(i);
-			if (arrayclass.isInstance(obj)) {
-				ar[i] = (E) get(i);
-			} else {
-				throw new ArrayStoreException("The array does not match the objects stored in the List.");
+		try {
+			parent.getReadLock().lock();
+			E[] ar = Arrays.copyOf(a, size());
+			Arrays.fill(ar, null);
+			Class<?> arrayclass = a.getClass().getComponentType();
+			for (int i = 0; i < size(); i++) {
+				T obj = get(i);
+				if (arrayclass.isInstance(obj)) {
+					ar[i] = (E) get(i);
+				} else {
+					throw new ArrayStoreException("The array does not match the objects stored in the List.");
+				}
 			}
+			return ar;
+		} finally {
+			parent.getReadLock().unlock();
 		}
-		return ar;
 	}

 	@Override
 	public List<T> subList(int fromIndex, int toIndex) {
-		ArrayList<T> list = new ArrayList<>();
-		for (int i = fromIndex; i < toIndex; i++)
-			list.add(get(i));
-		return list;
+		try {
+			parent.getReadLock().lock();
+			ArrayList<T> list = new ArrayList<>();
+			for (int i = fromIndex; i < toIndex; i++)
+				list.add(get(i));
+			return list;
+		} finally {
+			parent.getReadLock().unlock();
+		}
 	}

 	@Override
 	public String toString() {
-		return listObject.toString();
+		try {
+			parent.getReadLock().lock();
+			return listObject.toString();
+		} finally {
+			parent.getReadLock().unlock();
+		}
 	}

-
 }
@@ -3,12 +3,15 @@ package de.tr7zw.changeme.nbtapi;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
+import java.lang.reflect.Field;
 import java.util.ArrayDeque;
 import java.util.Deque;
+import java.util.Map;
 import java.util.Set;

 import org.bukkit.block.BlockState;
 import org.bukkit.entity.Entity;
+import org.bukkit.inventory.meta.ItemMeta;

 import de.tr7zw.changeme.nbtapi.utils.GsonWrapper;
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
@@ -25,6 +28,17 @@ import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
 */
 public class NBTReflectionUtil {

+	private static Field field_unhandledTags = null;
+
+	static {
+		try {
+			field_unhandledTags = ClassWrapper.CRAFT_METAITEM.getClazz().getDeclaredField("unhandledTags");
+			field_unhandledTags.setAccessible(true);
+		} catch (NoSuchFieldException e) {
+			
+		}
+	}
+
 	/**
 	 * Hidden constructor
 	 */
@@ -146,6 +160,21 @@ public class NBTReflectionUtil {
 		}
 	}

+	/**
+	 * Gets a live copy of non-vanilla NBT tags.
+	 *
+	 * @param meta ItemMeta from which tags should be retrieved
+	 * @return Map containing unhandled (custom) NBT tags
+	 */
+	@SuppressWarnings("unchecked")
+	public static Map<String, Object> getUnhandledNBTTags(ItemMeta meta) {
+		try {
+			return (Map<String, Object>) field_unhandledTags.get(meta);
+		} catch (Exception e) {
+			throw new NbtApiException("Exception while getting unhandled tags from ItemMeta!", e);
+		}
+	}
+
 	/**
 	 * Gets the Vanilla NBT Compound from a given NMS Entity
 	 * 
@@ -188,10 +217,15 @@ public class NBTReflectionUtil {
 	 */
 	public static Object getTileEntityNBTTagCompound(BlockState tile) {
 		try {
-			Object pos = ObjectCreator.NMS_BLOCKPOSITION.getInstance(tile.getX(), tile.getY(), tile.getZ());
 			Object cworld = ClassWrapper.CRAFT_WORLD.getClazz().cast(tile.getWorld());
 			Object nmsworld = ReflectionMethod.CRAFT_WORLD_GET_HANDLE.run(cworld);
-			Object o = ReflectionMethod.NMS_WORLD_GET_TILEENTITY.run(nmsworld, pos);
+			Object o = null;
+			if(MinecraftVersion.getVersion() == MinecraftVersion.MC1_7_R4) {
+				o = ReflectionMethod.NMS_WORLD_GET_TILEENTITY_1_7_10.run(nmsworld, tile.getX(), tile.getY(), tile.getZ());
+			}else {
+				Object pos = ObjectCreator.NMS_BLOCKPOSITION.getInstance(tile.getX(), tile.getY(), tile.getZ());
+				o = ReflectionMethod.NMS_WORLD_GET_TILEENTITY.run(nmsworld, pos);
+			}
 			Object tag = ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz().newInstance();
 			Object answer = ReflectionMethod.TILEENTITY_GET_NBT.run(o, tag);
 			if (answer == null)
@@ -210,11 +244,21 @@ public class NBTReflectionUtil {
 	 */
 	public static void setTileEntityNBTTagCompound(BlockState tile, Object comp) {
 		try {
-			Object pos = ObjectCreator.NMS_BLOCKPOSITION.getInstance(tile.getX(), tile.getY(), tile.getZ());
 			Object cworld = ClassWrapper.CRAFT_WORLD.getClazz().cast(tile.getWorld());
 			Object nmsworld = ReflectionMethod.CRAFT_WORLD_GET_HANDLE.run(cworld);
-			Object o = ReflectionMethod.NMS_WORLD_GET_TILEENTITY.run(nmsworld, pos);
-			ReflectionMethod.TILEENTITY_SET_NBT.run(o, comp);
+			Object o = null;
+			if(MinecraftVersion.getVersion() == MinecraftVersion.MC1_7_R4) {
+				o = ReflectionMethod.NMS_WORLD_GET_TILEENTITY_1_7_10.run(nmsworld, tile.getX(), tile.getY(), tile.getZ());
+			}else {
+				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()) {
+				Object blockData = ReflectionMethod.TILEENTITY_GET_BLOCKDATA.run(o);
+				ReflectionMethod.TILEENTITY_SET_NBT.run(o, blockData, comp);
+			}else {
+				ReflectionMethod.TILEENTITY_SET_NBT_LEGACY1151.run(o, comp);
+			}
 		} catch (Exception e) {
 			throw new NbtApiException("Exception while setting NBTData for a TileEntity!", e);
 		}
@@ -254,8 +298,9 @@ public class NBTReflectionUtil {
 		if (nbttag == null) {
 			nbttag = ObjectCreator.NMS_NBTTAGCOMPOUND.getInstance();
 		}
-		if (!valideCompound(comp))
+		if (!valideCompound(comp)) {
 			return;
+		}
 		Object workingtag = gettoCompount(nbttag, comp);
 		try {
 			ReflectionMethod.COMPOUND_SET.run(workingtag, name,
@@ -25,7 +25,7 @@ public class NBTTileEntity extends NBTCompound {
 	 */
 	public NBTTileEntity(BlockState tile) {
 		super(null, null);
-		if (tile == null || !tile.isPlaced()) {
+		if (tile == null || (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_8_R3) && !tile.isPlaced())) {
 			throw new NullPointerException("Tile can't be null/not placed!");
 		}
 		this.tile = tile;
@@ -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());
 		}
@@ -16,17 +16,8 @@ import org.bukkit.Bukkit;
@SuppressWarnings("javadoc")
 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_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_16_R3(1163);

 	private static MinecraftVersion version;
 	private static Boolean hasGsonSupport;
@@ -36,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.3.0";
+	protected static final String VERSION = "2.6.0";

 	private final int versionId;

@@ -53,6 +44,26 @@ public enum MinecraftVersion {
 	public int getVersionId() {
 		return versionId;
 	}
+	
+	/**
+	 * Returns true if the current versions is at least the given Version
+	 * 
+	 * @param version The minimum version
+	 * @return
+	 */
+	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
@@ -82,17 +93,20 @@ public enum MinecraftVersion {

 	private static void init() {
 		try {
-			if (!bStatsDisabled)
+			if (hasGsonSupport() && !bStatsDisabled)
 				new ApiMetricsLite();
 		} catch (Exception ex) {
-			logger.log(Level.WARNING, "[NBTAPI] Error enabeling Metrics!", ex);
-		}
-		try {
-			if(!updateCheckDisabled)
-				VersionChecker.checkForUpdates();
-		} catch (Exception ex) {
-			logger.log(Level.WARNING, "[NBTAPI] Error while checking for updates!", ex);
+			logger.log(Level.WARNING, "[NBTAPI] Error enabling Metrics!", ex);
 		}
+
+		if (hasGsonSupport() && !updateCheckDisabled)
+			new Thread(() -> {
+				try {
+					VersionChecker.checkForUpdates();
+				} catch (Exception ex) {
+					logger.log(Level.WARNING, "[NBTAPI] Error while checking for updates!", ex);
+				}
+			}).start();
 		// Maven's Relocate is clever and changes strings, too. So we have to use this
 		// little "trick" ... :D (from bStats)
 		final String defaultPackage = new String(new byte[] { 'd', 'e', '.', 't', 'r', '7', 'z', 'w', '.', 'c', 'h',
@@ -137,10 +151,10 @@ public enum MinecraftVersion {
 	public static void disableBStats() {
 		bStatsDisabled = true;
 	}
-	
+
 	/**
-	 * Disables the update check. Uses Spiget to get the current version and
-	 * prints a warning when outdated.
+	 * Disables the update check. Uses Spiget to get the current version and prints
+	 * a warning when outdated.
 	 */
 	public static void disableUpdateCheck() {
 		updateCheckDisabled = true;
@@ -155,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()
+				MinecraftVersion.getLogger().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] 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() + "'");
 		}
 	}
@@ -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
@@ -15,6 +15,7 @@ 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"),
@@ -29,7 +30,7 @@ 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"),
+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"),
@@ -38,8 +39,10 @@ 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"),
-NMS_GAMEPROFILESERIALIZER(PackageWrapper.NMS, "GameProfileSerializer")
+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)
 ;
 	
    private Class<?> clazz;
@@ -61,7 +64,19 @@ NMS_GAMEPROFILESERIALIZER(PackageWrapper.NMS, "GameProfileSerializer")
            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);
+        	getLogger().log(Level.WARNING, "[NBTAPI] Error while trying to resolve the class '" + suffix + "'!", 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){
+        	getLogger().log(Level.WARNING, "[NBTAPI] Error while trying to resolve the class '" + path + "'!", ex);
        }
    }
    
@@ -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
@@ -16,40 +16,41 @@ import static de.tr7zw.changeme.nbtapi.utils.MinecraftVersion.logger;
 */
@SuppressWarnings("javadoc")
 public enum ObjectCreator {
-    NMS_NBTTAGCOMPOUND(null, null, ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()),
-    NMS_BLOCKPOSITION(null, null, ClassWrapper.NMS_BLOCKPOSITION.getClazz(), int.class, int.class, int.class),
-    NMS_COMPOUNDFROMITEM(MinecraftVersion.MC1_11_R1, null, ClassWrapper.NMS_ITEMSTACK.getClazz(), ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()),
-    ;
+	NMS_NBTTAGCOMPOUND(null, null, ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()),
+	NMS_BLOCKPOSITION(null, null, ClassWrapper.NMS_BLOCKPOSITION.getClazz(), int.class, int.class, int.class),
+	NMS_COMPOUNDFROMITEM(MinecraftVersion.MC1_11_R1, null, ClassWrapper.NMS_ITEMSTACK.getClazz(), ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()),;

-    private Constructor<?> construct;
-    private Class<?> targetClass;
+	private Constructor<?> construct;
+	private Class<?> targetClass;
+
+	ObjectCreator(MinecraftVersion from, MinecraftVersion to, Class<?> clazz, Class<?>... args) {
+		if (clazz == null)
+			return;
+		if (from != null && MinecraftVersion.getVersion().getVersionId() < from.getVersionId())
+			return;
+		if (to != null && MinecraftVersion.getVersion().getVersionId() > to.getVersionId())
+			return;
+		try {
+			this.targetClass = clazz;
+			construct = clazz.getDeclaredConstructor(args);
+			construct.setAccessible(true);
+		} catch (Exception ex) {
+			getLogger().log(Level.SEVERE, "Unable to find the constructor for the class '" + clazz.getName() + "'", ex);
+		}
+	}
+
+	/**
+	 * Creates an Object instance with given args
+	 * 
+	 * @param args
+	 * @return Object created
+	 */
+	public Object getInstance(Object... args) {
+		try {
+			return construct.newInstance(args);
+		} catch (Exception ex) {
+			throw new NbtApiException("Exception while creating a new instance of '" + targetClass + "'", ex);
+		}
+	}

-    ObjectCreator(MinecraftVersion from, MinecraftVersion to, Class<?> clazz, Class<?>... args){
-       if(from != null && MinecraftVersion.getVersion().getVersionId() < from.getVersionId())
-    	   return;
-       if(to != null && MinecraftVersion.getVersion().getVersionId() > to.getVersionId())
-    	   return;
-    	try{
-        	this.targetClass = clazz;
-            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);
-        }
-    }
-    
-    /**
-     * Creates an Object instance with given args
-     * 
-     * @param args
-     * @return Object created
-     */
-    public Object getInstance(Object... args){
-        try{
-            return construct.newInstance(args);
-        }catch(Exception ex){
-        	throw new NbtApiException("Exception while creating a new instance of '" + targetClass + "'", ex);
-        }
-    }
-    
 }
@@ -8,8 +8,8 @@ package de.tr7zw.changeme.nbtapi.utils.nmsmappings;
 */
@SuppressWarnings("javadoc")
 public enum PackageWrapper {
-	NMS("net.minecraft.server"),
-	CRAFTBUKKIT("org.bukkit.craftbukkit"),
+	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'})),
 	;
 	
 	private final String uri;
@@ -3,11 +3,10 @@ package de.tr7zw.changeme.nbtapi.utils.nmsmappings;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Method;
+import java.util.UUID;

 import org.bukkit.inventory.ItemStack;

-import com.mojang.authlib.GameProfile;
-
 import de.tr7zw.changeme.nbtapi.NbtApiException;
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;

@@ -30,10 +29,12 @@ public enum ReflectionMethod {
    COMPOUND_SET_BYTE(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class, byte.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "setByte")),
    COMPOUND_SET_DOUBLE(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class, double.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "setDouble")),
    COMPOUND_SET_BOOLEAN(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class, boolean.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "setBoolean")),
-    COMPOUND_MERGE(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "a")), //FIXME: No Spigot mapping!
+    COMPOUND_SET_UUID(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class, UUID.class}, MinecraftVersion.MC1_16_R1, new Since(MinecraftVersion.MC1_16_R1, "a")),
+    COMPOUND_MERGE(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "a")), //FIXME: No Spigot mapping!
    COMPOUND_SET(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class, ClassWrapper.NMS_NBTBASE.getClazz()}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "set")),
    COMPOUND_GET(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "get")),
    COMPOUND_GET_LIST(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class, int.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getList")),
+    COMPOUND_OWN_TYPE(ClassWrapper.NMS_NBTBASE.getClazz(), new Class[]{}, MinecraftVersion.MC1_7_R4, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getTypeId")), // Only needed for 1.7.10 getType
    
    COMPOUND_GET_FLOAT(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getFloat")),
    COMPOUND_GET_STRING(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getString")),
@@ -45,6 +46,7 @@ public enum ReflectionMethod {
    COMPOUND_GET_BYTE(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getByte")),
    COMPOUND_GET_DOUBLE(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getDouble")),
    COMPOUND_GET_BOOLEAN(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getBoolean")),
+    COMPOUND_GET_UUID(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_16_R1, new Since(MinecraftVersion.MC1_16_R1, "a")),
    COMPOUND_GET_COMPOUND(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getCompound")),
    
    NMSITEM_GETTAG(ClassWrapper.NMS_ITEMSTACK.getClazz(), new Class[] {}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getTag")),
@@ -53,45 +55,49 @@ public enum ReflectionMethod {
    
    COMPOUND_REMOVE_KEY(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "remove")),
    COMPOUND_HAS_KEY(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "hasKey")),
-    COMPOUND_GET_TYPE(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "b"), new Since(MinecraftVersion.MC1_9_R1, "d"), new Since(MinecraftVersion.MC1_15_R1, "e")), //FIXME: No Spigot mapping!
+    COMPOUND_GET_TYPE(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "b"), new Since(MinecraftVersion.MC1_9_R1, "d"), new Since(MinecraftVersion.MC1_15_R1, "e"), new Since(MinecraftVersion.MC1_16_R1, "d")), //FIXME: No Spigot mapping!
    COMPOUND_GET_KEYS(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "c"), new Since(MinecraftVersion.MC1_13_R1, "getKeys")),

    LISTCOMPOUND_GET_KEYS(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "c"), new Since(MinecraftVersion.MC1_13_R1, "getKeys")),
-    LIST_REMOVE_KEY(ClassWrapper.NMS_NBTTAGLIST.getClazz(), new Class[]{int.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "a"), new Since(MinecraftVersion.MC1_9_R1, "remove")),
+    LIST_REMOVE_KEY(ClassWrapper.NMS_NBTTAGLIST.getClazz(), new Class[]{int.class}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "a"), new Since(MinecraftVersion.MC1_9_R1, "remove")),
    LIST_SIZE(ClassWrapper.NMS_NBTTAGLIST.getClazz(), new Class[]{}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "size")),
-    LIST_SET(ClassWrapper.NMS_NBTTAGLIST.getClazz(), new Class[]{int.class, ClassWrapper.NMS_NBTBASE.getClazz()}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "a"), new Since(MinecraftVersion.MC1_13_R1, "set")),
+    LIST_SET(ClassWrapper.NMS_NBTTAGLIST.getClazz(), new Class[]{int.class, ClassWrapper.NMS_NBTBASE.getClazz()}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "a"), new Since(MinecraftVersion.MC1_13_R1, "set")),
    LEGACY_LIST_ADD(ClassWrapper.NMS_NBTTAGLIST.getClazz(), new Class[]{ClassWrapper.NMS_NBTBASE.getClazz()}, MinecraftVersion.MC1_7_R4, MinecraftVersion.MC1_13_R2, new Since(MinecraftVersion.MC1_7_R4, "add")),
    LIST_ADD(ClassWrapper.NMS_NBTTAGLIST.getClazz(), new Class[]{int.class, ClassWrapper.NMS_NBTBASE.getClazz()}, MinecraftVersion.MC1_14_R1, new Since(MinecraftVersion.MC1_14_R1, "add")),
    LIST_GET_STRING(ClassWrapper.NMS_NBTTAGLIST.getClazz(), new Class[]{int.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getString")),
    LIST_GET_COMPOUND(ClassWrapper.NMS_NBTTAGLIST.getClazz(), new Class[]{int.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "get")),
-    LIST_GET(ClassWrapper.NMS_NBTTAGLIST.getClazz(), new Class[]{int.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "g"), new Since(MinecraftVersion.MC1_9_R1, "h"), new Since(MinecraftVersion.MC1_12_R1, "i"), new Since(MinecraftVersion.MC1_13_R1, "get")),
+    LIST_GET(ClassWrapper.NMS_NBTTAGLIST.getClazz(), new Class[]{int.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "get"), new Since(MinecraftVersion.MC1_8_R3, "g"), new Since(MinecraftVersion.MC1_9_R1, "h"), new Since(MinecraftVersion.MC1_12_R1, "i"), new Since(MinecraftVersion.MC1_13_R1, "get")),
    
    ITEMSTACK_SET_TAG(ClassWrapper.NMS_ITEMSTACK.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "setTag")),
    ITEMSTACK_NMSCOPY(ClassWrapper.CRAFT_ITEMSTACK.getClazz(), new Class[]{ItemStack.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "asNMSCopy")),
    ITEMSTACK_BUKKITMIRROR(ClassWrapper.CRAFT_ITEMSTACK.getClazz(), new Class[]{ClassWrapper.NMS_ITEMSTACK.getClazz()}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "asCraftMirror")),

    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_7_R4, new Since(MinecraftVersion.MC1_7_R4, "getTileEntity")),
-    NMS_WORLD_SET_TILEENTITY(ClassWrapper.NMS_WORLDSERVER.getClazz(), new Class[]{ClassWrapper.NMS_BLOCKPOSITION.getClazz(), ClassWrapper.NMS_TILEENTITY.getClazz()}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "setTileEntity")),
-    NMS_WORLD_REMOVE_TILEENTITY(ClassWrapper.NMS_WORLDSERVER.getClazz(), new Class[]{ClassWrapper.NMS_BLOCKPOSITION.getClazz()}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "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(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_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")),
+
    TILEENTITY_LOAD_LEGACY191(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_MINECRAFTSERVER.getClazz(), ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_9_R1, MinecraftVersion.MC1_9_R1, new Since(MinecraftVersion.MC1_9_R1, "a")), //FIXME: No Spigot mapping!
    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(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_13_R1, new Since(MinecraftVersion.MC1_12_R1, "create")),
-    
-    TILEENTITY_GET_NBT(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "b"), new Since(MinecraftVersion.MC1_9_R1, "save")),
-    TILEENTITY_SET_NBT(ClassWrapper.NMS_TILEENTITY.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "a"), new Since(MinecraftVersion.MC1_12_R1, "load")),
+    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_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_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")),
-    NMS_ENTITY_SET_NBT(ClassWrapper.NMS_ENTITY.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "f")), //FIXME: No Spigot mapping!
-    NMS_ENTITY_GET_NBT(ClassWrapper.NMS_ENTITY.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_8_R3, new Since(MinecraftVersion.MC1_8_R3, "e"), new Since(MinecraftVersion.MC1_12_R1, "save")),
+    NMS_ENTITY_SET_NBT(ClassWrapper.NMS_ENTITY.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "f"), new Since(MinecraftVersion.MC1_16_R1, "load")), //FIXME: No Spigot mapping!
+    NMS_ENTITY_GET_NBT(ClassWrapper.NMS_ENTITY.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz()}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "e"), new Since(MinecraftVersion.MC1_12_R1, "save")),
    NMS_ENTITY_GETSAVEID(ClassWrapper.NMS_ENTITY.getClazz(), new Class[]{}, MinecraftVersion.MC1_14_R1,new Since(MinecraftVersion.MC1_14_R1, "getSaveID")),

    NBTFILE_READ(ClassWrapper.NMS_NBTCOMPRESSEDSTREAMTOOLS.getClazz(), new Class[]{InputStream.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "a")), //FIXME: No Spigot mapping!
    NBTFILE_WRITE(ClassWrapper.NMS_NBTCOMPRESSEDSTREAMTOOLS.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), OutputStream.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "a")), //FIXME: No Spigot mapping!
    
-    
    PARSE_NBT(ClassWrapper.NMS_MOJANGSONPARSER.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "parse")),
    REGISTRY_KEYSET (ClassWrapper.NMS_REGISTRYSIMPLE.getClazz(), new Class[]{}, MinecraftVersion.MC1_11_R1, MinecraftVersion.MC1_13_R1, new Since(MinecraftVersion.MC1_11_R1, "keySet")),
    REGISTRY_GET (ClassWrapper.NMS_REGISTRYSIMPLE.getClazz(), new Class[]{Object.class}, MinecraftVersion.MC1_11_R1, MinecraftVersion.MC1_13_R1, new Since(MinecraftVersion.MC1_11_R1, "get")),
@@ -102,8 +108,7 @@ 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(), GameProfile.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "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"));
    
    private MinecraftVersion removedAfter;
    private Since targetVersion;
@@ -114,9 +119,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())
@@ -129,7 +134,7 @@ public enum ReflectionMethod {
            loaded = true;
            methodName = targetVersion.name;
        }catch(NullPointerException | NoSuchMethodException | SecurityException ex){
-            System.out.println("[NBTAPI] Unable to find the method '" + targetVersion.name + "' in '" + targetClass.getSimpleName() + "' Enum: " + this); //NOSONAR This gets loaded before the logger is loaded
+            System.out.println("[NBTAPI] Unable to find the method '" + targetVersion.name + "' in '" + (targetClass == null ? "null" : targetClass.getSimpleName()) + "' Enum: " + this); //NOSONAR This gets loaded before the logger is loaded
        }
    }
    
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015 tr7zw
+Copyright (c) 2020 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
@@ -4,7 +4,7 @@
  <parent>
    <groupId>de.tr7zw</groupId>
    <artifactId>item-nbt-parent</artifactId>
-    <version>2.3.0</version>
+    <version>2.6.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.3.0</version>
+      <version>2.6.0</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>de.tr7zw</groupId>
      <artifactId>nbt-injector</artifactId>
-      <version>2.3.0</version>
+      <version>2.6.0</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>de.tr7zw</groupId>
      <artifactId>nbt-data-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.6.0</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
@@ -39,7 +39,7 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
+        <version>3.2.4</version>
        <executions>
          <execution>
            <id>shade</id>
@@ -50,7 +50,7 @@
          </execution>
        </executions>
        <configuration>
-          <createDependencyReducedPom>false</createDependencyReducedPom>
+          <createDependencyReducedPom>true</createDependencyReducedPom>
          <relocations>
            <relocation>
              <pattern>de.tr7zw.changeme.nbtapi</pattern>
@@ -63,7 +63,7 @@
      <plugin>
        <groupId>de.tr7zw.spigotmc.maven</groupId>
        <artifactId>tr-spigotmc-maven-plugin</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.0.3-SNAPSHOT</version>
        <executions>
          <execution>
            <id>start-server</id>
@@ -79,8 +79,18 @@
          </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 -->
-          <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.1,1.15.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.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.1,
+          1.16.1,1.16.2,https://yivesmirror.com/files/paper/Paper-1.16.4-latest.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>
@@ -17,6 +17,7 @@ import de.tr7zw.nbtapi.plugin.tests.NBTFileTest;
 import de.tr7zw.nbtapi.plugin.tests.compounds.EqualsTest;
 import de.tr7zw.nbtapi.plugin.tests.compounds.ForEachTest;
 import de.tr7zw.nbtapi.plugin.tests.compounds.GetterSetterTest;
+import de.tr7zw.nbtapi.plugin.tests.compounds.IteratorTest;
 import de.tr7zw.nbtapi.plugin.tests.compounds.ListTest;
 import de.tr7zw.nbtapi.plugin.tests.compounds.MergeTest;
 import de.tr7zw.nbtapi.plugin.tests.compounds.RemovingKeys;
@@ -30,10 +31,13 @@ import de.tr7zw.nbtapi.plugin.tests.injector.EntityCustomNbtInjectorTest;
 import de.tr7zw.nbtapi.plugin.tests.injector.MergeTileSubCompoundTest;
 import de.tr7zw.nbtapi.plugin.tests.injector.SpawnEntityCustomNbtInjectorTest;
 import de.tr7zw.nbtapi.plugin.tests.injector.TilesCustomNBTInjectorTest;
+import de.tr7zw.nbtapi.plugin.tests.items.DirectApplyTest;
 import de.tr7zw.nbtapi.plugin.tests.items.EmptyItemTest;
 import de.tr7zw.nbtapi.plugin.tests.items.ItemConvertionTest;
+import de.tr7zw.nbtapi.plugin.tests.tiles.TileTest;
 import de.tr7zw.nbtapi.plugin.tests.tiles.TilesCustomNBTPersistentTest;
 import de.tr7zw.nbtinjector.NBTInjector;
+import de.tr7zw.nbtapi.plugin.tests.items.ItemMergingTest;

 public class NBTAPI extends JavaPlugin {

@@ -49,36 +53,64 @@ public class NBTAPI extends JavaPlugin {
 	@Override
 	public void onLoad() {
 		
-		//Disabled by default since 2.1. Enable it yourself by calling NBTInjector.inject(); during onLoad.
-		/*getLogger().info("Injecting custom NBT");
-		try {
-			NBTInjector.inject();
-			getLogger().info("Injected!");
-		} catch (Throwable ex) { // NOSONAR
-			getLogger().log(Level.SEVERE, "Error while Injecting custom Tile/Entity classes!", ex);
-			compatible = false;
-		}*/
+		getConfig().options().copyDefaults(true);
+		getConfig().addDefault("nbtInjector.enabled", false);
+		getConfig().addDefault("bStats.enabled", true);
+		getConfig().addDefault("updateCheck.enabled", true);
+		saveConfig();
+		
+		if(!getConfig().getBoolean("bStats.enabled")) {
+			getLogger().info("bStats disabled");
+			MinecraftVersion.disableBStats();
+		}
+		
+		if(!getConfig().getBoolean("updateCheck.enabled")) {
+			getLogger().info("Update check disabled");
+			MinecraftVersion.disableUpdateCheck();
+		}
+		
+		//Disabled by default since 2.1. Enable it yourself by calling NBTInjector.inject(); during onLoad/config
+		if(getConfig().getBoolean("nbtInjector.enabled")) {
+			getLogger().info("Injecting custom NBT");
+			try {
+				NBTInjector.inject();
+				getLogger().info("Injected!");
+			} catch (Throwable ex) { // NOSONAR
+				getLogger().log(Level.SEVERE, "Error while Injecting custom Tile/Entity classes!", ex);
+				compatible = false;
+			}
+		}

 		// NBTCompounds
 		apiTests.add(new GetterSetterTest());
 		apiTests.add(new TypeTest());
 		apiTests.add(new RemovingKeys());
-		apiTests.add(new ListTest());
+		if(MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_8_R3)) // 1.7.10 list support is not complete at all
+			apiTests.add(new ListTest());
 		apiTests.add(new SubCompoundsTest());
-		apiTests.add(new MergeTest());
+		if(MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_8_R3)) // 1.7.10 not a thing
+			apiTests.add(new MergeTest());
 		apiTests.add(new ForEachTest());
 		apiTests.add(new StreamTest());
 		apiTests.add(new EqualsTest());
+		if(MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_8_R3)) // 1.7.10 list support is not complete at all
+			apiTests.add(new IteratorTest());

 		// Items
-		apiTests.add(new ItemConvertionTest());
+		if(MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_8_R3)) // 1.7.10 not a thing
+			apiTests.add(new ItemConvertionTest());
 		apiTests.add(new EmptyItemTest());
+		if(MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_8_R3)) { // 1.7.10 not a thing
+			apiTests.add(new ItemMergingTest());
+			apiTests.add(new DirectApplyTest());
+		}

 		// Entity
 		apiTests.add(new EntityTest());
 		apiTests.add(new EntityCustomNbtPersistentTest());

 		// Tiles
+		apiTests.add(new TileTest());
 		apiTests.add(new TilesCustomNBTPersistentTest());

 		// Files
@@ -93,7 +125,8 @@ public class NBTAPI extends JavaPlugin {
 		apiTests.add(new EntityCustomNbtInjectorTest());
 		apiTests.add(new SpawnEntityCustomNbtInjectorTest());
 		
-		apiTests.add(new GameprofileTest());
+		if(MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_8_R3))
+			apiTests.add(new GameprofileTest());

 	}

@@ -104,33 +137,36 @@ public class NBTAPI extends JavaPlugin {

 		getLogger().info("Adding listeners...");
 		Bukkit.getPluginManager().registerEvents(new ReloadListener(), this);
-		getLogger().info("Checking bindings...");
-		MinecraftVersion.getVersion();
 		getLogger().info("Gson:");
 		MinecraftVersion.hasGsonSupport();
-		getLogger().info("Classes:");
+		getLogger().info("Checking bindings...");
+		MinecraftVersion.getVersion();
+		
 		boolean classUnlinked = false;
 		for (ClassWrapper c : ClassWrapper.values()) {
 			if (c.isEnabled() && c.getClazz() == null) {
+				if(!classUnlinked)
+					getLogger().info("Classes:");
 				getLogger().warning(c.name() + " did not find it's class!");
 				compatible = false;
 				classUnlinked = true;
 			}
 		}
 		if (!classUnlinked)
-			getLogger().info("All Classes where able to link!");
+			getLogger().info("All Classes were able to link!");

-		getLogger().info("Methods:");
 		boolean methodUnlinked = false;
 		for (ReflectionMethod method : ReflectionMethod.values()) {
 			if (method.isCompatible() && !method.isLoaded()) {
+				if(!methodUnlinked)
+					getLogger().info("Methods:");
 				getLogger().warning(method.name() + " did not find the method!");
 				compatible = false;
 				methodUnlinked = true;
 			}
 		}
 		if (!methodUnlinked)
-			getLogger().info("All Methods where able to link!");
+			getLogger().info("All Methods were able to link!");
 		getLogger().info("Running NBT reflection test...");

 		Map<de.tr7zw.nbtapi.plugin.tests.Test, Exception> results = new HashMap<>();
@@ -141,7 +177,7 @@ public class NBTAPI extends JavaPlugin {
 			} catch (Exception ex) {
 				results.put(test, ex);
 				getLogger().log(Level.WARNING, "Error during '" + test.getClass().getSimpleName() + "' test!", ex);
-			} catch (Throwable th) { // NOSONAR
+			} catch (NoSuchFieldError th) { // NOSONAR
 				getLogger().log(Level.SEVERE, "Servere error during '" + test.getClass().getSimpleName() + "' test!");
 				getLogger().warning(
 						"WARNING! This version of Item-NBT-API seems to be broken with your Spigot version! Canceled the other tests!");
@@ -162,6 +198,9 @@ public class NBTAPI extends JavaPlugin {
 		} else {
 			getLogger().warning(
 					"WARNING! This version of NBT-API seems to be broken with your Spigot version! " + checkMessage);
+			if(MinecraftVersion.getVersion() == MinecraftVersion.MC1_7_R4) {
+				getLogger().warning("1.7.10 is only partally supported! Some thing will not work/are not yet avaliable in 1.7.10!");
+			}
 		}

 	}
@@ -0,0 +1,65 @@
+package de.tr7zw.nbtapi.plugin.tests.compounds;
+
+import de.tr7zw.changeme.nbtapi.NBTContainer;
+import de.tr7zw.changeme.nbtapi.NBTList;
+import de.tr7zw.changeme.nbtapi.NbtApiException;
+import de.tr7zw.nbtapi.plugin.tests.Test;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+public class IteratorTest implements Test {
+
+    @Override
+    public void test() throws Exception {
+        NBTList<Integer> testList;
+
+        testList = initIntegerList();
+        testIterator(testList.iterator());
+
+        testList = initIntegerList();
+        testIterator(testList.listIterator());
+    }
+
+    private NBTList<Integer> initIntegerList() {
+        NBTContainer comp = new NBTContainer();
+        NBTList<Integer> list = comp.getIntegerList("test");
+        list.add(1);
+        list.add(2);
+        list.add(3);
+        list.add(4);
+        return list;
+    }
+
+    private static void testIterator(Iterator<Integer> iterator) {
+        assertTrue(iterator.hasNext());
+        assertTrue(iterator.next() == 1);
+        assertTrue(iterator.hasNext());
+        assertTrue(iterator.next() == 2);
+        iterator.remove();
+        assertTrue(iterator.hasNext());
+        assertTrue(iterator.next() == 3);
+        assertTrue(iterator.hasNext());
+        assertTrue(iterator.next() == 4);
+        testNoMoreElements(iterator);
+    }
+
+    private static void testNoMoreElements(Iterator<Integer> iterator) {
+        assertTrue(!iterator.hasNext());
+        try {
+            iterator.next();
+        } catch(NoSuchElementException expected) {
+            return;
+        } catch(Exception e) {
+            throw new NbtApiException("iterator threw wrong exception: " + e.toString());
+        }
+        throw new NbtApiException("iterator did not throw exception");
+    }
+
+    private static void assertTrue(boolean condition) {
+        if(!condition) {
+            throw new NbtApiException("iterator test failed");
+        }
+    }
+
+}
@@ -1,14 +1,11 @@
 package de.tr7zw.nbtapi.plugin.tests.entities;

 import org.bukkit.Bukkit;
-import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.block.Block;
 import org.bukkit.entity.Animals;
 import org.bukkit.entity.Monster;

 import de.tr7zw.changeme.nbtapi.NBTEntity;
-import de.tr7zw.changeme.nbtapi.NBTTileEntity;
 import de.tr7zw.changeme.nbtapi.NbtApiException;
 import de.tr7zw.nbtapi.plugin.tests.Test;

@@ -25,23 +22,7 @@ public class EntityTest implements Test {
 					nbte.setString("INVALIDEKEY", "test");
 				}
 			} catch (Exception ex) {
-				throw new NbtApiException("Wasn't able to use NBTEntities!");
-			}
-			try {
-				Block block = world.getBlockAt(world.getSpawnLocation().getBlockX(), 255,
-						world.getSpawnLocation().getBlockZ());
-				if (block.getType() == Material.AIR) {
-					block.setType(Material.CHEST);
-					NBTTileEntity tile = new NBTTileEntity(block.getState());
-					tile.setString("Lock", "test");
-					if (!tile.asNBTString().contains("Lock:\"test\"")) {
-						block.setType(Material.AIR);
-						throw new NbtApiException("The Lock wasn't successfully set.");
-					}
-					block.setType(Material.AIR);
-				}
-			} catch (Exception ex) {
-				throw new NbtApiException("Wasn't able to use NBTTiles!", ex);
+				throw new NbtApiException("Wasn't able to use NBTEntities!", ex);
 			}
 		}
 	}
@@ -0,0 +1,22 @@
+package de.tr7zw.nbtapi.plugin.tests.items;
+
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+import de.tr7zw.changeme.nbtapi.NBTItem;
+import de.tr7zw.changeme.nbtapi.NbtApiException;
+import de.tr7zw.nbtapi.plugin.tests.Test;
+
+public class DirectApplyTest implements Test{
+
+	@Override
+	public void test() throws Exception {
+		ItemStack baseItem = new ItemStack(Material.STONE);
+		NBTItem nbti = new NBTItem(baseItem, true);
+		nbti.setString("SomeKey", "SomeValue");
+		if(!baseItem.equals(nbti.getItem()) || !new NBTItem(baseItem).hasKey("SomeKey")) {
+			throw new NbtApiException("The item's where not equal!");
+		}
+	}
+
+}
@@ -15,6 +15,14 @@ public class EmptyItemTest implements Test {
 		NBTItem nbti = new NBTItem(item);
 		if (nbti.getBoolean("test") == null || nbti.getString("test") == null)
 			throw new NbtApiException("Getters return null instead of the default value");
+
+		try {
+			Material barrel = Material.valueOf("BARREL");
+			item = new ItemStack(barrel);
+			nbti = new NBTItem(item);
+		} catch (IllegalArgumentException ex) {
+			// old version
+		}
 	}

 }
@@ -0,0 +1,56 @@
+package de.tr7zw.nbtapi.plugin.tests.items;
+
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BookMeta;
+
+import de.tr7zw.changeme.nbtapi.NBTItem;
+import de.tr7zw.changeme.nbtapi.NbtApiException;
+import de.tr7zw.nbtapi.plugin.tests.Test;
+
+public class ItemMergingTest implements Test {
+
+	@Override
+	public void test() throws Exception {
+		ItemStack item = new ItemStack(Material.WRITTEN_BOOK);
+		BookMeta bookMeta = (BookMeta) item.getItemMeta();
+		bookMeta.setAuthor("Author");
+		bookMeta.setDisplayName("name");
+		item.setItemMeta(bookMeta);
+
+		NBTItem nbti = new NBTItem(item);
+		nbti.setString("author", "New Author");
+		nbti.setString("test", "value");
+
+		nbti.mergeCustomNBT(item);
+		if (!new NBTItem(item).hasKey("test"))
+			throw new NbtApiException("Couldn't merge custom NBT tag!");
+		if ("New Author".equals(new NBTItem(item).getString("author")))
+			throw new NbtApiException("Vanilla NBT tag was merged when shouldn't!");
+
+		nbti.setString("test", "New Value");
+		nbti.mergeNBT(item);
+		if (!"New Author".equals(new NBTItem(item).getString("author")) || !"New Value".equals(new NBTItem(item).getString("test")))
+			throw new NbtApiException("Couldn't replace NBT tag while merging!");
+
+		ItemStack test = new ItemStack(Material.WRITTEN_BOOK);
+		nbti.applyNBT(test);
+		if (!item.isSimilar(test))
+			throw new NbtApiException("ItemStacks didn't match! " + new NBTItem(item) + " " + new NBTItem(test));
+
+		test = new ItemStack(Material.STONE);
+		nbti.applyNBT(test);
+		if (!nbti.hasKey("test"))
+			throw new NbtApiException("Couldn't merge custom NBT tag!");
+		if (!item.getItemMeta().getDisplayName().equals(test.getItemMeta().getDisplayName()))
+			throw new NbtApiException("Couldn't merge vanilla NBT tag!");
+
+		nbti.setBoolean("remove", true);
+		nbti.clearCustomNBT();
+		if (nbti.hasKey("remove"))
+			throw new NbtApiException("Couldn't clear custom NBT tags!");
+		if (!nbti.hasKey("author"))
+			throw new NbtApiException("Vanilla tag was removed!");
+	}
+
+}
@@ -0,0 +1,42 @@
+package de.tr7zw.nbtapi.plugin.tests.tiles;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+
+import de.tr7zw.changeme.nbtapi.NBTTileEntity;
+import de.tr7zw.changeme.nbtapi.NbtApiException;
+import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
+import de.tr7zw.nbtapi.plugin.tests.Test;
+
+public class TileTest implements Test {
+
+	@Override
+	public void test() throws Exception {
+		if (!Bukkit.getWorlds().isEmpty()) {
+			World world = Bukkit.getWorlds().get(0);
+			try {
+				Block block = world.getBlockAt(world.getSpawnLocation().getBlockX(), 255,
+						world.getSpawnLocation().getBlockZ());
+				if (block.getType() == Material.AIR) {
+					block.setType(Material.CHEST);
+					NBTTileEntity tile = new NBTTileEntity(block.getState());
+					if(tile.getInteger("y") != 255) {
+						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")) {
+						block.setType(Material.AIR);
+						throw new NbtApiException("The Lock wasn't successfully set.");
+					}
+					block.setType(Material.AIR);
+				}
+			} catch (Exception ex) {
+				throw new NbtApiException("Wasn't able to use NBTTiles!", ex);
+			}
+		}
+	}
+
+}
@@ -2,4 +2,5 @@ main: de.tr7zw.nbtapi.plugin.NBTAPI
 name: NBTAPI
 version: ${project.version}
 author: tr7zw
-loadbefore: [ItemNBTAPI]
+loadbefore: [ItemNBTAPI]
+api-version: 1.13
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015 tr7zw
+Copyright (c) 2020 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
@@ -7,7 +7,7 @@
    <parent>
        <groupId>de.tr7zw</groupId>
        <artifactId>item-nbt-parent</artifactId>
-        <version>2.3.0</version>
+        <version>2.6.0</version>
    </parent>

    <artifactId>nbt-data-api</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>de.tr7zw</groupId>
      <artifactId>item-nbt-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.6.0</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015 tr7zw
+Copyright (c) 2020 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
@@ -4,7 +4,7 @@
  <parent>
    <groupId>de.tr7zw</groupId>
    <artifactId>item-nbt-parent</artifactId>
-    <version>2.3.0</version>
+    <version>2.6.0</version>
  </parent>
  <artifactId>nbt-injector</artifactId>
  <packaging>jar</packaging>
@@ -12,7 +12,7 @@
    <dependency>
      <groupId>de.tr7zw</groupId>
      <artifactId>item-nbt-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.6.0</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
@@ -179,6 +179,10 @@ public class ClassGenerator {
 				: "void";
 		String writeName = ReflectionMethod.TILEENTITY_GET_NBT.getMethodName();
 		String readName = ReflectionMethod.TILEENTITY_SET_NBT.getMethodName();
+		if(MinecraftVersion.getVersion().getVersionId() < MinecraftVersion.MC1_16_R1.getVersionId()) {
+			readName = ReflectionMethod.TILEENTITY_SET_NBT_LEGACY1151.getMethodName();
+		}
+
 		String writeMethod = "public " + writeReturn + " " + writeName + "(NBTTagCompound compound) {\n"
 				+ "  compound = writeExtraCompound(compound);\n"
 				// + " System.out.println(\"Save: \" +compound);\n"
@@ -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!"
@@ -48,6 +48,10 @@ public class NBTInjector {
 	 */
 	public static void inject() {
 		if(isInjected)return;
+		if(MinecraftVersion.getVersion() == MinecraftVersion.MC1_7_R4 || MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_16_R1)) {
+			logger.warning("[NBTINJECTOR] The NBT-Injector is not compatibel with this Minecraft Version! For 1.16+ please use the persistent storage API.");
+			return;
+		}
 		isInjected = true;
 		try {
 			ClassPool classPool = ClassPool.getDefault();
@@ -3,7 +3,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>de.tr7zw</groupId>
  <artifactId>item-nbt-parent</artifactId>
-  <version>2.3.0</version>
+  <version>2.6.0</version>
  <packaging>pom</packaging>
  <modules>
    <module>item-nbt-api</module>
@@ -115,7 +115,7 @@
      <plugin>
        <groupId>com.github.ekryd.sortpom</groupId>
        <artifactId>sortpom-maven-plugin</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0</version>
        <executions>
          <execution>
            <id>sortpom</id>
Author	SHA1	Message	Date
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
tr7zw	17c689699d	Change to 2.5.0 Release	2020-08-14 10:04:52 +02:00
tr7zw	c8110b0637	Merge pull request #100 from LoneDev6/master Update MinecraftVersion.java to 1.16.2	2020-08-14 10:04:16 +02:00
tr7zw	2daec88667	Merge branch 'master' into master	2020-08-14 09:48:33 +02:00
tr7zw	01aec6c272	Bump versions to 2.5.0-SNAPSHOT, add 1.16.2 to unit test	2020-08-14 09:44:45 +02:00
LoneDev6	b74ba362c8	Update MinecraftVersion.java	2020-08-12 13:52:12 +02:00
tr7zw	65a86027ba	Update ReflectionMethod.java	2020-08-03 18:15:34 +02:00
tr7zw	580c07fc3f	Apply isntead of merge so removeing tags works	2020-07-11 19:43:05 +02:00
tr7zw	c38ca2cb35	Add direct apply mode Fixes #49	2020-07-11 18:44:22 +02:00
tr7zw	1ebd2a8ed1	Add Config file Fixes #79	2020-07-11 18:13:51 +02:00
tr7zw	19300566c2	More 1.7.10 fixes, add 1.7.10 to unit test	2020-07-10 18:45:40 +02:00
tr7zw	6b6783e7c6	Block the NBTInjector from even trying to load in invalid versions, fixed 1.7.10 getType	2020-07-10 17:55:26 +02:00
tr7zw	7e5b5a1ff4	Fix loading in 1.7.10	2020-07-10 17:11:07 +02:00
tr7zw	ff50036688	Merge branch 'master' of https://github.com/tr7zw/Item-NBT-API	2020-07-10 16:37:47 +02:00
tr7zw	7c0b63d0e3	Bump to 2.5.0-SNAPSHOT since the API will change compared to 2.4.1	2020-07-10 16:37:45 +02:00
tr7zw	8f4dad62bd	Merge pull request #89 from tr7zw/dependabot/maven/com.github.ekryd.sortpom-sortpom-maven-plugin-2.12.0 Bump sortpom-maven-plugin from 2.11.0 to 2.12.0	2020-07-10 16:35:46 +02:00
tr7zw	6667682c6c	Merge pull request #92 from brandonwamboldt/fix-91 Use the correct TILEENTITY_SET_NBT method on pre-1.1.6 versions	2020-07-10 16:35:25 +02:00
Brandon Wamboldt	0123652cc7	Use the correct TILEENTITY_SET_NBT method on pre-1.1.6 versions Fixes #91	2020-07-10 09:41:36 -03:00
dependabot-preview[bot]	0d9c200e88	Bump sortpom-maven-plugin from 2.11.0 to 2.12.0 Bumps [sortpom-maven-plugin](https://github.com/Ekryd/sortpom) from 2.11.0 to 2.12.0. - [Release notes](https://github.com/Ekryd/sortpom/releases) - [Commits](https://github.com/Ekryd/sortpom/compare/sortpom-parent-2.11.0...sortpom-parent-2.12.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-07-03 05:29:48 +00:00
tr7zw	ab3c52ada1	Merge pull request #88 from SoSeDiK/apply Implement utility methods for merging NBT	2020-06-30 11:12:55 +02:00
tr7zw	443fb2d3c0	Fix potential issue with 1.7.10	2020-06-28 16:24:24 +02:00
SoSeDiK	0de8279b4b	Implement utility methods for merging NBT	2020-06-27 06:48:04 +03:00
tr7zw	003e015d1d	Merge pull request #87 from stijnb1234/master ReflectionMethod cleanup	2020-06-25 17:01:12 +02:00
tr7zw	b5dc20683f	Bump to 2.4.2-SNAPSHOT for future development	2020-06-25 17:00:47 +02:00
Stijn Bannink	bda2845a79	ReflectionMethod cleanup	2020-06-25 16:58:18 +02:00
tr7zw	817b104757	Merge pull request #85 from LoneDev6/master 1.16.1 support	2020-06-25 15:47:54 +02:00
tr7zw	d4ab47d287	Release 2.4.1: 1.16.1 Update	2020-06-25 15:46:57 +02:00
tr7zw	cd30dd1303	Fix 1.16 TileEntities	2020-06-25 15:36:44 +02:00
tr7zw	ff6a0361b7	Merge branch 'master' into pr/85	2020-06-25 15:36:24 +02:00
tr7zw	97042b9fc1	Merge pull request #86 from Leonardo-DGS/patch-1 Fix mistake in MinecraftVersion.java	2020-06-25 15:33:24 +02:00
Leonardo Di Gianfelice Stornelli	6234e359eb	Fix mistake in MinecraftVersion.java	2020-06-25 15:22:58 +02:00
LoneDev6	32070b8f19	Merge branch 'master' of https://github.com/LoneDev6/Item-NBT-API	2020-06-25 13:17:55 +02:00
LoneDev6	a371a33766	Fixed imports	2020-06-25 13:17:44 +02:00
tr7zw	8ad527057e	Update pom.xml	2020-06-25 13:16:48 +02:00
LoneDev6	cf5fe7c083	Merge branch 'master' of https://github.com/LoneDev6/Item-NBT-API	2020-06-25 13:08:07 +02:00
LoneDev6	0255ef044f	Get and set UUID (1.16.1+)	2020-06-25 13:08:04 +02:00
tr7zw	faeea97934	Update pom.xml	2020-06-25 13:06:31 +02:00
tr7zw	b4a59cdede	Update pom.xml	2020-06-25 13:05:49 +02:00
tr7zw	c47ca55e84	Update pom.xml	2020-06-25 13:05:28 +02:00
tr7zw	8cbf4b1cf6	Bump version	2020-06-25 13:05:15 +02:00
LoneDev6	67bf920ba7	1.16.1 support - 1.16.1 support - incremented api version	2020-06-25 12:36:26 +02:00
tr7zw	af0a8f1d4c	Merge pull request #82 from tr7zw/dependabot/maven/org.apache.maven.plugins-maven-shade-plugin-3.2.4 Bump maven-shade-plugin from 3.2.3 to 3.2.4	2020-06-16 12:23:41 +02:00
dependabot-preview[bot]	7fa614b3d5	Bump maven-shade-plugin from 3.2.3 to 3.2.4 Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.3...maven-shade-plugin-3.2.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-06-03 05:31:03 +00:00
tr7zw	55a3f8b1b1	Merge pull request #81 from drunderscore/fix/nbtcomp-docs Correct documentation to specify JSON validity	2020-05-27 23:48:09 +02:00
James Puleo	2a432e68ab	Correct documentation to specify JSON validity	2020-05-27 17:45:42 -04:00
tr7zw	efbd6912ab	Update README.md	2020-05-06 19:19:03 +02:00
tr7zw	70579b649d	Fix typo Fixes (part of) #78	2020-04-27 13:44:56 +02:00
tr7zw	cdeabe7364	Fix Copypaste fail	2020-04-26 20:08:15 +02:00
tr7zw	f4f32d9303	Reading from dead entities is valid	2020-04-21 14:04:32 +02:00
tr7zw	5cb25ad47d	Merge pull request #77 from j0x0f/fix/nbt-list-iterator-remove Fix "remove" method in NBTList iterators	2020-04-20 20:24:19 +02:00
j0x0f	1fb0945f1d	IteratorTest: Also test previously failed case Removing an element from the list would skip the element that was right after the removed one.	2020-04-20 21:34:09 +05:00
j0x0f	d31e2849b3	IteratorTest Add test to NBTList iterators: `iterator()` and `listIterator()`. Covers `hasNext`, `next` and `remove` methods.	2020-04-20 21:24:10 +05:00
tr7zw	ca2bb4d0b3	Adding a ReadWriteLock to Compounds to minimize the chance of Concurrent exceptions	2020-04-20 17:38:58 +02:00
j0x0f	550ae33051	Fixed skipping an element right after removed one	2020-04-20 02:24:35 +05:00
tr7zw	1b7bf63982	Merge pull request #75 from tr7zw/dependabot/maven/org.apache.maven.plugins-maven-shade-plugin-3.2.3 Bump maven-shade-plugin from 3.2.2 to 3.2.3	2020-04-18 18:55:50 +02:00
tr7zw	d89edc6738	Merge pull request #76 from j0x0f/feature/nbt-list-removeIf Implement "remove" method in NBTList iterator	2020-04-18 18:54:54 +02:00
tr7zw	71f4cb764e	Bump to 2.4.0-SNAPSHOT	2020-04-18 18:53:30 +02:00
j0x0f	bba58df6c3	Implement "remove" method in NBTList iterator	2020-04-18 21:43:00 +05:00
dependabot-preview[bot]	a9bb1bc839	Bump maven-shade-plugin from 3.2.2 to 3.2.3 Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.2...maven-shade-plugin-3.2.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-14 05:20:37 +00:00
tr7zw	75249b556e	Bump to 2.3.2 (no spigot release), prevent shading to change the nms packet names	2020-04-11 16:32:30 +02:00
tr7zw	8aba56ff70	2.3.1 fixes Added the api-version 1.13. Only >= 1.13 uses this so doesn't use legacy materials. Fixes #74 The versioncheck was doing a http request in the mainthread, which was fine for the plugin version since it happend during enable, but shaded versions might do that sometime later when players are online, causing a short lag.	2020-04-09 19:28:04 +02:00
tr7zw	27761ac95a	Bump to 2.4.0-SNAPSHOT	2020-04-04 18:00:36 +02:00
tr7zw	c6b3055a15	Add Peaches_MLG	2020-04-04 17:59:37 +02:00