Merge branch 'api-11' into api-11-be-tick

Author: MrHell228

gradle.properties

@@ -1,5 +1,5 @@
 group=org.spongepowered
-version=11.0.0-SNAPSHOT
+version=11.1.0-SNAPSHOT
 organization=SpongePowered
 projectUrl=https://www.spongepowered.org
 projectDescription=A plugin API for Minecraft: Java Edition

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

@@ -3113,6 +3113,11 @@ public final class Keys {
      */
     public static final Key<Value<Vector3i>> TARGET_POSITION = Keys.key(ResourceKey.sponge("target_position"), Vector3i.class);
 
+    /**
+     * The teleport duration of a {@link DisplayEntity}
+     */
+    public static final Key<Value<Ticks>> TELEPORT_DURATION = Keys.key(ResourceKey.sponge("teleport_duration"), Ticks.class);
+
     /**
      * The {@link TemperatureModifier} of a {@link Biome}.
      * Readonly

src/main/java/org/spongepowered/api/effect/Viewer.java

@@ -161,4 +161,52 @@ default void resetBlockChange(final Vector3i position) {
      */
     void resetBlockChange(int x, int y, int z);
 
+    /**
+     * Sends a client-only block breaking progress.
+     *
+     * @param position The position
+     * @param progress The breaking progress from 0 to 1
+     */
+    default void sendBlockProgress(final Vector3i position, final double progress) {
+        Objects.requireNonNull(position, "position");
+        this.sendBlockProgress(position.x(), position.y(), position.z(), progress);
+    }
+
+    /**
+     * Sends a client-only block breaking progress.
+     *
+     * @param x The x position
+     * @param y The y position
+     * @param z The z position
+     * @param progress The breaking progress from 0 to 1
+     */
+    void sendBlockProgress(int x, int y, int z, double progress);
+
+    /**
+     * Resets the client's view of the provided position to actual
+     * breaking progress.
+     *
+     * <p>This is useful for resetting what the client sees
+     * after sending a {@link #sendBlockProgress block progress}.</p>
+     *
+     * @param position The position
+     */
+    default void resetBlockProgress(final Vector3i position) {
+        Objects.requireNonNull(position, "position");
+        this.resetBlockProgress(position.x(), position.y(), position.z());
+    }
+
+    /**
+     * Resets the client's view of the provided position to actual
+     * breaking progress.
+     *
+     * <p>This is useful for resetting what the client sees
+     * after sending a {@link #sendBlockProgress block progress}.</p>
+     *
+     * @param x The x position
+     * @param y The y position
+     * @param z The z position
+     */
+    void resetBlockProgress(int x, int y, int z);
+
 }

src/main/java/org/spongepowered/api/entity/display/DisplayEntity.java

@@ -64,6 +64,15 @@ default Ticks interpolationDelay() {
         return this.require(Keys.INTERPOLATION_DELAY);
     }
 
+    /**
+     * Returns the duration of the teleportation
+     *
+     * @return the duration of the teleportation
+     */
+    default Ticks teleportDuration() {
+        return this.require(Keys.TELEPORT_DURATION);
+    }
+
     default BillboardType billboardType() {
         return this.require(Keys.BILLBOARD_TYPE);
     }

src/main/java/org/spongepowered/api/event/block/entity/BrewingEvent.java

@@ -25,13 +25,12 @@
 package org.spongepowered.api.event.block.entity;
 
 import org.spongepowered.api.block.entity.carrier.BrewingStand;
-import org.spongepowered.api.data.Transaction;
 import org.spongepowered.api.event.Cancellable;
 import org.spongepowered.api.event.Event;
+import org.spongepowered.api.event.item.inventory.AffectSlotEvent;
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 
-import java.util.List;
 
 /**
  * Fires during the brewing process where {@link ItemStack}s are brewed into different {@link ItemStack}s
@@ -61,15 +60,7 @@ interface Start extends BrewingEvent, Cancellable {}
     /**
      * Fired when a fuel item is consumed to refill the fuel bar.
      */
-    interface ConsumeFuel extends BrewingEvent, Cancellable {
-
-        /**
-         * The consumed fuel transaction.
-         *
-         * @return The consumed fuel transaction.
-         */
-        Transaction<ItemStackSnapshot> fuel();
-
+    interface ConsumeFuel extends BrewingEvent, AffectSlotEvent, Cancellable {
     }
 
     /**
@@ -85,14 +76,6 @@ interface Interrupt extends BrewingEvent {}
     /**
      * Fires when brewing finished.
      */
-    interface Finish extends BrewingEvent {
-
-        /**
-         * Gets an immutable {@link List} of {@link ItemStackSnapshot}s that are the result
-         * of the brew.
-         *
-         * @return The brewed items
-         */
-        List<ItemStackSnapshot> brewedItemStacks();
+    interface Finish extends BrewingEvent, AffectSlotEvent {
     }
 }

src/main/java/org/spongepowered/api/event/block/entity/CookingEvent.java

@@ -28,11 +28,10 @@
 import org.spongepowered.api.block.entity.BlockEntity;
 import org.spongepowered.api.event.Cancellable;
 import org.spongepowered.api.event.Event;
-import org.spongepowered.api.event.item.inventory.AffectItemStackEvent;
+import org.spongepowered.api.event.item.inventory.AffectSlotEvent;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 import org.spongepowered.api.item.recipe.cooking.CookingRecipe;
 
-import java.util.List;
 import java.util.Optional;
 
 /**
@@ -74,7 +73,7 @@ interface Start extends CookingEvent, Cancellable {}
      * Fires whenever fuel is consumed to refill the current burn time.
      * Canceling this event prevents fuel from being consumed in a furnace In the current burn time to 0.
      */
-    interface ConsumeFuel extends CookingEvent, AffectItemStackEvent {}
+    interface ConsumeFuel extends CookingEvent, AffectSlotEvent {}
 
     /**
      * The cooking timer ticking up or down.
@@ -95,13 +94,6 @@ interface Tick extends CookingEvent, Cancellable {
     interface Interrupt extends CookingEvent {
     }
 
-    interface Finish extends CookingEvent {
-        /**
-         * Gets an immutable {@link List} of {@link ItemStackSnapshot}s that are the result of the cooking.
-         * Always exactly one item.
-         *
-         * @return The cooked items
-         */
-        List<ItemStackSnapshot> cookedItems();
+    interface Finish extends CookingEvent, AffectSlotEvent {
     }
 }