From 12a1d1c46ee02ba437a275cb9c9554db3f38fa8e Mon Sep 17 00:00:00 2001 From: Muramasa Date: Tue, 19 Apr 2016 23:17:31 +0100 Subject: Main Commit --- src/main/java/gregtech/api/enums/ItemList.java | 2 +- .../gregtech/common/blocks/GT_Block_Casings4.java | 138 +++++++++++++++------ .../multi/GT_MetaTileEntity_LargeTurbine_Gas.java | 8 +- .../GT_MetaTileEntity_LargeTurbine_HPSteam.java | 8 +- .../GT_MetaTileEntity_LargeTurbine_Plasma.java | 8 +- .../GT_MetaTileEntity_LargeTurbine_Steam.java | 2 +- .../preload/GT_Loader_MetaTileEntities.java | 9 +- .../textures/blocks/iconsets/LARGETURBINE1.png | Bin 515 -> 0 bytes .../textures/blocks/iconsets/LARGETURBINE2.png | Bin 586 -> 0 bytes .../textures/blocks/iconsets/LARGETURBINE3.png | Bin 571 -> 0 bytes .../textures/blocks/iconsets/LARGETURBINE4.png | Bin 625 -> 0 bytes .../textures/blocks/iconsets/LARGETURBINE5.png | Bin 366 -> 0 bytes .../textures/blocks/iconsets/LARGETURBINE6.png | Bin 652 -> 0 bytes .../textures/blocks/iconsets/LARGETURBINE7.png | Bin 585 -> 0 bytes .../textures/blocks/iconsets/LARGETURBINE8.png | Bin 594 -> 0 bytes .../textures/blocks/iconsets/LARGETURBINE9.png | Bin 564 -> 0 bytes .../blocks/iconsets/LARGETURBINE_ACTIVE1.png | Bin 761 -> 0 bytes .../iconsets/LARGETURBINE_ACTIVE1.png.mcmeta | 3 - .../blocks/iconsets/LARGETURBINE_ACTIVE2.png | Bin 1131 -> 0 bytes .../iconsets/LARGETURBINE_ACTIVE2.png.mcmeta | 3 - .../blocks/iconsets/LARGETURBINE_ACTIVE3.png | Bin 798 -> 0 bytes .../iconsets/LARGETURBINE_ACTIVE3.png.mcmeta | 3 - .../blocks/iconsets/LARGETURBINE_ACTIVE4.png | Bin 1347 -> 0 bytes .../iconsets/LARGETURBINE_ACTIVE4.png.mcmeta | 3 - .../blocks/iconsets/LARGETURBINE_ACTIVE5.png | Bin 949 -> 0 bytes .../iconsets/LARGETURBINE_ACTIVE5.png.mcmeta | 3 - .../blocks/iconsets/LARGETURBINE_ACTIVE6.png | Bin 1481 -> 0 bytes .../iconsets/LARGETURBINE_ACTIVE6.png.mcmeta | 3 - .../blocks/iconsets/LARGETURBINE_ACTIVE7.png | Bin 868 -> 0 bytes .../iconsets/LARGETURBINE_ACTIVE7.png.mcmeta | 3 - .../blocks/iconsets/LARGETURBINE_ACTIVE8.png | Bin 1176 -> 0 bytes .../iconsets/LARGETURBINE_ACTIVE8.png.mcmeta | 3 - .../blocks/iconsets/LARGETURBINE_ACTIVE9.png | Bin 898 -> 0 bytes .../iconsets/LARGETURBINE_ACTIVE9.png.mcmeta | 3 - .../textures/blocks/iconsets/LARGETURBINE_SS1.png | Bin 0 -> 476 bytes .../textures/blocks/iconsets/LARGETURBINE_SS2.png | Bin 0 -> 494 bytes .../textures/blocks/iconsets/LARGETURBINE_SS3.png | Bin 0 -> 500 bytes .../textures/blocks/iconsets/LARGETURBINE_SS4.png | Bin 0 -> 528 bytes .../textures/blocks/iconsets/LARGETURBINE_SS5.png | Bin 0 -> 344 bytes .../textures/blocks/iconsets/LARGETURBINE_SS6.png | Bin 0 -> 521 bytes .../textures/blocks/iconsets/LARGETURBINE_SS7.png | Bin 0 -> 497 bytes .../textures/blocks/iconsets/LARGETURBINE_SS8.png | Bin 0 -> 504 bytes .../textures/blocks/iconsets/LARGETURBINE_SS9.png | Bin 0 -> 479 bytes .../blocks/iconsets/LARGETURBINE_SS_ACTIVE1.png | Bin 0 -> 623 bytes .../iconsets/LARGETURBINE_SS_ACTIVE1.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_SS_ACTIVE2.png | Bin 0 -> 852 bytes .../iconsets/LARGETURBINE_SS_ACTIVE2.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_SS_ACTIVE3.png | Bin 0 -> 657 bytes .../iconsets/LARGETURBINE_SS_ACTIVE3.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_SS_ACTIVE4.png | Bin 0 -> 931 bytes .../iconsets/LARGETURBINE_SS_ACTIVE4.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png | Bin 0 -> 890 bytes .../iconsets/LARGETURBINE_SS_ACTIVE5.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_SS_ACTIVE6.png | Bin 0 -> 950 bytes .../iconsets/LARGETURBINE_SS_ACTIVE6.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_SS_ACTIVE7.png | Bin 0 -> 633 bytes .../iconsets/LARGETURBINE_SS_ACTIVE7.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_SS_ACTIVE8.png | Bin 0 -> 864 bytes .../iconsets/LARGETURBINE_SS_ACTIVE8.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_SS_ACTIVE9.png | Bin 0 -> 631 bytes .../iconsets/LARGETURBINE_SS_ACTIVE9.png.mcmeta | 3 + .../textures/blocks/iconsets/LARGETURBINE_ST1.png | Bin 0 -> 515 bytes .../textures/blocks/iconsets/LARGETURBINE_ST2.png | Bin 0 -> 586 bytes .../textures/blocks/iconsets/LARGETURBINE_ST3.png | Bin 0 -> 571 bytes .../textures/blocks/iconsets/LARGETURBINE_ST4.png | Bin 0 -> 625 bytes .../textures/blocks/iconsets/LARGETURBINE_ST5.png | Bin 0 -> 366 bytes .../textures/blocks/iconsets/LARGETURBINE_ST6.png | Bin 0 -> 652 bytes .../textures/blocks/iconsets/LARGETURBINE_ST7.png | Bin 0 -> 585 bytes .../textures/blocks/iconsets/LARGETURBINE_ST8.png | Bin 0 -> 594 bytes .../textures/blocks/iconsets/LARGETURBINE_ST9.png | Bin 0 -> 564 bytes .../blocks/iconsets/LARGETURBINE_ST_ACTIVE1.png | Bin 0 -> 761 bytes .../iconsets/LARGETURBINE_ST_ACTIVE1.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png | Bin 0 -> 1131 bytes .../iconsets/LARGETURBINE_ST_ACTIVE2.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ST_ACTIVE3.png | Bin 0 -> 798 bytes .../iconsets/LARGETURBINE_ST_ACTIVE3.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png | Bin 0 -> 1347 bytes .../iconsets/LARGETURBINE_ST_ACTIVE4.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png | Bin 0 -> 949 bytes .../iconsets/LARGETURBINE_ST_ACTIVE5.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png | Bin 0 -> 1481 bytes .../iconsets/LARGETURBINE_ST_ACTIVE6.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ST_ACTIVE7.png | Bin 0 -> 868 bytes .../iconsets/LARGETURBINE_ST_ACTIVE7.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png | Bin 0 -> 1176 bytes .../iconsets/LARGETURBINE_ST_ACTIVE8.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ST_ACTIVE9.png | Bin 0 -> 898 bytes .../iconsets/LARGETURBINE_ST_ACTIVE9.png.mcmeta | 3 + .../textures/blocks/iconsets/LARGETURBINE_TI1.png | Bin 0 -> 547 bytes .../textures/blocks/iconsets/LARGETURBINE_TI2.png | Bin 0 -> 530 bytes .../textures/blocks/iconsets/LARGETURBINE_TI3.png | Bin 0 -> 577 bytes .../textures/blocks/iconsets/LARGETURBINE_TI4.png | Bin 0 -> 565 bytes .../textures/blocks/iconsets/LARGETURBINE_TI5.png | Bin 0 -> 344 bytes .../textures/blocks/iconsets/LARGETURBINE_TI6.png | Bin 0 -> 554 bytes .../textures/blocks/iconsets/LARGETURBINE_TI7.png | Bin 0 -> 585 bytes .../textures/blocks/iconsets/LARGETURBINE_TI8.png | Bin 0 -> 545 bytes .../textures/blocks/iconsets/LARGETURBINE_TI9.png | Bin 0 -> 548 bytes .../blocks/iconsets/LARGETURBINE_TI_ACTIVE1.png | Bin 0 -> 693 bytes .../iconsets/LARGETURBINE_TI_ACTIVE1.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TI_ACTIVE2.png | Bin 0 -> 897 bytes .../iconsets/LARGETURBINE_TI_ACTIVE2.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TI_ACTIVE3.png | Bin 0 -> 736 bytes .../iconsets/LARGETURBINE_TI_ACTIVE3.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TI_ACTIVE4.png | Bin 0 -> 968 bytes .../iconsets/LARGETURBINE_TI_ACTIVE4.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png | Bin 0 -> 890 bytes .../iconsets/LARGETURBINE_TI_ACTIVE5.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TI_ACTIVE6.png | Bin 0 -> 971 bytes .../iconsets/LARGETURBINE_TI_ACTIVE6.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TI_ACTIVE7.png | Bin 0 -> 732 bytes .../iconsets/LARGETURBINE_TI_ACTIVE7.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TI_ACTIVE8.png | Bin 0 -> 909 bytes .../iconsets/LARGETURBINE_TI_ACTIVE8.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TI_ACTIVE9.png | Bin 0 -> 693 bytes .../iconsets/LARGETURBINE_TI_ACTIVE9.png.mcmeta | 3 + .../textures/blocks/iconsets/LARGETURBINE_TU1.png | Bin 0 -> 526 bytes .../textures/blocks/iconsets/LARGETURBINE_TU2.png | Bin 0 -> 519 bytes .../textures/blocks/iconsets/LARGETURBINE_TU3.png | Bin 0 -> 551 bytes .../textures/blocks/iconsets/LARGETURBINE_TU4.png | Bin 0 -> 553 bytes .../textures/blocks/iconsets/LARGETURBINE_TU5.png | Bin 0 -> 344 bytes .../textures/blocks/iconsets/LARGETURBINE_TU6.png | Bin 0 -> 543 bytes .../textures/blocks/iconsets/LARGETURBINE_TU7.png | Bin 0 -> 556 bytes .../textures/blocks/iconsets/LARGETURBINE_TU8.png | Bin 0 -> 530 bytes .../textures/blocks/iconsets/LARGETURBINE_TU9.png | Bin 0 -> 523 bytes .../blocks/iconsets/LARGETURBINE_TU_ACTIVE1.png | Bin 0 -> 684 bytes .../iconsets/LARGETURBINE_TU_ACTIVE1.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TU_ACTIVE2.png | Bin 0 -> 881 bytes .../iconsets/LARGETURBINE_TU_ACTIVE2.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TU_ACTIVE3.png | Bin 0 -> 710 bytes .../iconsets/LARGETURBINE_TU_ACTIVE3.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TU_ACTIVE4.png | Bin 0 -> 950 bytes .../iconsets/LARGETURBINE_TU_ACTIVE4.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png | Bin 0 -> 890 bytes .../iconsets/LARGETURBINE_TU_ACTIVE5.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TU_ACTIVE6.png | Bin 0 -> 958 bytes .../iconsets/LARGETURBINE_TU_ACTIVE6.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TU_ACTIVE7.png | Bin 0 -> 697 bytes .../iconsets/LARGETURBINE_TU_ACTIVE7.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TU_ACTIVE8.png | Bin 0 -> 885 bytes .../iconsets/LARGETURBINE_TU_ACTIVE8.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_TU_ACTIVE9.png | Bin 0 -> 669 bytes .../iconsets/LARGETURBINE_TU_ACTIVE9.png.mcmeta | 3 + 142 files changed, 228 insertions(+), 82 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE1.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE2.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE3.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE4.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE5.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE6.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE7.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE8.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE9.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE1.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE1.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE2.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE2.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE3.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE3.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE4.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE4.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE5.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE5.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE6.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE6.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE7.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE7.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE8.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE8.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE9.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE9.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS1.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS2.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS3.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS4.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS5.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS6.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS7.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS8.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS9.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE1.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE1.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE2.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE2.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE3.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE3.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE4.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE4.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE6.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE6.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE7.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE7.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE8.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE8.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE9.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE9.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST1.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST2.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST3.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST4.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST5.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST6.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST7.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST8.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST9.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE1.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE1.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE3.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE3.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE7.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE7.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE9.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE9.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI1.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI2.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI3.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI4.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI5.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI6.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI7.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI8.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI9.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE1.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE1.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE2.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE2.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE3.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE3.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE4.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE4.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE6.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE6.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE7.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE7.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE8.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE8.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE9.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE9.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU1.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU2.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU3.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU4.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU5.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU6.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU7.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU8.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU9.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE1.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE1.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE2.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE2.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE3.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE3.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE4.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE4.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE6.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE6.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE7.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE7.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE8.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE8.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE9.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE9.png.mcmeta diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 87455efac8..a5dac2ce29 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -628,7 +628,7 @@ public enum ItemList implements IItemContainer { LargeSteamTurbine, LargeGasTurbine, LargeHPSteamTurbine, LargePlasmaTurbine, Ingot_Heavy1, Ingot_Heavy2, Ingot_Heavy3, Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV, - Teleporter, Cover_NeedsMaintainance, Casing_Turbine, + Teleporter, Cover_NeedsMaintainance, Casing_Turbine, Casing_Turbine1, Casing_Turbine2, Casing_Turbine3, MobRep_LV, MobRep_MV, MobRep_HV, MobRep_EV, MobRep_IV, Cover_PlayerDetector, Machine_Multi_HeatExchanger, Block_BronzePlate, Block_IridiumTungstensteel, Block_Plascrete, Block_TungstenSteelReinforced, Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector, OilDrill, AdvancedMiner2, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite, diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java index 3705ce2204..f19219323c 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java @@ -33,6 +33,9 @@ public class GT_Block_Casings4 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Fusion Coil"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Fusion Casing MK II"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Turbine Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Stainless Steel Turbine Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Titanium Turbine Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Tungstensteel Turbine Casing"); ItemList.Casing_RobustTungstenSteel.set(new ItemStack(this, 1, 0)); ItemList.Casing_CleanStainlessSteel.set(new ItemStack(this, 1, 1)); @@ -42,6 +45,9 @@ public class GT_Block_Casings4 ItemList.Casing_Fusion_Coil.set(new ItemStack(this, 1, 7)); ItemList.Casing_Fusion2.set(new ItemStack(this, 1, 8)); ItemList.Casing_Turbine.set(new ItemStack(this, 1, 9)); + ItemList.Casing_Turbine1.set(new ItemStack(this, 1, 10)); + ItemList.Casing_Turbine2.set(new ItemStack(this, 1, 11)); + ItemList.Casing_Turbine3.set(new ItemStack(this, 1, 12)); } public IIcon getIcon(int aSide, int aMeta) { @@ -67,9 +73,9 @@ public class GT_Block_Casings4 case 9: return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); case 10: - return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); case 11: - return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); case 12: return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); case 13: @@ -82,118 +88,176 @@ public class GT_Block_Casings4 return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); } + public IIcon getTurbineCasing(int meta, int iconIndex, boolean active) { + switch (meta) { + case 9: + return active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() : Textures.BlockIcons.TURBINE[iconIndex].getIcon(); + case 10: + return active ? Textures.BlockIcons.TURBINE_ACTIVE1[iconIndex].getIcon() : Textures.BlockIcons.TURBINE1[iconIndex].getIcon(); + case 11: + return active ? Textures.BlockIcons.TURBINE_ACTIVE2[iconIndex].getIcon() : Textures.BlockIcons.TURBINE2[iconIndex].getIcon(); + case 12: + return active ? Textures.BlockIcons.TURBINE_ACTIVE3[iconIndex].getIcon() : Textures.BlockIcons.TURBINE3[iconIndex].getIcon(); + default: + return active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() : Textures.BlockIcons.TURBINE[iconIndex].getIcon(); + } + } + @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) { int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); - if (((tMeta != 6) && (tMeta != 8) && (tMeta != 9)) || (!mConnectedMachineTextures)) { + if ((tMeta != 6) && (tMeta != 8) && (tMeta != 9) && (tMeta != 10) && (tMeta != 11) && (tMeta != 12) || (!mConnectedMachineTextures)) { return getIcon(aSide, tMeta); } int tStartIndex = tMeta == 6 ? 1 : 13; - if (tMeta == 9) { + if ((tMeta == 9) || (tMeta == 10) || (tMeta == 11) || (tMeta == 12)) { if ((aSide == 2) || (aSide == 3)) { TileEntity tTileEntity; IMetaTileEntity tMetaTileEntity; if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon(); + return getTurbineCasing(tMeta, 0, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon(); } - return Textures.BlockIcons.TURBINE[0].getIcon(); + return getTurbineCasing(tMeta, 0, false); + //return Textures.BlockIcons.TURBINE[0].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon(); + return getTurbineCasing(tMeta, 3, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon(); } - return Textures.BlockIcons.TURBINE[3].getIcon(); + return getTurbineCasing(tMeta, 3, false); + //return Textures.BlockIcons.TURBINE[3].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon(); + return getTurbineCasing(tMeta, 6, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon(); } - return Textures.BlockIcons.TURBINE[6].getIcon(); + return getTurbineCasing(tMeta, 6, false); + //return Textures.BlockIcons.TURBINE[6].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon(); + return getTurbineCasing(tMeta, 1, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon(); } - return Textures.BlockIcons.TURBINE[1].getIcon(); + return getTurbineCasing(tMeta, 1, false); + //return Textures.BlockIcons.TURBINE[1].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon(); + return getTurbineCasing(tMeta, 7, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon(); } - return Textures.BlockIcons.TURBINE[7].getIcon(); + return getTurbineCasing(tMeta, 7, false); + //return Textures.BlockIcons.TURBINE[7].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon(); + return getTurbineCasing(tMeta, 8, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon(); } - return Textures.BlockIcons.TURBINE[8].getIcon(); + return getTurbineCasing(tMeta, 8, false); + //return Textures.BlockIcons.TURBINE[8].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon(); + return getTurbineCasing(tMeta, 5, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon(); } - return Textures.BlockIcons.TURBINE[5].getIcon(); + return getTurbineCasing(tMeta, 5, false); + //return Textures.BlockIcons.TURBINE[5].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon(); + return getTurbineCasing(tMeta, 2, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon(); } - return Textures.BlockIcons.TURBINE[2].getIcon(); + return getTurbineCasing(tMeta, 2, false); + //return Textures.BlockIcons.TURBINE[2].getIcon(); } } else if ((aSide == 4) || (aSide == 5)) { TileEntity tTileEntity; Object tMetaTileEntity; if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon(); + return getTurbineCasing(tMeta, 0, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon(); } - return Textures.BlockIcons.TURBINE[0].getIcon(); + return getTurbineCasing(tMeta, 0, false); + //return Textures.BlockIcons.TURBINE[0].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon(); + return getTurbineCasing(tMeta, 3, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon(); } - return Textures.BlockIcons.TURBINE[3].getIcon(); + return getTurbineCasing(tMeta, 3, false); + //return Textures.BlockIcons.TURBINE[3].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon(); + return getTurbineCasing(tMeta, 6, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon(); } - return Textures.BlockIcons.TURBINE[6].getIcon(); + return getTurbineCasing(tMeta, 6, false); + //return Textures.BlockIcons.TURBINE[6].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon(); + return getTurbineCasing(tMeta, 1, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon(); } - return Textures.BlockIcons.TURBINE[1].getIcon(); + return getTurbineCasing(tMeta, 1, false); + //return Textures.BlockIcons.TURBINE[1].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon(); + return getTurbineCasing(tMeta, 7, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon(); } - return Textures.BlockIcons.TURBINE[7].getIcon(); + return getTurbineCasing(tMeta, 7, false); + //return Textures.BlockIcons.TURBINE[7].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon(); + return getTurbineCasing(tMeta, 8, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon(); } - return Textures.BlockIcons.TURBINE[8].getIcon(); + return getTurbineCasing(tMeta, 8, false); + //return Textures.BlockIcons.TURBINE[8].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon(); + return getTurbineCasing(tMeta, 5, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon(); } - return Textures.BlockIcons.TURBINE[5].getIcon(); + return getTurbineCasing(tMeta, 5, false); + //return Textures.BlockIcons.TURBINE[5].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon(); + return getTurbineCasing(tMeta, 2, true); + //return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon(); } - return Textures.BlockIcons.TURBINE[2].getIcon(); + return getTurbineCasing(tMeta, 2, false); + //return Textures.BlockIcons.TURBINE[2].getIcon(); } } - return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + switch (tMeta) { + case 9: + return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + case 10: + return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); + case 11: + return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); + case 12: + return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + default: + return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + } } boolean[] tConnectedSides = {(aWorld.getBlock(xCoord, yCoord - 1, zCoord) == this) && (aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta), (aWorld.getBlock(xCoord, yCoord + 1, zCoord) == this) && (aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta), (aWorld.getBlock(xCoord + 1, yCoord, zCoord) == this) && (aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta), (aWorld.getBlock(xCoord, yCoord, zCoord + 1) == this) && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta), (aWorld.getBlock(xCoord - 1, yCoord, zCoord) == this) && (aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta), (aWorld.getBlock(xCoord, yCoord, zCoord - 1) == this) && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta)}; switch (aSide) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java index 419b885d47..a914ab3a12 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java @@ -28,7 +28,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]}; + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_SS_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_SS5) : Textures.BlockIcons.CASING_BLOCKS[59]}; } @@ -40,7 +40,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT "1x Dynamo Hatch (back centered)", "1x Maintenance Hatch (side centered)", "1x Muffler Hatch (side centered)", - "Turbine Casings for the rest (24 at least!)", + "Stainless Steel Turbine Casings for the rest (24 at least!)", "Needs a Turbine Item (inside controller GUI)"}; } @@ -66,12 +66,12 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT @Override public byte getCasingMeta() { - return 9; + return 11; } @Override public byte getCasingTextureIndex() { - return 46; + return 59; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java index b9b4b7b2b4..7befab0088 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java @@ -28,7 +28,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]}; + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_SS_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_SS5) : Textures.BlockIcons.CASING_BLOCKS[58]}; } public String[] getDescription() { @@ -38,7 +38,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La "1x Input Hatch (side centered)", "1x Output Hatch(side centered)", "1x Dynamo Hatch (back centered)", "1x Maintenance Hatch (side centered)", - "Turbine Casings for the rest (24 at least!)", + "Stainless Steel Turbine Casings for the rest (24 at least!)", "Needs a Turbine Item (inside controller GUI)"}; } @@ -54,12 +54,12 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La @Override public byte getCasingMeta() { - return 9; + return 10; } @Override public byte getCasingTextureIndex() { - return 46; + return 58; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index 7cb84129c4..c72e880783 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -28,7 +28,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]}; + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_TU_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_TU5) : Textures.BlockIcons.CASING_BLOCKS[60]}; } @@ -39,7 +39,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar "1x Input Hatch (side centered)", "1x Dynamo Hatch (back centered)", "1x Maintenance Hatch (side centered)", - "Turbine Casings for the rest (24 at least!)", + "Tungstensteel Turbine Casings for the rest (24 at least!)", "Needs a Turbine Item (inside controller GUI)"}; } @@ -65,12 +65,12 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar @Override public byte getCasingMeta() { - return 9; + return 12; } @Override public byte getCasingTextureIndex() { - return 46; + return 60; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java index 34e23196a7..534f53c36b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java @@ -30,7 +30,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]}; + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ST_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ST5) : Textures.BlockIcons.CASING_BLOCKS[57]}; } public String[] getDescription() { diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 5eaea080aa..571c7d00de 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -52,6 +52,9 @@ public class GT_Loader_MetaTileEntities GT_ModHandler.addCraftingRecipe(ItemList.Casing_CleanStainlessSteel.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PhP", "PFP", "PwP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('F'), OrePrefixes.frameGt.get(Materials.StainlessSteel)}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_RobustTungstenSteel.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PhP", "PFP", "PwP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('F'), OrePrefixes.frameGt.get(Materials.TungstenSteel)}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PhP", "PFP", "PwP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Magnalium), Character.valueOf('F'), OrePrefixes.frameGt.get(Materials.BlueSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine1.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PhP", "PFP", "PwP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('F'), ItemList.Casing_Turbine}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine2.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PhP", "PFP", "PwP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('F'), ItemList.Casing_Turbine}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine3.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PhP", "PFP", "PwP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('F'), ItemList.Casing_Turbine}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Bronze.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PIP", "IFI", "PIP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Bronze), Character.valueOf('F'), OrePrefixes.frameGt.get(Materials.Bronze), Character.valueOf('I'), OrePrefixes.pipeMedium.get(Materials.Bronze)}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Steel.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PIP", "IFI", "PIP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('F'), OrePrefixes.frameGt.get(Materials.Steel), Character.valueOf('I'), OrePrefixes.pipeMedium.get(Materials.Steel)}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Titanium.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PIP", "IFI", "PIP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('F'), OrePrefixes.frameGt.get(Materials.Titanium), Character.valueOf('I'), OrePrefixes.pipeMedium.get(Materials.Titanium)}); @@ -956,13 +959,11 @@ public class GT_Loader_MetaTileEntities ItemList.LargeGasTurbine.set(new GT_MetaTileEntity_LargeTurbine_Gas(1151, "multimachine.largegasturbine", "Large Gas Turbine").getStackForm(1L)); ItemList.LargeHPSteamTurbine.set(new GT_MetaTileEntity_LargeTurbine_HPSteam(1152, "multimachine.largehpturbine", "Large HP Steam Turbine").getStackForm(1L)); ItemList.LargePlasmaTurbine.set(new GT_MetaTileEntity_LargeTurbine_Plasma(1153, "multimachine.largeplasmaturbine", "Large Plasma Generator").getStackForm(1L)); - ItemList.LargeDieselTurbine.set(new GT_MetaTileEntity_LargeTurbine_Diesel(1171, "multimachine.largedieselturbine", "Large Diesel Generator").getStackForm(1L)); GT_ModHandler.addCraftingRecipe(ItemList.LargeSteamTurbine.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CPC", "PMP", "BPB", 'M', ItemList.Hull_HV, 'B', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', OrePrefixes.gearGt.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.LargeGasTurbine.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CPC", "PMP", "BPB", 'M', ItemList.Hull_EV, 'B', OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Elite), 'P', OrePrefixes.gearGt.get(Materials.Titanium)}); - GT_ModHandler.addCraftingRecipe(ItemList.LargeHPSteamTurbine.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CPC", "PMP", "BPB", 'M', ItemList.Hull_IV, 'B', OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Master), 'P', OrePrefixes.gearGt.get(Materials.TungstenSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.LargeGasTurbine.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CPC", "PMP", "BPB", 'M', ItemList.Hull_EV, 'B', OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Elite), 'P', OrePrefixes.gearGt.get(Materials.StainlessSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.LargeHPSteamTurbine.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CPC", "PMP", "BPB", 'M', ItemList.Hull_EV, 'B', OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Elite), 'P', OrePrefixes.gearGt.get(Materials.StainlessSteel)}); GT_ModHandler.addCraftingRecipe(ItemList.LargePlasmaTurbine.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CPC", "PMP", "BPB", 'M', ItemList.Hull_UV, 'B', OrePrefixes.pipeHuge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Master), 'P', OrePrefixes.gearGt.get(Materials.TungstenSteel)}); - GT_ModHandler.addCraftingRecipe(ItemList.LargeGasTurbine.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CPC", "PMP", "BPB", 'M', ItemList.Hull_EV, 'B', OrePrefixes.pipeHuge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Elite), 'P', OrePrefixes.gearGt.get(Materials.Titanium)}); ItemList.Pump_LV.set(new GT_MetaTileEntity_Pump(1140, "basicmachine.pump.tier.01", "Basic Pump", 1).getStackForm(1L)); diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE1.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE1.png deleted file mode 100644 index 30fc8fe03b..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE1.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE2.png deleted file mode 100644 index c1439353f4..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE2.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE3.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE3.png deleted file mode 100644 index 83bd3cd414..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE3.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE4.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE4.png deleted file mode 100644 index 4e0a4647ae..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE4.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE5.png deleted file mode 100644 index 72a4426d51..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE5.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE6.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE6.png deleted file mode 100644 index ea87e4f919..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE6.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE7.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE7.png deleted file mode 100644 index 51eadce638..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE7.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE8.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE8.png deleted file mode 100644 index 76464e267b..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE8.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE9.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGE