From bb588e3b09040b4f9e06782000abda2504113ae4 Mon Sep 17 00:00:00 2001 From: Gabriel Harris-Rouquette Date: Sun, 8 Sep 2024 16:32:25 -0700 Subject: [PATCH] feat: update to 24w36a --- .../api/entity/living/player/CooldownTracker.java | 10 +++++----- .../api/statistic/StatisticCategories.java | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/spongepowered/api/entity/living/player/CooldownTracker.java b/src/main/java/org/spongepowered/api/entity/living/player/CooldownTracker.java index 2cc55b36fe..8d3accafeb 100644 --- a/src/main/java/org/spongepowered/api/entity/living/player/CooldownTracker.java +++ b/src/main/java/org/spongepowered/api/entity/living/player/CooldownTracker.java @@ -41,7 +41,7 @@ public interface CooldownTracker { * Checks if the specified {@link ItemType} is currently on cooldown * for the player. * - * @param type The item type to check is on cooldown + * @param stack The item type to check is on cooldown * @return Whether or not the specified item type is cooldown */ boolean hasCooldown(ItemStack stack); @@ -51,7 +51,7 @@ public interface CooldownTracker { * Gets the cooldown of the specified {@link ItemType} in ticks for the * player, or empty if the the item type is currently not on cooldown. * - * @param type The item type to get the cooldown for + * @param stack The item type to get the cooldown for * @return The cooldown remaining for this item type in ticks, if not * on cooldown */ @@ -62,7 +62,7 @@ public interface CooldownTracker { * Sets the cooldown for the specified {@link ItemType} for the * specified amount of ticks. * - * @param type The item type to set the cooldown for + * @param stack The item type to set the cooldown for * @param ticks The amount of ticks to set the item type on cooldown for * @return False if setting the cooldown failed, possibly due to the event * being cancelled @@ -74,7 +74,7 @@ public interface CooldownTracker { * Resets the cooldown of the specified {@link ItemType} for the * player. * - * @param type The item type to reset the cooldown for + * @param stack The item type to reset the cooldown for * @return False if setting the cooldown failed, possibly due to the event * being cancelled */ @@ -88,7 +88,7 @@ public interface CooldownTracker { * *

If present, this value will be between 0.0 and 1.0.

* - * @param type The item type to get the cooldown fraction remaining + * @param stack The item type to get the cooldown fraction remaining * @return The fraction of cooldown remaining for the specified item type */ OptionalDouble fractionRemaining(ItemStack stack); diff --git a/src/main/java/org/spongepowered/api/statistic/StatisticCategories.java b/src/main/java/org/spongepowered/api/statistic/StatisticCategories.java index 417704dd9f..f6e4cd600a 100644 --- a/src/main/java/org/spongepowered/api/statistic/StatisticCategories.java +++ b/src/main/java/org/spongepowered/api/statistic/StatisticCategories.java @@ -52,6 +52,7 @@ public final class StatisticCategories { public static final DefaultedRegistryReference> KILLED = StatisticCategories.typedKey(ResourceKey.minecraft("killed")); + @SuppressWarnings("rawtypes") public static final DefaultedRegistryReference> KILLED_BY = StatisticCategories.typedKey(ResourceKey.minecraft("killed_by")); public static final DefaultedRegistryReference> MINED = StatisticCategories.typedKey(ResourceKey.minecraft("mined"));