Merge branch 'development'

Core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.11</version>
+        <version>2.4.12</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.11";
+    private final static String coreVersion = "2.4.12";
     
     /**
      * 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.11</version>
+        <version>2.4.12</version>
         <relativePath>../../</relativePath>
     </parent>
 

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

@@ -47,6 +47,8 @@ public interface NBTCompound {
 
     Set<String> getKeys();
 
+    Set<String> getKeys(String tag);
+
     byte[] serialize(String... exclusions);
 
     void deSerialize(byte[] serialized);

NMS/NMS-v1_10_R1/pom.xml

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

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

@@ -141,6 +141,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.c();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).c();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_11_R1/pom.xml

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

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

@@ -141,6 +141,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.c();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).c();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_12_R1/pom.xml

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

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

@@ -141,6 +141,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.c();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).c();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_13_R1/pom.xml

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

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

@@ -141,6 +141,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.getKeys();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).getKeys();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_13_R2/pom.xml

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

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

@@ -141,6 +141,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.getKeys();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).getKeys();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_14_R1/pom.xml

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

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

@@ -141,6 +141,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.getKeys();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).getKeys();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_15_R1/pom.xml

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

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

@@ -141,6 +141,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.getKeys();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).getKeys();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_16_R1/pom.xml

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

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

@@ -141,6 +141,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.getKeys();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).getKeys();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_16_R2/pom.xml

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

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

@@ -141,6 +141,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.getKeys();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).getKeys();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_8_R1/pom.xml

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

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

@@ -142,6 +142,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.c();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).c();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_8_R2/pom.xml

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

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

@@ -142,6 +142,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.c();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).c();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_8_R3/pom.xml

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

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

@@ -142,6 +142,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.c();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).c();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_9_R1/pom.xml

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

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

@@ -141,6 +141,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.c();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).c();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

NMS/NMS-v1_9_R2/pom.xml

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

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

@@ -141,6 +141,11 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         return compound.c();
     }
 
+    @Override
+    public Set<String> getKeys(String tag) {
+        return compound.getCompound(tag).c();
+    }
+
     @Override
     public byte[] serialize(String... exclusions) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

pom.xml

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