WIP registry rework

Author: aromaa

src/main/java/org/spongepowered/api/advancement/Advancement.java

@@ -26,17 +26,25 @@
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.ResourceKey;
+import org.spongepowered.api.Sponge;
 import org.spongepowered.api.advancement.criteria.AdvancementCriterion;
-import org.spongepowered.api.data.persistence.DataSerializable;
+import org.spongepowered.api.datapack.DataPackSerializable;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.util.CopyableBuilder;
 
 import java.util.List;
 import java.util.Optional;
 
 /**
  * An advancement.
  */
-public interface Advancement extends ComponentLike, DataSerializable {
+public interface Advancement extends DefaultedRegistryValue, ComponentLike, DataPackSerializable {
+
+    static Advancement.Builder builder() {
+        return Sponge.game().builderProvider().provide(Advancement.Builder.class);
+    }
 
     /**
      * Gets all the {@link AdvancementCriterion} that should be achieved
@@ -72,4 +80,57 @@ public interface Advancement extends ComponentLike, DataSerializable {
      */
     List<Component> toToastText();
 
+    /**
+     * A builder to create {@link Advancement}s.
+     */
+    interface Builder extends org.spongepowered.api.util.Builder<Advancement, Builder>, CopyableBuilder<Advancement, Builder> {
+
+        /**
+         * Sets the parent {@link Advancement} key.
+         * <p>For the root advancement use {@link #root}</p>
+         *
+         * @param parent The parent advancement
+         * @return This builder, for chaining
+         */
+        Builder parent(ResourceKey parent);
+
+        /**
+         * Sets this advancement as root.
+         *
+         * @return This builder, for chaining
+         */
+        Builder.RootStep root();
+
+        /**
+         * Define root advancement only parameters.
+         */
+        interface RootStep extends Builder {
+
+            /**
+             * Sets the background path..
+             *
+             * @param backgroundPath The {@link AdvancementTree}s background.
+             *
+             * @return This builder, for chaining
+             */
+            Builder background(ResourceKey backgroundPath);
+        }
+
+        /**
+         * Sets the {@link AdvancementCriterion} that should be used
+         * for the advancement. Defaults to {@link AdvancementCriterion#empty()}.
+         *
+         * @param criterion The criterion
+         * @return This builder, for chaining
+         */
+        Builder criterion(AdvancementCriterion criterion);
+
+        /**
+         * Sets the {@link DisplayInfo}. Defaults to {code null}.
+         *
+         * @param displayInfo The display info
+         * @return This builder, for chaining
+         */
+        Builder displayInfo(@Nullable DisplayInfo displayInfo);
+    }
 }

src/main/java/org/spongepowered/api/advancement/AdvancementTemplate.java

@@ -59,7 +59,7 @@ public interface AdvancementTree extends AdvancementNode {
      * @param advancement The advancement
      * @return The tree layout element
      */
-    Optional<TreeLayoutElement> layoutElement(AdvancementTemplate advancement);
+    Optional<TreeLayoutElement> layoutElement(Advancement advancement);
 
 
     /**

src/main/java/org/spongepowered/api/advancement/AdvancementTree.java

@@ -25,16 +25,62 @@
 package org.spongepowered.api.adventure;
 
 import net.kyori.adventure.text.format.Style;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.datapack.DataPackSerializable;
+import org.spongepowered.api.util.CopyableBuilder;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * A type of chat
  */
 @CatalogedBy(ChatTypes.class)
-public interface ChatType extends net.kyori.adventure.chat.ChatType {
+public interface ChatType extends net.kyori.adventure.chat.ChatType, DataPackSerializable {
+
+    static Builder builder() {
+        return Sponge.game().builderProvider().provide(Builder.class);
+    }
 
     String translationKey();
 
     Style style();
 
+    interface Builder extends org.spongepowered.api.util.Builder<ChatType, Builder>, CopyableBuilder<ChatType, Builder> {
+
+        /**
+         * Sets the translation key or custom format mask.
+         *
+         * @param translationKey The translation key or format mask
+         * @return this builder, for chaining
+         */
+        Builder translationKey(String translationKey);
+
+        /**
+         * Sets the style.
+         *
+         * @param style The style
+         * @return this builder, for chaining
+         */
+        Builder style(Style style);
+
+        /**
+         * Adds a sender parameter.
+         *
+         * @return this builder, for chaining
+         */
+        Builder addSender();
+
+        /**
+         * Adds a content parameter.
+         *
+         * @return this builder, for chaining
+         */
+        Builder addContent();
+
+        /**
+         * Adds a target parameter.
+         *
+         * @return this builder, for chaining
+         */
+        Builder addTarget();
+    }
 }

src/main/java/org/spongepowered/api/adventure/ChatType.java

@@ -41,6 +41,7 @@
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.event.EventContext;
 import org.spongepowered.api.event.lifecycle.RegisterCommandEvent;
+import org.spongepowered.api.registry.RegistryHolder;
 import org.spongepowered.api.service.permission.PermissionDescription;
 import org.spongepowered.api.service.permission.Subject;
 
@@ -209,9 +210,9 @@ interface Raw extends Command {
          *
          * @return The tree.
          */
-        default CommandTreeNode.Root commandTree() {
+        default CommandTreeNode.Root commandTree(RegistryHolder registryHolder) {
             return CommandTreeNode.root().executable().child("arguments",
-                    CommandTreeNodeTypes.STRING.get().createNode().greedy().executable().customCompletions());
+                    CommandTreeNodeTypes.STRING.get(registryHolder).createNode().greedy().executable().customCompletions());
         }
 
     }