From 329912b816548dfec62e86c9870669ca86375bbe Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 30 Dec 2021 02:42:16 -0600 Subject: [PATCH] Expose isFuel and canSmelt methods to FurnaceInventory (#7181) --- ...d-canSmelt-methods-to-FurnaceInvento.patch | 35 +++++++++++++++++++ ...d-canSmelt-methods-to-FurnaceInvento.patch | 31 ++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 patches/api/0351-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch create mode 100644 patches/server/0839-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0351-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0351-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch new file mode 100644 index 0000000000..f094cdc255 --- /dev/null +++ b/patches/api/0351-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: BillyGalbreath +Date: Thu, 23 Dec 2021 15:32:40 -0600 +Subject: [PATCH] Expose isFuel and canSmelt methods to FurnaceInventory + + +diff --git a/src/main/java/org/bukkit/inventory/FurnaceInventory.java b/src/main/java/org/bukkit/inventory/FurnaceInventory.java +index 3f46259c1e0f82941ffc3038d1b51be199114abd..b9d4f05980d924a4831b1d213d4963199f5b9a5d 100644 +--- a/src/main/java/org/bukkit/inventory/FurnaceInventory.java ++++ b/src/main/java/org/bukkit/inventory/FurnaceInventory.java +@@ -53,6 +53,24 @@ public interface FurnaceInventory extends Inventory { + */ + void setSmelting(@Nullable ItemStack stack); + ++ // Paper start ++ /** ++ * Check if an item can be used as a fuel source in this furnace container ++ * ++ * @param item Item to check ++ * @return True if a valid fuel source ++ */ ++ public boolean isFuel(@Nullable ItemStack item); ++ ++ /** ++ * Check if an item can be smelted in this furnace container ++ * ++ * @param item Item to check ++ * @return True if can be smelt ++ */ ++ public boolean canSmelt(@Nullable ItemStack item); ++ // Paper end ++ + @Override + @Nullable + Furnace getHolder(); diff --git a/patches/server/0839-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0839-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch new file mode 100644 index 0000000000..9f3ee548ee --- /dev/null +++ b/patches/server/0839-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: BillyGalbreath +Date: Thu, 23 Dec 2021 15:32:50 -0600 +Subject: [PATCH] Expose isFuel and canSmelt methods to FurnaceInventory + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java +index 05c29a788c96282fc18066ae253cf0b5be37e95c..e8e53d3c7d8b1bba7d77dc0c76d242eb177ad851 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java +@@ -40,6 +40,20 @@ public class CraftInventoryFurnace extends CraftInventory implements FurnaceInve + setItem(0, stack); + } + ++ // Paper start ++ @Override ++ public boolean isFuel(ItemStack stack) { ++ return stack != null && !stack.getType().isEmpty() && AbstractFurnaceBlockEntity.isFuel(CraftItemStack.asNMSCopy(stack)); ++ } ++ ++ @Override ++ public boolean canSmelt(ItemStack stack) { ++ // data packs are always loaded in the main world ++ net.minecraft.server.level.ServerLevel world = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorlds().get(0)).getHandle(); ++ return stack != null && !stack.getType().isEmpty() && world.getRecipeManager().getRecipeFor(((AbstractFurnaceBlockEntity) this.inventory).recipeType, new net.minecraft.world.SimpleContainer(CraftItemStack.asNMSCopy(stack)), world).isPresent(); ++ } ++ // Paper end ++ + @Override + public Furnace getHolder() { + return (Furnace) inventory.getOwner();