Consistently use Ticks where tick based values are used

Author: dualspiral

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

@@ -42,6 +42,7 @@
 import org.spongepowered.api.scoreboard.Scoreboard;
 import org.spongepowered.api.service.ServiceProvider;
 import org.spongepowered.api.user.UserManager;
+import org.spongepowered.api.util.Ticks;
 import org.spongepowered.api.util.locale.LocaleSource;
 import org.spongepowered.api.world.difficulty.Difficulty;
 import org.spongepowered.api.world.generation.config.WorldGenerationConfig;
@@ -278,7 +279,7 @@ public interface Server extends ForwardingAudience, Engine, LocaleSource {
      *
      * @return The number of ticks since this server started running
      */
-    int runningTimeTicks();
+    Ticks runningTimeTicks();
 
     /**
      * Gets the message channel that server-wide messages are sent through.

src/main/java/org/spongepowered/api/entity/ai/goal/builtin/creature/RangedAttackAgainstAgentGoal.java

@@ -29,6 +29,7 @@
 import org.spongepowered.api.entity.ai.goal.Goal;
 import org.spongepowered.api.entity.ai.goal.GoalBuilder;
 import org.spongepowered.api.entity.living.Ranger;
+import org.spongepowered.api.util.Ticks;
 
 /**
  * An {@link Goal} which uses the ranging aspect of the Ranger to attack
@@ -68,7 +69,7 @@ static Builder builder() {
      *
      * @return The delay in ticks between attempts to attack
      */
-    int delayBetweenAttacks();
+    Ticks delayBetweenAttacks();
 
     /**
      * The time, in ticks, this {@link Ranger} will wait before attacking
@@ -77,7 +78,7 @@ static Builder builder() {
      * @param delay The delay, in ticks
      * @return This goal, for chaining
      */
-    RangedAttackAgainstAgentGoal setDelayBetweenAttacks(int delay);
+    RangedAttackAgainstAgentGoal setDelayBetweenAttacks(Ticks delay);
 
     /**
      * Gets the radius of which the owning {@link Ranger} will attempt to
@@ -101,7 +102,7 @@ interface Builder extends GoalBuilder<Ranger, RangedAttackAgainstAgentGoal, Buil
 
         Builder moveSpeed(double speed);
 
-        Builder delayBetweenAttacks(int delay);
+        Builder delayBetweenAttacks(Ticks delay);
 
         Builder attackRadius(float radius);
     }

src/main/java/org/spongepowered/api/entity/living/player/CooldownTracker.java

@@ -25,9 +25,10 @@
 package org.spongepowered.api.entity.living.player;
 
 import org.spongepowered.api.item.ItemType;
+import org.spongepowered.api.util.Ticks;
 
+import java.util.Optional;
 import java.util.OptionalDouble;
-import java.util.OptionalInt;
 
 /**
  * Provides access to the item cooldowns of a {@link Player}.
@@ -51,7 +52,7 @@ public interface CooldownTracker {
      * @return The cooldown remaining for this item type in ticks, if not
      *     on cooldown
      */
-    OptionalInt cooldown(ItemType type);
+    Optional<Ticks> cooldown(ItemType type);
 
     /**
      * Sets the cooldown for the specified {@link ItemType} for the
@@ -62,7 +63,7 @@ public interface CooldownTracker {
      * @return False if setting the cooldown failed, possibly due to the event
      *     being cancelled
      */
-    boolean setCooldown(ItemType type, int ticks);
+    boolean setCooldown(ItemType type, Ticks ticks);
 
     /**
      * Resets the cooldown of the specified {@link ItemType} for the

src/main/java/org/spongepowered/api/event/entity/IgniteEntityEvent.java

@@ -27,6 +27,7 @@
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.event.Cancellable;
 import org.spongepowered.api.event.Event;
+import org.spongepowered.api.util.Ticks;
 
 /**
  * An event that occurs when an entity becomes ignited.
@@ -44,20 +45,20 @@ public interface IgniteEntityEvent extends Event, Cancellable {
      * Gets the original amount of fire ticks the entity will remain on fire.
      * @return The original fire ticks
      */
-    int originalFireTicks();
+    Ticks originalFireTicks();
 
     /**
      * Gets the amount of ticks the entity will remain on fire.
      *
      * @return The amount of ticks the entity will remain on fire
      */
-    int fireTicks();
+    Ticks fireTicks();
 
     /**
      * Sets the amount of ticks the entity will remain on fire.
      *
      * @param fireTicks The amount of ticks the entity will remain on fire
      */
-    void setFireTicks(int fireTicks);
+    void setFireTicks(Ticks fireTicks);
 
 }

src/main/java/org/spongepowered/api/event/entity/living/player/CooldownEvent.java

@@ -29,7 +29,9 @@
 import org.spongepowered.api.event.Cancellable;
 import org.spongepowered.api.event.Event;
 import org.spongepowered.api.item.ItemType;
