Burn time indicator of a furnace not working correctly after reloading the world

The bug

When you start a furnace burning and then swap out what's in the fuel slot and save and quit, the next time you load the burn time indicator will glitch. The reason for this is that the NBT file for furnaces does not store the max fuel burn time and instead dynamically gets it from the fuel slot, which may no longer contain the same item as was used to initially fuel the furnace. This can be seen in the code snippet attached.

To reproduce

1. Start furnace burning with a fuel other than a stick.

2. Allow the burn time to visibly decrease.

3. Swap the fuel with something that burns shorter than the original fuel.

4. Save and quit.

5. Reload the save.

6. Open the furnace.

7. The burn time indicator will have increased.

With particularly large differences (lava bucket to stick), the progress bar may wrap around the top of the screen and display twice (see

).

Fix

Rather than attempting to guess the total burn time of the original item, it should be saved too:

TileEntityFurnace

public void readFromNBT(NBTTagCompound compound)
    {
        super.readFromNBT(compound);
        this.furnaceItemStacks = NonNullList.<ItemStack>withSize(this.getSizeInventory(), ItemStack.EMPTY);
        ItemStackHelper.loadAllItems(compound, this.furnaceItemStacks);
        this.furnaceBurnTime = compound.getShort("BurnTime");
        this.cookTime = compound.getShort("CookTime");
        this.totalCookTime = compound.getShort("CookTimeTotal");
        //this.currentItemBurnTime = getItemBurnTime(this.furnaceItemStacks.get(1));
        this.currentItemBurnTime = compound.getShort("BurnTimeTotal"); // added

        if (compound.hasKey("CustomName", 8))
        {
            this.furnaceCustomName = compound.getString("CustomName");
        }
    }

    public NBTTagCompound writeToNBT(NBTTagCompound compound)
    {
        super.writeToNBT(compound);
        compound.setShort("BurnTime", (short)this.furnaceBurnTime);
        compound.setShort("CookTime", (short)this.cookTime);
        compound.setShort("CookTimeTotal", (short)this.totalCookTime);
        compound.setShort("BurnTimeTotal", (short)this.currentItemBurnTime); // added
        ItemStackHelper.saveAllItems(compound, this.furnaceItemStacks);

        if (this.hasCustomName())
        {
            compound.setString("CustomName", this.furnaceCustomName);
        }

        return compound;
    }