diff --git a/src/main/java/de/bixilon/minosoft/Config.java b/src/main/java/de/bixilon/minosoft/Config.java index 3bed57f59..ec80f3001 100644 --- a/src/main/java/de/bixilon/minosoft/Config.java +++ b/src/main/java/de/bixilon/minosoft/Config.java @@ -14,8 +14,8 @@ package de.bixilon.minosoft; public class Config { - public static String homeDir; public static final String configFileName = "game.yml"; - public static final boolean skipAuthentication = false; // only for offline development + public static final boolean skipAuthentication = true; // only for offline development public static final boolean colorLog = true; + public static String homeDir; } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/ByteArrayTag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/ByteArrayTag.java index 2b4b09228..2e3ae757a 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/ByteArrayTag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/ByteArrayTag.java @@ -42,4 +42,18 @@ public class ByteArrayTag implements Tag { public byte[] getValue() { return value; } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("["); + for (byte b : value) { + builder.append(b); + builder.append("b, "); + } + builder.delete(builder.length() - 1, builder.length()); // delete last comma + builder.append("]"); + + return builder.toString(); + } } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/ByteTag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/ByteTag.java index b1a7f2075..eb8da1c9a 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/ByteTag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/ByteTag.java @@ -40,4 +40,9 @@ public class ByteTag implements Tag { public byte getValue() { return value; } + + @Override + public String toString() { + return value + "b"; + } } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/CompoundTag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/CompoundTag.java index be0b49ccd..222840e58 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/CompoundTag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/CompoundTag.java @@ -182,4 +182,22 @@ public class CompoundTag implements Tag { return (CompoundTag) data.get(key); } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append(name); + builder.append("{"); + + for (Map.Entry set : data.entrySet()) { + builder.append(set.getKey()); + builder.append(":"); + builder.append(set.getValue()); + builder.append(","); + } + builder.delete(builder.length() - 1, builder.length()); // delete last comma + + builder.append("}"); + return builder.toString(); + } } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/DoubleTag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/DoubleTag.java index d852f462d..841a0af56 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/DoubleTag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/DoubleTag.java @@ -40,4 +40,9 @@ public class DoubleTag implements Tag { public double getValue() { return value; } + + @Override + public String toString() { + return value + "D"; + } } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/FloatTag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/FloatTag.java index 2d8c86aa3..91cb7d54f 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/FloatTag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/FloatTag.java @@ -40,4 +40,9 @@ public class FloatTag implements Tag { public float getValue() { return value; } + + @Override + public String toString() { + return value + "F"; + } } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/IntArrayTag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/IntArrayTag.java index 97ed1f78f..630423644 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/IntArrayTag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/IntArrayTag.java @@ -42,4 +42,18 @@ public class IntArrayTag implements Tag { public int[] getValue() { return value; } + + @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(); + } } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/IntTag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/IntTag.java index ef4d3211a..984d3efef 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/IntTag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/IntTag.java @@ -40,4 +40,9 @@ public class IntTag implements Tag { public int getValue() { return value; } + + @Override + public String toString() { + return String.valueOf(value); + } } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/ListTag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/ListTag.java index 029f08c18..430a8f433 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/ListTag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/ListTag.java @@ -88,4 +88,18 @@ public class ListTag implements Tag { public List getValue() { return list; } + + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("["); + for (Tag tag : list) { + builder.append(tag); + } + builder.delete(builder.length() - 1, builder.length()); // delete last comma + builder.append("]"); + + return builder.toString(); + } } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/LongArrayTag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/LongArrayTag.java index 9c712ff40..56f2efbaf 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/LongArrayTag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/LongArrayTag.java @@ -42,4 +42,18 @@ public class LongArrayTag implements Tag { public long[] getValue() { return value; } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("["); + for (long l : value) { + builder.append(l); + builder.append("L, "); + } + builder.delete(builder.length() - 1, builder.length()); // delete last comma + builder.append("]"); + + return builder.toString(); + } } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/LongTag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/LongTag.java index 536fec92f..9aa7f99bd 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/LongTag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/LongTag.java @@ -40,4 +40,9 @@ public class LongTag implements Tag { public long getValue() { return value; } + + @Override + public String toString() { + return value + "L"; + } } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/ShortTag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/ShortTag.java index 98fadf239..6d5ef8b68 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/ShortTag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/ShortTag.java @@ -40,4 +40,9 @@ public class ShortTag implements Tag { public short getValue() { return value; } + + @Override + public String toString() { + return value + "s"; + } } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/StringTag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/StringTag.java index b95e57802..fc5299ce8 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/StringTag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/StringTag.java @@ -41,4 +41,9 @@ public class StringTag implements Tag { public String getValue() { return value; } + + @Override + public String toString() { + return "\"" + value + "\""; + } } diff --git a/src/main/java/de/bixilon/minosoft/nbt/tag/Tag.java b/src/main/java/de/bixilon/minosoft/nbt/tag/Tag.java index e367a8713..4f4eb14b9 100644 --- a/src/main/java/de/bixilon/minosoft/nbt/tag/Tag.java +++ b/src/main/java/de/bixilon/minosoft/nbt/tag/Tag.java @@ -19,4 +19,6 @@ public interface Tag { TagTypes getType(); void writeBytes(OutByteBuffer buffer); + + String toString(); }