Merge branch 'api-14' into api-14-consume-effects

Author: MrHell228

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/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/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(final ServerWorld world) {
-        return world.registry(RegistryTypes.WOLF_VAIRANT);
+        return world.registry(RegistryTypes.WOLF_VARIANT);
     }
 
     private static RegistryReference<WolfVariant> key(final ResourceKey location) {
-        return RegistryKey.of(RegistryTypes.WOLF_VAIRANT, location).asReference();
+        return RegistryKey.of(RegistryTypes.WOLF_VARIANT, location).asReference();
     }
 }

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();
     }
 }

src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java

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

src/main/java/org/spongepowered/api/item/enchantment/EnchantmentTypes.java

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

src/main/java/org/spongepowered/api/item/recipe/smithing/TrimMaterials.java

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