From 1859aef846bfa46ff5e76af50816bd5d101e4312 Mon Sep 17 00:00:00 2001 From: dNiym Date: Sun, 25 Aug 2019 17:24:51 -0400 Subject: [PATCH] Fix electric furnaces not being able to use logs. --- .../machines/ElectricFurnace.java | 78 ++++++++++--------- 1 file changed, 42 insertions(+), 36 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricFurnace.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricFurnace.java index 0db649992..12b736ab1 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricFurnace.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricFurnace.java @@ -1,36 +1,42 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines; - -import java.util.Iterator; - -import org.bukkit.Bukkit; -import org.bukkit.inventory.FurnaceRecipe; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.Recipe; - -import me.mrCookieSlime.Slimefun.Lists.RecipeType; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; - -public abstract class ElectricFurnace extends AContainer { - - public ElectricFurnace(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); - } - - @Override - public void registerDefaultRecipes() { - Iterator iterator = Bukkit.recipeIterator(); - while (iterator.hasNext()) { - Recipe r = iterator.next(); - if (r instanceof FurnaceRecipe) { - registerRecipe(4, new ItemStack[] {((FurnaceRecipe) r).getInput()}, new ItemStack[] {r.getResult()}); - } - } - } - - @Override - public String getMachineIdentifier() { - return "ELECTRIC_FURNACE"; - } - -} +package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines; + +import java.util.Iterator; + +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.Tag; +import org.bukkit.inventory.FurnaceRecipe; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.Recipe; + +import me.mrCookieSlime.Slimefun.Lists.RecipeType; +import me.mrCookieSlime.Slimefun.Objects.Category; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; + +public abstract class ElectricFurnace extends AContainer { + + public ElectricFurnace(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { + super(category, item, name, recipeType, recipe); + } + + @Override + public void registerDefaultRecipes() { + Iterator iterator = Bukkit.recipeIterator(); + while (iterator.hasNext()) { + Recipe r = iterator.next(); + if (r instanceof FurnaceRecipe) { + registerRecipe(4, new ItemStack[] {((FurnaceRecipe) r).getInput()}, new ItemStack[] {r.getResult()}); + } + } + + //Bukkit Recipe Iterator does not seem to include _LOG's of any type for charcoal... Manually adding them all. + for(Material mat:Tag.LOGS.getValues()) + registerRecipe(4, new ItemStack[] {new ItemStack(mat,1)}, new ItemStack[] {new ItemStack(Material.CHARCOAL, 1)}); + } + + @Override + public String getMachineIdentifier() { + return "ELECTRIC_FURNACE"; + } + +}