ReflectedNBTWrapper 1.1 Alpha Revision 2

- Added ReflectedNBTCompound#keyset() - Now ReflectedNBTList implements Iterable<Object> - Added LinearIterator - Changed package name to v1_1_R2
milkyway0308 · Jan 4, 2020 · f06a812 · f06a812
1 parent 6902a62
commit f06a812
Show file tree

Hide file tree

Showing 23 changed files with 101 additions and 59 deletions.
diff --git a/README.md b/README.md
@@ -8,13 +8,14 @@ ReflectedNBTWrapper is NBT class wrapper using reflection for plugin version sup
   1. Download last release of ReflectedNBTWrapper from git release history.
   2. Add to dependency. 
   Be careful, ReflectedNBTWrapper use **difference package** to evade version collision.
-
+  3. Add to extract target.
+  ReflectNBTWrapper must have to extract or included in your plugin.
   #### With Gradle
   > Preparing.
   #### With Maven
   > Preparing.
 ## Example
-  ##### <= 1.1
+  ##### Before version 1.1 R2(1.1.2)
   ```java
         // Simple nbt extract sample.
         // Extract string from item nbt.

diff --git a/...f46/NBTUtil/v1_1R1/BukkitVersionUtil.java → ...f46/NBTUtil/v1_1R2/BukkitVersionUtil.java b/...f46/NBTUtil/v1_1R1/BukkitVersionUtil.java → ...f46/NBTUtil/v1_1R2/BukkitVersionUtil.java
@@ -1,4 +1,4 @@
-package skywolf46.NBTUtil.v1_1R1;
+package skywolf46.NBTUtil.v1_1R2;
 
 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_1R1.Exception;
+package skywolf46.NBTUtil.v1_1R2.Exception;
 
 public class CollectionMismatchedException extends RuntimeException {
     public CollectionMismatchedException(Class bef, Class nex) {

diff --git a/..._1R1/Exception/UndefinedNBTException.java → ..._1R2/Exception/UndefinedNBTException.java b/..._1R1/Exception/UndefinedNBTException.java → ..._1R2/Exception/UndefinedNBTException.java
@@ -1,4 +1,4 @@
-package skywolf46.NBTUtil.v1_1R1.Exception;
+package skywolf46.NBTUtil.v1_1R2.Exception;
 
 public class UndefinedNBTException extends RuntimeException {
     public UndefinedNBTException(Class c) {

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

diff --git a/..._1R1/Interface/IReflectedNBTCompound.java → ..._1R2/Interface/IReflectedNBTCompound.java b/..._1R1/Interface/IReflectedNBTCompound.java → ..._1R2/Interface/IReflectedNBTCompound.java
@@ -1,11 +1,14 @@
-package skywolf46.NBTUtil.v1_1R1.Interface;
+package skywolf46.NBTUtil.v1_1R2.Interface;
 
 import java.util.HashMap;
+import java.util.List;
 
 public interface IReflectedNBTCompound extends IReflectedNBTBase<HashMap<String, IReflectedNBTBase<?>>> {
     Object get(String str);
     IReflectedNBTBase<?> getNBT(String str);
 
     IReflectedNBTCompound set(String str,Object o);
     IReflectedNBTCompound setNBT(String str,IReflectedNBTBase<?> o);
+
+    List<String> keyset();
 }
diff --git a/...l/v1_1R1/Interface/IReflectedNBTList.java → ...l/v1_1R2/Interface/IReflectedNBTList.java b/...l/v1_1R1/Interface/IReflectedNBTList.java → ...l/v1_1R2/Interface/IReflectedNBTList.java
@@ -1,8 +1,8 @@
-package skywolf46.NBTUtil.v1_1R1.Interface;
+package skywolf46.NBTUtil.v1_1R2.Interface;
 
 import java.util.List;
 
-public interface IReflectedNBTList extends IReflectedNBTBase<List<Object>> {
+public interface IReflectedNBTList extends IReflectedNBTBase<List<Object>>, Iterable<Object> {
 
     int size();
 

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

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

diff --git a/src/skywolf46/NBTUtil/v1_1R2/Iterator/LinearIterator.java b/src/skywolf46/NBTUtil/v1_1R2/Iterator/LinearIterator.java
@@ -0,0 +1,22 @@
+package skywolf46.NBTUtil.v1_1R2.Iterator;
+
+import java.util.Iterator;
+
+public class LinearIterator implements Iterator<Object> {
+    private Object[] data;
+    private int pointer;
+
+    public LinearIterator(Object[] data) {
+        this.data = data;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return pointer >= data.length;
+    }
+
+    @Override
+    public Object next() {
+        return data[pointer++];
+    }
+}
diff --git a/...Util/v1_1R1/NBTData/ReflectedNBTByte.java → ...Util/v1_1R2/NBTData/ReflectedNBTByte.java b/...Util/v1_1R1/NBTData/ReflectedNBTByte.java → ...Util/v1_1R2/NBTData/ReflectedNBTByte.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_1R1.NBTData;
+package skywolf46.NBTUtil.v1_1R2.NBTData;
 
-import skywolf46.NBTUtil.v1_1R1.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_1R1.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_1R2.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_1R2.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

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

diff --git a/.../v1_1R1/NBTData/ReflectedNBTCompound.java → .../v1_1R2/NBTData/ReflectedNBTCompound.java b/.../v1_1R1/NBTData/ReflectedNBTCompound.java → .../v1_1R2/NBTData/ReflectedNBTCompound.java
@@ -1,16 +1,18 @@
-package skywolf46.NBTUtil.v1_1R1.NBTData;
+package skywolf46.NBTUtil.v1_1R2.NBTData;
 
-import skywolf46.NBTUtil.v1_1R1.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_1R1.Exception.UndefinedNBTException;
-import skywolf46.NBTUtil.v1_1R1.Interface.IReflectedNBTBase;
-import skywolf46.NBTUtil.v1_1R1.Interface.IReflectedNBTCompound;
-import skywolf46.NBTUtil.v1_1R1.ReflectedNBTStorage;
+import skywolf46.NBTUtil.v1_1R2.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_1R2.Exception.UndefinedNBTException;
+import skywolf46.NBTUtil.v1_1R2.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_1R2.Interface.IReflectedNBTCompound;
+import skywolf46.NBTUtil.v1_1R2.ReflectedNBTStorage;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Modifier;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class ReflectedNBTCompound implements IReflectedNBTCompound {
@@ -131,6 +133,11 @@ public IReflectedNBTCompound setNBT(String str, IReflectedNBTBase<?> o) {
         return this;
     }
 
+    @Override
+    public List<String> keyset() {
+        return new ArrayList<>(d.keySet());
+    }
+
     public boolean containsKey(String key) {
         return d.containsKey(key);
     }

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

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

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

diff --git a/...1R1/NBTData/ReflectedNBTIntegerArray.java → ...1R2/NBTData/ReflectedNBTIntegerArray.java b/...1R1/NBTData/ReflectedNBTIntegerArray.java → ...1R2/NBTData/ReflectedNBTIntegerArray.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_1R1.NBTData;
+package skywolf46.NBTUtil.v1_1R2.NBTData;
 
-import skywolf46.NBTUtil.v1_1R1.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_1R1.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_1R2.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_1R2.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

diff --git a/...Util/v1_1R1/NBTData/ReflectedNBTList.java → ...Util/v1_1R2/NBTData/ReflectedNBTList.java b/...Util/v1_1R1/NBTData/ReflectedNBTList.java → ...Util/v1_1R2/NBTData/ReflectedNBTList.java
@@ -1,14 +1,17 @@
-package skywolf46.NBTUtil.v1_1R1.NBTData;
+package skywolf46.NBTUtil.v1_1R2.NBTData;
 
-import skywolf46.NBTUtil.v1_1R1.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_1R1.Exception.CollectionMismatchedException;
-import skywolf46.NBTUtil.v1_1R1.Exception.UndefinedNBTException;
-import skywolf46.NBTUtil.v1_1R1.Interface.IReflectedNBTBase;
-import skywolf46.NBTUtil.v1_1R1.Interface.IReflectedNBTList;
-import skywolf46.NBTUtil.v1_1R1.ReflectedNBTStorage;
+import skywolf46.NBTUtil.v1_1R2.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_1R2.Exception.CollectionMismatchedException;
+import skywolf46.NBTUtil.v1_1R2.Exception.UndefinedNBTException;
+import skywolf46.NBTUtil.v1_1R2.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_1R2.Interface.IReflectedNBTList;
+import skywolf46.NBTUtil.v1_1R2.Iterator.LinearIterator;
+import skywolf46.NBTUtil.v1_1R2.ReflectedNBTStorage;
 
+import javax.annotation.Nonnull;
 import java.lang.reflect.*;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 public class ReflectedNBTList implements IReflectedNBTList {
@@ -184,4 +187,10 @@ public Object getNBTBase() {
         }
         return null;
     }
+
+    @Override
+    @Nonnull
+    public Iterator<Object> iterator() {
+        return new LinearIterator(getValue().toArray());
+    }
 }
diff --git a/...Util/v1_1R1/NBTData/ReflectedNBTLong.java → ...Util/v1_1R2/NBTData/ReflectedNBTLong.java b/...Util/v1_1R1/NBTData/ReflectedNBTLong.java → ...Util/v1_1R2/NBTData/ReflectedNBTLong.java
@@ -1,7 +1,7 @@
-package skywolf46.NBTUtil.v1_1R1.NBTData;
+package skywolf46.NBTUtil.v1_1R2.NBTData;
 
-import skywolf46.NBTUtil.v1_1R1.BukkitVersionUtil;
-import skywolf46.NBTUtil.v1_1R1.Interface.IReflectedNBTBase;
+import skywolf46.NBTUtil.v1_1R2.BukkitVersionUtil;
+import skywolf46.NBTUtil.v1_1R2.Interface.IReflectedNBTBase;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

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

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

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

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