Skip to content

Commit 43688da

Browse files
committed
Passthrough toString to the base adventure NBT tag
1 parent 46888a3 commit 43688da

14 files changed

+4
-106
lines changed

worldedit-core/src/main/java/com/sk89q/jnbt/ByteArrayTag.java

-13
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,6 @@ public byte[] getValue() {
5353
return innerTag.value();
5454
}
5555

56-
@Override
57-
public String toString() {
58-
StringBuilder hex = new StringBuilder();
59-
for (byte b : innerTag.value()) {
60-
String hexDigits = Integer.toHexString(b).toUpperCase(Locale.ROOT);
61-
if (hexDigits.length() == 1) {
62-
hex.append("0");
63-
}
64-
hex.append(hexDigits).append(" ");
65-
}
66-
return "TAG_Byte_Array(" + hex + ")";
67-
}
68-
6956
@Override
7057
public ByteArrayBinaryTag asBinaryTag() {
7158
return innerTag;

worldedit-core/src/main/java/com/sk89q/jnbt/ByteTag.java

-5
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ public Byte getValue() {
5151
return innerTag.value();
5252
}
5353

54-
@Override
55-
public String toString() {
56-
return "TAG_Byte(" + innerTag.value() + ")";
57-
}
58-
5954
@Override
6055
public ByteBinaryTag asBinaryTag() {
6156
return innerTag;

worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTag.java

-11
Original file line numberDiff line numberDiff line change
@@ -439,17 +439,6 @@ public String getString(String key) {
439439
}
440440
}
441441

442-
@Override
443-
public String toString() {
444-
StringBuilder bldr = new StringBuilder();
445-
bldr.append("TAG_Compound").append(": ").append(value.size()).append(" entries\r\n{\r\n");
446-
for (Map.Entry<String, Tag> entry : value.entrySet()) {
447-
bldr.append(" ").append(entry.getValue().toString().replaceAll("\r\n", "\r\n ")).append("\r\n");
448-
}
449-
bldr.append("}");
450-
return bldr.toString();
451-
}
452-
453442
@Override
454443
public CompoundBinaryTag asBinaryTag() {
455444
CompoundBinaryTag.Builder builder = CompoundBinaryTag.builder();

worldedit-core/src/main/java/com/sk89q/jnbt/DoubleTag.java

-5
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,4 @@ public Double getValue() {
5656
return innerTag.value();
5757
}
5858

59-
@Override
60-
public String toString() {
61-
return "TAG_Double(" + innerTag.value() + ")";
62-
}
63-
6459
}

worldedit-core/src/main/java/com/sk89q/jnbt/EndTag.java

-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ public Object getValue() {
3434
return null;
3535
}
3636

37-
@Override
38-
public String toString() {
39-
return "TAG_End";
40-
}
41-
4237
@Override
4338
public EndBinaryTag asBinaryTag() {
4439
return EndBinaryTag.get();

worldedit-core/src/main/java/com/sk89q/jnbt/FloatTag.java

-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
package com.sk89q.jnbt;
2121

22-
import com.sk89q.worldedit.util.nbt.BinaryTag;
2322
import com.sk89q.worldedit.util.nbt.FloatBinaryTag;
2423

2524
/**
@@ -57,9 +56,4 @@ public Float getValue() {
5756
return innerTag.value();
5857
}
5958

60-
@Override
61-
public String toString() {
62-
return "TAG_Float(" + innerTag.value() + ")";
63-
}
64-
6559
}

worldedit-core/src/main/java/com/sk89q/jnbt/IntArrayTag.java

-15
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
import com.sk89q.worldedit.util.nbt.IntArrayBinaryTag;
2323

24-
import java.util.Locale;
25-
2624
import static com.google.common.base.Preconditions.checkNotNull;
2725

2826
/**
@@ -61,17 +59,4 @@ public int[] getValue() {
6159
return innerTag.value();
6260
}
6361

64-
@Override
65-
public String toString() {
66-
StringBuilder hex = new StringBuilder();
67-
for (int b : innerTag.value()) {
68-
String hexDigits = Integer.toHexString(b).toUpperCase(Locale.ROOT);
69-
if (hexDigits.length() == 1) {
70-
hex.append("0");
71-
}
72-
hex.append(hexDigits).append(" ");
73-
}
74-
return "TAG_Int_Array(" + hex + ")";
75-
}
76-
7762
}

worldedit-core/src/main/java/com/sk89q/jnbt/IntTag.java

-5
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,4 @@ public Integer getValue() {
5656
return innerTag.value();
5757
}
5858

59-
@Override
60-
public String toString() {
61-
return "TAG_Int(" + innerTag.value() + ")";
62-
}
63-
6459
}

worldedit-core/src/main/java/com/sk89q/jnbt/ListTag.java

-11
Original file line numberDiff line numberDiff line change
@@ -449,15 +449,4 @@ public String getString(int index) {
449449
}
450450
}
451451

452-
@Override
453-
public String toString() {
454-
StringBuilder bldr = new StringBuilder();
455-
bldr.append("TAG_List").append(": ").append(value.size()).append(" entries of type ").append(NBTUtils.getTypeName(type)).append("\r\n{\r\n");
456-
for (Tag t : value) {
457-
bldr.append(" ").append(t.toString().replaceAll("\r\n", "\r\n ")).append("\r\n");
458-
}
459-
bldr.append("}");
460-
return bldr.toString();
461-
}
462-
463452
}

worldedit-core/src/main/java/com/sk89q/jnbt/LongArrayTag.java

-15
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
import com.sk89q.worldedit.util.nbt.LongArrayBinaryTag;
2323

24-
import java.util.Locale;
25-
2624
import static com.google.common.base.Preconditions.checkNotNull;
2725

2826
/**
@@ -61,17 +59,4 @@ public long[] getValue() {
6159
return innerTag.value();
6260
}
6361

64-
@Override
65-
public String toString() {
66-
StringBuilder hex = new StringBuilder();
67-
for (long b : innerTag.value()) {
68-
String hexDigits = Long.toHexString(b).toUpperCase(Locale.ROOT);
69-
if (hexDigits.length() == 1) {
70-
hex.append("0");
71-
}
72-
hex.append(hexDigits).append(" ");
73-
}
74-
return "TAG_Long_Array(" + hex + ")";
75-
}
76-
7762
}

worldedit-core/src/main/java/com/sk89q/jnbt/LongTag.java

-5
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,4 @@ public Long getValue() {
5656
return innerTag.value();
5757
}
5858

59-
@Override
60-
public String toString() {
61-
return "TAG_Long(" + innerTag.value() + ")";
62-
}
63-
6459
}

worldedit-core/src/main/java/com/sk89q/jnbt/ShortTag.java

-5
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,4 @@ public Short getValue() {
5656
return innerTag.value();
5757
}
5858

59-
@Override
60-
public String toString() {
61-
return "TAG_Short(" + innerTag.value() + ")";
62-
}
63-
6459
}

worldedit-core/src/main/java/com/sk89q/jnbt/StringTag.java

-5
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,4 @@ public String getValue() {
5959
return innerTag.value();
6060
}
6161

62-
@Override
63-
public String toString() {
64-
return "TAG_String(" + innerTag.value() + ")";
65-
}
66-
6762
}

worldedit-core/src/main/java/com/sk89q/jnbt/Tag.java

+4
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,8 @@ public abstract class Tag implements BinaryTagLike {
3636
*/
3737
public abstract Object getValue();
3838

39+
@Override
40+
public String toString() {
41+
return asBinaryTag().toString();
42+
}
3943
}

0 commit comments

Comments
 (0)