diff --git a/src/main/java/net/querz/nbt/ByteArrayTag.java b/src/main/java/net/querz/nbt/ByteArrayTag.java index 65554a05..5082bc29 100644 --- a/src/main/java/net/querz/nbt/ByteArrayTag.java +++ b/src/main/java/net/querz/nbt/ByteArrayTag.java @@ -110,7 +110,7 @@ public void setValue(byte[] value) { this.value = value; } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public ByteArrayTag read(DataInput in, int depth) throws IOException { diff --git a/src/main/java/net/querz/nbt/ByteTag.java b/src/main/java/net/querz/nbt/ByteTag.java index a79446b0..92b77b51 100644 --- a/src/main/java/net/querz/nbt/ByteTag.java +++ b/src/main/java/net/querz/nbt/ByteTag.java @@ -98,7 +98,7 @@ public String toString() { return value + "b"; } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public ByteTag read(DataInput in, int depth) throws IOException { diff --git a/src/main/java/net/querz/nbt/CompoundTag.java b/src/main/java/net/querz/nbt/CompoundTag.java index 0afb63d2..46c7e987 100644 --- a/src/main/java/net/querz/nbt/CompoundTag.java +++ b/src/main/java/net/querz/nbt/CompoundTag.java @@ -529,7 +529,7 @@ public Set> entrySet() { return value.entrySet(); } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public CompoundTag read(DataInput in, int depth) throws IOException { diff --git a/src/main/java/net/querz/nbt/DoubleTag.java b/src/main/java/net/querz/nbt/DoubleTag.java index f1663908..85e8307e 100644 --- a/src/main/java/net/querz/nbt/DoubleTag.java +++ b/src/main/java/net/querz/nbt/DoubleTag.java @@ -93,7 +93,7 @@ public String toString() { return value + "d"; } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public DoubleTag read(DataInput in, int depth) throws IOException { diff --git a/src/main/java/net/querz/nbt/EndTag.java b/src/main/java/net/querz/nbt/EndTag.java index 2852923a..a51cb441 100644 --- a/src/main/java/net/querz/nbt/EndTag.java +++ b/src/main/java/net/querz/nbt/EndTag.java @@ -23,7 +23,7 @@ public void accept(TagVisitor visitor) { visitor.visit(this); } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public EndTag read(DataInput in, int depth) throws IOException { diff --git a/src/main/java/net/querz/nbt/FloatTag.java b/src/main/java/net/querz/nbt/FloatTag.java index 8477ddb2..cdb0c8b3 100644 --- a/src/main/java/net/querz/nbt/FloatTag.java +++ b/src/main/java/net/querz/nbt/FloatTag.java @@ -92,7 +92,7 @@ public String toString() { return value + "f"; } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public FloatTag read(DataInput in, int depth) throws IOException { diff --git a/src/main/java/net/querz/nbt/IntArrayTag.java b/src/main/java/net/querz/nbt/IntArrayTag.java index fe961b0e..e9e90f08 100644 --- a/src/main/java/net/querz/nbt/IntArrayTag.java +++ b/src/main/java/net/querz/nbt/IntArrayTag.java @@ -112,7 +112,7 @@ public void setValue(int[] value) { this.value = value; } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public IntArrayTag read(DataInput in, int depth) throws IOException { diff --git a/src/main/java/net/querz/nbt/IntTag.java b/src/main/java/net/querz/nbt/IntTag.java index c3d2848a..af3f96a0 100644 --- a/src/main/java/net/querz/nbt/IntTag.java +++ b/src/main/java/net/querz/nbt/IntTag.java @@ -95,7 +95,7 @@ public String toString() { return String.valueOf(value); } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public IntTag read(DataInput in, int depth) throws IOException { diff --git a/src/main/java/net/querz/nbt/ListTag.java b/src/main/java/net/querz/nbt/ListTag.java index 5ba5d703..953b57cc 100644 --- a/src/main/java/net/querz/nbt/ListTag.java +++ b/src/main/java/net/querz/nbt/ListTag.java @@ -219,7 +219,7 @@ public boolean equals(Object other) { if (this == other) { return true; } else { - return other instanceof ListTag otherList && value.equals(otherList.value); + return other instanceof ListTag && value.equals(((ListTag) other).value); } } @@ -453,7 +453,7 @@ public T remove(int index) { } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public ListTag read(DataInput in, int depth) throws IOException { diff --git a/src/main/java/net/querz/nbt/LongArrayTag.java b/src/main/java/net/querz/nbt/LongArrayTag.java index a9fe87bb..b8aa3605 100644 --- a/src/main/java/net/querz/nbt/LongArrayTag.java +++ b/src/main/java/net/querz/nbt/LongArrayTag.java @@ -112,7 +112,7 @@ public void setValue(long[] value) { this.value = value; } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public LongArrayTag read(DataInput in, int depth) throws IOException { @@ -137,4 +137,4 @@ public void skip(DataInput in) throws IOException { in.skipBytes(in.readInt() * 8); } }; -} \ No newline at end of file +} diff --git a/src/main/java/net/querz/nbt/LongTag.java b/src/main/java/net/querz/nbt/LongTag.java index dbdb2260..ee8a0c75 100644 --- a/src/main/java/net/querz/nbt/LongTag.java +++ b/src/main/java/net/querz/nbt/LongTag.java @@ -95,7 +95,7 @@ public String toString() { return value + "L"; } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public LongTag read(DataInput in, int depth) throws IOException { diff --git a/src/main/java/net/querz/nbt/ShortTag.java b/src/main/java/net/querz/nbt/ShortTag.java index 143daccb..f6d91d48 100644 --- a/src/main/java/net/querz/nbt/ShortTag.java +++ b/src/main/java/net/querz/nbt/ShortTag.java @@ -95,7 +95,7 @@ public String toString() { return value + "s"; } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public ShortTag read(DataInput in, int depth) throws IOException { diff --git a/src/main/java/net/querz/nbt/StringTag.java b/src/main/java/net/querz/nbt/StringTag.java index 18d02955..2b53757d 100644 --- a/src/main/java/net/querz/nbt/StringTag.java +++ b/src/main/java/net/querz/nbt/StringTag.java @@ -55,7 +55,7 @@ public String getValue() { return value; } - public static final TagReader READER = new TagReader<>() { + public static final TagReader READER = new TagReader() { @Override public StringTag read(DataInput in, int depth) throws IOException { diff --git a/src/main/java/net/querz/nbt/io/stream/TagSelector.java b/src/main/java/net/querz/nbt/io/stream/TagSelector.java index 9f19421a..40813353 100644 --- a/src/main/java/net/querz/nbt/io/stream/TagSelector.java +++ b/src/main/java/net/querz/nbt/io/stream/TagSelector.java @@ -1,6 +1,9 @@ package net.querz.nbt.io.stream; import net.querz.nbt.TagReader; + +import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Objects; @@ -16,15 +19,15 @@ public TagSelector(List path, String name, TagReader type) { } public TagSelector(String name, TagReader reader) { - this(List.of(), name, reader); + this(Collections.emptyList(), name, reader); } public TagSelector(String p1, String name, TagReader reader) { - this(List.of(p1), name, reader); + this(Collections.singletonList(p1), name, reader); } public TagSelector(String p1, String p2, String name, TagReader reader) { - this(List.of(p1, p2), name, reader); + this(Arrays.asList(p1, p2), name, reader); } public List path() { diff --git a/src/test/java/net/querz/nbt/TestNBTUtil.java b/src/test/java/net/querz/nbt/TestNBTUtil.java index 6c3280f7..e3cce721 100644 --- a/src/test/java/net/querz/nbt/TestNBTUtil.java +++ b/src/test/java/net/querz/nbt/TestNBTUtil.java @@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test; import java.io.*; +import java.util.Arrays; import java.util.List; import java.util.zip.GZIPInputStream; import static org.junit.jupiter.api.Assertions.*; @@ -41,7 +42,7 @@ public void testParse() throws IOException { } try (DataInputStream dis = new DataInputStream(new ByteArrayInputStream(raw))) { - t = NBTUtil.parseStream(dis, new TagSelector(List.of("Data", "Player", "Attributes"), "Name", StringTag.READER)); + t = NBTUtil.parseStream(dis, new TagSelector(Arrays.asList("Data", "Player", "Attributes"), "Name", StringTag.READER)); System.out.println(NBTUtil.toSNBT(t, "\t")); } @@ -106,7 +107,7 @@ public void testBlah() throws IOException { - +