aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java2
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java302
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings4.java140
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java11
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java13
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java1
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java13
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java7
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java31
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java11
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java16
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java16
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java42
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java17
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS1.pngbin0 -> 476 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS2.pngbin0 -> 494 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS3.pngbin0 -> 500 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS4.pngbin0 -> 528 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS5.pngbin0 -> 344 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS6.pngbin0 -> 521 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS7.pngbin0 -> 497 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS8.pngbin0 -> 504 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS9.pngbin0 -> 479 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE1.pngbin0 -> 623 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE1.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE2.pngbin0 -> 852 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE2.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE3.pngbin0 -> 657 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE3.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE4.pngbin0 -> 931 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE4.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.pngbin0 -> 890 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE6.pngbin0 -> 950 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE6.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE7.pngbin0 -> 633 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE7.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE8.pngbin0 -> 864 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE8.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE9.pngbin0 -> 631 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE9.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST1.pngbin0 -> 515 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST2.pngbin0 -> 586 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST3.pngbin0 -> 571 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST4.pngbin0 -> 625 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST5.pngbin0 -> 366 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST6.pngbin0 -> 652 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST7.pngbin0 -> 585 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST8.pngbin0 -> 594 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST9.pngbin0 -> 564 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE1.pngbin0 -> 761 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE1.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.pngbin0 -> 1131 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE3.pngbin0 -> 798 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE3.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.pngbin0 -> 1347 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.pngbin0 -> 949 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.pngbin0 -> 1481 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE7.pngbin0 -> 868 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE7.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.pngbin0 -> 1176 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE9.pngbin0 -> 898 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE9.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI1.pngbin0 -> 547 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI2.pngbin0 -> 530 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI3.pngbin0 -> 577 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI4.pngbin0 -> 565 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI5.pngbin0 -> 344 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI6.pngbin0 -> 554 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI7.pngbin0 -> 585 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI8.pngbin0 -> 545 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI9.pngbin0 -> 548 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE1.pngbin0 -> 693 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE1.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE2.pngbin0 -> 897 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE2.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE3.pngbin0 -> 736 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE3.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE4.pngbin0 -> 968 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE4.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.pngbin0 -> 890 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE6.pngbin0 -> 971 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE6.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE7.pngbin0 -> 732 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE7.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE8.pngbin0 -> 909 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE8.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE9.pngbin0 -> 693 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE9.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU1.pngbin0 -> 526 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU2.pngbin0 -> 519 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU3.pngbin0 -> 551 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU4.pngbin0 -> 553 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU5.pngbin0 -> 344 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU6.pngbin0 -> 543 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU7.pngbin0 -> 556 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU8.pngbin0 -> 530 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU9.pngbin0 -> 523 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE1.pngbin0 -> 684 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE1.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE2.pngbin0 -> 881 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE2.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE3.pngbin0 -> 710 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE3.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE4.pngbin0 -> 950 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE4.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.pngbin0 -> 890 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE6.pngbin0 -> 958 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE6.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE7.pngbin0 -> 697 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE7.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE8.pngbin0 -> 885 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE8.png.mcmeta3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE9.pngbin0 -> 669 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE9.png.mcmeta3
127 files changed, 631 insertions, 130 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index b394fa66a8..1b7ca84bca 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -659,7 +659,7 @@ public enum ItemList implements IItemContainer {
Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV,
Teleporter,
Cover_NeedsMaintainance,
- Casing_Turbine,
+ Casing_Turbine, Casing_Turbine1, Casing_Turbine2, Casing_Turbine3,
MobRep_LV, MobRep_MV, MobRep_HV, MobRep_EV, MobRep_IV, LargeGasTurbine, LargeHPSteamTurbine, LargePlasmaTurbine, Cover_PlayerDetector, Machine_Multi_HeatExchanger, Uraniumcell_1, Uraniumcell_2, Uraniumcell_4, Moxcell_1, Moxcell_2, Moxcell_4;
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index b272684dcb..1ac967bdc4 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -15,7 +15,7 @@ import static gregtech.api.enums.GT_Values.RES_PATH_ITEM;
public class Textures {
public enum BlockIcons implements IIconContainer, Runnable {
VOID // The Empty Texture
- , RENDERING_ERROR, PIPE_RESTRICTOR, INSULATION_FULL, INSULATION_TINY, INSULATION_SMALL, INSULATION_MEDIUM, INSULATION_LARGE, INSULATION_HUGE, CFOAM_FRESH, CFOAM_HARDENED, SOLARPANEL, SOLARPANEL_8V, SOLARPANEL_LV, SOLARPANEL_MV, SOLARPANEL_HV, SOLARPANEL_EV, SOLARPANEL_IV, SOLARPANEL_LuV, SOLARPANEL_ZPM, SOLARPANEL_UV, VENT_NORMAL, VENT_ADVANCED, COVER_WOOD_PLATE, ARROW_UP, ARROW_DOWN, ARROW_LEFT, ARROW_RIGHT, AUTOMATION_FILTER, AUTOMATION_TYPEFILTER, AUTOMATION_CHESTBUFFER, AUTOMATION_SUPERBUFFER, AUTOMATION_REGULATOR, CONCRETE_LIGHT_STONE, CONCRETE_LIGHT_COBBLE, CONCRETE_LIGHT_COBBLE_MOSSY, CONCRETE_LIGHT_BRICKS, CONCRETE_LIGHT_BRICKS_CRACKED, CONCRETE_LIGHT_BRICKS_MOSSY, CONCRETE_LIGHT_BRICKS_CHISELED, CONCRETE_LIGHT_SMOOTH, CONCRETE_DARK_STONE, CONCRETE_DARK_COBBLE, CONCRETE_DARK_COBBLE_MOSSY, CONCRETE_DARK_BRICKS, CONCRETE_DARK_BRICKS_CRACKED, CONCRETE_DARK_BRICKS_MOSSY, CONCRETE_DARK_BRICKS_CHISELED, CONCRETE_DARK_SMOOTH, GRANITE_BLACK_STONE, GRANITE_BLACK_COBBLE, GRANITE_BLACK_COBBLE_MOSSY, GRANITE_BLACK_BRICKS, GRANITE_BLACK_BRICKS_CRACKED, GRANITE_BLACK_BRICKS_MOSSY, GRANITE_BLACK_BRICKS_CHISELED, GRANITE_BLACK_SMO