diff options
| author | Martin Robertz <dream-master@gmx.net> | 2022-11-13 22:26:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-13 22:26:49 +0100 |
| commit | 8127d1ecb3664aed1ddf320953f33f1c5b9c62e3 (patch) | |
| tree | ca75e02bcf8d317d0fa0e88bd3436d4cdde0966e /src/main/java/gregtech/common | |
| parent | 62ba05e40fc746e733235e62dc5075e4cc5194ec (diff) | |
| download | GT5-Unofficial-8127d1ecb3664aed1ddf320953f33f1c5b9c62e3.tar.gz GT5-Unofficial-8127d1ecb3664aed1ddf320953f33f1c5b9c62e3.tar.bz2 GT5-Unofficial-8127d1ecb3664aed1ddf320953f33f1c5b9c62e3.zip | |
Gas turbine singleblock (#1511)
* Added EV and IV single Block Gas Turbine
* BS+SA
* derp
(cherry picked from commit c8ebc2f5a8decb8e28c76e9ceb2eca0e04618c22)
* add pollution level
(cherry picked from commit ffcddc7547fa9f8f3d3235b596ead812291ff4cb)
* Set efficiency
* Texture
Co-authored-by: kuba6000 <kuba.123123.6000@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java | 30 |
2 files changed, 29 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index a89374e1b2..8db4c21dde 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -566,7 +566,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG public int mPollutionBaseDieselGeneratorPerSecond = 200; public double[] mPollutionDieselGeneratorReleasedByTier = new double[] {0.1, 1.0, 0.9, 0.8}; public int mPollutionBaseGasTurbinePerSecond = 200; - public double[] mPollutionGasTurbineReleasedByTier = new double[] {0.1, 1.0, 0.9, 0.8}; + public double[] mPollutionGasTurbineReleasedByTier = new double[] {0.1, 1.0, 0.9, 0.8, 0.7, 0.6}; public final GT_UO_DimensionList mUndergroundOil = new GT_UO_DimensionList(); public int mTicksUntilNextCraftSound = 0; public double mMagneticraftBonusOutputPercent = 0d; diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java index 6a5ee85d99..b085d82bab 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java @@ -16,6 +16,7 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat public int mEfficiency; + @Deprecated public GT_MetaTileEntity_GasTurbine(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, new String[] { "Requires flammable Gasses", @@ -24,16 +25,40 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat * GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier[aTier]) + " Pollution per second" }); + this.mEfficiency = 100 - aTier * 5; onConfigLoad(); } + public GT_MetaTileEntity_GasTurbine(int aID, String aName, String aNameRegional, int aTier, int mEfficiency) { + super(aID, aName, aNameRegional, aTier, new String[] { + "Requires flammable Gasses", + "Causes " + + (int) (GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond + * GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier[aTier]) + + " Pollution per second" + }); + this.mEfficiency = mEfficiency; + onConfigLoad(); + } + + @Deprecated public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); + this.mEfficiency = 100 - aTier * 5; onConfigLoad(); } + @Deprecated public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); + this.mEfficiency = 100 - aTier * 5; + onConfigLoad(); + } + + public GT_MetaTileEntity_GasTurbine( + String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, int mEfficiency) { + super(aName, aTier, aDescription, aTextures); + this.mEfficiency = mEfficiency; onConfigLoad(); } @@ -44,7 +69,8 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_GasTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new GT_MetaTileEntity_GasTurbine( + this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mEfficiency); } @Override @@ -59,7 +85,7 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat public void onConfigLoad() { this.mEfficiency = GregTech_API.sMachineFile.get( - ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, (100 - this.mTier * 5)); + ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, this.mEfficiency); } @Override |