Passthrough toString to the base adventure NBT tag

EngineHub · Feb 5, 2021 · 43688da · 43688da
1 parent 46888a3
commit 43688da
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 106 deletions.
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/ByteArrayTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/ByteArrayTag.java
@@ -53,19 +53,6 @@ public byte[] getValue() {
         return innerTag.value();
     }
 
-    @Override
-    public String toString() {
-        StringBuilder hex = new StringBuilder();
-        for (byte b : innerTag.value()) {
-            String hexDigits = Integer.toHexString(b).toUpperCase(Locale.ROOT);
-            if (hexDigits.length() == 1) {
-                hex.append("0");
-            }
-            hex.append(hexDigits).append(" ");
-        }
-        return "TAG_Byte_Array(" + hex + ")";
-    }
-
     @Override
     public ByteArrayBinaryTag asBinaryTag() {
         return innerTag;

diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/ByteTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/ByteTag.java
@@ -51,11 +51,6 @@ public Byte getValue() {
         return innerTag.value();
     }
 
-    @Override
-    public String toString() {
-        return "TAG_Byte(" + innerTag.value() + ")";
-    }
-
     @Override
     public ByteBinaryTag asBinaryTag() {
         return innerTag;

diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTag.java
@@ -439,17 +439,6 @@ public String getString(String key) {
         }
     }
 
-    @Override
-    public String toString() {
-        StringBuilder bldr = new StringBuilder();
-        bldr.append("TAG_Compound").append(": ").append(value.size()).append(" entries\r\n{\r\n");
-        for (Map.Entry<String, Tag> entry : value.entrySet()) {
-            bldr.append("   ").append(entry.getValue().toString().replaceAll("\r\n", "\r\n   ")).append("\r\n");
-        }
-        bldr.append("}");
-        return bldr.toString();
-    }
-
     @Override
     public CompoundBinaryTag asBinaryTag() {
         CompoundBinaryTag.Builder builder = CompoundBinaryTag.builder();

diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/DoubleTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/DoubleTag.java
@@ -56,9 +56,4 @@ public Double getValue() {
         return innerTag.value();
     }
 
-    @Override
-    public String toString() {
-        return "TAG_Double(" + innerTag.value() + ")";
-    }
-
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/EndTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/EndTag.java
@@ -34,11 +34,6 @@ public Object getValue() {
         return null;
     }
 
-    @Override
-    public String toString() {
-        return "TAG_End";
-    }
-
     @Override
     public EndBinaryTag asBinaryTag() {
         return EndBinaryTag.get();

diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/FloatTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/FloatTag.java
@@ -19,7 +19,6 @@
 
 package com.sk89q.jnbt;
 
-import com.sk89q.worldedit.util.nbt.BinaryTag;
 import com.sk89q.worldedit.util.nbt.FloatBinaryTag;
 
 /**
@@ -57,9 +56,4 @@ public Float getValue() {
         return innerTag.value();
     }
 
-    @Override
-    public String toString() {
-        return "TAG_Float(" + innerTag.value() + ")";
-    }
-
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/IntArrayTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/IntArrayTag.java
@@ -21,8 +21,6 @@
 
 import com.sk89q.worldedit.util.nbt.IntArrayBinaryTag;
 
-import java.util.Locale;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
@@ -61,17 +59,4 @@ public int[] getValue() {
         return innerTag.value();
     }
 
-    @Override
-    public String toString() {
-        StringBuilder hex = new StringBuilder();
-        for (int b : innerTag.value()) {
-            String hexDigits = Integer.toHexString(b).toUpperCase(Locale.ROOT);
-            if (hexDigits.length() == 1) {
-                hex.append("0");
-            }
-            hex.append(hexDigits).append(" ");
-        }
-        return "TAG_Int_Array(" + hex + ")";
-    }
-
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/IntTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/IntTag.java
@@ -56,9 +56,4 @@ public Integer getValue() {
         return innerTag.value();
     }
 
-    @Override
-    public String toString() {
-        return "TAG_Int(" + innerTag.value() + ")";
-    }
-
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/ListTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/ListTag.java
@@ -449,15 +449,4 @@ public String getString(int index) {
         }
     }
 
-    @Override
-    public String toString() {
-        StringBuilder bldr = new StringBuilder();
-        bldr.append("TAG_List").append(": ").append(value.size()).append(" entries of type ").append(NBTUtils.getTypeName(type)).append("\r\n{\r\n");
-        for (Tag t : value) {
-            bldr.append("   ").append(t.toString().replaceAll("\r\n", "\r\n   ")).append("\r\n");
-        }
-        bldr.append("}");
-        return bldr.toString();
-    }
-
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/LongArrayTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/LongArrayTag.java
@@ -21,8 +21,6 @@
 
 import com.sk89q.worldedit.util.nbt.LongArrayBinaryTag;
 
-import java.util.Locale;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
@@ -61,17 +59,4 @@ public long[] getValue() {
         return innerTag.value();
     }
 
-    @Override
-    public String toString() {
-        StringBuilder hex = new StringBuilder();
-        for (long b : innerTag.value()) {
-            String hexDigits = Long.toHexString(b).toUpperCase(Locale.ROOT);
-            if (hexDigits.length() == 1) {
-                hex.append("0");
-            }
-            hex.append(hexDigits).append(" ");
-        }
-        return "TAG_Long_Array(" + hex + ")";
-    }
-
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/LongTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/LongTag.java
@@ -56,9 +56,4 @@ public Long getValue() {
         return innerTag.value();
     }
 
-    @Override
-    public String toString() {
-        return "TAG_Long(" + innerTag.value() + ")";
-    }
-
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/ShortTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/ShortTag.java
@@ -56,9 +56,4 @@ public Short getValue() {
         return innerTag.value();
     }
 
-    @Override
-    public String toString() {
-        return "TAG_Short(" + innerTag.value() + ")";
-    }
-
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/StringTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/StringTag.java
@@ -59,9 +59,4 @@ public String getValue() {
         return innerTag.value();
     }
 
-    @Override
-    public String toString() {
-        return "TAG_String(" + innerTag.value() + ")";
-    }
-
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/Tag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/Tag.java
@@ -36,4 +36,8 @@ public abstract class Tag implements BinaryTagLike {
      */
     public abstract Object getValue();
 
+    @Override
+    public String toString() {
+        return asBinaryTag().toString();
+    }
 }