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 zcmV;F0&D%X2E+!CK@d~5QYsEs5K+ibo$R6_x|NYpFMoP)+>dwn9(V5mpk9P16JN^W@ zWO9|j$gzM5R7j2={11M2Yv!jW-K0Pi=zg*7k1@cv3p8rB{e5iPjT6B83|wg~f29u0 zev)2mX`v&ae;c^CZfWu!aJd5vJ?WAmIg*#AkTcH%?`QN)SzzE6@UOYOHTQA)0Hmp_ zj5Z#97#k$ zR5;6>lQB}mKnz8nJ)UedDYBtV$6;L3at1oCkv7*zn~uZKg@PH9rC@}rP-L{(H8wD8 z<<*z9`u|H!-}h%TBZNRo34jt~;hzKDB%nSfk&36&O%urPTL6}yHfETtDH2XwNvyQkO5ETewlNzTe#d0000dwn9(V5mZ==E#qbmw1 zs;Q^qF(I2<75uO0MF>L}#DvHUEsypE7oQpPld1g@0q~?i(#6q!yr4D8#T_K(!4$F#4 z`QEI1)6os`aZU-<_X|?2Cme$zuExi zK1r{)weS%zunk;Xw>4=GxZD9oo-|PxZOKQ|TQevC?`QN)Ibiq}=v#AoYwhFo0mx8S z%QwKmAuwK~>~)uS_jLC5@0nJAKh8^X%SqUnNt3YwF$oD86A%{|TEE|u>j5Z#4M{{n zR5;76lCh40Komuf6QYoXM6j~jZ}7ji+n?GWvDuhdu7yIZz`}t9jnl2gGB`5~RQnPN z^4`h2bMKpdeSH2hQv34CX1!vnADrtu08%NdDVv&HHf+`__T?4X)MU#PfGi9F*yROc z4Ayn7?_O9l!i7v2;5~h_V5!u9-`C9v4Q0#Jf;D6*>$aMTgdQG)wMV|^Sqi2$yRbPE z9IKM=;sihv#ZX=P=3>6!Se5)#7uv_oJ2U&2J21^LCGPT~ci!hgE}LPDZr)=CS}FJp zoH{NuHR0wu<-Q3I?jQ?8OSYT0^*m#l@ZGmh(cr&h0;v?+!=Z1qj~huO6w?+bk|=)N fL3b-=B~i>1Qk%AJGi=6e00000NkvXXu0mjfH0C#% diff --git a/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing_ctm.png b/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing_ctm.png index 57b10e1bac1a331c85bfe8ac7d515bb363006171..b5ea8b3d6d2537883a20f078d6e7a3a1ca6554a8 100644 GIT binary patch delta 988 zcmV<210(!~CzlA2BQ61iX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ?*hm4ptCR z$WWc^q9VGLlOq8uf0q0X4BF+?-K`EQBsJ{i6;!Y zAn_yDWtZPL7aSINX3$6{=ZS;FVxf)YHfBXbC7vb@DXK>Ke?rD(h4U6?wOnP*d-4|s za@tCY>oi9Y!xG|1K!l7cN+`oZm{yGx6G_^ScJL27{sg&Xa+Scyv49FxNRA);4}N!R z=BFmzq(BttezEP3F~GMAG-|f}eQeu}6TtfnTxl(Tr4Gz~l3r_Rp(CJw8@RY`Y4RR$ zxdRM6>5?Hif0CD`kk13}XY@^3VBi+;uerT7_i_3Fq^Yar8{ps&7%x!vdWU!Sw)gh$ znPz`K^Hg%$b(MsR00006VoOIv00000008+zyMF)x010qNS#tmYE+YT{E+YYWr9XB6 z000McNliru=?VrGFb~BRQ#Swr02y>eSad^gZEa<4e{=vta%Ew3Wn>_CX>@2HM@dak zSAh-}0005+NklA!&W$V2!HFx6gR}== zLJAYec!!Nc=Pu2fq;05%FIDR_e`@=4n$cph*bxyZrGS|s&vPImK*Yvt(>P{^$14Kc z-d11mf4sQ>B7&zIX!L2VL9N&8B=L}Gt%H7J3}jmC-s1AyXUx1`BzecE?RJ|a9{b9W zAtETBXd7{6?wtanGAb%XJkRssB0@eyEQ>HjoQR?+kT3PtK#F(@1+uU#MLb49%$T_z zfv)0`$G$ZH0EZgrBQ9YKl^2O97w@&6z(SPWevc<7R7LA@hFCHV#}5v-+waE^m^P0 ze?ie5&FAx7jNec*al`CVqO}HN%+b8nUQiT8jdQ`!?r<)euFqz^X^Sq3qVmfa(ai*h z8hT9_M$nwjBn1QjR6Be;%#3p|S;6^aJbV$l;s2Ku47z~B$>>BFh8mIRX0M~mqiT0i za;sa2umx^`IxYC+=L`_B{3UY>$9`sqB2n-ZfBjwZo_?Bqg5fXJOIJ;$T(rXg0000< KMNUMnLSTYcX2nPV literal 4998 zcmeHKX;c$g7A}Y^vbX>vwhd#9jVMyt*Ah@52($(ekwtK+R4So>ETjSnC=wJI#HHaN zF5@z-(~e8y)~DNLU{o3bcWqlmL}bRc^m)^?)~1q z-~HY@d23>#!d;yvI6)BP8W|yt1$R1iIog9?GB>vq-0E}V5)HAak*?Egl|%+kH{|GW zI&LDA5M;Wej%jwSrMtXSm25CitgfFV^UGSbp_Mjcp4-o3>bom{(%oLs8f|iA6W8L> zG?MUH+k{Ue()gX9Onbb}{fWoZ&ADR7*^#=EMd>ds|A_jN+1on_8F}-#`^AdX$8Wl( zJQ#gm$4{wb-bjhK?Wix%w3eK_skeOpP2KbZ?QGlgohz9}V^w-h=dD6xVUGK?Vn&+1 z;)%yslZj$~yY+Jm%X^=CoS$W_xhR>TP_|hIhEidcd;oP zQ?X^gFK=zqi4BLBnYwd5|CRLgk;SX_^BRRY{Id<5mLtWYVwDKq@ggX*w8Cd~_jc2T zFP+_H>KA2quP66kw!P{yp{X+&V^O%8Y$yd1ukEn^TvZlT_;N-LH)QrIL)c zgyaV&pV#epD0WK>ahq0LIxpOAL1OW>17&iC>}{rJ{=W9;vN=-{?ACcX?+adi6EvI>T*_QiUSZvIB zHA}1Q+1b|liU#@XTdP`VE)XS9O_WF*RB=%HFYPUkcEOg0>5BC@%RASZf&UZF%{rL+4Wz*`_A z)nL#eESAw|WEy!)tzO0ANF)*#o6F*IVc-FiIT{0Mf;Hr13ZfT7ij$b0&>0A=hE8Fk za&49&kih`s^#1(RI+<($UPJb=0Qg{;P#ufIWV6(2*5C-z5S9%<`V#ux2r>>VR8}lb zYP0kh9+r)343h^#D6oNeU6ww>T8;u^;TgCZxRPL2&X6g?BV{oI5flX~Lann#0kVg9 z8VKckvWDbFjabVWoCpXXz#Zba!#QKN|M0`}i zSHgTQj}7y2429)#&=|f5L)jwm1%rd2A~mD|)nGUU1;CjEz~L%|BA!@?!2*;cf%$Ac zfZz$mFqg-{IAVo>i;2)d5Yc)9s1nT>oD~J7prC{ziIO9d!vb6Ypm-P;M)^1w7D$Ac zL@4L86-u@hN`WD>wR$xQ+DWKU70%LWRMr8Ca3nY;GLXS#_PSavF&U^q2?D?xAT$cC zk$mqQN2u}n29)BHBNB)uVhLNwV+*-resAH{_;_4T0xeRg95$2JJ3=)E0p$Q{QA()* zpubKeRF9(utv*hx%?M;r5OgYXU|0qglma!NQq+J0P&QY9uq6mr6vyEpY(B!}z-(X{ zR`zsrh(j?_2L{24P)Hbh>p}ASl*b0*Pkh3TvJK zt9J-XMKvlM>>quC?Y9%ZBL*SH!?{8(4l6~VZ+rnz1j^-bVO$P0fr&&4oxCtlzY|*J02O3TWxI zft?v_^sIrMzK<_zPyL9WKAC;Q836R~Bp<}@FkQoReGmg5=qhrB_`hvul>d)?XE&S%o6UnXjRx~w)?S3A2Dv#um zZ|^;+G%h~9yvw1;CsW(C>;ljE$HwcoTw*`3Ugqz&VoAg4=j|5fxj98Ywv?^TOAHt> zwqWbX^6XEebG_f4({OfNh378ettFG5&d|%Zli!A%pI%V%;Ng{sX+NC3-BcI$SLlZo zjmd>2dB0wIq46jPY@d0c?j$iyxwvv&o(2smt~S?N7Q=dE zFiR{d_iYyzpG!8ga>8gGr?;!4y00#Ya_#p2%4U-EUQxrUg3b8}bG8O;<~pa*kC){; z#QoxWc*>^np}8^XZC#g|?e=t>+iwG%v@c31_cQK%Fs0{Bw&jK7pEu2`w5^hB5j3CZ zZJCC*~YlPod(?(ADW9WY#%NE?x|(Myg4-KMo;>l6j%GKplx~Z9;ruI z%&9lygeOOj8GF0=!QV_N8zWTZ*PMTPz4Pbi%O#z1Ez-Ehv1hN^d1L8&n^EJ}JPWa-NP07L;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') }