Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2024-11-24 02:56:17 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2021-04-12 13:04:01 -05:00
commit 628616c467
69 changed files with 354 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/pom.xml
View File

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

2
Core/src/main/java/com/songoda/core/SongodaCore.java
View File

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

2
NMS/NMS-API/pom.xml
View File

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

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

@ -21,6 +21,8 @@ public interface NBTCompound {
NBTCompound set(String tag, int[] i);
NBTCompound set(String tag, byte[] b);
NBTCompound set(String tag, UUID u);
NBTCompound remove(String tag);
@ -45,6 +47,8 @@ public interface NBTCompound {
int[] getIntArray(String tag);
byte[] getByteArray(String tag);
NBTCompound getCompound(String tag);
Set<String> getKeys();

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

@ -20,6 +20,8 @@ public interface NBTObject {
int[] asIntArray();
byte[] asByteArray();
Set<String> getKeys();
NBTCompound asCompound();

2
NMS/NMS-v1_10_R1/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
compound.a(tag, u);
@ -136,6 +142,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

2
NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTItemImpl.java
View File

@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_10_R1.ItemStack nmsItem;
private final net.minecraft.server.v1_10_R1.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_10_R1.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();

2
NMS/NMS-v1_11_R1/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
compound.a(tag, u);
@ -136,6 +142,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

14
NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTItemImpl.java
View File

@ -1,5 +1,6 @@
package com.songoda.core.nms.v1_11_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTItem;
import net.minecraft.server.v1_11_R1.NBTTagCompound;
import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftItemStack;
@ -7,7 +8,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_11_R1.ItemStack nmsItem;
private final net.minecraft.server.v1_11_R1.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_11_R1.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());
@ -22,6 +23,17 @@ public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
}
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public void addExtras() {
}

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();

2
NMS/NMS-v1_12_R1/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
compound.a(tag, u);
@ -136,6 +142,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

2
NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTItemImpl.java
View File

@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_12_R1.ItemStack nmsItem;
private final net.minecraft.server.v1_12_R1.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_12_R1.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();

2
NMS/NMS-v1_13_R1/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
compound.a(tag, u);
@ -136,6 +142,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

2
NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTItemImpl.java
View File

@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_13_R1.ItemStack nmsItem;
private final net.minecraft.server.v1_13_R1.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_13_R1.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.getKeys();

2
NMS/NMS-v1_13_R2/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
compound.a(tag, u);
@ -136,6 +142,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

14
NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTItemImpl.java
View File

@ -1,5 +1,6 @@
package com.songoda.core.nms.v1_13_R2.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTItem;
import net.minecraft.server.v1_13_R2.NBTTagCompound;
import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftItemStack;
@ -7,7 +8,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_13_R2.ItemStack nmsItem;
private final net.minecraft.server.v1_13_R2.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_13_R2.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());
@ -22,6 +23,17 @@ public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
}
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public void addExtras() {
}

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.getKeys();

2
NMS/NMS-v1_14_R1/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
compound.a(tag, u);
@ -136,6 +142,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

14
NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTItemImpl.java
View File

@ -1,5 +1,6 @@
package com.songoda.core.nms.v1_14_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTItem;
import net.minecraft.server.v1_14_R1.NBTTagCompound;
import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack;
@ -7,7 +8,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_14_R1.ItemStack nmsItem;
private final net.minecraft.server.v1_14_R1.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_14_R1.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());
@ -22,6 +23,17 @@ public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
}
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public void addExtras() {
}

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.getKeys();

2
NMS/NMS-v1_15_R1/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
compound.a(tag, u);
@ -136,6 +142,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

12
NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTEntityImpl.java
View File

@ -1,5 +1,6 @@
package com.songoda.core.nms.v1_15_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTEntity;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.Entity;
@ -56,6 +57,17 @@ public class NBTEntityImpl extends NBTCompoundImpl implements NBTEntity {
return spawn(location);
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public void addExtras() {
compound.setString("entity_type", IRegistry.ENTITY_TYPE.getKey(nmsEntity.getEntityType()).toString());

2
NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTItemImpl.java
View File

@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_15_R1.ItemStack nmsItem;
private final net.minecraft.server.v1_15_R1.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_15_R1.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.getKeys();

2
NMS/NMS-v1_16_R1/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
compound.a(tag, u);
@ -136,6 +142,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

14
NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTItemImpl.java
View File

@ -1,5 +1,6 @@
package com.songoda.core.nms.v1_16_R1.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTItem;
import net.minecraft.server.v1_16_R1.NBTTagCompound;
import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
@ -7,7 +8,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_16_R1.ItemStack nmsItem;
private final net.minecraft.server.v1_16_R1.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_16_R1.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());
@ -22,6 +23,17 @@ public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
}
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public void addExtras() {
}

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.getKeys();

2
NMS/NMS-v1_16_R2/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
compound.a(tag, u);
@ -136,6 +142,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

2
NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTItemImpl.java
View File

