From 03e382702de287d323035e6776204fd60487e118 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Tue, 7 Oct 2025 05:34:59 -0500 Subject: [PATCH] more cooling tower stuff (#1971) * stuff * eh * stuff * stuff to save * stuff * texture stuff * lang --- .../assets/tfg/blockstates/cooling_tower.json | 19 ++++ kubejs/assets/tfg/lang/en_us.json | 3 + .../models/block/machines/cooling_tower.json | 90 ++++++++++++++++++ .../assets/tfg/models/item/cooling_tower.json | 3 + .../block/casings/heat_pipe_casing.png | Bin 821 -> 836 bytes .../block/casings/heat_pipe_casing_ctm.png | Bin 4998 -> 1047 bytes .../tfg/recipes.miscellaneous.js | 9 +- kubejs/server_scripts/tfg/recipes.nuclear.js | 37 +++++++ kubejs/startup_scripts/gtceu/materials.js | 2 +- kubejs/startup_scripts/tfg/blocks.js | 13 +-- kubejs/startup_scripts/tfg/materials.js | 7 ++ 11 files changed, 169 insertions(+), 14 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/cooling_tower.json create mode 100644 kubejs/assets/tfg/models/block/machines/cooling_tower.json create mode 100644 kubejs/assets/tfg/models/item/cooling_tower.json diff --git a/kubejs/assets/tfg/blockstates/cooling_tower.json b/kubejs/assets/tfg/blockstates/cooling_tower.json new file mode 100644 index 000000000..dd1239578 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/cooling_tower.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/cooling_tower", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/cooling_tower" + }, + "facing=south": { + "model": "tfg:block/machines/cooling_tower", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/cooling_tower", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index ebf3b004b..f9b8b1c36 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -555,6 +555,7 @@ "block.tfg.casings.bioculture_rotor_primary": "Primary Bioculture Rotor", "block.tfg.casings.bioculture_rotor_secondary": "Secondary Bioculture Rotor", "block.tfg.casings.machine_casing_ostrum_carbon": "Ostrum Machine Casing", + "block.tfg.casings.heat_pipe_casing": "Heat Pipe Casing", "block.tfg.glacian_wool_frame": "Framed Glacian Wool", "block.tfg.aes_insulation_frame": "Framed AES Insulation", "block.tfg.sand.fluorapatite.blue": "Blue Fluorapatite Sand", @@ -635,6 +636,7 @@ "block.tfg.titanium_concrete_bricks_square": "Square Titanium-Rebar Concrete Bricks", "block.tfg.nuclear_turbine": "Nuclear Steam Turbine", "block.tfg.evaporation_tower": "Evaporation Tower", + "block.tfg.cooling_tower": "Nuclear Cooling Tower", "block.tfg.growth_monitor": "Growth Monitor", "block.tfg.sample_rack": "Sample Rack", "block.tfg.casings.machine_casing_sterilizing_pipes": "Sterilizing Pipes", @@ -1024,6 +1026,7 @@ "material.tfg.cooked_mycelienzane": "1,3-Mycelienzane", "material.tfg.iodomethane": "Iodomethane", "material.tfg.trideuteroiodomethane": "Trideuteroiodomethane", + "material.tfg.thermally_conductive_fluid": "Thermally Conductive Fluid", "ore_vein.tfg.deep_sheldonite": "Cooperite & Bornite", "ore_vein.tfg.deep_garnet_amethyst": "Amethyst & Garnet", "ore_vein.tfg.deep_garnet_opal": "Opal & Garnet", diff --git a/kubejs/assets/tfg/models/block/machines/cooling_tower.json b/kubejs/assets/tfg/models/block/machines/cooling_tower.json new file mode 100644 index 000000000..b910175a4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/cooling_tower.json @@ -0,0 +1,90 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:cooling_tower", + "texture_overrides": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_paused_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_paused_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_ostrum_carbon", + "overlay_front": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_steam_turbine/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/cooling_tower.json b/kubejs/assets/tfg/models/item/cooling_tower.json new file mode 100644 index 000000000..87f1fd1ad --- /dev/null +++ b/kubejs/assets/tfg/models/item/cooling_tower.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/cooling_tower" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing.png b/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing.png index 1538c493e2c36620ec812779f239e1c158dd4454..193d41b54022816d0cfb997e2bb312e3c50659b3 100644 GIT binary patch delta 660 zcmdnWc7$z$qd@T1AT7Qyfxr_1bKfjd+BJ1zpniQ-!JYo{?{eku85YK+t-2}77;@HV z(#91tPOj_P7yjd7vtv(^U(zx;f8Avl3v2EkK74(*!TDD;@6KOb{=|o^!sQXiW!~z3QTcl6^!pa#GGY~J7d+ITcQzkMTG;#4EX~zfb)FiZ z<|?pzR7Z;eSkTm4C#t>~6l*J~4Zfx|+NJRDkjw7fJ9JIx5|6%qEl)nE33 z-})cR&Xl652Tp8k;0p2RlmEkCSDyWBx!T<&4k9n=HoomQJg}YHBx~E>+ML_H!Uuly z#ANE$FXcN^Hz_VVbD{Erdg&cI@-jck73^f@v3)s7(Q?xCWfP3gGrv#&;v1RpKcvU2rP=?4!4B=iHmRkfFY-}e36`7Kli(U6miO^ivS zH)oUXDB35fBpCNz5hMkSh>Z)i?cyOnL&=-L-T1x<$IfivSep_YA#h{#twPqSZF1_}TFVdQ&MBb@0L<<@7XSbN delta 645 zcmX@Ywv}yyqd@dhEm2o%kHQlHr5n4uET&Bi)UU57xYJ+$U9S8+L;m7JB8#=TG*+!# z{>V^qcC_f9^)FmGoF$I5oZ!)&7-@f&Opuq;-n3(ORnfyEMFuKh%2^7yg>3%udScBnx`WIizgdbur zqKm7t-#-4rcp@PDwE2O9iUx5@-jq%+|6cO#+xwYe_4enyi%xsqnBh5jBcmZFr``b zrf9z2Hmj>ePOf>Y`@ZLqT+7UMZ?F`WSv~3fBNhjtqXDtMo+a&j5Ha;ni1@AJXRVEY zPq#KWYpD9})1vZw&mHw}peR2rGbfdSL1SX=L|c!;4l+mMgSQ50@r4Nlo(P!x zW|7jasgso%wd<#gL>;LrxYJ+$U9S8+!@{_u0g_tud)* zt3Qde72WdcdTrt^a9HS(heJz`mY2q1rx{_rBEp`x`pZ7>TmNI(nNl?Mz=@3wTp=EP z@_+d2%Cny>SG&8!LF7f<#<%^32exyYWNrIfn{&HY_`q+Tm`vUJrF>`VCdFlEE>vDn zFTG<&Ugjscf}PAfwl60sTGmgRzHGvI=J)Aed?OPch<#YUbFb<5!e0zaR<3?3{osLs zgnq!cs`m2l+rEE$KQpb~{&Pstt z_W6UI+WpO2*b|(%gilno_c}kCT};||Lr_p-X~Rs#^Ti5E z4o8ko8y@oJLMYJJ(_fUpD6=FyVMJ1y+od;mQ$8xsOMZ(oSc22{yOLG zEzecBW?3ah7j`;m2yN6@xlQE9y4v3kp)K#0W(ab?@@c+0QRI`&#;Wos7r9LXmfB z?^AgX91uHNknvHYtsv?2H2M4WMi;+S-QlcvyeND2`RCZ4`vJyf2=03Lf4T_Iu7<-WU${uLNlko_wtn&H#aZQnMXRGbHn8S3TIv3H`kY5#;~&*x s?&Ec7?Mi_kMC$*>ewtS|tETCp{uS?V-=#5I4uevar>mdKI;Vst09IzjNB{r; literal 4998 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}$ErdiN`ey06$*;-(=u~X z6-p`#QWa7wGSe6sDsJTl+~z&3!1E`)tFJ+R&oM<`tsn%Tdpo9hs?h?AaOy2F8|5XXgM< zXJ?p?7#J$%)K0YZIP4&EG(LE#)>OW-39lwBw7Pk;%VL_A*g>aE?Jchoie8GFWO@X} z$go~-YL@Q~WfxD6m5pI_{J?x9wjiivqR{{AB2h;w3hwlmf0rwN&#*8ub=6IA=8&^S zmpXUMIK94WUpP+^4`YkK)EO()jk_av^sTS1_)#VPF!J5=e=>)?4yH7?tMnP(-Oyp) zk#4R#_p@E$gsG~nKju`NTEH!2Uld#RqqlhFS*G(mQa8WY6i$fH`MTlG;Warcju;crdkk8itc#klAE zfvMNNUY~W~j{3{qbz*i*Ot%jlEe)Uiz2UTM!WYl!JS%l8Gr5i`eW-K0KZV^buW_O2 z^6lsB{Nx*SO1IW9%g8WIRy`G0UisZ2KmY%{mtVd!Gw2lE-+h;vhk=1FG&3ZkB*NFn zDmgz_FEJ%QDOIl`w}1fzZ0suv5|gu2OB9k)(=+pImEP~(ucVNfVyhHx>TBRz;GCL~ z=}}db8eHWUl3bOYY?-2DZ^va*VO5b^kegbPs8ErclUHn2VXFi-*D9~r3M8zrqySb@ zl5MLL;TxdfoL`ixV4`QDXQ1m^ky&P>WXGjoQ-9F1v$^t z#a0Pqzg0?pa%PGZn3-s5ZjzW{lBR27WNe^olA4^To0Mc^q-$cHoM>QfU~Z6@VuECp zXI^nhVqS78$f%0k0=>-46f2`NGjn4Lvt(VB?6jP&Q z^F$;g{EITvGxHL2kX;2bDg|VenYm?}p?Q+7X{xEEu8DE7k#3?%s*$d#rCGA2S(1rC zN}2)KsFY+YxBQ~q#1dPj%-qEERQ-aybg%>{z^xnuJZ+VX^dL&XA^|yxC29FZxwcB- znRzMs<;4iaA(^?U!6k{H@H8|xwXn3XG%zzZFf+0+fp{FOKPlFkUSNfS_t7mxH*|1)d~s<;A~-)m<;hkabj6&3fLQPspO2ry!6x*TP0|Mg=xve zk{HaAjZ=-xj8b*e%u|hYO-v0fbrX#YjdW9!l8nug&COGcQ!G(UFV0UZDNig)bxcpq zE3s8_&&(|Vhn0c`G^#XF)t6_ag5trz$W+(BQrE~V#L(2r(9p`nTuGny-b+bKHaE2} zG10X&O)}OsNij;+wM;We)lD%?OiWF(OiMLLG)HwVh2Ddw2xFM{Z1h0|A}lg(^f96v zq5!D`wc}ENhy}U0*>TzEgNt!ckq!+nP?<_Y3{7S4fq^N&)5S3);_%yW+k9b1 zf!d8>J^s^<{$x4GIWZ$>Mw?cXlB%!OuP+`Yf7t#p+c$RcePmt{w7Y8xM`Pcy#)xmZ zDv!QKZCbD+`u@GTo5x)jeGJ)GTWnnX``(*1<#GFKzOuKe7UqAgK4r{(`TC`6JV9Q2 zs&%yL;*anD`1T*SPi5QXyAxY$BWzd%8)tG(E|d1JlKpcc&v5Q}U7vX4?&8RI))L++y1*1wW%qOeAHS0JL-JoCT%KU!+oLs*j=i~i& zf9Nb>RCKx5cD%W9dVRR}OuOku+*u0SC)Trvyyji6Hci60Dj@si*E6?Sm%cx-l96F2 zTU+>Kt@3$K)c*e}`}f)M!PSQ5{QH&{JeXDeXBXyO61jBXV?w|l`AZFj>sF`BKdpx6md5b1mDFVdQ I&MBb@07L;c8~^|S diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index a0a650681..b97a068ba 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -1402,15 +1402,10 @@ function registerTFGMiscellaneousRecipes(event) { .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', '4x #forge:dusts/kaolinite') + .itemInputs('2x #forge:rods/titanium', '#forge:dusts/kaolinite') .inputFluids(Fluid.of('gtceu:concrete', 144 * 1.5)) .itemOutputs('tfg:titanium_concrete') .circuit(2) diff --git a/kubejs/server_scripts/tfg/recipes.nuclear.js b/kubejs/server_scripts/tfg/recipes.nuclear.js index 810bb345d..dec2f01bd 100644 --- a/kubejs/server_scripts/tfg/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/recipes.nuclear.js @@ -434,6 +434,43 @@ function registerTFGNuclearRecipes(event) { .duration(20*1.5) //#endregion + + //#region Cooling Tower + event.recipes.gtceu.assembler('tfg:ostrum_carbon_casing') + .itemInputs('2x #forge:plates/ostrum', '2x #forge:plates/titanium_carbide', '#forge:dense_plates/hsla_steel', '#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.mixer('tfg:thermally_conductive_fluid') + .itemInputs('7x #forge:dusts/gallium', '2x #forge:dusts/tin', '#forge:dusts/zinc') + .outputFluids(Fluid.of('tfg:thermally_conductive_fluid', 1000)) + .circuit(2) + .EUt(GTValues.VA[GTValues.EV]) + .duration(20*20) + + event.recipes.gtceu.assembler('tfg:heat_pipe_casing') + .itemInputs('4x gtceu:copper_large_fluid_pipe', '4x gtceu:copper_normal_fluid_pipe', '4x #forge:plates/hsla_steel') + .inputFluids(Fluid.of('tfg:thermally_conductive_fluid', 1000)) + .itemOutputs('tfg:casings/heat_pipe_casing') + .circuit(6) + .EUt(GTValues.VA[GTValues.IV] * 2) + .duration(20*4) + + event.shaped('tfg:cooling_tower', [ + 'ABA', + 'CDC', + 'EBE' + ], { + A: 'gtceu:ostrum_normal_fluid_pipe', + B: 'gtceu:platinum_single_cable', + C: '#gtceu:circuits/iv', + D: 'gtceu:iv_machine_hull', + E: 'gtceu:iv_fluid_regulator' + }).id('tfg:shaped/cooling_tower') + + //#endregion //#region FLiBe Line - SCRAP FROM MARS TO VENUS diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 76958809f..acc8d4070 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -274,7 +274,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Ultimet.addFlags(GENERATE_ROTOR) - GTMaterials.HSLASteel.addFlags(GENERATE_BOLT_SCREW) + GTMaterials.HSLASteel.addFlags(GENERATE_BOLT_SCREW, GENERATE_DENSE) GTMaterials.Invar.addFlags(GENERATE_RING); GTMaterials.Magnalium.addFlags(GENERATE_RING); diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 0d5bbc9de..de1a9db78 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -17,13 +17,14 @@ const registerTFGBlocks = (event) => { .tagBlock('minecraft:mineable/wrench') .mapColor('color_black') .speedFactor(1.1) - .activeOffset(5, 1, 5) - .activeVelocity(0.0, 0.1, 0.0) - //.activeParticle('tfc:smoke_0') - .activeCount(50) - .activeForced(true) + .activeOffset(3.5, 2, 3.5) + .activeVelocity(0.0, 0.0, 0.0) + .activeParticle('tfg:cooling_steam') + .activeBase(0.0, 12.5, 0.0) + .activeCount(8) + .activeForced(false) .hasTicker(true) - + // #region Machine Casings global.TFG_MACHINE_CASINGS.forEach(type => { diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 89357c886..aad39269c 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -512,4 +512,11 @@ const registerTFGMaterials = (event) => { .color(0xDD9DED) // #endregion + + // #region conductor + event.create('tfg:thermally_conductive_fluid') + .liquid() + .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) + .components('7x gallium', '2x tin', '1x zinc') + .color('0x34cfeb') }