ReflectedNBTWrapper 1.2 Revision 3

- Fixed ItemNBTImporter.import(ItemStack,ReflectedNBTCompound) make error with arrays - *Warning!* If you edit nbt with arrays, error will occurred in previous versions. - Changed package name to v1_2R3
milkyway0308 · Jan 25, 2020 · a51c5e0 · a51c5e0
1 parent 40eb5f3
commit a51c5e0
Show file tree

Hide file tree

Showing 22 changed files with 68 additions and 61 deletions.
diff --git a/...f46/NBTUtil/v1_2R2/BukkitVersionUtil.java → ...f46/NBTUtil/v1_2R3/BukkitVersionUtil.java b/...f46/NBTUtil/v1_2R2/BukkitVersionUtil.java → ...f46/NBTUtil/v1_2R3/BukkitVersionUtil.java
@@ -1,4 +1,4 @@
-package skywolf46.NBTUtil.v1_2R2;
+package skywolf46.NBTUtil.v1_2R3;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Server;

diff --git a/...eption/CollectionMismatchedException.java → ...eption/CollectionMismatchedException.java b/...eption/CollectionMismatchedException.java → ...eption/CollectionMismatchedException.java
@@ -1,4 +1,4 @@
-package skywolf46.NBTUtil.v1_2R2.Exception;
+package skywolf46.NBTUtil.v1_2R3.Exception;
 
 public class CollectionMismatchedException extends RuntimeException {
     public CollectionMismatchedException(Class bef, Class nex) {

diff --git a/..._2R2/Exception/UndefinedNBTException.java → ..._2R3/Exception/UndefinedNBTException.java b/..._2R2/Exception/UndefinedNBTException.java → ..._2R3/Exception/UndefinedNBTException.java
@@ -1,4 +1,4 @@
-package skywolf46.NBTUtil.v1_2R2.Exception;
+package skywolf46.NBTUtil.v1_2R3.Exception;
 
 public class UndefinedNBTException extends RuntimeException {
     public UndefinedNBTException(Class c) {

diff --git a/...l/v1_2R2/Interface/IReflectedNBTBase.java → ...l/v1_2R3/Interface/IReflectedNBTBase.java b/...l/v1_2R2/Interface/IReflectedNBTBase.java → ...l/v1_2R3/Interface/IReflectedNBTBase.java
@@ -1,4 +1,4 @@
-package skywolf46.NBTUtil.v1_2R2.Interface;
+package skywolf46.NBTUtil.v1_2R3.Interface;
 
 public interface IReflectedNBTBase<T> {
     T getValue();

diff --git a/..._2R2/Interface/IReflectedNBTCompound.java → ..._2R3/Interface/IReflectedNBTCompound.java b/..._2R2/Interface/IReflectedNBTCompound.java → ..._2R3/Interface/IReflectedNBTCompound.java
@@ -1,4 +1,4 @@
-package skywolf46.NBTUtil.v1_2R2.Interface;
+package skywolf46.NBTUtil.v1_2R3.Interface;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/...l/v1_2R2/Interface/IReflectedNBTList.java → ...l/v1_2R3/Interface/IReflectedNBTList.java b/...l/v1_2R2/Interface/IReflectedNBTList.java → ...l/v1_2R3/Interface/IReflectedNBTList.java
@@ -1,4 +1,4 @@
-package skywolf46.NBTUtil.v1_2R2.Interface;
+package skywolf46.NBTUtil.v1_2R3.Interface;
 
 import java.util.List;
 

diff --git a/...olf46/NBTUtil/v1_2R2/ItemNBTExtrator.java → ...olf46/NBTUtil/v1_2R3/ItemNBTExtrator.java b/...olf46/NBTUtil/v1_2R2/ItemNBTExtrator.java → ...olf46/NBTUtil/v1_2R3/ItemNBTExtrator.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2;
+package skywolf46.NBTUtil.v1_2R3;
 
 import org.bukkit.inventory.ItemStack;
-import skywolf46.NBTUtil.v1_2R2.NBTData.ReflectedNBTCompound;
+import skywolf46.NBTUtil.v1_2R3.NBTData.ReflectedNBTCompound;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

diff --git a/...olf46/NBTUtil/v1_2R2/ItemNBTImporter.java → ...olf46/NBTUtil/v1_2R3/ItemNBTImporter.java b/...olf46/NBTUtil/v1_2R2/ItemNBTImporter.java → ...olf46/NBTUtil/v1_2R3/ItemNBTImporter.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2;
+package skywolf46.NBTUtil.v1_2R3;
 
 import org.bukkit.inventory.ItemStack;
-import skywolf46.NBTUtil.v1_2R2.NBTData.ReflectedNBTCompound;
+import skywolf46.NBTUtil.v1_2R3.NBTData.ReflectedNBTCompound;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

diff --git a/...TUtil/v1_2R2/Iterator/LinearIterator.java → ...TUtil/v1_2R3/Iterator/LinearIterator.java b/...TUtil/v1_2R2/Iterator/LinearIterator.java → ...TUtil/v1_2R3/Iterator/LinearIterator.java
@@ -1,4 +1,4 @@
-package skywolf46.NBTUtil.v1_2R2.Iterator;
+package skywolf46.NBTUtil.v1_2R3.Iterator;
 
 import java.util.Iterator;
 

diff --git a/...Util/v1_2R2/NBTData/ReflectedNBTByte.java → ...Util/v1_2R3/NBTData/ReflectedNBTByte.java b/...Util/v1_2R2/NBTData/ReflectedNBTByte.java → ...Util/v1_2R3/NBTData/ReflectedNBTByte.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2.NBTData;
+package skywolf46.NBTUtil.v1_2R3.NBTData;
 
-import skywolf46.NBTUtil.v1_2R2.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

diff --git a/...v1_2R2/NBTData/ReflectedNBTByteArray.java → ...v1_2R3/NBTData/ReflectedNBTByteArray.java b/...v1_2R2/NBTData/ReflectedNBTByteArray.java → ...v1_2R3/NBTData/ReflectedNBTByteArray.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2.NBTData;
+package skywolf46.NBTUtil.v1_2R3.NBTData;
 
-import skywolf46.NBTUtil.v1_2R2.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

diff --git a/.../v1_2R2/NBTData/ReflectedNBTCompound.java → .../v1_2R3/NBTData/ReflectedNBTCompound.java b/.../v1_2R2/NBTData/ReflectedNBTCompound.java → .../v1_2R3/NBTData/ReflectedNBTCompound.java
@@ -1,10 +1,10 @@
-package skywolf46.NBTUtil.v1_2R2.NBTData;
+package skywolf46.NBTUtil.v1_2R3.NBTData;
 
-import skywolf46.NBTUtil.v1_2R2.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_2R2.Exception.UndefinedNBTException;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTCompound;
-import skywolf46.NBTUtil.v1_2R2.ReflectedNBTStorage;
+import skywolf46.NBTUtil.v1_2R3.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_2R3.Exception.UndefinedNBTException;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTCompound;
+import skywolf46.NBTUtil.v1_2R3.ReflectedNBTStorage;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

diff --git a/...il/v1_2R2/NBTData/ReflectedNBTDouble.java → ...il/v1_2R3/NBTData/ReflectedNBTDouble.java b/...il/v1_2R2/NBTData/ReflectedNBTDouble.java → ...il/v1_2R3/NBTData/ReflectedNBTDouble.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2.NBTData;
+package skywolf46.NBTUtil.v1_2R3.NBTData;
 
-import skywolf46.NBTUtil.v1_2R2.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

diff --git a/...til/v1_2R2/NBTData/ReflectedNBTFloat.java → ...til/v1_2R3/NBTData/ReflectedNBTFloat.java b/...til/v1_2R2/NBTData/ReflectedNBTFloat.java → ...til/v1_2R3/NBTData/ReflectedNBTFloat.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2.NBTData;
+package skywolf46.NBTUtil.v1_2R3.NBTData;
 
-import skywolf46.NBTUtil.v1_2R2.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

diff --git a/...l/v1_2R2/NBTData/ReflectedNBTInteger.java → ...l/v1_2R3/NBTData/ReflectedNBTInteger.java b/...l/v1_2R2/NBTData/ReflectedNBTInteger.java → ...l/v1_2R3/NBTData/ReflectedNBTInteger.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2.NBTData;
+package skywolf46.NBTUtil.v1_2R3.NBTData;
 
-import skywolf46.NBTUtil.v1_2R2.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

diff --git a/...2R2/NBTData/ReflectedNBTIntegerArray.java → ...2R3/NBTData/ReflectedNBTIntegerArray.java b/...2R2/NBTData/ReflectedNBTIntegerArray.java → ...2R3/NBTData/ReflectedNBTIntegerArray.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2.NBTData;
+package skywolf46.NBTUtil.v1_2R3.NBTData;
 
-import skywolf46.NBTUtil.v1_2R2.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -20,7 +20,7 @@ public class ReflectedNBTIntegerArray implements IReflectedNBTBase<Integer[]> {
             NBT_CLASS = BukkitVersionUtil.getNMSClass("NBTTagIntArray");
             CONTENT_FIELD = NBT_CLASS.getDeclaredField("data");
             CONTENT_FIELD.setAccessible(true);
-            NBT_CONSTRUCTOR = NBT_CLASS.getConstructor(new int[0].getClass());
+            NBT_CONSTRUCTOR = NBT_CLASS.getConstructor(int[].class);
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
         } catch (NoSuchMethodException e) {
@@ -71,7 +71,10 @@ public void setNBTValue(IReflectedNBTBase<Integer[]> base) {
 
     public Object getNBTBase() {
         try {
-            return NBT_CONSTRUCTOR.newInstance(Arrays.copyOf(data, data.length));
+            int[] data = new int[this.data.length];
+            for (int i = 0; i < data.length; i++)
+                data[i] = this.data[i];
+            return NBT_CONSTRUCTOR.newInstance(data);
         } catch (InstantiationException e) {
             e.printStackTrace();
         } catch (IllegalAccessException e) {

diff --git a/...Util/v1_2R2/NBTData/ReflectedNBTList.java → ...Util/v1_2R3/NBTData/ReflectedNBTList.java b/...Util/v1_2R2/NBTData/ReflectedNBTList.java → ...Util/v1_2R3/NBTData/ReflectedNBTList.java
@@ -1,12 +1,12 @@
-package skywolf46.NBTUtil.v1_2R2.NBTData;
+package skywolf46.NBTUtil.v1_2R3.NBTData;
 
-import skywolf46.NBTUtil.v1_2R2.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_2R2.Exception.CollectionMismatchedException;
-import skywolf46.NBTUtil.v1_2R2.Exception.UndefinedNBTException;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTList;
-import skywolf46.NBTUtil.v1_2R2.Iterator.LinearIterator;
-import skywolf46.NBTUtil.v1_2R2.ReflectedNBTStorage;
+import skywolf46.NBTUtil.v1_2R3.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_2R3.Exception.CollectionMismatchedException;
+import skywolf46.NBTUtil.v1_2R3.Exception.UndefinedNBTException;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTList;
+import skywolf46.NBTUtil.v1_2R3.Iterator.LinearIterator;
+import skywolf46.NBTUtil.v1_2R3.ReflectedNBTStorage;
 
 import javax.annotation.Nonnull;
 import java.lang.reflect.*;
@@ -56,7 +56,7 @@ public ReflectedNBTList(Object o) {
             for (Object obj : listNBT)
                 nb.add(ReflectedNBTStorage.createReflectedNBT(obj));
             if (listNBT.size() != 0)
-                nbtClass = listNBT.get(0).getClass();
+                nbtClass = nb.get(0).getClass();
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }

diff --git a/...Util/v1_2R2/NBTData/ReflectedNBTLong.java → ...Util/v1_2R3/NBTData/ReflectedNBTLong.java b/...Util/v1_2R2/NBTData/ReflectedNBTLong.java → ...Util/v1_2R3/NBTData/ReflectedNBTLong.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2.NBTData;
+package skywolf46.NBTUtil.v1_2R3.NBTData;
 
-import skywolf46.NBTUtil.v1_2R2.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -43,6 +43,10 @@ public ReflectedNBTLong() {
         this.d = 0;
     }
 
+    public ReflectedNBTLong(long l) {
+        this.d = l;
+    }
+
     @Override
     public Long getValue() {
         return d;

diff --git a/...v1_2R2/NBTData/ReflectedNBTLongArray.java → ...v1_2R3/NBTData/ReflectedNBTLongArray.java b/...v1_2R2/NBTData/ReflectedNBTLongArray.java → ...v1_2R3/NBTData/ReflectedNBTLongArray.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2.NBTData;
+package skywolf46.NBTUtil.v1_2R3.NBTData;
 
-import skywolf46.NBTUtil.v1_2R2.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

diff --git a/...til/v1_2R2/NBTData/ReflectedNBTShort.java → ...til/v1_2R3/NBTData/ReflectedNBTShort.java b/...til/v1_2R2/NBTData/ReflectedNBTShort.java → ...til/v1_2R3/NBTData/ReflectedNBTShort.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2.NBTData;
+package skywolf46.NBTUtil.v1_2R3.NBTData;
 
-import skywolf46.NBTUtil.v1_2R2.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

diff --git a/...il/v1_2R2/NBTData/ReflectedNBTString.java → ...il/v1_2R3/NBTData/ReflectedNBTString.java b/...il/v1_2R2/NBTData/ReflectedNBTString.java → ...il/v1_2R3/NBTData/ReflectedNBTString.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2.NBTData;
+package skywolf46.NBTUtil.v1_2R3.NBTData;
 
-import skywolf46.NBTUtil.v1_2R2.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

diff --git a/...6/NBTUtil/v1_2R2/ReflectedNBTStorage.java → ...6/NBTUtil/v1_2R3/ReflectedNBTStorage.java b/...6/NBTUtil/v1_2R2/ReflectedNBTStorage.java → ...6/NBTUtil/v1_2R3/ReflectedNBTStorage.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_2R2;
+package skywolf46.NBTUtil.v1_2R3;
 
-import skywolf46.NBTUtil.v1_2R2.Interface.IReflectedNBTBase;
-import skywolf46.NBTUtil.v1_2R2.NBTData.*;
+import skywolf46.NBTUtil.v1_2R3.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_2R3.NBTData.*;
 
 import java.util.HashMap;
 import java.util.function.Function;