diff options
9 files changed, 85 insertions, 11 deletions
diff --git a/build.gradle b/build.gradle index 030dc18539..0953aeed5c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ -//version: 1666118075 +//version: 1668274302 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. - Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates. + Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/master/build.gradle for updates. */ @@ -341,7 +341,7 @@ dependencies { annotationProcessor('org.spongepowered:mixin:0.8.5-GTNH:processor') } if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - compile('com.gtnewhorizon:gtnhmixins:2.0.1') + compile('com.gtnewhorizon:gtnhmixins:2.0.2') } } diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index f68bbb145f..8446016b12 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -738,6 +738,8 @@ public enum ItemList implements IItemContainer { Generator_Gas_Turbine_LV, Generator_Gas_Turbine_MV, Generator_Gas_Turbine_HV, + Generator_Gas_Turbine_EV, + Generator_Gas_Turbine_IV, Generator_Steam_Turbine_LV, Generator_Steam_Turbine_MV, Generator_Steam_Turbine_HV, 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 diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 75829f0014..9f73e3cb28 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -11226,14 +11226,20 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC }); ItemList.Generator_Gas_Turbine_LV.set( - new GT_MetaTileEntity_GasTurbine(1115, "basicgenerator.gasturbine.tier.01", "Basic Gas Turbine", 1) - .getStackForm(1L)); - ItemList.Generator_Gas_Turbine_MV.set( - new GT_MetaTileEntity_GasTurbine(1116, "basicgenerator.gasturbine.tier.02", "Advanced Gas Turbine", 2) + new GT_MetaTileEntity_GasTurbine(1115, "basicgenerator.gasturbine.tier.01", "Basic Gas Turbine", 1, 95) .getStackForm(1L)); + ItemList.Generator_Gas_Turbine_MV.set(new GT_MetaTileEntity_GasTurbine( + 1116, "basicgenerator.gasturbine.tier.02", "Advanced Gas Turbine", 2, 90) + .getStackForm(1L)); ItemList.Generator_Gas_Turbine_HV.set( - new GT_MetaTileEntity_GasTurbine(1117, "basicgenerator.gasturbine.tier.03", "Turbo Gas Turbine", 3) + new GT_MetaTileEntity_GasTurbine(1117, "basicgenerator.gasturbine.tier.03", "Turbo Gas Turbine", 3, 85) .getStackForm(1L)); + ItemList.Generator_Gas_Turbine_EV.set(new GT_MetaTileEntity_GasTurbine( + 1118, "basicgenerator.gasturbine.tier.04", "Turbo Gas Turbine II", 4, 60) + .getStackForm(1L)); + ItemList.Generator_Gas_Turbine_IV.set(new GT_MetaTileEntity_GasTurbine( + 1119, "basicgenerator.gasturbine.tier.05", "Turbo Gas Turbine III", 5, 50) + .getStackForm(1L)); GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_LV.get(1L), bitsd, new Object[] { "CRC", @@ -11280,6 +11286,36 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_EV.get(1L), bitsd, new Object[] { + "CRC", + "RMR", + aTextMotorWire, + 'M', + ItemList.Hull_EV, + 'E', + ItemList.Electric_Motor_EV, + 'R', + OrePrefixes.rotor.get(Materials.Titanium), + 'C', + OrePrefixes.circuit.get(Materials.Data), + 'W', + OrePrefixes.cableGt01.get(Materials.Aluminium) + }); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_IV.get(1L), bitsd, new Object[] { + "CRC", + "RMR", + aTextMotorWire, + 'M', + ItemList.Hull_IV, + 'E', + ItemList.Electric_Motor_IV, + 'R', + OrePrefixes.rotor.get(Materials.TungstenSteel), + 'C', + OrePrefixes.circuit.get(Materials.Elite), + 'W', + OrePrefixes.cableGt01.get(Materials.Tungsten) + }); ItemList.Generator_Steam_Turbine_LV.set(new GT_MetaTileEntity_SteamTurbine( 1120, "basicgenerator.steamturbine.tier.01", "Basic Steam Turbine", 1) diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png Binary files differindex 8399f0b4b7..e1d4a0f009 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..dfae8cae16 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png Binary files differindex 8399f0b4b7..e1d4a0f009 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..dfae8cae16 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +}
\ No newline at end of file |
