Paper/patches/server/0560-Add-recipe-to-cook-events.patch

46 lines
3.7 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com>
Date: Wed, 6 Jan 2021 12:04:03 -0800
Subject: [PATCH] Add recipe to cook events
diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
2023-09-22 19:31:02 +02:00
index b6e31bede16f7dbc9abb6609f1c39b82883512b2..37cdb835bdc665dc5858eb570cfd08e2cdd98eab 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
2023-03-14 21:25:13 +01:00
@@ -437,7 +437,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
2021-06-11 14:02:28 +02:00
CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
2021-06-15 04:59:31 +02:00
- FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(CraftBlock.at(world, blockposition), source, result);
2023-09-22 19:31:02 +02:00
+ FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(CraftBlock.at(world, blockposition), source, result, (org.bukkit.inventory.CookingRecipe<?>) recipeholder.toBukkitRecipe()); // Paper
2021-06-15 04:59:31 +02:00
world.getCraftServer().getPluginManager().callEvent(furnaceSmeltEvent);
2021-06-11 14:02:28 +02:00
if (furnaceSmeltEvent.isCancelled()) {
diff --git a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
2023-09-22 07:41:27 +02:00
index 24e2063db933bfbc8fc1f34edb8106ae4d7c633c..04b2697ee857e714b1202d02d093b0c60f079a6f 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
2023-09-22 07:41:27 +02:00
@@ -63,8 +63,10 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
2021-06-11 14:02:28 +02:00
2021-06-15 04:59:31 +02:00
if (campfire.cookingProgress[i] >= campfire.cookingTime[i]) {
2021-06-11 14:02:28 +02:00
SimpleContainer inventorysubcontainer = new SimpleContainer(new ItemStack[]{itemstack});
2023-09-22 07:41:27 +02:00
- ItemStack itemstack1 = (ItemStack) campfire.quickCheck.getRecipeFor(inventorysubcontainer, world).map((recipeholder) -> {
- return ((CampfireCookingRecipe) recipeholder.value()).assemble(inventorysubcontainer, world.registryAccess());
+ Optional<RecipeHolder<CampfireCookingRecipe>> recipeHolderOptional = campfire.quickCheck.getRecipeFor( inventorysubcontainer, world);
+ ItemStack itemstack1 = (ItemStack) recipeHolderOptional.map((recipeholder) -> {
2021-06-11 14:02:28 +02:00
+ // Paper end
2023-09-22 07:41:27 +02:00
+ return recipeholder.value().assemble(inventorysubcontainer, world.registryAccess());
2021-06-11 14:02:28 +02:00
}).orElse(itemstack);
2021-06-15 04:59:31 +02:00
2023-09-22 07:41:27 +02:00
if (itemstack1.isItemEnabled(world.enabledFeatures())) {
@@ -72,7 +74,7 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
2022-12-07 21:16:54 +01:00
CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
2021-06-11 14:02:28 +02:00
2022-12-07 21:16:54 +01:00
- BlockCookEvent blockCookEvent = new BlockCookEvent(CraftBlock.at(world, pos), source, result);
2023-09-22 07:41:27 +02:00
+ BlockCookEvent blockCookEvent = new BlockCookEvent(CraftBlock.at(world, pos), source, result, (org.bukkit.inventory.CookingRecipe<?>) recipeHolderOptional.map(RecipeHolder::toBukkitRecipe).orElse(null)); // Paper
2022-12-07 21:16:54 +01:00
world.getCraftServer().getPluginManager().callEvent(blockCookEvent);
2021-06-11 14:02:28 +02:00
2022-12-07 21:16:54 +01:00
if (blockCookEvent.isCancelled()) {