testserver/patches/server/0586-Add-recipe-to-cook-eve...

44 lines
3.4 KiB
Diff
Raw Normal View History

2021-06-11 12:02:28 +00: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
2022-06-08 07:40:34 +00:00
index 1cc2c13ab07b9dc4492cec55314e12d7536d5453..9a40839ccedd6a39c2b8755e29f31a4f626fe15d 100644
2021-06-11 12:02:28 +00: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
2022-06-08 07:40:34 +00:00
@@ -442,7 +442,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
2021-06-11 12:02:28 +00:00
CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
2021-06-15 02:59:31 +00:00
- FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(CraftBlock.at(world, blockposition), source, result);
+ FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(CraftBlock.at(world, blockposition), source, result, (org.bukkit.inventory.CookingRecipe<?>) irecipe.toBukkitRecipe()); // Paper
world.getCraftServer().getPluginManager().callEvent(furnaceSmeltEvent);
2021-06-11 12:02:28 +00: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
2022-06-08 07:40:34 +00:00
index 003a66064c666db974c2b36f6579a87e1ad28685..18b22efe9f5335bb49aa0e899727d1911dc20718 100644
2021-06-11 12:02:28 +00: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
2022-06-08 07:40:34 +00:00
@@ -60,7 +60,9 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
2021-06-11 12:02:28 +00:00
2021-06-15 02:59:31 +00:00
if (campfire.cookingProgress[i] >= campfire.cookingTime[i]) {
2021-06-11 12:02:28 +00:00
SimpleContainer inventorysubcontainer = new SimpleContainer(new ItemStack[]{itemstack});
2022-06-08 07:40:34 +00:00
- ItemStack itemstack1 = (ItemStack) campfire.quickCheck.getRecipeFor(inventorysubcontainer, world).map((recipecampfire) -> {
+ Optional<CampfireCookingRecipe> recipe = campfire.quickCheck.getRecipeFor( inventorysubcontainer, world);
2021-06-11 12:02:28 +00:00
+ ItemStack itemstack1 = (ItemStack) recipe.map((recipecampfire) -> {
+ // Paper end
return recipecampfire.assemble(inventorysubcontainer);
}).orElse(itemstack);
2021-06-15 02:59:31 +00:00
2022-06-08 07:40:34 +00:00
@@ -68,7 +70,7 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
2021-06-11 12:02:28 +00:00
CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
2021-06-15 02:59:31 +00:00
- BlockCookEvent blockCookEvent = new BlockCookEvent(CraftBlock.at(world, pos), source, result);
+ BlockCookEvent blockCookEvent = new BlockCookEvent(CraftBlock.at(world, pos), source, result, (org.bukkit.inventory.CookingRecipe<?>) recipe.map(CampfireCookingRecipe::toBukkitRecipe).orElse(null)); // Paper
world.getCraftServer().getPluginManager().callEvent(blockCookEvent);
2021-06-11 12:02:28 +00:00
if (blockCookEvent.isCancelled()) {