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-10-25 17:08:48 +02:00
|
|
|
index 187f380eae3948eb5e37e8703db6ea785aaf833d..08b94e5e31ca835c1f9eaefbab07076c91deadeb 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-10-23 19:46:06 +02:00
|
|
|
@@ -332,7 +332,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-10-23 19:46:06 +02:00
|
|
|
index 30035d534e144bf31f94073c57b0195be7e62772..7fa1aea7942a1bc4d9779a9f8ab020ccd5566923 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-10-23 19:46:06 +02:00
|
|
|
@@ -66,7 +66,10 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2024-10-23 19:46:06 +02:00
|
|
|
if (blockEntity.cookingProgress[i] >= blockEntity.cookingTime[i]) {
|
2024-06-13 23:42:02 +02:00
|
|
|
SingleRecipeInput singlerecipeinput = new SingleRecipeInput(itemstack);
|
2024-10-23 19:46:06 +02:00
|
|
|
- ItemStack itemstack1 = (ItemStack) recipeMatchGetter.getRecipeFor(singlerecipeinput, world).map((recipeholder) -> {
|
2024-06-13 23:42:02 +02:00
|
|
|
+ // Paper start - add recipe to cook events
|
2024-10-23 19:46:06 +02:00
|
|
|
+ final Optional<RecipeHolder<CampfireCookingRecipe>> recipeHolderOptional = recipeMatchGetter.getRecipeFor(singlerecipeinput, world);
|
|
|
|
+ ItemStack itemstack1 = (ItemStack) recipeHolderOptional.map((recipeholder) -> {
|
|
|
|
+ // Paper end - add recipe to cook events
|
2024-06-13 23:42:02 +02:00
|
|
|
return ((CampfireCookingRecipe) recipeholder.value()).assemble(singlerecipeinput, world.registryAccess());
|
2021-06-11 14:02:28 +02:00
|
|
|
}).orElse(itemstack);
|
2021-06-15 04:59:31 +02:00
|
|
|
|
2024-10-23 19:46:06 +02:00
|
|
|
@@ -75,7 +78,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()) {
|