diff options
Diffstat (limited to 'src/main/java')
13 files changed, 346 insertions, 131 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index bba2b652cc..706fd0c316 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -35,6 +35,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; public class RECIPES_Machines { @@ -797,6 +798,32 @@ public class RECIPES_Machines { GregtechItemList.Large_Plasma_Turbine.get(1), 20 * 60, MaterialUtils.getVoltageForTier(7)); + if (LoadedMods.GoodGenerator) { + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(18), + GT_ModHandler.getModItem("GoodGenerator", "supercriticalFluidTurbineCasing", 1), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 4, 10101), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 8, 10101) + }, + FluidRegistry.getFluidStack("molten.adamantium alloy", 144 * 2), + GregtechItemList.Casing_Turbine_SC.get(1), + 20 * 5, + MaterialUtils.getVoltageForTier(6)); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(18), + GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 32016), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 8, 10104), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 16, 10104), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedgearGt", 4, 10104), + CI.getCircuit(7, 8) + }, + FluidRegistry.getFluidStack("molten.hikarium", 144 * 8), + GregtechItemList.Large_SCSteam_Turbine.get(1), + 20 * 60, + MaterialUtils.getVoltageForTier(7)); + } } private static void multiSolarTower() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 83e765c11b..f3b9552800 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -418,11 +418,13 @@ public enum GregtechItemList implements GregtechItemContainer { Large_HPSteam_Turbine, Large_Gas_Turbine, Large_Plasma_Turbine, + Large_SCSteam_Turbine, Casing_Turbine_Shaft, Casing_Turbine_LP, Casing_Turbine_HP, Casing_Turbine_Gas, Casing_Turbine_Plasma, + Casing_Turbine_SC, XL_HeatExchanger, Casing_XL_HeatExchanger, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java index 5973d21fc5..572d9184b3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; +import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST5; +import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST_ACTIVE5; + import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.interfaces.ITexture; @@ -20,7 +23,6 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.gui.hatches.CONTAINER_1by1_Turbine; import gtPlusPlus.xmod.gregtech.api.gui.hatches.GUI_1by1_Turbine; import gtPlusPlus.xmod.gregtech.common.StaticFields59; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.turbine.LargeTurbineTextureHandler; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -276,8 +278,8 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { private ITexture getFrontFacingTurbineTexture() { if (!mHasController) { return this.getBaseMetaTileEntity().isActive() - ? new GT_RenderedTexture(LargeTurbineTextureHandler.OVERLAY_LP_TURBINE_ACTIVE[4]) - : new GT_RenderedTexture(LargeTurbineTextureHandler.OVERLAY_LP_TURBINE[4]); + ? new GT_RenderedTexture(LARGETURBINE_ST_ACTIVE5) + : new GT_RenderedTexture(LARGETURBINE_ST5); } else { if (usingAnimations()) { if (isControllerActive()) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java index 96a4e6da82..47b9d9b093 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java @@ -59,8 +59,9 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Particle Containment Casing"); GT_LanguageManager.addStringLocalization( this.getUnlocalizedName() + ".14.name", "Reinforced Heat Exchanger Casing"); + GT_LanguageManager.addStringLocalization( + this.getUnlocalizedName() + ".15.name", "Reinforced SC Turbine Casing"); TAE.registerTexture(1, 12, new GTPP_CopiedBlockTexture(this, 6, 14)); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", ""); // Unused GregtechItemList.Casing_Turbine_Shaft.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_Turbine_LP.set(new ItemStack(this, 1, 1)); @@ -77,6 +78,7 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs GregtechItemList.Casing_Molecular_Transformer_2.set(new ItemStack(this, 1, 12)); GregtechItemList.Casing_Molecular_Transformer_3.set(new ItemStack(this, 1, 13)); GregtechItemList.Casing_XL_HeatExchanger.set(new ItemStack(this, 1, 14)); + GregtechItemList.Casing_Turbine_SC.set(new ItemStack(this, 1, 15)); } @Override @@ -123,6 +125,8 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs return TexturesGtBlock.TEXTURE_MAGIC_PANEL_B.getIcon(); case 14: return TexturesGtBlock.Casing_Material_Talonite.getIcon(); + case 15: + return TexturesGtBlock.Turbine_SC_Material_Casing.getIcon(); } return Textures.BlockIcons.RENDERING_ERROR.getIcon(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index a0e7fd0875..d92c9fb7e1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -198,6 +198,8 @@ public class TexturesGtBlock { private static final CustomIcon Internal_Casing_Talonite = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TALONITE"); public static final CustomIcon Casing_Material_Talonite = Internal_Casing_Talonite; + private static final CustomIcon Internal_Turbine_SC_Casing = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE"); + public static final CustomIcon Turbine_SC_Material_Casing = Internal_Turbine_SC_Casing; private static final CustomIcon Internal_Casing_Tumbaga = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TUMBAGA"); public static final CustomIcon Casing_Material_Tumbaga = Internal_Casing_Tumbaga; @@ -696,6 +698,25 @@ public class TexturesGtBlock { public static final CustomIcon TEXTURE_STONE_TABLET_A = new CustomIcon("metro/TEXTURE_STONE_TABLET_A"); public static final CustomIcon TEXTURE_STONE_TABLET_B = new CustomIcon("metro/TEXTURE_STONE_TABLET_B"); + public static final CustomIcon OVERLAY_SC_TURBINE1 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL1"); + public static final CustomIcon OVERLAY_SC_TURBINE2 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL2"); + public static final CustomIcon OVERLAY_SC_TURBINE3 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL3"); + public static final CustomIcon OVERLAY_SC_TURBINE4 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL4"); + public static final CustomIcon OVERLAY_SC_TURBINE5 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL5"); + public static final CustomIcon OVERLAY_SC_TURBINE6 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL6"); + public static final CustomIcon OVERLAY_SC_TURBINE7 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL7"); + public static final CustomIcon OVERLAY_SC_TURBINE8 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL8"); + public static final CustomIcon OVERLAY_SC_TURBINE9 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL9"); + + public static final CustomIcon OVERLAY_SC_TURBINE1_ACTIVE = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE1"); + public static final CustomIcon OVERLAY_SC_TURBINE2_ACTIVE = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE2"); + public static final CustomIcon OVERLAY_SC_TURBINE3_ACTIVE = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE3"); + public static final CustomIcon OVERLAY_SC_TURBINE4_ACTIVE = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE4"); + public static final CustomIcon OVERLAY_SC_TURBINE5_ACTIVE = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE5"); + public static final CustomIcon OVERLAY_SC_TURBINE6_ACTIVE = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE6"); + public static final CustomIcon OVERLAY_SC_TURBINE7_ACTIVE = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE7"); + public static final CustomIcon OVERLAY_SC_TURBINE8_ACTIVE = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE8"); + public static final CustomIcon OVERLAY_SC_TURBINE9_ACTIVE = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE9"); public static final CustomIcon TEXTURE_TECH_A = new CustomIcon("metro/TEXTURE_TECH_A"); public static final CustomIcon TEXTURE_TECH_B = new CustomIcon("metro/TEXTURE_TECH_B"); public static final CustomIcon TEXTURE_TECH_C = new CustomIcon("metro/TEXTURE_TECH_C"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java index b811f601e2..b136ad496a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java @@ -72,8 +72,8 @@ import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE6; import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE7; import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE8; import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE9; +import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.*; -import gregtech.api.enums.Textures.BlockIcons; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine; @@ -87,109 +87,133 @@ public class LargeTurbineTextureHandler { /** * LP Turbines */ - public static BlockIcons[] OVERLAY_LP_TURBINE = new BlockIcons[] { - LARGETURBINE_ST1, - LARGETURBINE_ST2, - LARGETURBINE_ST3, - LARGETURBINE_ST4, - LARGETURBINE_ST5, - LARGETURBINE_ST6, - LARGETURBINE_ST7, - LARGETURBINE_ST8, - LARGETURBINE_ST9, + public static IIcon[] OVERLAY_LP_TURBINE = new IIcon[] { + LARGETURBINE_ST1.getIcon(), + LARGETURBINE_ST2.getIcon(), + LARGETURBINE_ST3.getIcon(), + LARGETURBINE_ST4.getIcon(), + LARGETURBINE_ST5.getIcon(), + LARGETURBINE_ST6.getIcon(), + LARGETURBINE_ST7.getIcon(), + LARGETURBINE_ST8.getIcon(), + LARGETURBINE_ST9.getIcon(), }; - public static BlockIcons[] OVERLAY_LP_TURBINE_ACTIVE = new BlockIcons[] { - LARGETURBINE_ST_ACTIVE1, - LARGETURBINE_ST_ACTIVE2, - LARGETURBINE_ST_ACTIVE3, - LARGETURBINE_ST_ACTIVE4, - LARGETURBINE_ST_ACTIVE5, - LARGETURBINE_ST_ACTIVE6, - LARGETURBINE_ST_ACTIVE7, - LARGETURBINE_ST_ACTIVE8, - LARGETURBINE_ST_ACTIVE9, + public static IIcon[] OVERLAY_LP_TURBINE_ACTIVE = new IIcon[] { + LARGETURBINE_ST_ACTIVE1.getIcon(), + LARGETURBINE_ST_ACTIVE2.getIcon(), + LARGETURBINE_ST_ACTIVE3.getIcon(), + LARGETURBINE_ST_ACTIVE4.getIcon(), + LARGETURBINE_ST_ACTIVE5.getIcon(), + LARGETURBINE_ST_ACTIVE6.getIcon(), + LARGETURBINE_ST_ACTIVE7.getIcon(), + LARGETURBINE_ST_ACTIVE8.getIcon(), + LARGETURBINE_ST_ACTIVE9.getIcon(), }; /** * HP Turbines */ - public static BlockIcons[] OVERLAY_HP_TURBINE = new BlockIcons[] { - LARGETURBINE_TI1, - LARGETURBINE_TI2, - LARGETURBINE_TI3, - LARGETURBINE_TI4, - LARGETURBINE_TI5, - LARGETURBINE_TI6, - LARGETURBINE_TI7, - LARGETURBINE_TI8, - LARGETURBINE_TI9, + public static IIcon[] OVERLAY_HP_TURBINE = new IIcon[] { + LARGETURBINE_TI1.getIcon(), + LARGETURBINE_TI2.getIcon(), + LARGETURBINE_TI3.getIcon(), + LARGETURBINE_TI4.getIcon(), + LARGETURBINE_TI5.getIcon(), + LARGETURBINE_TI6.getIcon(), + LARGETURBINE_TI7.getIcon(), + LARGETURBINE_TI8.getIcon(), + LARGETURBINE_TI9.getIcon(), }; - public static BlockIcons[] OVERLAY_HP_TURBINE_ACTIVE = new BlockIcons[] { - LARGETURBINE_TI_ACTIVE1, - LARGETURBINE_TI_ACTIVE2, - LARGETURBINE_TI_ACTIVE3, - LARGETURBINE_TI_ACTIVE4, - LARGETURBINE_TI_ACTIVE5, - LARGETURBINE_TI_ACTIVE6, - LARGETURBINE_TI_ACTIVE7, - LARGETURBINE_TI_ACTIVE8, - LARGETURBINE_TI_ACTIVE9, + public static IIcon[] OVERLAY_HP_TURBINE_ACTIVE = new IIcon[] { + LARGETURBINE_TI_ACTIVE1.getIcon(), + LARGETURBINE_TI_ACTIVE2.getIcon(), + LARGETURBINE_TI_ACTIVE3.getIcon(), + LARGETURBINE_TI_ACTIVE4.getIcon(), + LARGETURBINE_TI_ACTIVE5.getIcon(), + LARGETURBINE_TI_ACTIVE6.getIcon(), + LARGETURBINE_TI_ACTIVE7.getIcon(), + LARGETURBINE_TI_ACTIVE8.getIcon(), + LARGETURBINE_TI_ACTIVE9.getIcon(), }; /** * Gas Turbines */ - public static BlockIcons[] OVERLAY_GAS_TURBINE = new BlockIcons[] { - LARGETURBINE_SS1, - LARGETURBINE_SS2, - LARGETURBINE_SS3, - LARGETURBINE_SS4, - LARGETURBINE_SS5, - LARGETURBINE_SS6, - LARGETURBINE_SS7, - LARGETURBINE_SS8, - LARGETURBINE_SS9, + public static IIcon[] OVERLAY_GAS_TURBINE = new IIcon[] { + LARGETURBINE_SS1.getIcon(), + LARGETURBINE_SS2.getIcon(), + LARGETURBINE_SS3.getIcon(), + LARGETURBINE_SS4.getIcon(), + LARGETURBINE_SS5.getIcon(), + LARGETURBINE_SS6.getIcon(), + LARGETURBINE_SS7.getIcon(), + LARGETURBINE_SS8.getIcon(), + LARGETURBINE_SS9.getIcon(), }; - public static BlockIcons[] OVERLAY_GAS_TURBINE_ACTIVE = new BlockIcons[] { - LARGETURBINE_SS_ACTIVE1, - LARGETURBINE_SS_ACTIVE2, - LARGETURBINE_SS_ACTIVE3, - LARGETURBINE_SS_ACTIVE4, - LARGETURBINE_SS_ACTIVE5, - LARGETURBINE_SS_ACTIVE6, - LARGETURBINE_SS_ACTIVE7, - LARGETURBINE_SS_ACTIVE8, - LARGETURBINE_SS_ACTIVE9, + public static IIcon[] OVERLAY_GAS_TURBINE_ACTIVE = new IIcon[] { + LARGETURBINE_SS_ACTIVE1.getIcon(), + LARGETURBINE_SS_ACTIVE2.getIcon(), + LARGETURBINE_SS_ACTIVE3.getIcon(), + LARGETURBINE_SS_ACTIVE4.getIcon(), + LARGETURBINE_SS_ACTIVE5.getIcon(), + LARGETURBINE_SS_ACTIVE6.getIcon(), + LARGETURBINE_SS_ACTIVE7.getIcon(), + LARGETURBINE_SS_ACTIVE8.getIcon(), + LARGETURBINE_SS_ACTIVE9.getIcon(), }; /** * Plasma Turbines */ - public static BlockIcons[] OVERLAY_PLASMA_TURBINE = new BlockIcons[] { - LARGETURBINE_TU1, - LARGETURBINE_TU2, - LARGETURBINE_TU3, - LARGETURBINE_TU4, - LARGETURBINE_TU5, - LARGETURBINE_TU6, - LARGETURBINE_TU7, - LARGETURBINE_TU8, - LARGETURBINE_TU9, + public static IIcon[] OVERLAY_PLASMA_TURBINE = new IIcon[] { + LARGETURBINE_TU1.getIcon(), + LARGETURBINE_TU2.getIcon(), + LARGETURBINE_TU3.getIcon(), + LARGETURBINE_TU4.getIcon(), + LARGETURBINE_TU5.getIcon(), + LARGETURBINE_TU6.getIcon(), + LARGETURBINE_TU7.getIcon(), + LARGETURBINE_TU8.getIcon(), + LARGETURBINE_TU9.getIcon(), }; - public static BlockIcons[] OVERLAY_PLASMA_TURBINE_ACTIVE = new BlockIcons[] { - LARGETURBINE_TU_ACTIVE1, - LARGETURBINE_TU_ACTIVE2, - LARGETURBINE_TU_ACTIVE3, - LARGETURBINE_TU_ACTIVE4, - LARGETURBINE_TU_ACTIVE5, - LARGETURBINE_TU_ACTIVE6, - LARGETURBINE_TU_ACTIVE7, - LARGETURBINE_TU_ACTIVE8, - LARGETURBINE_TU_ACTIVE9, + public static IIcon[] OVERLAY_PLASMA_TURBINE_ACTIVE = new IIcon[] { + LARGETURBINE_TU_ACTIVE1.getIcon(), + LARGETURBINE_TU_ACTIVE2.getIcon(), + LARGETURBINE_TU_ACTIVE3.getIcon(), + LARGETURBINE_TU_ACTIVE4.getIcon(), + LARGETURBINE_TU_ACTIVE5.getIcon(), + LARGETURBINE_TU_ACTIVE6.getIcon(), + LARGETURBINE_TU_ACTIVE7.getIcon(), + LARGETURBINE_TU_ACTIVE8.getIcon(), + LARGETURBINE_TU_ACTIVE9.getIcon(), + }; + + public static IIcon[] OVERLAY_SC_TURBINE = new IIcon[] { + OVERLAY_SC_TURBINE1.getIcon(), + OVERLAY_SC_TURBINE2.getIcon(), + OVERLAY_SC_TURBINE3.getIcon(), + OVERLAY_SC_TURBINE4.getIcon(), + OVERLAY_SC_TURBINE5.getIcon(), + OVERLAY_SC_TURBINE6.getIcon(), + OVERLAY_SC_TURBINE7.getIcon(), + OVERLAY_SC_TURBINE8.getIcon(), + OVERLAY_SC_TURBINE9.getIcon(), + }; + + public static IIcon[] OVERLAY_SC_TURBINE_ACTIVE = new IIcon[] { + OVERLAY_SC_TURBINE1_ACTIVE.getIcon(), + OVERLAY_SC_TURBINE2_ACTIVE.getIcon(), + OVERLAY_SC_TURBINE3_ACTIVE.getIcon(), + OVERLAY_SC_TURBINE4_ACTIVE.getIcon(), + OVERLAY_SC_TURBINE5_ACTIVE.getIcon(), + OVERLAY_SC_TURBINE6_ACTIVE.getIcon(), + OVERLAY_SC_TURBINE7_ACTIVE.getIcon(), + OVERLAY_SC_TURBINE8_ACTIVE.getIcon(), + OVERLAY_SC_TURBINE9_ACTIVE.getIcon(), }; public static IIcon handleCasingsGT( @@ -207,10 +231,10 @@ public class LargeTurbineTextureHandler { // 3 Gas // 4 Plasma - BlockIcons[] mGetCurrentTextureSet = null; - BlockIcons[] mGetCurrentTextureSet_ACTIVE = null; + IIcon[] mGetCurrentTextureSet = null; + IIcon[] mGetCurrentTextureSet_ACTIVE = null; - if (tMeta <= 0 || tMeta >= 5) { + if ((tMeta <= 0 || tMeta >= 5) && tMeta != 15) { return GregtechMetaSpecialMultiCasings.getStaticIcon((byte) aSide, (byte) tMeta); } else { if (tMeta == 1) { @@ -225,6 +249,9 @@ public class LargeTurbineTextureHandler { } else if (tMeta == 4) { mGetCurrentTextureSet = OVERLAY_PLASMA_TURBINE; mGetCurrentTextureSet_ACTIVE = OVERLAY_PLASMA_TURBINE_ACTIVE; + } else { + mGetCurrentTextureSet = OVERLAY_SC_TURBINE; + mGetCurrentTextureSet_ACTIVE = OVERLAY_SC_TURBINE_ACTIVE; } if (mGetCurrentTextureSet == null || mGetCurrentTextureSet_ACTIVE == null) { return GregtechMetaSpecialMultiCasings.getStaticIcon((byte) aSide, (byte) tMeta); @@ -239,9 +266,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[0].getIcon(); + return mGetCurrentTextureSet_ACTIVE[0]; } - return mGetCurrentTextureSet[0].getIcon(); + return mGetCurrentTextureSet[0]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -249,9 +276,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[3].getIcon(); + return mGetCurrentTextureSet_ACTIVE[3]; } - return mGetCurrentTextureSet[3].getIcon(); + return mGetCurrentTextureSet[3]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -259,9 +286,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[6].getIcon(); + return mGetCurrentTextureSet_ACTIVE[6]; } - return mGetCurrentTextureSet[6].getIcon(); + return mGetCurrentTextureSet[6]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -269,9 +296,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[1].getIcon(); + return mGetCurrentTextureSet_ACTIVE[1]; } - return mGetCurrentTextureSet[1].getIcon(); + return mGetCurrentTextureSet[1]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -279,9 +306,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[7].getIcon(); + return mGetCurrentTextureSet_ACTIVE[7]; } - return mGetCurrentTextureSet[7].getIcon(); + return mGetCurrentTextureSet[7]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -289,9 +316,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[8].getIcon(); + return mGetCurrentTextureSet_ACTIVE[8]; } - return mGetCurrentTextureSet[8].getIcon(); + return mGetCurrentTextureSet[8]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -299,9 +326,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[5].getIcon(); + return mGetCurrentTextureSet_ACTIVE[5]; } - return mGetCurrentTextureSet[5].getIcon(); + return mGetCurrentTextureSet[5]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -309,9 +336,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[2].getIcon(); + return mGetCurrentTextureSet_ACTIVE[2]; } - return mGetCurrentTextureSet[2].getIcon(); + return mGetCurrentTextureSet[2]; } } else if ((aSide == 4) || (aSide == 5)) { TileEntity tTileEntity; @@ -322,9 +349,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[0].getIcon(); + return mGetCurrentTextureSet_ACTIVE[0]; } - return mGetCurrentTextureSet[0].getIcon(); + return mGetCurrentTextureSet[0]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -332,9 +359,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[3].getIcon(); + return mGetCurrentTextureSet_ACTIVE[3]; } - return mGetCurrentTextureSet[3].getIcon(); + return mGetCurrentTextureSet[3]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -342,9 +369,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[6].getIcon(); + return mGetCurrentTextureSet_ACTIVE[6]; } - return mGetCurrentTextureSet[6].getIcon(); + return mGetCurrentTextureSet[6]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -352,9 +379,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[1].getIcon(); + return mGetCurrentTextureSet_ACTIVE[1]; } - return mGetCurrentTextureSet[1].getIcon(); + return mGetCurrentTextureSet[1]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -362,9 +389,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[7].getIcon(); + return mGetCurrentTextureSet_ACTIVE[7]; } - return mGetCurrentTextureSet[7].getIcon(); + return mGetCurrentTextureSet[7]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -372,9 +399,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[8].getIcon(); + return mGetCurrentTextureSet_ACTIVE[8]; } - return mGetCurrentTextureSet[8].getIcon(); + return mGetCurrentTextureSet[8]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -382,9 +409,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[5].getIcon(); + return mGetCurrentTextureSet_ACTIVE[5]; } - return mGetCurrentTextureSet[5].getIcon(); + return mGetCurrentTextureSet[5]; } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) @@ -392,9 +419,9 @@ public class LargeTurbineTextureHandler { && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { if (isUsingAnimatedTexture(tTileEntity)) { - return mGetCurrentTextureSet_ACTIVE[2].getIcon(); + return mGetCurrentTextureSet_ACTIVE[2]; } - return mGetCurrentTextureSet[2].getIcon(); + return mGetCurrentTextureSet[2]; } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java index d0a7ba9da9..690ddb0919 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java @@ -36,7 +36,7 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin } @Override - public byte getCasingTextureIndex() { + public int getCasingTextureIndex() { return 58; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java index aad8b0c368..13efb8e276 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java @@ -37,7 +37,7 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur } @Override - public byte getCasingTextureIndex() { + public int getCasingTextureIndex() { return 60; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java new file mode 100644 index 0000000000..694cdf8f6b --- /dev/null +++ b/ |