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
|
2024-01-21 19:37:09 +01:00
|
|
|
index 8f7029e602300f68b3c8411caa2d9e0b1e8be62e..d975e80b6a7849bcbabf20bf12f7d63ab1a6335f 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
|
2024-01-14 10:46:04 +01:00
|
|
|
@@ -438,7 +438,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);
|
2024-01-19 22:13:42 +01:00
|
|
|
+ FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(CraftBlock.at(world, blockposition), source, result, (org.bukkit.inventory.CookingRecipe<?>) recipeholder.toBukkitRecipe()); // Paper - Add recipe to cook events
|
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
|
2024-01-21 19:37:09 +01:00
|
|
|
index 3a2afa6c1f6dfad7dc18d93b743cbea1eef0e4b8..5da0c6bf4f04448f640a11931b2cc5b91cf83f12 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
|
2024-01-19 22:13:42 +01:00
|
|
|
@@ -63,7 +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) -> {
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Add recipe to cook events; re-use recipeHolderOptional below
|
|
|
|
+ Optional<RecipeHolder<CampfireCookingRecipe>> recipeHolderOptional = campfire.quickCheck.getRecipeFor(inventorysubcontainer, world);
|
2023-09-22 07:41:27 +02:00
|
|
|
+ ItemStack itemstack1 = (ItemStack) recipeHolderOptional.map((recipeholder) -> {
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Add recipe to cook events
|
|
|
|
return ((CampfireCookingRecipe) recipeholder.value()).assemble(inventorysubcontainer, world.registryAccess());
|
2021-06-11 14:02:28 +02:00
|
|
|
}).orElse(itemstack);
|
2021-06-15 04:59:31 +02:00
|
|
|
|
2024-01-19 22:13:42 +01:00
|
|
|
@@ -72,7 +75,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);
|
2024-01-19 22:13:42 +01:00
|
|
|
+ BlockCookEvent blockCookEvent = new BlockCookEvent(CraftBlock.at(world, pos), source, result, (org.bukkit.inventory.CookingRecipe<?>) recipeHolderOptional.map(RecipeHolder::toBukkitRecipe).orElse(null)); // Paper - Add recipe to cook events
|
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()) {
|