+import org.spongepowered.api.util.Ticks;
 
+import java.util.Optional;
 import java.util.OptionalInt;
 
 /**
@@ -64,28 +66,28 @@ interface Set extends CooldownEvent, Cancellable {
          *
          * @return The cooldown of the item type beforehand
          */
-        OptionalInt startingCooldown();
+        Optional<Ticks> startingCooldown();
 
         /**
          * Gets the original new set cooldown at the beginning of the event.
          *
          * @return The originally set cooldown
          */
-        int originalNewCooldown();
+        Ticks originalNewCooldown();
 
         /**
          * Gets the new cooldown the item type has for the player.
          *
          * @return The new cooldown of the item type
          */
-        int newCooldown();
+        Ticks newCooldown();
 
         /**
          * Sets the new cooldown for the item type for the player.
          *
          * @param ticks The amount of ticks the cooldown should last for
          */
-        void setNewCooldown(int ticks);
+        void setNewCooldown(Ticks ticks);
 
     }
 

src/main/java/org/spongepowered/api/event/item/inventory/UseItemStackEvent.java

@@ -30,6 +30,7 @@
 import org.spongepowered.api.item.ItemType;
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
+import org.spongepowered.api.util.Ticks;
 
 /**
  * Fired when an {@link ItemStack} is used.
@@ -41,21 +42,21 @@ public interface UseItemStackEvent extends Event {
      *
      * @return The original remaining duration
      */
-    int originalRemainingDuration();
+    Ticks originalRemainingDuration();
 
     /**
      * Gets the remaining duration of {@link ItemStack} in use.
      *
      * @return The remaining duration
      */
-    int remainingDuration();
+    Ticks remainingDuration();
 
     /**
      * Sets the remaining duration of {@link ItemStack} in use.
      *
      * @param duration The remaining duration to set
      */
-    void setRemainingDuration(int duration);
+    void setRemainingDuration(Ticks duration);
 
     /**
      * Gets the {@link ItemStack} being consumed.

src/main/java/org/spongepowered/api/event/world/ChangeWeatherEvent.java

@@ -57,7 +57,7 @@ public interface ChangeWeatherEvent extends Event, Cancellable {
      * @param type The weather type
      * @param duration The custom weather duration
      */
-    default void setWeather(WeatherType type, Ticks duration) {
+    default void setWeather(final WeatherType type, final Ticks duration) {
         this.weather().setCustom(Weather.of(type, duration));
     }
 }

src/main/java/org/spongepowered/api/item/recipe/cooking/CookingRecipe.java

@@ -35,6 +35,7 @@
 import org.spongepowered.api.item.recipe.RecipeType;
 import org.spongepowered.api.item.recipe.crafting.Ingredient;
 import org.spongepowered.api.util.ResourceKeyedBuilder;
+import org.spongepowered.api.util.Ticks;
 
 import java.util.Optional;
 import java.util.function.Function;
@@ -87,7 +88,7 @@ static Builder builder() {
      *
      * @return The cooking time in ticks.
      */
-    int cookingTime();
+    Ticks cookingTime();
 
     /**
      * Returns the experience of this recipe.
@@ -117,7 +118,7 @@ interface Builder extends ResourceKeyedBuilder<RecipeRegistration, Builder> {
          *
          * @return This builder, for chaining
          */
-        default IngredientStep type(Supplier<RecipeType<CookingRecipe>> type) {
+        default IngredientStep type(final Supplier<RecipeType<CookingRecipe>> type) {
             return this.type(type.get());
         }
 
@@ -238,7 +239,7 @@ interface EndStep extends Builder,
              *
              * @return This builder, for chaining
              */
-            EndStep cookingTime(int ticks);
+            EndStep cookingTime(Ticks ticks);
 
         }
     }

src/main/java/org/spongepowered/api/world/server/storage/ServerWorldProperties.java

@@ -33,6 +33,7 @@
 import org.spongepowered.api.entity.living.trader.WanderingTrader;
 import org.spongepowered.api.util.Identifiable;
 import org.spongepowered.api.util.MinecraftDayTime;
+import org.spongepowered.api.util.Ticks;
 import org.spongepowered.api.world.SerializationBehavior;
 import org.spongepowered.api.world.WorldType;
 import org.spongepowered.api.world.difficulty.Difficulty;
@@ -229,14 +230,14 @@ public interface ServerWorldProperties extends WorldProperties, Identifiable, Re
      *
      * @return The delay, in ticks
      */
-    int wanderingTraderSpawnDelay();
+    Ticks wanderingTraderSpawnDelay();
 
     /**
      * Sets the delay before a {@link WanderingTrader} will be spawned.
      *
      * @param delay The delay, in ticks
      */
-    void setWanderingTraderSpawnDelay(int delay);
+    void setWanderingTraderSpawnDelay(Ticks delay);
 
     /**
      * Gets the chance that a {@link WanderingTrader} will be spawned, as a percentage