aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorDreamMasterXXL <dream-master@gmx.net>2020-07-25 13:44:08 +0200
committerDreamMasterXXL <dream-master@gmx.net>2020-07-25 13:44:20 +0200
commitae4c28053de46d319c5a82bb06cf34fcb705b6a1 (patch)
tree7c091b72dfac5221c2d8be8c452a36fe4e48a51b /src/main/java/gregtech
parent91113b3aef300b129da5d0d3d3317ffedd765cb7 (diff)
downloadGT5-Unofficial-ae4c28053de46d319c5a82bb06cf34fcb705b6a1.tar.gz
GT5-Unofficial-ae4c28053de46d319c5a82bb06cf34fcb705b6a1.tar.bz2
GT5-Unofficial-ae4c28053de46d319c5a82bb06cf34fcb705b6a1.zip
feat(Gregtech)New Boiler Fuels
Add Cactus and Sugar Fuesl from gt++ to the single Block Boiler burn list Allow for Cactus/sugar coke/coal to be used as fuel in coal boilers. #6438 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6438 (cherry picked from commit eb900fccc4dc85dee445498c9524c9a75b5529e6)
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
index 6db4013a60..eeb8ec252f 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
@@ -137,7 +137,11 @@ public class GT_MetaTileEntity_Boiler_Bronze
(GT_Utility.isPartOfMaterials(this.mInventory[2],Materials.Charcoal) && !GT_Utility.isPartOfOrePrefix(this.mInventory[2],OrePrefixes.block)) ||
(GT_Utility.isPartOfMaterials(this.mInventory[2],Materials.Lignite) && !GT_Utility.isPartOfOrePrefix(this.mInventory[2],OrePrefixes.block)) ||
(GT_Utility.isPartOfMaterials(this.mInventory[2],Materials.Diamond) && !GT_Utility.isPartOfOrePrefix(this.mInventory[2],OrePrefixes.block)) ||
- GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke")
+ GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke") ||
+ GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCactusCharcoal") ||
+ GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCactusCoke") ||
+ GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelSugarCharcoal") ||
+ GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelSugarCoke")
) {
if ((TileEntityFurnace.getItemBurnTime(this.mInventory[2])/10) > 0) {
this.mProcessingEnergy += (TileEntityFurnace.getItemBurnTime(this.mInventory[2])/10);