From 7b11ab058b6125b53c2aa3916be0860654f0ace8 Mon Sep 17 00:00:00 2001 From: Tamion <70228790+notTamion@users.noreply.github.com> Date: Fri, 20 Sep 2024 17:39:22 +0200 Subject: [PATCH] Add recipeBrewTime --- .../java/org/bukkit/block/BrewingStand.java | 23 ++++++++ .../bukkit/event/block/BrewingStartEvent.java | 56 ++++++++++++++++++- .../inventory/view/BrewingStandView.java | 23 ++++++++ 3 files changed, 101 insertions(+), 1 deletion(-) diff --git a/paper-api/src/main/java/org/bukkit/block/BrewingStand.java b/paper-api/src/main/java/org/bukkit/block/BrewingStand.java index fe155f14de..7f27f0660d 100644 --- a/paper-api/src/main/java/org/bukkit/block/BrewingStand.java +++ b/paper-api/src/main/java/org/bukkit/block/BrewingStand.java @@ -22,6 +22,29 @@ public interface BrewingStand extends Container { */ void setBrewingTime(int brewTime); + // Paper start - Add recipeBrewTime + /** + * Sets the recipe time for the brewing process which is + * used to compute the progress of the brewing process with + * {@link #getBrewingTime()}. + * + * @param recipeBrewTime recipe brew time (in ticks) + * @throws IllegalArgumentException if the recipe brew time is non-positive + */ + @org.jetbrains.annotations.ApiStatus.Experimental + void setRecipeBrewTime(@org.jetbrains.annotations.Range(from = 1, to = Integer.MAX_VALUE) int recipeBrewTime); + + /** + * Gets the recipe time for the brewing process which is + * used to compute the progress of the brewing process with + * {@link #getBrewingTime()}. + * + * @return recipe brew time (in ticks) + */ + @org.jetbrains.annotations.ApiStatus.Experimental + @org.jetbrains.annotations.Range(from = 1, to = Integer.MAX_VALUE) int getRecipeBrewTime(); + // Paper end - Add recipeBrewTime + /** * Get the level of current fuel for brewing. * diff --git a/paper-api/src/main/java/org/bukkit/event/block/BrewingStartEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BrewingStartEvent.java index 43eac972f4..f193ab698e 100644 --- a/paper-api/src/main/java/org/bukkit/event/block/BrewingStartEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/block/BrewingStartEvent.java @@ -13,7 +13,9 @@ public class BrewingStartEvent extends InventoryBlockStartEvent { // Paper - remove HandlerList private int brewingTime; + private int recipeBrewTime = 400; // Paper - Add recipeBrewTime + @org.jetbrains.annotations.ApiStatus.Internal // Paper public BrewingStartEvent(@NotNull final Block furnace, @NotNull ItemStack source, int brewingTime) { super(furnace, source); this.brewingTime = brewingTime; @@ -23,7 +25,9 @@ public class BrewingStartEvent extends InventoryBlockStartEvent { * Gets the total brew time associated with this event. * * @return the total brew time + * @deprecated use {@link #getBrewingTime()} instead */ + @Deprecated(since = "1.21", forRemoval = true) // Paper public int getTotalBrewTime() { return brewingTime; } @@ -32,10 +36,60 @@ public class BrewingStartEvent extends InventoryBlockStartEvent { * Sets the total brew time for this event. * * @param brewTime the new total brew time + * @deprecated use {@link #setBrewingTime(int)} instead */ + @Deprecated(since = "1.21", forRemoval = true) // Paper public void setTotalBrewTime(int brewTime) { - this.brewingTime = brewTime; + this.setBrewingTime(brewTime); // Paper - delegate to new method } // Paper - remove HandlerList + + // Paper start - add recipeBrewTime + /** + * Gets the recipe time for the brewing process which is + * used to compute the progress of the brewing process with + * {@link #getBrewingTime()}. + * + * @return recipe brew time (in ticks) + */ + @org.jetbrains.annotations.ApiStatus.Experimental + public @org.jetbrains.annotations.Range(from = 1, to = Integer.MAX_VALUE) int getRecipeBrewTime() { + return this.recipeBrewTime; + } + + /** + * Sets the recipe time for the brewing process which is + * used to compute the progress of the brewing process with + * {@link #getBrewingTime()}. + * + * @param recipeBrewTime recipe brew time (in ticks) + * @throws IllegalArgumentException if the recipe brew time is non-positive + */ + @org.jetbrains.annotations.ApiStatus.Experimental + public void setRecipeBrewTime(@org.jetbrains.annotations.Range(from = 1, to = Integer.MAX_VALUE) int recipeBrewTime) { + com.google.common.base.Preconditions.checkArgument(recipeBrewTime > 0, "recipeBrewTime must be positive"); + this.recipeBrewTime = recipeBrewTime; + } + + /** + * Gets the amount of brewing ticks left. + * + * @return The amount of ticks left for the brewing task + */ + public @org.jetbrains.annotations.Range(from = 0, to = Integer.MAX_VALUE) int getBrewingTime() { + return this.brewingTime; + } + + /** + * Sets the brewing ticks left. + * + * @param brewTime the ticks left, which is no less than 0 + * @throws IllegalArgumentException if the ticks are less than 0 + */ + public void setBrewingTime(@org.jetbrains.annotations.Range(from = 0, to = Integer.MAX_VALUE) int brewTime) { + com.google.common.base.Preconditions.checkArgument(brewTime >= 0, "brewTime must be non-negative"); + this.brewingTime = brewTime; + } + // Paper end - add recipeBrewTime } diff --git a/paper-api/src/main/java/org/bukkit/inventory/view/BrewingStandView.java b/paper-api/src/main/java/org/bukkit/inventory/view/BrewingStandView.java index f76db2757f..ff7227bfa1 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/view/BrewingStandView.java +++ b/paper-api/src/main/java/org/bukkit/inventory/view/BrewingStandView.java @@ -45,4 +45,27 @@ public interface BrewingStandView extends InventoryView { * @throws IllegalArgumentException if the ticks are less than 0 */ void setBrewingTicks(final int ticks) throws IllegalArgumentException; + + // Paper start - Add recipeBrewTime + /** + * Sets the recipe time for the brewing process which is + * used to compute the progress of the brewing process with + * {@link #getBrewingTicks()}. + * + * @param recipeBrewTime recipe brew time (in ticks) + * @throws IllegalArgumentException if the recipe brew time is non-positive + */ + @org.jetbrains.annotations.ApiStatus.Experimental + void setRecipeBrewTime(@org.jetbrains.annotations.Range(from = 1, to = Integer.MAX_VALUE) int recipeBrewTime); + + /** + * Gets the recipe time for the brewing process which is + * used to compute the progress of the brewing process with + * {@link #getBrewingTicks()}. + * + * @return recipe brew time (in ticks) + */ + @org.jetbrains.annotations.ApiStatus.Experimental + @org.jetbrains.annotations.Range(from = 1, to = Integer.MAX_VALUE) int getRecipeBrewTime(); + // Paper end - Add recipeBrewTime }