From 328f84cdd4468101d45a092f15f95de816e7009d Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 29 Aug 2023 16:10:17 +0200 Subject: [PATCH] missing tank textures, lang keys --- CONTRIBUTING.md | 38 ++++++++++++++++++ .../java/com/hbm/inventory/fluid/Fluids.java | 6 +-- src/main/resources/assets/hbm/lang/de_DE.lang | 1 + src/main/resources/assets/hbm/lang/en_US.lang | 1 + .../models/tank/tank_HEAVYWATER_HOT.png | Bin 0 -> 1104 bytes .../hbm/textures/models/tank/tank_SODIUM.png | Bin 0 -> 1192 bytes .../textures/models/tank/tank_SODIUM_HOT.png | Bin 0 -> 1260 bytes 7 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 CONTRIBUTING.md create mode 100644 src/main/resources/assets/hbm/textures/models/tank/tank_HEAVYWATER_HOT.png create mode 100644 src/main/resources/assets/hbm/textures/models/tank/tank_SODIUM.png create mode 100644 src/main/resources/assets/hbm/textures/models/tank/tank_SODIUM_HOT.png diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..9d02a90df --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,38 @@ +# NTM Contribution Guidelines, Version 1 + +## Keep it concise + +The best PRs are the ones that are small and to the point. The entire PR should focus on the thing you're trying to do, whether it's a fix or a feature PR. If your PR adds the Super Weldtronic 9000, there's no reason to include changes and tweaks to other things that have nothing to do with the Super Weldtronic 9000. If you think those changes are still necessary, open a new PR. + +## Keep it clean + +While admittedly my own code isn't the cleanest on earth, please try to keep terrible practices at a minimum. Also avoid things like unused variables and imports, mixed indentation styles or changes that have a high likelihood of breaking things. + +Things you should also avoid include: +* new libraries (unless your PR absolutely needs it like for special mod compat) +* duplicate util functions (just use what we have, man) +* unused or half finished util functions (for obvious reasons) +* half finished or obviously broken features (à la "bob will fix it, i'm sure of it", please don't do that) + +## Test your code + +This should go without saying, but please don't PR code that was never actually tested or has obvious compiler errors in it. + +## Communication + +If you're planning on adding some new thing or doing a grand change, it's best to ask whether that's a good idea before spending 50 hours on a project that won't end up getting merged, due to issues that could have been entirely avoidable with communication. + +## No guarantees + +This ties together with the previous point - there's no guarantees that your PR gets merged no matter how hard or long you've worked on it. However, if you follow these guidelines, there's a good chance that your PR will be accepted. + +## I want to help but don't know where to start + +If you want to help the project, consider getting involved with the [wiki](ntm.fandom.com) first. Writing an article is the easiest and quickest way of helping, and requires no programming knowledge. If you do know Java and want to help, consider these places first: + +* Localization, i.e. translations in different language are always accepted. +* `IConfigurableMachine`, an interface that allows machines to be added to the `hbmMachines.json` config, is still not used by many machines. +* F1 Presentations, also known as "Stare" or "Jar Presentations", is a neat system of creating a short movie explaining functionality. All the relevant code can be found in `com.hbm.wiaj`. +* Some guns still use the old "bow-style" systems and not `ItemGunBase`. +* Many guns don't have any animations whatsoever, just adding a minor recoil would already improve them by a lot. +* Adding tooltips to more machines, explaining some of the basics. diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index cb2fb5539..093030189 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -321,9 +321,9 @@ public class Fluids { HEAVYWATER_HOT = new FluidType("HEAVYWATER_HOT", 0x4D007B, 1, 0, 0, EnumSymbol.NONE).setTemp(600).addTraits(LIQUID); SODIUM = new FluidType("SODIUM", 0xCCD4D5, 1, 2, 3, EnumSymbol.NONE).setTemp(400).addTraits(LIQUID); SODIUM_HOT = new FluidType("SODIUM_HOT", 0xE2ADC1, 1, 2, 3, EnumSymbol.NONE).setTemp(1200).addTraits(LIQUID); - THORIUM_SALT = new FluidType("THORIUM_SALT", 0x7A5542, 2, 0, 3, EnumSymbol.NONE).setTemp(800).addTraits(LIQUID); - THORIUM_SALT_HOT = new FluidType("THORIUM_SALT_HOT", 0x3E3627, 2, 0, 3, EnumSymbol.NONE).setTemp(1600).addTraits(LIQUID); - THORIUM_SALT_DEPLETED = new FluidType(129, "THORIUM_SALT_DEPLETED", 0x302D1C, 2, 0, 3, EnumSymbol.NONE).setTemp(800).addTraits(LIQUID); + THORIUM_SALT = new FluidType("THORIUM_SALT", 0x7A5542, 2, 0, 3, EnumSymbol.NONE).setTemp(800).addTraits(LIQUID, new FT_Corrosive(65)); + THORIUM_SALT_HOT = new FluidType("THORIUM_SALT_HOT", 0x3E3627, 2, 0, 3, EnumSymbol.NONE).setTemp(1600).addTraits(LIQUID, new FT_Corrosive(65)); + THORIUM_SALT_DEPLETED = new FluidType(129, "THORIUM_SALT_DEPLETED", 0x302D1C, 2, 0, 3, EnumSymbol.NONE).setTemp(800).addTraits(LIQUID, new FT_Corrosive(65)); // ^ ^ ^ ^ ^ ^ ^ ^ //ADD NEW FLUIDS HERE diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index c93c37910..84147f821 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -666,6 +666,7 @@ hbmfluid.heatingoil_vacuum=Schweres Heizöl hbmfluid.heavyoil=Schweröl hbmfluid.heavyoil_vacuum=Vakuum-Schweröl hbmfluid.heavywater=Schweres Wasser +hbmfluid.heavywater_hot=Heißes Schweres Wasser hbmfluid.helium3=Helium-3 hbmfluid.helium4=Helium-4 hbmfluid.hotcrackoil=Heißes Crack-Öl diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index a34f8457c..0a303319d 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -1308,6 +1308,7 @@ hbmfluid.heatingoil_vacuum=Heavy Heating Oil hbmfluid.heavyoil=Heavy Oil hbmfluid.heavyoil_vacuum=Vacuum Heavy Oil hbmfluid.heavywater=Heavy Water +hbmfluid.heavywater_hot=Hot Heavy Water hbmfluid.helium3=Helium-3 hbmfluid.helium4=Helium-4 hbmfluid.hotcrackoil=Hot Cracked Oil diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_HEAVYWATER_HOT.png b/src/main/resources/assets/hbm/textures/models/tank/tank_HEAVYWATER_HOT.png new file mode 100644 index 0000000000000000000000000000000000000000..09ce7b6d20cbc2d851d14aab2763decf0f93f201 GIT binary patch literal 1104 zcmV-W1h4yvP)d;~ zFzTM`+)=kCTC^e850@W4A8ub4+c)t_5%CJEqw98pLOVgBogiK*B3>bgcvUIl6;z}y z6?EMV$m!xKbOYYH{4@&Pfc^9Ib)0ymXzh5#HM$aW<5kXf#4AN>#jBj{h*u4v>js5x z0Xf=4c&Dls=+$ZEVSSm9wuD z24jY#7G}@+gGl``5U&*Ra3F$sI1oupYB)iTc7k`WHpaVG2x4iAO0l#BRM2%dj#0N0 z%w9Rc?A6A2I1oWR99St!4+qks4dLA@Br)oCg09;MmbTa!OIsj_r7bGO!+{9m;Xowq zpRXpz0~Fc`3he~5SBkXa)%bOtoZm%@HY7J*^&|3g5U&(z#j821ArP+&VQC8#qeWLP z_XT-cv=hWDMH=yH9Ia^470QWMbE1_9@k*6OyqY^2XE0`nX1t=%l_*_)ifgnJ6xs>m zl_E{<*r(Hdam%(8uiUR3I4p8s*wD|mM%P^+R?y++t-A50xh?cmt8J~=E(<-?U57^B zwHKSEEfjtJ`ddUqj>lv49Ith5UAE{@OTF3M$N_AY|)lxuNEDQ zrA}~Z3tozq;|Q6%FnbQ-RV9d5$U>o=;Nd_;JRFE1)A0&%mf{ufUKzr>S13lIouJT8 z5U&&wuMkAMsub}GLBuN*qtH%JXeWqQiilSTB3@OBc!eP16^c=4Cn&TN#4AOX;?-Y$ WFGd}B^O>mt00002% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_SODIUM.png b/src/main/resources/assets/hbm/textures/models/tank/tank_SODIUM.png new file mode 100644 index 0000000000000000000000000000000000000000..a17ee9e4954052c96ab8e1b1f64d26a696914eec GIT binary patch literal 1192 zcmeAS@N?(olHy`uVBq!ia0vp^RY2Us!3HEZPulwcNU;<Eakt zG3V{wjd_&C3!r9wG2EXp1WYdbexFJPfx%6?zx7?)|}rSw>#TB-gmyaoxfW9 zx7h!8-<*2e{@eQVv$wndmIaDDJAB+YQAZVv&FQ_5TLmyJzCh^Y!iWJ>8(I z7FFUT_wIdM&i`G1CEwmSqV0G@+d^=?K#!BQ`CD*;V1Ygx|6$x5CFhR#x5qobF^3MR$eY6||&Vel%fX?M6+!S`1uX2@`; ztFfnboop#U7iSm#9CQVRCrYZ0Ez{4iu*>-v3h+t0l;Yjau+ z3HnK0;olxx*=1bh{MZ{_D>hp>juR+U8|JJKr`obqSD;61uH|~h`3qfFJMIxu5nTVv zMLRj;qUXoX@Y?Gi)qsjS!fV|h^BfaWl3cG*qE_R6-4_@j3odv8~Gn{j! z_)eXipK(1&HnDyXJC5&OzN>R;*7`x3AcyZhq{ISg`TVm2Wq!`er#h^8V_R zPd{%C-IlTY#MA4)et&&`(|)q@qfp<-H_NWwzWQ~#c5;v5>8G14(*)N)*|POY)#&1qD5!)LbQvc@rt+?y^&GtU8lJ&0LAewz;?xYnT zPl@`zdVh8MZkL%w_Ahm$cOO{1w>nfzxy&)?`Rx!@+4VW=u1P!hxyt44u`0>DxGx}4 ze0^rT?xxCbt5#a9YckvWZj=5WR&lH86$|J7;#P|)`0jNfVVg z6xa@(xxgpj0E#ft23%nXb|qx-MryV6G~IgNPhyQm))+rp-9Px0)5B+X_8Dt0q=;ib#H(fz+qBMeD>w@Wcwyw86sXmMZCgj6xs<2?F8}45b+8s;#H=I zS5S4uE3F}(o?Oe>`BBjIZw}oH@Zin2{=;pRZ7V&l~;IhuI2d-TyxkfTxK>Xo6n;#Ei=O^Z%QY`hA( z9!liF?MJ;MprDLi*_5;lBv;bq^IgUw4;~sMdwSSVFocX4n2h z40#Zqcx8y21EI3KIgr8F0&r2o339X(JbSfcJbMKdQ(I(;sV$(goZ5mz_X05Lc7m%{ zPB3%ej&XA!RNNexDQ*sg%JSJO4&4jDsM`rnm^d-Z)E3x|sV$&lYKu&9b0Abn&m4%| zsgA-QUcQk>SKZ?Q`e-L8v=hWDLss#s{kTpDT697}<5fK(AAope$SPjN%!a_IJ0VPM zfzfEunG1bDo)+x{@yd`zyo!ldBDCnFgv6_uXeC0tGG!63Vn^c)#u8!~uPAgT#!f#) zAMFH%c7k|iXs(+BL(rlV!k-n+6o2;$Dz08(Gz#qmg?55?)v$kjAR;2S7dMmak9d`! zs>to-IT5dnX@%WCJ{aAyiB}0}7P%^HwQh=H4?(;#q7}KlysN|b)JC`HTo3ETW?e78 zSgobltmVaO-Pq!~-e&*!p!MEwx%}lImo2(oack{(_2K24$@cBK&?0{pdsjua<~Cm4b=^7Q?vhK_HEE011~J8Et-jXc ziuPW}Ywa`J>$KNR&B9JK>Q0GiylO_3YI$3P>08%a9ukA9?LuylM+=J=?xlL~q?=?5fBq#VgaRSIwgL{j&Q`OSVsPwD&jUvr?7KvscXm zwbyCe^{vy^cfB66tv90!olCs%&ix4!FSvSTXwmTs@v@3n_{~kc!Z6$%h|wst6BODB z;*}xd6;#BlOcAf3B3@xM3he}ic7k|ihzUKvU$Ui|`; Ws43x5F|T$20000