Skip to content

Commit

Permalink
Renamed back NBTType class (#63)
Browse files Browse the repository at this point in the history
  • Loading branch information
@AmauryCarrade
AmauryCarrade authored Nov 26, 2020
1 parent e129d26 commit 9f862f7
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions src/main/java/fr/zcraft/quartzlib/components/nbt/NBT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ static Object fromNativeValue(Object value) {
return null;
}

NbtType type = NbtType.fromClass(value.getClass());
NBTType type = NBTType.fromClass(value.getClass());
return type.newTag(value);
}

Expand All @@ -334,7 +334,7 @@ static Object toNativeValue(Object nbtTag) {
if (nbtTag == null) {
return null;
}
NbtType type = NbtType.fromNmsNbtTag(nbtTag);
NBTType type = NBTType.fromNmsNbtTag(nbtTag);

switch (type) {
case TAG_COMPOUND:
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/fr/zcraft/quartzlib/components/nbt/NBTCompound.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public NBTCompound() {
if (nativeNbtTag == null) {
this.nmsNbtMap = new HashMap<>();
} else {
this.nmsNbtMap = (Map<String, Object>) NbtType.TAG_COMPOUND.getData(nmsNbtTag);
this.nmsNbtMap = (Map<String, Object>) NBTType.TAG_COMPOUND.getData(nmsNbtTag);
}

this.parent = null;
Expand All @@ -92,10 +92,10 @@ private Map<String, Object> getNbtMap() {
if (nmsNbtMap == null) {
nmsNbtMap = new HashMap<>();
if (nmsNbtTag != null) {
NbtType.TAG_COMPOUND.setData(nmsNbtTag, nmsNbtMap);
NBTType.TAG_COMPOUND.setData(nmsNbtTag, nmsNbtMap);
} else {
nmsNbtTag = NbtType.TAG_COMPOUND.newTag(nmsNbtMap);
NbtType.TAG_LIST.setData(nmsNbtTag, nmsNbtTag);
nmsNbtTag = NBTType.TAG_COMPOUND.newTag(nmsNbtMap);
NBTType.TAG_LIST.setData(nmsNbtTag, nmsNbtTag);

if (parent != null && parentKey != null) {
if (parent instanceof NBTCompound) {
Expand Down
28 changes: 14 additions & 14 deletions src/main/java/fr/zcraft/quartzlib/components/nbt/NBTList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class NBTList implements List<Object> {
private final Object parentKey;
List<Object> nmsNbtList;
private Object nmsNbtTag;
private NbtType type = NbtType.TAG_END;
private NBTType type = NBTType.TAG_END;

/**
* Created a new empty NBT list.
Expand All @@ -63,7 +63,7 @@ public NBTList() {

@SuppressWarnings("unchecked")
NBTList(Object nmsListTag) {
this(null, nmsListTag == null ? new ArrayList<>() : (List<Object>) NbtType.TAG_LIST.getData(nmsListTag));
this(null, nmsListTag == null ? new ArrayList<>() : (List<Object>) NBTType.TAG_LIST.getData(nmsListTag));
}

private NBTList(Object nmsListTag, List<Object> nmsNbtList) {
Expand Down Expand Up @@ -91,16 +91,16 @@ private NBTList(Object nmsListTag, List<Object> nmsNbtList) {

static void guessAndWriteTypeToNbtTagList(Object nmsNbtTag) {
try {
final NbtType currentType = NbtType.fromId((byte) Reflection.getFieldValue(nmsNbtTag, "type"));
if (currentType.equals(NbtType.TAG_END)) {
final NBTType currentType = NBTType.fromId((byte) Reflection.getFieldValue(nmsNbtTag, "type"));
if (currentType.equals(NBTType.TAG_END)) {
// We retrieve the first element of the internal list and use it as
// the list type, if the list is not empty.
@SuppressWarnings("unchecked") final List<Object> internalNbtList =
(List<Object>) Reflection.getFieldValue(nmsNbtTag, "list");

if (!internalNbtList.isEmpty()) {
Reflection.setFieldValue(nmsNbtTag, "type",
(byte) NbtType.fromNmsNbtTag(internalNbtList.get(0)).getId());
(byte) NBTType.fromNmsNbtTag(internalNbtList.get(0)).getId());
}
}
} catch (NoSuchFieldException | IllegalAccessException e) {
Expand All @@ -114,11 +114,11 @@ private List<Object> getNbtList() {
if (nmsNbtList == null) {
nmsNbtList = new ArrayList<>();
if (nmsNbtTag != null) {
NbtType.TAG_LIST.setData(nmsNbtTag, nmsNbtList);
NBTType.TAG_LIST.setData(nmsNbtTag, nmsNbtList);
setTypeFromNbtTag();
} else {
nmsNbtTag = NbtType.TAG_LIST.newTag(nmsNbtList);
NbtType.TAG_LIST.setData(nmsNbtTag, nmsNbtList);
nmsNbtTag = NBTType.TAG_LIST.newTag(nmsNbtList);
NBTType.TAG_LIST.setData(nmsNbtTag, nmsNbtList);

setTypeFromNbtList();
writeTypeToNbtTag();
Expand All @@ -139,7 +139,7 @@ private List<Object> getNbtList() {
private void setTypeFromNbtTag() {
if (nmsNbtTag != null) {
try {
this.type = NbtType.fromId((byte) Reflection.getFieldValue(nmsNbtTag, "type"));
this.type = NBTType.fromId((byte) Reflection.getFieldValue(nmsNbtTag, "type"));
} catch (NoSuchFieldException | IllegalAccessException e) {
PluginLogger.error("Unable to retrieve NBTTagList's type."
+ " The type will be guessed next time an element is inserted into the list…", e);
Expand All @@ -149,7 +149,7 @@ private void setTypeFromNbtTag() {

private void setTypeFromNbtList() {
if (nmsNbtList != null && !nmsNbtList.isEmpty()) {
setType(NbtType.fromNmsNbtTag(nmsNbtList.get(0)));
setType(NBTType.fromNmsNbtTag(nmsNbtList.get(0)));
}
}

Expand All @@ -165,19 +165,19 @@ private void writeTypeToNbtTag() {
}
}

public NbtType getType() {
public NBTType getType() {
return type;
}

private void setType(NbtType type) {
private void setType(NBTType type) {
this.type = type;
writeTypeToNbtTag();
}

private void checkType(Object o) {
if (type == null || type.equals(NbtType.TAG_END)) {
if (type == null || type.equals(NBTType.TAG_END)) {
try {
setType(NbtType.fromClass(o.getClass()));
setType(NBTType.fromClass(o.getClass()));
} catch (IllegalArgumentException e) {
throw new IllegalArgumentException("Illegal type class in a NBT list: " + o.getClass(), e);
}
Expand Down
14 changes: 7 additions & 7 deletions ...aft/quartzlib/components/nbt/NbtType.java → ...aft/quartzlib/components/nbt/NBTType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import java.util.Map;


enum NbtType {
enum NBTType {
TAG_END((byte) 0, null, Void.class),
TAG_BYTE((byte) 1, "NBTTagByte", byte.class, Byte.class),
TAG_SHORT((byte) 2, "NBTTagShort", short.class, Short.class),
Expand All @@ -56,14 +56,14 @@ enum NbtType {
private final String nmsClassName;
private Class nmsClass;

NbtType(byte id, String nmsClassName, Class... types) {
NBTType(byte id, String nmsClassName, Class... types) {
this.id = id;
this.types = types;
this.nmsClassName = nmsClassName;
}

public static NbtType fromId(byte id) {
for (NbtType type : NbtType.values()) {
public static NBTType fromId(byte id) {
for (NBTType type : NBTType.values()) {
if (id == type.id) {
return type;
}
Expand All @@ -72,16 +72,16 @@ public static NbtType fromId(byte id) {
throw new IllegalArgumentException("Illegal type id: " + id);
}

public static NbtType fromNmsNbtTag(Object nmsNbtTag) {
public static NBTType fromNmsNbtTag(Object nmsNbtTag) {
try {
return fromId((byte) Reflection.call(nmsNbtTag, "getTypeId"));
} catch (Exception ex) {
throw new NBTException("Unable to retrieve type of nbt tag", ex);
}
}

public static NbtType fromClass(Class klass) {
for (NbtType type : NbtType.values()) {
public static NBTType fromClass(Class klass) {
for (NBTType type : NBTType.values()) {
if (type.isAssignableFrom(klass)) {
return type;
}
Expand Down

0 comments on commit 9f862f7

Please sign in to comment.