AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-12 00:47:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

improve nbt toString function

Browse Source
This commit is contained in:
Bixilon 2020-10-05 22:52:18 +02:00
parent 767462170e
commit 6aaec0bcaf
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
7 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/de/bixilon/minosoft/util/nbt/tag/ByteArrayTag.java
View File

@ -45,14 +45,16 @@ public class ByteArrayTag implements NBTTag {
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("[");
for (byte b : value) {
builder.append(b);
builder.append("b, ");
builder.append('[');
for (int i = 0; i < value.length; i++) {
builder.append(value[i]);
builder.append("b");
if (i == value.length - 1) {
break;
}
builder.append(", ");
}
builder.delete(builder.length() - 2, builder.length()); // delete last comma
builder.append("]");
return builder.toString();
}
}

23
src/main/java/de/bixilon/minosoft/util/nbt/tag/CompoundTag.java
View File

@ -19,6 +19,7 @@ import de.bixilon.minosoft.protocol.protocol.OutByteBuffer;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
public class CompoundTag implements NBTTag {
final String name;
@ -148,17 +149,21 @@ public class CompoundTag implements NBTTag {
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
if (name != null) {
builder.append(name);
builder.append("{");
for (Map.Entry<String, NBTTag> set : data.entrySet()) {
builder.append(set.getKey());
builder.append(": ");
builder.append(set.getValue());
builder.append(", ");
}
builder.delete(builder.length() - 2, builder.length()); // delete last comma
builder.append('{');
AtomicInteger i = new AtomicInteger();
data.forEach((key, value) -> {
builder.append(key);
builder.append(": ");
builder.append(value);
if (i.get() == data.size() - 1) {
return;
}
builder.append(", ");
i.getAndIncrement();
});
builder.append("}");
return builder.toString();
}

13
src/main/java/de/bixilon/minosoft/util/nbt/tag/IntArrayTag.java
View File

@ -16,6 +16,8 @@ package de.bixilon.minosoft.util.nbt.tag;
import de.bixilon.minosoft.protocol.protocol.InByteBuffer;
import de.bixilon.minosoft.protocol.protocol.OutByteBuffer;
import java.util.Arrays;
public class IntArrayTag implements NBTTag {
final int[] value;
@ -44,15 +46,6 @@ public class IntArrayTag implements NBTTag {
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("[");
for (int i : value) {
builder.append(i);
builder.append(", ");
}
builder.delete(builder.length() - 1, builder.length()); // delete last comma
builder.append("]");
return builder.toString();
return Arrays.toString(value);
}
}

14
src/main/java/de/bixilon/minosoft/util/nbt/tag/ListTag.java
View File

@ -63,20 +63,12 @@ public class ListTag implements NBTTag {
}
}
public ArrayList<NBTTag> getValue() {
return list;
public <K> ArrayList<K> getValue() {
return (ArrayList<K>) list;
}
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("[");
for (NBTTag NBTTag : list) {
builder.append(NBTTag);
}
builder.delete(builder.length() - 1, builder.length()); // delete last comma
builder.append("]");
return builder.toString();
return list.toString();
}
}

14
src/main/java/de/bixilon/minosoft/util/nbt/tag/LongArrayTag.java
View File

@ -45,14 +45,16 @@ public class LongArrayTag implements NBTTag {
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("[");
for (long l : value) {
builder.append(l);
builder.append("L, ");
builder.append('[');
for (int i = 0; i < value.length; i++) {
builder.append(value[i]);
builder.append("l");
if (i == value.length - 1) {
break;
}
builder.append(", ");
}
builder.delete(builder.length() - 2, builder.length()); // delete last comma
builder.append("]");
return builder.toString();
}
}

2
src/main/java/de/bixilon/minosoft/util/nbt/tag/LongTag.java
View File

@ -43,6 +43,6 @@ public class LongTag implements NBTTag {
@Override
public String toString() {
return value + "L";
return value + "l";
}
}