aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2022-10-31 18:19:59 +0100
committerMartin Robertz <dream-master@gmx.net>2022-10-31 18:19:59 +0100
commit444c1846d07a7eec71879cf039034ef8dccc60d0 (patch)
tree93df21c520b2d5938a10acd538275528c49d3a94
parentbd979e43c20322b3d4074ff0d43171b00d00ba88 (diff)
downloadGT5-Unofficial-444c1846d07a7eec71879cf039034ef8dccc60d0.tar.gz
GT5-Unofficial-444c1846d07a7eec71879cf039034ef8dccc60d0.tar.bz2
GT5-Unofficial-444c1846d07a7eec71879cf039034ef8dccc60d0.zip
Revert "add sc steam turbine (#413)"
This reverts commit bd979e43c20322b3d4074ff0d43171b00d00ba88.
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java21
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java259
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java125
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java11
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE.pngbin278 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE1.pngbin565 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE1.png.mcmeta3
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE2.pngbin969 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE2.png.mcmeta3
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE3.pngbin650 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE3.png.mcmeta3
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE4.pngbin1079 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE4.png.mcmeta3
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE5.pngbin890 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE5.png.mcmeta3
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE6.pngbin1151 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE6.png.mcmeta3
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE7.pngbin628 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE7.png.mcmeta3
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE8.pngbin1009 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE8.png.mcmeta3
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE9.pngbin616 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE9.png.mcmeta3
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL1.pngbin342 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL2.pngbin461 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL3.pngbin383 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL4.pngbin485 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL5.pngbin413 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL6.pngbin486 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL7.pngbin392 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL8.pngbin456 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL9.pngbin364 -> 0 bytes
41 files changed, 132 insertions, 374 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 706fd0c316..bba2b652cc 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -35,7 +35,6 @@ 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 {
@@ -798,32 +797,6 @@ 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 f3b9552800..83e765c11b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -418,13 +418,11 @@ 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 de13280eb8..41433e50f9 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,8 +1,5 @@
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;
@@ -23,6 +20,7 @@ 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;
@@ -278,8 +276,8 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
private ITexture getFrontFacingTurbineTexture() {
if (!mHasController) {
return this.getBaseMetaTileEntity().isActive()
- ? TextureFactory.of(LARGETURBINE_ST_ACTIVE5)
- : TextureFactory.of(LARGETURBINE_ST5);
+ ? TextureFactory.of(LargeTurbineTextureHandler.OVERLAY_LP_TURBINE_ACTIVE[4])
+ : TextureFactory.of(LargeTurbineTextureHandler.OVERLAY_LP_TURBINE[4]);
} 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 213f4e6c1e..a0a8a3bf34 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
@@ -59,9 +59,8 @@ 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, TextureFactory.of(this, 15));
+ TAE.registerTexture(1, 12, TextureFactory.of(this, 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));
@@ -78,7 +77,6 @@ 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
@@ -125,8 +123,6 @@ 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 760186f735..67b2eef707 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,8 +198,6 @@ 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;
@@ -698,25 +696,6 @@ 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 b136ad496a..b811f601e2 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,133 +87,109 @@ public class LargeTurbineTextureHandler {
/**
* LP Turbines
*/
- 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 = 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_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(),
+ 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,
};
/**
* HP Turbines
*/
- 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 = 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_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(),
+ 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,
};
/**
* Gas Turbines
*/
- 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 = 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_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(),
+ 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,
};
/**
* Plasma Turbines
*/
- 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 = 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_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 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 handleCasingsGT(
@@ -231,10 +207,10 @@ public class LargeTurbineTextureHandler {
// 3 Gas
// 4 Plasma
- IIcon[] mGetCurrentTextureSet = null;
- IIcon[] mGetCurrentTextureSet_ACTIVE = null;
+ BlockIcons[] mGetCurrentTextureSet = null;
+ BlockIcons[] mGetCurrentTextureSet_ACTIVE = null;
- if ((tMeta <= 0 || tMeta >= 5) && tMeta != 15) {
+ if (tMeta <= 0 || tMeta >= 5) {
return GregtechMetaSpecialMultiCasings.getStaticIcon((byte) aSide, (byte) tMeta);
} else {
if (tMeta == 1) {
@@ -249,9 +225,6 @@ 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);
@@ -266,9 +239,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[0];
+ return mGetCurrentTextureSet_ACTIVE[0].getIcon();
}
- return mGetCurrentTextureSet[0];
+ return mGetCurrentTextureSet[0].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord, zCoord)))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -276,9 +249,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[3];
+ return mGetCurrentTextureSet_ACTIVE[3].getIcon();
}
- return mGetCurrentTextureSet[3];
+ return mGetCurrentTextureSet[3].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord + 1, zCoord)))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -286,9 +259,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[6];
+ return mGetCurrentTextureSet_ACTIVE[6].getIcon();
}
- return mGetCurrentTextureSet[6];
+ return mGetCurrentTextureSet[6].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord)))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -296,9 +269,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[1];
+ return mGetCurrentTextureSet_ACTIVE[1].getIcon();
}
- return mGetCurrentTextureSet[1];
+ return mGetCurrentTextureSet[1].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord)))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -306,9 +279,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[7];
+ return mGetCurrentTextureSet_ACTIVE[7].getIcon();
}
- return mGetCurrentTextureSet[7];
+ return mGetCurrentTextureSet[7].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord + 1, zCoord)))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -316,9 +289,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[8];
+ return mGetCurrentTextureSet_ACTIVE[8].getIcon();
}
- return mGetCurrentTextureSet[8];
+ return mGetCurrentTextureSet[8].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord, zCoord)))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -326,9 +299,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[5];
+ return mGetCurrentTextureSet_ACTIVE[5].getIcon();
}
- return mGetCurrentTextureSet[5];
+ return mGetCurrentTextureSet[5].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord - 1, zCoord)))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -336,9 +309,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[2];
+ return mGetCurrentTextureSet_ACTIVE[2].getIcon();
}
- return mGetCurrentTextureSet[2];
+ return mGetCurrentTextureSet[2].getIcon();
}
} else if ((aSide == 4) || (aSide == 5)) {
TileEntity tTileEntity;
@@ -349,9 +322,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[0];
+ return mGetCurrentTextureSet_ACTIVE[0].getIcon();
}
- return mGetCurrentTextureSet[0];
+ return mGetCurrentTextureSet[0].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 4 ? 1 : -1))))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -359,9 +332,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[3];
+ return mGetCurrentTextureSet_ACTIVE[3].getIcon();
}
- return mGetCurrentTextureSet[3];
+ return mGetCurrentTextureSet[3].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 4 ? 1 : -1))))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -369,9 +342,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[6];
+ return mGetCurrentTextureSet_ACTIVE[6].getIcon();
}
- return mGetCurrentTextureSet[6];
+ return mGetCurrentTextureSet[6].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord)))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -379,9 +352,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[1];
+ return mGetCurrentTextureSet_ACTIVE[1].getIcon();
}
- return mGetCurrentTextureSet[1];
+ return mGetCurrentTextureSet[1].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord)))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -389,9 +362,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[7];
+ return mGetCurrentTextureSet_ACTIVE[7].getIcon();
}
- return mGetCurrentTextureSet[7];
+ return mGetCurrentTextureSet[7].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 5 ? 1 : -1))))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -399,9 +372,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[8];
+ return mGetCurrentTextureSet_ACTIVE[8].getIcon();
}
- return mGetCurrentTextureSet[8];
+ return mGetCurrentTextureSet[8].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 5 ? 1 : -1))))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -409,9 +382,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[5];
+ return mGetCurrentTextureSet_ACTIVE[5].getIcon();
}
- return mGetCurrentTextureSet[5];
+ return mGetCurrentTextureSet[5].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord + (aSide == 5 ? 1 : -1))))
&& ((tTileEntity instanceof IGregTechTileEntity))
@@ -419,9 +392,9 @@ public class LargeTurbineTextureHandler {
&& (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()))
&& ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) {
if (isUsingAnimatedTexture(tTileEntity)) {
- return mGetCurrentTextureSet_ACTIVE[2];
+ return mGetCurrentTextureSet_ACTIVE[2].getIcon();
}
- return mGetCurrentTextureSet[2];
+ return mGetCurrentTextureSet[2].getIcon();
}
}
}
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 47c7bc9e66..dde4c1127e 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 int getCasingTextureIndex() {
+ public byte 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 7df2649ed0..c41af18a23 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 int getCasingTextureIndex() {
+ public byte 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
deleted file mode 100644
index d8a39bd213..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines;
-
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.util.math.MathUtils;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-
-public class GT_MTE_LargeTurbine_SCSteam extends GregtechMetaTileEntity_LargerTurbineBase {
-
- public GT_MTE_LargeTurbine_SCSteam(int aID, String aName, String aNameRegional) {
- super(aID, aName, aNameRegional);
- }
-
- public GT_MTE_LargeTurbine_SCSteam(String aName) {
- super(aName);
- }
-
- @Override
- public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
- return new GT_MTE_LargeTurbine_SCSteam(mName);
- }
-
- @Override
- public int getCasingMeta() {
- return 15;
- }
-
- @Override
- public int getCasingTextureIndex() {
- return 1538;
- }
-
- @Override
- protected boolean requiresOutputHatch() {
- return true;
- }
-
- @Override
- public int getPollutionPerSecond(ItemStack aStack) {
- return 0;
- }
-
- @Override
- public int getFuelValue(FluidStack aLiquid) {
- return 0;
- }
-
- @Override
- int fluidIntoPower(ArrayList<FluidStack> aFluids, long aOptFlow, int aBaseEff, float[] flowMultipliers) {
- int tEU = 0;
- int totalFlow = 0; // Byproducts are based on actual flow
- int flow = 0;
- int remainingFlow = MathUtils.safeInt((long) (aOptFlow
- * 1.25f)); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for
- // multi-hatch scenarios.
- this.realOptFlow = (double) aOptFlow * (double) flowMultipliers[0];
-
- storedFluid = 0;
- FluidStack tSCSteam = FluidRegistry.getFluidStack("supercriticalsteam", 1);
- for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) {
- if (GT_Utility.areFluidsEqual(aFluids.get(i), tSCSteam, true)) {
- flow = Math.min(aFluids.get(i).amount, remainingFlow); // try to use up w/o exceeding remainingFlow
- depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount
- this.storedFluid += aFluids.get(i).amount;
- remainingFlow -= flow; // track amount we're allowed to continue depleting from hatches
- totalFlow += flow; // track total input used
- }
- }
- if (totalFlow <= 0) return 0;
- tEU = totalFlow;
- addOutput(GT_ModHandler.getSteam(totalFlow));
- if (totalFlow != aOptFlow) {
- float efficiency = 1.0f - Math.abs((totalFlow - aOptFlow) / (float) aOptFlow);
- // if(totalFlow>aOptFlow){efficiency = 1.0f;}
- tEU *= efficiency;
- tEU = Math.max(1, MathUtils.safeInt((long) tEU * (long) aBaseEff / 10000L));
- } else {
- tEU = MathUtils.safeInt((long) tEU * (long) aBaseEff / 10000L);
- }
-
- return (int) Math.min(tEU * 100L, Integer.MAX_VALUE);
- }
-
- @Override
- public int getDamageToComponent(ItemStack aStack) {
- return 6;
- }
-
- @Override
- public String getCustomGUIResourceName() {
- return null;
- }
-
- @Override
- public String getMachineType() {
- return "Large Supercritical Steam Turbine";
- }
-
- @Override
- protected String getTurbineType() {
- return "Supercritical Steam";
- }
-
- @Override
- protected String getCasingName() {
- return "Reinforced SC Turbine Casing";
- }
-
- @Override
- protected ITexture getTextureFrontFace() {
- return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI5);
- }
-
- @Override
- protected ITexture getTextureFrontFaceActive() {
- return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI_ACTIVE5);
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
index 2f808d3db3..0702552aee 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
@@ -41,7 +41,7 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu
}
@Override
- public int getCasingTextureIndex() {
+ public byte getCasingTextureIndex() {
return 59;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
index 986ba7b51c..6cc3d57eba 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
@@ -43,7 +43,7 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb
}
@Override
- public int getCasingTextureIndex() {
+ public byte getCasingTextureIndex() {
return 16;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
index bc1639a052..d44fb475b3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
@@ -140,7 +140,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
{"ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc"},
}))
.addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta())))
- .addElement('s', lazy(t -> ofBlock(t.getShaftBlock(), t.getTurbineShaftMeta())))
+ .addElement('s', lazy(t -> ofBlock(t.getCasingBlock(), t.getTurbineShaftMeta())))
.addElement('t', lazy(t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class)
.adder(GregtechMetaTileEntity_LargerTurbineBase::addTurbineHatch)
.hatchClass(GT_MetaTileEntity_Hatch_Turbine.class)
@@ -267,11 +267,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "LargeTurbine.png");
}
- public Block getCasingBlock() {
- return ModBlocks.blockSpecialMultiCasings;
- }
-
- public final Block getShaftBlock() {
+ public final Block getCasingBlock() {
return ModBlocks.blockSpecialMultiCasings;
}
@@ -286,7 +282,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
return 0;
}
- public abstract int getCasingTextureIndex();
+ public abstract byte getCasingTextureIndex();
public abstract int getFuelValue(FluidStack aLiquid);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java
index 05993e06a6..bad00131ee 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java
@@ -1,11 +1,13 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_HeatExchanger;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.*;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_Gas;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_Plasma;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_SHSteam;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_Steam;
public class GregtechLargeTurbinesAndHeatExchanger {
@@ -29,11 +31,6 @@ public class GregtechLargeTurbinesAndHeatExchanger {
GregtechItemList.Large_Plasma_Turbine.set(
new GT_MTE_LargeTurbine_Plasma(31074, "multimachine.largerplasmaturbine", "XL Turbo Plasma Turbine")
.getStackForm(1L));
- if (LoadedMods.GoodGenerator) {
- GregtechItemList.Large_SCSteam_Turbine.set(
- new GT_MTE_LargeTurbine_SCSteam(31076, "multimachine.largerscturbine", "XL Turbo SC Steam Turbine")
- .getStackForm(1L));
- }
GregtechItemList.Hatch_Turbine_Rotor.set(
new GT_MetaTileEntity_Hatch_Turbine(30010, "hatch.turbine", "Rotor Assembly", 8).getStackForm(1L));
GregtechItemList.XL_HeatExchanger.set(new GregtechMetaTileEntity_Adv_HeatExchanger(
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE.png
deleted file mode 100644
index c654bbe779..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE1.png
deleted file mode 100644
index e9b05f8181..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE1.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE1.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE1.png.mcmeta
deleted file mode 100644
index dd1bedb120..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE1.png.mcmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "animation": {}
-}
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE2.png
deleted file mode 100644
index 07b795be97..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE2.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE2.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE2.png.mcmeta
deleted file mode 100644
index dd1bedb120..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE2.png.mcmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "animation": {}
-}
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE3.png
deleted file mode 100644
index e1ad601839..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE3.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE3.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE3.png.mcmeta
deleted file mode 100644
index dd1bedb120..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE3.png.mcmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "animation": {}
-}
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE4.png
deleted file mode 100644
index f69d8cb0ec..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE4.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE4.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE4.png.mcmeta
deleted file mode 100644
index dd1bedb120..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE4.png.mcmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "animation": {}
-}
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE5.png
deleted file mode 100644
index f863ec49e6..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE5.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE5.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE5.png.mcmeta
deleted file mode 100644
index dd1bedb120..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE5.png.mcmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "animation": {}
-}
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE6.png
deleted file mode 100644
index a61511d4c2..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE6.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE6.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE6.png.mcmeta
deleted file mode 100644
index dd1bedb120..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE6.png.mcmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "animation": {}
-}
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE7.png
deleted file mode 100644
index 73a0abe065..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE7.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE7.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE7.png.mcmeta
deleted file mode 100644
index dd1bedb120..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE7.png.mcmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "animation": {}
-}
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE8.png
deleted file mode 100644
index 269ab80e3b..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE8.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE8.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE8.png.mcmeta
deleted file mode 100644
index dd1bedb120..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE8.png.mcmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "animation": {}
-}
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE9.png
deleted file mode 100644
index 54ac28edc8..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE9.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE9.png.mcmeta
deleted file mode 100644
index dd1bedb120..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE9.png.mcmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "animation": {}
-}
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL1.png
deleted file mode 100644
index 34991094fd..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL1.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL2.png
deleted file mode 100644
index 50ce1abd9c..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL2.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL3.png
deleted file mode 100644
index c4a02dcd25..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL3.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL4.png
deleted file mode 100644
index 5955b40f1e..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL4.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL5.png
deleted file mode 100644
index 7fee9a77ad..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL5.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL6.png
deleted file mode 100644
index ff418776b6..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL6.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL7.png
deleted file mode 100644
index 59217da11f..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL7.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL8.png
deleted file mode 100644
index 3af9794005..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL8.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL9.png
deleted file mode 100644
index d121090176..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/iconsets/SC_TURBINE_IDEL9.png
+++ /dev/null
Binary files differ