diff --git a/Core/pom.xml b/Core/pom.xml index 298bb629..08338879 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../ diff --git a/Core/src/main/java/com/songoda/core/SongodaCore.java b/Core/src/main/java/com/songoda/core/SongodaCore.java index 231d4ff5..86e498b4 100644 --- a/Core/src/main/java/com/songoda/core/SongodaCore.java +++ b/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 diff --git a/NMS/NMS-API/pom.xml b/NMS/NMS-API/pom.xml index 6c5068bc..e5584ccd 100644 --- a/NMS/NMS-API/pom.xml +++ b/NMS/NMS-API/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-API/src/com/songoda/core/nms/nbt/NBTCompound.java b/NMS/NMS-API/src/com/songoda/core/nms/nbt/NBTCompound.java index 0e22cc6f..9a4b8cbb 100644 --- a/NMS/NMS-API/src/com/songoda/core/nms/nbt/NBTCompound.java +++ b/NMS/NMS-API/src/com/songoda/core/nms/nbt/NBTCompound.java @@ -47,6 +47,8 @@ public interface NBTCompound { Set getKeys(); + Set getKeys(String tag); + byte[] serialize(String... exclusions); void deSerialize(byte[] serialized); diff --git a/NMS/NMS-v1_10_R1/pom.xml b/NMS/NMS-v1_10_R1/pom.xml index c4c30d13..b56a7570 100644 --- a/NMS/NMS-v1_10_R1/pom.xml +++ b/NMS/NMS-v1_10_R1/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTCompoundImpl.java index 0a1b632f..4cc8c6f7 100644 --- a/NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).c(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_11_R1/pom.xml b/NMS/NMS-v1_11_R1/pom.xml index ed3e4202..b62cfa17 100644 --- a/NMS/NMS-v1_11_R1/pom.xml +++ b/NMS/NMS-v1_11_R1/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTCompoundImpl.java index b23953bf..471f307d 100644 --- a/NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).c(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_12_R1/pom.xml b/NMS/NMS-v1_12_R1/pom.xml index e297313f..e0f461f0 100644 --- a/NMS/NMS-v1_12_R1/pom.xml +++ b/NMS/NMS-v1_12_R1/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTCompoundImpl.java index cf3c291e..ff8f2954 100644 --- a/NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).c(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_13_R1/pom.xml b/NMS/NMS-v1_13_R1/pom.xml index 2f709857..80b949c0 100644 --- a/NMS/NMS-v1_13_R1/pom.xml +++ b/NMS/NMS-v1_13_R1/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTCompoundImpl.java index f4bded03..579c4274 100644 --- a/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).getKeys(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_13_R2/pom.xml b/NMS/NMS-v1_13_R2/pom.xml index 9605b498..7f44f8b4 100644 --- a/NMS/NMS-v1_13_R2/pom.xml +++ b/NMS/NMS-v1_13_R2/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTCompoundImpl.java index be66e343..990fa9a1 100644 --- a/NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).getKeys(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_14_R1/pom.xml b/NMS/NMS-v1_14_R1/pom.xml index 8e65b1e6..9553c338 100644 --- a/NMS/NMS-v1_14_R1/pom.xml +++ b/NMS/NMS-v1_14_R1/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTCompoundImpl.java index a3cd644c..56e47497 100644 --- a/NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).getKeys(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_15_R1/pom.xml b/NMS/NMS-v1_15_R1/pom.xml index ed391569..4af491fc 100644 --- a/NMS/NMS-v1_15_R1/pom.xml +++ b/NMS/NMS-v1_15_R1/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTCompoundImpl.java index ad4a7210..64b6a920 100644 --- a/NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).getKeys(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_16_R1/pom.xml b/NMS/NMS-v1_16_R1/pom.xml index c16cdad9..dbd2f8c5 100644 --- a/NMS/NMS-v1_16_R1/pom.xml +++ b/NMS/NMS-v1_16_R1/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTCompoundImpl.java index 0113d640..13e76e68 100644 --- a/NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).getKeys(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_16_R2/pom.xml b/NMS/NMS-v1_16_R2/pom.xml index ab3535f5..20211784 100644 --- a/NMS/NMS-v1_16_R2/pom.xml +++ b/NMS/NMS-v1_16_R2/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTCompoundImpl.java index 4017b3fe..912de14c 100644 --- a/NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).getKeys(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_8_R1/pom.xml b/NMS/NMS-v1_8_R1/pom.xml index 44e3faa5..9c955706 100644 --- a/NMS/NMS-v1_8_R1/pom.xml +++ b/NMS/NMS-v1_8_R1/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTCompoundImpl.java index e6025b21..6551dc14 100644 --- a/NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).c(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_8_R2/pom.xml b/NMS/NMS-v1_8_R2/pom.xml index a5efab5e..2128a096 100644 --- a/NMS/NMS-v1_8_R2/pom.xml +++ b/NMS/NMS-v1_8_R2/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTCompoundImpl.java index 4e8f61db..66de8084 100644 --- a/NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).c(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_8_R3/pom.xml b/NMS/NMS-v1_8_R3/pom.xml index 5bb44002..ad69143c 100644 --- a/NMS/NMS-v1_8_R3/pom.xml +++ b/NMS/NMS-v1_8_R3/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTCompoundImpl.java index 4bf9da11..8bbd163d 100644 --- a/NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).c(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_9_R1/pom.xml b/NMS/NMS-v1_9_R1/pom.xml index 7d15eeb6..989663b3 100644 --- a/NMS/NMS-v1_9_R1/pom.xml +++ b/NMS/NMS-v1_9_R1/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTCompoundImpl.java index 18a9857f..e9222124 100644 --- a/NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).c(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/NMS/NMS-v1_9_R2/pom.xml b/NMS/NMS-v1_9_R2/pom.xml index e59502df..0c9a82f7 100644 --- a/NMS/NMS-v1_9_R2/pom.xml +++ b/NMS/NMS-v1_9_R2/pom.xml @@ -3,7 +3,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 ../../ diff --git a/NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTCompoundImpl.java index 05b7ad1e..ab80c0ba 100644 --- a/NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTCompoundImpl.java +++ b/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 getKeys(String tag) { + return compound.getCompound(tag).c(); + } + @Override public byte[] serialize(String... exclusions) { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/pom.xml b/pom.xml index ee050e7a..e374dc8a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ com.songoda SongodaCore-Modules - 2.4.11 + 2.4.12 4.0.0 pom