Support tag search

pop4959 · Feb 4, 2024 · 62c437d · 62c437d
1 parent a2e8736
commit 62c437d
Show file tree

Hide file tree

Showing 14 changed files with 187 additions and 0 deletions.
diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/ByteArrayTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/ByteArrayTag.java
@@ -24,12 +24,24 @@ public void read(final DataInput input) throws IOException {
         input.readFully(value);
     }
 
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        final int size = input.readInt();
+        input.skipBytes(size);
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         output.writeInt(value.length);
         output.write(value);
     }
 
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        skip(input);
+        return null;
+    }
+
     @Override
     public byte type() {
         return TagType.BYTE_ARRAY;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/ByteTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/ByteTag.java
@@ -21,11 +21,22 @@ public void read(final DataInput input) throws IOException {
         this.value = input.readByte();
     }
 
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        input.skipBytes(1);
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         output.writeByte(value);
     }
 
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        skip(input);
+        return null;
+    }
+
     @Override
     public byte type() {
         return TagType.BYTE;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/CompoundTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/CompoundTag.java
@@ -28,6 +28,12 @@ public void read(final DataInput input) throws IOException {
         }
     }
 
+    @SuppressWarnings("StatementWithEmptyBody")
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        while (TagType.END != Tag.pass(input)) ;
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         for (final Tag tag : value.values()) {
@@ -36,6 +42,17 @@ public void write(final DataOutput output) throws IOException {
         output.writeByte(TagType.END);
     }
 
+    @SuppressWarnings("StatementWithEmptyBody")
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        Tag tag;
+        while ((tag = Tag.find(input, type, name)) == null) ;
+        if (TagType.END == tag.type()) {
+            return null;
+        }
+        return tag;
+    }
+
     @Override
     public byte type() {
         return TagType.COMPOUND;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/DoubleTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/DoubleTag.java
@@ -21,11 +21,22 @@ public void read(final DataInput input) throws IOException {
         this.value = input.readDouble();
     }
 
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        input.skipBytes(8);
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         output.writeDouble(value);
     }
 
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        skip(input);
+        return null;
+    }
+
     @Override
     public byte type() {
         return TagType.DOUBLE;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/EndTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/EndTag.java
@@ -14,11 +14,22 @@ public void read(final DataInput input) throws IOException {
         // No data
     }
 
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        // No data
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         // No data
     }
 
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        skip(input);
+        return null;
+    }
+
     @Override
     public byte type() {
         return TagType.END;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/FloatTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/FloatTag.java
@@ -21,11 +21,22 @@ public void read(final DataInput input) throws IOException {
         this.value = input.readFloat();
     }
 
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        input.skipBytes(4);
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         output.writeFloat(value);
     }
 
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        skip(input);
+        return null;
+    }
+
     @Override
     public byte type() {
         return TagType.FLOAT;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/IntArrayTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/IntArrayTag.java
@@ -26,6 +26,12 @@ public void read(final DataInput input) throws IOException {
         }
     }
 
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        final int size = input.readInt();
+        input.skipBytes(4 * size);
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         final int size = value.length;
@@ -35,6 +41,12 @@ public void write(final DataOutput output) throws IOException {
         }
     }
 
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        skip(input);
+        return null;
+    }
+
     @Override
     public byte type() {
         return TagType.INT_ARRAY;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/IntTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/IntTag.java
@@ -21,11 +21,22 @@ public void read(final DataInput input) throws IOException {
         this.value = input.readInt();
     }
 
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        input.skipBytes(4);
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         output.writeInt(value);
     }
 
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        skip(input);
+        return null;
+    }
+
     @Override
     public byte type() {
         return TagType.INT;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/ListTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/ListTag.java
@@ -32,6 +32,16 @@ public void read(final DataInput input) throws IOException {
         }
     }
 
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        this.type = input.readByte();
+        final int size = input.readInt();
+        final Tag tag = Tag.create(type, "");
+        for (int i = 0; i < size; ++i) {
+            tag.skip(input);
+        }
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         output.writeByte(type);
@@ -42,6 +52,12 @@ public void write(final DataOutput output) throws IOException {
         }
     }
 
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        skip(input);
+        return null;
+    }
+
     @Override
     public byte type() {
         return TagType.LIST;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/LongArrayTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/LongArrayTag.java
@@ -26,6 +26,12 @@ public void read(final DataInput input) throws IOException {
         }
     }
 
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        final int size = input.readInt();
+        input.skipBytes(8 * size);
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         final int size = value.length;
@@ -35,6 +41,12 @@ public void write(final DataOutput output) throws IOException {
         }
     }
 
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        skip(input);
+        return null;
+    }
+
     @Override
     public byte type() {
         return TagType.LONG_ARRAY;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/LongTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/LongTag.java
@@ -21,11 +21,22 @@ public void read(final DataInput input) throws IOException {
         this.value = input.readLong();
     }
 
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        input.skipBytes(8);
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         output.writeLong(value);
     }
 
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        skip(input);
+        return null;
+    }
+
     @Override
     public byte type() {
         return TagType.LONG;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/ShortTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/ShortTag.java
@@ -21,11 +21,22 @@ public void read(final DataInput input) throws IOException {
         this.value = input.readShort();
     }
 
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        input.skipBytes(2);
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         output.writeShort(value);
     }
 
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        skip(input);
+        return null;
+    }
+
     @Override
     public byte type() {
         return TagType.SHORT;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/StringTag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/StringTag.java
@@ -21,11 +21,23 @@ public void read(final DataInput input) throws IOException {
         this.value = input.readUTF();
     }
 
+    @Override
+    public void skip(final DataInput input) throws IOException {
+        final int size = input.readUnsignedShort();
+        input.skipBytes(size);
+    }
+
     @Override
     public void write(final DataOutput output) throws IOException {
         output.writeUTF(value);
     }
 
+    @Override
+    public Tag search(final DataInput input, final byte type, final String name) throws IOException {
+        skip(input);
+        return null;
+    }
+
     @Override
     public byte type() {
         return TagType.STRING;

diff --git a/nbt/src/main/java/org/popcraft/chunky/nbt/Tag.java b/nbt/src/main/java/org/popcraft/chunky/nbt/Tag.java
@@ -23,6 +23,17 @@ public static Tag load(final DataInput input) throws IOException {
         return tag;
     }
 
+    public static byte pass(final DataInput input) throws IOException {
+        final byte type = input.readByte();
+        if (TagType.END == type) {
+            return type;
+        }
+        final int size = input.readUnsignedShort();
+        input.skipBytes(size);
+        create(type, "").skip(input);
+        return type;
+    }
+
     public static void save(final DataOutput output, final Tag tag) throws IOException {
         final byte type = tag.type();
         output.writeByte(type);
@@ -33,6 +44,20 @@ public static void save(final DataOutput output, final Tag tag) throws IOExcepti
         tag.write(output);
     }
 
+    public static Tag find(final DataInput input, final byte type, final String name) throws IOException {
+        final byte t = input.readByte();
+        if (TagType.END == t) {
+            return new EndTag();
+        }
+        final String n = input.readUTF();
+        final Tag tag = create(t, n);
+        if (type == t && name.equals(n)) {
+            tag.read(input);
+            return tag;
+        }
+        return tag.search(input, type, name);
+    }
+
     public static Tag create(final byte type, final String name) {
         return switch (type) {
             case TagType.END -> new EndTag();
@@ -58,8 +83,12 @@ public String name() {
 
     abstract void read(final DataInput input) throws IOException;
 
+    abstract void skip(final DataInput input) throws IOException;
+
     abstract void write(final DataOutput output) throws IOException;
 
+    abstract Tag search(final DataInput input, final byte type, final String name) throws IOException;
+
     abstract byte type();
 
     abstract String typeName();