Merge branch 'development'

This commit is contained in:
Brianna 2020-09-29 19:02:28 -05:00
commit c0beeeba5b
47 changed files with 276 additions and 45 deletions

View File

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

View File

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

View File

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

View File

@ -1,5 +1,7 @@
package com.songoda.core.nms.nbt;
import java.util.Set;
public interface NBTObject {
String asString();
@ -17,4 +19,8 @@ public interface NBTObject {
byte asByte();
int[] asIntArray();
Set<String> getKeys();
NBTCompound getCompound(String tag);
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).c();
return getNBTObject(tag).getKeys();
}
@Override
@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_10_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_10_R1.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).c();
return getNBTObject(tag).getKeys();
}
@Override
@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_11_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_11_R1.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).c();
return getNBTObject(tag).getKeys();
}
@Override
@ -175,4 +175,9 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_12_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).getKeys();
return getNBTObject(tag).getKeys();
}
@Override
@ -175,4 +175,9 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_13_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_13_R1.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.getKeys();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).getKeys();
return getNBTObject(tag).getKeys();
}
@Override
@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_13_R2.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_13_R2.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.getKeys();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).getKeys();
return getNBTObject(tag).getKeys();
}
@Override
@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_14_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_14_R1.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,5 +56,14 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.getKeys();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).getKeys();
return getNBTObject(tag).getKeys();
}
@Override
@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_15_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_15_R1.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.getKeys();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).getKeys();
return getNBTObject(tag).getKeys();
}
@Override
@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_16_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_16_R1.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.getKeys();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,5 +1,6 @@
package com.songoda.core.nms.v1_16_R2.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_16_R2.NBTTagCompound;
@ -55,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.getKeys();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -144,7 +144,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).c();
return getNBTObject(tag).getKeys();
}
@Override
@ -176,4 +176,9 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_8_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_8_R1.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -144,7 +144,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).c();
return getNBTObject(tag).getKeys();
}
@Override
@ -176,4 +176,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_8_R2.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_8_R2.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -144,7 +144,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).c();
return getNBTObject(tag).getKeys();
}
@Override
@ -176,4 +176,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_8_R3.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_8_R3.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).c();
return getNBTObject(tag).getKeys();
}
@Override
@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_9_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_9_R1.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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

View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.util.Set;
import java.util.UUID;
public abstract class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
@Override
public Set<String> getKeys(String tag) {
return compound.getCompound(tag).c();
return getNBTObject(tag).getKeys();
}
@Override
@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
}
}
@Override
public void addExtras() {
// None
}
}

View File

@ -1,8 +1,11 @@
package com.songoda.core.nms.v1_9_R2.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_9_R2.NBTTagCompound;
import java.util.Set;
public class NBTObjectImpl implements NBTObject {
private final NBTTagCompound compound;
@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();
}
@Override
public NBTCompound getCompound(String tag) {
return new NBTCompoundImpl(compound.getCompound(tag));
}
}

View File

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