Merge branch 'api-8' into api-9

Author: zml2008

src/main/java/org/spongepowered/api/scheduler/ScheduledUpdateList.java

@@ -27,6 +27,7 @@
 import org.spongepowered.api.block.BlockType;
 import org.spongepowered.api.fluid.FluidType;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
+import org.spongepowered.api.util.Ticks;
 import org.spongepowered.math.vector.Vector3i;
 
 import java.time.Duration;
@@ -186,6 +187,57 @@ default ScheduledUpdate<T> schedule(
      */
     ScheduledUpdate<T> schedule(int x, int y, int z, T target, Duration delay, TaskPriority priority);
 
+    /**
+     *
+     * @param x The x coordinate
+     * @param y The y coordinate
+     * @param z The z coordinate
+     * @param target The target
+     * @param ticks The delay, in {@link Ticks}
+     * @param priority The priority of the scheduled update
+     * @return The scheduled update
+     */
+    default ScheduledUpdate<T> schedule(
+            final int x, final int y, final int z, final T target, final Ticks ticks, final DefaultedRegistryReference<? extends TaskPriority> priority) {
+        return this.schedule(x, y, z, target, ticks, priority.get());
+    }
+
+    /**
+     *
+     * @param x The x coordinate
+     * @param y The y coordinate
+     * @param z The z coordinate
+     * @param target The target
+     * @param delay The delay
+     * @return The scheduled update
+     */
+    default ScheduledUpdate<T> schedule(int x, int y, int z, final T target, final Ticks delay) {
+        return this.schedule(x, y, z, target, delay, TaskPriorities.NORMAL.get());
+    }
+
+    /**
+     *
+     * @param pos The position
+     * @param target The target
+     * @param delay The delay
+     * @return The scheduled update
+     */
+    default ScheduledUpdate<T> schedule(final Vector3i pos, final T target, final Ticks delay) {
+        return this.schedule(pos.x(), pos.y(), pos.z(), target, delay, TaskPriorities.NORMAL.get());
+    }
+
+    /**
+     *
+     * @param pos The position
+     * @param target The target
+     * @param delay The delay
+     * @param priority The priority of the scheduled update
+     * @return The scheduled update
+     */
+    default ScheduledUpdate<T> schedule(final Vector3i pos, final T target, final Ticks delay, final TaskPriority priority) {
+        return this.schedule(pos.x(), pos.y(), pos.z(), target, delay, priority);
+    }
+
     /**
      *
      * @param x The x coordinate
@@ -200,6 +252,20 @@ default ScheduledUpdate<T> schedule(final int x, final int y, final int z, final
         return this.schedule(x, y, z, target, delay, priority.get());
     }
 
+    /**
+     * Schedules a new update at the desired position after the specified
+     * number of {@link Ticks}.
+     *
+     * @param x The x coordinate
+     * @param y The y coordinate
+     * @param z The z coordinate
+     * @param target The target
+     * @param delay The delay, in {@link Ticks}
+     * @param priority The priority of the scheduled update
+     * @return The scheduled update
+     */
+    ScheduledUpdate<T> schedule(int x, int y, int z, T target, Ticks delay, TaskPriority priority);
+
     /**
      * Gets whether there's a scheduled update at the desired position with the provided target.
      *

src/main/java/org/spongepowered/api/world/server/ServerLocation.java

@@ -42,6 +42,7 @@
 import org.spongepowered.api.scheduler.ScheduledUpdate;
 import org.spongepowered.api.scheduler.TaskPriority;
 import org.spongepowered.api.util.Direction;
+import org.spongepowered.api.util.Ticks;
 import org.spongepowered.api.world.BlockChangeFlag;
 import org.spongepowered.api.world.LocatableBlock;
 import org.spongepowered.api.world.Location;
@@ -259,6 +260,16 @@ static ServerLocation of(final ResourceKey worldKey, final Vector3i position) {
      */
     ScheduledUpdate<BlockType> scheduleBlockUpdate(int delay, TemporalUnit temporalUnit);
 
+    /**
+     * Adds a new {@link ScheduledUpdate} for the block at this location.
+     *
+     * @param delay The delay, in {@link Ticks}, before the scheduled update
+     *              should be processed
+     * @param priority The priority of the scheduled update
+     * @return The newly created scheduled update
+     */
+    ScheduledUpdate<BlockType> scheduleBlockUpdate(Ticks delay, TaskPriority priority);
+
     /**
      * Adds a new {@link ScheduledUpdate} for the block at this location.
      *
@@ -269,6 +280,15 @@ static ServerLocation of(final ResourceKey worldKey, final Vector3i position) {
      */
     ScheduledUpdate<BlockType> scheduleBlockUpdate(int delay, TemporalUnit temporalUnit, TaskPriority priority);
 
+    /**
+     * Adds a new {@link ScheduledUpdate} for the block at this location.
+     *
+     * @param delay The delay, in {@link Ticks}, before the scheduled update
+     *              should be processed
+     * @return The newly created scheduled update
+     */
+    ScheduledUpdate<BlockType> scheduleBlockUpdate(Ticks delay);
+
     /**
      * Adds a new {@link ScheduledUpdate} for the block at this location.
      *
@@ -312,6 +332,25 @@ static ServerLocation of(final ResourceKey worldKey, final Vector3i position) {
      */
     ScheduledUpdate<FluidType> scheduleFluidUpdate(int delay, TemporalUnit temporalUnit, TaskPriority priority);
 
+    /**
+     * Adds a new {@link ScheduledUpdate} for the fluid at this location.
+     *
+     * @param ticks The delay, in {@link Ticks}, before the scheduled update
+     *              should be processed
+     * @return The newly created scheduled update
+     */
+    ScheduledUpdate<FluidType> scheduleFluidUpdate(Ticks ticks);
+
+    /**
+     * Adds a new {@link ScheduledUpdate} for the fluid at this location.
+     *
+     * @param ticks The delay, in {@link Ticks}, before the scheduled update
+     *              should be processed
+     * @param priority The priority of the scheduled update
+     * @return The newly created scheduled update
+     */
+    ScheduledUpdate<FluidType> scheduleFluidUpdate(Ticks ticks, TaskPriority priority);
+
     /**
      * Adds a new {@link ScheduledUpdate} for the fluid at this location.
      *