diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2017-06-06 23:44:58 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-06-06 23:44:58 +1000 |
| commit | 9c50c40770a8abb61e9a26f597931578f085067b (patch) | |
| tree | f626a50cb119a9627c16e8b84f8db80b387dd4ff | |
| parent | 7020dc7ba5299ec9224b482f4d3705ef699a7b0c (diff) | |
| download | GT5-Unofficial-9c50c40770a8abb61e9a26f597931578f085067b.tar.gz GT5-Unofficial-9c50c40770a8abb61e9a26f597931578f085067b.tar.bz2 GT5-Unofficial-9c50c40770a8abb61e9a26f597931578f085067b.zip | |
$ Implemented a secondary boiler fuel check for vanilla items which wouldn't burn previously with Forge methods.
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java index 09b83cc46c..48e9f0408b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java @@ -13,6 +13,7 @@ import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_AdvancedBoiler; import gtPlusPlus.xmod.gregtech.api.gui.GUI_AdvancedBoiler; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; @@ -267,16 +268,27 @@ extends GT_MetaTileEntity_Boiler { public boolean isInputFuelItem(ItemStack inputItem){ int vCurrentBurnTime = 0; vCurrentBurnTime = GameRegistry.getFuelValue(inputItem); - if (vCurrentBurnTime > 0){ - return true; + if (vCurrentBurnTime <= 0){ + Utils.LOG_INFO("Invalid Boiler Fuel. Fuel:"+inputItem.getDisplayName()+" burns for "+vCurrentBurnTime); + return false; } - Utils.LOG_INFO("Invalid Boiler Fuel. Fuel:"+inputItem.getDisplayName()+" burns for "+vCurrentBurnTime); - return false; + else if (TileEntityFurnace.getItemBurnTime(inputItem) <= 0){ + return false; + } + return true; } public boolean useInputFuelItem(IGregTechTileEntity aBaseMetaTileEntity, ItemStack inputItem){ int vCurrentBurnTime = 0; vCurrentBurnTime = GameRegistry.getFuelValue(inputItem); + + if (vCurrentBurnTime <= 0){ + int furnaceTime = TileEntityFurnace.getItemBurnTime(inputItem); + if (furnaceTime > 0){ + vCurrentBurnTime = furnaceTime; + } + } + if (vCurrentBurnTime > 0){ this.mProcessingEnergy += (vCurrentBurnTime/10); if ((vCurrentBurnTime/500) > 0){ |