From 04fa4cd9db4c44975d4da75521f8eae811c0a827 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Fri, 26 Sep 2025 21:47:54 -0500 Subject: [PATCH 1/3] cooling tower blocks (#1909) --- .../casings/machine_casing_ostrum_carbon.json | 1 + .../concrete/polished_titanium_concrete.json | 6 ++++++ .../models/block/concrete/titanium_concrete.json | 6 ++++++ .../casings/machine_casing_ostrum_carbon.png | Bin 0 -> 821 bytes .../machine_casing_ostrum_carbon.png.mcmeta | 5 +++++ .../casings/machine_casing_ostrum_carbon_ctm.png | Bin 0 -> 4866 bytes .../block/polished_titanium_concrete.png | Bin 0 -> 4527 bytes .../tfg/textures/block/titanium_concrete.png | Bin 0 -> 4492 bytes kubejs/startup_scripts/tfg/constants.js | 3 ++- 9 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 kubejs/assets/tfg/models/block/casings/machine_casing_ostrum_carbon.json create mode 100644 kubejs/assets/tfg/models/block/concrete/polished_titanium_concrete.json create mode 100644 kubejs/assets/tfg/models/block/concrete/titanium_concrete.json create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon_ctm.png create mode 100644 kubejs/assets/tfg/textures/block/polished_titanium_concrete.png create mode 100644 kubejs/assets/tfg/textures/block/titanium_concrete.png diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_ostrum_carbon.json b/kubejs/assets/tfg/models/block/casings/machine_casing_ostrum_carbon.json new file mode 100644 index 000000000..51fb076f7 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_ostrum_carbon.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_ostrum_carbon"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/concrete/polished_titanium_concrete.json b/kubejs/assets/tfg/models/block/concrete/polished_titanium_concrete.json new file mode 100644 index 000000000..1aa5fc507 --- /dev/null +++ b/kubejs/assets/tfg/models/block/concrete/polished_titanium_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/polished_titanium_concrete" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/concrete/titanium_concrete.json b/kubejs/assets/tfg/models/block/concrete/titanium_concrete.json new file mode 100644 index 000000000..8328c13fa --- /dev/null +++ b/kubejs/assets/tfg/models/block/concrete/titanium_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/titanium_concrete" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png new file mode 100644 index 0000000000000000000000000000000000000000..1538c493e2c36620ec812779f239e1c158dd4454 GIT binary patch literal 821 zcmV-51Iqk~P)EX>4Tx04R}tkv&MmKpe$iTcs)$MLS4w$WV2$i;6gwDi*;)X)CnqU~=gfG-*gu zTpR`0f`cE6RR1)6os`aZU-<_X|?2Cme$zuExiK1r{) zweS%zunk;Xw>4=GxZD9oo-|PxZOKQ|TPOhUXY@@uVE7j3TXTAA?c?+T$WT|yH^9Lm zFkYnWb(eSdboTb|nO1*4&P#I3N!XZ400006VoOIv00000008+zyMF)x010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=?NMW5EmF)zuy1=02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{009k2L_t(I%dL{Jj)FiGMUNArkcC9Bvf6L(zqZ?-+8?pm zm{_ibLae~Tfdq}yt;I4pGYnMw5(@I($-8s!n|*zJ{xVYg^2%ntVyYjU>pK8aDXS@) znp`$))+_eq71`8e%M^et3<22X1!4@=b*}GTSTn+fOc>xjeY0Sx)Zf?52@Pe-)Pgl+ zDeJbHii92>gSAJ#=UED-HoLGn6CA6O@8SeN62(wm`sQN3;8>OXR2SOE%{w#umpd@c zF(vNuqIcfsK`xtNjBegz23jfj44gVHGd1DnI_16z5AGlfLrb=sxAi<@neg4WPtoAN zV*;rZ+ry!6w2vD}6w?+bk|=)NL3b-=B~i>1Qk%AJGi=6e00000NkvXXu0mjf$DU=; literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png.mcmeta new file mode 100644 index 000000000..1d8dd341a --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_ostrum_carbon_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_ostrum_carbon_ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..20c32fcc3ee12151e46f3a796e10ee4441c151fc GIT binary patch literal 4866 zcmeHKdsGuw8Xw9diU`yyT16dF+=IB2$&-*sc*rwqVnkNKpfZ_EaF9I63?!f|3c6j9 ziVrGPDaRIBm4epdqk<0*6qSk(v{)31R`6B9E>^H`>fQuIJlk{jc+U1el9PFS_xJto z_x--_-jlmgArBwxIN1?`ps~`3kVtTcEx%C?;7X;XJqNeCw5Vu05;MUDqh3QM5-^== zAYj5wY9PqmtW^X#*T7Dd-PsbGdx00Jht1Ny>cRk9@}``}T<^>M3-;>dio4f5q*)!s zZnI{LOGvo>*$v-oVe=P;ySwf)pSf8h9W}3QV`|yCzT7mieaE%W+BYfE#fMu*FKRjz zFz0vIilR;x5hNy~4wcmBPz!jPuynC<#Q(60Bd zl2H1CwdZRm*>Ct{^v=|K2?}?)@0JWo?0VXPiqX^6@@xpQSx*KBE2P1}uTuhv6r^vJ zMAQVjpIf0U_MQ+rJ0j_VBKh#9Y~LN;Zq;+hSw|kn86QpLlM#`z?)FWYS<^TDjWIEP z+0Hf`6`Ay_z=H?lmTh>FP1$hhCZ5&nRJ<}ob$aLzLj}tSt#g031DeiuB-~`8z z+b+K|&QuB<8yCqVVF&t5^!Ig>+J3a(m0bUu|FP1J(QT_84&FF+rWxw+mmWHP^x6CD zugAv59v6@<-`=qaE95VnsJ$58sPuxm;-AYzalLL2l~mfQr$0Tnxu955FRZHeU@zbM zb8^0^hko&*Yvx~4=XYpBVB-Bi%aGCy&u%A(_5l4oE4N`zN z33DY)8^kDTGMQK=9!qbGM>!&q2xW6oE*Aj^gi6)Xm>JPgA6X~{I6?>tHUJS-B#lUjq-3yA#| zk|s58#Cj_>%ZN3d;ei16A>OypuXDG80ZJwlhv@NSOL)={3DYvaSgprNwb=TI350x1 z&DS7&E{~1y2^>RIDo_}{5Xaa;@CAdzsH8fI#&kGgp#tPA67cXvB7!4Q z5c%LD9~Gai*08NqYFr$qH)=6ZPEw1-6R1HKZym4*E)G&iB}^`B0BW@;5;0l>9KaeN zb!xqddIOFkwZtMCv*^hY3VcQ2!WR1Sc)lFr8_;6HNP%9ouyWWe-hd>Q!iYgSKw8Yw zser)h0kRPX8wrfo8>964LJ~;XhTE{1wkwi z%g=_P?0*G}3|cA+Wjq=^dHfi(z@vFN1ie=x4GD^ht~s|vrf&{(O@}{7jGOV(+`MV7 zb>C*^l`uk_k;vlKw1>HOU7iR0+NwlPZJBp7f?x7*gPq{kjv$}8u97NU3gb`!9NA&l zn$FX7T;Bb~jVHhQz?zsHz3!pcT6gv*-kKiAKV=K8Ia6`AGv)tM6O|DCY3FoHL<+Bm)#>_f38@GT_KZwe(JG%9+tjqVC90sK+7>FG zoaTJLv%Qg;;af-CO+D|_d^|?5pwa1)O_{^b-1DUlPR&IX)BZ*7i{IR0r_*i7_4LcF z7G>>L<~3$MNswQ0uRO3Ho7Ujjkjb1ZCqCUYuQdkV+go3^Al&6kUHN9#V<>h_Umq`d z`j)IEIgUBkp37g_M|r8QKf95{==ME-dkLDi!S3jqzO`4^;h9g^F@0-u&{MN3Zz0k3#c-PbW>D|e{#BaZnS(+Yq z58>qE{k`d@S{Tk_S)FxJB{iWqDh`vRn}! TwDtUUOP@>#AW^mhMzAa literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/polished_titanium_concrete.png b/kubejs/assets/tfg/textures/block/polished_titanium_concrete.png new file mode 100644 index 0000000000000000000000000000000000000000..185ff9e63b99048caf9c51cb5139434d75b9ee85 GIT binary patch literal 4527 zcmeHKeNYo;8egFDRZtG`qn65&f?9R6n`Fb1$cK>d5im3YT2$z<+1-RKBpZ{31lk)~ zKpoIgvArTnIq$@CPVu813!e0fm0bP6TE`ElA64hd2$gfdqM}zl?%nVq%ys65nd^UK zX0yA``+I)x^ZefDd1v2BU0RaA?>t`!g8Vhf>U3}q5H4>|@EDqnr*(u$y6dF8eIQ7^tKJmhd$mTwWYF}!%F*0{Frcx@H2_os)a znr0t3QTkN!)253H1826px{4?}@7@x(`}UtQQ@<=Fm*pkYF686q->NywHC}6KPD+jM zg37nJed4j_4|6ZB$fV*vOKjTc`C4#jOeNBFyFRS~y~(V3_1uQ7Gz7U-uqu^Kqf(9L z1G1?5U3GMF+w$PQ|90KJ#j_HYC9glDEBthGRpiHuXMYvXE;)8D*ZSieoJ~&84xZLo zRvxl>mDe0&&THAz;`%+DIhJ(3I&i2aXsy#>xw*|gIN#m}aeGe%?Oo!#=)hn0|3ebG zd)=&OM|u*xRdbycXZ(=rx6hv}eDC|Vw$2vsZ>_O|-90q}o*q%|>px;oXugPxYGL20 z8>}pE3_IuSc7CYL+5V)ucSjpnw>je7VuSA6hP##J&iGHu_f0p1=Y-aWPH(SDd3vj{ zP1=oINZI%G+QBZ=uj}gX@lJNDXlr=b_6o>H{?W=0D!mUae#0~UScvVxrh?KP*@1sO zm)n)Ke3q~J#*BY^wYJE8FK48s!=8L=R>$eNcWzJHRoMQon5M?NK6l>rJbb08^*VGn zMsuY3^ZwspNBy(2o8|0`<2T(B>+zLyOlOlWuUiE586RpDxld;Ith1Hm-~ZvE+Zo+k z?ZnBiLb10S{#jUKALJiD?yFs08hatt+CGR{UjlVk#Debu#i+f!^3*U$eN=?eJ!mbn5CmdZ^^Zo)}mta*yIu`lTnhENtNVN3R)B!;~V8r z0s<4mld!{7V74h8(IOYG5?#3k*Oj6a-EnG{F!Na!O9>^~5+TjoHSNW{MH00J)e2Jd^|@4LE@# z(g-=AFi;GlkTP2DO-tt^q-CWt>hEEs~0dp)QNAfaDFp z0rUWCra8Oq1vry6F&R85=qVxOkqU`aDkEe>q=JyY0Ig=MHc*QKs{|9vaMy^iFiMaP zkd_oG6%e@WARDF1%8)!~&E&X(Xps;CEO?F$Ye7TNBu}bIo<oRIbDnN@+xqgg}o|3VAx14j)ndNOMR^B22J!#$P3tRH?Gel1{K%>=`)wosDPa0)iE zh@o9^05WdShZV_B=*d2Ot@ODL~DQN=As#kz`R}#~95v z3jHrVqFjJ+TMY0Uwt=k+?1bppRyd*;i1pX}jjY43IRy+)O)@Ecr{tQFYf=hK3OrR^ zQ*up8fk}a%av)Rkf6YCm&1l8XE+? zJX5&bpj~xyfzgZCXcN4C^qCj9MDg?)5dzNAYc=Y)%*b|T$2VzC%&#K0A;mQF(M5jS z$)97r0=Gez#LeFaLyx+3;ifk&J=ep+iPQBDw%p$|(Az%a?8^gNOuLqTY}~zI^Yi;D zZvD?6RmzLJobR{hxM3X)H@8qTman;*MLoFH_tIqy^DlS5emLVI?pM%$!lSpUsrS2% z4W=Au(W$5(pz=qplxB@ zjlZQ-2ZS8*{_~kH=6Ai4zjNaUr}rE8bbse39t?fFx6GNJ5~M%wQL<{5{z=C6l$6e} zw$!1aZ{YJXQzv7G>l3VNuAX=$)IMDt64K&+?O<4;`1zTp#$yZjhs8J8b9X21`#M0r z{@8*|3kt8zu3NTpb?AVh@$6ku?wW)1({~yleKLPVi5Jw7WfI*uw={S^nzLci{duY@ udlz5m;~ag8FOM(XdE$cp^Nh}UL+(0-&%-PCJ_9FY2+|~^sSn5Jmi-6sAbz$0 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/titanium_concrete.png b/kubejs/assets/tfg/textures/block/titanium_concrete.png new file mode 100644 index 0000000000000000000000000000000000000000..d2b2159cdd9b61caf4129a871e6fe62ddff63ebd GIT binary patch literal 4492 zcmeHKeNYtV8DE0(B@#kJY#L=bw1ben@4dUda3J3Caij;whlm2{?d|OyE8OjIyT_f7 zmZ&rin9_h+r)Uz5GBvG;X;BlfgYnQ%KrK>r#;-bR!BkRgv_YfAzI(@))68_3Y5wD8 z_ICGqf6woIp5OaC@9bNr&q`ky@=6ECy8P!&iu|4zp-rHkAKMGlsee1~iOPiK9 zoPQFzZ0V`RuMIVA$edSrG=5>qzDLj8 z2Nzsje{g90Z(sC8Ul@-~IntTqjNO@Ike3p#WgflrBTwZqPn{F zAaCpMBML8`32gsxNqfve!$56Xn%duWnr*24`O~X|nny2O8(z2U0{>Az1o_ocYPDXg zR!`;wve@&}MpcGq)vKp}Qq&S3nfiK0MUUS3$+mjMui_VfzM4vC|GUBQWt5c4$Sr<# z{^iYEqPMLHjIxw0EuNop-@m)Wp362yJlnNseYe|w?U$~xWv)?(-hXP*{)CXY-+ug? zTcViVMUhY2?xqH*mvq2{W%KiTNNVtgk-v z@r^?s@i1~Ov*pbCu{(m$I~R9KFH;S?h84@-tA&Em9XXrof?DHO2IRI!GymLLUei<@ z@ma6oPT{J^5Y5#W#{;`M(U8HstXw#N?JB(V#gdzUo!{*2`!?y=p`qZL)d7e9a;)nL zG?b)mJAU;3OTr@yi;It=)Qg{9^Go|cniFOHQ~F?095iZqsKX487T+yms>;5){m`#R zzqU_)^79zsn+HamyIf=JH{Xo@x}YZc+#8O*F@a+qsJluE)K{VI$4Y{>@^KSwB>8Tu z9TXk}B__M=I8jEju#vP-HWhEQvx^5)CKYcjsuSw$YO<8dsB(~bRayB&RT+Vqc*#j2 ziEbqzu#zkeyRGFmM(I}Zyu3>A%$Wr|*b8CHRJ=l+9#+#15|;9%d?AwRrYgm}q!2jK zVKOUoHE9zR;7!FVWm&sYAaJ={e3yhzJ1hbbhG7DsSRfW70D&+YZ7l9aY)mXi;p5Pd z4B?>cEJfR3juSW1PFBU^fpK^;KC4})o1(Wd6Dj~b1a90e5b=cqt5q=5gJDxE0m(!_ z-|4~RgEkf9k__#15M*j4X=7t&QkaM-f4kFB?oG!;2*`5M3ZM*_RrK7H=~|tB%7c@@ zLRsxzFCg}FNR~2Bi}hS=+=w@wnSlWJDc6{rwFB?^hyC^r)%CiPO82xS`Wu;O4jDJyOv1$LXoJHQF9OwnsqJTYH5ZPAzG ztQk0f9-wR{+Qm!{-MUGV@TbQu2KPk*8^muR69tVr5*V+U9RGBLBX8o)UXaTlnG~X4bGB)R47K3LQE-^<%=Xr z5vG(%5FxP4z|$tmyzzgbx%Pn*eT$w!F<}0UUX!n<^2iF`oA0%p@-`C;d)q>Z6TTD} zypr@S7vS;@5v91zLW2EcqF^WO)OQqvganl%5{eOwkbzCzcrCRws-c?F+>i{G}gcvd{nT#ixNLIk@7?as1 z3jRxvL@!{*76bfzHn4Spolr2f6;9{{V*NgU6YKDOP65MnlgvurIl1QKnw0{x0?$>~ zoLsX~U{>I{>iWOQ6*7I8B5mLc$OVo{MYw$c9J2z9Z=`Fy2QKKby0Zp61=};$F%Y!i zW$yBWn)fUL#z0o9OAY)o_?3v4`PL(0vEVE%*J@Jo6@4Xnowl!pp@g4*#mLIaGsn8F z@2eRY{hIi?tiu%)*E7J{c{z);HBbLN{*<}l2ZdD|&-xY6OQD-5Jb1Qyc%aJD?Egon zV$|?3z2NM+fOTbIe#s+s;kNc0hOp|7hTd)dLuj$cW+>~o+;9KXcRZ z!Mz`@x>6hYQuV#f{mk9a-~H>Ia2up89LU1=BKunxWj|{}3yGxA!%J2KYA&t&vtO(` zD7$SRdZK1QetaQut7FUC;Tev-^k^%cb7_O5bR<^dY29kw-F2>07Zo;G5PV^Gg#Ug9 zG8BDuT}SY?&3t(reEdT%j literal 0 HcmV?d00001 diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index 84bda4e36..33d6337ca 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -113,7 +113,8 @@ global.TFG_MACHINE_CASINGS = [ 'machine_casing_blue_solar_panel', 'machine_casing_green_solar_panel', 'machine_casing_red_solar_panel', - 'machine_casing_mars' + 'machine_casing_mars', + 'machine_casing_ostrum_carbon' ]; /** From 951023fb359f4b261b030e447ced6ebc46c998c9 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Fri, 26 Sep 2025 23:19:48 -0500 Subject: [PATCH 2/3] crafting stuff (#1911) * yes * yes * some stuff --- kubejs/server_scripts/tacz/recipes.ammo.js | 2 +- kubejs/server_scripts/tacz/recipes.guns.js | 14 +++--- kubejs/server_scripts/tacz/recipes.misc.js | 4 +- .../tfg/recipes.miscellaneous.js | 43 +++++++++++++------ kubejs/server_scripts/tfg/recipes.rocks.js | 3 ++ kubejs/startup_scripts/gtceu/materials.js | 2 + kubejs/startup_scripts/tfg/blocks.js | 31 +++++++++++++ 7 files changed, 75 insertions(+), 24 deletions(-) diff --git a/kubejs/server_scripts/tacz/recipes.ammo.js b/kubejs/server_scripts/tacz/recipes.ammo.js index 43c977617..4d04f3fab 100644 --- a/kubejs/server_scripts/tacz/recipes.ammo.js +++ b/kubejs/server_scripts/tacz/recipes.ammo.js @@ -117,7 +117,7 @@ function registerTACZAmmoRecipes(event){ .EUt(GTValues.VA[GTValues.EV]) .duration(20) event.recipes.gtceu.assembler('tfg_tacz:hard_quartz_large') - .itemInputs('4x #forge:exquisite_gems/certus_quartz', '8x #forge:bolts/tungsten', '4x tfg:large_bullet_casing', + .itemInputs('4x #forge:exquisite_gems/certus_quartz', '4x #forge:rods/titanium', '4x tfg:large_bullet_casing', '2x tfg:nitrocellulose') .itemOutputs(Item.of('tacz:ammo', 4, '{AmmoId:"applied_armorer:hard_core_quartz_bullet"}')) diff --git a/kubejs/server_scripts/tacz/recipes.guns.js b/kubejs/server_scripts/tacz/recipes.guns.js index 1257fb74a..2ec61fc5b 100644 --- a/kubejs/server_scripts/tacz/recipes.guns.js +++ b/kubejs/server_scripts/tacz/recipes.guns.js @@ -122,7 +122,7 @@ function registerTACZGunRecipes(event){ //Region certus era event.recipes.gtceu.assembler('tfg_tacz:aa_pride') .itemInputs('gtceu:titanium_small_fluid_pipe', '4x #forge:ingots/titanium', '2x #forge:plates/stainless_steel', - '2x #forge:rods/long/titanium', '8x #forge:screws/tungsten', 'tfg:certus_mechanism') + '2x #forge:rods/long/titanium', '8x #forge:screws/hsla_steel', 'tfg:certus_mechanism') .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152)) .itemOutputs(Item.of('tacz:modern_kinetic_gun', '{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"applied_armorer:niklas_pistol_semi_pride",HasBulletInBarrel:0b}')) @@ -132,7 +132,7 @@ function registerTACZGunRecipes(event){ event.recipes.gtceu.assembler('tfg_tacz:aa_right') .itemInputs('gtceu:titanium_small_fluid_pipe', '5x #forge:ingots/titanium', '3x #forge:plates/stainless_steel', - '#forge:rods/long/titanium', '10x #forge:screws/tungsten', 'tfg:certus_mechanism') + '#forge:rods/long/titanium', '10x #forge:screws/hsla_steel', 'tfg:certus_mechanism') .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152)) .itemOutputs(Item.of('tacz:modern_kinetic_gun', '{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"applied_armorer:niklas_pistol_semi_right",HasBulletInBarrel:0b}')) @@ -142,7 +142,7 @@ function registerTACZGunRecipes(event){ event.recipes.gtceu.assembler('tfg_tacz:aa_win_win') .itemInputs('2x gtceu:titanium_small_fluid_pipe', '10x #forge:ingots/titanium', '6x #forge:plates/stainless_steel', - '2x #forge:rods/long/titanium', '16x #forge:screws/tungsten', 'tfg:certus_mechanism') + '2x #forge:rods/long/titanium', '16x #forge:screws/hsla_steel', 'tfg:certus_mechanism') .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 2304)) .itemOutputs(Item.of('tacz:modern_kinetic_gun', '{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"applied_armorer:niklas_pistol_double_win_win",HasBulletInBarrel:1b}')) @@ -152,7 +152,7 @@ function registerTACZGunRecipes(event){ event.recipes.gtceu.assembler('tfg_tacz:aa_ar') .itemInputs('gtceu:titanium_small_fluid_pipe', '10x #forge:ingots/titanium', '5x #forge:plates/stainless_steel', - '2x #forge:rods/long/tungsten_carbide', '2x tfc:lens', '20x #forge:screws/tungsten', + '2x #forge:rods/long/hsla_steel', '2x tfc:lens', '20x #forge:screws/hsla_steel', 'tfg:certus_mechanism') .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 2880)) .itemOutputs(Item.of('tacz:modern_kinetic_gun', @@ -163,7 +163,7 @@ function registerTACZGunRecipes(event){ event.recipes.gtceu.assembler('tfg_tacz:aa_914') .itemInputs('gtceu:titanium_small_fluid_pipe', '10x #forge:ingots/titanium', '10x #forge:plates/stainless_steel', - '2x #forge:rods/long/tungsten_carbide', '2x tfc:lens', '20x #forge:screws/tungsten', + '2x #forge:rods/long/hsla_steel', '2x tfc:lens', '20x #forge:screws/hsla_steel', 'tfg:certus_mechanism') .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1728)) .itemOutputs(Item.of('tacz:modern_kinetic_gun', @@ -174,8 +174,8 @@ function registerTACZGunRecipes(event){ event.recipes.gtceu.assembler('tfg_tacz:aa_k30') .itemInputs('2x gtceu:titanium_small_fluid_pipe', '8x #forge:ingots/titanium', '2x #forge:ingots/magnalium', - '8x #forge:plates/stainless_steel', '3x #forge:rods/long/tungsten_carbide', '2x tfc:lens', - '24x #forge:screws/tungsten', 'tfg:certus_mechanism') + '8x #forge:plates/stainless_steel', '3x #forge:rods/long/hsla_steel', '2x tfc:lens', + '24x #forge:screws/hsla_steel', 'tfg:certus_mechanism') .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1728)) .itemOutputs(Item.of('tacz:modern_kinetic_gun', '{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"applied_armorer:moritz_sniper_semi_k30",HasBulletInBarrel:0b}')) diff --git a/kubejs/server_scripts/tacz/recipes.misc.js b/kubejs/server_scripts/tacz/recipes.misc.js index 57f685168..90901ff94 100644 --- a/kubejs/server_scripts/tacz/recipes.misc.js +++ b/kubejs/server_scripts/tacz/recipes.misc.js @@ -9,7 +9,7 @@ function registerTACZMiscRecipes(event) { ' B ' ],{ A: '#forge:dyes/red', - B: '#forge:plates/steel', + B: '#forge:foils/steel', C: '#forge:rods/long/wood' }).id('tfg_tacz:target'); @@ -83,7 +83,7 @@ function registerTACZMiscRecipes(event) { .duration(80) event.recipes.gtceu.assembler('tfg:certus_mechanism') - .itemInputs('2x ae2:charged_certus_quartz_crystal', '2x #forge:gears/titanium', '2x #forge:springs/tungsten', + .itemInputs('2x ae2:charged_certus_quartz_crystal', '2x #forge:gears/titanium', '4x #forge:springs/hsla_steel', '16x #forge:screws/titanium', '2x #forge:rods/titanium', '6x #forge:rings/styrene_butadiene_rubber', '16x #forge:fine_wires/red_alloy') .inputFluids(Fluid.of('gtceu:soldering_alloy', 288)) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 8b7527f13..54ec33441 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -781,13 +781,13 @@ function registerTFGMiscellaneousRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) //Rock-wool stuff - event.recipes.gtceu.mixer('aes_mix') + event.recipes.gtceu.mixer('tfg:aes_mix') .itemInputs('5x gtceu:silicon_dioxide_dust', '4x gtceu:quicklime_dust', 'gtceu:magnesia_dust') .itemOutputs('10x tfg:aes_mix_dust') .duration(160) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.electric_blast_furnace('molten_aes') + event.recipes.gtceu.electric_blast_furnace('tfg:molten_aes') .itemInputs('2x tfg:aes_mix_dust') .outputFluids(Fluid.of('tfg:molten_aes', 1000)) .chancedOutput('gtceu:ash_dust', 3000, 0) @@ -796,7 +796,7 @@ function registerTFGMiscellaneousRecipes(event) { .blastFurnaceTemp(3000) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.electric_blast_furnace('molten_aes_he') + event.recipes.gtceu.electric_blast_furnace('tfg:molten_aes_he') .itemInputs('2x tfg:aes_mix_dust') .inputFluids(Fluid.of('gtceu:helium', 200)) .outputFluids(Fluid.of('tfg:molten_aes', 1000)) @@ -805,20 +805,20 @@ function registerTFGMiscellaneousRecipes(event) { .blastFurnaceTemp(3000) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.centrifuge('aes_wool') + event.recipes.gtceu.centrifuge('tfg:aes_wool') .inputFluids(Fluid.of('tfg:molten_aes', 200)) .itemOutputs('tfg:aes_wool') .duration(30) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.forming_press('aes_compressed_wool') + event.recipes.gtceu.forming_press('tfg:aes_compressed_wool') .itemInputs('4x tfg:aes_wool') .notConsumable('gtceu:ingot_casting_mold') .itemOutputs('tfg:aes_compressed_wool') .duration(40) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.chemical_bath('aes_insulation_sheet') + event.recipes.gtceu.chemical_bath('tfg:aes_insulation_sheet') .itemInputs('tfg:aes_compressed_wool') .inputFluids(Fluid.of('gtceu:epoxy', 72)) .circuit(1) @@ -826,7 +826,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(80) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.chemical_bath('aes_insulation_roll') + event.recipes.gtceu.chemical_bath('tfg:aes_insulation_roll') .itemInputs('9x tfg:aes_compressed_wool') .inputFluids(Fluid.of('gtceu:epoxy', 648)) .itemOutputs('tfg:aes_insulation_roll') @@ -834,7 +834,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(400) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.assembler('aes_insulation_roll') + event.recipes.gtceu.assembler('tfg:aes_insulation_roll') .itemInputs('9x tfg:aes_insulation_sheet') .itemOutputs('tfg:aes_insulation_roll') .circuit(0) @@ -849,7 +849,7 @@ function registerTFGMiscellaneousRecipes(event) { A: 'tfg:aes_insulation_sheet', }).id('tfg:shaped/aes_insulation_roll') - event.recipes.gtceu.assembler('aes_insulation_sheet') + event.recipes.gtceu.assembler('tfg:aes_insulation_sheet') .itemInputs('9x tfg:aes_insulation_sheet') .itemOutputs('tfg:aes_insulation_roll') .circuit(0) @@ -860,7 +860,7 @@ function registerTFGMiscellaneousRecipes(event) { 'tfg:aes_insulation_roll' ]).id('tfg:shapeless/aes_insulation_sheet') - event.recipes.gtceu.electric_blast_furnace('smelt_aes_sheet') + event.recipes.gtceu.electric_blast_furnace('tfg:smelt_aes_sheet') .itemInputs('tfg:aes_insulation_sheet') .inputFluids(Fluid.of('gtceu:helium', 200)) .outputFluids(Fluid.of('tfg:molten_aes', 800)) @@ -869,7 +869,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(140) .blastFurnaceTemp(3000) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.electric_blast_furnace('smelt_aes_roll') + event.recipes.gtceu.electric_blast_furnace('tfg:smelt_aes_roll') .itemInputs('tfg:aes_insulation_roll') .inputFluids(Fluid.of('gtceu:helium', 1000)) .itemOutputs('2x gtceu:ash_dust') @@ -879,7 +879,7 @@ function registerTFGMiscellaneousRecipes(event) { .blastFurnaceTemp(3000) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.electric_blast_furnace('smelt_sniffer_wool') + event.recipes.gtceu.electric_blast_furnace('tfg:smelt_sniffer_wool') .itemInputs('tfg:sniffer_wool') .chancedOutput('gtceu:ash_dust', 7500, 0) .outputFluids(Fluid.of('tfg:molten_aes', 200)) @@ -887,7 +887,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(80) .blastFurnaceTemp(3400) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.electric_blast_furnace('smelt_wraptor_wool') + event.recipes.gtceu.electric_blast_furnace('tfg:smelt_wraptor_wool') .itemInputs('tfg:wraptor_wool') .chancedOutput('gtceu:ash_dust', 5000, 0) .outputFluids(Fluid.of('tfg:molten_aes', 100)) @@ -1077,7 +1077,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(80) .EUt(GTValues.VA[GTValues.IV]) event.recipes.gtceu.mixer('tfg:aes_polyurethane_electric_only') - .itemInputs('2x #tfg:mineral_rich_wool', '#forge:dusts/methylene_diphenyl_diisocyanate') + .itemInputs('2x #tfg:mineral_rich_wool', 'tfg:aes_compressed_wool', '#forge:dusts/methylene_diphenyl_diisocyanate') .inputFluids(Fluid.of('gtceu:diethylenetriamine', 250), Fluid.of('gtceu:acetone', 1000)) .itemOutputs('tfg:aes_polyurethane') .duration(80) @@ -1357,5 +1357,20 @@ function registerTFGMiscellaneousRecipes(event) { .itemOutputs('tfc:burlap_cloth') .duration(100) .EUt(4) + + event.recipes.gtceu.assembler('tfg:ostrum_carbon_casing') + .itemInputs('2x #forge:plates/ostrum', '2x #forge:plates/titanium_carbide', '#forge:frames/black_steel') + .itemOutputs('2x tfg:casings/machine_casing_ostrum_carbon') + .circuit(6) + .duration(20 * (2.5)) + .EUt(GTValues.VH[GTValues.LV]) + + event.recipes.gtceu.assembler('tfg:titanium_concrete') + .itemInputs('2x #forge:rods/titanium') + .inputFluids(Fluid.of('gtceu:concrete', 144*1.5)) + .itemOutputs('tfg:titanium_concrete') + .circuit(2) + .duration(20) + .EUt(GTValues.VH[GTValues.EV]) } diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index bf8bbf986..8db7d5907 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -219,6 +219,9 @@ function registerTFGRockRecipes(event) { { raw: 'ae2:sky_stone_brick', polished: 'ae2:sky_stone_small_brick' }, { raw: 'ae2:sky_stone_small_brick', polished: 'ae2:smooth_sky_stone_block' }, { raw: 'gtceu:certus_quartz_block', polished: 'ae2:cut_quartz_block' }, + + // Concrete + { raw: 'tfg:titanium_concrete', polished: 'tfg:polished_titanium_concrete' }, // Recon Stone { raw: 'minecraft:stone', polished: 'minecraft:smooth_stone' }, diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index b1b72d20e..20db7e48c 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -269,6 +269,8 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Ultimet.addFlags(GENERATE_ROTOR) + GTMaterials.HSLASteel.addFlags(GENERATE_BOLT_SCREW) + GTMaterials.Invar.addFlags(GENERATE_RING); GTMaterials.Magnalium.addFlags(GENERATE_RING); GTMaterials.TinAlloy.addFlags(GENERATE_RING); diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 3786c3566..e4d2dda64 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -31,6 +31,21 @@ const registerTFGBlocks = (event) => { .particle('minecraft:campfire_cosy_smoke') .particleCount(2) .particleForced(false) + + event.create('tfg:exhaust_vent_particle', 'tfg:particle_emitter') + .textureAll('tfg:block/titanium_concrete') + .soundType('metal') + .hardness(5) + .resistance(6) + .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('minecraft:mineable/wrench') + .mapColor('color_black') + .speedFactor(1.1) + .particleOffset(5, 1, 5) + .particleVelocity(0.0, 0.1, 0.0) + .particle('minecraft:campfire_signal_smoke') + .particleCount(50) + .particleForced(true) // #region Machine Casings @@ -118,6 +133,22 @@ const registerTFGBlocks = (event) => { .mapColor('color_light_gray') //#endregion + + event.create('tfg:titanium_concrete') + .translationKey('block.tfg.titanium_concrete') + .model('tfg:block/concrete/titanium_concrete') + .soundType('stone') + .mapColor('stone') + .tagBlock('minecraft:mineable/pickaxe') + + + event.create('tfg:polished_titanium_concrete') + .translationKey('block.tfg.polidhed_titanium_concrete') + .model('tfg:block/concrete/polished_titanium_concrete') + .soundType('stone') + .mapColor('stone') + .tagBlock('minecraft:mineable/pickaxe') + // #region Decorative vases global.MINECRAFT_DYE_NAMES.forEach(color => { From 772ffc14ef4df25daff6fd1534f66c9498288d26 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Sat, 27 Sep 2025 01:18:26 -0400 Subject: [PATCH 3/3] tungsten_line (#1910) * add tungsten line * add timer to tungsten line * fix apt --- kubejs/server_scripts/gregtech/recipes.js | 85 +++++++++++++++++++++++ kubejs/startup_scripts/tfg/materials.js | 29 ++++++++ 2 files changed, 114 insertions(+) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index e4715ff95..234e74f7c 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1482,4 +1482,89 @@ const registerGTCEURecipes = (event) => { event.replaceInput({ id: 'gtceu:assembler/phenolic_board' }, '#tfg:wood_dusts', 'tfg:high_density_treated_fiberboard') + //#region New Tungsten Line + + event.remove({ id: 'gtceu:chemical_bath/tungstic_acid_from_scheelite' }) + event.remove({ id: 'gtceu:chemical_bath/tungstic_acid_from_tungstate' }) + event.remove({ id: 'gtceu:electrolyzer/tungstic_acid_electrolysis' }) + + // Transform Tungstate and Scheelite + + event.recipes.gtceu.large_chemical_reactor('tfg:scheelite_to_sodium_tungstate') + .itemInputs(Item.of('gtceu:scheelite_dust', 6)) + .itemInputs(Item.of('gtceu:soda_ash_dust', 6)) + .itemOutputs(Item.of('tfg:sodium_tungstate_dust', 6)) + .itemOutputs(Item.of('gtceu:calcite_dust', 6)) + .duration(20*12) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.large_chemical_reactor('tfg:tungstate_to_sodium_tungstate') + .itemInputs(Item.of('gtceu:tungstate_dust', 6)) + .itemInputs(Item.of('gtceu:soda_ash_dust', 6)) + .itemOutputs(Item.of('tfg:sodium_tungstate_dust', 6)) + .itemOutputs(Item.of('gtceu:lithium_dust', 2)) + .itemOutputs(Item.of('gtceu:carbon_dust', 1)) + .outputFluids(Fluid.of('gtceu:oxygen', 3000)) + .duration(20*12) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.chemical_bath('tfg:tungstate_to_tungsten_acid') + .inputFluids(Fluid.of('gtceu:hydrochloric_acid', 12000)) + .itemInputs(Item.of('tfg:sodium_tungstate_dust', 6)) + .itemOutputs(Item.of('gtceu:salt_dust', 48)) + .itemOutputs(Item.of('gtceu:tungstic_acid_dust', 6)) + .duration(20*24) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.chemical_bath('tfg:tungsten_acid_to_ammonium_tungstate') + .inputFluids(Fluid.of('gtceu:ammonia', 10000)) + .itemInputs(Item.of('gtceu:tungstic_acid_dust', 12)) + .itemOutputs(Item.of('tfg:ammonium_tungstate_dust', 1)) + .duration(20*16) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.evaporation_tower('tfg:ammonium_tungstate_to_apt_h') + .itemInputs(Item.of('tfg:ammonium_tungstate_dust', 1)) + .itemOutputs(Item.of('tfg:apt_gem', 1)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .duration(20*120) + .EUt(GTValues.VHA[GTValues.HV]) + + event.recipes.gtceu.distillery('tfg:ammonium_tungstate_to_apt') + .itemInputs(Item.of('tfg:ammonium_tungstate_dust', 1)) + .itemOutputs(Item.of('tfg:apt_gem', 1)) + .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .duration(20*120) + .EUt(GTValues.VHA[GTValues.HV]) + + event.recipes.gtceu.pyrolyse_oven('tfg:apt') + .itemInputs(Item.of('tfg:apt_gem', 1)) + .itemOutputs(Item.of('tfg:tungsten_oxide_dust', 3)) + .outputFluids(Fluid.of('gtceu:ammonia', 10000)) + .duration(20*36) + .EUt(GTValues.VA[GTValues.EV]) + .circuit(1) + + event.recipes.gtceu.pyrolyse_oven('tfg:apt_nitrogen') + .itemInputs(Item.of('tfg:apt_gem', 1)) + .inputFluids(Fluid.of('gtceu:nitrogen', 1000)) + .itemOutputs(Item.of('tfg:tungsten_oxide_dust', 3)) + .outputFluids(Fluid.of('gtceu:ammonia', 10000)) + .duration(20*18) + .EUt(GTValues.VA[GTValues.EV]) + .circuit(2) + + event.recipes.gtceu.arc_furnace('tfg:tungsten_apt') + .itemInputs(Item.of('tfg:tungsten_oxide_dust', 1)) + .inputFluids(Fluid.of('gtceu:hydrogen', 1000)) + .itemOutputs(Item.of('gtceu:tungsten_dust', 1)) + .duration(20*2.8) + .EUt(GTValues.VA[GTValues.EV]) + + } diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index ca8675f9d..01d4cabcf 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -393,5 +393,34 @@ const registerTFGMaterials = (event) => { .color('0xa2cde0') .secondaryColor('0x7a5225') + //#region Tungsten Line + + event.create('tfg:sodium_tungstate') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION, GTMaterialFlags.DISABLE_DECOMPOSITION) + .iconSet(GTMaterialIconSet.BRIGHT) + .components('2x sodium','1x tungsten', '4x oxygen') + .color('0xdcf6f7') + + event.create('tfg:ammonium_tungstate') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION, GTMaterialFlags.DISABLE_DECOMPOSITION) + .iconSet(GTMaterialIconSet.DULL) + .formula('(NH4)10(H2W12O42)') + .color('0xfafafa') + + event.create('tfg:apt') + .gem() + .flags(GTMaterialFlags.NO_UNIFICATION, GTMaterialFlags.DISABLE_DECOMPOSITION) + .iconSet(GTMaterialIconSet.FLINT) + .color('0xaabdf0') + + event.create('tfg:tungsten_oxide') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION, GTMaterialFlags.DISABLE_DECOMPOSITION) + .iconSet(GTMaterialIconSet.FLINT) + .components('1x tungsten', '3x oxygen') + .color('0xf0c851') + }