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 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 CpD!c; 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7j#Pz2lmsP~D-;yvr)B1( zDwI?fq$;FVWTr7NRNTr9xXpW5f#*+pS6{;KGubkimIRr<_+k3MW#KDNndj|%j|*z< zt^e>s;MxMi=^?>N&0%XV`H0NQXr5WJfxV1NTcGdqh{M3FyT}XJhbf|gL8K&Kiv+pko@!nUTXr19YQ@zAV?%wp1`D<=&+wSh| z^n{_ghjA|Rg832`d_s~PH@R(VW0RFpwCmJ;a(|v*i~gO|Na<6peJKnKj4heY&H|d8@szKrfG>CbjsA;@+zU|rMO9^M^KCm z>-DB)`R-75@$^{P7*@v*%tvAif=VU|{huxpb)=%;PJj7#x$^f6`HK&UEY{}IShaHb zBSXd6(V~CWzi{PnmN?RKf=72^+?fNVHFpmmzP_8|e3AY4=P#yzW@ENtDx8wJ%X5#T z&F;*sIo~^**QlI2^8CnTtJn!YCcd6@IDbyJS#@Pv!1*Q5I-8F;ZERl3m!=x4I8Tx9 zbeGr9dut9GJ=Z2<<$T@Fc=Pl*{Ed|3CKqyG^++2m1vnu$AnOxOQCP!F|?QrKf+{ZCmq<^FcM+ zx+~lE-(q-X=ed6S)(?UP8+c=4wwq@1@3_P0HqRtbJolvg+t zIX_n~F(p4KRj(qqfB^(->?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8 zQB{;0T;&&%T$P<{nWAKG$7NGtRgqhen_7~nP?4LHS8P>bs{}UJDzDfIB&@Hb09I0x zZL1XF8=&BvUzDm~qGzIKpzB(ZS!SeU$E9FXl#*r@+442g6AGjj{Tx+-!DP*j#=rXd0g#Wx@suy>FhQjuE#Hy1@U%MY!n_`}7Zf2TnnwXSij%1W) zUU5lcUUDkPsEXVIz0AxMt7Joi#55Cg6I~-SQxjd2wB%G>OQTd%-DLAr6Qd+^<76`< zGbAJYi!#$Q^AdBAT?H~KB{Rh;DLKW&IMvud*C@rnSl1*e#a!1iIoV9t%+e$!Db3tC z(ZI+6Y*b3Jm0NyMZeoe8Qf6*qda8awUOHF;6yR2l0iL!>MtTsXV3B~F#FDi9qFh_0 z@XWlF{PJRi;*iYT)ZmgtP`uOtzaQf-wC!QvIU1y;^Qsfi`|MIrh5Ikrk5Cny-{8A2QclJ-q4NlZyB zNpwjpNwrlnGB7f=GO)BVG7B*@wlXocGBwgQFtsv3QlFoanN~?iwH+vX*gzuPBeS?9 zzo-%{1j$pusf7?8gqxEIQmvq%0L~UxiOCQz6epIYrhvTxmrBk^%u7#Au~mX5SeTYf zEQuk-GSSq~z}Q4L+0-;y*TlrgNY}#9#8@{iCD|m!Jkh|^#1fJi;HDSnrl3=wo2tn_IC3o7ky`7U|>t~c6R~ww-^|HI`6J$U|`@Z z@Q5sCVBi)8VMc~ob0ioT7}!fZeO=jKa!LtlTmJlGF3-Tg80G2W7-Dfcb<$bCBL+Mz z_Dj5Sg}+`X=|Aw>o?WP);ga6=yD|)4p9iSs`WL*orJ`zneBQ^Nx9y)_pXNWw{kbQ1 zmd>>F*=pT?-+D2A`1`ffw2b{o!~R%CgKJCf^d$2;L|%_%Vh%t-e#s->w+(s z@Z_A{#r(Q!+v^+GT61F=G!EHlZ&;JX;A>TWNb0o3w<7|E*EX!}zQ!oBE%U?n)ken! zLR&rTR(ZYdy0W@hea`K@UK0i6*K#a7u}AKSWcG}<#^cM=7d*egqxW6$+v27p*|NpZJXN+^Nr% zvqgQmiqn$vgxPLOj|rF-Zc%GjE4?W;$2u@f@pIamlh2eAB3H`=%}D<`SI(!3o#9$U zuF~yOIx@@kV_P-eN;zLytaa{ve#LvseLHk!>^hgUHTb&Jf2IIS&M#M9ZDIk%i>Irf J%Q~loCIIgsezpJr 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 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 WZ 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') + }