From 83f8f232e7d542b1c1cf21b55beb630c2d916225 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Mon, 18 May 2015 23:56:48 +0200 Subject: [PATCH] update 5.08.14 --- main/java/gregtech/api/enums/ItemList.java | 2 +- main/java/gregtech/api/enums/Materials.java | 31 +- main/java/gregtech/api/enums/Textures.java | 54 +++ .../metatileentity/BaseMetaTileEntity.java | 4 +- .../GT_MetaTileEntity_Hatch_Maintenance.java | 6 + .../GT_MetaTileEntity_MultiBlockBase.java | 6 +- .../java/gregtech/api/util/GT_ModHandler.java | 1 + main/java/gregtech/common/GT_Proxy.java | 2 +- .../common/blocks/GT_Block_Casings4.java | 402 +++++++++++++++++- .../basic/GT_MetaTileEntity_Scanner.java | 12 +- .../GT_MetaTileEntity_BronzeBlastFurnace.java | 6 +- .../multi/GT_MetaTileEntity_LargeBoiler.java | 15 +- .../multi/GT_MetaTileEntity_LargeTurbine.java | 19 +- .../common/tools/GT_Tool_Chainsaw_LV.java | 2 +- .../common/tools/GT_Tool_Drill_HV.java | 2 +- .../common/tools/GT_Tool_Drill_LV.java | 2 +- .../common/tools/GT_Tool_HardHammer.java | 2 +- .../common/tools/GT_Tool_JackHammer.java | 2 +- .../common/tools/GT_Tool_Pickaxe.java | 2 +- .../common/tools/GT_Tool_UniversalSpade.java | 2 +- .../loaders/misc/GT_Achievements.java | 16 +- .../postload/GT_MachineRecipeLoader.java | 8 +- .../GT_Loader_Item_Block_And_Fluid.java | 2 +- .../preload/GT_Loader_MetaTileEntities.java | 1 + .../resources/assets/gregtech/lang/en_US.lang | 4 +- .../textures/blocks/iconsets/FUSIONII_1.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONII_10.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONII_11.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONII_12.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONII_2.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONII_3.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONII_4.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONII_5.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONII_6.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONII_7.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONII_8.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONII_9.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONI_1.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONI_10.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONI_11.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONI_12.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONI_2.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONI_3.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONI_4.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONI_5.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONI_6.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONI_7.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONI_8.png | Bin 0 -> 822 bytes .../textures/blocks/iconsets/FUSIONI_9.png | Bin 0 -> 822 bytes .../blocks/iconsets/LARGETURBINE1.png | Bin 0 -> 515 bytes .../blocks/iconsets/LARGETURBINE2.png | Bin 0 -> 586 bytes .../blocks/iconsets/LARGETURBINE3.png | Bin 0 -> 571 bytes .../blocks/iconsets/LARGETURBINE4.png | Bin 0 -> 625 bytes .../blocks/iconsets/LARGETURBINE5.png | Bin 0 -> 366 bytes .../blocks/iconsets/LARGETURBINE6.png | Bin 0 -> 652 bytes .../blocks/iconsets/LARGETURBINE7.png | Bin 0 -> 585 bytes .../blocks/iconsets/LARGETURBINE8.png | Bin 0 -> 594 bytes .../blocks/iconsets/LARGETURBINE9.png | Bin 0 -> 564 bytes .../blocks/iconsets/LARGETURBINE_ACTIVE1.png | Bin 0 -> 761 bytes .../iconsets/LARGETURBINE_ACTIVE1.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE2.png | Bin 0 -> 1131 bytes .../iconsets/LARGETURBINE_ACTIVE2.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE3.png | Bin 0 -> 798 bytes .../iconsets/LARGETURBINE_ACTIVE3.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE4.png | Bin 0 -> 1347 bytes .../iconsets/LARGETURBINE_ACTIVE4.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE5.png | Bin 0 -> 949 bytes .../iconsets/LARGETURBINE_ACTIVE5.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE6.png | Bin 0 -> 1481 bytes .../iconsets/LARGETURBINE_ACTIVE6.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE7.png | Bin 0 -> 868 bytes .../iconsets/LARGETURBINE_ACTIVE7.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE8.png | Bin 0 -> 1176 bytes .../iconsets/LARGETURBINE_ACTIVE8.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE9.png | Bin 0 -> 898 bytes .../iconsets/LARGETURBINE_ACTIVE9.png.mcmeta | 3 + .../iconsets/MACHINE_CASING_TURBINE.png | Bin 0 -> 473 bytes .../textures/blocks/iconsets/Thumbs.db | Bin 244224 -> 292352 bytes 78 files changed, 570 insertions(+), 62 deletions(-) create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_1.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_10.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_11.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_12.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_2.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_3.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_4.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_5.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_6.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_7.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_8.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_9.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_1.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_10.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_11.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_12.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_2.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_3.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_4.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_5.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_6.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_7.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_8.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_9.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE1.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE2.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE3.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE4.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE5.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE6.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE7.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE8.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE9.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE1.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE1.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE2.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE2.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE3.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE3.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE4.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE4.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE5.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE5.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE6.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE6.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE7.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE7.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE8.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE8.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE9.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE9.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TURBINE.png diff --git a/main/java/gregtech/api/enums/ItemList.java b/main/java/gregtech/api/enums/ItemList.java index 7581e73d..4ce75cd7 100644 --- a/main/java/gregtech/api/enums/ItemList.java +++ b/main/java/gregtech/api/enums/ItemList.java @@ -645,7 +645,7 @@ public enum ItemList implements IItemContainer { Energy_LapotronicOrb2, ZPM2, Quantum_Tank_LV,Quantum_Tank_MV,Quantum_Tank_HV,Quantum_Tank_EV,Quantum_Tank_IV, Quantum_Chest_LV, Quantum_Chest_MV, Quantum_Chest_HV, Quantum_Chest_EV, Quantum_Chest_IV, - NULL, Cover_RedstoneTransmitterExternal,Cover_RedstoneTransmitterInternal,Cover_RedstoneReceiverExternal,Cover_RedstoneReceiverInternal, LargeTurbine, Ingot_Heavy1,Ingot_Heavy2,Ingot_Heavy3, Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV, Teleporter, Cover_NeedsMaintainance; + NULL, Cover_RedstoneTransmitterExternal,Cover_RedstoneTransmitterInternal,Cover_RedstoneReceiverExternal,Cover_RedstoneReceiverInternal, LargeTurbine, Ingot_Heavy1,Ingot_Heavy2,Ingot_Heavy3, Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV, Teleporter, Cover_NeedsMaintainance, Casing_Turbine; public static final ItemList[] DYE_ONLY_ITEMS = {Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15} diff --git a/main/java/gregtech/api/enums/Materials.java b/main/java/gregtech/api/enums/Materials.java index 642c6818..4c7057ee 100644 --- a/main/java/gregtech/api/enums/Materials.java +++ b/main/java/gregtech/api/enums/Materials.java @@ -201,7 +201,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Draconium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Draconium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), DraconiumAwakened ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Awakened Draconium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), PurpleAlloy ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 100, 180, 255, 0, "Purple Alloy" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), - InfusedTeslatite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 100, 180, 255, 0, "Infused Teslatite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), + InfusedTeslatite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 100, 180, 255, 0, "Infused Teslatite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), /** * Unknown Material Components. Dead End Section. @@ -210,12 +210,12 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Adamite ( -1, TextureSet.SET_NONE , 1.0F, 0, 3, 1 |8 , 255, 255, 255, 0, "Adamite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeLightGray ), Adluorite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |8 , 255, 255, 255, 0, "Adluorite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Agate ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Agate" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), - Alduorite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |8 , 255, 255, 255, 0, "Alduorite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Alduorite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |8|16 , 255, 255, 255, 0, "Alduorite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Amber ( 514, TextureSet.SET_RUBY , 4.0F, 128, 2, 1 |4|8 |64 , 255, 128, 0, 127, "Amber" , 5, 3, -1, 0, F, T, 1, 1, 1, Dyes.dyeOrange , Arrays.asList(new TC_AspectStack(TC_Aspects.VINCULUM, 2), new TC_AspectStack(TC_Aspects.VITREUS, 1))), Ammonium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Ammonium" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), - Amordrine ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8 |64 , 255, 255, 255, 0, "Amordrine" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Amordrine ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8|16 |64 , 255, 255, 255, 0, "Amordrine" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Andesite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |8 , 255, 255, 255, 0, "Andesite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), - Angmallen ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8 |64 , 255, 255, 255, 0, "Angmallen" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Angmallen ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8|16 |64 , 255, 255, 255, 0, "Angmallen" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Ardite ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8 |64 , 255, 0, 0, 0, "Ardite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeYellow ), Aredrite ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8 |64 , 255, 0, 0, 0, "Aredrite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeYellow ), Atlarus ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8 |64 , 255, 255, 255, 0, "Atlarus" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), @@ -227,7 +227,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Bloodstone ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Bloodstone" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeRed ), Blutonium ( -1, TextureSet.SET_SHINY , 1.0F, 0, 2, 1|2 |8 , 0, 0, 255, 0, "Blutonium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeBlue ), Carmot ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8 |64 , 255, 255, 255, 0, "Carmot" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), - Celenegil ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8 |64 , 255, 255, 255, 0, "Celenegil" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Celenegil ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8|16 |64 , 255, 255, 255, 0, "Celenegil" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), CertusQuartz ( 516, TextureSet.SET_QUARTZ , 5.0F, 32, 1, 1 |4|8 |64 , 210, 210, 230, 0, "Certus Quartz" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeLightGray , Arrays.asList(new TC_AspectStack(TC_Aspects.POTENTIA, 1), new TC_AspectStack(TC_Aspects.VITREUS, 1))), Ceruclase ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 |8 , 255, 255, 255, 0, "Ceruclase" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Citrine ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Citrine" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), @@ -246,9 +246,10 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { DarkStone ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Dark Stone" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeBlack ), Demonite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Demonite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeRed ), Desh ( 884, TextureSet.SET_DULL , 1.0F, 1280, 3, 1|2 |8 |64|128 , 40, 40, 40, 0, "Desh" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeBlack ), - Desichalkos ( -1, TextureSet.SET_NONE , 6.0F, 1280, 3, 1|2 |8 |64 , 255, 255, 255, 0, "Desichalkos" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Desichalkos ( -1, TextureSet.SET_NONE , 6.0F, 1280, 3, 1|2 |8|16 |64 , 255, 255, 255, 0, "Desichalkos" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Dilithium ( 515, TextureSet.SET_DIAMOND , 1.0F, 0, 1, 1 |4|8|16 , 255, 250, 250, 127, "Dilithium" , 0, 0, -1, 0, F, T, 1, 1, 1, Dyes.dyeWhite ), Draconic ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Draconic" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeRed ), + Drulloy ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|16 , 255, 255, 255, 0, "Drulloy" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeRed ), Duranium ( 328, TextureSet.SET_METALLIC , 8.0F, 1280, 4, 1|2 |64 , 255, 255, 255, 0, "Duranium" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeLightGray ), Eclogite ( 860, TextureSet.SET_DULL , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Eclogite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), ElectrumFlux ( 320, TextureSet.SET_SHINY , 16.0F, 512, 3, 1|2 |64 , 255, 255, 120, 0, "Fluxed Electrum" , 0, 0, 3000, 3000, T, F, 1, 1, 1, Dyes.dyeYellow ), @@ -273,11 +274,11 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Greenschist ( 866, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Green Schist" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeGreen ), Greenstone ( 867, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Greenstone" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeGreen ), Greywacke ( 868, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Greywacke" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeGray ), - Haderoth ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8 |64 , 255, 255, 255, 0, "Haderoth" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Haderoth ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8|16 |64 , 255, 255, 255, 0, "Haderoth" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Hematite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 |8 , 255, 255, 255, 0, "Hematite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), - Hepatizon ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8 |64 , 255, 255, 255, 0, "Hepatizon" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Hepatizon ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8|16 |64 , 255, 255, 255, 0, "Hepatizon" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), HSLA ( 322, TextureSet.SET_METALLIC , 6.0F, 500, 2, 1|2 |64|128 , 128, 128, 128, 0, "HSLA Steel" , 0, 0, 1811, 1000, T, F, 3, 1, 1, Dyes._NULL , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_AspectStack(TC_Aspects.ORDO, 1))), - Ignatius ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Ignatius" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Ignatius ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |16 , 255, 255, 255, 0, "Ignatius" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Infernal ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 255, 255, 255, 0, "Infernal" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Infuscolium ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8 |64 , 255, 255, 255, 0, "Infuscolium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), InfusedGold ( 323, TextureSet.SET_SHINY , 12.0F, 64, 3, 1|2 |8 |64|128 , 255, 200, 60, 0, "Infused Gold" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeYellow ), @@ -289,14 +290,14 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { InfusedOrder ( 545, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 252, 252, 252, 0, "Ordo" , 5, 240, -1, 0, F, T, 3, 1, 1, Dyes.dyeWhite , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.ORDO, 2))), InfusedVis ( -1, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 255, 0, 255, 0, "Auram" , 5, 240, -1, 0, F, T, 3, 1, 1, Dyes.dyePurple , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.AURAM, 2))), InfusedDull ( -1, TextureSet.SET_SHARDS , 32.0F, 64, 3, 1 |4|8 |64|128 , 100, 100, 100, 0, "Vacuus" , 5, 160, -1, 0, F, T, 3, 1, 1, Dyes.dyeLightGray , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.VACUOS, 2))), - Inolashite ( -1, TextureSet.SET_NONE , 6.0F, 128, 3, 1|2 |8 |64 , 255, 255, 255, 0, "Inolashite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Inolashite ( -1, TextureSet.SET_NONE , 6.0F, 128, 3, 1|2 |8|16 |64 , 255, 255, 255, 0, "Inolashite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Invisium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Invisium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), Jade ( 537, TextureSet.SET_SHINY , 1.0F, 0, 2, 1 |8 , 0, 100, 0, 0, "Jade" , 0, 0, -1, 0, F, F, 5, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.LUCRUM, 6), new TC_AspectStack(TC_Aspects.VITREUS, 3))), Jasper ( 511, TextureSet.SET_EMERALD , 1.0F, 0, 2, 1 |4|8 , 200, 80, 80, 100, "Jasper" , 0, 0, -1, 0, F, T, 3, 1, 1, Dyes.dyeRed , Arrays.asList(new TC_AspectStack(TC_Aspects.LUCRUM, 4), new TC_AspectStack(TC_Aspects.VITREUS, 2))), - Kalendrite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Kalendrite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Kalendrite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |16 , 255, 255, 255, 0, "Kalendrite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Komatiite ( 869, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Komatiite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeYellow ), Lava ( 700, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 255, 64, 0, 0, "Lava" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeOrange ), - Lemurite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Lemurite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Lemurite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |16 , 255, 255, 255, 0, "Lemurite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Limestone ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Limestone" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Lodestone ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Lodestone" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Luminite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 250, 250, 250, 0, "Luminite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeWhite ), @@ -306,7 +307,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { MeteoricIron ( 340, TextureSet.SET_METALLIC , 6.0F, 384, 2, 1|2 |8 |64 , 100, 50, 80, 0, "Meteoric Iron" , 0, 0, 1811, 0, F, F, 1, 1, 1, Dyes.dyeGray , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.MAGNETO, 1))), MeteoricSteel ( 341, TextureSet.SET_METALLIC , 6.0F, 768, 2, 1|2 |64 , 50, 25, 40, 0, "Meteoric Steel" , 0, 0, 1811, 1000, T, F, 1, 1, 1, Dyes.dyeGray , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.MAGNETO, 1), new TC_AspectStack(TC_Aspects.ORDO, 1))), Meteorite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 80, 35, 60, 0, "Meteorite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyePurple ), - Meutoite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Meutoite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Meutoite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8|16 , 255, 255, 255, 0, "Meutoite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Migmatite ( 872, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Migmatite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Mimichite ( -1, TextureSet.SET_GEM_VERTICAL , 1.0F, 0, 1, 1 |4|8 , 255, 255, 255, 0, "Mimichite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Moonstone ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Moonstone" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeWhite , Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_AspectStack(TC_Aspects.ALIENIS, 1))), @@ -338,7 +339,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { RefinedGlowstone (-326, TextureSet.SET_METALLIC , 1.0F, 0, 1, 1|2 , 255, 255, 0, 0, "Refined Glowstone" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeYellow ), RefinedObsidian (-327, TextureSet.SET_METALLIC , 1.0F, 0, 1, 1|2 , 80, 50, 100, 0, "Refined Obsidian" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyePurple ), Rhyolite ( 875, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Rhyolite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), - Rubracium ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Rubracium" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Rubracium ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8|16 , 255, 255, 255, 0, "Rubracium" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), RyuDragonRyder ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 0 , 255, 255, 255, 0, "Ryu Dragon Ryder" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Sand ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 0 , 255, 255, 255, 0, "Sand" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeYellow ), Sanguinite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1|2 |8 , 255, 255, 255, 0, "Sanguinite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), @@ -348,7 +349,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Sugilite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Sugilite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), Sunstone ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Sunstone" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeYellow , Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_AspectStack(TC_Aspects.ALIENIS, 1))), Tar ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 0 , 10, 10, 10, 0, "Tar" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeBlack ), - Tartarite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1|2 |8 , 255, 255, 255, 0, "Tartarite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Tartarite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1|2 |8|16 , 255, 255, 255, 0, "Tartarite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Tapazite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Tapazite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeGreen ), Thyrium ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1|2 |8 , 255, 255, 255, 0, "Thyrium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), Tourmaline ( -1, TextureSet.SET_RUBY , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Tourmaline" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), diff --git a/main/java/gregtech/api/enums/Textures.java b/main/java/gregtech/api/enums/Textures.java index f749a2d2..5ebbd26d 100644 --- a/main/java/gregtech/api/enums/Textures.java +++ b/main/java/gregtech/api/enums/Textures.java @@ -63,6 +63,9 @@ public class Textures { , OVERLAY_FRONT_POTIONBREWER_ACTIVE, OVERLAY_FRONT_REPLICATOR_ACTIVE, OVERLAY_FRONT_MASSFAB_ACTIVE, OVERLAY_FRONT_STEAM_HAMMER_ACTIVE, OVERLAY_FRONT_STEAM_FURNACE_ACTIVE, OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE, OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE, OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE, OVERLAY_FRONT_DISASSEMBLER_ACTIVE, OVERLAY_FRONT_BOXINATOR_ACTIVE, OVERLAY_FRONT_ROCK_BREAKER_ACTIVE, OVERLAY_FRONT_SCANNER_ACTIVE , OVERLAY_BOTTOM_POTIONBREWER_ACTIVE, OVERLAY_BOTTOM_REPLICATOR_ACTIVE, OVERLAY_BOTTOM_MASSFAB_ACTIVE, OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE, OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE, OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE, OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE, OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE, OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE, OVERLAY_BOTTOM_BOXINATOR_ACTIVE, OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE, OVERLAY_BOTTOM_SCANNER_ACTIVE , OVERLAY_SIDE_POTIONBREWER_ACTIVE, OVERLAY_SIDE_REPLICATOR_ACTIVE, OVERLAY_SIDE_MASSFAB_ACTIVE, OVERLAY_SIDE_STEAM_HAMMER_ACTIVE, OVERLAY_SIDE_STEAM_FURNACE_ACTIVE, OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE, OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE, OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE, OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE, OVERLAY_SIDE_DISASSEMBLER_ACTIVE, OVERLAY_SIDE_BOXINATOR_ACTIVE, OVERLAY_SIDE_ROCK_BREAKER_ACTIVE, OVERLAY_SIDE_SCANNER_ACTIVE, OVERLAY_ADV_PUMP, OVERLAY_TELEPORTER,OVERLAY_TELEPORTER_ACTIVE + ,FUSIONI_1,FUSIONI_2,FUSIONI_3,FUSIONI_4,FUSIONI_5,FUSIONI_6,FUSIONI_7,FUSIONI_8,FUSIONI_9,FUSIONI_10,FUSIONI_11,FUSIONI_12,FUSIONII_1,FUSIONII_2,FUSIONII_3,FUSIONII_4,FUSIONII_5,FUSIONII_6,FUSIONII_7,FUSIONII_8,FUSIONII_9,FUSIONII_10,FUSIONII_11,FUSIONII_12 + ,LARGETURBINE1,LARGETURBINE2,LARGETURBINE3,LARGETURBINE4,LARGETURBINE5,LARGETURBINE6,LARGETURBINE7,LARGETURBINE8,LARGETURBINE9,LARGETURBINE_ACTIVE1,LARGETURBINE_ACTIVE2,LARGETURBINE_ACTIVE3,LARGETURBINE_ACTIVE4,LARGETURBINE_ACTIVE5,LARGETURBINE_ACTIVE6,LARGETURBINE_ACTIVE7,LARGETURBINE_ACTIVE8,LARGETURBINE_ACTIVE9, MACHINE_CASING_TURBINE + ; protected IIcon mIcon; @@ -208,8 +211,59 @@ public class Textures { CONCRETE_LIGHT_BRICKS_MOSSY, CONCRETE_LIGHT_BRICKS_CHISELED, CONCRETE_LIGHT_SMOOTH, + }, + TURBINE = new IIconContainer[] { + LARGETURBINE1, + LARGETURBINE2, + LARGETURBINE3, + LARGETURBINE4, + LARGETURBINE5, + LARGETURBINE6, + LARGETURBINE7, + LARGETURBINE8, + LARGETURBINE9 + }, + TURBINE_ACTIVE = new IIconContainer[] { + LARGETURBINE_ACTIVE1, + LARGETURBINE_ACTIVE2, + LARGETURBINE_ACTIVE3, + LARGETURBINE_ACTIVE4, + LARGETURBINE_ACTIVE5, + LARGETURBINE_ACTIVE6, + LARGETURBINE_ACTIVE7, + LARGETURBINE_ACTIVE8, + LARGETURBINE_ACTIVE9 + }, + CONNECTED_HULLS = new IIconContainer[] { + CONCRETE_DARK_STONE, + FUSIONI_1, + FUSIONI_2, + FUSIONI_3, + FUSIONI_4, + FUSIONI_5, + FUSIONI_6, + FUSIONI_7, + FUSIONI_8, + FUSIONI_9, + FUSIONI_10, + FUSIONI_11, + FUSIONI_12, + FUSIONII_1, + FUSIONII_2, + FUSIONII_3, + FUSIONII_4, + FUSIONII_5, + FUSIONII_6, + FUSIONII_7, + FUSIONII_8, + FUSIONII_9, + FUSIONII_10, + FUSIONII_11, + FUSIONII_12, }; + + public static ITexture[] ERROR_RENDERING = new ITexture[] { new GT_RenderedTexture(RENDERING_ERROR) diff --git a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 5a3dfd4e..2d631545 100644 --- a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -389,7 +389,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE || (getCoverIDAtSide((byte)5) == 0 && worldObj.getPrecipitationHeight(xCoord+1, zCoord ) - 1 < yCoord)) { if (GregTech_API.sMachineRainExplosions && worldObj.isRaining() && getBiome().rainfall > 0) { if (getRandomNumber(10)==0) {doEnergyExplosion(); - GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather"); + try{GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather");}catch(Exception e){} }else setOnFire(); } if (!hasValidMetaTileEntity()) { @@ -398,7 +398,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE } if (GregTech_API.sMachineThunderExplosions && worldObj.isThundering() && getBiome().rainfall > 0 && getRandomNumber(3) == 0) { doEnergyExplosion(); - GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather"); + try{GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather");}catch(Exception e){} } } } diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java index 6468d6a7..cd04a07d 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java @@ -1,5 +1,6 @@ package gregtech.api.metatileentity.implementations; +import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.gui.GT_Container_MaintenanceHatch; @@ -13,6 +14,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -88,6 +90,10 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch getBaseMetaTileEntity().setActive(false); aStack.stackSize--; } + if(mSolderingTool&&aPlayer instanceof EntityPlayerMP){ + EntityPlayerMP tPlayer = (EntityPlayerMP) aPlayer; + try{GT_Mod.instance.achievements.issueAchievement( tPlayer, "maintainance");}catch(Exception e){} + } } @Override diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index b93e4671..d0722f66 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -181,7 +181,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { stopMachine(); } if (mMaxProgresstime > 0 && ++mProgresstime>=mMaxProgresstime) { - if (mOutputItems != null) for (ItemStack tStack : mOutputItems) if (tStack != null) {GT_Mod.instance.achievements.issueAchivementHatch(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), tStack);addOutput(tStack);} + if (mOutputItems != null) for (ItemStack tStack : mOutputItems) if (tStack != null) { + try{GT_Mod.instance.achievements.issueAchivementHatch(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), tStack);}catch(Exception e){} + addOutput(tStack);} if (mOutputFluids != null&&mOutputFluids.length==1) {for (FluidStack tStack : mOutputFluids) if (tStack != null) {addOutput(tStack);}} else if(mOutputFluids!=null&&mOutputFluids.length>1){ addFluidOutputs(mOutputFluids);} @@ -195,7 +197,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { System.out.println("fluids"+mOutputFluids.length); GT_Mod.instance.achievements.issueAchivementHatchFluid(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), mOutputFluids[0]); if(mOutputFluids.length>1){GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "oilplant");} - mOutputFluids = null; +// mOutputFluids = null; } } } diff --git a/main/java/gregtech/api/util/GT_ModHandler.java b/main/java/gregtech/api/util/GT_ModHandler.java index 91addfbd..72ba214b 100644 --- a/main/java/gregtech/api/util/GT_ModHandler.java +++ b/main/java/gregtech/api/util/GT_ModHandler.java @@ -1579,6 +1579,7 @@ public class GT_ModHandler { if (aPlayer instanceof EntityPlayer) { EntityPlayer tPlayer = (EntityPlayer)aPlayer; if (tPlayer.capabilities.isCreativeMode) return T; + System.out.println("hier"); for (int i = 0; i < tPlayer.inventory.mainInventory.length; i++) { if (GT_Utility.isStackInList(tPlayer.inventory.mainInventory[i], GregTech_API.sSolderingMetalList)) { tPlayer.inventory.mainInventory[i].stackSize--; diff --git a/main/java/gregtech/common/GT_Proxy.java b/main/java/gregtech/common/GT_Proxy.java index e6dce1cd..881797c0 100644 --- a/main/java/gregtech/common/GT_Proxy.java +++ b/main/java/gregtech/common/GT_Proxy.java @@ -1329,7 +1329,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { default: break; } - if ((!aPrefix.mIsUnificatable) || (aMaterial.mUnificatable)) { + if ((!aPrefix.mIsUnificatable) || (aMaterial.mUnificatable)) {return; } } else { for (Dyes tDye : Dyes.VALUES) { diff --git a/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/main/java/gregtech/common/blocks/GT_Block_Casings4.java index f533eb2c..12a470dc 100644 --- a/main/java/gregtech/common/blocks/GT_Block_Casings4.java +++ b/main/java/gregtech/common/blocks/GT_Block_Casings4.java @@ -1,16 +1,25 @@ /* 1: */ package gregtech.common.blocks; /* 2: */ -/* 3: */ import gregtech.api.enums.ItemList; +/* 3: */ import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.ItemList; import gregtech.api.enums.Textures; /* 4: */ import gregtech.api.enums.Textures.BlockIcons; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; /* 5: */ import gregtech.api.objects.GT_CopiedBlockTexture; /* 6: */ import gregtech.api.util.GT_LanguageManager; +import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine; /* 7: */ import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; /* 8: */ import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; /* 9: */ /* 10: */ public class GT_Block_Casings4 /* 11: */ extends GT_Block_Casings_Abstract /* 12: */ { + public static boolean mConnectedMachineTextures = true; + /* 13: */ public GT_Block_Casings4() /* 14: */ { /* 15:12 */ super(GT_Item_Casings4.class, "gt.blockcasings4", GT_Material_Casings.INSTANCE); @@ -21,19 +30,21 @@ import gregtech.api.enums.Textures; /* 20:15 */ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Clean Stainless Steel Casing"); /* 21:16 */ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Stable Titanium Casing"); /* 22:17 */ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Titanium Firebox Casing"); -/* 23: */ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Fusion Casing"); -/* 23: */ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Fusion Casing"); +///* 23: */ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Fusion Casing"); +///* 23: */ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Fusion Casing"); /* 23: */ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Fusion Casing"); /* 23: */ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Fusion Coil"); /* 24: */ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Fusion Casing MK II"); +/* 25: */ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Turbine Casing"); /* 25: */ /* 35:30 */ ItemList.Casing_RobustTungstenSteel.set(new ItemStack(this, 1, 0)); /* 36:31 */ ItemList.Casing_CleanStainlessSteel.set(new ItemStack(this, 1, 1)); /* 37:32 */ ItemList.Casing_StableTitanium.set(new ItemStack(this, 1, 2)); /* 38:33 */ ItemList.Casing_Firebox_Titanium.set(new ItemStack(this, 1, 3)); ItemList.Casing_Fusion.set(new ItemStack(this,1,6)); - ItemList.Casing_Fusion2.set(new ItemStack(this,1,8)); 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)); /* 39: */ } /* 40: */ /* 41: */ public IIcon getIcon(int aSide, int aMeta) @@ -59,7 +70,7 @@ import gregtech.api.enums.Textures; /* 61: */ case 8: /* 62:59 */ return Textures.BlockIcons.MACHINE_CASING_FUSION_2.getIcon(); /* 63: */ case 9: -/* 64:60 */ return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); +/* 64:60 */ return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); /* 65: */ case 10: /* 66:61 */ return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); /* 67: */ case 11: @@ -75,4 +86,383 @@ import gregtech.api.enums.Textures; /* 77: */ } /* 78:68 */ return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); /* 79: */ } -/* 80: */ } \ No newline at end of file + +@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)) { + return getIcon(aSide, tMeta); + } + int tStartIndex = tMeta == 6 ? 1 : 13; + if (tMeta == 9) { + 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Textures.BlockIcons.TURBINE[2].getIcon(); + } + }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) + { + case 0: + if (tConnectedSides[0]) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); + } + if ((tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon(); + } + if ((!tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon(); + } + if ((tConnectedSides[4]) && (!tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon(); + } + if ((tConnectedSides[4]) && (tConnectedSides[5]) && (!tConnectedSides[2]) && (tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon(); + } + if ((tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (!tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon(); + } + if ((!tConnectedSides[4]) && (!tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon(); + } + if ((tConnectedSides[4]) && (!tConnectedSides[5]) && (!tConnectedSides[2]) && (tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon(); + } + if ((tConnectedSides[4]) && (tConnectedSides[5]) && (!tConnectedSides[2]) && (!tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon(); + } + if ((!tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (!tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon(); + } + if ((!tConnectedSides[4]) && (!tConnectedSides[5]) && (!tConnectedSides[2]) && (!tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); + } + if ((!tConnectedSides[4]) && (!tConnectedSides[2])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon(); + } + if ((!tConnectedSides[5]) && (!tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon(); + } + case 1: + if (tConnectedSides[1] ) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); + } + if ((tConnectedSides[4] ) && (tConnectedSides[5] ) && (tConnectedSides[2] ) && (tConnectedSides[3] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon(); + } + if ((!tConnectedSides[4]) && (tConnectedSides[5] ) && (tConnectedSides[2] ) && (tConnectedSides[3] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon(); + } + if ((tConnectedSides[4] ) && (!tConnectedSides[5]) && (tConnectedSides[2] ) && (tConnectedSides[3] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon(); + } + if ((tConnectedSides[4] ) && (tConnectedSides[5] ) && (!tConnectedSides[2]) && (tConnectedSides[3] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon(); + } + if ((tConnectedSides[4] ) && (tConnectedSides[5] ) && (tConnectedSides[2] ) && (!tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon(); + } + if ((!tConnectedSides[4]) && (!tConnectedSides[5]) && (tConnectedSides[2] ) && (tConnectedSides[3] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon(); + } + if ((tConnectedSides[4] ) && (!tConnectedSides[5]) && (!tConnectedSides[2]) && (tConnectedSides[3] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon(); + } + if ((tConnectedSides[4] ) && (tConnectedSides[5] ) && (!tConnectedSides[2]) && (!tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon(); + } + if ((!tConnectedSides[4]) && (tConnectedSides[5] ) && (tConnectedSides[2] ) && (!tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon(); + } + if ((!tConnectedSides[4]) && (!tConnectedSides[5]) && (!tConnectedSides[2]) && (!tConnectedSides[3])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); + } + if ((!tConnectedSides[2]) && (!tConnectedSides[4])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon(); + } + if ((!tConnectedSides[3]) && (!tConnectedSides[5])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon(); + } + case 2: + if (tConnectedSides[5] ) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); + } + if ((tConnectedSides[2] ) && (tConnectedSides[0] ) && (tConnectedSides[4] ) && (tConnectedSides[1] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon(); + } + if ((!tConnectedSides[2]) && (tConnectedSides[0] ) && (tConnectedSides[4] ) && (tConnectedSides[1] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon(); + } + if ((tConnectedSides[2] ) && (!tConnectedSides[0]) && (tConnectedSides[4] ) && (tConnectedSides[1] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon(); + } + if ((tConnectedSides[2] ) && (tConnectedSides[0] ) && (!tConnectedSides[4]) && (tConnectedSides[1] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon(); + } + if ((tConnectedSides[2] ) && (tConnectedSides[0] ) && (tConnectedSides[4] ) && (!tConnectedSides[1])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon(); + } + if ((!tConnectedSides[2]) && (!tConnectedSides[0]) && (tConnectedSides[4] ) && (tConnectedSides[1] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon(); + } + if ((tConnectedSides[2] ) && (!tConnectedSides[0]) && (!tConnectedSides[4]) && (tConnectedSides[1] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon(); + } + if ((tConnectedSides[2] ) && (tConnectedSides[0] ) && (!tConnectedSides[4]) && (!tConnectedSides[1])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon(); + } + if ((!tConnectedSides[2]) && (tConnectedSides[0] ) && (tConnectedSides[4] ) && (!tConnectedSides[1])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon(); + } + if ((!tConnectedSides[2]) && (!tConnectedSides[0]) && (!tConnectedSides[4]) && (!tConnectedSides[1])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); + } + if ((!tConnectedSides[2]) && (!tConnectedSides[4])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon(); + } + if ((!tConnectedSides[0]) && (!tConnectedSides[1])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon(); + } + case 3: + if (tConnectedSides[3] ) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); + } + if ((tConnectedSides[2] ) && (tConnectedSides[0] ) && (tConnectedSides[4] ) && (tConnectedSides[1] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon(); + } + if ((!tConnectedSides[2]) && (tConnectedSides[0] ) && (tConnectedSides[4] ) && (tConnectedSides[1] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon(); + } + if ((tConnectedSides[2] ) && (!tConnectedSides[0]) && (tConnectedSides[4] ) && (tConnectedSides[1] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon(); + } + if ((tConnectedSides[2] ) && (tConnectedSides[0] ) && (!tConnectedSides[4]) && (tConnectedSides[1] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon(); + } + if ((tConnectedSides[2] ) && (tConnectedSides[0] ) && (tConnectedSides[4] ) && (!tConnectedSides[1])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon(); + } + if ((!tConnectedSides[2]) && (!tConnectedSides[0]) && (tConnectedSides[4] ) && (tConnectedSides[1] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon(); + } + if ((tConnectedSides[2] ) && (!tConnectedSides[0]) && (!tConnectedSides[4]) && (tConnectedSides[1] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon(); + } + if ((tConnectedSides[2] ) && (tConnectedSides[0] ) && (!tConnectedSides[4]) && (!tConnectedSides[1])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon(); + } + if ((!tConnectedSides[2]) && (tConnectedSides[0] ) && (tConnectedSides[4] ) && (!tConnectedSides[1])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon(); + } + if ((!tConnectedSides[2]) && (!tConnectedSides[0]) && (!tConnectedSides[4]) && (!tConnectedSides[1])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); + } + if ((!tConnectedSides[2]) && (!tConnectedSides[4])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon(); + } + if ((!tConnectedSides[0]) && (!tConnectedSides[1])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon(); + } + case 4: + if (tConnectedSides[4] ) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); + } + if ((tConnectedSides[0] ) && (tConnectedSides[3] ) && (tConnectedSides[1] ) && (tConnectedSides[5] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon(); + } + if ((!tConnectedSides[0]) && (tConnectedSides[3] ) && (tConnectedSides[1] ) && (tConnectedSides[5] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon(); + } + if ((tConnectedSides[0] ) && (!tConnectedSides[3]) && (tConnectedSides[1] ) && (tConnectedSides[5] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon(); + } + if ((tConnectedSides[0] ) && (tConnectedSides[3] ) && (!tConnectedSides[1]) && (tConnectedSides[5] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon(); + } + if ((tConnectedSides[0] ) && (tConnectedSides[3] ) && (tConnectedSides[1] ) && (!tConnectedSides[5])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon(); + } + if ((!tConnectedSides[0]) && (!tConnectedSides[3]) && (tConnectedSides[1] ) && (tConnectedSides[5] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon(); + } + if ((tConnectedSides[0] ) && (!tConnectedSides[3]) && (!tConnectedSides[1]) && (tConnectedSides[5] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon(); + } + if ((tConnectedSides[0] ) && (tConnectedSides[3] ) && (!tConnectedSides[1]) && (!tConnectedSides[5])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon(); + } + if ((!tConnectedSides[0]) && (tConnectedSides[3] ) && (tConnectedSides[1] ) && (!tConnectedSides[5])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon(); + } + if ((!tConnectedSides[0]) && (!tConnectedSides[3]) && (!tConnectedSides[1]) && (!tConnectedSides[5])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); + } + if ((!tConnectedSides[0]) && (!tConnectedSides[1])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon(); + } + if ((!tConnectedSides[3]) && (!tConnectedSides[5])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon(); + } + case 5: + if (tConnectedSides[2] ) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); + } + if ((tConnectedSides[0] ) && (tConnectedSides[3] ) && (tConnectedSides[1] ) && (tConnectedSides[5] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon(); + } + if ((!tConnectedSides[0]) && (tConnectedSides[3] ) && (tConnectedSides[1] ) && (tConnectedSides[5] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon(); + } + if ((tConnectedSides[0] ) && (!tConnectedSides[3]) && (tConnectedSides[1] ) && (tConnectedSides[5] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon(); + } + if ((tConnectedSides[0] ) && (tConnectedSides[3] ) && (!tConnectedSides[1]) && (tConnectedSides[5] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon(); + } + if ((tConnectedSides[0] ) && (tConnectedSides[3] ) && (tConnectedSides[1] ) && (!tConnectedSides[5])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon(); + } + if ((!tConnectedSides[0]) && (!tConnectedSides[3]) && (tConnectedSides[1] ) && (tConnectedSides[5] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon(); + } + if ((tConnectedSides[0] ) && (!tConnectedSides[3]) && (!tConnectedSides[1]) && (tConnectedSides[5] )) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon(); + } + if ((tConnectedSides[0] ) && (tConnectedSides[3] ) && (!tConnectedSides[1]) && (!tConnectedSides[5])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon(); + } + if ((!tConnectedSides[0]) && (tConnectedSides[3] ) && (tConnectedSides[1] ) && (!tConnectedSides[5])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon(); + } + if ((!tConnectedSides[0]) && (!tConnectedSides[3]) && (!tConnectedSides[1]) && (!tConnectedSides[5])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); + } + if ((!tConnectedSides[0]) && (!tConnectedSides[1])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon(); + } + if ((!tConnectedSides[3]) && (!tConnectedSides[5])) { + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon(); + } + break; + } + return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon(); +}} \ No newline at end of file diff --git a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java index 9c27b3f3..72d613d2 100644 --- a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java +++ b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java @@ -3,6 +3,7 @@ /* 3: */ import forestry.api.genetics.AlleleManager; /* 4: */ import forestry.api.genetics.IAlleleRegistry; /* 5: */ import forestry.api.genetics.IIndividual; +import gregtech.GT_Mod; /* 6: */ import gregtech.api.GregTech_API; /* 7: */ import gregtech.api.enums.Element; /* 8: */ import gregtech.api.enums.GT_Values; @@ -132,7 +133,6 @@ import gregtech.api.util.GT_Recipe; /* 128:101 */ this.mOutputItems[0] = ItemList.Tool_DataOrb.get(1L, new Object[0]); /* 129:102 */ Behaviour_DataOrb.setDataTitle(this.mOutputItems[0], "Elemental-Scan"); /* 130:103 */ Behaviour_DataOrb.setDataName(this.mOutputItems[0], tData.mMaterial.mMaterial.mElement.name()); -/* 131: */ /* 132:105 */ this.mMaxProgresstime = ((int)(tData.mMaterial.mMaterial.getMass() * 8192L / (1 << this.mTier - 1))); /* 133:106 */ this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1)); /* 134:107 */ return 2; @@ -174,6 +174,16 @@ import gregtech.api.util.GT_Recipe; /* 170: */ } /* 171:140 */ return 0; /* 172: */ } + +@Override +public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { + if (mProgresstime>=(mMaxProgresstime-1)) {try{ + if(this.mOutputItems[0].getUnlocalizedName().equals("gt.metaitem.01.32707")){ + GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "scanning");}}catch (Exception e){} + } + super.onPostTick(aBaseMetaTileEntity, aTick); +} + /* 173: */ /* 174: */ public GT_Recipe.GT_Recipe_Map getRecipeList() /* 175: */ { diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java index b1391612..d1b5ea8e 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java @@ -226,13 +226,13 @@ import gregtech.api.enums.Textures; /* 224: */ { /* 225:151 */ if (++this.mProgresstime >= this.mMaxProgresstime) /* 226: */ { - GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "steel"); -/* 227:152 */ addOutputProducts(); + addOutputProducts(); /* 228:153 */ this.mOutputItem1 = null; /* 229:154 */ this.mOutputItem2 = null; /* 230:155 */ this.mProgresstime = 0; /* 231:156 */ this.mMaxProgresstime = 0; -/* 232: */ } +/* 232: */ try{GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "steel");}catch(Exception e){} +/* 227:152 */ } /* 233: */ } /* 234:159 */ else if (aBaseMetaTileEntity.isAllowedToWork()) { /* 235:159 */ checkRecipe(); diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java index 53e87093..fd02e50e 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java @@ -1,6 +1,7 @@ /* 1: */ package gregtech.common.tileentities.machines.multi; /* 2: */ -/* 3: */ import gregtech.api.enums.Materials; +/* 3: */ import gregtech.GT_Mod; +import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; /* 4: */ import gregtech.api.enums.Textures.BlockIcons; /* 5: */ import gregtech.api.gui.GT_GUIContainer_MultiMachine; @@ -150,6 +151,18 @@ import gregtech.api.enums.Textures; /* 147: */ } /* 148:126 */ return true; /* 149: */ } + +private boolean firstRun = true; + +@Override +public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { + if (mProgresstime>0&&firstRun) {firstRun = false;try{ + GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "extremepressure");}catch (Exception e){} + } + super.onPostTick(aBaseMetaTileEntity, aTick); +} + + /* 150: */ /* 151: */ public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) /* 152: */ { diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java index 9d15000b..5dfee91f 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java @@ -18,15 +18,22 @@ public class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_MultiBlock public GT_MetaTileEntity_LargeTurbine(int aID, String aName, String aNameRegional){super(aID, aName, aNameRegional);} public GT_MetaTileEntity_LargeTurbine(String aName){super(aName);} - @Override - public String[] getDescription() { - return new String[]{"Consumes 1600 Liters of Steam per Tick"}; - } - @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],new GT_RenderedTexture(Textures.BlockIcons.STEAM_TURBINE_SIDE)}; + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex+1], aFacing == aSide ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]}; } + + + public String[] getDescription() + { + return new String[] { + "Controller Block for the Large Turbine", + "Size: 3x3x4 (Hollow)", "Controller (front centered)", + "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!)" }; + } @Override public boolean isCorrectMachinePart(ItemStack aStack) { diff --git a/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java index 66bed7d5..06ca429c 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java +++ b/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java @@ -93,7 +93,7 @@ import net.minecraft.entity.player.EntityPlayer; public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) /* 117: */ { /* 118:117 */ super.onToolCrafted(aStack, aPlayer); - GT_Mod.achievements.issueAchievement(aPlayer, "brrrr"); + try{GT_Mod.instance.achievements.issueAchievement(aPlayer, "brrrr");}catch(Exception e){} /* 121: */ } /* 87: */ diff --git a/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java b/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java index bdf696c0..f03a8616 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java +++ b/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java @@ -54,7 +54,7 @@ import net.minecraft.entity.player.EntityPlayer; public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) /* 117: */ { /* 118:117 */ super.onToolCrafted(aStack, aPlayer); - GT_Mod.achievements.issueAchievement(aPlayer, "highpowerdrill"); + try{GT_Mod.instance.achievements.issueAchievement(aPlayer, "highpowerdrill");}catch(Exception e){} /* 121: */ } /* 51: */ /* 52: */ public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) diff --git a/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java b/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java index 625f2059..dc58100d 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java +++ b/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java @@ -122,7 +122,7 @@ import gregtech.api.enums.Textures; /* 119:118 */ super.onToolCrafted(aStack, aPlayer); /* 120:119 */ aPlayer.triggerAchievement(AchievementList.buildPickaxe); /* 121:120 */ aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe); - GT_Mod.achievements.issueAchievement(aPlayer, "driltime"); + try{GT_Mod.instance.achievements.issueAchievement(aPlayer, "driltime");}catch(Exception e){} /* 122: */ } /* 123: */ /* 124: */ public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) diff --git a/main/java/gregtech/common/tools/GT_Tool_HardHammer.java b/main/java/gregtech/common/tools/GT_Tool_HardHammer.java index eeb323f8..d910f434 100644 --- a/main/java/gregtech/common/tools/GT_Tool_HardHammer.java +++ b/main/java/gregtech/common/tools/GT_Tool_HardHammer.java @@ -185,7 +185,7 @@ import net.minecraftforge.event.world.BlockEvent; public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) /* 117: */ { /* 118:117 */ super.onToolCrafted(aStack, aPlayer); - GT_Mod.achievements.issueAchievement(aPlayer, "tools"); + try{GT_Mod.instance.achievements.issueAchievement(aPlayer, "tools");}catch(Exception e){} /* 121: */ } /* 179: */ } diff --git a/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/main/java/gregtech/common/tools/GT_Tool_JackHammer.java index cb50cfbd..9393a5a0 100644 --- a/main/java/gregtech/common/tools/GT_Tool_JackHammer.java +++ b/main/java/gregtech/common/tools/GT_Tool_JackHammer.java @@ -105,7 +105,7 @@ import net.minecraftforge.event.world.BlockEvent; public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) /* 117: */ { /* 118:117 */ super.onToolCrafted(aStack, aPlayer); - GT_Mod.achievements.issueAchievement(aPlayer, "hammertime"); + try{GT_Mod.instance.achievements.issueAchievement(aPlayer, "hammertime");}catch(Exception e){} /* 121: */ } /* 100: */ diff --git a/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java b/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java index d535fd4a..9d567a63 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java +++ b/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java @@ -118,7 +118,7 @@ /* 118:117 */ super.onToolCrafted(aStack, aPlayer); /* 119:118 */ aPlayer.triggerAchievement(AchievementList.buildPickaxe); /* 120:119 */ aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe); - GT_Mod.achievements.issueAchievement(aPlayer, "flintpick"); + try{GT_Mod.instance.achievements.issueAchievement(aPlayer, "flintpick");}catch(Exception e){} /* 121: */ } /* 122: */ /* 123: */ public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) diff --git a/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java b/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java index 43165412..7670bf93 100644 --- a/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java +++ b/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java @@ -127,7 +127,7 @@ import gregtech.api.GregTech_API; /* 124: */ { /* 125:122 */ super.onToolCrafted(aStack, aPlayer); /* 126:123 */ aPlayer.triggerAchievement(AchievementList.buildSword); - GT_Mod.achievements.issueAchievement(aPlayer, "unitool"); + try{GT_Mod.instance.achievements.issueAchievement(aPlayer, "unitool");}catch(Exception e){} /* 127: */ } /* 128: */ /* 129: */ public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) diff --git a/main/java/gregtech/loaders/misc/GT_Achievements.java b/main/java/gregtech/loaders/misc/GT_Achievements.java index bdc340b2..96463f24 100644 --- a/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -111,8 +111,8 @@ public int adjY = 9; registerAchievement("magneticiron", 4, -2, GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), "steel", false); registerAchievement("lvmotor", 4, -6, ItemList.Electric_Motor_LV.get(1, new Object[] {}), "magneticiron", false); - registerAchievement("pump", 2, -8, ItemList.Electric_Pump_LV.get(1, new Object[] {}), "lvmotor", false); - registerAchievement("closeit", 2, -10, ItemList.Cover_Shutter.get(1, new Object[] {}), "pump", false); + registerAchievement("pumpcover", 2, -8, ItemList.Electric_Pump_LV.get(1, new Object[] {}), "lvmotor", false); + registerAchievement("closeit", 2, -10, ItemList.Cover_Shutter.get(1, new Object[] {}), "pumpcover", false); registerAchievement("slurp", 2, -12, ItemList.Pump_HV.get(1, new Object[] {}), "closeit", false); registerAchievement("transport", 4, -10, ItemList.Conveyor_Module_LV.get(1, new Object[] {}), "lvmotor", false); registerAchievement("manipulation", 4, -12, ItemList.Cover_Controller.get(1, new Object[] {}), "transport", false); @@ -160,7 +160,7 @@ public int adjY = 9; registerAchievement("tothelimit", 12, 10, ItemList.Generator_Plasma_LuV.get(1, new Object[] {}), "advancing", false); registerAchievement("denseaspossible", 10, 10, ItemList.FusionComputer_UV.get(1, new Object[] {}), "tothelimit", false); registerAchievement("fullefficiency", 10, 12, ItemList.Generator_Plasma_ZPMV.get(1, new Object[] {}), "denseaspossible", false); - registerAchievement("whatnow", 8, 10, GT_OreDictUnificator.get(OrePrefixes.battery, Materials.Ultimate, 1L), "denseaspossible", false); + registerAchievement("whatnow", 8, 10, ItemList.ZPM2.get(1, new Object[] {}), "denseaspossible", false); AchievementPage.registerAchievementPage(new AchievementPage("GregTech 5", (Achievement[]) this.achievementList.values().toArray( new Achievement[this.achievementList.size()]))); @@ -261,7 +261,6 @@ public int adjY = 9; } public void issueAchivementHatchFluid(EntityPlayer player, FluidStack fluid){ - System.out.println("fluid!"); if (player == null||fluid==null) { return; } @@ -280,13 +279,11 @@ public int adjY = 9; @SubscribeEvent public void onCrafting(ItemCraftedEvent event) { - System.out.println("crafting"); EntityPlayer player = event.player; ItemStack stack = event.crafting; if (player == null||stack==null) { return; } - System.out.println(stack.getUnlocalizedName()); if(stack.getUnlocalizedName().startsWith("gt.metaitem.")){ if(stack.getUnlocalizedName().equals("gt.metaitem.01.2300")){ issueAchievement(player, "bronze"); @@ -299,7 +296,7 @@ public int adjY = 9; }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32600")){ issueAchievement(player, "lvmotor"); }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32610")){ - issueAchievement(player, "pump"); + issueAchievement(player, "pumpcover"); }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32630")){ issueAchievement(player, "transport"); }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32650")){ @@ -415,8 +412,8 @@ public int adjY = 9; || data.mPrefix == OrePrefixes.oreNetherrack || data.mPrefix == OrePrefixes.oreRedgranite) { for (int i = 0; i < data.getAllMaterialStacks().size(); i++) { issueAchievement(player, data.getAllMaterialStacks().get(i).mMaterial.name()); - - }return; + if(data.getAllMaterialStacks().get(i).mMaterial == Materials.AnyIron){issueAchievement(player, "iron");} + } }else if(data.mPrefix == OrePrefixes.crushed){ issueAchievement(player, "crushed"); }else if(data.mPrefix == OrePrefixes.crushedPurified){ @@ -425,7 +422,6 @@ public int adjY = 9; issueAchievement(player, "spinit"); } } - System.out.println(stack.getUnlocalizedName()); if(stack.getUnlocalizedName().startsWith("gt.metaitem.")){ if(stack.getUnlocalizedName().equals("gt.metaitem.02.32500")){ issueAchievement(player, "havestlead"); diff --git a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index d7241b92..301a7940 100644 --- a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1055,10 +1055,10 @@ public class GT_MachineRecipeLoader GT_Values.RA.addCentrifugeRecipe(new ItemStack(Items.magma_cream, 1), 0, new ItemStack(Items.blaze_powder, 1), new ItemStack(Items.slime_ball, 1), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, 500); GT_Values.RA.addCentrifugeRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1L), GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium235, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { 2000, 200 }, 800, 320); GT_Values.RA.addCentrifugeRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1L), GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium241, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { 2000, 3000 }, 1600, 320); - GT_Values.RA.addCentrifugeRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L), GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { 2000, 200 }, 3200, 320); - GT_Values.RA.addCentrifugeRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 1L), GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadah, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { 2000, 3000 }, 6400, 320); - GT_Values.RA.addCentrifugeRecipe(GT_Values.NI, GT_Values.NI, Materials.Hydrogen.getGas(80L), Materials.Deuterium.getGas(20L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 160, 10); - GT_Values.RA.addCentrifugeRecipe(GT_Values.NI, GT_Values.NI, Materials.Deuterium.getGas(80L), Materials.Tritium.getGas(20L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 160, 40); + GT_Values.RA.addCentrifugeRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L), GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { 5000, 1000 }, 3200, 320); + GT_Values.RA.addCentrifugeRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 1L), GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Naquadria, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Naquadah, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { 2000, 3000 }, 6400, 640); + GT_Values.RA.addCentrifugeRecipe(GT_Values.NI, GT_Values.NI, Materials.Hydrogen.getGas(160L), Materials.Deuterium.getGas(40L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 160, 20); + GT_Values.RA.addCentrifugeRecipe(GT_Values.NI, GT_Values.NI, Materials.Deuterium.getGas(160L), Materials.Tritium.getGas(40L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 160, 80); GT_Values.RA.addCentrifugeRecipe(GT_Values.NI, GT_Values.NI, Materials.Helium.getGas(80L), Materials.Helium_3.getGas(5L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 160, 80); GT_Values.RA.addCentrifugeRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Redstone, 2L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Gold, 2L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 488, 80); GT_Values.RA.addCentrifugeRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1L), GT_Values.NI, GT_Values.NF, Materials.Helium.getGas(120L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tungsten, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Platinum, 1L), new ItemStack(Blocks.sand, 1), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { 625, 625, 9000, 0, 0, 0 }, 320, 20); diff --git a/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 464bdb84..d5ea52cf 100644 --- a/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -115,7 +115,7 @@ import ic2.core.item.ItemRadioactive; /* 107:108 */ ItemList.NC_SensorCard.set(tItem == null ? new GT_Generic_Item("sensorcard", "GregTech Sensor Card", "Nuclear Control not installed", false) : tItem); ItemList.Neutron_Reflector.set(new GT_NeutronReflector_Item("neutronreflector", "Iridium Neutron Reflector", 0)); - GT_ModHandler.addCraftingRecipe(ItemList.Neutron_Reflector.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] { "RRR", "RPR", "RRR",'R', GT_ModHandler.getIC2Item("reactorReflectorThick", 1L),'P', OrePrefixes.plate.get(Materials.Iridium) }); + GT_ModHandler.addCraftingRecipe(ItemList.Neutron_Reflector.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] { "RRR", "RPR", "RRR",'R', GT_ModHandler.getIC2Item("reactorReflectorThick", 1L),'P', OrePrefixes.plateAlloy.get(Materials.Iridium) }); ItemList.Reactor_Coolant_He_1.set(GregTech_API.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000)); GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_He_1.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] { " P ", "PCP", " P ",'C', OrePrefixes.cell.get(Materials.Helium),'P', OrePrefixes.plate.get(Materials.Tin) }); diff --git a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 78264f62..871d9e69 100644 --- a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -121,6 +121,7 @@ import net.minecraftforge.oredict.OreDictionary; /* 187: 128 */ GT_ModHandler.addCraftingRecipe(ItemList.Casing_FrostProof.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.Aluminium), Character.valueOf('F'), OrePrefixes.frameGt.get(Materials.Aluminium) }); /* 188: 129 */ 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) }); /* 189: 130 */ 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) }); +/* 190: 131 */ 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) }); /* 190: 131 */ 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) }); /* 191: 132 */ 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) }); /* 192: 133 */ 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) }); diff --git a/main/resources/assets/gregtech/lang/en_US.lang b/main/resources/assets/gregtech/lang/en_US.lang index 2a9610b3..ccbd863d 100644 --- a/main/resources/assets/gregtech/lang/en_US.lang +++ b/main/resources/assets/gregtech/lang/en_US.lang @@ -269,8 +269,8 @@ achievement.magneticiron=Magnetic Iron achievement.magneticiron.desc=Craft a Magnetic Iron Rod with 4 Redstone achievement.lvmotor=Low Voltage Motor achievement.lvmotor.desc=Craft a Low Voltage Motor -achievement.pump=Pump -achievement.pump.desc=Craft a LV Pump +achievement.pumpcover=Pump +achievement.pumpcover.desc=Craft a LV Pump achievement.closeit=Close it! achievement.closeit.desc=Get a Shutter Cover achievement.slurp=Slurp diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_1.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_1.png new file mode 100644 index 0000000000000000000000000000000000000000..62bb0b0b5aaaac2af0d2236d0c25f41dbecef053 GIT binary patch literal 822 zcmah{+e!ja6gB#R9{Ys8zz^uX|EcID2%<173nKz6vyddaJQM^`*<_jJW%4%KG@?;- z`G95=PHXm_ITlLEp3Qd8T5IofW(|*c`#tpYA`jsiaGpNTAoV@Yd;Y`u^Fw=otGvDx zpPOpk$moxETKOh8GqyZCUe!{S(lw%7Oco!Mf_jTYD@&0UU#G%Mxd4fD@ldcS zB?k=UzwlsTC^A@@uvDA%4_;2BZCf>Ap3y$MIWnI@7Oc;M&@_ap5Z;}O=@981w33-{ z@kH-|)al;%;MfQHNvC7qC-u4L&i4L{=S!eXx?w*%5V!T^{_>Y&^!A`N*9KwIQoi!g%Gi|Ik*dcL$L9Xx!?}l&qhW=(a35%wtjLPODacdE&=Pp aic8a@`Rqlha0PqUs<-g@lYZZ9*O9ss5h-zKRY?R@l$4>wMMWh-wbhfJRYr|UUGf5* zHd+3?*Vr9(Xx6N(wfn8Z{%1x;hx;A!Hw-_7XTW;;9E0-QVg1hu`;T}1&_8cxsg;(N zq!uhL4JVw!#|T(4e+_@Ozuak1kF^bI*U2oBXeB$W&Wby!GfwBgPlBz5z zkXazVcQSo?o1yT;UKM!iq$*$+25*Iw5%PMH{yXmyI=JHODSv=qFCv0>tey};WGUJ4{ zcI6?6J+;S2fkm+ocoso6w*x(Kc*k9!hOq literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_11.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_11.png new file mode 100644 index 0000000000000000000000000000000000000000..983fdda99760d978717bfda0a597543659ce2a70 GIT binary patch literal 822 zcmaKqSxN&z5QZaOz(IY#5fygfgkybn+$+-!tfQ_j?_^NJo+2&504EYKf{vs%ktyEKH+HfhuV-5@b9uL!uHs)fEenq{X8G zOUZIRO7pJ1yU1BX9$65DN0v%Pl9px$qRRPyyj0}fZZA&6W0#BmpkQJl4PgwOn9?q^8Y|6TE;?ScIdV!iVo(tmpAxG#}sH$HaZ7m9q-Ja6vvHTppQL5Pv8Uez1NANAR?kdOEIm4+N`iFyHJTxk%f8NEM4y{B8Gje z2hdeG{pZ5AiY;e{Gc&()=6}x2m83H)R7AF++|b(`E56EXgL>t~A7$Wlk; zmZAWwA}MYHGOlu*=y2(bsN;Jlc5ny#WQTJ%_d)>dMy(P`Ffw6Z&A;* zCb5t*56P2}C&ja1DLVmnA@I@^S2RDcnt6KQh+Od0a i-~t~GDd5`?YClrviM?C-p5bsGFUNRiPYBpotMCi@h^B4; literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_3.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_3.png new file mode 100644 index 0000000000000000000000000000000000000000..8bbbf40ab8d7354f9ed2101abb0588c1080a0016 GIT binary patch literal 822 zcmah{%}T>S5RUi)9(@F#pby~P2NHb&u^{;GrQks=77uFiCQ6A>DQYY=HAsoXqdq{B z2F7n@)@`~343lAY_nU9Onc2mq+N>vE4SoUtocU+GdD-{Oxh~ZIe8;Dadfuh%Q7oVg z=8IuRm+&0|EPTFwkM1vyw~B-u8xLvxL3v0_B@DZ3%Sed_5AEho@hSL}3Tp{*N?%f5 zD2H`vbWOltwe}{k5*{~lN@T$Q;E{++;gJ; zEl2rrq|1bxc2HlP;8X5NwTUEjb$@+@^+-P}kVDgFE*yG%8oUMPN1L|!*tfA0C_d`n zU7l>?NXZ?Hv&7&GUhB1$PLEr~Fn{o;$F>p3QbSyRpZQsT89z;~DXJFr_QDQc5hjQo nhpk*YPR|ZEfNV7z@S`@*8skHU^)+%JF`iBS#E${6uk`g7&7-$z literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_4.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_4.png new file mode 100644 index 0000000000000000000000000000000000000000..e6175b3525680782cd786d7ff37fde2615083725 GIT binary patch literal 822 zcmah{T}s115RP~OA3cI6=mC89K6(NXlq!lZLj5aJ3|8?$K@hdXpjK^KYfG%LQXlmI z<_E@aXO>M`gNDg4yZe1J-^}jxOkv#OuK+)Ve?tFb)+Fy+`dk*`zdrr_(qdGn@RrS` z5azI9N0#t40?d27gg@R}P5LxqaX@j8B9Bxm&al2PCz+E0CGU(!V60Dy(q>A7B3PZi z&y|K0W55WwqM~#(_#ZqdD9Xgxr>Lb^f922CVzp=|ykI>jEdrzqEG3ZqQi$cLxk10| zGYd)bjU{2K8qf3`WRPhbdXV28nmh(FauH^!^b1~wz)H+%ZXnm4>NlOTJVQ~pz}YlD zJ38)K&u5qgdaB1zeqp4F&hMyK2eUVq4z`O&JlZc3lM@v0G&{!2ktp|t*Djw8Ujny8u7J`&W z{iqMnCV}z4GjS8^5hlyb?r+ZB-o99;!Cwq(5B{#;?=ZS~-w4jdkoDu;-Z7`#Jhd#A z8)`waEZ7kfYleW83RhSUH)nl^+Qh4q_d;%oR49(HFfo|BK8EQx$bV%XiWY~IOO;)U z+~(<{@3 zhYQ6cwG<#-z!XK|OCpC3))UW_tm0*#y)cvC#iotLvE*ofz)N>O;drS~m&C6Yfyq=p(>1!aG7X|aFlrup+ z+U0v>?Si4`>UI(BlBHm`D8<^{W(AD7a%QQSX%eVgxYA2oDBTQrBQG z|Aj{tn!=;XrNB{D|KLqWR@;9f|BUsBa(Fp~34~u7A?cBCGd}8z?jRX%EXlu!@LWCw z+2Xm$!J!BI1)Wjz$gAv literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_7.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_7.png new file mode 100644 index 0000000000000000000000000000000000000000..014df80d0cda07da7c74e9822667442bdbbd41c6 GIT binary patch literal 822 zcmah{L23d)5M0RzJmv|$zz2BuL3u(T;31Hs;6=ocOYj;Jf(T(rq9TIGvcVkn0q*QV zr@DHWUCoj#y+hATRd;pwbh_<}h+i9P3xCu9jp&l+k-xW%t%v<)+`n zC$`1jW5XUiIz>glm6LdmV#IVvHIWTo3^@Dk5%Z-8C37F$ykhB9ygYEkUDk zIRTJ7|9w-NDxsOa%xix$Z|47|qqDu)#GiJoZFpO>x5?DXznirGw4wF;OZxoCzrST( zU&N9Um!D!%F612Ro*VBeNa1|;9+u18Wl}e3F_?&7VSBted$eIYShF6k&ych4nTGAH zPJ5g~F5AGuL?6PDRhVRe8`-HhaBt;>d zLb9BXvL$POB;;?%BMOINMU=!UB6HgZqu~qGuhwI%q~7P%3M-TG*d_H#d9*H23AID{ z=^%wc5U7OSp^wIwS+&@}B(||IVjJ$7xAdy@PCA>dUOpz{tBY=+-HI?h9`JnQ(XGLpVghDB4HN V$;WG)j)5r_BAD}M`QfFU`~k~Fh8h3> literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_9.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_9.png new file mode 100644 index 0000000000000000000000000000000000000000..9407286b72c431d964db94b268b88e4ae5134e4a GIT binary patch literal 822 zcmah{*-FDu5UuzFKKcoMK|jEE|3}ex5i5168$#Wx7K3%Af*@*%ajDw0cCpr2iI4gL zCM}F-?!>eW1;b>Rx%bSuXXf6)p>S_VePQ?k{C(cv6Y5v%A#Yz2@!wz7-FU>!l5?lb zAP1%^!-}Nv83N3Fx_l|$9Bt1v>lCntMU5J{CNY&_SeO_=Nwso&lALdTD7;Ng-|ECA zMOBg`7nY@;a{@lCEw*57c$~;3We@xh9)&m*9#vIx3tR<$=x04XZP!4lMLW&~ z5D30pyguHEVN1vZm_Uk)^YGHI-)ZM{ix}oN{`B}`1hQ=)L4KY2S${jelUzzfE&45( z8N4EGb!u-tdXSib?Qc$tmq6mwMic->CgaJ(N=jQhJJk$5jq=j7j;9zKAI|5la5^4X P?e*Szdw91VKkfW4>kp=G literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_1.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_1.png new file mode 100644 index 0000000000000000000000000000000000000000..5804a0aa2498c5ab547c772cd6610b89d40cd3e8 GIT binary patch literal 822 zcmaKq+e$)F5QdFjpvxYiC-4Ef_o9n}h#-R^Bq~BeO~MXXnPu+E5J~eCmSl&Eg04E4 z9Vk=tTvlWh9Uh`Tf7xs_+{{|c%=+eEvlr8>kk`vfpB#G=RzrE!$r?*}S^1m+_n+_F z*Jt+QJ@r;hygWw>k2kr@rEONbYSQI%SK0IhER%|)?!(E%SuA?I%QU8Jlj%WzIb83g7Z$;NFXq8q?7swH% z!Zh3=GExUTOV%b--~rd>QHx8lqsnC*u#feks)oMwE_Uml8PfH%pdTnuhk1l_sLzX# zgiZFhfoGmo5c${Gl0nr7Ie*Hx-f4r4jy(o%y9hv$bd88bA*EHM~A^k h_#hEG#pq%bm!~!HyOVVC9OM0vzs8(D6>f{K@n1<=y9)pS literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_10.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_10.png new file mode 100644 index 0000000000000000000000000000000000000000..923c7e606faa85aa8730396a99e3370390adc976 GIT binary patch literal 822 zcmaKq+e!jq5XX&PpvxYiC-4Ef@3J5ws4gNZDneqd=%A#Q=3&!7OkGoBZOftyBZDZ@ zQZsY216FoXm-P_+apdE}tYvnXneR7;Z+1Jow5^)jqlNCk+g5*DH0`yxrhZNi>F=+~ zZop>K^{-9$K}?gq5aW0cgt>?q#=3!(is#TrI~!5E&>&%}E@YYV%nqRxRoGnBXD$