@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_16_R2.ItemStack nmsItem;
private final net.minecraft.server.v1_16_R2.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_16_R2.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public NBTCompound asCompound() {
return new NBTCompoundImpl(compound.getCompound(tag));

2
NMS/NMS-v1_16_R3/pom.xml
View File

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

11
NMS/NMS-v1_16_R3/src/com/songoda/core/nms/v1_16_R3/nbt/NBTCompoundImpl.java
View File

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
compound.a(tag, u);
@ -136,6 +142,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return getNBTObject(tag).asByteArray();
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

25
NMS/NMS-v1_16_R3/src/com/songoda/core/nms/v1_16_R3/nbt/NBTItemImpl.java
View File

@ -13,7 +13,7 @@ import java.io.IOException;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_16_R3.ItemStack nmsItem;
private final net.minecraft.server.v1_16_R3.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_16_R3.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());
@ -28,29 +28,6 @@ public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
}
}
@Override
public byte[] serialize(String... exclusions) {
try (ByteArrayOutputStream stream = new ByteArrayOutputStream(); BukkitObjectOutputStream bukkitStream = new BukkitObjectOutputStream(stream)) {
bukkitStream.writeObject(nmsItem);
return stream.toByteArray();
} catch (IOException e) {
e.printStackTrace();
return null;
}
}
@Override
public void deSerialize(byte[] serialized) {
try (BukkitObjectInputStream stream = new BukkitObjectInputStream(
new ByteArrayInputStream(serialized))) {
nmsItem = (net.minecraft.server.v1_16_R3.ItemStack) stream.readObject();
} catch (IOException | ClassNotFoundException e) {
e.printStackTrace();
}
}
@Override
public void addExtras() {
}

5
NMS/NMS-v1_16_R3/src/com/songoda/core/nms/v1_16_R3/nbt/NBTObjectImpl.java
View File

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public NBTCompound asCompound() {
return new NBTCompoundImpl(compound.getCompound(tag));

2
NMS/NMS-v1_8_R1/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
set(tag + "Most", u.getMostSignificantBits());
@ -137,6 +143,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

2
NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTItemImpl.java
View File

@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_8_R1.ItemStack nmsItem;
private final net.minecraft.server.v1_8_R1.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_8_R1.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();

2
NMS/NMS-v1_8_R2/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
set(tag + "Most", u.getMostSignificantBits());
@ -137,6 +143,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

2
NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTItemImpl.java
View File

@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_8_R2.ItemStack nmsItem;
private final net.minecraft.server.v1_8_R2.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_8_R2.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();

2
NMS/NMS-v1_8_R3/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
set(tag + "Most", u.getMostSignificantBits());
@ -137,6 +143,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

12
NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTEntityImpl.java
View File

@ -1,5 +1,6 @@
package com.songoda.core.nms.v1_8_R3.nbt;
import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTEntity;
import net.minecraft.server.v1_8_R3.Entity;
import net.minecraft.server.v1_8_R3.EntityTypes;
@ -65,6 +66,17 @@ public class NBTEntityImpl extends NBTCompoundImpl implements NBTEntity {
return spawn(location);
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public void addExtras() {
String key = EntityTypes.b(nmsEntity); // Changed in 1.12

2
NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTItemImpl.java
View File

@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_8_R3.ItemStack nmsItem;
private final net.minecraft.server.v1_8_R3.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_8_R3.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();

2
NMS/NMS-v1_9_R1/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
compound.a(tag, u);
@ -136,6 +142,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

2
NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTItemImpl.java
View File

@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_9_R1.ItemStack nmsItem;
private final net.minecraft.server.v1_9_R1.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_9_R1.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();

2
NMS/NMS-v1_9_R2/pom.xml
View File

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

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

@ -74,6 +74,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, byte[] b) {
compound.setByteArray(tag, b);
return this;
}
@Override
public NBTCompound set(String tag, UUID u) {
compound.a(tag, u);
@ -136,6 +142,11 @@ public class NBTCompoundImpl implements NBTCompound {
return getNBTObject(tag).asIntArray();
}
@Override
public byte[] getByteArray(String tag) {
return new byte[0];
}
@Override
public NBTCompound getCompound(String tag) {
if (has(tag)) {

2
NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTItemImpl.java
View File

@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
public class NBTItemImpl extends NBTCompoundImpl implements NBTItem {
private net.minecraft.server.v1_9_R2.ItemStack nmsItem;
private final net.minecraft.server.v1_9_R2.ItemStack nmsItem;
public NBTItemImpl(net.minecraft.server.v1_9_R2.ItemStack nmsItem) {
super(nmsItem != null && nmsItem.hasTag() ? nmsItem.getTag() : new NBTTagCompound());

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

@ -56,6 +56,11 @@ public class NBTObjectImpl implements NBTObject {
return compound.getIntArray(tag);
}
@Override
public byte[] asByteArray() {
return compound.getByteArray(tag);
}
@Override
public Set<String> getKeys() {
return compound.c();

4
README.md
View File

@ -18,7 +18,7 @@ Maven Information
<dependency>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore</artifactId>
<version>2.4.50</version>
<version>2.4.51</version>
<scope>provided</scope>
</dependency>
```
@ -37,6 +37,6 @@ repositories {
* Artifact:
```groovy
dependencies {
compileOnly 'com.songoda:SongodaCore:2.4.50'
compileOnly 'com.songoda:SongodaCore:2.4.51'
}
```

2
pom.xml
View File

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