chore: merge api-14 for updates

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>

Author: gabizou

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

@@ -98,6 +98,6 @@ public static Registry<ChatType> registry() {
     }
 
     public static DefaultedRegistryReference<ChatType> key(final ResourceKey location) {
-        return RegistryKey.of(RegistryTypes.CHAT_TYPE, location).asDefaultedReference(Sponge::server);
+        return RegistryKey.of(RegistryTypes.CHAT_TYPE, location).asScopedReference();
     }
 }

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

@@ -68,6 +68,11 @@ public final class ResolveOperations {
      */
     public static final DefaultedRegistryReference<ResolveOperation> CUSTOM_TRANSLATIONS = ResolveOperations.key(ResourceKey.sponge("custom_translations"));
 
+    /**
+     * Resolves Sponge provided virtual components.
+     */
+    public static final DefaultedRegistryReference<ResolveOperation> VIRTUAL_COMPONENTS = ResolveOperations.key(ResourceKey.sponge("virtual_components"));
+
     // SORTFIELDS:OFF
     // @formatter:ON
 

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

@@ -119,10 +119,28 @@ public static ComponentFlattener flattener() {
      * render each {@link Audience} their own version of
      * the received message.
      *
+     * @param apply The function invoked to render
+     *              {@link Audience} specific component.
      * @return The virtual component
      */
     public static VirtualComponent receiverVirtualComponent(final Function<Audience, ComponentLike> apply) {
-        return SpongeComponents.factory().receiverVirtualComponent(apply);
+        return SpongeComponents.receiverVirtualComponent(apply, "");
+    }
+
+    /**
+     * Creates a new {@link VirtualComponent} that will be used to
+     * render each {@link Audience} their own version of
+     * the received message.
+     *
+     * @param apply The function invoked to render
+     *              {@link Audience} specific component.
+     * @param fallbackValue The fallback value used when this
+     *                      component has been serialized without
+     *                      being rendered.
+     * @return The virtual component
+     */
+    public static VirtualComponent receiverVirtualComponent(final Function<Audience, ComponentLike> apply, final String fallbackValue) {
+        return SpongeComponents.factory().receiverVirtualComponent(apply, fallbackValue);
     }
 
     private static Factory factory() {
@@ -151,6 +169,6 @@ Component render(
 
         ComponentFlattener flattener();
 
-        VirtualComponent receiverVirtualComponent(Function<Audience, ComponentLike> apply);
+        VirtualComponent receiverVirtualComponent(Function<Audience, ComponentLike> apply, String fallbackValue);
     }
 }

src/main/java/org/spongepowered/api/command/registrar/tree/CommandTreeNodeTypes.java

@@ -138,6 +138,6 @@ public static Registry<CommandTreeNodeType<?>> registry() {
     }
 
     private static <T extends CommandTreeNode<T>> DefaultedRegistryReference<CommandTreeNodeType<T>> key(final ResourceKey location) {
-        return RegistryKey.of(RegistryTypes.COMMAND_TREE_NODE_TYPE, location).asDefaultedReference(Sponge::server);
+        return RegistryKey.of(RegistryTypes.COMMAND_TREE_NODE_TYPE, location).asScopedReference();
     }
 }

src/main/java/org/spongepowered/api/data/Keys.java

@@ -292,6 +292,8 @@
 import org.spongepowered.api.world.portal.PortalLogic;
 import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.server.ServerWorld;
+import org.spongepowered.api.world.server.WorldArchetype;
+import org.spongepowered.api.world.server.WorldArchetypeType;
 import org.spongepowered.api.world.server.storage.ServerWorldProperties;
 import org.spongepowered.api.world.storage.WorldProperties;
 import org.spongepowered.api.world.weather.Weather;
@@ -3567,6 +3569,18 @@ public final class Keys {
      */
     public static final Key<Value<Sheep>> WOLOLO_TARGET = Keys.key(ResourceKey.sponge("wololo_target"), Sheep.class);
 
+    /**
+     * The {@link WorldArchetype} of a {@link World} or {@link ServerWorldProperties}
+     * Readonly
+     */
+    public static final Key<Value<WorldArchetype>> WORLD_ARCHETYPE = Keys.key(ResourceKey.sponge("world_archetype"), WorldArchetype.class);
+
+    /**
+     * The {@link WorldArchetypeType} of a {@link World} or {@link ServerWorldProperties}
+     * Readonly
+     */
+    public static final Key<Value<WorldArchetypeType>> WORLD_ARCHETYPE_TYPE = Keys.key(ResourceKey.sponge("world_archetype_type"), WorldArchetypeType.class);
+
     /**
      * The world border of {@link WorldProperties}
      * Readonly

src/main/java/org/spongepowered/api/data/type/ArtTypes.java

@@ -148,6 +148,6 @@ public static Registry<ArtType> registry() {
     }
 
     private static DefaultedRegistryReference<ArtType> key(final ResourceKey location) {
-        return RegistryKey.of(RegistryTypes.ART_TYPE, location).asDefaultedReference(Sponge::server);
+        return RegistryKey.of(RegistryTypes.ART_TYPE, location).asScopedReference();
     }
 }

src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java

@@ -134,6 +134,6 @@ public static Registry<BannerPatternShape> registry() {
     }
 
     private static DefaultedRegistryReference<BannerPatternShape> key(final ResourceKey location) {
-        return RegistryKey.of(RegistryTypes.BANNER_PATTERN_SHAPE, location).asDefaultedReference(Sponge::server);
+        return RegistryKey.of(RegistryTypes.BANNER_PATTERN_SHAPE, location).asScopedReference();
     }
 }

src/main/java/org/spongepowered/api/data/type/WolfVariants.java

@@ -62,10 +62,10 @@ private WolfVariants() {
     }
 
     public static Registry<WolfVariant> registry() {
-        return Sponge.server().registry(RegistryTypes.WOLF_VAIRANT);
+        return Sponge.server().registry(RegistryTypes.WOLF_VARIANT);
     }
 
     private static DefaultedRegistryReference<WolfVariant> key(final ResourceKey location) {
-        return RegistryKey.of(RegistryTypes.WOLF_VAIRANT, location).asDefaultedReference(Sponge::server);
+        return RegistryKey.of(RegistryTypes.WOLF_VARIANT, location).asScopedReference();
     }
 }

src/main/java/org/spongepowered/api/effect/particle/ParticleOptions.java

@@ -59,6 +59,7 @@ public final class ParticleOptions {
      *   <li>{@link ParticleTypes#BLOCK_MARKER}</li>
      *   <li>{@link ParticleTypes#DUST_PILLAR}</li>
      *   <li>{@link ParticleTypes#FALLING_DUST}</li>
+     *   <li>{@link ParticleTypes#BLOCK_CRUMBLE}</li>
      * </ul>
      */
     public static final DefaultedRegistryReference<ParticleOption<BlockState>> BLOCK_STATE = ParticleOptions.key(ResourceKey.sponge("block_state"));
@@ -71,6 +72,7 @@ public final class ParticleOptions {
      *   <li>{@link ParticleTypes#ENTITY_EFFECT}</li>
      *   <li>{@link ParticleTypes#DUST}</li>
      *   <li>{@link ParticleTypes#DUST_COLOR_TRANSITION}</li>
+     *   <li>{@link ParticleTypes#TRAIL}</li>
      * </ul>
      */
     public static final DefaultedRegistryReference<ParticleOption<Color>> COLOR = ParticleOptions.key(ResourceKey.sponge("color"));
@@ -158,6 +160,16 @@ public final class ParticleOptions {
      */
     public static final DefaultedRegistryReference<ParticleOption<Double>> SCALE = ParticleOptions.key(ResourceKey.sponge("scale"));
 
+    /**
+     * This option will affect the target of a particle
+     * The only vanilla {@link ParticleType} this option is applicable to is:
+     *
+     * <ul>
+     *   <li>{@link ParticleTypes#TRAIL}</li>
+     * </ul>
+     */
+    public static final DefaultedRegistryReference<ParticleOption<Vector3d>> TARGET = ParticleOptions.key(ResourceKey.sponge("target"));
+
     /**
      * This option will change the color the transition particle will change to.
      * The only vanilla {@link ParticleType} this option is applicable to is:
@@ -174,6 +186,7 @@ public final class ParticleOptions {
      *
      * <ul>
      *   <li>{@link ParticleTypes#VIBRATION}</li>
+     *   <li>{@link ParticleTypes#TRAIL}</li>
      * </ul>
      */
     public static final DefaultedRegistryReference<ParticleOption<Ticks>> TRAVEL_TIME = ParticleOptions.key(ResourceKey.sponge("travel_time"));

src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java

@@ -86,6 +86,6 @@ public static Registry<MusicDisc> registry() {
     }
 
     private static DefaultedRegistryReference<MusicDisc> key(final ResourceKey location) {
-        return RegistryKey.of(RegistryTypes.MUSIC_DISC, location).asDefaultedReference(Sponge::server);
+        return RegistryKey.of(RegistryTypes.MUSIC_DISC, location).asScopedReference();
     }
 }