chore(git): merge upstream changes

Author: gabizou

src/main/java/org/spongepowered/api/MinecraftVersion.java

@@ -27,6 +27,7 @@
 import org.spongepowered.api.event.server.ClientPingServerEvent;
 import org.spongepowered.api.network.status.StatusResponse;
 
+import java.util.Optional;
 import java.util.OptionalInt;
 
 /**
@@ -44,6 +45,14 @@ public interface MinecraftVersion extends Comparable<MinecraftVersion> {
      */
     String name();
 
+    /**
+     * Gets the id of this Minecraft version.
+     *
+     * @implNote The version id will not be available in a status response.
+     * @return The version id
+     */
+    Optional<String> id();
+
     /**
      * Gets the protocol version of this Minecraft version.
      *

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

@@ -28,7 +28,6 @@
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.effect.sound.SoundType;
 import org.spongepowered.api.entity.Entity;
-import org.spongepowered.api.item.recipe.Recipe;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
 import org.spongepowered.api.registry.Registry;
 import org.spongepowered.api.registry.RegistryKey;
@@ -44,15 +43,6 @@ public final class CommandCompletionProviders {
 
     // SORTFIELDS:ON
 
-    /**
-     * Instructs the node represented by a {@link CommandTreeNode} to display
-     * all known {@link Recipe recipes}.
-     *
-     * <p>This provider is intended for use with a {@link ResourceKey} parser.
-     * </p>
-     */
-    public static final DefaultedRegistryReference<CommandCompletionProvider> ALL_RECIPES = CommandCompletionProviders.key(ResourceKey.minecraft("all_recipes"));
-
     /**
      * Instructs the node represented by a {@link CommandTreeNode} to display
      * all known {@link SoundType sounds}.

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

@@ -55,13 +55,14 @@
 import org.spongepowered.api.data.type.ArtType;
 import org.spongepowered.api.data.type.AttachmentSurface;
 import org.spongepowered.api.data.type.AxolotlVariant;
-import org.spongepowered.api.data.type.BoatType;
 import org.spongepowered.api.data.type.BodyPart;
 import org.spongepowered.api.data.type.BodyParts;
 import org.spongepowered.api.data.type.CatType;
 import org.spongepowered.api.data.type.ChestAttachmentType;
+import org.spongepowered.api.data.type.ChickenVariant;
 import org.spongepowered.api.data.type.ComparatorMode;
 import org.spongepowered.api.data.type.CopperOxidation;
+import org.spongepowered.api.data.type.CowVariant;
 import org.spongepowered.api.data.type.DoorHinge;
 import org.spongepowered.api.data.type.DripstoneSegment;
 import org.spongepowered.api.data.type.DyeColor;
@@ -134,6 +135,7 @@
 import org.spongepowered.api.entity.Item;
 import org.spongepowered.api.entity.Ownable;
 import org.spongepowered.api.entity.ai.goal.GoalExecutorTypes;
+import org.spongepowered.api.entity.attribute.ItemAttribute;
 import org.spongepowered.api.entity.display.BillboardType;
 import org.spongepowered.api.entity.display.DisplayEntity;
 import org.spongepowered.api.entity.display.ItemDisplayType;
@@ -167,6 +169,7 @@
 import org.spongepowered.api.entity.living.animal.TameableAnimal;
 import org.spongepowered.api.entity.living.animal.Turtle;
 import org.spongepowered.api.entity.living.animal.Wolf;
+import org.spongepowered.api.entity.living.animal.cow.Cow;
 import org.spongepowered.api.entity.living.animal.cow.Mooshroom;
 import org.spongepowered.api.entity.living.animal.frog.Frog;
 import org.spongepowered.api.entity.living.animal.horse.Horse;
@@ -578,11 +581,6 @@ public final class Keys {
      */
     public static final Key<Value<Double>> BLOCK_TEMPERATURE = Keys.key(ResourceKey.sponge("block_temperature"), Double.class);
 
