Skip to content

Furnace refill fix & fix furnaceable items beeing put into any type of furnace #1345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Furnace refill fix & fix furnaceable items beeing put into any type of furnace #1345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d53d081
seperate furnace recipes by furnace type, dynamically determine isAFu…
Mar 30, 2025
9136217
allow partially empty furnaces and brewing stands to be refilled
Mar 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions src/main/java/com/sk89q/craftbook/util/InventoryUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import org.bukkit.block.ChiseledBookshelf;
import org.bukkit.block.Crafter;
import org.bukkit.block.Furnace;
import org.bukkit.block.Smoker;
import org.bukkit.block.BlastFurnace;
import org.bukkit.block.ShulkerBox;
import org.bukkit.entity.Player;
import org.bukkit.inventory.BrewerInventory;
Expand Down Expand Up @@ -89,12 +91,16 @@ public static List<ItemStack> addItemsToFurnace(Furnace furnace, ItemStack ... s
if(!ItemUtil.isStackValid(stack))
continue;

if (ItemUtil.isFurnacable(stack) && fitsInSlot(stack, furnace.getInventory().getSmelting())) {
if (((furnace instanceof Smoker && ItemUtil.isCookable(stack))
|| (furnace instanceof BlastFurnace && ItemUtil.isBlastSmeltable(stack))
|| (furnace instanceof Furnace && !(furnace instanceof Smoker)
&& !(furnace instanceof BlastFurnace) && ItemUtil.isFurnacable(stack)))
&& fitsPartiallyInSlot(stack, furnace.getInventory().getSmelting())) {
if (furnace.getInventory().getSmelting() == null)
furnace.getInventory().setSmelting(stack);
else
leftovers.add(ItemUtil.addToStack(furnace.getInventory().getSmelting(), stack));
} else if (ItemUtil.isAFuel(stack) && fitsInSlot(stack, furnace.getInventory().getFuel())) {
} else if (ItemUtil.isAFuel(stack) && fitsPartiallyInSlot(stack, furnace.getInventory().getFuel())) {
if (furnace.getInventory().getFuel() == null)
furnace.getInventory().setFuel(stack);
else
Expand Down Expand Up @@ -123,13 +129,15 @@ public static List<ItemStack> addItemsToBrewingStand(BrewingStand brewingStand,

for(ItemStack stack : stacks) {
BrewerInventory inv = brewingStand.getInventory();
if (ItemUtil.isAPotionIngredient(stack) && InventoryUtil.fitsInSlot(stack, inv.getIngredient())) {
if (ItemUtil.isAPotionIngredient(stack)
&& InventoryUtil.fitsPartiallyInSlot(stack, inv.getIngredient())) {
if (inv.getIngredient() == null) {
inv.setIngredient(stack);
} else {
leftovers.add(ItemUtil.addToStack(inv.getIngredient(), stack));
}
} else if (stack.getType() == Material.BLAZE_POWDER && InventoryUtil.fitsInSlot(stack, inv.getFuel())) {
} else if (stack.getType() == Material.BLAZE_POWDER
&& InventoryUtil.fitsPartiallyInSlot(stack, inv.getFuel())) {
if (inv.getFuel() == null) {
inv.setFuel(stack);
} else {
Expand Down Expand Up @@ -330,6 +338,18 @@ public static boolean fitsInSlot(ItemStack stack, ItemStack slot) {
return slot == null || ItemUtil.areItemsIdentical(stack, slot) && stack.getAmount() + slot.getAmount() <= stack.getMaxStackSize();
}

/**
* Checks whether the itemstack can partially stack onto the other itemstack.
*
* @param stack The stack to add.
* @param slot The base stack.
* @return whether it can be added or not.
*/
public static boolean fitsPartiallyInSlot(ItemStack stack, ItemStack slot) {

return slot == null || (ItemUtil.areItemsIdentical(stack, slot) && slot.getAmount() < stack.getMaxStackSize());
}

/**
* Checks whether the block has an inventory.
*
Expand Down
177 changes: 67 additions & 110 deletions src/main/java/com/sk89q/craftbook/util/ItemUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,35 +514,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.SMOOTH_BASALT);
case CACTUS:
return new ItemStack(Material.GREEN_DYE);
case IRON_ORE:
case RAW_IRON:
case DEEPSLATE_IRON_ORE:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case NETHER_GOLD_ORE:
case RAW_GOLD:
case DEEPSLATE_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case RAW_COPPER:
case DEEPSLATE_COPPER_ORE:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case SAND:
case RED_SAND:
return new ItemStack(Material.GLASS);
Expand All @@ -552,8 +523,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.NETHER_BRICK);
case CLAY:
return new ItemStack(Material.TERRACOTTA);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case STONE_BRICKS:
return new ItemStack(Material.CRACKED_STONE_BRICKS);
case NETHER_BRICKS:
Expand Down Expand Up @@ -592,6 +561,71 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.RED_GLAZED_TERRACOTTA);
case BLACK_TERRACOTTA:
return new ItemStack(Material.BLACK_GLAZED_TERRACOTTA);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
case RESIN_CLUMP:
return new ItemStack(Material.RESIN_BRICK);
default:
if (Tag.LOGS_THAT_BURN.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
if (Tag.LEAVES.isTagged(item.getType())) {
return new ItemStack(Material.LEAF_LITTER);
}
return null;
}
}

public static boolean isBlastSmeltable(ItemStack item) {

return getBlastSmeltedResult(item) != null;
}

public static ItemStack getBlastSmeltedResult(ItemStack item) {

switch (item.getType()) {
case IRON_ORE:
case DEEPSLATE_IRON_ORE:
case RAW_IRON:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
case DEEPSLATE_COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case DEEPSLATE_GOLD_ORE:
case RAW_GOLD:
case NETHER_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case DEEPSLATE_COPPER_ORE:
case RAW_COPPER:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case IRON_SWORD:
case IRON_PICKAXE:
case IRON_AXE:
Expand All @@ -618,22 +652,7 @@ public static ItemStack getSmeltedResult(ItemStack item) {
case GOLDEN_BOOTS:
case GOLDEN_HORSE_ARMOR:
return new ItemStack(Material.GOLD_NUGGET);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
default:
if (Tag.LOGS.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
return null;
}
}
Expand Down Expand Up @@ -700,69 +719,7 @@ public static Material getBoatFromTree(TreeSpecies treeSpecies) {
*/
public static boolean isAFuel(ItemStack item) {

switch(item.getType()) {
case COAL:
case CHARCOAL:
case COAL_BLOCK:
case WOODEN_AXE:
case WOODEN_HOE:
case WOODEN_PICKAXE:
case WOODEN_SHOVEL:
case WOODEN_SWORD:
case STICK:
case OAK_FENCE:
case OAK_FENCE_GATE:
case OAK_TRAPDOOR:
case ACACIA_TRAPDOOR:
case BIRCH_TRAPDOOR:
case DARK_OAK_TRAPDOOR:
case JUNGLE_TRAPDOOR:
case SPRUCE_TRAPDOOR:
case CRAFTING_TABLE:
case CHEST:
case TRAPPED_CHEST:
case JUKEBOX:
case NOTE_BLOCK:
case BROWN_MUSHROOM_BLOCK:
case RED_MUSHROOM_BLOCK:
case BLAZE_ROD:
case LAVA_BUCKET:
case BOOKSHELF:
case ACACIA_STAIRS:
case DARK_OAK_STAIRS:
case SPRUCE_FENCE:
case JUNGLE_FENCE:
case BIRCH_FENCE:
case ACACIA_FENCE:
case DARK_OAK_FENCE:
case SPRUCE_FENCE_GATE:
case JUNGLE_FENCE_GATE:
case BIRCH_FENCE_GATE:
case ACACIA_FENCE_GATE:
case DARK_OAK_FENCE_GATE:
case FISHING_ROD:
case BOW:
case LADDER:
case SCAFFOLDING:
case DRIED_KELP_BLOCK:
case BAMBOO:
return true;
default:
return Tag.ITEMS_BOATS.isTagged(item.getType())
|| Tag.WOODEN_DOORS.isTagged(item.getType())
|| Tag.WOOL_CARPETS.isTagged(item.getType())
|| Tag.WOODEN_BUTTONS.isTagged(item.getType())
|| Tag.ITEMS_BANNERS.isTagged(item.getType())
|| Tag.LOGS.isTagged(item.getType())
|| Tag.LEAVES.isTagged(item.getType())
|| Tag.PLANKS.isTagged(item.getType())
|| Tag.WOODEN_STAIRS.isTagged(item.getType())
|| Tag.WOODEN_SLABS.isTagged(item.getType())
|| Tag.SAPLINGS.isTagged(item.getType())
|| Tag.WOOL.isTagged(item.getType())
|| Tag.WOODEN_PRESSURE_PLATES.isTagged(item.getType())
|| Tag.SIGNS.isTagged(item.getType());
}
return item.getType().isFuel();
}

/**
Expand Down Expand Up @@ -875,7 +832,7 @@ public static List<ItemStack> getRawMaterials(Inventory inv) {

public static boolean isFurnacable(ItemStack item) {

return isCookable(item) || isSmeltable(item);
return isSmeltable(item) || isCookable(item) || isBlastSmeltable(item);
}

public static boolean isItemEdible(ItemStack item) {
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/sk89q/craftbook/util/ItemUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand Down Expand Up @@ -119,13 +120,26 @@ public void testIsCookable() {

ItemStack ingredient = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertTrue(ItemUtil.isCookable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsSmeltable() {

ItemStack ingredient = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertTrue(ItemUtil.isSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.BEDROCK, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsBlastSmeltable() {

ItemStack ingredient = newMockItemStack(Material.IRON_ORE, (byte) 0, 1);
assertTrue(ItemUtil.isBlastSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
Expand Down