diff options
| -rw-r--r-- | patches/api/0492-Add-recipeBrewTime.patch | 158 | ||||
| -rw-r--r-- | patches/server/1061-Add-recipeBrewTime.patch | 181 |
2 files changed, 339 insertions, 0 deletions
diff --git a/patches/api/0492-Add-recipeBrewTime.patch b/patches/api/0492-Add-recipeBrewTime.patch new file mode 100644 index 0000000000..f6b6f5b0ca --- /dev/null +++ b/patches/api/0492-Add-recipeBrewTime.patch @@ -0,0 +1,158 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tamion <[email protected]> +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 +index 206e9befae9863f99f44ac0e1629c2af1905787a..bb7de0b1c602e96f5b34d44a9ffa8c04e4ab5e0e 100644 +--- a/src/main/java/org/bukkit/inventory/view/BrewingStandView.java ++++ b/src/main/java/org/bukkit/inventory/view/BrewingStandView.java +@@ -39,4 +39,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 + } diff --git a/patches/server/1061-Add-recipeBrewTime.patch b/patches/server/1061-Add-recipeBrewTime.patch new file mode 100644 index 0000000000..34513fe035 --- /dev/null +++ b/patches/server/1061-Add-recipeBrewTime.patch @@ -0,0 +1,181 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tamion <[email protected]> +Date: Sun, 15 Sep 2024 19:17:12 +0200 +Subject: [PATCH] Add recipeBrewTime + +== AT == +public net.minecraft.world.inventory.BrewingStandMenu brewingStandData + +diff --git a/src/main/java/io/papermc/paper/inventory/BrewingSimpleContainerData.java b/src/main/java/io/papermc/paper/inventory/BrewingSimpleContainerData.java +new file mode 100644 +index 0000000000000000000000000000000000000000..84dead75191634c3aa6031781a2ff3087171793b +--- /dev/null ++++ b/src/main/java/io/papermc/paper/inventory/BrewingSimpleContainerData.java +@@ -0,0 +1,11 @@ ++package io.papermc.paper.inventory; ++ ++import net.minecraft.world.inventory.SimpleContainerData; ++ ++public class BrewingSimpleContainerData extends SimpleContainerData { ++ ++ public BrewingSimpleContainerData() { ++ super(3); ++ this.set(2, 400); ++ } ++} +diff --git a/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java b/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java +index 68c529cb38d61cd3a0f39bef0f666057fc219c9b..6ec207e91f93b3ab625515dc75367ba399818876 100644 +--- a/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java ++++ b/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java +@@ -41,14 +41,14 @@ public class BrewingStandMenu extends AbstractContainerMenu { + // CraftBukkit end + + public BrewingStandMenu(int syncId, Inventory playerInventory) { +- this(syncId, playerInventory, new SimpleContainer(5), new SimpleContainerData(2)); ++ this(syncId, playerInventory, new SimpleContainer(5), new io.papermc.paper.inventory.BrewingSimpleContainerData()); // Paper - Add totalBrewTime + } + + public BrewingStandMenu(int syncId, Inventory playerInventory, Container inventory, ContainerData propertyDelegate) { + super(MenuType.BREWING_STAND, syncId); + this.player = playerInventory; // CraftBukkit + checkContainerSize(inventory, 5); +- checkContainerDataCount(propertyDelegate, 2); ++ checkContainerDataCount(propertyDelegate, 3); // Paper - Add recipeBrewTime + this.brewingStand = inventory; + this.brewingStandData = propertyDelegate; + PotionBrewing potionbrewer = playerInventory.player.level().potionBrewing(); +@@ -60,7 +60,20 @@ public class BrewingStandMenu extends AbstractContainerMenu { + // Paper end - custom potion mixes + this.ingredientSlot = this.addSlot(new BrewingStandMenu.IngredientsSlot(potionbrewer, inventory, 3, 79, 17)); + this.addSlot(new BrewingStandMenu.FuelSlot(inventory, 4, 17, 17)); +- this.addDataSlots(propertyDelegate); ++ // Paper start - Add recipeBrewTime ++ this.addDataSlots(new SimpleContainerData(2) { ++ @Override ++ public int get(final int index) { ++ if (index == 0) return 400 * propertyDelegate.get(index) / propertyDelegate.get(2); ++ return propertyDelegate.get(index); ++ } ++ ++ @Override ++ public void set(final int index, final int value) { ++ propertyDelegate.set(index, value); ++ } ++ }); ++ // Paper end - Add recipeBrewTime + + int j; + +diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java +index bf2c303a314205590a2839e0f729af3a9ff40a86..0a93bacd62249bae1800ff306b8a7c765b0e5a8b 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java +@@ -49,6 +49,7 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements + public static final int NUM_DATA_VALUES = 2; + private NonNullList<ItemStack> items; + public int brewTime; ++ public int recipeBrewTime = 400; // Paper - Add recipeBrewTime + private boolean[] lastPotionCount; + private Item ingredient; + public int fuel; +@@ -99,6 +100,11 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements + case 1: + j = BrewingStandBlockEntity.this.fuel; + break; ++ // Paper start - Add recipeBrewTime ++ case 2: ++ j = BrewingStandBlockEntity.this.recipeBrewTime; ++ break; ++ // Paper end - Add recipeBrewTime + default: + j = 0; + } +@@ -114,13 +120,18 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements + break; + case 1: + BrewingStandBlockEntity.this.fuel = value; ++ // Paper start - Add recipeBrewTime ++ case 2: ++ BrewingStandBlockEntity.this.recipeBrewTime = value; ++ break; ++ // Paper end - Add recipeBrewTime + } + + } + + @Override + public int getCount() { +- return 2; ++ return 3; // Paper - Add recipeBrewTime + } + }; + } +@@ -188,7 +199,8 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements + // CraftBukkit start + BrewingStartEvent event = new BrewingStartEvent(CraftBlock.at(world, pos), CraftItemStack.asCraftMirror(itemstack1), 400); + world.getCraftServer().getPluginManager().callEvent(event); +- blockEntity.brewTime = event.getTotalBrewTime(); // 400 -> event.getTotalBrewTime() ++ blockEntity.recipeBrewTime = event.getRecipeBrewTime(); // Paper - use recipe brew time from event ++ blockEntity.brewTime = event.getBrewingTime(); // 400 -> event.getTotalBrewTime() // Paper - use brewing time from event + // CraftBukkit end + blockEntity.ingredient = itemstack1.getItem(); + setChanged(world, pos, state); +diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBrewingStand.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBrewingStand.java +index e9f55c898de827afe6c9f951cbe1b46eea5f4149..f330c17b11566102b4db430fef013101b3275bda 100644 +--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBrewingStand.java ++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBrewingStand.java +@@ -41,6 +41,19 @@ public class CraftBrewingStand extends CraftContainer<BrewingStandBlockEntity> i + this.getSnapshot().brewTime = brewTime; + } + ++ // Paper start - Add recipeBrewTime ++ @Override ++ public void setRecipeBrewTime(int recipeBrewTime) { ++ com.google.common.base.Preconditions.checkArgument(recipeBrewTime > 0, "recipeBrewTime must be positive"); ++ this.getSnapshot().recipeBrewTime = recipeBrewTime; ++ } ++ ++ @Override ++ public int getRecipeBrewTime() { ++ return this.getSnapshot().recipeBrewTime; ++ } ++ // Paper end - Add recipeBrewTime ++ + @Override + public int getFuelLevel() { + return this.getSnapshot().fuel; +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +index 674e3a827f8fb64e5c0beefb3c1874d6e8aee4e5..6d3f9d5dab6c9a2860ae31cae24310aa2d62da7c 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +@@ -163,7 +163,7 @@ public class CraftContainer extends AbstractContainerMenu { + this.delegate = new EnchantmentMenu(windowId, bottom); + break; + case BREWING: +- this.delegate = new BrewingStandMenu(windowId, bottom, top, new SimpleContainerData(2)); ++ this.delegate = new BrewingStandMenu(windowId, bottom, top, new io.papermc.paper.inventory.BrewingSimpleContainerData()); // Paper - Add recipeBrewTime + break; + case HOPPER: + this.delegate = new HopperMenu(windowId, bottom, top); +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftBrewingStandView.java b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftBrewingStandView.java +index c92e51227cf2c0046a558b012c078c46582aed44..4f60ff23422ed268ee1e76190e5bac1fc2f7cdc1 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftBrewingStandView.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftBrewingStandView.java +@@ -35,4 +35,17 @@ public class CraftBrewingStandView extends CraftInventoryView<BrewingStandMenu> + Preconditions.checkArgument(brewingTicks > 0, "The given brewing ticks must be greater than 0"); + this.container.setData(BrewingStandBlockEntity.DATA_BREW_TIME, brewingTicks); + } ++ ++ // Paper start - Add recipeBrewTime ++ @Override ++ public void setRecipeBrewTime(int recipeBrewTime) { ++ com.google.common.base.Preconditions.checkArgument(recipeBrewTime > 0, "recipeBrewTime must be positive"); ++ this.container.brewingStandData.set(2, recipeBrewTime); ++ } ++ ++ @Override ++ public int getRecipeBrewTime() { ++ return this.container.brewingStandData.get(2); ++ } ++ // Paper end - Add recipeBrewTime + } |