Prepare Tag 2.2.0

Fixes #59

.github/workflows/maven.yml

@@ -0,0 +1,17 @@
+name: Java CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: mvn --file pom.xml

README.md

@@ -1,8 +1,9 @@
 # Item-NBT-API
-Add custom NBT tags to Items without NMS!
+Add custom NBT tags to Items without NMS!<br/>
+[Server Owner/Developer Wiki](https://github.com/tr7zw/Item-NBT-API/wiki)
 
 ### 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)
 
 ### 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)
+[![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)

item-nbt-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.tr7zw</groupId>
         <artifactId>item-nbt-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
     </parent>
 
     <artifactId>item-nbt-api</artifactId>

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTCompound.java

@@ -3,6 +3,8 @@ package de.tr7zw.changeme.nbtapi;
 import java.io.Serializable;
 import java.util.Set;
 
+import org.bukkit.inventory.ItemStack;
+
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
 
@@ -23,6 +25,11 @@ public class NBTCompound {
 		this.parent = owner;
 	}
 
+	protected void saveCompound(){
+		if(parent != null)
+			parent.saveCompound();
+	}
+	
 	/**
 	 * @return The Compound name
 	 */
@@ -56,6 +63,7 @@ public class NBTCompound {
 	 */
 	public void mergeCompound(NBTCompound comp) {
 		NBTReflectionUtil.mergeOtherNBTCompound(this, comp);
+		saveCompound();
 	}
 
 	/**
@@ -66,6 +74,7 @@ public class NBTCompound {
 	 */
 	public void setString(String key, String value) {
 		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_STRING, key, value);
+		saveCompound();
 	}
 
 	/**
@@ -90,6 +99,7 @@ public class NBTCompound {
 	 */
 	public void setInteger(String key, Integer value) {
 		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_INT, key, value);
+		saveCompound();
 	}
 
 	/**
@@ -110,6 +120,7 @@ public class NBTCompound {
 	 */
 	public void setDouble(String key, Double value) {
 		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_DOUBLE, key, value);
+		saveCompound();
 	}
 
 	/**
@@ -130,6 +141,7 @@ public class NBTCompound {
 	 */
 	public void setByte(String key, Byte value) {
 		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_BYTE, key, value);
+		saveCompound();
 	}
 
 	/**
@@ -150,6 +162,7 @@ public class NBTCompound {
 	 */
 	public void setShort(String key, Short value) {
 		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_SHORT, key, value);
+		saveCompound();
 	}
 
 	/**
@@ -170,6 +183,7 @@ public class NBTCompound {
 	 */
 	public void setLong(String key, Long value) {
 		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_LONG, key, value);
+		saveCompound();
 	}
 
 	/**
@@ -190,6 +204,7 @@ public class NBTCompound {
 	 */
 	public void setFloat(String key, Float value) {
 		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_FLOAT, key, value);
+		saveCompound();
 	}
 
 	/**
@@ -210,6 +225,7 @@ public class NBTCompound {
 	 */
 	public void setByteArray(String key, byte[] value) {
 		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_BYTEARRAY, key, value);
+		saveCompound();
 	}
 
 	/**
@@ -230,6 +246,7 @@ public class NBTCompound {
 	 */
 	public void setIntArray(String key, int[] value) {
 		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_INTARRAY, key, value);
+		saveCompound();
 	}
 
 	/**
@@ -250,10 +267,12 @@ public class NBTCompound {
 	 */
 	public void setBoolean(String key, Boolean value) {
 		NBTReflectionUtil.setData(this, ReflectionMethod.COMPOUND_SET_BOOLEAN, key, value);
+		saveCompound();
 	}
 
 	protected void set(String key, Object val) {
 		NBTReflectionUtil.set(this, key, val);
+		saveCompound();
 	}
 
 	/**
@@ -274,6 +293,7 @@ public class NBTCompound {
 	 */
 	public void setObject(String key, Object value) {
 		NBTReflectionUtil.setObject(this, key, value);
+		saveCompound();
 	}
 
 	/**
@@ -286,6 +306,28 @@ public class NBTCompound {
 	public <T> T getObject(String key, Class<T> type) {
 		return NBTReflectionUtil.getObject(this, key, type);
 	}
+	
+	/**
+	 * 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));
+	}
+	
+	/**
+	 * 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);
+	}
 
 	/**
 	 * @param key
@@ -303,6 +345,7 @@ public class NBTCompound {
 	 */
 	public void removeKey(String key) {
 		NBTReflectionUtil.remove(this, key);
+		saveCompound();
 	}
 
 	/**
@@ -325,6 +368,7 @@ public class NBTCompound {
 		NBTCompound comp = getCompound(name);
 		if(comp == null)
 			throw new NbtApiException("Error while adding Compound, got null!");
+		saveCompound();
 		return comp;
 	}
 
@@ -346,7 +390,9 @@ public class NBTCompound {
 	 * @return The retrieved String List
 	 */
 	public NBTList<String> getStringList(String name) {
-		return NBTReflectionUtil.getList(this, name, NBTType.NBTTagString, String.class);
+		NBTList<String> list = NBTReflectionUtil.getList(this, name, NBTType.NBTTagString, String.class);
+		saveCompound();
+		return list;
 	}
 
 	/**
@@ -354,7 +400,9 @@ public class NBTCompound {
 	 * @return The retrieved Integer List
 	 */
 	public NBTList<Integer> getIntegerList(String name) {
-		return NBTReflectionUtil.getList(this, name, NBTType.NBTTagInt, Integer.class);
+		NBTList<Integer> list = NBTReflectionUtil.getList(this, name, NBTType.NBTTagInt, Integer.class);
+		saveCompound();
+		return list;
 	}
 
 	/**
@@ -362,7 +410,9 @@ public class NBTCompound {
 	 * @return The retrieved Compound List
 	 */
 	public NBTCompoundList getCompoundList(String name) {
-		return (NBTCompoundList) NBTReflectionUtil.getList(this, name, NBTType.NBTTagCompound, NBTListCompound.class);
+		NBTCompoundList list = (NBTCompoundList) NBTReflectionUtil.getList(this, name, NBTType.NBTTagCompound, NBTListCompound.class);
+		saveCompound();
+		return list;
 	}
 
 	/**
@@ -380,19 +430,22 @@ public class NBTCompound {
 
 	@Override
 	public String toString() {
-		StringBuilder result = new StringBuilder();
+		/*StringBuilder result = new StringBuilder();
 		for (String key : getKeys()) {
 			result.append(toString(key));
 		}
-		return result.toString();
+		return result.toString();*/
+		return asNBTString();
 	}
 
 	/**
+	 * @deprecated Just use toString()
 	 * @param key
 	 * @return A string representation of the given key
 	 */
