diff options
| author | redmage17 <raistlen888@gmail.com> | 2018-10-07 12:02:31 -0400 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-10-07 20:33:25 +0200 |
| commit | ee452b9fa5da1e927140fdf8f4581d22637d1cb9 (patch) | |
| tree | e42558121be80fb3077210a295e6bfc54616effa /src/main/java | |
| parent | 6d686863a93571eba9e6b24fc799929e44ba386a (diff) | |
| download | GT5-Unofficial-ee452b9fa5da1e927140fdf8f4581d22637d1cb9.tar.gz GT5-Unofficial-ee452b9fa5da1e927140fdf8f4581d22637d1cb9.tar.bz2 GT5-Unofficial-ee452b9fa5da1e927140fdf8f4581d22637d1cb9.zip | |
chery pick eef9513ef22c8f48b70e968c2699bb9e2f179643 [eef9513]
Add config for Small Boiler Automation (#1449)
* Add config for Small Boiler Automation
Default is off
* Update GT_Mod.java
* Update GT_Mod.java
* Update GT_MetaTileEntity_Boiler.java
Fixed retarded logic
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java | 13 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index b89ee6a9b5..1633fa361e 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -291,6 +291,7 @@ public class GT_Mod implements IGT_Mod { gregtechproxy.mSkeletonsShootGTArrows = tMainConfig.get(aTextGeneral, "SkeletonsShootGTArrows", 16).getInt(16); gregtechproxy.mFlintChance = tMainConfig.get(aTextGeneral, "FlintAndSteelChance", 30).getInt(30); gregtechproxy.mItemDespawnTime = tMainConfig.get(aTextGeneral, "ItemDespawnTime", 6000).getInt(6000); + gregtechproxy.mAllowSmallBoilerAutomation = tMainConfig.get(aTextGeneral,"AllowSmallBoilerAutomation",false).getBoolean(false); gregtechproxy.mHardMachineCasings= tMainConfig.get(aTextGeneral,"HardMachineCasings",true).getBoolean(true); gregtechproxy.mDisableVanillaOres = tMainConfig.get(aTextGeneral, "DisableVanillaOres", true).getBoolean(true); gregtechproxy.mNerfDustCrafting = tMainConfig.get(aTextGeneral, "NerfDustCrafting", true).getBoolean(true); diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 100b5016ab..bf79b49133 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -141,6 +141,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public boolean mHardcoreCables = false;
public boolean mDisableVanillaOres = true;
public boolean mHardMachineCasings = true;
+ public boolean mAllowSmallBoilerAutomation = false;
public boolean mNerfDustCrafting = true;
public boolean mSortToTheEnd = true;
public boolean mCraftingUnification = true;
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java index 96f74390b1..9b8ffbc175 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java @@ -1,5 +1,6 @@ package gregtech.common.tileentities.boilers; +import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -254,11 +255,19 @@ public abstract class GT_MetaTileEntity_Boiler } public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return false; + if (GT_Mod.gregtechproxy.mAllowSmallBoilerAutomation) + return true; + else + return false; + } public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return false; + if(GT_Mod.gregtechproxy.mAllowSmallBoilerAutomation) + return true; + else + return false; + } public void doSound(byte aIndex, double aX, double aY, double aZ) { |