From 0c2dee56daeb7b94208a581f1dc9f21edbb5e2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=A4=C3=9Fler?= Date: Tue, 9 May 2017 21:51:49 +0200 Subject: [PATCH] Added new textures for the LCM, using them now --- ...NE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png | Bin 0 -> 476 bytes misc/vector/casing.chemically_inert.svg | 145 +++++ .../casing.pipe_polytetrafluoroethylene.svg | 538 ++++++++++++++++++ .../java/gregtech/api/enums/ItemList.java | 2 +- .../java/gregtech/api/enums/Textures.java | 5 +- .../common/blocks/GT_Block_Casings4.java | 6 +- ...T_MetaTileEntity_LargeChemicalReactor.java | 8 +- .../MACHINE_CASING_CHEMICALLY_INERT.png | Bin 0 -> 336 bytes ...NE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png | Bin 0 -> 476 bytes .../OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR.png | Bin 0 -> 439 bytes ...AY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE.png | Bin 0 -> 457 bytes 11 files changed, 694 insertions(+), 10 deletions(-) create mode 100644 misc/vector/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png create mode 100644 misc/vector/casing.chemically_inert.svg create mode 100644 misc/vector/casing.pipe_polytetrafluoroethylene.svg create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_CHEMICALLY_INERT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE.png diff --git a/misc/vector/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png b/misc/vector/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png new file mode 100644 index 0000000000000000000000000000000000000000..18006024c91dec5628cdcbf2f4fbf345731573f3 GIT binary patch literal 476 zcmV<20VDp2P)isBI{h*;T)kc|gnhTV`y*z?YPAx~3~Mdi>ZL(lixbfwdMzQHb?=jk>PifJ!N7 zt$n{-E`=Y#&19{`^?L0EIYO;97K?@V!z;L4E+)@&QB~DPkn0bJ1Bl4X=ks`kJkJF) z<9IywdLX5QF$NAC5im1$yIrpbVV|a{$M{?L=0T`HYmM1#hK~w}2u;&OB#*}<8fU-X zM_KR+ZnvAsvP^^?gnxDfP1B&RYm+2NY+{yWqAW}AK`6a@rAd+qui#S-+`+yaY&M(s z91xLtKA)m(+pjq&%M$nd-At!b5qaRUJsb`(nM^PqkG^U4tb literal 0 HcmV?d00001 diff --git a/misc/vector/casing.chemically_inert.svg b/misc/vector/casing.chemically_inert.svg new file mode 100644 index 00000000..81eb0198 --- /dev/null +++ b/misc/vector/casing.chemically_inert.svg @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/misc/vector/casing.pipe_polytetrafluoroethylene.svg b/misc/vector/casing.pipe_polytetrafluoroethylene.svg new file mode 100644 index 00000000..80d1cf70 --- /dev/null +++ b/misc/vector/casing.pipe_polytetrafluoroethylene.svg @@ -0,0 +1,538 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 678fbc45..c8b71ff4 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -535,7 +535,7 @@ public enum ItemList implements IItemContainer { Casing_ULV, Casing_LV, Casing_MV, Casing_HV, Casing_EV, Casing_IV, Casing_LuV, Casing_ZPM, Casing_UV, Casing_MAX, Casing_BronzePlatedBricks, Casing_HeatProof, Casing_Coil_Cupronickel_Deprecated, Casing_Coil_Kanthal_Deprecated, Casing_Coil_Nichrome_Deprecated, Casing_Coil_Superconductor, Casing_SolidSteel, Casing_FrostProof, Casing_Gearbox_Bronze, Casing_Gearbox_Steel, Casing_Gearbox_Titanium, Casing_Gearbox_TungstenSteel, Casing_Processor, Casing_DataDrive, Casing_ContainmentField, Casing_Assembler, Casing_Pump, Casing_Motor, Casing_Pipe_Bronze, Casing_Pipe_Steel, Casing_Pipe_Titanium, Casing_Pipe_TungstenSteel, Casing_Pipe_Polytetrafluoroethylene, - Casing_Stripes_A, Casing_Stripes_B, Casing_RadioactiveHazard, Casing_BioHazard, Casing_ExplosionHazard, Casing_FireHazard, Casing_AcidHazard, Casing_MagicHazard, Casing_FrostHazard, Casing_NoiseHazard, Casing_Grate, Casing_Vent, Casing_RadiationProof, Casing_Firebox_Bronze, Casing_Firebox_Steel, Casing_Firebox_TungstenSteel, Casing_Inert, + Casing_Stripes_A, Casing_Stripes_B, Casing_RadioactiveHazard, Casing_BioHazard, Casing_ExplosionHazard, Casing_FireHazard, Casing_AcidHazard, Casing_MagicHazard, Casing_FrostHazard, Casing_NoiseHazard, Casing_Grate, Casing_Vent, Casing_RadiationProof, Casing_Firebox_Bronze, Casing_Firebox_Steel, Casing_Firebox_TungstenSteel, Casing_Chemically_Inert, Casing_RobustTungstenSteel, Casing_CleanStainlessSteel, Casing_StableTitanium, Casing_Firebox_Titanium, Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, Hull_MAX, diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 068d67fb..379858cb 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -36,7 +36,7 @@ public class Textures { MACHINE_CASING_GEARBOX_BRONZE, MACHINE_CASING_GEARBOX_STEEL, MACHINE_CASING_GEARBOX_TITANIUM, MACHINE_CASING_GEARBOX_TUNGSTENSTEEL, MACHINE_CASING_DATA_DRIVE, MACHINE_CASING_CONTAINMENT_FIELD, MACHINE_CASING_ASSEMBLER, MACHINE_CASING_PROCESSOR, MACHINE_CASING_STRIPES_A, MACHINE_CASING_STRIPES_B, MACHINE_CASING_RADIOACTIVEHAZARD, MACHINE_CASING_BIOHAZARD, MACHINE_CASING_EXPLOSIONHAZARD, MACHINE_CASING_FIREHAZARD, MACHINE_CASING_ACIDHAZARD, MACHINE_CASING_MAGICHAZARD, MACHINE_CASING_FROSTHAZARD, MACHINE_CASING_NOISEHAZARD, MACHINE_CASING_GRATE, MACHINE_CASING_VENT, - MACHINE_CASING_RADIATIONPROOF, MACHINE_CASING_FIREBOX_BRONZE, MACHINE_CASING_FIREBOX_STEEL, MACHINE_CASING_FIREBOX_TUNGSTENSTEEL, MACHINE_CASING_ENGINE_INTAKE, MACHINE_CASING_INERT, MACHINE_COIL_CUPRONICKEL, + MACHINE_CASING_RADIATIONPROOF, MACHINE_CASING_FIREBOX_BRONZE, MACHINE_CASING_FIREBOX_STEEL, MACHINE_CASING_FIREBOX_TUNGSTENSTEEL, MACHINE_CASING_ENGINE_INTAKE, MACHINE_CASING_CHEMICALLY_INERT, MACHINE_COIL_CUPRONICKEL, MACHINE_COIL_KANTHAL, MACHINE_COIL_NICHROME, MACHINE_COIL_TUNGSTENSTEEL, MACHINE_COIL_HSSG, MACHINE_COIL_NAQUADAH, MACHINE_COIL_NAQUADAHALLOY, BOILER_SOLAR, BOILER_FRONT, BOILER_FRONT_ACTIVE, BOILER_LAVA_FRONT, BOILER_LAVA_FRONT_ACTIVE, NAQUADAH_REACTOR_SOLID_BACK, NAQUADAH_REACTOR_SOLID_FRONT, NAQUADAH_REACTOR_SOLID_SIDE, NAQUADAH_REACTOR_SOLID_BOTTOM, NAQUADAH_REACTOR_SOLID_TOP, NAQUADAH_REACTOR_SOLID_BACK_ACTIVE, NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE, NAQUADAH_REACTOR_SOLID_SIDE_ACTIVE, NAQUADAH_REACTOR_SOLID_BOTTOM_ACTIVE, @@ -101,7 +101,8 @@ public class Textures { BASALT_BRICKS_CRACKED, BASALT_BRICKS_MOSSY, BASALT_BRICKS_CHISELED, BASALT_SMOOTH, OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE, OVERLAY_FRONT_HEAT_EXCHANGER, OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE, OVERLAY_FRONT_PROCESSING_ARRAY, OVERLAY_FRONT_OIL_DRILL_ACTIVE, OVERLAY_FRONT_OIL_DRILL, OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE, OVERLAY_FRONT_DIESEL_ENGINE, OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE, OVERLAY_FRONT_PYROLYSE_OVEN, OVERLAY_FRONT_OIL_CRACKER_ACTIVE, OVERLAY_FRONT_OIL_CRACKER, OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE, OVERLAY_FRONT_DISTILLATION_TOWER, - OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE, OVERLAY_FRONT_ASSEMBLY_LINE, OVERLAY_FRONT_ADVMINER2_ACTIVE, OVERLAY_FRONT_ADVMINER2, OVERLAY_TOP_CLEANROOM_ACTIVE, OVERLAY_TOP_CLEANROOM; + OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE, OVERLAY_FRONT_ASSEMBLY_LINE, OVERLAY_FRONT_ADVMINER2_ACTIVE, OVERLAY_FRONT_ADVMINER2, OVERLAY_TOP_CLEANROOM_ACTIVE, OVERLAY_TOP_CLEANROOM, + OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR, OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE; /** * Icon for Fresh CFoam diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java index da775be6..9de9c3d3 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java @@ -37,7 +37,7 @@ public class GT_Block_Casings4 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Titanium Turbine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Tungstensteel Turbine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Engine Intake Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Inert Machine Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chemically Inert Machine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "PTFE Pipe Casing"); ItemList.Casing_RobustTungstenSteel.set(new ItemStack(this, 1, 0)); @@ -52,7 +52,7 @@ public class GT_Block_Casings4 ItemList.Casing_Turbine2.set(new ItemStack(this, 1, 11)); ItemList.Casing_Turbine3.set(new ItemStack(this, 1, 12)); ItemList.Casing_EngineIntake.set(new ItemStack(this, 1, 13)); - ItemList.Casing_Inert.set(new ItemStack(this, 1, 14)); + ItemList.Casing_Chemically_Inert.set(new ItemStack(this, 1, 14)); ItemList.Casing_Pipe_Polytetrafluoroethylene.set(new ItemStack(this, 1, 15)); } @@ -87,7 +87,7 @@ public class GT_Block_Casings4 case 13: return Textures.BlockIcons.MACHINE_CASING_ENGINE_INTAKE.getIcon(); case 14: - return Textures.BlockIcons.MACHINE_CASING_INERT.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_CHEMICALLY_INERT.getIcon(); case 15: return Textures.BlockIcons.MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.getIcon(); } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java index 63d0dd66..c7a11829 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java @@ -20,7 +20,7 @@ import net.minecraftforge.fluids.FluidStack; public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_MultiBlockBase { - private static final int CASING_INDEX = 16; + private static final int CASING_INDEX = 62; public GT_MetaTileEntity_LargeChemicalReactor(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -50,7 +50,7 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu "1x Output Bus/Hatch (Any edge casing)", "1x Maintenance Hatch (Any edge casing)", "1x Energy Hatch (Any edge casing)", - "Chemically Inert Casings for the rest (10 at least!)" }; + "Chemically Inert Casings for the rest (8 at least!)" }; } @Override @@ -59,8 +59,8 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu if (aSide == aFacing) { return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[CASING_INDEX], - new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE - : Textures.BlockIcons.OVERLAY_FRONT_IMPLOSION_COMPRESSOR) }; + new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR + : Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE) }; } return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[CASING_INDEX] }; } diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_CHEMICALLY_INERT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_CHEMICALLY_INERT.png new file mode 100644 index 0000000000000000000000000000000000000000..65af5abd523369eed3e196b0f820fafceb10871f GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?- zjUdc;OxLp)$dD{?jVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw{mw=TsOYSxi(`mI zZ*TBMu2ut{H`--Fj;xMVs3@G9cFa7sbLCY&#U&?I(~JH+tF)VW^T4{-Mn>0` zeHJyIojFU!c(y=OWBbeUmz^h~OQNP7Ro=O7_4T8-w;i<+tbCv&cf7DR?G5u=mIi`HZ{2v%S(aCHdz;=(N6m=mIeLLi|584%`AM9xu5bKa z>tCwy{*UR-%vllDmmM{8f6V4vV)Jya>05y&%f7?v))PJ*nOnT&^{&3HqH53TuB-n% b^@BgX?!NOb!`N=1#~3_a{an^LB{Ts5c8Q2% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png new file mode 100644 index 0000000000000000000000000000000000000000..18006024c91dec5628cdcbf2f4fbf345731573f3 GIT binary patch literal 476 zcmV<20VDp2P)isBI{h*;T)kc|gnhTV`y*z?YPAx~3~Mdi>ZL(lixbfwdMzQHb?=jk>PifJ!N7 zt$n{-E`=Y#&19{`^?L0EIYO;97K?@V!z;L4E+)@&QB~DPkn0bJ1Bl4X=ks`kJkJF) z<9IywdLX5QF$NAC5im1$yIrpbVV|a{$M{?L=0T`HYmM1#hK~w}2u;&OB#*}<8fU-X zM_KR+ZnvAsvP^^?gnxDfP1B&RYm+2NY+{yWqAW}AK`6a@rAd+qui#S-+`+yaY&M(s z91xLtKA)m(+pjq&%M$nd-At!b5qaRUJsb`(nM^PqkG^U4tb literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR.png new file mode 100644 index 0000000000000000000000000000000000000000..bc1dd3f5f0430f3a4f25926959e7a8d6400cf3ae GIT binary patch literal 439 zcmV;o0Z9IdP)d$Ht@M%V{v4+YVSG|=39t$mR`h)`i4AmYVyK?4a5@#rCu zkRDn?V5)81K@rzko<7qw%>2v z0n#73wvGN`yi6U9A*R2vaJosxH$7$N_L7b-lAEvS_ h#dVyE3FO*w{sP3IkDiLfK?DE*002ovPDHLkV1j>jxlRB8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE.png new file mode 100644 index 0000000000000000000000000000000000000000..b57178136f2579c083fab8d66e7b414e329db9a0 GIT binary patch literal 457 zcmV;)0XF`LP);z3OC374A;h6=Xh?+CUbt}Kod56s&%Nh}G)-A$t2500coWjR-1LlRe8~6vqIxf>xGSshY(SW@Iq|18`q`1Pz>L8~G%W zQsTNUr<`RuYx54~#Q^M1H)LWdW%(ll*p8i@BNX-9I`Mc6B$?QCU7EgM?!farJkKKx zLjc-4ZC>_Y7k2>AXf*OAXb{~fn!caAxfGBS14qFDqc~=JYb?I|{Z!X9@iQEzhOUbO zAX18oY32Z*-EOW;-_JkTyfDih7`iU39gC}tYtZ2M>yW#XhsifKZQd?J(25-?X0zZp z&cZ_xDMi%l6+1Cf>i@%(B#AI|eQAJLb)0_zJV1acXvuF#00000NkvXXu0mjf51F>_ literal 0 HcmV?d00001