From d2713822659e43c7bdc42a565db95ae61e08c3e9 Mon Sep 17 00:00:00 2001 From: Boblet Date: Thu, 17 Oct 2024 16:28:54 +0200 Subject: [PATCH] liquid lead cooling (preliminary version, not balanced, no need to yell) --- .../java/com/hbm/inventory/fluid/Fluids.java | 12 ++++++++++-- .../hbm/inventory/fluid/trait/FT_Coolable.java | 2 +- .../hbm/inventory/fluid/trait/FT_Heatable.java | 2 +- .../inventory/recipes/LiquefactionRecipes.java | 2 ++ .../inventory/recipes/SolidificationRecipes.java | 1 + src/main/resources/assets/hbm/lang/de_DE.lang | 2 ++ src/main/resources/assets/hbm/lang/en_US.lang | 2 ++ .../assets/hbm/textures/gui/fluids/lead.png | Bin 0 -> 790 bytes .../assets/hbm/textures/gui/fluids/lead_hot.png | Bin 0 -> 757 bytes .../hbm/textures/models/tank/tank_LEAD.png | Bin 0 -> 1046 bytes .../hbm/textures/models/tank/tank_LEAD_HOT.png | Bin 0 -> 1095 bytes 11 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/gui/fluids/lead.png create mode 100644 src/main/resources/assets/hbm/textures/gui/fluids/lead_hot.png create mode 100644 src/main/resources/assets/hbm/textures/models/tank/tank_LEAD.png create mode 100644 src/main/resources/assets/hbm/textures/models/tank/tank_LEAD_HOT.png diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index cc933de8e..08007179a 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -170,6 +170,8 @@ public class Fluids { public static FluidType HEAVYWATER_HOT; public static FluidType SODIUM; public static FluidType SODIUM_HOT; + public static FluidType LEAD; + public static FluidType LEAD_HOT; public static FluidType THORIUM_SALT; public static FluidType THORIUM_SALT_HOT; public static FluidType THORIUM_SALT_DEPLETED; @@ -379,7 +381,9 @@ public class Fluids { LIGHTOIL_DS = new FluidType("LIGHTOIL_DS", 0x63543E, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xB46B52)).addTraits(LIQUID, P_FUEL); STELLAR_FLUX = new FluidType("STELLAR_FLUX", 0xE300FF, 0, 4, 4, EnumSymbol.ANTIMATTER).addTraits(ANTI, GASEOUS); VITRIOL = new FluidType("VITRIOL", 0x6E5222, 2, 0, 1, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS); - SLOP = new FluidType(141, "SLOP", 0x929D45, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS); + SLOP = new FluidType("SLOP", 0x929D45, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS); + LEAD = new FluidType("LEAD", 0x666672, 4, 0, 0, EnumSymbol.NONE).setTemp(350).addTraits(LIQUID, VISCOUS); + LEAD_HOT = new FluidType(143, "LEAD_HOT", 0x776563, 4, 0, 0, EnumSymbol.NONE).setTemp(1500).addTraits(LIQUID, VISCOUS); // ^ ^ ^ ^ ^ ^ ^ ^ //ADD NEW FLUIDS HERE @@ -416,6 +420,8 @@ public class Fluids { metaOrder.add(BLOOD_HOT); metaOrder.add(SODIUM); metaOrder.add(SODIUM_HOT); + metaOrder.add(LEAD); + metaOrder.add(LEAD_HOT); metaOrder.add(THORIUM_SALT); metaOrder.add(THORIUM_SALT_HOT); metaOrder.add(THORIUM_SALT_DEPLETED); @@ -609,9 +615,11 @@ public class Fluids { HEAVYWATER.addTraits(new FT_Heatable().setEff(HeatingType.PWR, 1.0D).addStep(300, 1, HEAVYWATER_HOT, 1), new FT_PWRModerator(1.25D)); HEAVYWATER_HOT.addTraits(new FT_Coolable(HEAVYWATER, 1, 1, 300).setEff(CoolingType.HEATEXCHANGER, 1.0D)); - + SODIUM.addTraits(new FT_Heatable().setEff(HeatingType.PWR, 2.5D).setEff(HeatingType.ICF, 3D).addStep(400, 1, SODIUM_HOT, 1)); SODIUM_HOT.addTraits(new FT_Coolable(SODIUM, 1, 1, 400).setEff(CoolingType.HEATEXCHANGER, 1.0D)); + LEAD.addTraits(new FT_Heatable().setEff(HeatingType.PWR, 5D).setEff(HeatingType.ICF, 10D).addStep(600, 1, LEAD_HOT, 1), new FT_PWRModerator(0.5D)); + LEAD_HOT.addTraits(new FT_Coolable(LEAD, 1, 1, 400).setEff(CoolingType.HEATEXCHANGER, 1.0D)); THORIUM_SALT.addTraits(new FT_Heatable().setEff(HeatingType.PWR, 1.0D).addStep(400, 1, THORIUM_SALT_HOT, 1), new FT_PWRModerator(2.5D)); THORIUM_SALT_HOT.addTraits(new FT_Coolable(THORIUM_SALT_DEPLETED, 1, 1, 400).setEff(CoolingType.HEATEXCHANGER, 1.0D)); diff --git a/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java b/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java index 87f595015..3e57ac963 100644 --- a/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java +++ b/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java @@ -42,7 +42,7 @@ public class FT_Coolable extends FluidTrait { @Override public void addInfoHidden(List info) { - info.add(EnumChatFormatting.RED + "Thermal capacity: " + heatEnergy + " TU"); + info.add(EnumChatFormatting.RED + "Thermal capacity: " + heatEnergy + " TU per " + amountReq + "mB"); for(CoolingType type : CoolingType.values()) { double eff = getEfficiency(type); diff --git a/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java b/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java index 0ec79abb7..f5c25c89e 100644 --- a/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java +++ b/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java @@ -42,7 +42,7 @@ public class FT_Heatable extends FluidTrait { @Override public void addInfoHidden(List info) { - info.add(EnumChatFormatting.RED + "Thermal capacity: " + this.getFirstStep().heatReq + " TU"); + info.add(EnumChatFormatting.RED + "Thermal capacity: " + this.getFirstStep().heatReq + " TU per " + this.getFirstStep().amountReq + "mB"); for(HeatingType type : HeatingType.values()) { double eff = getEfficiency(type); diff --git a/src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java b/src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java index 4b2ea8f6b..feb244d49 100644 --- a/src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java @@ -43,6 +43,8 @@ public class LiquefactionRecipes extends SerializableRecipe { recipes.put(KEY_LOG, new FluidStack(100, Fluids.MUG)); recipes.put(KNO.dust(), new FluidStack(750, Fluids.NITRIC_ACID)); recipes.put(NA.dust(), new FluidStack(100, Fluids.SODIUM)); + recipes.put(PB.ingot(), new FluidStack(100, Fluids.LEAD)); + recipes.put(PB.dust(), new FluidStack(100, Fluids.LEAD)); //general utility recipes because why not recipes.put(new ComparableStack(Blocks.netherrack), new FluidStack(250, Fluids.LAVA)); recipes.put(new ComparableStack(Blocks.cobblestone), new FluidStack(250, Fluids.LAVA)); diff --git a/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java b/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java index 637779c6a..cc1f38a79 100644 --- a/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java @@ -70,6 +70,7 @@ public class SolidificationRecipes extends SerializableRecipe { registerRecipe(WATZ, 1000, ModItems.ingot_mud); registerRecipe(REDMUD, 1000, Items.iron_ingot); registerRecipe(SODIUM, 100, ModItems.powder_sodium); + registerRecipe(LEAD, 100, ModItems.ingot_lead); registerRecipe(SLOP, 250, ModBlocks.ore_oil_sand); registerRecipe(OIL, SF_OIL, DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRUDE)); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 5e0a7bdbe..03b5fc26c 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -722,6 +722,8 @@ hbmfluid.iongel=Ionengel hbmfluid.kerosene=Kerosin hbmfluid.kerosene_reform=Düsentreibstoff hbmfluid.lava=Lava +hbmfluid.lead=Flüssiges Blei +hbmfluid.lead_hot=Heißes flüssiges Blei hbmfluid.lightoil=Leichtöl hbmfluid.lightoil_crack=Crack-Leichtöl hbmfluid.lightoil_ds=Entschwefeltes Leichtöl diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index e5c7acb68..ef097a17a 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -1432,6 +1432,8 @@ hbmfluid.iongel=Ionic Gel hbmfluid.kerosene=Kerosene hbmfluid.kerosene_reform=Jet Fuel hbmfluid.lava=Lava +hbmfluid.lead=Liquid Lead +hbmfluid.lead_hot=Hot Liquid Lead hbmfluid.lightoil=Light Oil hbmfluid.lightoil_crack=Cracked Light Oil hbmfluid.lightoil_ds=Desulfurized Light Oil diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/lead.png b/src/main/resources/assets/hbm/textures/gui/fluids/lead.png new file mode 100644 index 0000000000000000000000000000000000000000..d6da14bdd429e7fc5d4b4f33121d3e59302a16d1 GIT binary patch literal 790 zcmV+x1L^#UP)$>#& zeUwtP+iiT`XS3P-F^HmwG)>uVxAgmc@;t}3?W0I3g<%*JMFD_iS=`^>^ZNRV09Y=U ztk-MGvZO3abX_M10-`7)3`0hv5lShflsJw2!)|ng9qPux*=e zw~LgL)oMi?$JBMra=Ap;b@DuCGMONyL@1@ubsfVnFbo5LcDs#~5~UPLl5jX2`0?Wh zjYflyj}Km6Ua0GuqA1YIvP1}hloHSLXti2gTwD;xFq?0pTiqFqa7K_C(O&EqmQG}*x0F-4( zQ50yue*IJbeXQ%6%gal`Fy!g!iN#`ZM7Jmk&d<-u^PD6}a2y9+*AY@milSh<-C|i5 ztyYUhqjBWlvMgNJC5~gp<1zF3{77RMhKRenJ4T}s!{HFm^LT!Krm8CD^EpBY9LG6c zfG`Z%?RK1;oN#-4i*Ou=o0}VUyB)soGZ+k5E|-*LNnO{hRx3=?L@9;mdGvZc#^W*T z^_uB)ig9uA^S?ArDT;!2yNzX8Xqtv$7*th7S(a#;h7f{Ir$Z0~2qDO_jP-iW{|Mt) Uw}EY>Qvd(}07*qoM6N<$f-5$3UjP6A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/lead_hot.png b/src/main/resources/assets/hbm/textures/gui/fluids/lead_hot.png new file mode 100644 index 0000000000000000000000000000000000000000..5d93be21e6ed7f084ba39579412378f436f18b26 GIT binary patch literal 757 zcmV&kO`9BGs7qZ+Re$|o)#UHL{(QdaI>I=T=Q$@QCwT8^ znufZr>ADUb$HZDQRSGko6UQ+R4-YIB3nHZyizMM;7}#1%(=_ybk1>W20$G+(mL<-K6$Ypp-(t z78zsMT1!zBgb=XSBBjK>u4;@S^4=q*L`aDoM*#9X#~AZwW*A3~kB@QAaeaNwX0ri! zQR}@&3V|^OV+>iAv0kq!ih{oHY1@`0NhtCh9mnhj?)-_y5CGU(OBhG8EaPysdfC|+ zm`rHCeg&XyTejORZQBAMr6gJ;2}M!RG!0$Xadma|=7Y5sDFnkXaP|2!>2k^b{yu$w zhcPp>)A)DIXgQ8;Nai@p_IaV&#sXa z0`EQlefdIvdy9|}W;SD)rexVZyYSu zSZloZtX8X6gx@e`h7^Km{)%fD2Bu1pWf^IjqP51%X2e=EH-@|@-hN|ujcJ+^{qo@h zbzO5=RVYr~-LkNL9&xy5uWBl~=#25lhCa5Ul n@bHkmy*;8R!rt9sw_E-P(zIDWO|>~z00000NkvXXu0mjfs=8k_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_LEAD.png b/src/main/resources/assets/hbm/textures/models/tank/tank_LEAD.png new file mode 100644 index 0000000000000000000000000000000000000000..ee86122ea128c9210454f695fd87e7e0eb4b104a GIT binary patch literal 1046 zcmeAS@N?(olHy`uVBq!ia0vp^RY2Us!3HEZPulwcNU;<go!HV`>hn103h3&ZBujA=8OzsQ}ftD02e&u{#@dx2nHo=g-^!zMgw~*YxS} zo_42&U9Wt8u`l=bHvN*@+uoJ!R{gExfASvZ#kRY%S53CIpR`YUlk39X1sB|O`ncvM zUy*%vF>t$@m6h`K*Wd5HUba)EI{(pBrAMMJN3>lQUvLY^Q0@rt>IfGQT+ijYr%A&s z?(AGGi<0*Z=N0EULCFIjf9%@9`_b#-t&d&BC5ldur=Bl6qV1Y}RD1s0j&MoN-f+9; z8GLu$0$#`}xJy4Q?o*4?REl#va(A`UTG92ho^7)5QjbejF^MZ&dz+)kq)McUeb2hm z=O&H0`PXi3pR<@-SZaOExr;y}efU~5OyYh%0h(rg!15MI@twUvTf+9dI(PBTUM-i5 zJ)dS7yKR3JsU27O^o6?}N6E%5tZ9bnXE=(s2-;L{-8kjrspos28AzNyap%w*yLy4* zdLD?e9VZ)S9QEZ@K5^0Q!<(zeD!y?kP1~j+;vMa9T4)5CX z=<1I`+4=Wf-P4bl$F=I1x$g;DBD&rw%vm8WwPmTUKyRPkocGM1O120BT_p7}OJ?nh z7fe5otiDjXr!&0EyXJpPTFV-t%66#ngrCPCUMztrVv@nJYT<`HOSsG~;Hz ze~~!RfBE;_kJjD2`MBcg=P66{FSp8xM^^2P6?j2k1-_1{`5 zSOw3=DM|sO#!1?7Pms%=rjCkG4P2?dqoOqf7@okm{OA?v_wkjy%#^alo@-X70W&&- Mr>mdKI;Vst0Ip&4`v3p{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_LEAD_HOT.png b/src/main/resources/assets/hbm/textures/models/tank/tank_LEAD_HOT.png new file mode 100644 index 0000000000000000000000000000000000000000..a043b9a4dbec21a63ae4bdc9550c7be8b0542957 GIT binary patch literal 1095 zcmV-N1i1T&P)c#16vpxAB0%rpY&n3pTp(Kx(A=S!nv=Mbdk6Ot-8y(N zvKGh|Px1jWwM%Wt#FIozd=jbm|4lZaD2ARX@{=ffArZcQ`Sv$vJ6!tl^ZTM}oBFYR z|9F$z&v)n7$Kz2}%ljms<%S~Kx%Su|k4L#(-ko1pRVA`a^I2}v>;@^+TkmRlpRC9t zBA?Rj3OS?DPEcqkI!A>fjJo@}cGPW&7M+pzkGG50uZLZ-eG{(?5wD;kUSTi_?F5B( zf_P`?L_BeKhgP5R(I;>Km_Oax|yz z8DP$s6Xa-|ares5Sn=xAM|1b85PjoSOdn0WGBj4aiptT~d=S`TX$!Ps&X^PAXeW5~ zYGNtlRm{HHFc`~7+rsQIUx>CZ1M$iblLMh*av)l9Q^N^zv=cmgH8GyOf{LXr3dPbE zP_eWHS~2Q&g1c8vaQA9rOb&#K$$^Dpav)SZdxchvx}D&Hi4!bsF)^05fQqFp3dQ6= zsF)mxRu8Mk&hY?+c7j4X!QCrER`Du)Tqov#(V{aF8?VkI@+%Op3|YmiKC2-RuQI~Y z78r~cUAWi>XsxAcExM@> zkG0?L7i~ojS;nh{ht}Gpt&l^D+(&(hir2$Vs;WAVyt!a9KvN$)MUh2p|g&qSO~6!s3;5p`-0*g@>B_?p3{YrQDy@{;!eK-K)u4bg1bPWRq~) zn7>Uu!5|gO$$`YHLJ+SIg+e>Qq(YL7|->UKt`@K}EbO z6!8iw;uQv?&`wZjCx};uh*wY%uL?!Hf{J*B!6>v76xs>mm7$#C)jyt1n^%5jv#S6A N002ovPDHLkV1k8{5Iq0@ literal 0 HcmV?d00001