nbt: ability to add multiple tags to a Compound tag

KyoriPowered · Dec 14, 2020 · a1c3b62 · a1c3b62
1 parent dccfc46
commit a1c3b62
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 3 deletions.
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/CompoundBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/CompoundBinaryTag.java
@@ -44,6 +44,19 @@ public interface CompoundBinaryTag extends BinaryTag, CompoundTagSetter<Compound
     return CompoundBinaryTagImpl.EMPTY;
   }
 
+  /**
+   * Creates a compound tag populated with {@code tags}.
+   *
+   * <p>If {@code tags} is empty, {@link #empty()} will be returned.</p>
+   *
+   * @return a compound tag
+   * @since 4.4.0
+   */
+  static @NonNull CompoundBinaryTag from(final @NonNull Map<String, BinaryTag> tags) {
+    if(tags.isEmpty()) return empty();
+    return builder().put(tags).build();
+  }
+
   /**
    * Creates a builder.
    *

diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/CompoundBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/CompoundBinaryTagImpl.java
@@ -66,6 +66,11 @@ public boolean contains(final @NonNull String key, final @NonNull BinaryTagType<
     return this.edit(map -> map.put(key, tag));
   }
 
+  @Override
+  public @NonNull CompoundBinaryTag put(final @NonNull Map<String, BinaryTag> tags) {
+    return this.edit(map -> map.putAll(tags));
+  }
+
   @Override
   public byte getByte(final @NonNull String key, final byte defaultValue) {
     if(this.contains(key, BinaryTagTypes.BYTE)) {

diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/CompoundTagBuilder.java b/nbt/src/main/java/net/kyori/adventure/nbt/CompoundTagBuilder.java
@@ -31,12 +31,22 @@
 final class CompoundTagBuilder implements CompoundBinaryTag.Builder {
   private @MonotonicNonNull Map<String, BinaryTag> tags;
 
-  @Override
-  public CompoundBinaryTag.@NonNull Builder put(final @NonNull String key, final @NonNull BinaryTag tag) {
+  private Map<String, BinaryTag> tags() {
     if(this.tags == null) {
       this.tags = new HashMap<>();
     }
-    this.tags.put(key, tag);
+    return this.tags;
+  }
+
+  @Override
+  public CompoundBinaryTag.@NonNull Builder put(final @NonNull String key, final @NonNull BinaryTag tag) {
+    this.tags().put(key, tag);
+    return this;
+  }
+
+  @Override
+  public CompoundBinaryTag.@NonNull Builder put(final @NonNull Map<String, BinaryTag> tags) {
+    this.tags().putAll(tags);
     return this;
   }
 

diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/CompoundTagSetter.java b/nbt/src/main/java/net/kyori/adventure/nbt/CompoundTagSetter.java
@@ -23,6 +23,7 @@
  */
 package net.kyori.adventure.nbt;
 
+import java.util.Map;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
@@ -42,6 +43,15 @@ public interface CompoundTagSetter<R> {
    */
   @NonNull R put(final @NonNull String key, final @NonNull BinaryTag tag);
 
+  /**
+   * Inserts some tag.
+   *
+   * @param tags the tags
+   * @return a compound tag
+   * @since 4.4.0
+   */
+  @NonNull R put(final @NonNull Map<String, BinaryTag> tags);
+
   /**
    * Inserts a boolean.
    *