-    /**
-     * The type of the boat.
-     */
-    public static final Key<Value<BoatType>> BOAT_TYPE = Keys.key(ResourceKey.sponge("boat_type"), BoatType.class);
-
     /**
      * The rotation of specific body parts of a {@link ArmorStand} or {@link Living}.
      *
@@ -754,6 +752,11 @@ public final class Keys {
      */
     public static final Key<Value<Vector3d>> CHEST_ROTATION = Keys.key(ResourceKey.sponge("chest_rotation"), Vector3d.class);
 
+    /**
+     * The {@link ChickenVariant} of a {@link Chicken}.
+     */
+    public static final Key<Value<ChickenVariant>> CHICKEN_VARIANT = Keys.key(ResourceKey.sponge("chicken_variant"), ChickenVariant.class);
+
     /**
      * The chunk generator of a {@link World}
      * Readonly
@@ -812,6 +815,11 @@ public final class Keys {
      */
     public static final Key<Value<CopperOxidation>> COPPER_OXIDATION = Keys.key(ResourceKey.sponge("copper_oxidation"), CopperOxidation.class);
 
+    /**
+     * The {@link CowVariant} of a {@link Cow}.
+     */
+    public static final Key<Value<CowVariant>> COW_VARIANT = Keys.key(ResourceKey.sponge("cow_variant"), CowVariant.class);
+
     /**
      * The {@link ItemStack} a food {@link ItemStack} converts to when eaten.
      */
