Improve furnace fuel handling (#4083)

This commit is contained in:
mezz authored and GitHub committed 2017-07-03 12:54:01 -07:00
1 parent e1a2bcf902
commit c1ae2cdbf2
9 files changed
+274 -15

No files matched your search

@@ -19,8 +19,14 @@
package net.minecraftforge.fml.common;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.furnace.FurnaceFuelBurnTimeEvent;
/**
* @deprecated set your item's {@link Item#getItemBurnTime(ItemStack)} or subscribe to {@link FurnaceFuelBurnTimeEvent} instead.
*/
@Deprecated
public interface IFuelHandler
{
int getBurnTime(ItemStack fuel);
@@ -37,7 +37,6 @@ import net.minecraft.command.EntitySelector;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.Entity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.item.crafting.Ingredient;
@@ -56,6 +55,8 @@ import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.common.crafting.CraftingHelper.ShapedPrimer;
import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.event.furnace.FurnaceFuelBurnTimeEvent;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.IFuelHandler;
import net.minecraftforge.fml.common.IWorldGenerator;
@@ -65,8 +66,6 @@ import net.minecraftforge.registries.IForgeRegistryEntry;
import net.minecraftforge.registries.RegistryManager;
import net.minecraftforge.fml.common.IEntitySelectorFactory;
import org.apache.logging.log4j.Level;
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -237,12 +236,29 @@ public class GameRegistry
TileEntity.register(key, tileEntityClass);
}
/**
* @deprecated set your item's {@link Item#getItemBurnTime(ItemStack)} or subscribe to {@link FurnaceFuelBurnTimeEvent} instead.
*/
@Deprecated
public static void registerFuelHandler(IFuelHandler handler)
{
fuelHandlers.add(handler);
}
/**
* @deprecated use {@link ForgeEventFactory#getItemBurnTime(ItemStack)}
*/
@Deprecated
public static int getFuelValue(@Nonnull ItemStack itemStack)
{
return ForgeEventFactory.getItemBurnTime(itemStack);
}
/**
* @deprecated use {@link ForgeEventFactory#getItemBurnTime(ItemStack)}
*/
@Deprecated
public static int getFuelValueLegacy(@Nonnull ItemStack itemStack)
{
int fuelValue = 0;
for (IFuelHandler handler : fuelHandlers)