Merge branch 'development'

Core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../</relativePath>
     </parent>
 

Core/src/main/java/com/songoda/core/SongodaCore.java

@@ -54,7 +54,7 @@ public class SongodaCore {
     /**
      * This has been added as of Rev 6
      */
-    private final static String coreVersion = "2.4.13";
+    private final static String coreVersion = "2.4.14";
     
     /**
      * This is specific to the website api

NMS/NMS-API/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-API/src/com/songoda/core/nms/nbt/NBTCompound.java

@@ -45,6 +45,8 @@ public interface NBTCompound {
 
     int[] getIntArray(String tag);
 
+    NBTCompound getCompound(String tag);
+
     Set<String> getKeys();
 
     Set<String> getKeys(String tag);

NMS/NMS-API/src/com/songoda/core/nms/nbt/NBTObject.java

@@ -22,5 +22,5 @@ public interface NBTObject {
 
     Set<String> getKeys();
 
-    NBTCompound getCompound(String tag);
+    NBTCompound asCompound();
 }

NMS/NMS-v1_10_R1/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTCompoundImpl.java

@@ -136,6 +136,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.c();

NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

NMS/NMS-v1_11_R1/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTCompoundImpl.java

@@ -136,6 +136,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.c();

NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

NMS/NMS-v1_12_R1/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTCompoundImpl.java

@@ -136,6 +136,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.c();

NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

NMS/NMS-v1_13_R1/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTCompoundImpl.java

@@ -136,6 +136,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.getKeys();

NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

NMS/NMS-v1_13_R2/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTCompoundImpl.java

@@ -136,6 +136,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.getKeys();

NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

NMS/NMS-v1_14_R1/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTCompoundImpl.java

@@ -136,6 +136,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.getKeys();

NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

NMS/NMS-v1_15_R1/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTCompoundImpl.java

@@ -136,6 +136,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.getKeys();

NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

NMS/NMS-v1_16_R1/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTCompoundImpl.java

@@ -136,6 +136,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.getKeys();

NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

NMS/NMS-v1_16_R2/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTCompoundImpl.java

@@ -136,6 +136,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.getKeys();

NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTObjectImpl.java

@@ -57,12 +57,12 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public Set<String> getKeys() {
-        return compound.getKeys();
+    public NBTCompound asCompound() {
+        return new NBTCompoundImpl(compound.getCompound(tag));
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
-        return new NBTCompoundImpl(compound.getCompound(tag));
+    public Set<String> getKeys() {
+        return compound.getKeys();
     }
 }

NMS/NMS-v1_8_R1/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTCompoundImpl.java

@@ -137,6 +137,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.c();

NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

NMS/NMS-v1_8_R2/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTCompoundImpl.java

@@ -137,6 +137,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.c();

NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

NMS/NMS-v1_8_R3/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTCompoundImpl.java

@@ -137,6 +137,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.c();

NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

NMS/NMS-v1_9_R1/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTCompoundImpl.java

@@ -136,6 +136,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.c();

NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

NMS/NMS-v1_9_R2/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
         <relativePath>../../</relativePath>
     </parent>
 

NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTCompoundImpl.java

@@ -136,6 +136,11 @@ public class NBTCompoundImpl implements NBTCompound {
         return getNBTObject(tag).asIntArray();
     }
 
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return getNBTObject(tag).asCompound();
+    }
+
     @Override
     public Set<String> getKeys() {
         return compound.c();

NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTObjectImpl.java

@@ -62,7 +62,7 @@ public class NBTObjectImpl implements NBTObject {
     }
 
     @Override
-    public NBTCompound getCompound(String tag) {
+    public NBTCompound asCompound() {
         return new NBTCompoundImpl(compound.getCompound(tag));
     }
 }

pom.xml

@@ -2,7 +2,7 @@
 
     <groupId>com.songoda</groupId>
     <artifactId>SongodaCore-Modules</artifactId>
-    <version>2.4.13</version>
+    <version>2.4.14</version>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>