Modernize burn time querying

This commit is contained in:
Vincent Lee committed 2019-10-16 16:52:34 -05:00
1 parent c09915fc20
commit 2fea94a85d
2 files changed
+4 -5

No files matched your search

@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.tileentity.FurnaceTileEntity;
import net.minecraft.tileentity.FurnaceTileEntity;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.event.ForgeEventFactory;
import vazkii.botania.common.Botania;
import vazkii.botania.common.item.block.ItemBlockMod;
@@ -17,7 +18,7 @@ public class ItemBlockBlaze extends ItemBlockMod {
@Override
public int getBurnTime(ItemStack stack) {
int blazeTime = ForgeEventFactory.getItemBurnTime(stack, FurnaceTileEntity.getBurnTimes().getOrDefault(Items.BLAZE_ROD, 0));
int blazeTime = ForgeHooks.getBurnTime(new ItemStack(Items.BLAZE_ROD));
return blazeTime * (Botania.gardenOfGlassLoaded ? 5 : 10);
}
}
@@ -25,6 +25,7 @@ import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
@@ -161,10 +162,7 @@ public class SubTileEndoflame extends TileEntityGeneratingFlower {
if (stack.isEmpty() || Block.getBlockFromItem(stack.getItem()) instanceof BlockSpreader) {
return 0;
} else {
Item item = stack.getItem();
int ret = stack.getBurnTime();
return net.minecraftforge.event.ForgeEventFactory.getItemBurnTime(stack, ret == -1
? AbstractFurnaceTileEntity.getBurnTimes().getOrDefault(item, 0) : ret);
return ForgeHooks.getBurnTime(stack);
}
}