1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 14:35:11 +01:00
PaperMC/patches/api/0490-Add-recipeBrewTime.patch

159 lines
6.8 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 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
diff --git a/src/main/java/org/bukkit/block/BrewingStand.java b/src/main/java/org/bukkit/block/BrewingStand.java
index fe155f14de7f7efb519f0585897ef43ee6c16bb9..7f27f0660d5487689eb77c8617951d708452c4e1 100644
--- a/src/main/java/org/bukkit/block/BrewingStand.java
+++ b/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/src/main/java/org/bukkit/event/block/BrewingStartEvent.java b/src/main/java/org/bukkit/event/block/BrewingStartEvent.java
index 43eac972f45d1cbb6278b048f8e6d7882c0aabeb..f193ab698edc548ec7fad89a82d03f39bb6e80e0 100644
--- a/src/main/java/org/bukkit/event/block/BrewingStartEvent.java
+++ b/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/src/main/java/org/bukkit/inventory/view/BrewingStandView.java b/src/main/java/org/bukkit/inventory/view/BrewingStandView.java
Updated Upstream (Bukkit/CraftBukkit) (#11501) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: bb4e97c6 Add support for Java 23 bc6874dd Bump asm to 9.7.1 50e8a00b PR-1064: Add specific getTopInventory methods for InventoryView derivatives 758b0a0f SPIGOT-7911: Fix Location#isWorldLoaded() for re-loaded worlds 133a64a7 Improve Registry#getOrThrow messages be0f5957 PR-1058: Add tests for Minecraft registry <-> Bukkit fields d1b31df2 PR-1062: Clarify BeaconView documentation 3fab4384 PR-1060: Cache Material to BlockType and ItemType conversion 967a7301 SPIGOT-7906: Increase YAML nesting limit to 100 6ecf033d SPIGOT-7899: Smithing recipes don't require inputs CraftBukkit Changes: 0a7bd6c81 PR-1493: Improve reroute performance and add some tests 54941524c Add support for Java 23 f4d957fff SPIGOT-7915: Fix World#getKeepSpawnInMemory() using Spawn Radius rather than Spawn Chunk Radius ded183674 Fix HIDE_ENCHANTS flag in items without enchantments 308785a0a Bump asm to 9.7.1 and re-add ClassReader to ClassWriter 72ce823cd PR-1487: Add specific getTopInventory methods for InventoryView derivatives 11a5e840c SPIGOT-7907, PR-1484: Improve merchant recipe item matching behavior to more closely align with older versions 45b66f7e4 SPIGOT-7909: Always set HIDE_ENCHANTS flag to item if flag is set 963459791 Increase outdated build delay fc5b2d75f SPIGOT-7910: Fix launching breeze wind charge from API and improve dispenser launch API c7d6428f2 SPIGOT-7856, PR-1483: End platform not dropping items after replacing blocks 2a5572b52 SPIGOT-7780, PR-1482: Cannot edit chunks during unload event 527041ab5 SPIGOT-7902, PR-1477: Fix CraftMetaPotion#hasCustomEffects() does not check if customEffects (List) is empty 5529a1769 Implement base methods for tags 30fbdbaaf Improve Registry#getOrThrow messages 6b71a7322 PR-1475: Add tests for Minecraft registry <-> Bukkit fields 5f24c255c SPIGOT-7908: Mark junit-platform-suite-engine as test scope e4c92ef65 PR-1473: Change tests to use suites, to run tests in different environments and feature flags d25e1e722 PR-1481: Fix BeaconView#set[X]Effect(null) d69a05362 PR-1480: Fix PerMaterialTest#isEdible test running for legacy materials bb3284a89 PR-1479: Use custom #isBlock method in legacy init instead of the one in Material, since it relies on legacy being init 98c57cbbe SPIGOT-7904: Fix NPE for PlayerItemBreakEvent f35bae9ec Fix missing hasJukeboxPlayable 8a6f8b6d8 SPIGOT-7881: CTRL+Pick Block saves position data into item 7913b3be7 SPIGOT-7899: Smithing recipes don't require inputs
2024-10-21 00:06:54 +02:00
index f76db2757f6388265b7fed0f3d1c363ea4f01052..ff7227bfa13cba497ba404cdd7493f911377fab6 100644
--- a/src/main/java/org/bukkit/inventory/view/BrewingStandView.java
+++ b/src/main/java/org/bukkit/inventory/view/BrewingStandView.java
Updated Upstream (Bukkit/CraftBukkit) (#11501) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: bb4e97c6 Add support for Java 23 bc6874dd Bump asm to 9.7.1 50e8a00b PR-1064: Add specific getTopInventory methods for InventoryView derivatives 758b0a0f SPIGOT-7911: Fix Location#isWorldLoaded() for re-loaded worlds 133a64a7 Improve Registry#getOrThrow messages be0f5957 PR-1058: Add tests for Minecraft registry <-> Bukkit fields d1b31df2 PR-1062: Clarify BeaconView documentation 3fab4384 PR-1060: Cache Material to BlockType and ItemType conversion 967a7301 SPIGOT-7906: Increase YAML nesting limit to 100 6ecf033d SPIGOT-7899: Smithing recipes don't require inputs CraftBukkit Changes: 0a7bd6c81 PR-1493: Improve reroute performance and add some tests 54941524c Add support for Java 23 f4d957fff SPIGOT-7915: Fix World#getKeepSpawnInMemory() using Spawn Radius rather than Spawn Chunk Radius ded183674 Fix HIDE_ENCHANTS flag in items without enchantments 308785a0a Bump asm to 9.7.1 and re-add ClassReader to ClassWriter 72ce823cd PR-1487: Add specific getTopInventory methods for InventoryView derivatives 11a5e840c SPIGOT-7907, PR-1484: Improve merchant recipe item matching behavior to more closely align with older versions 45b66f7e4 SPIGOT-7909: Always set HIDE_ENCHANTS flag to item if flag is set 963459791 Increase outdated build delay fc5b2d75f SPIGOT-7910: Fix launching breeze wind charge from API and improve dispenser launch API c7d6428f2 SPIGOT-7856, PR-1483: End platform not dropping items after replacing blocks 2a5572b52 SPIGOT-7780, PR-1482: Cannot edit chunks during unload event 527041ab5 SPIGOT-7902, PR-1477: Fix CraftMetaPotion#hasCustomEffects() does not check if customEffects (List) is empty 5529a1769 Implement base methods for tags 30fbdbaaf Improve Registry#getOrThrow messages 6b71a7322 PR-1475: Add tests for Minecraft registry <-> Bukkit fields 5f24c255c SPIGOT-7908: Mark junit-platform-suite-engine as test scope e4c92ef65 PR-1473: Change tests to use suites, to run tests in different environments and feature flags d25e1e722 PR-1481: Fix BeaconView#set[X]Effect(null) d69a05362 PR-1480: Fix PerMaterialTest#isEdible test running for legacy materials bb3284a89 PR-1479: Use custom #isBlock method in legacy init instead of the one in Material, since it relies on legacy being init 98c57cbbe SPIGOT-7904: Fix NPE for PlayerItemBreakEvent f35bae9ec Fix missing hasJukeboxPlayable 8a6f8b6d8 SPIGOT-7881: CTRL+Pick Block saves position data into item 7913b3be7 SPIGOT-7899: Smithing recipes don't require inputs
2024-10-21 00:06:54 +02:00
@@ -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
}