IYrIKtNp1U7w&SV|atwA;oVP1&^{@&c%E-`4^8|G=)ZD z&@|y)7?#||o80L?JZneOD#7();S4-Y4oz`pP3s#=9uP^!PTj9NW`}v{%02fud6951J literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_11.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_11.png new file mode 100644 index 0000000000000000000000000000000000000000..2d8ecc34a306f8b8313233b6b637684b73324514 GIT binary patch literal 822 zcmaKq*-AoT5XX&PpvxYiC-4Ef>B@^P3?zySiZH1N5i=>%GD~wgr6J{>q1k>BR1lF_ zSt7Y>6h%hS@(}%Tx&Va~_Qe7{-FoM{ya8wJ%zh_eN6Q|)aKG*|tC+C3R`etnid z-b-(<`Ik!O=`rj9pQKUm1c!L$AW(3kQ^G=pr6XLF-MY#_WS%qN>ZqkdQjk6|YA zW7ELngkW6ouv=2taA4vV>jyp>_JEg5+LTg}y02X~C`LuSyhAG!L!e`Gtjcce8?efA F`Ws0oychrg literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_12.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_12.png new file mode 100644 index 0000000000000000000000000000000000000000..93bc9e05e67a2b229ecbe8fcdce408858f929714 GIT binary patch literal 822 zcmaKq%SwV#6orjmpka^D6Z8O08Z~HO;Gn3W2#abUkr%=)M5Sc@r6!S~W?9lb8b|ja z#7s@2C^CvJ57CEP4nHKx{x|FFz4mgQOG8tAwW0K@C)e@Sl)oxNZK-Z3_hljZ=ezLr zng4jtz7^9i&&j99o5KB-f7%+Du{{*7^SMjnK6{b9JIka`Q^{kN`)l)iF>NP0x4Y^U zupRLbTVYScKM~SKgKh`oh-`-3s2#?Aaj!i#JG`MeRIrS?EKANFpRH4~c6f)|-Ims& zjwbj=iGZRh0AEIy$IS2{|IcTTKP5A@GT9#->1GOj{NqQ-Rs`ZUJT++RYL@+qj?@tp zAo{daeY~%Qy>mXoCnHiZ#FEo&Ty)v-BfI;{0t!I?{utO%;2fbesf^MmyT ziXyJM6~W|yN%-O)j@p`@FJ=&gFMi-lKm$~qqJ@9-@vrCWl@%7Z@YAUiUJ=JdMRf(} n_fD7R2Qv{5k^4-I+%?xX)@#HhIvh0t=Gl0L+IVl!im$i7i-^0u literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_2.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_2.png new file mode 100644 index 0000000000000000000000000000000000000000..b13be5bf8df69bf31c1ca0d6bfc9cb2132db58d3 GIT binary patch literal 822 zcmZ{i+e$)F5QdFjpvxYiC-4Ef>B@^P3?zySiZH1N5l@sUnWcHyX(i<;u{1l-0il8j z%hU?dOwHT6tcU2wkzu2@nZ1}b>zjYgEM`z9?Ugh?Db@k}eXYMo(%+0rTIaN(_4lW7 z9CA7}V;hU3Fx$KWW>t^Cc#DW-Rt~IGeE6*8E)TcjE?t|&9Ga+o!Ecy^6e(=4>$8vP zMm>L>@F%=R@JYeMhAmR|%ri(4^h&R8A|$L7ayQ`9sU61Hq3e(mw5Y)2mVM9iOaAsh z9*MXVD-y%DxxmtN#Akgi+@XHd!?Il+sx}qgEWX`SzobKP2$DnkIHK)&%u}sA1)L_l z5Aj&>CS46B#RF@?s&?05L_O49Cy9Q!@nq29x9jTF=Zm;NL97gLgq@R!3-#1KvR6kw z1WBAvJDsxwH(=taelXm!n8&41BcAF3PX-K5*DSnGrJR92>KF53W%i+uc?17m%D};M vA;PERh@)TF*$DSIOYx5_gDE3S%bR8 literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_3.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_3.png new file mode 100644 index 0000000000000000000000000000000000000000..e500b1033a08a21bac56f2d1e939fce4b2a08075 GIT binary patch literal 822 zcmaKq%SwV_5QdFzpkvcgh@q+cp}6=DkagflE{#-ENRh!))91A zg+*y@Ygrf3gRcxyKmE)<%s2DS`_0TZL+-&|SNj`85AgSO{vKC<+wbbcb&&r4YMquc znc(>P(ioCj@FFXLQN)gTl5-wl^{1Qn#>2(YW@RJ%OAgb)^6FwCIt7&&w$~!0w3?4s z)j~BF1Amf_n{Xs$FEL9>KH|%TCrJ$X+~BWkI|egD*O9WH^n(ZdKb}M`MU!}tnlCQT zkOe>WQ;*R)8mg9dqSGVlS3L4VC`0^&%+Jt@nK<(i9u0}3sHBA7vzv}lkGlJdq+e^C zDE!U0`}0a(PP75cV}|gJ*SpK(Eu12^sH4Hd39tIWSZm#QE)^Si)dOAv48t*t5cR`P z{oVL(X0yc){-u7)7BMb77M0Q6JJGXp7G$kjLI=FVyfx3q-f9~eHG<9BWJ43|8?euh F=O1($INg$2oAP^iT+lgLNb9q2ejPn3HD%XadX~Nfz+%!IW@HG>q1HtR;In8yd51g zBct$f6bLDa`FkmedYutZCxs(UJ53cwccdL9YXKL0$hG;@(iBT!A~>)*-a}OleZ7}V z%XNI+EzBd6VSkH`B3vcgh@q+s70BQS(>*pkn)xonq8npP(ef` zWrZYG(6*NK5Pdju_%Z8e{$b9XZ!Tw;UW2|<*ZB149{#T8-=XVn_;t;DIf(xLdf!h4 zgSMfy*+IlNZ9=@(0Yn|~cqWZt&($mR$=*gj0 z5S@d^P{NUrZTAErF{e4|7)iyJDtBiTRgBh3?J&;R0yr6`)fv~Mc0 zFrL};K2|RN;Z-^5wv=A4K3&2~=Va`V literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_6.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_6.png new file mode 100644 index 0000000000000000000000000000000000000000..a7ef6ba6da7ad88a2e886021ec42595e1ae23499 GIT binary patch literal 822 zcmaKq-AV#c5XX&PpvxYiC+GpX>B@^P3?zySiZH1N5j6?3kTS{K$dJfTGpy+I34)>z z2r0|dD2j}tkB8`oBgO)rPdjTHZ%gfMGPPForrN#)vi|;* zzrRYKABFcy{`DpI{B&I|UdHA6=FmyD!hvk7fF9`;d=2yochyRG@M(aFrB8%H<7^n!EEKfK}{&^)%NyC2eJ zGlwR6bVhaHrDQ!|hX-!VQ_G>ORBZ%D<5NRaHPBbjl5Uf8|mjHB^0_m*z!W1?qjoF};5P`BDQZ z%^)beIyy*oAcjKe-@qFf38h5 Q!{^#WTz%X(u*%!*A7jX?{Qv*} literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_7.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_7.png new file mode 100644 index 0000000000000000000000000000000000000000..9193deca081b2e480d52f6d82e0bfeff94a5b16c GIT binary patch literal 822 zcmaKq&q_jJ5XEow0xf%lp1=oa)5=8)1BpU|LQE<`L@h!LB>#|T6hvf56l%2b33>v_ zrQ2NEL-fNV!=T~i++k+EGiT<`{Wim))nNLBup7K$rzu&#xX6Nu)O}B5(?(+voN#UWKlXACt*=bzB$1xC6 z@>EDr(#*vh*%*bHc$lWf@s8S2@?1>9hrFCmElsf$zLZWLua2l%qVIcYT0SR#xXnD8 z9IL!J(pMvrKufc}93k>AG*TfMLEmH-nS8I5wO;hutumJPq4!Y}UrUgY(|B_$qvx$4cf17HV4fTp_@^$k?eITMi+opY1x#k4_7lif-|*`F-45 VhD3)|1AMMcJ+se!gEsyd{sBy5n(6=m literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_8.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_8.png new file mode 100644 index 0000000000000000000000000000000000000000..d172b46f89f696084853a9fac8abd2f63a4cfc8b GIT binary patch literal 822 zcmZ`%*)Bs-6s`CHk3PW{^aH&61PLBQJcx%zZikp@X?3_-G}VDBmrISQs6^=8s?ySt zA}Yl25mvgJlP0a3eRtN`XYF{0z9=|^4VzbV`A@}2$cJ<^0i$SE WbLrbFoQ{EcEG01K&*huSTlx=HdfMgy literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_9.png b/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_9.png new file mode 100644 index 0000000000000000000000000000000000000000..a9f041ebd594aba268720092ccca613d835b7214 GIT binary patch literal 822 zcmaKqUoXO86vs1fz@?Yq74!n!ci|$NnN2okG0d7(nzd~H6)A<*NDA?r{2iMsEHU$+ zO2`G5ya*pod)8=vJHNB@oab}C&pE%}Q)|#y>V6(QzJ|A|_*UqufAYHGzAVIle&pBY zJswNbSZ^aX)ZKs$cGhERNygP-1iQI9e9WG1FHbE^Sbtf}ZHbQb1nn(IiNf@#jgoxs zY&Q{1`1;{j{SIX;DG58D(K5H|DeI^6^o;IT}707Xv%(=|)!2k0Uawwj{$WT{k zpp7c@>7Ra-Y}r7%WgL5Joy;pbl1ESi(PvBL`Dh`JgYP3e9+9#pEji7`S$9AE$aH^6 z=2e5Ui+(PX-dgfY60ZQ2QGxK;hm)O^07(&7yJZ7@obb{=j2f+!=TK3Dmww>IzzE7# zu|@yr(|;*ns;pwshrhcy<`!v@@%5;8Gw#DSVw2(}kT|*M1^6Zt^NDyksVyArYw6S; f<(c~wS1~Yby}dr-bS~KQ(|O_L;V zK~y+TeNszG#6T1*hsfwk5Mjt9Gj3hz$|H!U@BrdX#4~t~IftMwGU>Q*;eZQ4M1)t> z>Y_i%sMwoyr(b>gz1mnT7GIJ;5i~&}B!NcA6Qn>AWc;7@UJ!{w66X8!03cx$B!iKV zC1Qpz6QMyAoO2kFp`d9R7zxtQH0_!)MYL_3&(1j*4U{5*i1};|#e&(a4sK)_R8>{5 zPGVY3p|~%?dzCL0Et`VfL^^bn+?g01(6C%CVX+64AQMFU6WlqM1&hR1*A=MHpkeVZ z2PCFt861izlnYbS6wd0q-GhgX6=X!wUs``bgK4PVlZTuT_fH0F*FyqEHS2>U^}R~>Np-MDE)l<&EtCpzP-KxK$wDPsH-X_PBBpbgU25$oL`)wNbj_PYL4)L zUTdEnM6UKRiV002ovPDHLk FV1g2^*}DJ$ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE2.png b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE2.png new file mode 100644 index 0000000000000000000000000000000000000000..c1439353f4f3dfe5e1d42271371ad883f3282855 GIT binary patch literal 586 zcmV-Q0=4~#P)O%BxRA{G=8lV-n|ssLZ!>4kobQ|8OsU`R2T7O=b3!sCVa|{@ z%!HX?HtuJ&7c!$FiQbW3YB0l@kQ~koxh&Yy)v`c`OvG_a*(@Cx3GkKl5mhR^Row=NJ;(&nIs+Lo00dPQYlc*8ntSbh50(`H*e$R zr-F+3#egIc<*j$`XAYHkj-Ea{^?{J%KfZGd?>$SaCvpPFDX!h!mu4^P)FiQy%A!7$2;i!R?X4Qa!Wy-RoBc*`(d`?J6!F;~F#Vm{Ea@p+5vLqD9&Hxs( z=?v$9>2yD-aWqMj$s|da7*EDHue<5JZZ4fAhm+hIbW=^OF08CT!D6u>vInwp7%Tpp zd{LGSVYf!x-=82SgEoV=6iAGVA}O@!x(TdJbK1LgyG`CS);L7>_`^AH&f(K1?S+Ey zCVLB>>O@#3WIE*UqA2seclSYj>H z*?shw;ofc<8z7&)UEX4^s*BVwAy%suaxSFd-Y$b)pFywBK~b=y%Le4^`>%#^RE!9j zuo&JSrlynV4to7Y_Sxxs4xc^e#nG$gY*kg*$uQ?Cl_U3p`3HTEfBK3BWGnyx002ov JPDHLkV1i1#UfCK(u z(3POsh#Or*%w#5@q7aOOAq2F}t&WSDX{VXoRaJ4%SLfba<(8M1_sk5LkT=YPnISJ8 zzy1io&h~)D?sv+v#6qA9f%eH$w3;&-TmAe0XP(5CVxLWTMCm zB#$KWJOfs%%>e*h7CcIO^E;KZ*AXs{)|J7 zsR)Q7RSg{3ACJwg!NggsIRn%H8oKbc#KGrJm>D4iLI}u2umESy0>p~iF!wzt8=Npuf;GE;e(gPrlGO?k3 zZ}A^U!u(_(oO4{ed#@5g9Az?^eZSu$ZKs$-e`5nUToYeeSgZ+0kyr?rJnb~ad&A5~ z)0C#fhp)R;8SUdu_KU>4Snu};3ix3;A;iX#w5r4(KeuX-(Zl)&Z>?CsCYaer92WPN*)3` zdmDKMFF@H@D3^_e1q*h{b10U&i^DhhZgZ!@!l{Yo&+nU=b8cZco&9*SHkHyNxl1P6v3V`fR=ggABG0fJRfEfMsb$SE!qejK8!zaf8UQnP! z2m#aiBE$^2wp08UwuT^#h0FaRSfk&MDsTV-^TpfCHNXgBocRz`fNh=0;d5dTc8k%Y z02JY{*h0_+7D>}z>% M07*qoM6N<$g6~9{Z~y=R literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE6.png b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE6.png new file mode 100644 index 0000000000000000000000000000000000000000..ea87e4f9193f5b5ab4d3eacaedbb69cc78380ae8 GIT binary patch literal 652 zcmV;70(1R|P)Q$ZBQe|PSrX%cF*R@yYJ&<79%Mf3%1p(~%kg}QSiE{aeTHzK%HH|~4@ z7lLlBJBuKKE^=)mt<|*2rI&(j=A87pxPQp4;s=MB1M_`z&YW+&+pG6ufaRq{GHmbm zc>eSy6ZJ^|u3lU~L{L>kB-sxY6~T@YGt8cuD&%v`IYcETDxs z*;-!yM!QX8dIl$g$;@*c%S(%NH>2Fnl9ntgG-hT}Bc)>mIDN97lgp*jUxG>hE;UmU zLs9(B*DtHY&tr-OHMWhL(RLb{(nVSFFo7_7A% ml&5n6FKpq`e;}HQr1>9wY;yL+b~4-m0000ZR8bJde{QZ-SONjf-s~S6!AcMWt;8;9XDQg(hz}xy_yRUQgVjEOg}n&D zO?Eemgb)l1QH0HW-$jda?s1bG7*26!zCSZ_u8hayzqXNu!q~z#3gJe4__zze@6!b@ zUOwa9>sQ>{c|?0E+l+3EQh`Ls*g;4*4D6QV_ix{vD_-i1jwBRfGMNw(QZSk9BN<6N zfARo;?#3os@ALiWh^5Y0>Wt%)MFy}K4M$i)62svjsc|5Qr#p8G$nlR;j!zaTzI;v= z6p76ec2X1;k_%{i63Bw9e-2q&TgwU*?CtFlxd*aw7%M4|#N+!n&w*&YPtzSzwO$8< zKC)3;bU}e69^T$Y5}&^Qq`R>RK*uF9jZTp)Su0>A64{;6dQsD9A48D}EUY}nY;P4L z?TNT`twZ(e8`ZhT%vu)7F02W7rMVF_Hl36t_NPtnoEOVE8ktTz``L6_m}m3ZrQ-Q~miiLn;NSo` z^`mmrU literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE8.png b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE8.png new file mode 100644 index 0000000000000000000000000000000000000000..76464e267bd2980f0db3f5b6f6f85f2f8fd31e30 GIT binary patch literal 594 zcmV-Y0kz3Tt~0pCeP zK~y+TeUUM16j2m~zj^NkF(NAl%+6*bVqqr;7J`kHD4N3BKcLuI2qtMn(WqF8m5|?H z5lreJ8WAh8$?lGz2#cE~>C8KKh{f!VyF2263y*uxIrq$+~*V}f%hk6;o}qLXE4x=xe`k}yS@b8{$0WJZ*@ zbhd${k+Pypr1d&6Mr0z`fDp|vE8Z3h;-rCDEarpCWw3r#Wtc>;D7M=za^+=$JhxJ45;nMt g$&eYcIQR_X4_={A)`53Z`Tzg`07*qoM6N<$g0toa<^TWy literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE9.png b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE9.png new file mode 100644 index 0000000000000000000000000000000000000000..78d7753eee3ba5ddd23374430b95c2b6a0b381e3 GIT binary patch literal 564 zcmV-40?Yl0P)@VOMk2k;_@Fg>#e zPb=AlAcW+rYV^=QGubpW-Oy8CeP310osVaq{$24JtMd&uzkZ@93S2*^@aXX_0AT<1 zbC3i{NE+^55Q!21?%&(N^vN#p;wApN7UR`44QK?#2o^|#C^+X(U~66O>}B@j!$kmz zXxlckJLh0DP(tzj%Vz+<>U@LM?~4I^w1CMnsIKeKI*EBbhvL0>e{zZ+-@e`e0|*Qp zW==a46^w+5xclbx$u@>l{b z1xI;)Md3(6X7Cb%`$Haw)ZQ&SOrif}b%R-ll z(WJ~O(N<@h zMM1krGjSo(f{Q{awQ$aVZ(Q6vHK&-y@bD1gYoH`31XZpSkFqQzjPht{nn39aR9t+?fht;Y>>N@NF)U=E%JeOh z!gHM|EJ0C3lb14ip#ots`y{xV6UD)i0842xfck7Q86gyN>nv7T&#m zgKFOUQI>_wqi>@r@xif7iJOfT0Kmq>O;l+NsDf4;`-vptIKEO`yEw+|6;Tw!Q3j(X zI51|?Z!D!@v9Sg}zkUI3-$Apnf}1yLsFXY?dGK%WAe!cZ1Rn4&cwntvj0a9^VC{H* z9@Ksv!59N$EQ~Sp@u1nRw zx5q;HBM&Y-56(_c5S{;kp~b7+-4LYYLCJ&vod>;s7p=9%;^%|>t6cbe@OtODufd!= rFvh}I3u}%0oEPDNweD~+9*^-G8@D1-sGI|L00000NkvXXu0mjfr`1>+ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE1.png.mcmeta b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE1.png.mcmeta new file mode 100644 index 00000000..d746756c --- /dev/null +++ b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE1.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +} \ No newline at end of file diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE2.png b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE2.png new file mode 100644 index 0000000000000000000000000000000000000000..4f7704cee8a24647da57ab5d634a226aca8f71f7 GIT binary patch literal 1131 zcmV-x1eE)UP) z-)Ei~&il-anVOpNs*0!}v7#!dDiRB71rbF=5UKWuwpCPwoT}2>*PA4W5R0N36N{j6 zAeQ7QfiOlzsZ=UNB1yo^%nY#zA~7>Fb9Ez&3UhOF>3gM8A(j|XtrDov+tZ6y1A2P8 z6EzyANu^RLkuE}4sSB;PbIE)){is#Ru_kf@X|0-|E>A zEgssvBTb&KR45jUiGsj(_Qwmr1=hnizgBAAwo=eUjTwGy+^-E@Ub?)t3xJ#Q?G1go z(5Ow?y1IzRlizViUGU=HSxg|yg~ZmC1@ImRsLw=o7TUR?r4@jup4bn-st8Bkd=~)o z>A6YYwXMKE|6b(u(YL^RJm9@&`@o$k!QMT?De0;Rm#!@F`P(Omy0#Sn=xEFH_BEVN@b{b17%SjP`K zd-7@fYGnp67-Lvo$`YIU!Ty8KrvcODa`OD+cL0nrwAuxX0TV?jS*~?u0p}dnLn!T4 z5eA2bm@b#G)}{miQ50dEXY{~GLSU`MJBM=(O97A)U<`)DXbv4a4kQERR2A<%-Zv)* zWo=Bd4r}8g=UnPSFO5G9WK}shG=!=q4rMLQIVMh?swc44;%#Ce&D`kzhaXJ|R3z;W z-jEB--h13SKB%e~V>o&GqlRyrez55Wu#O*$j*Zj>eRk@^_4z^D?fpP~Szo%cl>Uhu z`axU&&W61(AlZpCKWM+LpPPZ@`Ps}5HiES_^@GCBfpnn1AoGKb5T+1R1oRb)nICL~ zP|jU+B;o;f_Rt``K{ zy8FJm(Zi`_(+@WN0IqRgz#ATa_F&ro{(E1f?d!fT)Oy3{*a&CNpXciQZ0ZNm=-3FI zJ$bB6ipo_tQ&q)kQjCDh|MVj(_kWkeTarxm=xA xa-#8UNeI@e`2MRe*Yc)t*5REe+LD}?{s%c0GgTiyvmXEe002ovPDHLkV1lHI7q$QZ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE2.png.mcmeta b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE2.png.mcmeta new file mode 100644 index 00000000..d746756c --- /dev/null +++ b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE2.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +} \ No newline at end of file diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE3.png b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE3.png new file mode 100644 index 0000000000000000000000000000000000000000..8ddd66ee129700b7e037d1d793d1307bd112a370 GIT binary patch literal 798 zcmV+(1L6FMP)pXA|xOLH#?b)b{Y(ZAn1F}>{{HJ*)KnmV5NKEGGF(e_sl!*edc<#TCFV!6hRXt zLK0|%B7zi1f{gDc=aC>1SxKnQRNVv;MnN(d30WdccVr@H5QQKJkRjcGdc6)KK^p4y zMo(mlXfzt>br1wF8YsmABC3@t6c4CWrkxvEI;mVPJL@D$9DJiRM8QzVD-X@V=A8q@9@u-O*PbEMjD2 zq(^YbgCP%wJm^o}Z+OuEYX?rxgG?)OzxH$Q527ea_XquCIu#Gv?H2AXK1{8bE>5Al c{fP%Z08(NgvfpDDWB>pF07*qoM6N<$f*HJC4FCWD literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE3.png.mcmeta b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE3.png.mcmeta new file mode 100644 index 00000000..d746756c --- /dev/null +++ b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE3.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +} \ No newline at end of file diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE4.png b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE4.png new file mode 100644 index 0000000000000000000000000000000000000000..b438ec172d5dc5ee819e56dffa1783ef62ff2978 GIT binary patch literal 1347 zcmV-J1-$x+P)*`wRcW*x`ww8P#f2eZ81lzYXIWTW!iPfQaDxRp4U!a!08IK-cA5kVwiYHEr=gg_Kg1)|~i_+`c?CR>Vilu8suqOVu0eTXU| z0iS+#dX+%xpAc+XmGc$+=s0hzKdUr;|U@)ff+Awwc zdjtJ_dgp4R%mo$bYzuSN2wGG#5_p0G~&UE zIp+vn$dSEoaA?o&%zs|OgJc0C9%RGWIR_zxp(6|(!@Gvq_v+3_pdAlxS)Ru^a5$WE zI2Yn@0PK0?<@P*qfOBDHG%ifUTzek42FFyuIX1uWB9MazUH9C_hDs&#EQx_8fz~`| z<2a{5bRAcpFH^I+j}gtNvdY_!}wXtd#7Ln-2N@!;d*qu98psQFvd~vqF5*t3c&y1fiZ@= z9(XW~iKIH^=0RsuK#fmKvTf^@IFMoM@Ijjxg;YWa|J{DJaFrB8fHt|54crbVNOjIAAc_0#&OER)84;o)?v?RH5@nEe?gq%ERW#bc*j89Cq=fQ^`d`^#FUWK)lIFNiiXl}HU zz9|Q7#RLdW^31Wz5Z<7s4=% zr;w8ei9>Q;u(3#P9@w~~C64I`8hNnRd7+s`-<|vt7rJN!d3Z25Fp#<5)ZfqfbLRls z^I+(;?JbijZL-?&09q$gn$GQbu$Hw*=hi&<w9+$=%h1p>+8o{r4_RV=V;!Ay}wpCTy?RIPPBJWT*&+~S!=-3^d z8CCqV*=+23z3wbrtyWRJ*zI-)HcCcHaiM*l&7-F`P4kZn5~xoP$Xs}h>sD1Ak_iij z^Z=XTCE`++r8V+?WAz~5!g9H^^ZDFPr?=hdWAvayCe6knJz%`>*S`WKZHyjBLiI{o zN)NIuYx8C00@(qOap)6O#-M1Q(yZFd10tU0va;?31?h{Ikd#do76y=Bn4&2B>5|6N z>9nH_^is;8K{jc@06KC*+d(u0P69bS&~rZ&g*c*)@miED4gT)Ui1i z#J>6;EA_EHBFKYOV9vc2F4-wP&{yuXI751%TOHrxz{Rn8z+xPTD%1GVdLX$i z%X_Ln2m~e8p$zp0fuQuYI4L~{1cjyTm>|01s%ziSGty&UTv_KOmHQG&u3?3CwNX!u z?GvIcPO8y}c^i-^)hqPPb?D5x2d&hU_F~djWt4Vzg{rQjr5i%40S=AEHtZ9Dsu#iw zXri{uq$8~jP<2-_Mh{49Ul)izlt{Xp@jX(kD)p5%c4+0cZ7^bVh9;zbFJuc8*R?I$ z&h4n*3;(SLofc;{o7u@^60|reJqQE^3B#a_71fTQ&=C9Orhl=~ec$HEQmu1ACzPZ; z+5!|=_l!D4wMHODu_|7-JPMu>C4ISAbjtc7TSNg|vyIcMva&_dw)z*mh&2|Vcg%~w Xuc)YsX_I|t00000NkvXXu0mjfg_O8p literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE5.png.mcmeta b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE5.png.mcmeta new file mode 100644 index 00000000..d746756c --- /dev/null +++ b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE5.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +} \ No newline at end of file diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE6.png b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE6.png new file mode 100644 index 0000000000000000000000000000000000000000..199fe6264cabf8a65a31fb48167bad217d6736a9 GIT binary patch literal 1481 zcmV;)1vdJLP)z{C;!J z%=dhL-=m)0^NJ6!WBWFuxO!unBOiRs;=ZK-Y~8pD5y3f!hy=fD4kv<5CPq=Xr$2SQ zVsHiGBusXQcsOwsi$!$u#yJt@M7VlmnjY^uH>)!M96dhF*w|S7^kT7yCm!M)HcAAj z%vOVh{cmEeP0eC(a4?v{f|8-ukL-}h4mqNfK-3EqY01Y4P{ za^QvCbl48G)hOS`4@a+D=Vlca_bp8&j~9#N^Ld;IM%~r7=k66NsZL!%D~;9~rBwJ= zBc_+GMcowtnqg&sFCs#3PY>dRN~MC$^#`Ad4V%b{TbHYeWw^vr9L^K$qK+;A;zEhI zHa(NN4zv&sad_g=I{5n3>BbtVaN^;G@45G%QIyx2<4A$?3VhTo09A@Ir3wzEE|G=8f zTey8^j@x(U=IR_tcZr_v9-Ii}i89?i-Be~~P>(W zqcO(t!Xn|d9X)dfYb{!9bgV#?TK}V4w>Ia2@B7qhH55=+3KfoIwB$jpR>Svw>b_6C zUXM3Y+dS~YM1^AS!MEe5Mp%oYDG&A?K0-Uuj0c%Wiuua0Ak!5V|H7Gn+8Sm<1yD3HN}Z$JA4 zYc0l@;I2>u%1>(nvUw1{M5PppFiC|Y5it)up;Rh`+gs2FKKy9DfC{oBCEn^>{+~S1 z0Q(Lf;k9?)1Fg|Im`S6YlROBd9Pl8egS`h1^3wjdLae6?luF}>Cpb?im&=F?g_MP~ zC!X8Mt|VSk`z>?KR9;c1m%&Ru-3N614;XX;4?n71%RpF&e4holH`FG`h!IsUGpMZ zw;q6*ix*n*An6Y@1R{zG<@%Sh^nnN4=Rr~jQ6Zph9;k1A9`Rw`R83Az@lWwm+x{Rf z0BO_R_IaT(5#ZQ~6C|S*4^nPD>Qb|pF4AL6Y_yLaA8z15kwT#m_=C!9HBKBkeF|$$ zV0Uy1*v)xxesq-Yzx)DgY=E_T;FH=tFX-<+{}jLOgAaA)&kFPBh1UK+M^EypL-^46 ze~C$)94R86Af87dpAU+;us7~Id<5TT!L%DAp1MRkG69q~4!yr1q0wk%@*vVcmced} zOdhn;+MopwA`J{}*svfeDd%Q9Q0vyN^>x?}AKvj;oIE)-l{#>&?$f~C?p`GEnV^Fl6{3mQx0&W$p0V^vBm;DPiG;CaCkQvSdg j6VE^;4xPzptM) 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 Y54ht&?d73HCjbBd07*qoM6N<$f`KirH2?qr literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE9.png.mcmeta b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE9.png.mcmeta new file mode 100644 index 00000000..d746756c --- /dev/null +++ b/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE9.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +} \ No newline at end of file diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TURBINE.png b/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TURBINE.png new file mode 100644 index 0000000000000000000000000000000000000000..340bfeddc4622fb037e372a9e24a411d24e43266 GIT binary patch literal 473 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 delta 8902 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