+	@Deprecated
 	public String toString(String key) {
-		StringBuilder result = new StringBuilder();
+		/*StringBuilder result = new StringBuilder();
 		NBTCompound compound = this;
 		while (compound.getParent() != null) {
 			result.append("   ");
@@ -402,12 +455,15 @@ public class NBTCompound {
 			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
 	 */
+	@Deprecated
 	public String asNBTString() {
 		Object comp = NBTReflectionUtil.gettoCompount(getCompound(), this);
 		if (comp == null)

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTCompoundList.java

@@ -24,6 +24,17 @@ public class NBTCompoundList extends NBTList<NBTListCompound> {
 	 * @return The added {@link NBTListCompound}
 	 */
 	public NBTListCompound addCompound() {
+		return (NBTListCompound) addCompound(null);
+	}
+	
+	/**
+	 * Adds a copy of the Compound to the end of the List and returns it.
+	 * When null is given, a new Compound will be created
+	 * 
+	 * @param comp
+	 * @return
+	 */
+	public NBTCompound addCompound(NBTCompound comp) {
 		try {
 			Object compound = ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz().newInstance();
 			if (MinecraftVersion.getVersion().getVersionId() >= MinecraftVersion.MC1_14_R1.getVersionId()) {
@@ -31,7 +42,12 @@ public class NBTCompoundList extends NBTList<NBTListCompound> {
 			} else {
 				ReflectionMethod.LEGACY_LIST_ADD.run(listObject, compound);
 			}
-			return new NBTListCompound(this, compound);
+			getParent().saveCompound();
+			NBTListCompound listcomp = new NBTListCompound(this, compound);
+			if(comp != null){
+				listcomp.mergeCompound(comp);
+			}
+			return listcomp;
 		} catch (Exception ex) {
 			throw new NbtApiException(ex);
 		}
@@ -40,25 +56,15 @@ public class NBTCompoundList extends NBTList<NBTListCompound> {
 	/**
 	 * Adds a new Compound to the end of the List.
 	 * 
-	 * @param empty This has to be null!
+	 * 
+	 * @deprecated Please use addCompound!
+	 * @param empty
 	 * @return True, if compound was added
 	 */
 	@Override
+	@Deprecated
 	public boolean add(NBTListCompound empty) {
-		if (empty != null) {
-			throw new NotImplementedException("You need to pass null! ListCompounds from other lists won't work.");
-		}
-		try {
-			Object compound = ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz().newInstance();
-			if (MinecraftVersion.getVersion().getVersionId() >= MinecraftVersion.MC1_14_R1.getVersionId()) {
-				ReflectionMethod.LIST_ADD.run(listObject, 0, compound);
-			} else {
-				ReflectionMethod.LEGACY_LIST_ADD.run(listObject, compound);
-			}
-			return true;
-		} catch (Exception ex) {
-			throw new NbtApiException(ex);
-		}
+		return addCompound(empty) != null;
 	}
 
 	@Override
@@ -73,6 +79,7 @@ public class NBTCompoundList extends NBTList<NBTListCompound> {
 			} else {
 				ReflectionMethod.LEGACY_LIST_ADD.run(listObject, compound);
 			}
+			super.getParent().saveCompound();
 		} catch (Exception ex) {
 			throw new NbtApiException(ex);
 		}

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTIntegerList.java

@@ -1,5 +1,6 @@
 package de.tr7zw.changeme.nbtapi;
 
+import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ClassWrapper;
@@ -20,10 +21,12 @@ public class NBTIntegerList extends NBTList<Integer> {
 	@Override
 	protected Object asTag(Integer object) {
 		try {
-			return ClassWrapper.NMS_NBTTAGINT.getClazz().getConstructor(int.class).newInstance(object);
+			Constructor<?> con = ClassWrapper.NMS_NBTTAGINT.getClazz().getDeclaredConstructor(int.class);
+			con.setAccessible(true);
+			return con.newInstance(object);
 		} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
 				| NoSuchMethodException | SecurityException e) {
-			throw new NbtApiException("Error while wrapping the Oject " + object + " to it's NMS object!", e);
+			throw new NbtApiException("Error while wrapping the Object " + object + " to it's NMS object!", e);
 		}
 	}
 

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTList.java

@@ -31,6 +31,20 @@ public abstract class NBTList<T> implements List<T> {
 		this.type = type;
 		this.listObject = list;
 	}
+	
+	/**
+	 * @return Name of this list-compound
+	 */
+	public String getName(){
+		return listName;
+	}
+	
+	/**
+	 * @return The Compound's parent Object
+	 */
+	public NBTCompound getParent() {
+		return parent;
+	}
 
 	protected void save() {
 		parent.set(listName, listObject);
@@ -208,7 +222,7 @@ public abstract class NBTList<T> implements List<T> {
 	public Iterator<T> iterator() {
 		return new Iterator<T>() {
 
-			private int index = 0;
+			private int index = -1;
 
 			@Override
 			public boolean hasNext() {
@@ -234,7 +248,7 @@ public abstract class NBTList<T> implements List<T> {
 		final NBTList<T> list = this;
 		return new ListIterator<T>() {
 
-			int index = startIndex;
+			int index = startIndex - 1;
 
 			@Override
 			public void add(T e) {
@@ -248,7 +262,7 @@ public abstract class NBTList<T> implements List<T> {
 
 			@Override
 			public boolean hasPrevious() {
-				return index > 0;
+				return index >= 0 && index <= size();
 			}
 
 			@Override
@@ -265,7 +279,9 @@ public abstract class NBTList<T> implements List<T> {
 
 			@Override
 			public T previous() {
-				return get(--index);
+				if (!hasPrevious())
+					throw new NoSuchElementException("Id: " + (index - 1));
+				return get(index--);
 			}
 
 			@Override
@@ -318,4 +334,10 @@ public abstract class NBTList<T> implements List<T> {
 		return list;
 	}
 
+	@Override
+	public String toString() {
+		return listObject.toString();
+	}
+
+
 }

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTListCompound.java

@@ -1,9 +1,5 @@
 package de.tr7zw.changeme.nbtapi;
 
-import java.util.Set;
-
-import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
-
 /**
  * Cut down version of the {@link NBTCompound} for inside
  * {@link NBTCompoundList} This Compound implementation is missing the ability
@@ -13,144 +9,34 @@ import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
  * @author tr7zw
  *
  */
-public class NBTListCompound {
+public class NBTListCompound extends NBTCompound {
 
 	private NBTList<?> owner;
 	private Object compound;
 
 	protected NBTListCompound(NBTList<?> parent, Object obj) {
+		super(null, null);
 		owner = parent;
 		compound = obj;
 	}
-
-	/**
-	 * String setter
-	 * 
-	 * @param key
-	 * @param value
-	 */
-	public void setString(String key, String value) {
-		if (value == null) {
-			remove(key);
-			return;
-		}
-		try {
-			compound.getClass().getMethod("setString", String.class, String.class).invoke(compound, key, value);
-			owner.save();
-		} catch (Exception ex) {
-			throw new NbtApiException(ex);
-		}
+	
+	public NBTList<?> getListParent() {
+		return owner;
 	}
 
-	/**
-	 * int setter
-	 * 
-	 * @param key
-	 * @param value
-	 */
-	public void setInteger(String key, int value) {
-		try {
-			compound.getClass().getMethod("setInt", String.class, int.class).invoke(compound, key, value);
-			owner.save();
-		} catch (Exception ex) {
-			throw new NbtApiException(ex);
-		}
+	@Override
+	public Object getCompound() {
+		return compound;
 	}
 
-	/**
-	 * int getter
-	 * 
-	 * @param value
-	 * @return Saved value or NMS fallback
-	 */
-	public int getInteger(String value) {
-		try {
-			return (int) compound.getClass().getMethod("getInt", String.class).invoke(compound, value);
-		} catch (Exception ex) {
-			throw new NbtApiException(ex);
-		}
+	@Override
+	protected void setCompound(Object compound) {
+		this.compound = compound;
 	}
 
-	/**
-	 * double setter
-	 * 
-	 * @param key
-	 * @param value
-	 */
-	public void setDouble(String key, double value) {
-		try {
-			compound.getClass().getMethod("setDouble", String.class, double.class).invoke(compound, key, value);
-			owner.save();
-		} catch (Exception ex) {
-			throw new NbtApiException(ex);
-		}
-	}
-
-	/**
-	 * double getter
-	 * 
-	 * @param key
-	 * @return Saved value or NMS fallback
-	 */
-	public double getDouble(String key) {
-		try {
-			return (double) compound.getClass().getMethod("getDouble", String.class).invoke(compound, key);
-		} catch (Exception ex) {
-			throw new NbtApiException(ex);
-		}
-	}
-
-	/**
-	 * String getter
-	 * 
-	 * @param key
-	 * @return Saved value or NMS fallback
-	 */
-	public String getString(String key) {
-		try {
-			return (String) compound.getClass().getMethod("getString", String.class).invoke(compound, key);
-		} catch (Exception ex) {
-			throw new NbtApiException(ex);
-		}
-	}
-
-	/**
-	 * Checks for a given key
-	 * 
-	 * @param key
-	 * @return true if the Compound has this key, else false
-	 */
-	public boolean hasKey(String key) {
-		try {
-			return (boolean) compound.getClass().getMethod("hasKey", String.class).invoke(compound, key);
-		} catch (Exception ex) {
-			throw new NbtApiException(ex);
-		}
-	}
-
-	/**
-	 * @return Set containing all keys
-	 */
-	@SuppressWarnings("unchecked")
-	public Set<String> getKeys() {
-		try {
-			return (Set<String>) ReflectionMethod.LISTCOMPOUND_GET_KEYS.run(compound);
-		} catch (Exception ex) {
-			throw new NbtApiException(ex);
-		}
-	}
-
-	/**
-	 * Removes a key from the Compound
-	 * 
-	 * @param key
-	 */
-	public void remove(String key) {
-		try {
-			compound.getClass().getMethod("remove", String.class).invoke(compound, key);
-		} catch (Exception ex) {
-			throw new NbtApiException(ex);
-		}
+	@Override
+	protected void saveCompound() {
+		owner.save();
 	}
 
 }

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTReflectionUtil.java

@@ -99,10 +99,11 @@ public class NBTReflectionUtil {
 	 */
 	public static Object convertNBTCompoundtoNMSItem(NBTCompound nbtcompound) {
 		try {
+			Object nmsComp = gettoCompount(nbtcompound.getCompound(), nbtcompound);
 			if (MinecraftVersion.getVersion().getVersionId() >= MinecraftVersion.MC1_11_R1.getVersionId()) {
-				return ObjectCreator.NMS_COMPOUNDFROMITEM.getInstance(nbtcompound.getCompound());
+				return ObjectCreator.NMS_COMPOUNDFROMITEM.getInstance(nmsComp);
 			} else {
-				return ReflectionMethod.NMSITEM_CREATESTACK.run(null, nbtcompound.getCompound());
+				return ReflectionMethod.NMSITEM_CREATESTACK.run(null, nmsComp);
 			}
 		} catch (Exception e) {
 			throw new NbtApiException("Exception while converting NBTCompound to NMS ItemStack!", e);

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTStringList.java

@@ -1,5 +1,6 @@
 package de.tr7zw.changeme.nbtapi;
 
+import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ClassWrapper;
@@ -29,10 +30,12 @@ public class NBTStringList extends NBTList<String> {
 	@Override
 	protected Object asTag(String object) {
 		try {
-			return ClassWrapper.NMS_NBTTAGSTRING.getClazz().getConstructor(String.class).newInstance(object);
+			Constructor<?> con = ClassWrapper.NMS_NBTTAGSTRING.getClazz().getDeclaredConstructor(String.class);
+			con.setAccessible(true);
+			return con.newInstance(object);
 		} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
 				| NoSuchMethodException | SecurityException e) {
-			throw new NbtApiException("Error while wrapping the Oject " + object + " to it's NMS object!", e);
+			throw new NbtApiException("Error while wrapping the Object " + object + " to it's NMS object!", e);
 		}
 	}
 

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/ApiMetricsLite.java

@@ -1,377 +1,387 @@
-package de.tr7zw.changeme.nbtapi.utils;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import org.bukkit.plugin.ServicePriority;
-
-import javax.net.ssl.HttpsURLConnection;
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.Timer;
-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;
-
-/**
- * bStats collects some data for plugin authors.
- * <p>
- * Check out https://bStats.org/ to learn more about bStats!
- * 
- * This class is modified by tr7zw to work when the api is shaded into other peoples plugins.
- */
-public class ApiMetricsLite {
-
-	private static final String PLUGINNAME = "ItemNBTAPI"; // DO NOT CHANGE THE NAME! else it won't link the data on bStats
-	private static final String PLUGINVERSION = "2.0.0"; // In case you fork the nbt-api for internal use in your network, plugins and so on, you *may* add that to the version here. (2.x.x-Timolia or something like that?)
-	// Not sure how good of an idea that is, so maybe just leave it as is ¯\_(ツ)_/¯
-
-	// The version of this bStats class
-	public static final int B_STATS_VERSION = 1;
-
-	// The version of the NBT-Api bStats
-	public static final int NBT_BSTATS_VERSION = 1;
-
-	// The url to which the data is sent
-	private static final String URL = "https://bStats.org/submitData/bukkit";
-
-	// Is bStats enabled on this server?
-	private boolean enabled;
-
-	// Should failed requests be logged?
-	private static boolean logFailedRequests;
-
-	// Should the sent data be logged?
-	private static boolean logSentData;
-
-	// Should the response text be logged?
-	private static boolean logResponseStatusText;
-
-	// The uuid of the server
-	private static String serverUUID;
-
-	// The plugin
-	private Plugin plugin;
-
-	/**
-	 * Class constructor.
-	 *
-	 */
-	public ApiMetricsLite() {
-
-		// The register method just uses any enabled plugin it can find to register. This *shouldn't* cause any problems, since the plugin isn't used any other way.
-		// Register our service
-		for(Plugin plug : Bukkit.getPluginManager().getPlugins()) {
-				plugin = plug;
-				if(plugin != null)
-					break;
-		}
-		if(plugin == null) {
-			return;// Didn't find any plugin that could work
-		}
-
-		// Get the config file
-		File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
-		File configFile = new File(bStatsFolder, "config.yml");
-		YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-
-		// Check if the config file exists
-		if (!config.isSet("serverUuid")) {
-
-			// Add default values
-			config.addDefault("enabled", true);
-			// Every server gets it's unique random id.
-			config.addDefault("serverUuid", UUID.randomUUID().toString());
-			// Should failed request be logged?
-			config.addDefault("logFailedRequests", false);
-			// Should the sent data be logged?
-			config.addDefault("logSentData", false);
-			// Should the response text be logged?
-			config.addDefault("logResponseStatusText", false);
-
-			// Inform the server owners about bStats
-			config.options().header(
-					"bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
-							"To honor their work, you should not disable it.\n" +
-							"This has nearly no effect on the server performance!\n" +
-							"Check out https://bStats.org/ to learn more :)"
-					).copyDefaults(true);
-			try {
-				config.save(configFile);
-			} catch (IOException ignored) { }
-		}
-
-		// Load the data
-		serverUUID = config.getString("serverUuid");
-		logFailedRequests = config.getBoolean("logFailedRequests", false);
-		enabled = config.getBoolean("enabled", true);
-		logSentData = config.getBoolean("logSentData", false);
-		logResponseStatusText = config.getBoolean("logResponseStatusText", false);
-		if (enabled) {
-			boolean found = false;
-			// Search for all other bStats Metrics classes to see if we are the first one
-			for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
-				try {
-					service.getField("NBT_BSTATS_VERSION"); // Create only one instance of the nbt-api bstats.
-					return;
-				} catch (NoSuchFieldException ignored) { }
-				try {
-					service.getField("B_STATS_VERSION"); // Our identifier :)
-					found = true; // We aren't the first
-					break;
-				} catch (NoSuchFieldException ignored) { }
-			}
-			// Register our service
-			Bukkit.getServicesManager().register(ApiMetricsLite.class, this, plugin, ServicePriority.Normal);
-			if (!found) {
-				logger.info("[NBTAPI] Using the plugin '" + plugin.getName() + "' to create a bStats instance!");
-				// We are the first!
-				startSubmitting();
-			}
-		}
-	}
-
-	/**
-	 * Checks if bStats is enabled.
-	 *
-	 * @return Whether bStats is enabled or not.
-	 */
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	/**
-	 * Starts the Scheduler which submits our data every 30 minutes.
-	 */
-	private void startSubmitting() {
-		final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
-		timer.scheduleAtFixedRate(new TimerTask() {
-			@Override
-			public void run() {
-				if (!plugin.isEnabled()) { // Plugin was disabled
-					timer.cancel();
-					return;
-				}
-				// Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
-				// Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
-				Bukkit.getScheduler().runTask(plugin, () -> submitData());
-			}
-		}, 1000l * 60l * 5l, 1000l * 60l * 30l);
-		// Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
-		// WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
-		// WARNING: Just don't do it!
-	}
-
-	/**
-	 * Gets the plugin specific data.
-	 * This method is called using Reflection.
-	 *
-	 * @return The plugin specific data.
-	 */
-	public JsonObject getPluginData() {
-		JsonObject data = new JsonObject();
-
-		data.addProperty("pluginName", PLUGINNAME); // Append the name of the plugin
-		data.addProperty("pluginVersion", PLUGINVERSION); // Append the version of the plugin
-		data.add("customCharts", new JsonArray());
-
-		return data;
-	}
-
-	/**
-	 * Gets the server specific data.
-	 *
-	 * @return The server specific data.
-	 */
-	private JsonObject getServerData() {
-		// Minecraft specific data
-		int playerAmount;
-		try {
-			// Around MC 1.8 the return type was changed to a collection from an array,
-			// This fixes java.lang.NoSuchMethodError: org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
-			Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
-			playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class)
-					? ((Collection<?>) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
-							: ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
-		} catch (Exception e) {
-			playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed
-		}
-		int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
-		String bukkitVersion = Bukkit.getVersion();
-		String bukkitName = Bukkit.getName();
-
-		// OS/Java specific data
-		String javaVersion = System.getProperty("java.version");
-		String osName = System.getProperty("os.name");
-		String osArch = System.getProperty("os.arch");
-		String osVersion = System.getProperty("os.version");
-		int coreCount = Runtime.getRuntime().availableProcessors();
-
-		JsonObject data = new JsonObject();
-
-		data.addProperty("serverUUID", serverUUID);
-
-		data.addProperty("playerAmount", playerAmount);
-		data.addProperty("onlineMode", onlineMode);
-		data.addProperty("bukkitVersion", bukkitVersion);
-		data.addProperty("bukkitName", bukkitName);
-
-		data.addProperty("javaVersion", javaVersion);
-		data.addProperty("osName", osName);
-		data.addProperty("osArch", osArch);
-		data.addProperty("osVersion", osVersion);
-		data.addProperty("coreCount", coreCount);
-
-		return data;
-	}
-
-	/**
-	 * Collects the data and sends it afterwards.
-	 */
-	private void submitData() {
-		final JsonObject data = getServerData();
-
-		JsonArray pluginData = new JsonArray();
-		// Search for all other bStats Metrics classes to get their plugin data
-		for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
-			try {
-				service.getField("B_STATS_VERSION"); // Our identifier :)
-
-				for (RegisteredServiceProvider<?> provider : Bukkit.getServicesManager().getRegistrations(service)) {
-					try {
-						Object plugin = provider.getService().getMethod("getPluginData").invoke(provider.getProvider());
-						if (plugin instanceof JsonObject) {
-							pluginData.add((JsonObject) plugin);
-						} else { // old bstats version compatibility
-							try {
-								Class<?> jsonObjectJsonSimple = Class.forName("org.json.simple.JSONObject");
-								if (plugin.getClass().isAssignableFrom(jsonObjectJsonSimple)) {
-									Method jsonStringGetter = jsonObjectJsonSimple.getDeclaredMethod("toJSONString");
-									jsonStringGetter.setAccessible(true);
-									String jsonString = (String) jsonStringGetter.invoke(plugin);
-									JsonObject object = new JsonParser().parse(jsonString).getAsJsonObject();
-									pluginData.add(object);
-								}
-							} catch (ClassNotFoundException e) {
-								// minecraft version 1.14+
-								if (logFailedRequests) {
-									logger.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); 
-								}
-								continue; // continue looping since we cannot do any other thing.
-							}
-						}
-					} catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
-					}
-				}
-			} catch (NoSuchFieldException ignored) { }
-		}
-
-		data.add("plugins", pluginData);
-
-		// Create a new thread for the connection to the bStats server
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					// Send the data
-					sendData(plugin, data);
-				} catch (Exception e) {
-					// Something went wrong! :(
-					if (logFailedRequests) {
-						logger.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);
-					}
-				}
-			}
-		}).start();
-	}
-
-	/**
-	 * Sends the data to the bStats server.
-	 *
-	 * @param plugin Any plugin. It's just used to get a logger instance.
-	 * @param data The data to send.
-	 * @throws Exception If the request failed.
-	 */
-	private static void sendData(Plugin plugin, JsonObject data) throws Exception {
-		if (data == null) {
-			throw new IllegalArgumentException("Data cannot be null!");
-		}
-		if (Bukkit.isPrimaryThread()) {
-			throw new IllegalAccessException("This method must not be called from the main thread!");
-		}
-		if (logSentData) {
-			System.out.println("[NBTAPI][BSTATS] Sending data to bStats: " + data.toString());
-			// Not using the plugins logger since the plugin isn't the plugin containing the NBT-Api most of the time
-			//plugin.getLogger().info("Sending data to bStats: " + data.toString());
-		}
-		HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
-
-		// Compress the data to save bandwidth
-		byte[] compressedData = compress(data.toString());
-
-		// Add headers
-		connection.setRequestMethod("POST");
-		connection.addRequestProperty("Accept", "application/json");
-		connection.addRequestProperty("Connection", "close");
-		connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
-		connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
-		connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
-		connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
-
-		// Send data
-		connection.setDoOutput(true);
-		DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
-		outputStream.write(compressedData);
-		outputStream.flush();
-		outputStream.close();
-
-		InputStream inputStream = connection.getInputStream();
-		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
-
-		StringBuilder builder = new StringBuilder();
-		String line;
-		while ((line = bufferedReader.readLine()) != null) {
-			builder.append(line);
-		}
-		bufferedReader.close();
-		if (logResponseStatusText) {
-			logger.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());
-		}
-	}
-
-	/**
-	 * Gzips the given String.
-	 *
-	 * @param str The string to gzip.
-	 * @return The gzipped String.
-	 * @throws IOException If the compression failed.
-	 */
-	private static byte[] compress(final String str) throws IOException {
-		if (str == null) {
-			return new byte[0];
-		}
-		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-		GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
-		gzip.write(str.getBytes(StandardCharsets.UTF_8));
-		gzip.close();
-		return outputStream.toByteArray();
-	}
-
-}
+package de.tr7zw.changeme.nbtapi.utils;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredServiceProvider;
+import org.bukkit.plugin.ServicePriority;
+
+import javax.net.ssl.HttpsURLConnection;
+import java.io.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.Timer;
+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;
+
+/**
+ * bStats collects some data for plugin authors.
+ * <p>
+ * Check out https://bStats.org/ to learn more about bStats!
+ * 
+ * This class is modified by tr7zw to work when the api is shaded into other peoples plugins.
+ */
+public class ApiMetricsLite {
+
+	private static final String PLUGINNAME = "ItemNBTAPI"; // DO NOT CHANGE THE NAME! else it won't link the data on bStats
+
+	// The version of this bStats class
+	public static final int B_STATS_VERSION = 1;
+
+	// The version of the NBT-Api bStats
+	public static final int NBT_BSTATS_VERSION = 1;
+
+	// The url to which the data is sent
+	private static final String URL = "https://bStats.org/submitData/bukkit";
+
+	// Is bStats enabled on this server?
+	private boolean enabled;
+
+	// Should failed requests be logged?
+	private static boolean logFailedRequests;
+
+	// Should the sent data be logged?
+	private static boolean logSentData;
+
+	// Should the response text be logged?
+	private static boolean logResponseStatusText;
+
+	// The uuid of the server
+	private static String serverUUID;
+
+	// The plugin
+	private Plugin plugin;
+
+	/**
+	 * Class constructor.
+	 *
+	 */
+	public ApiMetricsLite() {
+
+		// The register method just uses any enabled plugin it can find to register. This *shouldn't* cause any problems, since the plugin isn't used any other way.
+		// Register our service
+		for(Plugin plug : Bukkit.getPluginManager().getPlugins()) {
+				plugin = plug;
+				if(plugin != null)
+					break;
+		}
+		if(plugin == null) {
+			return;// Didn't find any plugin that could work
+		}
+
+		// Get the config file
+		File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
+		File configFile = new File(bStatsFolder, "config.yml");
+		YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
+
+		// Check if the config file exists
+		if (!config.isSet("serverUuid")) {
+
+			// Add default values
+			config.addDefault("enabled", true);
+			// Every server gets it's unique random id.
+			config.addDefault("serverUuid", UUID.randomUUID().toString());
+			// Should failed request be logged?
+			config.addDefault("logFailedRequests", false);
+			// Should the sent data be logged?
+			config.addDefault("logSentData", false);
+			// Should the response text be logged?
+			config.addDefault("logResponseStatusText", false);
+
+			// Inform the server owners about bStats
+			config.options().header(
+					"bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
+							"To honor their work, you should not disable it.\n" +
+							"This has nearly no effect on the server performance!\n" +
+							"Check out https://bStats.org/ to learn more :)"
+					).copyDefaults(true);
+			try {
+				config.save(configFile);
+			} catch (IOException ignored) { }
+		}
+
+		// Load the data
+		serverUUID = config.getString("serverUuid");
+		logFailedRequests = config.getBoolean("logFailedRequests", false);
+		enabled = config.getBoolean("enabled", true);
+		logSentData = config.getBoolean("logSentData", false);
+		logResponseStatusText = config.getBoolean("logResponseStatusText", false);
+		if (enabled) {
+			boolean found = false;
+			// Search for all other bStats Metrics classes to see if we are the first one
+			for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
+				try {
+					service.getField("NBT_BSTATS_VERSION"); // Create only one instance of the nbt-api bstats.
+					return;
+				} catch (NoSuchFieldException ignored) { }
+				try {
+					service.getField("B_STATS_VERSION"); // Our identifier :)
+					found = true; // We aren't the first
+					break;
+				} catch (NoSuchFieldException ignored) { }
+			}
+			boolean fFound = found;
+			// Register our service
+			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!");
+					// We are the first!
+					startSubmitting();
+				}
+			}else{
+				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!");
+						// We are the first!
+						startSubmitting();
+					}
+				});
+			}
+		}
+	}
+
+	/**
+	 * Checks if bStats is enabled.
+	 *
+	 * @return Whether bStats is enabled or not.
+	 */
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	/**
+	 * Starts the Scheduler which submits our data every 30 minutes.
+	 */
+	private void startSubmitting() {
+		final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
+		timer.scheduleAtFixedRate(new TimerTask() {
+			@Override
+			public void run() {
+				if (!plugin.isEnabled()) { // Plugin was disabled
+					timer.cancel();
+					return;
+				}
+				// Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
+				// Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
+				Bukkit.getScheduler().runTask(plugin, () -> submitData());
+			}
+		}, 1000l * 60l * 5l, 1000l * 60l * 30l);
+		// Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
+		// WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
+		// WARNING: Just don't do it!
+	}
+
+	/**
+	 * Gets the plugin specific data.
+	 * This method is called using Reflection.
+	 *
+	 * @return The plugin specific data.
+	 */
+	public JsonObject getPluginData() {
+		JsonObject data = new JsonObject();
+
+		data.addProperty("pluginName", PLUGINNAME); // Append the name of the plugin
+		data.addProperty("pluginVersion", MinecraftVersion.VERSION); // Append the version of the plugin
+		data.add("customCharts", new JsonArray());
+
+		return data;
+	}
+
+	/**
+	 * Gets the server specific data.
+	 *
+	 * @return The server specific data.
+	 */
+	private JsonObject getServerData() {
+		// Minecraft specific data
+		int playerAmount;
+		try {
+			// Around MC 1.8 the return type was changed to a collection from an array,
+			// This fixes java.lang.NoSuchMethodError: org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
+			Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
+			playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class)
+					? ((Collection<?>) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
+							: ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
+		} catch (Exception e) {
+			playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed
+		}
+		int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
+		String bukkitVersion = Bukkit.getVersion();
+		String bukkitName = Bukkit.getName();
+
+		// OS/Java specific data
+		String javaVersion = System.getProperty("java.version");
+		String osName = System.getProperty("os.name");
+		String osArch = System.getProperty("os.arch");
+		String osVersion = System.getProperty("os.version");
+		int coreCount = Runtime.getRuntime().availableProcessors();
+
+		JsonObject data = new JsonObject();
+
+		data.addProperty("serverUUID", serverUUID);
+
+		data.addProperty("playerAmount", playerAmount);
+		data.addProperty("onlineMode", onlineMode);
+		data.addProperty("bukkitVersion", bukkitVersion);
+		data.addProperty("bukkitName", bukkitName);
+
+		data.addProperty("javaVersion", javaVersion);
+		data.addProperty("osName", osName);
+		data.addProperty("osArch", osArch);
+		data.addProperty("osVersion", osVersion);
+		data.addProperty("coreCount", coreCount);
+
+		return data;
+	}
+
+	/**
+	 * Collects the data and sends it afterwards.
+	 */
+	private void submitData() {
+		final JsonObject data = getServerData();
+
+		JsonArray pluginData = new JsonArray();
+		// Search for all other bStats Metrics classes to get their plugin data
+		for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
+			try {
+				service.getField("B_STATS_VERSION"); // Our identifier :)
+
+				for (RegisteredServiceProvider<?> provider : Bukkit.getServicesManager().getRegistrations(service)) {
+					try {
+						Object plugin = provider.getService().getMethod("getPluginData").invoke(provider.getProvider());
+						if (plugin instanceof JsonObject) {
+							pluginData.add((JsonObject) plugin);
+						} else { // old bstats version compatibility
+							try {
+								Class<?> jsonObjectJsonSimple = Class.forName("org.json.simple.JSONObject");
+								if (plugin.getClass().isAssignableFrom(jsonObjectJsonSimple)) {
+									Method jsonStringGetter = jsonObjectJsonSimple.getDeclaredMethod("toJSONString");
+									jsonStringGetter.setAccessible(true);
+									String jsonString = (String) jsonStringGetter.invoke(plugin);
+									JsonObject object = new JsonParser().parse(jsonString).getAsJsonObject();
+									pluginData.add(object);
+								}
+							} catch (ClassNotFoundException e) {
+								// minecraft version 1.14+
+								if (logFailedRequests) {
+									logger.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); 
+								}
+								continue; // continue looping since we cannot do any other thing.
+							}
+						}
+					} catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
+					}
+				}
+			} catch (NoSuchFieldException ignored) { }
+		}
+
+		data.add("plugins", pluginData);
+
+		// Create a new thread for the connection to the bStats server
+		new Thread(new Runnable() {
+			@Override
+			public void run() {
+				try {
+					// Send the data
+					sendData(plugin, data);
+				} catch (Exception e) {
+					// Something went wrong! :(
+					if (logFailedRequests) {
+						logger.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);
+					}
+				}
+			}
+		}).start();
+	}
+
+	/**
+	 * Sends the data to the bStats server.
+	 *
+	 * @param plugin Any plugin. It's just used to get a logger instance.
+	 * @param data The data to send.
+	 * @throws Exception If the request failed.
+	 */
+	private static void sendData(Plugin plugin, JsonObject data) throws Exception {
+		if (data == null) {
+			throw new IllegalArgumentException("Data cannot be null!");
+		}
+		if (Bukkit.isPrimaryThread()) {
+			throw new IllegalAccessException("This method must not be called from the main thread!");
+		}
+		if (logSentData) {
+			System.out.println("[NBTAPI][BSTATS] Sending data to bStats: " + data.toString());
+			// Not using the plugins logger since the plugin isn't the plugin containing the NBT-Api most of the time
+			//plugin.getLogger().info("Sending data to bStats: " + data.toString());
+		}
+		HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
+
+		// Compress the data to save bandwidth
+		byte[] compressedData = compress(data.toString());
+
+		// Add headers
+		connection.setRequestMethod("POST");
+		connection.addRequestProperty("Accept", "application/json");
+		connection.addRequestProperty("Connection", "close");
+		connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
+		connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
+		connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
+		connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
+
+		// Send data
+		connection.setDoOutput(true);
+		DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
+		outputStream.write(compressedData);
+		outputStream.flush();
+		outputStream.close();
+
+		InputStream inputStream = connection.getInputStream();
+		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+
+		StringBuilder builder = new StringBuilder();
+		String line;
+		while ((line = bufferedReader.readLine()) != null) {
+			builder.append(line);
+		}
+		bufferedReader.close();
+		if (logResponseStatusText) {
+			logger.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());
+		}
+	}
+
+	/**
+	 * Gzips the given String.
+	 *
+	 * @param str The string to gzip.
+	 * @return The gzipped String.
+	 * @throws IOException If the compression failed.
+	 */
+	private static byte[] compress(final String str) throws IOException {
+		if (str == null) {
+			return new byte[0];
+		}
+		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+		GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
+		gzip.write(str.getBytes(StandardCharsets.UTF_8));
+		gzip.close();
+		return outputStream.toByteArray();
+	}
+
+}

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/MinecraftVersion.java

@@ -25,16 +25,21 @@ public enum MinecraftVersion {
 	MC1_12_R1(1121),
 	MC1_13_R1(1131),
 	MC1_13_R2(1132),
-	MC1_14_R1(1141);
+	MC1_14_R1(1141),
+	MC1_15_R1(1151);
 
 	private static MinecraftVersion version;
 	private static Boolean hasGsonSupport;
 	private static boolean bStatsDisabled = false;
 	private static boolean disablePackageWarning = false;
+	private static boolean updateCheckDisabled = false;
 	/**
 	 * Logger used by the api
 	 */
 	public static final Logger logger = Logger.getLogger("NBTAPI");
+	
+	// NBT-API Version
+	protected static final String VERSION = "2.2.0";
 
 	private final int versionId;
 
@@ -82,6 +87,12 @@ public enum MinecraftVersion {
 		} 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);
+		}
 		// 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',