@@ -2212,6 +2220,11 @@ public final class Keys {
      */
     public static final Key<Value<Boolean>> IS_WET = Keys.key(ResourceKey.sponge("is_wet"), Boolean.class);
 
+    /**
+     * The {@link ItemAttribute}s an {@link ItemStackLike} can apply.
+     */
+    public static final Key<ListValue<ItemAttribute>> ITEM_ATTRIBUTES = Keys.listKey(ResourceKey.sponge("item_attributes"), ItemAttribute.class);
+
     /**
      * The {@link ItemDisplayType display type} of a {@link org.spongepowered.api.entity.display.ItemDisplay}.
      */

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

@@ -24,6 +24,7 @@
  */
 package org.spongepowered.api.entity.attribute;
 
+import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.ResourceKeyed;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.item.inventory.ItemStack;
@@ -38,6 +39,30 @@
  */
 public interface AttributeModifier extends ResourceKeyed {
 
+    /**
+     * Creates an attribute modifier with the given values.
+     *
+     * @param key The resource key
+     * @param operation The attribute operation
+     * @param amount The amount
+     * @return The attribute modifier
+     */
+    static AttributeModifier of(final ResourceKey key, final Supplier<? extends AttributeOperation> operation, final double amount) {
+        return AttributeModifier.builder().key(key).operation(operation).amount(amount).build();
+    }
+
+    /**
+     * Creates an attribute modifier with the given values.
+     *
+     * @param key The resource key
+     * @param operation The attribute operation
+     * @param amount The amount
+     * @return The attribute modifier
+     */
+    static AttributeModifier of(final ResourceKey key, final AttributeOperation operation, final double amount) {
+        return AttributeModifier.builder().key(key).operation(operation).amount(amount).build();
+    }
+
     /**
      * Creates a new {@link Builder} to create an {@link AttributeModifier}.
      *

src/main/java/org/spongepowered/api/entity/attribute/AttributeModifier.java

@@ -0,0 +1,114 @@
+/*
+ * This file is part of SpongeAPI, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.api.entity.attribute;
+
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.entity.attribute.type.AttributeType;
+import org.spongepowered.api.item.inventory.ItemStackLike;
+import org.spongepowered.api.item.inventory.equipment.EquipmentCondition;
+
+import java.util.Objects;
+import java.util.function.Supplier;
+
+/**
+ * Represents an {@link AttributeModifier} for the specific {@link AttributeType}
+ * an {@link ItemStackLike} can apply when the {@link EquipmentCondition} is met.
+ */
+public interface ItemAttribute {
+
+    /**
+     * Creates an item attribute with the given values.
+     *
+     * @param type The attribute type
+     * @param modifier The attribute modifier
+     * @param condition The equipment condition
+     * @return The item attribute
+     */
+    static ItemAttribute of(final Supplier<? extends AttributeType> type, final AttributeModifier modifier, final Supplier<? extends EquipmentCondition> condition) {
+        return ItemAttribute.of(Objects.requireNonNull(type, "type").get(), modifier, Objects.requireNonNull(condition, "condition").get());
+    }
+
+    /**
+     * Creates an item attribute with the given values.
+     *
+     * @param type The attribute type
+     * @param modifier The attribute modifier
+     * @param condition The equipment condition
+     * @return The item attribute
+     */
+    static ItemAttribute of(final Supplier<? extends AttributeType> type, final AttributeModifier modifier, final EquipmentCondition condition) {
+        return ItemAttribute.of(Objects.requireNonNull(type, "type").get(), modifier, condition);
+    }
+
+    /**
+     * Creates an item attribute with the given values.
+     *
+     * @param type The attribute type
+     * @param modifier The attribute modifier
+     * @param condition The equipment condition
+     * @return The item attribute
+     */
+    static ItemAttribute of(final AttributeType type, final AttributeModifier modifier, final Supplier<? extends EquipmentCondition> condition) {
+        return ItemAttribute.of(type, modifier, Objects.requireNonNull(condition, "condition").get());
+    }
+
+    /**
+     * Creates an item attribute with the given values.
+     *
+     * @param type The attribute type
+     * @param modifier The attribute modifier
+     * @param condition The equipment condition
+     * @return The item attribute
+     */
+    static ItemAttribute of(final AttributeType type, final AttributeModifier modifier, final EquipmentCondition condition) {
+        return Sponge.game().factoryProvider().provide(Factory.class).of(type, modifier, condition);
+    }
+
+    /**
+     * Returns the attribute type.
+     *
+     * @return The attribute type
+     */
+    AttributeType type();
+
+    /**
+     * Returns the attribute modifier.
+     *
+     * @return The attribute modifier
+     */
+    AttributeModifier modifier();
+
+    /**
+     * Returns the equipment condition.
+     *
+     * @return The equipment condition
+     */
+    EquipmentCondition condition();
+
+    interface Factory {
+
+        ItemAttribute of(AttributeType type, AttributeModifier modifier, EquipmentCondition condition);
+    }
+}

src/main/java/org/spongepowered/api/entity/attribute/ItemAttribute.java

@@ -25,7 +25,6 @@
 package org.spongepowered.api.entity.vehicle;
 
 import org.spongepowered.api.data.Keys;
-import org.spongepowered.api.data.type.BoatType;
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.entity.Leashable;
 
@@ -34,15 +33,6 @@
  */
 public interface Boat extends Vehicle, Leashable {
 
-    /**
-     * {@link Keys#BOAT_TYPE}
-     *
-     * @return The type of the boat
-     */
-    default Value.Mutable<BoatType> boatType() {
-        return this.requireValue(Keys.BOAT_TYPE).asMutable();
-    }
-
     /**
      * {@link Keys#IS_IN_WATER}
      *

src/main/java/org/spongepowered/api/entity/vehicle/Boat.java

@@ -57,6 +57,8 @@ public final class MovementTypes {
 
     public static final DefaultedRegistryReference<MovementType> PORTAL = MovementTypes.key(ResourceKey.sponge("portal"));
 
+    public static final DefaultedRegistryReference<MovementType> SPECTATOR = MovementTypes.key(ResourceKey.sponge("spectator"));
+
     // SORTFIELDS:OFF
 
     // @formatter:on