From 825151fe803929abbd4ea9e8e1cad66fc09086a4 Mon Sep 17 00:00:00 2001 From: miozune Date: Tue, 14 Nov 2023 00:45:10 +0900 Subject: Cleanup basic machines and textures (#779) * Cleanup dehydrator * Cleanup reactor processing unit * Cleanup cold trap * Cleanup simple washer * Cleanup unused textures * updateBuildScript --- .../GT_MetaTileEntity_Dehydrator.java | 170 -------------- .../common/blocks/textures/TexturesGtBlock.java | 182 --------------- .../basic/GregtechMetaTileEntity_BasicWasher.java | 78 ------- .../GregtechMetaTileEntity_ReactorColdTrap.java | 86 ------- ...egtechMetaTileEntity_ReactorProcessingUnit.java | 86 ------- .../registration/gregtech/GregtechDehydrator.java | 247 ++++++++++----------- .../registration/gregtech/GregtechLFTR.java | 78 ++++++- .../gregtech/GregtechSimpleWasher.java | 99 ++++++++- .../basicmachines/cold_trap/OVERLAY_BOTTOM.png | Bin 0 -> 228 bytes .../cold_trap/OVERLAY_BOTTOM_ACTIVE.png | Bin 0 -> 224 bytes .../cold_trap/OVERLAY_BOTTOM_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../cold_trap/OVERLAY_BOTTOM_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/cold_trap/OVERLAY_FRONT.png | Bin 0 -> 344 bytes .../cold_trap/OVERLAY_FRONT_ACTIVE.png | Bin 0 -> 387 bytes .../cold_trap/OVERLAY_FRONT_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/cold_trap/OVERLAY_FRONT_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/cold_trap/OVERLAY_SIDE.png | Bin 0 -> 345 bytes .../cold_trap/OVERLAY_SIDE_ACTIVE.png | Bin 0 -> 668 bytes .../cold_trap/OVERLAY_SIDE_ACTIVE.png.mcmeta | 6 + .../cold_trap/OVERLAY_SIDE_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/cold_trap/OVERLAY_SIDE_GLOW.png | Bin 0 -> 141 bytes .../blocks/basicmachines/cold_trap/OVERLAY_TOP.png | Bin 0 -> 228 bytes .../basicmachines/cold_trap/OVERLAY_TOP_ACTIVE.png | Bin 0 -> 224 bytes .../cold_trap/OVERLAY_TOP_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/cold_trap/OVERLAY_TOP_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/dehydrator/OVERLAY_BOTTOM.png | Bin 0 -> 141 bytes .../dehydrator/OVERLAY_BOTTOM_ACTIVE.png | Bin 0 -> 141 bytes .../dehydrator/OVERLAY_BOTTOM_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../dehydrator/OVERLAY_BOTTOM_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/dehydrator/OVERLAY_FRONT.png | Bin 0 -> 200 bytes .../dehydrator/OVERLAY_FRONT_ACTIVE.png | Bin 0 -> 194 bytes .../dehydrator/OVERLAY_FRONT_ACTIVE_GLOW.png | Bin 0 -> 137 bytes .../dehydrator/OVERLAY_FRONT_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/dehydrator/OVERLAY_SIDE.png | Bin 0 -> 212 bytes .../dehydrator/OVERLAY_SIDE_ACTIVE.png | Bin 0 -> 317 bytes .../dehydrator/OVERLAY_SIDE_ACTIVE_GLOW.png | Bin 0 -> 269 bytes .../basicmachines/dehydrator/OVERLAY_SIDE_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/dehydrator/OVERLAY_TOP.png | Bin 0 -> 314 bytes .../dehydrator/OVERLAY_TOP_ACTIVE.png | Bin 0 -> 302 bytes .../dehydrator/OVERLAY_TOP_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/dehydrator/OVERLAY_TOP_GLOW.png | Bin 0 -> 141 bytes .../reactor_processing_unit/OVERLAY_BOTTOM.png | Bin 0 -> 367 bytes .../OVERLAY_BOTTOM_ACTIVE.png | Bin 0 -> 366 bytes .../OVERLAY_BOTTOM_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../OVERLAY_BOTTOM_GLOW.png | Bin 0 -> 141 bytes .../reactor_processing_unit/OVERLAY_FRONT.png | Bin 0 -> 439 bytes .../OVERLAY_FRONT_ACTIVE.png | Bin 0 -> 704 bytes .../OVERLAY_FRONT_ACTIVE.png.mcmeta | 6 + .../OVERLAY_FRONT_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../reactor_processing_unit/OVERLAY_FRONT_GLOW.png | Bin 0 -> 141 bytes .../reactor_processing_unit/OVERLAY_SIDE.png | Bin 0 -> 439 bytes .../OVERLAY_SIDE_ACTIVE.png | Bin 0 -> 1049 bytes .../OVERLAY_SIDE_ACTIVE.png.mcmeta | 6 + .../OVERLAY_SIDE_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../reactor_processing_unit/OVERLAY_SIDE_GLOW.png | Bin 0 -> 141 bytes .../reactor_processing_unit/OVERLAY_TOP.png | Bin 0 -> 367 bytes .../reactor_processing_unit/OVERLAY_TOP_ACTIVE.png | Bin 0 -> 366 bytes .../OVERLAY_TOP_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../reactor_processing_unit/OVERLAY_TOP_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/simple_washer/OVERLAY_BOTTOM.png | Bin 0 -> 141 bytes .../simple_washer/OVERLAY_BOTTOM_ACTIVE.png | Bin 0 -> 141 bytes .../simple_washer/OVERLAY_BOTTOM_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../simple_washer/OVERLAY_BOTTOM_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/simple_washer/OVERLAY_FRONT.png | Bin 0 -> 214 bytes .../simple_washer/OVERLAY_FRONT_ACTIVE.png | Bin 0 -> 329 bytes .../simple_washer/OVERLAY_FRONT_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../simple_washer/OVERLAY_FRONT_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/simple_washer/OVERLAY_SIDE.png | Bin 0 -> 214 bytes .../simple_washer/OVERLAY_SIDE_ACTIVE.png | Bin 0 -> 329 bytes .../simple_washer/OVERLAY_SIDE_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../simple_washer/OVERLAY_SIDE_GLOW.png | Bin 0 -> 141 bytes .../basicmachines/simple_washer/OVERLAY_TOP.png | Bin 0 -> 141 bytes .../simple_washer/OVERLAY_TOP_ACTIVE.png | Bin 0 -> 141 bytes .../simple_washer/OVERLAY_TOP_ACTIVE_GLOW.png | Bin 0 -> 141 bytes .../simple_washer/OVERLAY_TOP_GLOW.png | Bin 0 -> 141 bytes .../resources/assets/miscutils/lang/en_US.lang | 10 - .../resources/assets/miscutils/lang/ru_RU.lang | 10 - .../resources/assets/miscutils/lang/zh_CN.lang | 10 - .../textures/blocks/TileEntities/Compartment/0.png | Bin 822 -> 0 bytes .../textures/blocks/TileEntities/Compartment/1.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/10.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/11.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/12.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/13.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/14.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/15.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/16.png | Bin 364 -> 0 bytes .../blocks/TileEntities/Compartment/17.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/18.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/19.png | Bin 822 -> 0 bytes .../textures/blocks/TileEntities/Compartment/2.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/20.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/21.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/22.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/23.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/24.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/25.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/26.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/27.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/28.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/29.png | Bin 822 -> 0 bytes .../textures/blocks/TileEntities/Compartment/3.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/30.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/31.png | Bin 822 -> 0 bytes .../textures/blocks/TileEntities/Compartment/4.png | Bin 822 -> 0 bytes .../textures/blocks/TileEntities/Compartment/5.png | Bin 822 -> 0 bytes .../textures/blocks/TileEntities/Compartment/6.png | Bin 822 -> 0 bytes .../textures/blocks/TileEntities/Compartment/7.png | Bin 822 -> 0 bytes .../textures/blocks/TileEntities/Compartment/8.png | Bin 822 -> 0 bytes .../textures/blocks/TileEntities/Compartment/9.png | Bin 822 -> 0 bytes .../blocks/TileEntities/Compartment/wood_shelf.png | Bin 822 -> 0 bytes .../TileEntities/Compartment/wood_shelf_cans.png | Bin 822 -> 0 bytes .../TileEntities/Compartment/wood_shelf_paper.png | Bin 822 -> 0 bytes .../TileEntities/FluidReactor/OVERLAY_FRONT.png | Bin 313 -> 0 bytes .../FluidReactor/OVERLAY_FRONT_ACTIVE.png | Bin 704 -> 0 bytes .../FluidReactor/OVERLAY_FRONT_ACTIVE.png.mcmeta | 6 - .../TileEntities/FluidReactor/OVERLAY_SIDE.png | Bin 333 -> 0 bytes .../FluidReactor/OVERLAY_SIDE_ACTIVE.png | Bin 1049 -> 0 bytes .../FluidReactor/OVERLAY_SIDE_ACTIVE.png.mcmeta | 6 - .../TileEntities/FluidReactor/OVERLAY_TOP.png | Bin 228 -> 0 bytes .../FluidReactor/OVERLAY_TOP_ACTIVE.png | Bin 224 -> 0 bytes .../TileEntities/ReactorColdTrap/OVERLAY_FRONT.png | Bin 344 -> 0 bytes .../ReactorColdTrap/OVERLAY_FRONT_ACTIVE.png | Bin 387 -> 0 bytes .../TileEntities/ReactorColdTrap/OVERLAY_SIDE.png | Bin 345 -> 0 bytes .../ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png | Bin 668 -> 0 bytes .../ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png.mcmeta | 6 - .../TileEntities/ReactorColdTrap/OVERLAY_TOP.png | Bin 228 -> 0 bytes .../ReactorColdTrap/OVERLAY_TOP_ACTIVE.png | Bin 224 -> 0 bytes .../ReactorProcessingUnit/OVERLAY_FRONT.png | Bin 439 -> 0 bytes .../ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png | Bin 704 -> 0 bytes .../OVERLAY_FRONT_ACTIVE.png.mcmeta | 6 - .../ReactorProcessingUnit/OVERLAY_SIDE.png | Bin 439 -> 0 bytes .../ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png | Bin 1049 -> 0 bytes .../OVERLAY_SIDE_ACTIVE.png.mcmeta | 6 - .../ReactorProcessingUnit/OVERLAY_TOP.png | Bin 367 -> 0 bytes .../ReactorProcessingUnit/OVERLAY_TOP_ACTIVE.png | Bin 366 -> 0 bytes .../RoundRobinator/MACHINE_CASING_VENT.png | Bin 467 -> 0 bytes .../blocks/TileEntities/RoundRobinator/Side_0.png | Bin 1448 -> 0 bytes .../blocks/TileEntities/RoundRobinator/Side_1.png | Bin 1444 -> 0 bytes .../blocks/TileEntities/RoundRobinator/Side_2.png | Bin 1446 -> 0 bytes .../blocks/TileEntities/RoundRobinator/Side_3.png | Bin 1446 -> 0 bytes .../blocks/TileEntities/RoundRobinator/Side_4.png | Bin 1443 -> 0 bytes .../blocks/TileEntities/RoundRobinator/Top_0.png | Bin 1405 -> 0 bytes .../blocks/TileEntities/RoundRobinator/Top_1.png | Bin 1403 -> 0 bytes .../blocks/TileEntities/RoundRobinator/Top_2.png | Bin 1403 -> 0 bytes .../blocks/TileEntities/RoundRobinator/Top_3.png | Bin 1402 -> 0 bytes .../blocks/TileEntities/RoundRobinator/Top_4.png | Bin 1400 -> 0 bytes .../iconsets/MACHINE_CASING_GEARBOX_ABYSSAL.png | Bin 3324 -> 0 bytes .../MACHINE_CASING_GEARBOX_EGLIN_STEEL.png | Bin 3324 -> 0 bytes .../MACHINE_CASING_GEARBOX_INCOLOY_MA956.png | Bin 3324 -> 0 bytes .../MACHINE_CASING_GEARBOX_INCONEL_792.png | Bin 3324 -> 0 bytes .../iconsets/MACHINE_CASING_GEARBOX_NITINOL_60.png | Bin 3324 -> 0 bytes .../iconsets/MACHINE_CASING_GEARBOX_PIKYONIUM.png | Bin 3324 -> 0 bytes .../iconsets/MACHINE_CASING_GEARBOX_TITANSTEEL.png | Bin 3324 -> 0 bytes .../iconsets/MACHINE_CASING_GEARBOX_ZERON_100.png | Bin 3324 -> 0 bytes .../iconsets/MACHINE_CASING_PIPE_ABYSSAL.png | Bin 610 -> 0 bytes .../iconsets/MACHINE_CASING_PIPE_BABBIT_ALLOY.png | Bin 610 -> 0 bytes .../iconsets/MACHINE_CASING_PIPE_CINOBITE.png | Bin 610 -> 0 bytes .../iconsets/MACHINE_CASING_PIPE_INCONEL_690.png | Bin 610 -> 0 bytes .../blocks/iconsets/MACHINE_CASING_PIPE_LAFIUM.png | Bin 610 -> 0 bytes .../iconsets/MACHINE_CASING_PIPE_NITINOL_60.png | Bin 610 -> 0 bytes .../iconsets/MACHINE_CASING_PIPE_STELLITE.png | Bin 610 -> 0 bytes .../iconsets/MACHINE_CASING_PIPE_TITANSTEEL.png | Bin 610 -> 0 bytes .../blocks/iconsets/OVERLAY_ENERGY_OUT_BUFFER.png | Bin 334 -> 0 bytes .../assets/miscutils/textures/blocks/number/1.png | Bin 682 -> 0 bytes .../assets/miscutils/textures/blocks/number/10.png | Bin 730 -> 0 bytes .../assets/miscutils/textures/blocks/number/11.png | Bin 663 -> 0 bytes .../assets/miscutils/textures/blocks/number/12.png | Bin 712 -> 0 bytes .../assets/miscutils/textures/blocks/number/13.png | Bin 745 -> 0 bytes .../assets/miscutils/textures/blocks/number/14.png | Bin 730 -> 0 bytes .../assets/miscutils/textures/blocks/number/15.png | Bin 734 -> 0 bytes .../assets/miscutils/textures/blocks/number/16.png | Bin 738 -> 0 bytes .../assets/miscutils/textures/blocks/number/2.png | Bin 732 -> 0 bytes .../assets/miscutils/textures/blocks/number/3.png | Bin 773 -> 0 bytes .../assets/miscutils/textures/blocks/number/4.png | Bin 739 -> 0 bytes .../assets/miscutils/textures/blocks/number/5.png | Bin 735 -> 0 bytes .../assets/miscutils/textures/blocks/number/6.png | Bin 752 -> 0 bytes .../assets/miscutils/textures/blocks/number/7.png | Bin 722 -> 0 bytes .../assets/miscutils/textures/blocks/number/8.png | Bin 767 -> 0 bytes .../assets/miscutils/textures/blocks/number/9.png | Bin 759 -> 0 bytes 180 files changed, 296 insertions(+), 808 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_ACTIVE.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_ACTIVE.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_ACTIVE.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP_GLOW.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_cans.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_paper.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png.mcmeta delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png.mcmeta delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png.mcmeta delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png.mcmeta delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png.mcmeta delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_ABYSSAL.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_EGLIN_STEEL.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_INCOLOY_MA956.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_INCONEL_792.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_NITINOL_60.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_PIKYONIUM.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANSTEEL.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_ZERON_100.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_ABYSSAL.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_BABBIT_ALLOY.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_CINOBITE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_INCONEL_690.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_LAFIUM.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_NITINOL_60.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_STELLITE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_TITANSTEEL.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_BUFFER.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/10.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/11.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/12.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/13.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/14.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/15.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/16.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/6.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/7.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/8.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/number/9.png diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java deleted file mode 100644 index a99cfcfea9..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java +++ /dev/null @@ -1,170 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; - -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE_OUT; - -import net.minecraftforge.common.util.ForgeDirection; - -import gregtech.api.enums.SoundResource; -import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.BlockIcons.CustomIcon; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.render.TextureFactory; -import gregtech.api.util.GTPP_Recipe; -import gtPlusPlus.core.lib.CORE; - -@SuppressWarnings("deprecation") -public class GT_MetaTileEntity_Dehydrator extends GT_MetaTileEntity_BasicMachine_GT_Recipe { - - private static final CustomIcon[] sDehydratorOverlays = new CustomIcon[10]; - - static { - sDehydratorOverlays[0] = new CustomIcon("basicmachines/microwave/OVERLAY_FRONT"); - sDehydratorOverlays[2] = new CustomIcon("basicmachines/plasma_arc_furnace/OVERLAY_BOTTOM"); - sDehydratorOverlays[3] = new CustomIcon("basicmachines/fluid_heater/OVERLAY_SIDE"); - sDehydratorOverlays[4] = new CustomIcon("basicmachines/chemical_bath/OVERLAY_FRONT"); - sDehydratorOverlays[5] = new CustomIcon("basicmachines/microwave/OVERLAY_FRONT_ACTIVE"); - sDehydratorOverlays[7] = new CustomIcon("basicmachines/plasma_arc_furnace/OVERLAY_BOTTOM_ACTIVE"); - sDehydratorOverlays[8] = new CustomIcon("basicmachines/fluid_heater/OVERLAY_SIDE_ACTIVE"); - sDehydratorOverlays[9] = new CustomIcon("basicmachines/chemical_bath/OVERLAY_FRONT_ACTIVE"); - // 3 8 - } - - public GT_MetaTileEntity_Dehydrator(int aID, String aName, String aNameRegional, int aTier, String aDescription, - int aTankCapacity) { - super( - aID, - aName, - aNameRegional, - aTier, - aDescription, - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, - 2, - 9, - aTankCapacity, - SoundResource.NONE, - false, - false, - SpecialEffects.NONE, - "", - null); - } - - @Override - public String[] getDescription() { - String[] S = super.getDescription(); - final String[] desc = new String[S.length + 1]; - System.arraycopy(S, 0, desc, 0, S.length); - desc[S.length] = CORE.GT_Tooltip.get(); - return desc; - } - - @Override - public ITexture[][][] getTextureSet(final ITexture[] aTextures) { - final ITexture[][][] rTextures = new ITexture[15][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = getSideFacingActive(i); - rTextures[1][i + 1] = getSideFacingInactive(i); - rTextures[2][i + 1] = getFrontFacingActive(i); - rTextures[3][i + 1] = getFrontFacingInactive(i); - rTextures[4][i + 1] = getTopFacingActive(i); - rTextures[5][i + 1] = getTopFacingInactive(i); - rTextures[6][i + 1] = getBottomFacingActive(i); - rTextures[7][i + 1] = getBottomFacingInactive(i); - rTextures[8][i + 1] = getBottomFacingPipeActive(i); - rTextures[9][i + 1] = getBottomFacingPipeInactive(i); - rTextures[10][i + 1] = getTopFacingPipeActive(i); - rTextures[11][i + 1] = getTopFacingPipeInactive(i); - rTextures[12][i + 1] = getSideFacingPipeActive(i); - rTextures[13][i + 1] = getSideFacingPipeInactive(i); - } - return rTextures; - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { - return super.getTexture(aBaseMetaTileEntity, side, facing, aColorIndex, aActive, aRedstone); - } - - @Override - public ITexture[] getFrontFacingInactive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[0]) }; - } - - @Override - public ITexture[] getBottomFacingInactive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[2]) }; - } - - @Override - public ITexture[] getTopFacingInactive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[3]) }; - } - - @Override - public ITexture[] getSideFacingInactive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[4]) }; - } - - @Override - public ITexture[] getFrontFacingActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[5]) }; - } - - @Override - public ITexture[] getBottomFacingActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[7]) }; - } - - @Override - public ITexture[] getTopFacingActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[8]) }; - } - - @Override - public ITexture[] getSideFacingActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[9]) }; - } - - @Override - public ITexture[] getBottomFacingPipeActive(byte aColor) { - return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) }; - } - - @Override - public ITexture[] getBottomFacingPipeInactive(byte aColor) { - return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) }; - } - - @Override - public ITexture[] getTopFacingPipeActive(byte aColor) { - return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) }; - } - - @Override - public ITexture[] getTopFacingPipeInactive(byte aColor) { - return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) }; - } - - @Override - public ITexture[] getSideFacingPipeActive(byte aColor) { - return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) }; - } - - @Override - public ITexture[] getSideFacingPipeInactive(byte aColor) { - return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) }; - } -} 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 3d71f00514..faeae0ba5a 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 @@ -118,50 +118,9 @@ public class TexturesGtBlock { private static final CustomIcon Internal_PlaceHolder = new CustomIcon("TileEntities/_PlaceHolder"); public static final CustomIcon _PlaceHolder = Internal_PlaceHolder; - // Energy overlays - public static final CustomIcon OVERLAY_ENERGY_OUT_BUFFER = new CustomIcon("iconsets/OVERLAY_ENERGY_OUT_BUFFER"); public static final CustomIcon OVERLAY_ENERGY_OUT_MULTI_BUFFER = new CustomIcon( "iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER"); - // Wooden Shelf and Compartment Overlays - public static final CustomIcon OVERLAY_WOODEN_SHELF_FRONT = new CustomIcon("TileEntities/Compartment/wood_shelf"); - public static final CustomIcon OVERLAY_WOODEN_SHELF_CANS_FRONT = new CustomIcon( - "TileEntities/Compartment/wood_shelf_cans"); - public static final CustomIcon OVERLAY_WOODEN_SHELF_PAPER_FRONT = new CustomIcon( - "TileEntities/Compartment/wood_shelf_paper"); - public static final CustomIcon OVERLAY_CABINET_1 = new CustomIcon("TileEntities/Compartment/0"); - public static final CustomIcon OVERLAY_CABINET_2 = new CustomIcon("TileEntities/Compartment/1"); - public static final CustomIcon OVERLAY_CABINET_3 = new CustomIcon("TileEntities/Compartment/2"); - public static final CustomIcon OVERLAY_CABINET_4 = new CustomIcon("TileEntities/Compartment/3"); - public static final CustomIcon OVERLAY_CABINET_5 = new CustomIcon("TileEntities/Compartment/4"); - public static final CustomIcon OVERLAY_CABINET_6 = new CustomIcon("TileEntities/Compartment/5"); - public static final CustomIcon OVERLAY_CABINET_7 = new CustomIcon("TileEntities/Compartment/6"); - public static final CustomIcon OVERLAY_CABINET_8 = new CustomIcon("TileEntities/Compartment/7"); - public static final CustomIcon OVERLAY_CABINET_9 = new CustomIcon("TileEntities/Compartment/8"); - public static final CustomIcon OVERLAY_CABINET_10 = new CustomIcon("TileEntities/Compartment/9"); - public static final CustomIcon OVERLAY_CABINET_11 = new CustomIcon("TileEntities/Compartment/10"); - public static final CustomIcon OVERLAY_CABINET_12 = new CustomIcon("TileEntities/Compartment/11"); - public static final CustomIcon OVERLAY_CABINET_13 = new CustomIcon("TileEntities/Compartment/12"); - public static final CustomIcon OVERLAY_CABINET_14 = new CustomIcon("TileEntities/Compartment/13"); - public static final CustomIcon OVERLAY_CABINET_15 = new CustomIcon("TileEntities/Compartment/14"); - public static final CustomIcon OVERLAY_CABINET_16 = new CustomIcon("TileEntities/Compartment/15"); - public static final CustomIcon OVERLAY_COMPARTMENT_1 = new CustomIcon("TileEntities/Compartment/16"); - public static final CustomIcon OVERLAY_COMPARTMENT_2 = new CustomIcon("TileEntities/Compartment/17"); - public static final CustomIcon OVERLAY_COMPARTMENT_3 = new CustomIcon("TileEntities/Compartment/18"); - public static final CustomIcon OVERLAY_COMPARTMENT_4 = new CustomIcon("TileEntities/Compartment/19"); - public static final CustomIcon OVERLAY_COMPARTMENT_5 = new CustomIcon("TileEntities/Compartment/20"); - public static final CustomIcon OVERLAY_COMPARTMENT_6 = new CustomIcon("TileEntities/Compartment/21"); - public static final CustomIcon OVERLAY_COMPARTMENT_7 = new CustomIcon("TileEntities/Compartment/22"); - public static final CustomIcon OVERLAY_COMPARTMENT_8 = new CustomIcon("TileEntities/Compartment/23"); - public static final CustomIcon OVERLAY_COMPARTMENT_9 = new CustomIcon("TileEntities/Compartment/24"); - public static final CustomIcon OVERLAY_COMPARTMENT_10 = new CustomIcon("TileEntities/Compartment/25"); - public static final CustomIcon OVERLAY_COMPARTMENT_11 = new CustomIcon("TileEntities/Compartment/26"); - public static final CustomIcon OVERLAY_COMPARTMENT_12 = new CustomIcon("TileEntities/Compartment/27"); - public static final CustomIcon OVERLAY_COMPARTMENT_13 = new CustomIcon("TileEntities/Compartment/28"); - public static final CustomIcon OVERLAY_COMPARTMENT_14 = new CustomIcon("TileEntities/Compartment/29"); - public static final CustomIcon OVERLAY_COMPARTMENT_15 = new CustomIcon("TileEntities/Compartment/30"); - public static final CustomIcon OVERLAY_COMPARTMENT_16 = new CustomIcon("TileEntities/Compartment/31"); - // Controllers private static final CustomIcon Internal_Casing_Fusion_Simple_Front = new CustomIcon( "TileEntities/MACHINE_CASING_FUSION_FRONT"); @@ -375,41 +334,11 @@ public class TexturesGtBlock { public static final CustomIcon TEXTURE_PIPE_GRINDING_MILL = new CustomIcon("TileEntities/MACHINE_CASING_PIPE_T1"); public static final CustomIcon TEXTURE_PIPE_GENERIC = new CustomIcon("iconsets/MACHINE_CASING_PIPE_GENERIC"); - public static final CustomIcon TEXTURE_PIPE_T1_BABBIT_ALLOY = new CustomIcon( - "iconsets/MACHINE_CASING_PIPE_BABBIT_ALLOY"); - public static final CustomIcon TEXTURE_PIPE_T2_INCONEL_690 = new CustomIcon( - "iconsets/MACHINE_CASING_PIPE_INCONEL_690"); - public static final CustomIcon TEXTURE_PIPE_T3_STELLITE = new CustomIcon("iconsets/MACHINE_CASING_PIPE_STELLITE"); - public static final CustomIcon TEXTURE_PIPE_T4_NITINOL_60 = new CustomIcon( - "iconsets/MACHINE_CASING_PIPE_NITINOL_60"); - public static final CustomIcon TEXTURE_PIPE_T5_LAFIUM = new CustomIcon("iconsets/MACHINE_CASING_PIPE_LAFIUM"); - public static final CustomIcon TEXTURE_PIPE_T6_CINOBITE = new CustomIcon("iconsets/MACHINE_CASING_PIPE_CINOBITE"); - public static final CustomIcon TEXTURE_PIPE_T7_TITANSTEEL = new CustomIcon( - "iconsets/MACHINE_CASING_PIPE_TITANSTEEL"); - public static final CustomIcon TEXTURE_PIPE_T8_ABYSSAL = new CustomIcon("iconsets/MACHINE_CASING_PIPE_ABYSSAL"); - // Custom Gearboxes public static final CustomIcon TEXTURE_GEARBOX_GRINDING_MILL = new CustomIcon( "TileEntities/MACHINE_CASING_GEARBOX_T1"); public static final CustomIcon TEXTURE_GEARBOX_GENERIC = new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_GENERIC"); - public static final CustomIcon TEXTURE_GEARBOX_T1_EGLIN_STEEL = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_EGLIN_STEEL"); - public static final CustomIcon TEXTURE_GEARBOX_T2_INCONEL_792 = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_INCONEL_792"); - public static final CustomIcon TEXTURE_GEARBOX_T3_INCOLOY_MA956 = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_INCOLOY_MA956"); - public static final CustomIcon TEXTURE_GEARBOX_T4_NITINOL_60 = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_NITINOL_60"); - public static final CustomIcon TEXTURE_GEARBOX_T5_ZERON_100 = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_ZERON_100"); - public static final CustomIcon TEXTURE_GEARBOX_T6_PIKYONIUM = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_PIKYONIUM"); - public static final CustomIcon TEXTURE_GEARBOX_T7_TITANSTEEL = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_TITANSTEEL"); - public static final CustomIcon TEXTURE_GEARBOX_T8_ABYSSAL = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_ABYSSAL"); - public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II = new CustomIcon("iconsets/MACHINE_CASING_FUSION_3"); public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_INNER = new CustomIcon( "iconsets/MACHINE_CASING_FUSION_COIL_II"); @@ -522,18 +451,6 @@ public class TexturesGtBlock { "iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE"); public static final CustomIcon Overlay_Machine_Controller_Advanced_Active = Internal_Overlay_Machine_Controller_Advanced_Active; - // Fluid Reactor Overlays - public static final CustomIcon Overlay_FluidReactor_Front = new CustomIcon( - "TileEntities/FluidReactor/OVERLAY_FRONT"); - public static final CustomIcon Overlay_FluidReactor_Side = new CustomIcon("TileEntities/FluidReactor/OVERLAY_SIDE"); - public static final CustomIcon Overlay_FluidReactor_Top = new CustomIcon("TileEntities/FluidReactor/OVERLAY_TOP"); - public static final CustomIcon Overlay_FluidReactor_Front_Active = new CustomIcon( - "TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE"); - public static final CustomIcon Overlay_FluidReactor_Side_Active = new CustomIcon( - "TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE"); - public static final CustomIcon Overlay_FluidReactor_Top_Active = new CustomIcon( - "TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE"); - // Crafting Overlays public static final CustomIcon Overlay_Crafting_Bronze = new CustomIcon("TileEntities/bronze_top_crafting"); public static final CustomIcon Overlay_Crafting_Steel = new CustomIcon("TileEntities/cover_crafting"); @@ -602,27 +519,6 @@ public class TexturesGtBlock { public static final CustomIcon Casing_InventoryManagaer_Blue_Redstone = new CustomIcon( "TileEntities/gt4/OVERLAY_BLUE_REDSTONE"); - private static final CustomIcon Casing_Test_1 = new CustomIcon("number/1"); - private static final CustomIcon Casing_Test_2 = new CustomIcon("number/2"); - private static final CustomIcon Casing_Test_3 = new CustomIcon("number/3"); - private static final CustomIcon Casing_Test_4 = new CustomIcon("number/4"); - private static final CustomIcon Casing_Test_5 = new CustomIcon("number/5"); - private static final CustomIcon Casing_Test_6 = new CustomIcon("number/6"); - private static final CustomIcon Casing_Test_7 = new CustomIcon("number/7"); - private static final CustomIcon Casing_Test_8 = new CustomIcon("number/8"); - private static final CustomIcon Casing_Test_9 = new CustomIcon("number/9"); - private static final CustomIcon Casing_Test_10 = new CustomIcon("number/10"); - private static final CustomIcon Casing_Test_11 = new CustomIcon("number/11"); - private static final CustomIcon Casing_Test_12 = new CustomIcon("number/12"); - private static final CustomIcon Casing_Test_13 = new CustomIcon("number/13"); - private static final CustomIcon Casing_Test_14 = new CustomIcon("number/14"); - private static final CustomIcon Casing_Test_15 = new CustomIcon("number/15"); - private static final CustomIcon Casing_Test_16 = new CustomIcon("number/16"); - - public static final CustomIcon[] TEST_NUMBER = new CustomIcon[] { Casing_Test_1, Casing_Test_2, Casing_Test_3, - Casing_Test_4, Casing_Test_5, Casing_Test_6, Casing_Test_7, Casing_Test_8, Casing_Test_9, Casing_Test_10, - Casing_Test_11, Casing_Test_12, Casing_Test_13, Casing_Test_14, Casing_Test_15, Casing_Test_16 }; - // Covers private static final CustomIcon Internal_Overlay_Overflow_Valve = new CustomIcon("iconsets/OVERLAY_OVERFLOW_VALVE"); public static final CustomIcon Overlay_Overflow_Valve = Internal_Overlay_Overflow_Valve; @@ -773,46 +669,6 @@ public class TexturesGtBlock { public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE_ALT = new CustomIcon( "TileEntities/DecayablesChest_top"); - // LFTR Single blocks - public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_FRONT = new CustomIcon( - "TileEntities/ReactorColdTrap/OVERLAY_FRONT"); - public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE = new CustomIcon( - "TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE"); - public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_SIDE = new CustomIcon( - "TileEntities/ReactorColdTrap/OVERLAY_SIDE"); - public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE = new CustomIcon( - "TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE"); - public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_TOP = new CustomIcon( - "TileEntities/ReactorColdTrap/OVERLAY_TOP"); - public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE = new CustomIcon( - "TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE"); - - public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_FRONT = new CustomIcon( - "TileEntities/ReactorProcessingUnit/OVERLAY_FRONT"); - public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE = new CustomIcon( - "TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE"); - public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_SIDE = new CustomIcon( - "TileEntities/ReactorProcessingUnit/OVERLAY_SIDE"); - public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE = new CustomIcon( - "TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE"); - public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_TOP = new CustomIcon( - "TileEntities/ReactorProcessingUnit/OVERLAY_TOP"); - public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE = new CustomIcon( - "TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE"); - - // Overlay Arrays - public static ITexture[] OVERLAYS_ENERGY_OUT_BUFFER = new ITexture[] { - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 220, 220, 220, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 220, 220, 220, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 255, 100, 0, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 255, 255, 30, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 128, 128, 128, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }) }; - public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[] { new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), @@ -827,42 +683,6 @@ public class TexturesGtBlock { (IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }) }; - public static ITexture[] OVERLAYS_CABINET_FRONT = new ITexture[] { - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_1, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_2, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_3, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_4, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_5, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_6, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_7, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_8, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_9, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_10, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_11, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_12, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_13, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_14, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_15, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_16, new short[] { 255, 255, 255, 0 }), }; - - public static ITexture[] OVERLAYS_COMPARTMENT_FRONT = new ITexture[] { - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_1, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_2, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_3, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_4, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_5, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_6, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_7, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_8, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_9, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_10, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_11, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_12, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_13, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_14, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_15, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_16, new short[] { 255, 255, 255, 0 }), }; - public static IIconContainer[] CONNECTED_FUSION_HULLS = new IIconContainer[] { TEXTURE_CASING_FUSION_COIL_II_1, TEXTURE_CASING_FUSION_COIL_II_2, TEXTURE_CASING_FUSION_COIL_II_3, TEXTURE_CASING_FUSION_COIL_II_4, TEXTURE_CASING_FUSION_COIL_II_5, TEXTURE_CASING_FUSION_COIL_II_6, TEXTURE_CASING_FUSION_COIL_II_7, @@ -879,6 +699,4 @@ public class TexturesGtBlock { TEXTURE_CASING_TIERED_LV, TEXTURE_CASING_TIERED_MV, TEXTURE_CASING_TIERED_HV, TEXTURE_CASING_TIERED_EV, TEXTURE_CASING_TIERED_IV, TEXTURE_CASING_TIERED_LuV, TEXTURE_CASING_TIERED_ZPM, TEXTURE_CASING_TIERED_UV, TEXTURE_CASING_TIERED_MAX }; - - public static Object Casing_Material_Turbine; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java deleted file mode 100644 index f21752795c..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java +++ /dev/null @@ -1,78 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; - -import org.apache.commons.lang3.ArrayUtils; - -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GTPP_Recipe; -import gregtech.api.util.GT_Recipe; -import gtPlusPlus.core.lib.CORE; - -public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicMachine { - - public GregtechMetaTileEntity_BasicWasher(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - 1, - "It's like an automatic Cauldron for washing dusts.", - 1, - 1, - new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER) }); - } - - public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1); - } - - @Override - public String[] getDescription() { - return ArrayUtils - .addAll(this.mDescriptionArray, "Grants no byproducts, but it is fast.", CORE.GT_Tooltip.get()); - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_BasicWasher(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - @Override - public GT_Recipe.GT_Recipe_Map getRecipeList() { - return GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes; - } - - @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return (super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack)) - && (getRecipeList().containsInput(aStack)); - } - - @Override - public boolean isFluidInputAllowed(FluidStack aFluid) { - return (aFluid.getFluid().getName().equals("water")) || (super.isFluidInputAllowed(aFluid)); - } - - @Override - public int getCapacity() { - return 8000 * Math.max(1, this.mTier); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java deleted file mode 100644 index 84bb17bf16..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java +++ /dev/null @@ -1,86 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.