@@ -126,6 +137,14 @@ 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.
+	 */
+	public static void disableUpdateCheck() {
+		updateCheckDisabled = true;
+	}
 
 	/**
 	 * Forcefully disables the log message for plugins not shading the API to

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/ReflectionUtil.java

@@ -0,0 +1,53 @@
+package de.tr7zw.changeme.nbtapi.utils;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+import de.tr7zw.changeme.nbtapi.NbtApiException;
+
+public final class ReflectionUtil {
+
+	private static Field field_modifiers;
+
+	static {
+		try {
+			field_modifiers = Field.class.getDeclaredField("modifiers");
+			field_modifiers.setAccessible(true);
+		} catch (NoSuchFieldException ex) {
+			try {
+				// This hacky workaround is for newer jdk versions 11+?
+				Method fieldGetter = Class.class.getDeclaredMethod("getDeclaredFields0", boolean.class);
+				fieldGetter.setAccessible(true);
+				Field[] fields = (Field[]) fieldGetter.invoke(Field.class, false);
+				for (Field f : fields)
+					if (f.getName().equals("modifiers")) {
+						field_modifiers = f;
+						field_modifiers.setAccessible(true);
+						break;
+					}
+			} catch (Exception e) {
+				throw new NbtApiException(e);
+			}
+		}
+		if (field_modifiers == null) {
+			throw new NbtApiException("Unable to init the modifiers Field.");
+		}
+	}
+
+	public static Field makeNonFinal(Field field) throws IllegalArgumentException, IllegalAccessException {
+		int mods = field.getModifiers();
+		if (Modifier.isFinal(mods)) {
+			field_modifiers.set(field, mods & ~Modifier.FINAL);
+		}
+		return field;
+	}
+
+	public static void setFinal(Object obj, Field field, Object newValue)
+			throws IllegalArgumentException, IllegalAccessException {
+		field.setAccessible(true);
+		field = makeNonFinal(field);
+		field.set(obj, newValue);
+	}
+
+}

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/VersionChecker.java

@@ -0,0 +1,106 @@
+package de.tr7zw.changeme.nbtapi.utils;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.logging.Level;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import de.tr7zw.changeme.nbtapi.NBTItem;
+
+/**
+ * This class uses the Spiget API to check for updates
+ *
+ */
+public class VersionChecker {
+
+	private static final String USER_AGENT = "nbt-api Version check";
+	private static final String REQUEST_URL = "https://api.spiget.org/v2/resources/7939/versions?size=100";
+
+	protected static void checkForUpdates() throws Exception {
+		URL url = new URL(REQUEST_URL);
+		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+		connection.addRequestProperty("User-Agent", USER_AGENT);// Set
+																// User-Agent
+
+		// If you're not sure if the request will be successful,
+		// you need to check the response code and use #getErrorStream if it
+		// returned an error code
+		InputStream inputStream = connection.getInputStream();
+		InputStreamReader reader = new InputStreamReader(inputStream);
+
+		// This could be either a JsonArray or JsonObject
+		JsonElement element = new JsonParser().parse(reader);
+		if (element.isJsonArray()) {
+			// Is JsonArray
+			JsonArray updates = (JsonArray) element;
+			JsonObject latest = (JsonObject) updates.get(updates.size() - 1);
+			int versionDifference = getVersionDifference(latest.get("name").getAsString());
+			if (versionDifference == -1) { // Outdated
+				MinecraftVersion.logger.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
+						+ "' Newest Version: " + latest.get("name").getAsString() + "'");
+				MinecraftVersion.logger.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!");
+			} else if (versionDifference == 1) {
+				MinecraftVersion.logger.log(Level.WARNING, "[NBTAPI] The NBT-API at '" + NBTItem.class.getPackage()
+						+ "' seems to be a future Version, not yet released on Spigot!");
+				MinecraftVersion.logger.log(Level.WARNING, "[NBTAPI] Current Version: '" + MinecraftVersion.VERSION
+						+ "' Newest Version: " + latest.get("name").getAsString() + "'");
+			}
+		} else {
+			// wut?!
+			MinecraftVersion.logger.log(Level.WARNING,
+					"[NBTAPI] Error when looking for Updates! Got non Json Array: '" + element.toString() + "'");
+		}
+	}
+
+	// -1 = we are outdated
+	// 0 = up to date
+	// 1 = using a future version
+	// This method is only able to compare the Format 0.0.0(-SNAPSHOT)
+	private static int getVersionDifference(String version) {
+		String current = MinecraftVersion.VERSION;
+		if (current.equals(version))
+			return 0;
+		String pattern = "\\.";
+		if (current.split(pattern).length != 3 || version.split(pattern).length != 3)
+			return -1;
+		int curMaj = Integer.parseInt(current.split(pattern)[0]);
+		int curMin = Integer.parseInt(current.split(pattern)[1]);
+		String curPatch = current.split(pattern)[2];
+		int relMaj = Integer.parseInt(version.split(pattern)[0]);
+		int relMin = Integer.parseInt(version.split(pattern)[1]);
+		String relPatch = version.split(pattern)[2];
+		if (curMaj < relMaj)
+			return -1;
+		if (curMaj > relMaj)
+			return 1;
+		if (curMin < relMin)
+			return -1;
+		if (curMin > relMin)
+			return 1;
+		int curPatchN = Integer.parseInt(curPatch.split("-")[0]);
+		int relPatchN = Integer.parseInt(relPatch.split("-")[0]);
+		if (curPatchN < relPatchN)
+			return -1;
+		if (curPatchN > relPatchN)
+			return 1;
+		if (!relPatch.contains("-") && curPatch.contains("-"))
+			return -1; // Release has no - but we do = We use a Snapshot of the
+						// release
+		if (relPatch.contains("-") && curPatch.contains("-"))
+			return 0; // Release and cur are Snapshots/alpha/beta
+		return 1;
+	}
+
+}

item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/utils/nmsmappings/ReflectionMethod.java

@@ -3,13 +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.logging.Level;
-
 import org.bukkit.inventory.ItemStack;
 
 import de.tr7zw.changeme.nbtapi.NbtApiException;
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
-import static de.tr7zw.changeme.nbtapi.utils.MinecraftVersion.logger;
 
 /**
  * This class caches method reflections, keeps track of method name changes between versions and allows early checking for problems
@@ -53,7 +50,7 @@ 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")), //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")), //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")),
@@ -127,7 +124,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() + "'"); //NOSONAR This gets loaded before the logger is loaded
+            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
         }
     }
     
@@ -143,10 +140,12 @@ public enum ReflectionMethod {
      * @return Value returned by the method
      */
     public Object run(Object target, Object... args){
-        try{
+        if(method == null)
+        	throw new NbtApiException("Method not loaded! '" + this + "'");
+    	try{
             return method.invoke(target, args);
         }catch(Exception ex){
-            throw new NbtApiException("Error while calling the method '" + methodName + "', loaded: " + loaded + ".", ex);
+            throw new NbtApiException("Error while calling the method '" + methodName + "', loaded: " + loaded + ", Enum: " + this, ex);
         }
     }
     

item-nbt-plugin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
   </parent>
   <artifactId>item-nbt-api-plugin</artifactId>
   <packaging>jar</packaging>
@@ -12,13 +12,13 @@
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>item-nbt-api</artifactId>
-      <version>2.1.0</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>nbt-injector</artifactId>
-      <version>2.1.0</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -73,11 +73,11 @@
           </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.1,1.14.2,1.14.3,1.14.4 -->
-          <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.1,1.14.2,1.14.3,1.14.4</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 -->
+          <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</versions>
           <works>Success! This version of NBT-API</works>
           <error>WARNING! This version of NBT-API</error>
-          <filename>item-nbt-api-plugin-2.1.0.jar</filename>
+          <filename>item-nbt-api-plugin-${project.version}.jar</filename>
           <foldername>item-nbt-plugin</foldername>
         </configuration>
       </plugin>

item-nbt-plugin/src/main/java/de/tr7zw/nbtapi/plugin/NBTAPI.java

@@ -13,6 +13,7 @@ import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ClassWrapper;
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
 import de.tr7zw.nbtapi.plugin.tests.NBTFileTest;
+import de.tr7zw.nbtapi.plugin.tests.compounds.ForEachTest;
 import de.tr7zw.nbtapi.plugin.tests.compounds.GetterSetterTest;
 import de.tr7zw.nbtapi.plugin.tests.compounds.ListTest;
 import de.tr7zw.nbtapi.plugin.tests.compounds.MergeTest;
@@ -57,6 +58,7 @@ public class NBTAPI extends JavaPlugin {
 		apiTests.add(new ListTest());
 		apiTests.add(new SubCompoundsTest());
 		apiTests.add(new MergeTest());
+		apiTests.add(new ForEachTest());
 
 		// Items
 		apiTests.add(new ItemConvertionTest());

item-nbt-plugin/src/main/java/de/tr7zw/nbtapi/plugin/tests/compounds/ForEachTest.java

@@ -0,0 +1,50 @@
+package de.tr7zw.nbtapi.plugin.tests.compounds;
+
+import java.util.ListIterator;
+
+import de.tr7zw.changeme.nbtapi.NBTCompoundList;
+import de.tr7zw.changeme.nbtapi.NBTContainer;
+import de.tr7zw.changeme.nbtapi.NBTListCompound;
+import de.tr7zw.changeme.nbtapi.NbtApiException;
+import de.tr7zw.nbtapi.plugin.tests.Test;
+
+/**
+ * Test requested by TAU on Discord
+ *
+ */
+public class ForEachTest implements Test {
+
+	@SuppressWarnings("unused")
+	@Override
+	public void test() throws Exception {
+		NBTContainer comp = new NBTContainer();
+        NBTCompoundList compList = comp.getCompoundList("testkey");
+        if (compList != null) {
+        	compList.addCompound().setInteger("id", 1);
+        	compList.addCompound().setInteger("id", 2);
+        	compList.addCompound().setInteger("id", 3);
+            int count = 0;
+            for (NBTListCompound listComp : compList) {
+            	count++;  
+            }
+            if(count != compList.size())
+            	throw new NbtApiException("For loop did not get all Entries!");
+            count = 0;
+            ListIterator<NBTListCompound> lit = compList.listIterator();
+            while(lit.hasNext()){
+            	lit.next();
+            	count++;
+            }
+            if(count != compList.size())
+            	throw new NbtApiException("ListIterator did not get all Entries!");
+            count = 0;
+            while(lit.hasPrevious()){
+            	lit.previous();
+            	count++;
+            }
+            if(count != compList.size())
+            	throw new NbtApiException("ListIterator previous did not get all Entries!");
+        }
+	}
+
+}

item-nbt-plugin/src/main/java/de/tr7zw/nbtapi/plugin/tests/compounds/ListTest.java

@@ -2,10 +2,12 @@ package de.tr7zw.nbtapi.plugin.tests.compounds;
 
 import java.util.Arrays;
 
+import de.tr7zw.changeme.nbtapi.NBTCompound;
 import de.tr7zw.changeme.nbtapi.NBTCompoundList;
 import de.tr7zw.changeme.nbtapi.NBTContainer;
 import de.tr7zw.changeme.nbtapi.NBTList;
 import de.tr7zw.changeme.nbtapi.NBTListCompound;
+import de.tr7zw.changeme.nbtapi.NBTType;
 import de.tr7zw.changeme.nbtapi.NbtApiException;
 import de.tr7zw.nbtapi.plugin.tests.Test;
 
@@ -34,19 +36,30 @@ public class ListTest implements Test {
 		lcomp.setInteger("int1", 42);
 		lcomp.setString("test1", "test1");
 		lcomp.setString("test2", "test2");
-		lcomp.remove("test1");
+		lcomp.removeKey("test1");
+		NBTCompound subsubcomp = lcomp.addCompound("listsubkey");
+		subsubcomp.setString("deep", "String");
+		subsubcomp.getCompoundList("deeplist").addCompound().setString("test", "test");
+		subsubcomp.getCompoundList("clonelist").addCompound(comp);
 
 		taglist = null;
 		lcomp = null;
+		subsubcomp = null;
 
 		taglist = comp.getCompoundList("complist");
 		if (taglist.size() == 1) {
 			lcomp = taglist.get(0);
-			if (lcomp.getKeys().size() != 3) {
+			if (lcomp.getKeys().size() != 4) {
 				throw new NbtApiException("Wrong key amount in Taglist (" + lcomp.getKeys().size() + ")!");
 			} else if (!(lcomp.getDouble("double1") == 0.3333 && lcomp.getInteger("int1") == 42
 					&& lcomp.getString("test2").equals("test2") && !lcomp.hasKey("test1"))) {
 				throw new NbtApiException("One key in the Taglist changed! The Item-NBT-API may not work!");
+			} else if(lcomp.getCompound("listsubkey") == null || !"String".equals(lcomp.getCompound("listsubkey").getString("deep"))){
+				throw new NbtApiException("The Compound nested in the listcompound was not correct! The Item-NBT-API may not work!");
+			} else if(lcomp.getCompound("listsubkey").getType("deep") != NBTType.NBTTagString){
+				throw new NbtApiException("The nested key's type wasn't correct! The Item-NBT-API may not work!");
+			} else if(lcomp.getCompound("listsubkey").getType("deeplist") != NBTType.NBTTagList){
+				throw new NbtApiException("The nested list's type wasn't correct '" + lcomp.getCompound("listsubkey").getType("deeplist") + "'! The Item-NBT-API may not work!");
 			}
 		} else {
 			throw new NbtApiException("Taglist is empty! The Item-NBT-API may not work!");

item-nbt-plugin/src/main/java/de/tr7zw/nbtapi/plugin/tests/items/ItemConvertionTest.java

@@ -25,6 +25,11 @@ public class ItemConvertionTest implements Test {
 		ItemStack rebuild = NBTItem.convertNBTtoItem(new NBTContainer(nbt));
 		if (!item.isSimilar(rebuild))
 			throw new NbtApiException("Rebuilt item did not match the original!");
+		
+		NBTContainer cont = new NBTContainer();
+		cont.setItemStack("testItem", item);
+		if(!cont.getItemStack("testItem").isSimilar(item))
+			throw new NbtApiException("Rebuilt item did not match the original!");
 	}
 
 }

nbt-injector/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.tr7zw</groupId>
     <artifactId>item-nbt-parent</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
   </parent>
   <artifactId>nbt-injector</artifactId>
   <packaging>jar</packaging>
@@ -12,13 +12,13 @@
     <dependency>
       <groupId>de.tr7zw</groupId>
       <artifactId>item-nbt-api</artifactId>
-      <version>2.1.0</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.javassist</groupId>
       <artifactId>javassist</artifactId>
-      <version>3.25.0-GA</version>
+      <version>3.26.0-GA</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

nbt-injector/src/main/java/de/tr7zw/nbtinjector/InternalInjectors.java

@@ -16,6 +16,7 @@ import org.bukkit.Bukkit;
 
 import de.tr7zw.changeme.nbtapi.NbtApiException;
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
+import de.tr7zw.changeme.nbtapi.utils.ReflectionUtil;
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ClassWrapper;
 import de.tr7zw.changeme.nbtapi.utils.nmsmappings.ReflectionMethod;
 import de.tr7zw.nbtinjector.NBTInjector.Entity;
@@ -64,6 +65,8 @@ public class InternalInjectors {
 		classMappings.put("minecraft:illusioner", "IllagerIllusioner");
 		classMappings.put("minecraft:pufferfish", "PufferFish");
 		classMappings.put("minecraft:cave_spider", "CaveSpider");
+		classMappings.put("minecraft:item_frame", "ItemFrame");
+		classMappings.put("minecraft:leash_knot", "Leash");
 	}
 
 	/**
@@ -115,7 +118,7 @@ public class InternalInjectors {
 			}
 		}
 		Field inverseField = registry.getClass().getDeclaredField("b");
-		NBTInjector.setFinal(registry, inverseField, inverse);
+		ReflectionUtil.setFinal(registry, inverseField, inverse);
 	}
 
 	protected static void entity1v13Below(ClassPool classPool) throws ReflectiveOperationException {
@@ -134,8 +137,8 @@ public class InternalInjectors {
 					continue;
 				} // Already injected
 				Class<?> wrapped = ClassGenerator.wrapEntity(classPool, nmsclass, "__extraData");
-				NBTInjector.setFinal(entityTypesObj, classField, wrapped);
-				NBTInjector.setFinal(entityTypesObj, supplierField, new Function<Object, Object>() {
+				ReflectionUtil.setFinal(entityTypesObj, classField, wrapped);
+				ReflectionUtil.setFinal(entityTypesObj, supplierField, new Function<Object, Object>() {
 
 					@Override
 					public Object apply(Object t) {
@@ -162,7 +165,10 @@ public class InternalInjectors {
 				continue;
 			}
 			Object entityTypesObj = ReflectionMethod.REGISTRYMATERIALS_GET.run(entityRegistry, mckey);
-			Field creatorField = entityTypesObj.getClass().getDeclaredField("aZ");
+			String creatorFieldName = "aZ";
+			if (MinecraftVersion.getVersion().getVersionId() >= MinecraftVersion.MC1_15_R1.getVersionId())
+				creatorFieldName = "ba";
+			Field creatorField = entityTypesObj.getClass().getDeclaredField(creatorFieldName);
 			creatorField.setAccessible(true);
 			Object creator = creatorField.get(entityTypesObj);
 			Method createEntityMethod = creator.getClass().getMethod("create", ClassWrapper.NMS_ENTITYTYPES.getClazz(),
@@ -198,7 +204,7 @@ public class InternalInjectors {
 					continue;
 				} // Already injected
 				Class<?> wrapped = ClassGenerator.wrapEntity(classPool, nmsclass, "__extraData");
-				NBTInjector.setFinal(entityTypesObj, creatorField,
+				ReflectionUtil.setFinal(entityTypesObj, creatorField,
 						ClassGenerator.createEntityTypeWrapper(classPool, wrapped).newInstance());
 			} catch (Exception e) {
 				throw new NbtApiException("Exception while injecting " + mckey, e);
@@ -240,7 +246,7 @@ public class InternalInjectors {
 			}
 		}
 		Field inverseField = registry.getClass().getDeclaredField("b");
-		NBTInjector.setFinal(registry, inverseField, inverse);
+		ReflectionUtil.setFinal(registry, inverseField, inverse);
 	}
 
 	protected static void tile1v13(ClassPool classPool) throws ReflectiveOperationException {
@@ -249,8 +255,10 @@ public class InternalInjectors {
 		for (Object mckey : registryentries) {
 			Object tileEntityTypesObj = ReflectionMethod.REGISTRYMATERIALS_GET.run(tileRegistry, mckey);
 			String supplierFieldName = "A";
-			if (MinecraftVersion.getVersion().getVersionId() >= MinecraftVersion.MC1_14_R1.getVersionId())
+			if (MinecraftVersion.getVersion().getVersionId() == MinecraftVersion.MC1_14_R1.getVersionId())
 				supplierFieldName = "H";
+			else if (MinecraftVersion.getVersion().getVersionId() >= MinecraftVersion.MC1_15_R1.getVersionId())
+				supplierFieldName = "I";
 			Field supplierField = tileEntityTypesObj.getClass().getDeclaredField(supplierFieldName);
 			supplierField.setAccessible(true);
 			Supplier<Object> supplier = (Supplier<Object>) supplierField.get(tileEntityTypesObj);
@@ -260,7 +268,7 @@ public class InternalInjectors {
 					continue;
 				} // Already injected
 				Class<?> wrapped = ClassGenerator.wrapTileEntity(classPool, nmsclass, "__extraData");
-				NBTInjector.setFinal(tileEntityTypesObj, supplierField, new Supplier<Object>() {
+				ReflectionUtil.setFinal(tileEntityTypesObj, supplierField, new Supplier<Object>() {
 					@Override
 					public Object get() {
 						try {

nbt-injector/src/main/java/de/tr7zw/nbtinjector/NBTInjector.java

@@ -2,7 +2,6 @@ package de.tr7zw.nbtinjector;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -37,6 +36,9 @@ public class NBTInjector {
 
 	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!"
+			+ " Check the Wiki/Pluginpage for more information!";
 
 	/**
 	 * Replaces the vanilla classes with Wrapped classes that support custom NBT.
@@ -105,6 +107,7 @@ public class NBTInjector {
 		if (entity == null) {
 			return null;
 		}
+		if(!isInjected)throw new NbtApiException(NOT_INJECTED_MESSAGE);
 		try {
 			Object ent = NBTReflectionUtil.getNMSEntity(entity);
 			if (!(ent instanceof INBTWrapper)) {// Replace Entity with custom one
@@ -152,6 +155,7 @@ public class NBTInjector {
 		if (entity == null) {
 			return null;
 		}
+		if(!isInjected)throw new NbtApiException(NOT_INJECTED_MESSAGE);
 		try {
 			Object ent = NBTReflectionUtil.getNMSEntity(entity);
 			if (!(ent instanceof INBTWrapper)) {
@@ -176,6 +180,7 @@ public class NBTInjector {
 		if (tile == null) {
 			return null;
 		}
+		if(!isInjected)throw new NbtApiException(NOT_INJECTED_MESSAGE);
 		try {
 			Object pos = ObjectCreator.NMS_BLOCKPOSITION.getInstance(tile.getX(), tile.getY(), tile.getZ());
 			Object cworld = ClassWrapper.CRAFT_WORLD.getClazz().cast(tile.getWorld());
@@ -212,17 +217,6 @@ public class NBTInjector {
 		}
 	}
 
-	protected static void setFinal(Object obj, Field field, Object newValue)
-			throws NoSuchFieldException, IllegalAccessException {
-		field.setAccessible(true);
-
-		Field modifiersField = Field.class.getDeclaredField("modifiers");
-		modifiersField.setAccessible(true);
-		modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-
-		field.set(obj, newValue);
-	}
-
 	private static Field getAccessable(Field field) {
 		field.setAccessible(true);
 		return field;

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>de.tr7zw</groupId>
   <artifactId>item-nbt-parent</artifactId>
-  <version>2.1.0</version>
+  <version>2.2.0</version>
   <packaging>pom</packaging>
   <modules>
     <module>item-nbt-api</module>
@@ -34,7 +34,7 @@
       <url>https://repo.codemc.org/repository/maven-public/</url>
       <layout>default</layout>
     </repository>
-	<!-- CodeMC NMS -->
+    <!-- CodeMC NMS -->
     <repository>
       <id>codemc-nms-repo</id>
       <url>https://repo.codemc.org/repository/nms/</url>
@@ -65,7 +65,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -87,6 +87,9 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <source>8</source>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>com.github.ekryd.sortpom</groupId>