From 31d0e68058c352802c8651333d66ffe2d340e745 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Wed, 30 Jul 2025 07:01:21 -0400 Subject: [PATCH 1/3] More fixes to nuclear line (#1477) * Adding the Nuclear Line CPU Wafer * merge * Revert "merge" This reverts commit b29b5e324f587042a7aad01a49cfdf63b33ab7b4. * revert * Revert "revert" This reverts commit 38376879b37a1150bd84dfa524621c2ffe6350db. * no change weird things happening to me * add fluid textures * Modification of nuclear line * fix conflict for fluids * first balance change * fix conflict with recipes.rocks * Nuclear Line * Add the bromine line and more fixes * Fully added back the bromine line * Add nuclear energy line and more fixes * fix conflit * Add back the recipes change to gtceu for nuclear * revert * fix conflict * One last try * Adjust Reactor rates * Added change to uranium dust commented out until Mars Update * Remove long rod from nuclear pellet * more fixes to nuclear line * test to increase output --- kubejs/server_scripts/gregtech/recipes.js | 12 +++++- kubejs/server_scripts/tfg/recipes.nuclear.js | 40 +++++++++----------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 4af3449bb..a395c07d4 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1266,8 +1266,16 @@ const registerGTCEURecipes = (event) => { // TODO: Nano CPU use Nuclear Tritiated Water COMMENTED UNTIL MARS IS OUT /* - event.replaceInput({ id: 'gtceu:chemical_reactor/nano_cpu_wafer' }, Fluid.of('gtceu:glowstone'), Fluid.of('gtceu:tritiated_water')) - event.replaceInput({ id: 'gtceu:large_chemical_reactor/nano_cpu_wafer' }, Fluid.of('gtceu:glowstone'), Fluid.of('gtceu:tritiated_water')) + event.remove({ id: 'gtceu:chemical_reactor/nano_cpu_wafer' }) + event.remove({ id: 'gtceu:large_chemical_reactor/nano_cpu_wafer' }) + + event.recipes.gtceu.chemical_reactor('tfg:nano_cpu_wafer') + .inputFluids(Fluid.of('gtceu:tritiated_water', 576)) + .itemInputs('gtceu:cpu_wafer', '16x gtceu:carbon_fibers') + .itemOutputs('gtceu:nano_cpu_wafer') + .duration(20*60) + .EUt(GTValues.VA[GTValues.EV]) + .cleanroom(CleanroomType.CLEANROOM) // Remove Plutonium from centrifuging Uranium dust diff --git a/kubejs/server_scripts/tfg/recipes.nuclear.js b/kubejs/server_scripts/tfg/recipes.nuclear.js index 9c0650f12..9d4aa903d 100644 --- a/kubejs/server_scripts/tfg/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/recipes.nuclear.js @@ -7,7 +7,7 @@ function registerTFGNuclearRecipes(event) { event.recipes.gtceu.nuclear_fuel_factory('gtceu:thorium_pellet') .itemInputs('1x #forge:nuggets/thorium_230', '1x #forge:ingots/thorium_232') .itemOutputs('#forge:ingots/thorium_pellet') - .duration(20*30) + .duration(20*10) .EUt(GTValues.V[GTValues.HV]) event.recipes.gtceu.nuclear_fuel_factory('gtceu:uranium_pellet') @@ -54,14 +54,6 @@ function registerTFGNuclearRecipes(event) { .duration(20*9) .EUt(GTValues.VA[GTValues.LV]) -/* event.recipes.gtceu.electric_blast_furnace('ammonium_chloryde') - .itemInputs('#forge:dusts/ammonium_chloride') - .outputFluids(Fluid.of('gtceu:hydrochloric_acid', 1000)) - .outputFluids(Fluid.of('gtceu:ammonia', 1000)) - .blastFurnaceTemp(4600) - .duration(20*36) - .EUt(GTValues.VA[GTValues.IV])*/ - // Martian Sludge event.recipes.gtceu.chemical_bath('dirty_hexafluorosilicic_acid') @@ -87,7 +79,7 @@ function registerTFGNuclearRecipes(event) { .inputFluids(Fluid.of('gtceu:radioactive_waste', 1000)) .outputFluids(Fluid.of('gtceu:radon', 100)) .itemOutputs('#forge:dusts/nuclear_residue') - .duration(20*48) + .duration(20*30) .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.vacuum_freezer('oxidized_nuclear_residue') @@ -104,14 +96,14 @@ function registerTFGNuclearRecipes(event) { .itemOutputs('#forge:dusts/refined_nuclear_residue') .outputFluids(Fluid.of('gtceu:hydrofluoric_acid', 2000)) .outputFluids(Fluid.of('gtceu:oxygen', 1000)) - .duration(20*48) + .duration(20*30) .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.large_chemical_reactor('dioxygen_difluoride') .inputFluids(Fluid.of('gtceu:oxygen', 2000)) .inputFluids(Fluid.of('gtceu:fluorine', 2000)) .outputFluids(Fluid.of('gtceu:dioxygen_difluoride', 1000)) - .duration(20*48) + .duration(20*16) .EUt(GTValues.VA[GTValues.IV]) event.recipes.gtceu.large_chemical_reactor('plutonium_dust') @@ -119,7 +111,7 @@ function registerTFGNuclearRecipes(event) { .inputFluids(Fluid.of('gtceu:hydrogen', 2000)) .itemOutputs('#forge:dusts/plutonium') .outputFluids(Fluid.of('gtceu:steam', 1000)) - .duration(20*48) + .duration(20*15) .EUt(GTValues.VA[GTValues.IV]) //#endregion @@ -157,14 +149,16 @@ function registerTFGNuclearRecipes(event) { //#region Fission Reactor + // Recipe for Thorium Reactor event.recipes.gtceu.fission_reactor('thorium_uranium_waste') .itemInputs('#forge:bolts/thorium_pellet') - .inputFluids(Fluid.of('minecraft:water', 200)) - .outputFluids(Fluid.of('gtceu:dense_steam', 200)) + .inputFluids(Fluid.of('minecraft:water', 100)) + .outputFluids(Fluid.of('gtceu:dense_steam', 100)) .outputFluids(Fluid.of('gtceu:uranium_waste', 20)) - .duration(20*100) + .duration(20*50) .EUt(32) + // Recipe for energy only reactor event.recipes.gtceu.fission_reactor('thorium_nuclear_waste') .itemInputs('#forge:bolts/thorium_pellet') .inputFluids(Fluid.of('gtceu:distilled_water', 200)) @@ -173,18 +167,20 @@ function registerTFGNuclearRecipes(event) { .duration(20*100) .EUt(32) + // Recipe for Uranium Reactor event.recipes.gtceu.fission_reactor('uranium_radioactive') .itemInputs('#forge:bolts/uranium_pellet') - .inputFluids(Fluid.of('gtceu:heavy_water', 500)) - .outputFluids(Fluid.of('gtceu:radioactive_steam', 500)) + .inputFluids(Fluid.of('gtceu:heavy_water', 750)) + .outputFluids(Fluid.of('gtceu:radioactive_steam', 750)) .outputFluids(Fluid.of('gtceu:radioactive_waste', 50)) .duration(20*100) .EUt(32) + // Recipe for Plutonium Reactor event.recipes.gtceu.fission_reactor('plutonium_irradiated') .itemInputs('#forge:bolts/plutonium_pellet') - .inputFluids(Fluid.of('gtceu:heavy_water', 1000)) - .outputFluids(Fluid.of('gtceu:irradiated_steam', 1000)) + .inputFluids(Fluid.of('gtceu:heavy_water', 2000)) + .outputFluids(Fluid.of('gtceu:irradiated_steam', 2000)) .outputFluids(Fluid.of('gtceu:tritiated_water', 50)) .duration(20*100) .EUt(32) @@ -205,7 +201,7 @@ function registerTFGNuclearRecipes(event) { event.recipes.gtceu.gas_turbine('dense_steam') .inputFluids(Fluid.of('gtceu:dense_steam', 1)) - .EUt(-32) + .EUt(-(32*4)) .duration(20*2) //#endregion @@ -226,7 +222,7 @@ function registerTFGNuclearRecipes(event) { .duration(20*24) .EUt(GTValues.VA[GTValues.HV]) - event.recipes.gtceu.chemical_reactor('basic_bromine_exhaust_to_hot_iodine_brine') + event.recipes.gtceu.large_chemical_reactor('basic_bromine_exhaust_to_hot_iodine_brine') .inputFluids(Fluid.of('gtceu:basic_bromine_exhaust', 1000)) .inputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) .outputFluids(Fluid.of('gtceu:sodium_potassium', 1000)) From 0a0d7934902b473e8e1278786af134a5db975b2a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 30 Jul 2025 13:04:23 +0100 Subject: [PATCH 2/3] mars plants cleanup --- .../blockstates/amber_root_seed.json | 20 ------------------- ...som_berry_seed.json => blossom_berry.json} | 0 kubejs/startup_scripts/betterend/blocks.js | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 kubejs/assets/betterend/blockstates/amber_root_seed.json rename kubejs/assets/betterend/blockstates/{blossom_berry_seed.json => blossom_berry.json} (100%) diff --git a/kubejs/assets/betterend/blockstates/amber_root_seed.json b/kubejs/assets/betterend/blockstates/amber_root_seed.json deleted file mode 100644 index d86169463..000000000 --- a/kubejs/assets/betterend/blockstates/amber_root_seed.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "age=0": [ - { "model": "betterend:block/amber_root_0" }, - { "model": "betterend:block/amber_root_1" } - ], - "age=1": [ - { "model": "betterend:block/amber_root_2" }, - { "model": "betterend:block/amber_root_3" } - ], - "age=2": [ - { "model": "betterend:block/amber_root_4" }, - { "model": "betterend:block/amber_root_5" } - ], - "age=3": [ - { "model": "betterend:block/amber_root_6" }, - { "model": "betterend:block/amber_root_7" } - ] - } -} diff --git a/kubejs/assets/betterend/blockstates/blossom_berry_seed.json b/kubejs/assets/betterend/blockstates/blossom_berry.json similarity index 100% rename from kubejs/assets/betterend/blockstates/blossom_berry_seed.json rename to kubejs/assets/betterend/blockstates/blossom_berry.json diff --git a/kubejs/startup_scripts/betterend/blocks.js b/kubejs/startup_scripts/betterend/blocks.js index 972270516..e61413ee7 100644 --- a/kubejs/startup_scripts/betterend/blocks.js +++ b/kubejs/startup_scripts/betterend/blocks.js @@ -44,7 +44,7 @@ function registerBetterEndBlocks(event) { .box(2, 0, 2, 14, 3, 14) createPlant(event, 'flammalix', 'mars') createPlant(event, 'globulagus', 'mars') - .box(3, 0, 3, 13, 13, 13) + .box(3, 0, 3, 13, 13, 13) createPlant(event, 'lamellarium', 'mars') createPlant(event, 'lutebus', 'mars') .box(3, 0, 3, 13, 8, 13) From 125efd9ac18c3476f79315fa2992b7517eb5878b Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Wed, 30 Jul 2025 14:33:50 -0500 Subject: [PATCH 3/3] Feature/tier3 rocket (#1483) * stuff for rocket * worm * Revert "worm" This reverts commit fa2f0fc74727a7c7f15cbaae2365b8147b2e9313. * Update blocks.js * rocket stuff * Update constants.js * More * final stuff * probably disalbed everything * Delete options.txt Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Delete kubejs/startup_scripts/tfg/elements.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * dry ice change Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * vacuum freezer change Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --- kubejs/assets/ad_astra/lang/en_us.json | 10 + .../entity/armor/netherite_space_suit.png | Bin 0 -> 6851 bytes .../textures/entity/rocket/tier_3_rocket.png | Bin 0 -> 44741 bytes .../textures/item/netherite_space_boots.png | Bin 0 -> 33587 bytes .../textures/item/netherite_space_helmet.png | Bin 0 -> 4353 bytes .../textures/item/netherite_space_pants.png | Bin 0 -> 33672 bytes .../textures/item/netherite_space_suit.png | Bin 0 -> 33885 bytes kubejs/assets/gtceu/lang/en_us.json | 3 + kubejs/assets/tfg/lang/en_us.json | 21 ++ .../tfg/models/item/aes_compressed_wool.json | 2 +- .../tfg/models/item/aes_insulation_roll.json | 2 +- .../tfg/models/item/aes_insulation_sheet.json | 2 +- .../tfg/models/item/aes_polyurethane.json | 6 + kubejs/assets/tfg/models/item/aes_wool.json | 2 +- .../models/item/better_space_suit_fabric.json | 6 + .../tfg/models/item/elite_power_thruster.json | 6 + .../assets/tfg/models/item/mli_shielding.json | 6 + .../tfg/models/item/rocket_cone_t2.json | 2 +- .../tfg/models/item/rocket_cone_t3.json | 6 + .../assets/tfg/models/item/rocket_fin_t2.json | 2 +- .../assets/tfg/models/item/rocket_fin_t3.json | 6 + .../tfg/models/item/silica_aerogel.json | 6 + .../textures/item/aes_insulation_sheet.png | Bin 864 -> 0 bytes .../{ => t2_rocket}/aes_compressed_wool.png | Bin .../{ => t2_rocket}/aes_insulation_roll.png | Bin .../item/t2_rocket/aes_insulation_sheet.png | Bin 0 -> 822 bytes .../item/{ => t2_rocket}/aes_wool.png | Bin .../item/{ => t2_rocket}/rocket_cone_t2.png | Bin .../item/{ => t2_rocket}/rocket_fin_t2.png | Bin .../item/t3_rocket/aes_polyurethane.png | Bin 0 -> 892 bytes .../t3_rocket/better_space_suit_fabric.png | Bin 0 -> 840 bytes .../item/t3_rocket/elite_power_thruster.png | Bin 0 -> 916 bytes .../textures/item/t3_rocket/mli_shielding.png | Bin 0 -> 938 bytes .../item/t3_rocket/rocket_cone_t3.png | Bin 0 -> 787 bytes .../textures/item/t3_rocket/rocket_fin_t3.png | Bin 0 -> 821 bytes .../item/t3_rocket/silica_aerogel.png | Bin 0 -> 870 bytes kubejs/server_scripts/ad_astra/recipes.js | 182 +++++++++++++---- kubejs/server_scripts/ad_astra/tags.js | 14 ++ .../server_scripts/greate/recipes.removes.js | 1 + .../tfg/recipes.miscellaneous.js | 192 +++++++++++++++++- kubejs/startup_scripts/ad_astra/constants.js | 15 +- kubejs/startup_scripts/ad_astra/materials.js | 12 +- kubejs/startup_scripts/gtceu/materials.js | 3 + kubejs/startup_scripts/main_startup_script.js | 1 - kubejs/startup_scripts/tfg/items.js | 18 +- kubejs/startup_scripts/tfg/materials.js | 101 ++++++++- 46 files changed, 556 insertions(+), 71 deletions(-) create mode 100644 kubejs/assets/ad_astra/textures/entity/armor/netherite_space_suit.png create mode 100644 kubejs/assets/ad_astra/textures/entity/rocket/tier_3_rocket.png create mode 100644 kubejs/assets/ad_astra/textures/item/netherite_space_boots.png create mode 100644 kubejs/assets/ad_astra/textures/item/netherite_space_helmet.png create mode 100644 kubejs/assets/ad_astra/textures/item/netherite_space_pants.png create mode 100644 kubejs/assets/ad_astra/textures/item/netherite_space_suit.png create mode 100644 kubejs/assets/tfg/models/item/aes_polyurethane.json create mode 100644 kubejs/assets/tfg/models/item/better_space_suit_fabric.json create mode 100644 kubejs/assets/tfg/models/item/elite_power_thruster.json create mode 100644 kubejs/assets/tfg/models/item/mli_shielding.json create mode 100644 kubejs/assets/tfg/models/item/rocket_cone_t3.json create mode 100644 kubejs/assets/tfg/models/item/rocket_fin_t3.json create mode 100644 kubejs/assets/tfg/models/item/silica_aerogel.json delete mode 100644 kubejs/assets/tfg/textures/item/aes_insulation_sheet.png rename kubejs/assets/tfg/textures/item/{ => t2_rocket}/aes_compressed_wool.png (100%) rename kubejs/assets/tfg/textures/item/{ => t2_rocket}/aes_insulation_roll.png (100%) create mode 100644 kubejs/assets/tfg/textures/item/t2_rocket/aes_insulation_sheet.png rename kubejs/assets/tfg/textures/item/{ => t2_rocket}/aes_wool.png (100%) rename kubejs/assets/tfg/textures/item/{ => t2_rocket}/rocket_cone_t2.png (100%) rename kubejs/assets/tfg/textures/item/{ => t2_rocket}/rocket_fin_t2.png (100%) create mode 100644 kubejs/assets/tfg/textures/item/t3_rocket/aes_polyurethane.png create mode 100644 kubejs/assets/tfg/textures/item/t3_rocket/better_space_suit_fabric.png create mode 100644 kubejs/assets/tfg/textures/item/t3_rocket/elite_power_thruster.png create mode 100644 kubejs/assets/tfg/textures/item/t3_rocket/mli_shielding.png create mode 100644 kubejs/assets/tfg/textures/item/t3_rocket/rocket_cone_t3.png create mode 100644 kubejs/assets/tfg/textures/item/t3_rocket/rocket_fin_t3.png create mode 100644 kubejs/assets/tfg/textures/item/t3_rocket/silica_aerogel.png diff --git a/kubejs/assets/ad_astra/lang/en_us.json b/kubejs/assets/ad_astra/lang/en_us.json index d29744703..1dcec0546 100644 --- a/kubejs/assets/ad_astra/lang/en_us.json +++ b/kubejs/assets/ad_astra/lang/en_us.json @@ -108,17 +108,27 @@ "entity.ad_astra.corrupted_lunarian": "Lunar Zombie", "entity.ad_astra.tier_1_rocket": "R-Aluminosteel Rocket", "entity.ad_astra.tier_2_rocket": "ASM 4914 Titanium Rocket", + "entity.ad_astra.tier_3_rocket": "45-Ti Tungstensteel Rocket", "entity.ad_astra.tier_1_rover": "Rover", "fluid_type.ad_astra.oxygen": "Breathable Air", "item.ad_astra.steel_cable": "Basic RF Cable", "item.ad_astra.desh_cable": "Advanced RF Cable", "item.ad_astra.tier_1_rocket": "R-Aluminosteel Rocket", "item.ad_astra.tier_2_rocket": "ASM 4914 Titanium Rocket", + "item.ad_astra.tier_3_rocket": "45-Ti Tungstensteel Rocket", "item.ad_astra.oxygen_bucket": "Breathable Air Bucket", "item.ad_astra.tier_1_rover": "Rover", "item.ad_astra.photovoltaic_etrium_cell": "Basic Photovoltaic Cell", "item.ad_astra.photovoltaic_vesnium_cell": "Energium Photovoltaic Cell", "item.ad_astra.cheese": "Moon Cheese", + "item.ad_astra.ostrum_tank": "Ostrum Booster Tank", + "item.ad_astra.steel_engine": "Steel Rocket Engine", + "item.ad_astra.desh_engine": "Desh Rocket Engine", + "item.ad_astra.ostrum_engine": "Ostrum Rocket Engine", + "item.ad_astra.netherite_space_helmet": "§bTungstensteel Space Helmet", + "item.ad_astra.netherite_space_suit": "§bTungstensteel Space Suit", + "item.ad_astra.netherite_space_pants": "§bTungstensteel Space Pants", + "item.ad_astra.netherite_space_boots": "§bTungstensteel Space Boots", "tagprefix.moon_stone": "Anorthosite %s Ore", "tagprefix.moon_deepslate": "Norite %s Ore", "tagprefix.mars_stone": "Argillite %s Ore", diff --git a/kubejs/assets/ad_astra/textures/entity/armor/netherite_space_suit.png b/kubejs/assets/ad_astra/textures/entity/armor/netherite_space_suit.png new file mode 100644 index 0000000000000000000000000000000000000000..1b2d3870ac8392497874eab9ccca0bfb23df8f40 GIT binary patch literal 6851 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 z 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 literal 0 HcmV?d00001 diff --git a/kubejs/assets/ad_astra/textures/item/netherite_space_boots.png b/kubejs/assets/ad_astra/textures/item/netherite_space_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..57aac97e82d2e1b808ef5de9098196b61b82e193 GIT binary patch literal 33587 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 MobB&DC@@j3# z3MB?7)FDSX5{`j{#KEDH6hab6hLF@EMtI_Sip$ZonHWqtv)B9H`@Q#m@4aud&$x>gPfnSUf*{CbXQ90q-cyxx;skh|ed8_zZ?Q;exm?VI z(10ZJf)}82V*sEaEbs^t{@mxzpW1;={OG%l3skDH-;E*8GO&$fYGs%lCh=DbsbRIlKSZ%ATFMk=y#rEq(ZVhX%e}YCZM0X*1uI z$#?e|-#@(U?Dtpriy5EpXxTjAFYPT18(L=``Zl-gY}db%AKy3KkUc4Kvtw85`G&U- zS3U8>`nlbeXtP6}f@T+Q+OW6DapG9Z+YfE{#Iqnd{kphx&LZ&n&mrdZ+5HR z$H0>H*b)->SZPv|Wt~oK;<>cM-0D4b%vQ5ebw;ib~nY zYSzrD^A@C7!ZZZ%0hvL=KCeGWhpp;3E)Aa*F|J1AD)MTpy4>YPZK4EFokpi2Fh^Ku zpwtUeP>aOzbg_NWAOw7~s%vC9K;w8Q6w-vW8d0joNwe9E6BJHS7}UUmjeeO4WBy>a z0+GP5gCHvj0a+0JsDjCO#CqAPR>O64C_Z1nm_xbSA7D3t3 z06_)=`caEuDV$Th7zD+7i3N@Z;Fq&ULvZY{eV|_Q#?#?g9C(2bss^D~@*bCqoi6vV zg+f8K;0wg9Aldh5$^t(^);+N)EAezj2LjE9aqrO{$~~?OwOlURF0%DXcuu=jt@x)o zkrg;P{>bwjMHuxu46qD`=}fEvV;I7OnOVkUV0ebt!S+yCPe3{SL7DNhK!Ji1jR0{t zJx8#>;K3-s5tvTr;V_c{7%;$75Xz`CvU=?(h^3MMyOQyaj!J>zAe7EzA_31EG15%I zXed2_nRyS7F@#ochCZ|uZ-_&2EWJpSd<-n7;A5%*9`IMk7Zk$je7Do8rZmKe#O-Bd z9vZ+I5d54N3XUw53O-OGGYX%iQLinO@Zjwme$QV{l{f=Ut^tuDTz6o!WB zKx!GKQz1ZH4zr^fY0lwL~dN(xj25 zOc((rqx3~i;2Zy!wlY4bB~htDAqf39#zl#lDgkwgx5TSghz}Er#>awY*hC6JrU4`> z4zUtTYz^bD25|ovY}g^W@FUGYDpk@^EN1plJf_nV9?ZmWMhtiehK0RBa>fKn!{|Yg zmqUyM@~a__kSo}rajww0gQa>j&f2hks0Ju?fRtf`5gSFB8Xrs+S9Xk{Y%TbI@nMN8 zjM`$LT|x%8F1Qoo!&~7XU(okYc?{O!r*wg$<4(rJ?>JrKbd8CDF)5FC*En5cVqi?l zX{-jx{X<2)J9c_f7x19F;Qqv#Us?3^bi_7ge`9q%JoB7+PP*Zhj+xY_N z_@mL*4aqyRbJUKWr@yLoPfAVOKBorxa7NBASXHdah|ivSrs=?hSW}t!N}3L-oV-zW zzJ2Y(na{(kJ&n!36p(J%3MwFMq^3P`&zxLwX{oZS^gW{`0_X6q&<1R=fk(J(H*CcW@IMk00G?pyK@UavzQR%M41OT5Ui;1!E?j*QE=(yPB$M zy2VGLiCG#Q$7o_=U@{q%I2v`4WD-YR8QLf^8XSp_F+MP6$>2LoGArr~&N!d_tL_F= z0(%)V|De*+)zzoYbMNo|?(g2eSDt_F*$+ATxTELh<{q-`oGlmd{|}RYj(QNkp7=k% z7x}*rUUkvMYZt_Q^Ltj7r=^{Be(eQ&>U`b5G|kQJ|Lm^wf9|0lXpg$%V^6;Ffd_8g zd(GN6-*U_IZ#;2n$EPmZ`|<}oVdcT`ju)TyH=la!J5J9V-uC-j9`w%VUVF&}JAUt* zH@)SQ7oL80_tn4I`HF4VJ@U;bfB5zj7e8_92S55p`_0cTFQ2^n=C|MRTUY=3_l|n; z!XK8sZ~od@ul>vCk2}6}$!}ct;ZHyD3T_WS?ji(kAked_%;T=JYFpL6=dzB_ltqpx|?&%fn^-+TPa zk1;14|Lrf`@@F^Ra>`S8Jo}B8ee0$p-ah?{uWotXP5=ElHyn7%PaM1TDD&!VH+}N; zZ@l5;O*eje^NU{eXRrGElW$-B#n&8h?en_>PkhA3%q`cwVthru`VIf}1^>?9^pV${ z@uG7#E#3T+uRQTR8{YTb554Es>kiltoHcAd@AxMi^YouTd7pX8V}ADUe)@_n&vYMo z^vZ^(T=Q=K2cKHJ{I6eseS7iE&+eZ0*6^|izTvf7j$SCAeCFvtbIhCm<7IF8?Q=fy zlFxtOv~PUp!dqYW;b$Fj(v3fH+4+wRFZmy*edm^UUUJRvuDt$bSNz_$Z}`*GKJ?N9 z8*aYrufFx|Kiu{1bLYNi_guU8yMOY8_Ks~=z4^^sU-L^h4|}e-r=E|I#m?`TRF+`OMc( zxczUx{+Pzp=Wu^-2agIH4cf6}*y9~H( z_v%{QovRGUkJzxpV683Vn4@i`FiuVHTx{Z$Y*R~2UA1}o%NyX`e7VhKe{`=>DhH< zmA4?Hns$TjXMb|%E}pr(b9rU^a;cja?Cg)^edmrTyG4|~1EOhbAl^WOT7XD$l zmPgpyrZpFtVX^0bf!{8+>r+4c-ODQ%EidofydbNamnj?`Y&({r#I<;MIJel2i?+SU zm_;)#c0<$hmAicZa#@;QaBtr&c3^%JKb|{u&eH1I^2!TlUs^W~7uGA*f4BbIol7&T zFh4(g--|J?FF4PZS!Oe3wDmt+`XTq{J|FtwQC63ywS94=o_;C&yLsVsF~9TYA9{cD z9kyrwNe2)5$#er;m|jebjeTRg z!DKu2zV_d@oBu@T%Marn^ow1;Xn10?XLVoJo0oTASy$G+|BUy#hAy}` z^kWLT0ej!qnEIw=b`6+F@L1pSzH8@OKNZt<$^lECx{<5wJKuyL1Den`#+1$tcFHa% z-GD8)tO` z`f-YRni@B>1!T1zpX-|1e8X{T+QoDUCxK0#1oT z!F@0cj^4|JolU+QhA9t8=cG)|ZOg$lVw7WE{shchs;KDZNe0|KrZu65^+G$-9tffK!+e6l(9yBi4L$-Lp5n+ z(Y@0d*luv6!zasi29NYYSY;le3C0r-wQVUyx8wm-DJ}ru#*&TP!&t%CZRm5!zW7mj z%0TSUTfsIpHzSx(){Sv6Q|(G|U{U2M`2)Mt zu-GtR!AbDg=B}BH#0I8~MQOge$h~nh@QR~PRSYaa6n?;l>?^R=D4!mrTyhqNH%+6^ zbREc@SM785t?P&dM&-3h0kpx+VF@|qQBbGE17mDq0~4UQ(;u!Jhkz;Uxq{KQ1F4YS zo8-xd_(AtlrZJBW_JxoUDqq|v=aCvN6St`j5iq41(BgzRN>&?v27-xC;mtK|3it$$ zzwLC6-uB6i9ga99Sdn!|>^LKUSMLW7+8docB-4}O2x=3EnE)UXqDUmw83H1F|7Zr? z9$Lr>!uF9(!wODTg2xso6*wzDxGD2Ab$iImHJ;3=v+ZojSjILcqFqzCh!BEGz-fbP zv%_c+M}S~4sqChl5%#Mi;OlsT${B(fxE)P0Eq+<@Xix+m7XxQN9?it0GqA*^r;7$FGAV(6@mO|JHkr;TASxJ9wpycdGzL}XrraanoFfanoy*mPY4 zf>p+XuSrA!1SoFm9Fe|m4`G2g7|d6PfyHO?mPbn-VJfkQwwaRAMf3pGkSlI(bU5b$ zKMH9z5(-SP7x0}bQlLC7@N=v zy3f04he3R->Xe}rV(_-|>bN$!3WA-Puk41>M-Yk9+Tc(o$O>Lvgyx)PT+1wyf*&zF z<-V;tYt!3-B+39j>|iAceB`BMfpZq?&Ay+Ee@6x zhVEkb5Z}HdKS7#45l(R^SZuKn@GjV~K^r{6$KeEUCvk-P>Ny9lAj}d35a7YV6f5aI zAnRl*!8{QfDc5xZ46?x5zH@!R-Sj%I2jqaJ3E2E9CnGscybS;5TZ5&k4&p_34+nUU zfL&+@&X$*A2rDu?Hd`Cu)@&Vg7Mm1vvKfXGEW@D?_5q0{*5ji4&f!R{&N%ciU$BHA zIm=~9>>Spnf{@3l1ERDLPs+C(`#f1V@!WC`xyoSd0o_PPla)!A>MBqANvDh`G2P}n2^fN9nBx!~)C@pp#EI|}Lz7zORL%J@+=7ul=cv0?xr>qfD3PvITRr;8k;b! zy~~i~%C}r97kL0)i<5#f#k&Y{w`4?P2Yh3Cz-Dy}V#~DQ$E>kqHR|cRN>I zG)m?JH&5JXg0PaUTpPnnB;&whIiJxgXE-?t1mHDe2SorQz#it<?XP*CBQ8IaIr0=UDM1l`33`9=@pBOuN;_$!b@-$FZ&Db*2p(^Z{4#OTA* zfNe6MgIpQ+Fu{qFs+mZ`wT`rnZV%Bjbk24p9TPSN6ib}K9sldynC_^&`Jc4*7 zJ;9apC#Vs^TR>tju{{SqwGN(rR9+iog3tghE}3a| zKx#s>fQ5jtkyAFo>&zFa4-ZKY$dygJk0djMVrfhlZS=7Yozjhhp~=v|Qt=mo4^i%6 zWXZ5zj=M-)RCIw41Cr&&+5jy%4=*%}F>sv*@1KKrZq&H|S4f^i!(wQlMu?6{6k7B= z(0q_Dpd9aY<_mY?Q=Qm3^qW|Jz)~dIfuAH79Lf}?q_fyqK=c;8H58(xeT;a$3cXu; zXkt^ii9xrALkr{}y@SQ(WP;Gn(URoK$s=k7bPlcV9u8#hBt3>|htLdC7mjIQ4}o;T zJ3B}^-5w66_Zh|l6f%)86LJ&F2*>N8*n!2RRidwf9K7$LuX ztc*qXQb7Enc2Mge98oJVVCWL2w%Ra^xh3(cJQR}X(62-~9&1BVh3xGBBu*sf!`OOq zJ~{+TMu*H8E+9^@L0OkT~Nt}UK;85)vX$?Ya8YbKb!I(5@T z9z-`FH>D+02tJ(QVsZ4q5OfZ>P_k9E>vUjg=nK>)aU;wUkc{PN(Cihzq?SSq013UUx42&yk99%VlnsxQA4dR4F;#cFLm?!43oDykOul z;HgIVSMVX%#&?8J&~w00T_gpKNeso#K@^}s5#x|D*$NObIx7pQF)2^kd+|&#UKIkY zh1_E|$=1idz)q6?=#?0IK)k^`cqFiU68*5+vE`nljY%U&9wVlEDS;?-Am#x%h}w%o z2_9`w_69?a4y;c)C^Epo76b#(edy7u$2bIIv1XO9hx9)zi_(0Ft^+_MRuK3g>b_{P zhoVKHi~+*8Dt$`yUEzY!}^m@_m_z6$a;tdFI@mVms zOb%0v4Ob2b0R-zvZU*Nmq8$-V2%wEMl0_s3qMTvsSTdy`lOY2zP6FqkA{&?B55*vc zqI3Zh#ONdUPq8y0<(MGQp>i zJsLbBLE=07GLGINPQdJB=sx8PJuET%ha(2tkgyi52x(Ug4Pi71f|8VbNU{Pg7O@zJ zS`aLU;&?byU+|#Bz1}HL8A>-hq2mzC38~BW!4;DmHK?aS^jeka$byM*xY!k*fD|9R zX^*`n-HhfdP2Tl7Ycm1{TMIExZciv|84%f~kT*D2(Qb7*D1urXMI@(8E*?&9rU;U! z*QZEY3Z>ep)H#fV6dVE-1`<|?%7$=?s)G@kAUaWGM!oV-fC%X0h@@cEgiM3(Lq7-$ z4Klhl?_#g?INHo!)6mc9ms8gAv9}{On6pJGUePIu=3nS}h)}&e- zxreAUuu$L0iA<{(ZK-4{kinvE2fEre#lj?Y_OKGVlkP?b3$}qE#-TdE(%2Erlm13X zqH|Is1ppPEka(6vIx+N3EqUA0)5jZ3X0Jzu&4~=4VaDhkUjLyJH zXiGQ>*#-OpW^&4K??k&$I3D_HbU}B@#Kav^Hv%%CHcF)#AxSI=4neBMT(i-+Q4bsf zWs8l0swy)LXGP);JVB6wa212Dx`&dUwGO&3k>EklAvy;tl*EvA9ola|oz4Z2QYCrB z~+Apn0x@kkAgg8Nw?QwsURB{z6d6p^!5q054=;Bf(=)-a~|Bo|FWs z6hWOJe+1s-8u+4xZfFTplmj9m2rYh-EGU_-fL{iO5e1MdMKw_(`4-)hDUIf!38HG| zGLjkw9}YT(DAd-NS>#g=?}?NLqPzMLB)vZb&(Wo9{RlsBnDNl zBUp3}J-GnuP$_q&8s)Vi4}kiPDM@V;p&19<0pFpi(ETz=uf#SUYnV{G$x)E;L7GNb z52s;LKvPV*9^a=s6ki>~V6O)J06JKFJXRlDLE6R=WudRu4VcBeip?i&A%%|we2xm5 z=tw!1u>*nXA}OhfMNP}(;9@0_PWpq8QBt_DY3PrFQU{BiorD5!c|zoevF0AaV@oao zyl4~jP}E_Y(3%!{hG3$jWKHTISu$^#e0U2uWIvS>qabA?XgehAM#yP}WQp8Cm1dYb{VK5_LR9WMLWS!{76FLbO$u$(P1lI|To$xD^ z1t`H1>X&JxzD^DpCnZe#%+XVJPKSdTm2c10(0fEUx(Gc}P64{Eikubd(BJ5h^~ zVnywRJ>>o65o%=O8g|4~X;AKALX3qgB@Hl;8=VPjJ;y@^1Bo6a36+_;Jjm>yxD6t6L$$OTc2 z5F1QzlxBbnRPAAGkz$}T5x)$;>BOf%@u5Ybn43HA$V2J|1hR93seqO$Bx*juhsZav zW)wnNOXX12AqUayL*5eHiLoAMewk_zf>Z8y%4IZ4B?kAR^Y}`d5WtQDfq^3AfSTH) z;GH@$4$4X{#354sEyoJO>1V2YP8bO0sGkgpni3t;E{TPKNVchH`6MUIFH*eiNrRIX zrQAmur$mysGcv6TBqq}!R25b55K29cnYw(X$~2A?qKjygJQ4yrSv)C72u~)9JB*^M z&|Mp1u(n0O0}D6O4nx2a(F)o*&@imzL@1>j5VD%I2}IBkMc^h$E>aBO5yML+*8&-& z9I%HJA>-pGbg<;02rzJXkjB)Ykpt&Ubn!9{3L8tlgX{+yZH4_#~`5OumE(~uu(3PN&UO`KZ{Zba@W9s3> zS!1QPP>RaIHWL|k5?lo1iOo<(QW1#`N;g1*fhX`Ye3&o}R2q`OE|7s*dl)HRqoe@1 z1#im5#yGUdZzKsvaSa8uLFboQ(~wE-aIvL`L{ga^ryq{;yy_e4`mwfZbU zBQy&VbnF6j8e6KZs78`BqL~sMF@t8s?RXCJFrWs2s zDNg7wWwVz=-vGccx)XZK31td=&s5t{41${9cW6*__E4^}fFiVwh_Pozd|B@I^iQBG+O zDMFe^BtWv$9Y-Q5tPMT}_)ftiG= zawyWC5u^>HCWWYkJJjA1DpSTaR&=ep0ZC@TRNzKotkFM-k8im))Rj~y<3!by&SEFJ z3iXm*g(*PLAsHV+7xaw-1&Rg5D3@C|L*%%5B$%g2lmw!0 zfJ6q@H`9Gd&I<|)Ye;z=W!B08p&8&Lv0T78kOR~Rj14ZPEeLN2NR?_9`prnEP0SZ9 zCZtpy^hG4Zp;H=xrh=YJx>F`>AoqbColjxA_fX*!|YLrckslpUcBm8J_a zAk|UiugQ!K6K_T7Q?jK6i=nFqjYM!KB=ZD{;G7BYNsID~ypFdaJyFoXWZ5*#s&q?8 zGihT>1seHaT))m9Vz2JCVV>&gVXo=igJuF)EOu!<~2(L0D|*>qGEJ zFBt+0w29QVsg_(w>(I0gPg0p7B~#!-6qDqnh#GSTsULKESWLuiLVG1cFhMejBp2IC zEZG^f?da2#v0mv=Ay5G!Juwj0LdS_x9z#a2%828O*6BD0$p&VmFn|V-0~{>X+BCKy z*=jQhX6iPSD$~L?(IX7z6=k4g%`gtaSJA+ZLO#^LNJeyrf~zE#OdY)iV^cE4s20kU zOc!A}EqJUFiWEkp#M5-NmD#{tc<_fO@iz_fz+-RjZ$MTsM*z1C? z(m5%zd9@6c3yI?e9}+O~5fL!#blLMf zBIQdVT{&5*)JL)l+-}LIkXj}YLP=&vfv*;07u2KxI%$Woo=*Y1_Nea3F;lHUAtkMU zb$b{<98v0|#B3iFCzIFXcJlHdG0;Ki1_V?Rc}j%~Y8L5^fa~Ke!;wg30Mb*ZgT&+{ z=%azuhVC8W`h>&?2w2hbv#Hd7@;}`SX{bnWNAepHnOGa?>PD6n+&zHcX{DgdRzLz! z%}FE`B9NHe8>Ft(zli7rMVQDuly8|@5BheXw;_KnpdBbeex5f&U`}~B4R&=<1jc`$ zyDugh+7E(CmTaV0m@tEG4rFkZHlt})t)FZM23v0VV1) z6gwCQkeoEkp(P$s1`HMlEsbB4O9na6u^Vzz`typ=mw$uCA#{QKqFJ<6_WR;3;~WMY0ALq(iW@5RAYY z={m}~d2RS*%s-Y9V%))V678$rvNS6tfZ)N=Y8)$waUf`vUOb44DJSAG>EK+YG69@K zj-J9iF$u795>pwp^CWN~oxJiMqPv(1-3;h&$$8KfN@hqRlHzKla~zrWrO?rZqz~q$ zXPR`#0l`Y^D%x!$;FK=h+KY|;d_bNI*@a)myJH+APU(>1C&>3gf>d`X7DIyP}Od;_h6BBv?x}XyQNRkV?L*)??clz8L!Zix^RZEruY3C0_;zY%< zU>t~_;51-*CEL!2$mj;No<{E=ShDfbYDkt0i7J9g!|71`u8fySj?s*nn+(%Q#RfW6 zc9T&#d{pQ(kD+_AZiXaJFo)8PhWahkeHcXoUWzC?%ayUPPTBz>2oruew`B8BZ2}(< zIb$67FN_`C&~^EgiGCBvaZ$72pr!T}Cq;xu`XA^;BAakoIYV;&RG4udP`LD`mpDaQ zF}Fl3JfI*=opgIB>Y5gtPh^j=o_(T0M)VdC+E~Nu0X*miq?$lJDut9fg^4tng=>)y zuHxeeXqrcB5sHSD1JbEN0y2^dV4InSQ(#@8O~x8iET-t81ubK0=6^Sm_`*>r_O=Ai7x*9^PX;*`Xnj;L!67 zJ2`8IhVqoNoAqA7ks&<&OSJ>4Z@&L_{gZ9i(VI@& zzbEF)>)L$X%?B>;TR831jqnb0b8`<$Pd|Ih+{fj=-}wC-zQ|V|yyu)tR_Eq^>XGu# z5p%zD&9Qv($hB?Tw;uV`BTsnP!;jm3YkkJt+!2r6w&nDT{9k(tH0O?eVYqTt4Q!H{NjJ2X8#(A6|bU zUwiJSZaU`X7d`sMug(AJ3Ge>qDRY0iZ|}R_^|`OyvGw>r_~qN)_nDuVd*@mI^2V<{ zZ0jRmdHboK|HNgVe9pgl?XMnt)wXy1T0Qy|?SY4W>4xz&FMGT><<$?5*L~ro&;5;K ze(sc)+2fx6zb<{!BcAyWyO)0RDQ92$@#8+X@x1pu>$~4OFkaEEedaUAUme)Lxoum| M-SVz8p8vA{2lw@@#Q*>R literal 0 HcmV?d00001 diff --git a/kubejs/assets/ad_astra/textures/item/netherite_space_suit.png b/kubejs/assets/ad_astra/textures/item/netherite_space_suit.png new file mode 100644 index 0000000000000000000000000000000000000000..4e1e26bfa47640eba5371adfc165cb8e0f3f3f50 GIT binary patch literal 33885 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 YJvZ$2@^7&z##SA1%*yv3cFN2DFSfKHMF0Q* literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 8dc213a92..ca0285896 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -84,7 +84,10 @@ "material.gtceu.etrium": "Etrium", "material.gtceu.rocket_alloy_t1": "R-Aluminosteel Rocket Alloy", "material.gtceu.rocket_alloy_t2": "ASM 4914 Titanium Rocket Alloy", + "material.gtceu.rocket_alloy_t3": "45-Ti Tungstensteel Rocket Alloy", "material.gtceu.vitrified_asbestos": "Vitrified Asbestos", + "material.gtceu.liquid_carbon_dioxide": "Liquid Carbon Dioxide", + "material.gtceu.thorium": "§dThorium", "material.gtceu.hot_debrominated_brine": "Hot Debrominated Brine", "material.gtceu.hydrogen_iodide": "Hydrogen Iodide", "material.gtceu.dense_steam": "High Pressure Steam", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 5dfc62bf5..6546b8272 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -509,6 +509,13 @@ "item.tfg.wood.lumber.aeronos": "Aeronos Lumber", "item.tfg.wood.lumber.strophar": "Strophar Lumber", "item.tfg.wood.lumber.glacian": "Glacian Lumber", + "item.tfg.aes_polyurethane": "AES Reinforced R-Polyurethane Foam", + "item.tfg.mli_shielding": "Multi-Layer Insulated Shielding", + "item.tfg.rocket_cone_t3": "Advanced Rocket Nose Cone", + "item.tfg.rocket_fin_t3": "Advanced Rocket Fin", + "item.tfg.elite_power_thruster": "§aElite Power Thruster", + "item.tfg.silica_aerogel": "Silica Aerogel", + "item.tfg.better_space_suit_fabric": "Adaptive Space Suit Fabric", "item.tfg.universal_compost_browns": "Brown Universal Compost", "item.tfg.universal_compost_greens": "Green Universal Compost", "item.tfg.etching_diamond_tip": "Etching Diamond Tip", @@ -556,6 +563,20 @@ "material.tfg.chloryl_fluoride": "Chloryl Fluoride", "material.tfg.chlorine_pentafluoride": "Chlorine Pentafluoride", "material.tfg.solar_coolant": "Solar Coolant", + "material.tfg.sodium_hydride": "Sodium Hydride", + "material.tfg.boric_acid": "Boric Acid", + "material.tfg.trimethyl_borate": "Trimethyl Borate", + "material.tfg.sodium_borohydride": "Sodium Borohydride", + "material.tfg.sodium_methoxide": "Sodium Methoxide", + "material.tfg.ammonia_borane": "Ammonia Borane", + "material.tfg.aniline": "Aniline", + "material.tfg.dimethyl_carbonate": "Dimethyl Carbonate", + "material.tfg.methyl_phenylcarbamate": "Methyl N-Phenylcarbamate", + "material.tfg.methylene_diphenyl_dicarbamate": "Methylene Diphenyl-4,4'-dicarbamate", + "material.tfg.methylene_diphenyl_diisocyanate": "Methylene Diphenyl-4,4'-diisocyanate", + "material.tfg.tmos": "Tetramethoxysilane", + "material.tfg.silica_gel": "Silica Gel", + "material.tfg.soaked_silica_gel": "Acetone Soaked Silica Gel", "material.tfg.nuclear_residue": "Nuclear Residue", "material.tfg.oxidized_nuclear_residue": "Oxidized Nuclear Residue", "material.tfg.refined_nuclear_residue": "Refined Nuclear Residue", diff --git a/kubejs/assets/tfg/models/item/aes_compressed_wool.json b/kubejs/assets/tfg/models/item/aes_compressed_wool.json index bc97a0aea..06e9c9dce 100644 --- a/kubejs/assets/tfg/models/item/aes_compressed_wool.json +++ b/kubejs/assets/tfg/models/item/aes_compressed_wool.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "tfg:item/aes_compressed_wool" + "layer0": "tfg:item/t2_rocket/aes_compressed_wool" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/aes_insulation_roll.json b/kubejs/assets/tfg/models/item/aes_insulation_roll.json index 34631a112..be928b0b0 100644 --- a/kubejs/assets/tfg/models/item/aes_insulation_roll.json +++ b/kubejs/assets/tfg/models/item/aes_insulation_roll.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "tfg:item/aes_insulation_roll" + "layer0": "tfg:item/t2_rocket/aes_insulation_roll" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/aes_insulation_sheet.json b/kubejs/assets/tfg/models/item/aes_insulation_sheet.json index c7c19c8db..a434dd5ec 100644 --- a/kubejs/assets/tfg/models/item/aes_insulation_sheet.json +++ b/kubejs/assets/tfg/models/item/aes_insulation_sheet.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "tfg:item/aes_insulation_sheet" + "layer0": "tfg:item/t2_rocket/aes_insulation_sheet" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/aes_polyurethane.json b/kubejs/assets/tfg/models/item/aes_polyurethane.json new file mode 100644 index 000000000..092360dea --- /dev/null +++ b/kubejs/assets/tfg/models/item/aes_polyurethane.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/t3_rocket/aes_polyurethane" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/aes_wool.json b/kubejs/assets/tfg/models/item/aes_wool.json index f37e1abed..51333ee88 100644 --- a/kubejs/assets/tfg/models/item/aes_wool.json +++ b/kubejs/assets/tfg/models/item/aes_wool.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "tfg:item/aes_wool" + "layer0": "tfg:item/t2_rocket/aes_wool" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/better_space_suit_fabric.json b/kubejs/assets/tfg/models/item/better_space_suit_fabric.json new file mode 100644 index 000000000..cbffac1fb --- /dev/null +++ b/kubejs/assets/tfg/models/item/better_space_suit_fabric.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/t3_rocket/better_space_suit_fabric" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/elite_power_thruster.json b/kubejs/assets/tfg/models/item/elite_power_thruster.json new file mode 100644 index 000000000..7100cd2d8 --- /dev/null +++ b/kubejs/assets/tfg/models/item/elite_power_thruster.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/t3_rocket/elite_power_thruster" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/mli_shielding.json b/kubejs/assets/tfg/models/item/mli_shielding.json new file mode 100644 index 000000000..03c363233 --- /dev/null +++ b/kubejs/assets/tfg/models/item/mli_shielding.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/t3_rocket/mli_shielding" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/rocket_cone_t2.json b/kubejs/assets/tfg/models/item/rocket_cone_t2.json index ec0983ebc..80a1f998e 100644 --- a/kubejs/assets/tfg/models/item/rocket_cone_t2.json +++ b/kubejs/assets/tfg/models/item/rocket_cone_t2.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "tfg:item/rocket_cone_t2" + "layer0": "tfg:item/t2_rocket/rocket_cone_t2" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/rocket_cone_t3.json b/kubejs/assets/tfg/models/item/rocket_cone_t3.json new file mode 100644 index 000000000..277d977ac --- /dev/null +++ b/kubejs/assets/tfg/models/item/rocket_cone_t3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/t3_rocket/rocket_cone_t3" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/rocket_fin_t2.json b/kubejs/assets/tfg/models/item/rocket_fin_t2.json index d8b03592e..8a0c8703a 100644 --- a/kubejs/assets/tfg/models/item/rocket_fin_t2.json +++ b/kubejs/assets/tfg/models/item/rocket_fin_t2.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "tfg:item/rocket_fin_t2" + "layer0": "tfg:item/t2_rocket/rocket_fin_t2" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/rocket_fin_t3.json b/kubejs/assets/tfg/models/item/rocket_fin_t3.json new file mode 100644 index 000000000..ffeacfe5b --- /dev/null +++ b/kubejs/assets/tfg/models/item/rocket_fin_t3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/t3_rocket/rocket_fin_t3" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/silica_aerogel.json b/kubejs/assets/tfg/models/item/silica_aerogel.json new file mode 100644 index 000000000..27555ea07 --- /dev/null +++ b/kubejs/assets/tfg/models/item/silica_aerogel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/t3_rocket/silica_aerogel" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/aes_insulation_sheet.png b/kubejs/assets/tfg/textures/item/aes_insulation_sheet.png deleted file mode 100644 index 6145f35188a7822fefcf5e9f468dddc53ef92139..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 864 zcmV-m1E2hfP)EX>4Tx04R}tkv&MmKpe$iQ>7}EB6bjQ$WWc^q9Tr^ibb$c+6t{Ym|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jf7n~Gbq{ROvg%&X$9QWhhy~o`>3QNXu~_P2xrE-VBZ{g~zL0ZS z;k?CJt=3ulp8SQug0_<3I?XX8u!JO15Fw+E3aYRWrBx%vM4I;F9{y3spCXq`t_m1A z7Epr<$?=2#!S8O(;`Ef86pRDCFSh+L4g_|AR>QWxk8Qhk0{EYSE3MlCf&SKp4k=CmbXo z5p8g=h@ILktKeGb(*z$NOL55q1mD0XaB%Dv1eXqWaI!-Og>n=;0uf`lP6yo! zcfTKZ-+gc+(KIqtq;?DLJ@qOjwOeqSq*O_2*Wmn^W7locB&F4E5k!Hh6hza=wC~$! zrP+LL$d5VMJ_Dft(!VGv1wj;;=3NuJZX+#8qt)QBKOilM$qi|eUX;`d*c*5_u7g$@ zyKdvS4r-$Sa9oG&*A}fb-oQJPh#(3~=b=OQu}hky<-3by`wVHxa=oaR^CjUh6yo#- zr-vNZDTP{Tq$SU!0IT;E;}~es;JWx7;gkqP`XD zk2T}hvH0_i;V=}-`Lg_l0tC=X1DwGZ2PqteBA&%aOO~B4B#XDj84Mt0000Vy~o diff --git a/kubejs/assets/tfg/textures/item/aes_compressed_wool.png b/kubejs/assets/tfg/textures/item/t2_rocket/aes_compressed_wool.png similarity index 100% rename from kubejs/assets/tfg/textures/item/aes_compressed_wool.png rename to kubejs/assets/tfg/textures/item/t2_rocket/aes_compressed_wool.png diff --git a/kubejs/assets/tfg/textures/item/aes_insulation_roll.png b/kubejs/assets/tfg/textures/item/t2_rocket/aes_insulation_roll.png similarity index 100% rename from kubejs/assets/tfg/textures/item/aes_insulation_roll.png rename to kubejs/assets/tfg/textures/item/t2_rocket/aes_insulation_roll.png diff --git a/kubejs/assets/tfg/textures/item/t2_rocket/aes_insulation_sheet.png b/kubejs/assets/tfg/textures/item/t2_rocket/aes_insulation_sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..8aed0433661bd79ee785eab08a6c9759d602960b GIT binary patch literal 822 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 M07*qoM6N<$g2)D(L;wH) literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/t3_rocket/rocket_cone_t3.png b/kubejs/assets/tfg/textures/item/t3_rocket/rocket_cone_t3.png new file mode 100644 index 0000000000000000000000000000000000000000..3f805bec52429df1705fb37cd2b224de890a9fb7 GIT binary patch literal 787 zcmV+u1MK{XP)EX>4Tx04R}tkv&MmKpe$iQ>7x6B6g7CkfAzR1Ql_VDi*;)X)CnqU~=gfG-*gu zTpR`0f`cE6RRe3JS*_Mt`=0!T!GgAu;X2I`B(Q`eQV=1djtZ)<5TjKi#YCF+;~xHq<4=)GCRYWF z91EyHh2;3b|KNAGW^roLO$x?=-WS{c7zF~mK&xTf-^aGyIsyF8z?IhV*P6iWC+Urj z7Ciz&+rY(jN0aw}%N=0&NtX=Ck^D4;Vi9;hqi@OsL$^Txn%i4@AEysMmbzNL0S*p< zu@Yskd%U}^ySIPOwEO!3*eP<)Sh+X_00006VoOIv0MY=`0MhKH#ozz{010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=?5AVHzQe8QR@Hz02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{008SrL_t(I%bk~AK=d^RrIo};-Kv6%a+kQ~D+Du+Ezg3@@ zB?;62n*A7$a;`a}rO%Rt_vMPa)oJ%^v+=5~U^KJu7Xi>h)D=9hc#+avY6o~Il+IEZ zt-Vry2Eg|ouP1P|YZT_%-Oo`NtvxFjg}LSCT@)tUE)pFLtT(%t7)wYj;R!_=5KG8> zF#$j%LL_4PH%!m6fhPfj@6Q~-d@(r+IyCOhKfhn;$8!F#)=SsA8V`+oZ2>AnWFg=t RM-c!3002ovPDHLkV1n5`Qz`%e literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/t3_rocket/rocket_fin_t3.png b/kubejs/assets/tfg/textures/item/t3_rocket/rocket_fin_t3.png new file mode 100644 index 0000000000000000000000000000000000000000..65b3940d7c7a926ac702f64fee75e0a410aa26ea GIT binary patch literal 821 zcmV-51Iqk~P)EX>4Tx04R}tkv&MmKpe$iQ>7x6B6g7CkfAzR1Ql_VDi*;)X)CnqU~=gfG-*gu zTpR`0f`cE6RRe3JS*_Mt`=0!T!GgAu;X2I`B(Q`eQV=1djtZ)<5TjKi#YCF+;~xHq<4=)GCRYWF z91EyHh2;3b|KNAGW^roLO$x?=-WS{c7zF~mK&xTf-^aGyIsyF8z?IhV*P6iWC+Urj z7Ciz&+rY(jN0aw}%N=0&NtX=Ck^D4;Vi9;hqi@OsL$^Txn%i4@AEysMmbzNL0S*p< zu@Yskd%U}^ySIPOwEO!3*eP<)Sh+X_00006VoOIv0MY=`0MhKH#ozz{010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=?5AVH5xQ$yI}wT02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{009k2L_t(I%e9lgPQx$|hrdSMVw#F2QHCO=h_NW@hJ=JF zWyr!K3~p0m#EF3*$m()PEuznxB2eA-<^GD_)m+YM8;7fO*umo zJP#M@D3_1-gRVTQ5B}P$n1>4vbuu);56e47C#L}X`C6R}OfZ1&1r+6uX)ps|yZxjt zV)a#4_OX5iz;!2FU)@SgAdV90x)ZH((}X>)M5e*460rb^a@VSyHnnISR_+G%~d#(Ay%bQBXI7S7(ygfA+M=B8^99bd(0eQ>jrqy5+)d)EX>4Tx04R}tkv&MmKpe$iQ>7vm1v`j3WT=8*9aO}zRIvyaN?V~-2a`)bgeDD1 zii@M*T5#}VvFhOBtgC~oAP9bdxC>5-E>hzEl0u6Z503ls?%w0>9U#=pOf@^AfT~$W zDjpNFxfL<+iU5YthcQe@%+wR%=pg zmd<&fIK)blLVQjlA>>?i59 zmKHt&dbfd#>y{?(0hc?#z>_W+k|X(P3WWmjen#Jv1Nv`)?p3$9<~~jzfDCoDbORh5 z0;5IBUh{Z&S9@>&o@w^?0~Vul=z74)O#lD@24YJ`L;%tN(g4!zrp4d@000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2k8eJ5HSOb)fpTB000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0003!Nkl}_D~YPENCu%`GE->3z5ww2bWgon5h}p2+oNDvOvYnE)tZCb zQwW0~Y25Fi878Wx<(KG(fNBv2Q*^_mH5P=yG-+m-jNaceIF2IxUN`T8u1GLUT7Ckq zubF(rFzk1hTAXe38#sB~S07*qoM6N<$f^89c>i_@% literal 0 HcmV?d00001 diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 1788dc199..14dcf1dcd 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -99,10 +99,11 @@ const registerAdAstraRecipes = (event) => { //#endregion + //region tier 2 rocket DISABLED UNTIL EV event.remove({ mod: 'gtceu', input: 'gtceu:hot_rocket_alloy_t2_ingot' }) - /* +/* event.recipes.gtceu.mixer('tfg:rocket_alloy_t2') .itemInputs('19x #forge:dusts/titanium', '3x #forge:small_dusts/chromium', '3x #forge:small_dusts/tin', '3x #forge:small_dusts/aluminium') .inputFluids(Fluid.of('gtceu:vanadium', 540)) @@ -111,7 +112,7 @@ const registerAdAstraRecipes = (event) => { .circuit(5) .EUt(GTValues.VA[GTValues.EV]) - event.recipes.gtceu.vacuum_freezer('tfg:vacuum_freezer/cool_rocket_alloy_t2_alloy') + event.recipes.gtceu.vacuum_freezer('tfg:vacuum_freezer/cool_rocket_alloy_t2') .itemInputs('#forge:hot_ingots/rocket_alloy_t2') .inputFluids(Fluid.of('gtceu:distilled_water', 500), Fluid.of('tfg:cryogenized_fluix', 288)) .itemOutputs('#forge:ingots/rocket_alloy_t2') @@ -119,18 +120,21 @@ const registerAdAstraRecipes = (event) => { .EUt(GTValues.VA[GTValues.HV]) event.recipes.gtceu.assembler('tfg:rocket_fin_t2') - .itemInputs('#forge:plates/rocket_alloy_t2', '#forge:double_plates/titanium') + .itemInputs('#forge:plates/rocket_alloy_t2', + '#forge:double_plates/titanium') .itemOutputs('tfg:rocket_fin_t2') .duration(180) .circuit(3) .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.assembler('tfg:rocket_cone_t2') - .itemInputs('gtceu:ev_emitter', '#forge:dense_plates/rocket_alloy_t2', '#forge:double_plates/titanium', '#forge:double_plates/desh') + .itemInputs('gtceu:ev_emitter', '#forge:dense_plates/rocket_alloy_t2', '#forge:double_plates/titanium', + '#forge:double_plates/desh') .itemOutputs('tfg:rocket_cone_t2') .duration(1440) .circuit(3) .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.assembler('tfg:rocket_desh_engine') .itemInputs( @@ -159,12 +163,96 @@ const registerAdAstraRecipes = (event) => { .duration(1440) .circuit(3) .EUt(GTValues.VA[GTValues.EV]) - */ //#endregion - - //#region space suits + //region Tier 3 DISABLED UNTIL IV + event.remove({ id: "gtceu:vacuum_freezer/cool_hot_rocket_alloy_t3_ingot" }) + event.remove({ id: "gtceu:vacuum_freezer/rocket_alloy_t3" }) + /* + event.recipes.gtceu.vacuum_freezer('tfg:cool_rocket_alloy_t3') + .inputFluids(Fluid.of('gtceu:molten_rocket_alloy_t3', 144), Fluid.of('gtceu:ice', 4000)) + .notConsumable('gtceu:ingot_casting_mold') + .itemOutputs('#forge:ingots/rocket_alloy_t3') + .duration(800) + .EUt(GTValues.VA[GTValues.HV]) + event.recipes.gtceu.vacuum_freezer('tfg:cool_hot_rocket_alloy_t3') + .itemInputs('#forge:hot_ingots/rocket_alloy_t3') + .inputFluids(Fluid.of('gtceu:liquid_helium', 500)) + .itemOutputs('#forge:ingots/rocket_alloy_t3') + .outputFluids(Fluid.of('gtceu:helium', 250)) + .duration(400) + .EUt(GTValues.VA[GTValues.HV]) + + //Add some unique cooling thing for molten ingots + + event.recipes.gtceu.assembler('tfg:rocket_fin_t3') + .itemInputs('#forge:plates/rocket_alloy_t3', '#forge:double_plates/tungsten_steel') + .itemOutputs('tfg:rocket_fin_t3') + .duration(220) + .circuit(4) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.assembler('tfg:rocket_cone_t3') + .itemInputs('gtceu:iv_emitter', '#forge:dense_plates/rocket_alloy_t3', '#forge:double_plates/tungsten_steel', + '#forge:double_plates/ostrum', 'gtceu:plutonium_nugget') //change this to the pellet + .itemOutputs('tfg:rocket_cone_t3') + .duration(1700) + .circuit(4) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.assembler('tfg:elite_power_thruster') + .itemInputs('gtceu:ev_electric_motor', '2x #forge:rings/titanium', '#forge:rods/titanium', + 'gtceu:ultimet_rotor', '2x gtceu:aluminium_single_cable') + .itemOutputs('tfg:elite_power_thruster') + .duration(200) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.assembler('tfg:rocket_ostrum_engine') + .itemInputs( + '6x #forge:double_plates/tungsten_steel', + '4x #gtceu:circuits/iv', + 'gtceu:iv_electric_pump', + '3x tfg:elite_power_thruster', + '4x #forge:insulation_t3/cryo', + '6x #forge:rods/magnetic_neodymium', + '#forge:rotors/tungsten_steel') + .inputFluids(Fluid.of('gtceu:ostrum', 144 * 16)) + .itemOutputs('ad_astra:ostrum_engine') + .duration(960) + .circuit(4) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.assembler('tfg:rocket_ostrum_tank') + .itemInputs( + '4x #forge:double_plates/rocket_alloy_t3', + 'gtceu:iv_electric_pump', + 'tfg:elite_power_thruster', + '2x #forge:insulation_t3/cryo') + .inputFluids(Fluid.of('gtceu:ostrum', 144 * 4)) + .itemOutputs('ad_astra:ostrum_tank') + .duration(400) + .circuit(4) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.assembler('ad_astra:tier_3_rocket') + .itemInputs( + '16x #forge:dense_plates/rocket_alloy_t3', + '4x tfg:rocket_fin_t3', + '1x ad_astra:ostrum_engine', + '2x ad_astra:ostrum_tank', + '1x tfg:rocket_cone_t3', + '8x #forge:insulation_t3/sheet' + ) + .inputFluids(Fluid.of('gtceu:bromine', 1000 * 16)) + .itemOutputs('ad_astra:tier_3_rocket') + .duration(1700) + .circuit(4) + .EUt(GTValues.VA[GTValues.IV]) + + //#endregion +*/ + //#region space suits NETHERITE STUFF DISABLED UNTIL IV event.recipes.gtceu.forming_press('space_suit_fabric') .itemInputs( @@ -176,7 +264,17 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('2x tfg:space_suit_fabric') .duration(20 * 10) .EUt(GTValues.VA[GTValues.HV]) - + /* + event.recipes.gtceu.forming_press('better_space_suit_fabric') + .itemInputs( + 'gtceu:carbon_fiber_mesh', + '#forge:aerogels', + 'tfc:wool'//replace with glacian wool + ) + .itemOutputs('2x tfg:better_space_suit_fabric') + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) +*/ event.shaped('ad_astra:space_helmet', [ 'AAA', 'ADA', @@ -186,18 +284,18 @@ const registerAdAstraRecipes = (event) => { B: 'tfg:space_suit_fabric', D: '#forge:small_fluid_pipes/polyethylene' }).id('tfg:space_helmet') - - //event.recipes.gtceu.assembler('ad_astra:netherite_space_helmet') - // .itemInputs( - // 'ad_astra:space_helmet', - // '3x #forge:plates/titanium_tungsten_carbide', - // '3x #forge:plates/polyphenylene_sulfide', - // '5x gtceu:laminated_glass' - // ) - // .itemOutputs('ad_astra:netherite_space_helmet') - // .duration(400) - // .EUt(GTValues.VA[GTValues.IV]) - +/* + event.recipes.gtceu.assembler('ad_astra:netherite_space_helmet') + .itemInputs( + 'ad_astra:space_helmet', + '3x #forge:plates/tungsten_steel', + '3x tfg:better_space_suit_fabric', + '5x gtceu:laminated_glass' + ) + .itemOutputs('ad_astra:netherite_space_helmet') + .duration(400) + .EUt(GTValues.VA[GTValues.IV]) +*/ event.shaped('ad_astra:space_suit', [ 'B B', 'BDB', @@ -206,13 +304,13 @@ const registerAdAstraRecipes = (event) => { B: 'tfg:space_suit_fabric', D: 'ad_astra:oxygen_gear' }).id('tfg:space_suit') - - //event.recipes.gtceu.assembler('ad_astra:netherite_space_suit') - // .itemInputs('ad_astra:space_suit', '4x #forge:plates/titanium_tungsten_carbide', '4x #forge:plates/polyphenylene_sulfide') - // .itemOutputs('ad_astra:netherite_space_suit') - // .duration(400) - // .EUt(GTValues.VA[GTValues.IV]) - +/* + event.recipes.gtceu.assembler('ad_astra:netherite_space_suit') + .itemInputs('ad_astra:space_suit', '5x #forge:plates/tungsten_steel','5x tfg:better_space_suit_fabric') + .itemOutputs('ad_astra:netherite_space_suit') + .duration(400) + .EUt(GTValues.VA[GTValues.IV]) +*/ event.shaped('ad_astra:space_pants', [ 'BAB', 'B B', @@ -221,13 +319,13 @@ const registerAdAstraRecipes = (event) => { A: 'gtceu:hv_electric_motor', B: 'tfg:space_suit_fabric', }).id('tfg:space_pants') - - //event.recipes.gtceu.assembler('ad_astra:netherite_space_pants') - // .itemInputs('ad_astra:space_pants', '4x #forge:plates/titanium_tungsten_carbide', '4x #forge:plates/polyphenylene_sulfide') - // .itemOutputs('ad_astra:netherite_space_pants') - // .duration(400) - // .EUt(GTValues.VA[GTValues.IV]) - +/* + event.recipes.gtceu.assembler('ad_astra:netherite_space_pants') + .itemInputs('ad_astra:space_pants', '4x #forge:plates/tungsten_steel', '4x tfg:better_space_suit_fabric') + .itemOutputs('ad_astra:netherite_space_pants') + .duration(400) + .EUt(GTValues.VA[GTValues.IV]) +*/ event.shaped('ad_astra:space_boots', [ 'B B', 'A A' @@ -235,13 +333,13 @@ const registerAdAstraRecipes = (event) => { A: '#forge:plates/polyphenylene_sulfide', B: 'tfg:space_suit_fabric' }).id('tfg:space_boots') - - //event.recipes.gtceu.assembler('ad_astra:netherite_space_boots') - // .itemInputs('ad_astra:space_boots', '2x #forge:plates/titanium_tungsten_carbide', '2x #forge:plates/polyphenylene_sulfide') - // .itemOutputs('ad_astra:netherite_space_boots') - // .duration(400) - // .EUt(GTValues.VA[GTValues.IV]) - +/* + event.recipes.gtceu.assembler('ad_astra:netherite_space_boots') + .itemInputs('ad_astra:space_boots', '2x #forge:plates/tungsten_steel', '2x tfg:better_space_suit_fabric') + .itemOutputs('ad_astra:netherite_space_boots') + .duration(400) + .EUt(GTValues.VA[GTValues.IV]) +*/ event.shaped('ad_astra:oxygen_gear', [ 'BAB', @@ -299,7 +397,7 @@ const registerAdAstraRecipes = (event) => { 'ADA' ], { A: '#forge:rods/magnetic_neodymium', - B: 'gtceu:ev_field_generator', + B: 'gtceu:mv_field_generator', C: '#forge:plates/titanium', D: 'gtceu:ev_polarizer', }).id('tfg:gravity_normalizer') diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index eb691ca42..aef602199 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -11,6 +11,7 @@ const registerAdAstraFluidTags = (event) => { // Using this to represent 'breathable air' instead of oxygen event.removeAllTagsFrom('ad_astra:oxygen') + event.removeAll('ad_astra:fuel') event.removeAll('ad_astra:efficient_fuel') @@ -45,6 +46,8 @@ const registerAdAstraItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', item) }) + + event.add('forge:cobblestone', 'ad_astra:moon_cobblestone') event.add('forge:cobblestone', 'ad_astra:mars_cobblestone') event.add('forge:cobblestone', 'ad_astra:venus_cobblestone') @@ -58,10 +61,21 @@ const registerAdAstraItemTags = (event) => { //Insulation Tier 2 event.add('forge:insulation_t2/sheet', 'tfg:aes_insulation_sheet') event.add('forge:insulation_t2/roll', 'tfg:aes_insulation_roll') + + //Insulation Tier3 + event.add('forge:insulation_t3/foam', 'tfg:aes_polyurethane') + event.add('forge:insulation_t3/sheet', 'tfg:mli_shielding') + event.add('forge:insulation_t3/cryo', 'tfg:silica_aerogel') + + event.add('forge:aerogels', 'tfg:silica_aerogel') //Rocket Engines event.add('ad_astra:rocket_engine', 'ad_astra:steel_engine') event.add('ad_astra:rocket_engine', 'ad_astra:desh_engine') + event.add('ad_astra:rocket_engine', 'ad_astra:ostrum_engine') + + //Rocket Tank + event.add('ad_astra:rocket_tank', 'ad_astra:ostrum_tank') // Deco blocks const DECO_BLOCKS = [ 'iron', 'steel', 'desh', 'calorite', 'ostrum' ]; diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 14589029e..56ecc2911 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -18,6 +18,7 @@ function removeGreateRecipes(event) { event.remove({ mod: 'greate', input: 'create:andesite_alloy' }); event.remove({ mod: 'greate', output: 'minecraft:bamboo_pressure_plate'}) + event.remove({ id: 'greate:shapeless/large_andesite_alloy_cogwheel_from_little' }) event.remove({ id: 'greate:shapeless/large_steel_cogwheel_from_little' }) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index c827de269..c1df5556d 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -451,18 +451,29 @@ function registerTFGMiscellaneousRecipes(event) { .duration(100) .EUt(GTValues.VA[GTValues.MV]) - event.recipes.gtceu.vacuum_freezer('tfg:vacuum_freezer/dry_ice') + event.recipes.gtceu.vacuum_freezer('tfg:vacuum_freezer/liq_co2') .inputFluids(Fluid.of('gtceu:carbon_dioxide', 1000)) + .outputFluids(Fluid.of('gtceu:liquid_carbon_dioxide', 1000)) + .duration(160) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.vacuum_freezer('tfg:vacuum_freezer/dry_ice') + .inputFluids(Fluid.of('gtceu:liquid_carbon_dioxide', 1000)) .notConsumable('gtceu:block_casting_mold') .itemOutputs('10x tfg:dry_ice') - .duration(100) - .EUt(GTValues.VA[GTValues.MV]) - - event.recipes.gtceu.chemical_reactor('tfg:chemical_reactor/decompress_dry_ice') - .outputFluids(Fluid.of('gtceu:carbon_dioxide', 100)) + .duration(60) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.fluid_heater('tfg:fluid_heater/decompress_liq_co2') .itemInputs('1x tfg:dry_ice') + .outputFluids(Fluid.of('gtceu:carbon_dioxide', 100)) + .duration(20) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.fluid_heater('tfg:fluid_heater/decompress_dry_ice') + .inputFluids(Fluid.of('gtceu:liquid_carbon_dioxide', 100)) + .outputFluids(Fluid.of('gtceu:carbon_dioxide', 100)) .duration(20) - .circuit(4) .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.mixer('tfg:clean_foil_pack') @@ -774,6 +785,42 @@ function registerTFGMiscellaneousRecipes(event) { .itemOutputs('gtceu:ev_sensor') .duration(100) .EUt(30) + + //quantum eye IV replacements + event.shaped('gtceu:iv_emitter', [ + 'ABC', + 'BDB', + 'CBA' + ], { + A: '#forge:single_cables/tungsten', + B: '#forge:rods/iridium', + C: '#gtceu:circuits/iv', + D: 'gtceu:quantum_eye' + }).id('gtceu:shaped/emitter_iv') + + event.recipes.gtceu.assembler('emitter_iv') + .itemInputs('gtceu:quantum_eye', '4x #forge:rods/iridium', '2x #gtceu:circuits/iv', '2x #forge:single_cables/tungsten') + .itemOutputs('gtceu:iv_emitter') + .circuit(1) + .duration(100) + .EUt(30) + + event.shaped('gtceu:iv_sensor', [ + 'A B', + 'AC ', + 'DAA' + ], { + A: '#forge:plates/tungsten_steel', + B: 'gtceu:quantum_eye', + C: '#forge:rods/iridium', + D: '#gtceu:circuits/iv', + }).id('gtceu:shaped/sensor_iv') + + event.recipes.gtceu.assembler('sensor_iv') + .itemInputs('gtceu:quantum_eye', '#forge:rods/iridium', '#gtceu:circuits/iv', '4x #forge:plates/tungsten_steel') + .itemOutputs('gtceu:ev_sensor') + .duration(100) + .EUt(30) // Temporary event.recipes.gtceu.chemical_bath('quantum_eye') @@ -923,6 +970,26 @@ function registerTFGMiscellaneousRecipes(event) { 'tfg:aes_insulation_roll' ]).id('tfg:shapeless/aes_insulation_sheet') + event.recipes.gtceu.electric_blast_furnace('smelt_aes_sheet') + .itemInputs('tfg:aes_insulation_sheet') + .inputFluids(Fluid.of('gtceu:helium', 200)) + .outputFluids(Fluid.of('tfg:molten_aes', 800)) + .chancedOutput('gtceu:ash_dust', 2500, 0) + .circuit(1) + .duration(140) + .blastFurnaceTemp(3000) + .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.electric_blast_furnace('smelt_aes_roll') + .itemInputs('tfg:aes_insulation_roll') + .inputFluids(Fluid.of('gtceu:helium', 1000)) + .itemOutputs('2x gtceu:ash_dust') + .outputFluids(Fluid.of('tfg:molten_aes', 7200)) + .circuit(9) + .duration(1000) + .blastFurnaceTemp(3000) + .EUt(GTValues.VA[GTValues.EV]) + //endregion + global.GTCEU_SUPERCONDUCTORS.forEach((type, index) => { const multiplier = index + 1 @@ -964,6 +1031,117 @@ function registerTFGMiscellaneousRecipes(event) { .circuit(4) .duration(800) .EUt(GTValues.VA[GTValues.MV]) + + //region ammonia borane + event.recipes.gtceu.chemical_reactor('tfg:sodium_hydride_synthesis') + .itemInputs('#forge:dusts/sodium') + .inputFluids(Fluid.of('gtceu:hydrogen', 1000)) + .itemOutputs('2x #forge:dusts/sodium_hydride') + .duration(400) + .EUt(GTValues.VA[GTValues.HV]) + event.recipes.gtceu.chemical_reactor('tfg:boric_acid_synthesis') + .itemInputs('#forge:dusts/borax') + .inputFluids(Fluid.of('gtceu:hydrochloric_acid', 2000)) + .itemOutputs('4x #forge:dusts/boric_acid', '2x #forge:dusts/salt') + .outputFluids(Fluid.of('minecraft:water', 5000)) + .duration(400) + .EUt(GTValues.VA[GTValues.HV]) + event.recipes.gtceu.chemical_reactor('tfg:trimethyl_borate_synthesis') + .itemInputs('#forge:dusts/boric_acid') + .inputFluids(Fluid.of('gtceu:methanol', 3000), Fluid.of('gtceu:sulfuric_acid', 100)) + .outputFluids(Fluid.of('tfg:trimethyl_borate', 1000), Fluid.of('minecraft:water', 3000)) + .duration(300) + .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.chemical_reactor('tfg:sodium_borohydride_synthesis') + .itemInputs('4x #forge:dusts/sodium_hydride') + .inputFluids(Fluid.of('tfg:trimethyl_borate', 1000)) + .itemOutputs('#forge:dusts/sodium_borohydride', '3x #forge:dusts/sodium_methoxide') + .duration(160) + .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.chemical_reactor('tfg:ammonia_borane_synthesis') + .itemInputs('#forge:dusts/sodium_borohydride', '#forge:dusts/ammonium_chloride') + .itemOutputs('#forge:dusts/ammonia_borane', '#forge:dusts/salt') + .outputFluids(Fluid.of('gtceu:hydrogen', 2000)) + .duration(100) + .EUt(GTValues.VA[GTValues.IV]) + //endregion + + //region polyurethane + event.recipes.gtceu.chemical_reactor('tfg:aniline_synthesis') + .inputFluids(Fluid.of('gtceu:nitrobenzene', 1000), Fluid.of('gtceu:hydrogen', 6000)) + .notConsumable('#forge:dusts/iron') + .outputFluids(Fluid.of('tfg:aniline', 1000), Fluid.of('minecraft:water', 2000)) + .duration(140) + .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.chemical_reactor('tfg:dimethyl_carbonate_synthesis') + .inputFluids(Fluid.of('gtceu:carbon_monoxide', 1000), Fluid.of('gtceu:oxygen', 500), Fluid.of('gtceu:methanol', 2000)) + .outputFluids(Fluid.of('tfg:dimethyl_carbonate', 1000), Fluid.of('minecraft:water', 1000)) + .duration(120) + .EUt(GTValues.VA[GTValues.HV]) + event.recipes.gtceu.chemical_reactor('tfg:methyl_phenylcarbamate_synthesis') + .inputFluids(Fluid.of('tfg:aniline', 1000), Fluid.of('tfg:dimethyl_carbonate', 1000)) + .outputFluids(Fluid.of('tfg:methyl_phenylcarbamate', 1000), Fluid.of('gtceu:methanol', 1000)) + .duration(200) + .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.chemical_reactor('tfg:mpc_synthesis') + .inputFluids(Fluid.of('tfg:methyl_phenylcarbamate', 2000), Fluid.of('gtceu:formaldehyde', 1000)) + .outputFluids(Fluid.of('tfg:methylene_diphenyl_dicarbamate', 1000), Fluid.of('minecraft:water', 1000)) + .duration(200) + .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.chemical_reactor('tfg:mpi_synthesis') + .inputFluids(Fluid.of('tfg:methylene_diphenyl_dicarbamate', 1000)) + .itemOutputs('#forge:dusts/methylene_diphenyl_diisocyanate') + .outputFluids(Fluid.of('gtceu:methanol', 2000)) + .duration(80) + .EUt(GTValues.VA[GTValues.IV]) + event.recipes.gtceu.mixer('tfg:aes_polyurethane_electric_only') + .itemInputs('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) + .EUt(GTValues.VA[GTValues.IV]) + //endregion + + //Aerogel + event.recipes.gtceu.chemical_reactor('tfg:tmos_synthesis') + .inputFluids(Fluid.of('tfg:dimethyl_carbonate', 2000)) + .itemInputs('#forge:dusts/silicon_dioxide') + .notConsumable('#forge:small_dusts/potassium_hydroxide') + .outputFluids(Fluid.of('tfg:tmos', 1000), Fluid.of('gtceu:carbon_dioxide', 2000)) + .duration(100) + .EUt(GTValues.VA[GTValues.IV]) + event.recipes.gtceu.chemical_reactor('tfg:tmos_hydrolysis') + .inputFluids(Fluid.of('tfg:tmos', 1000), Fluid.of('gtceu:distilled_water', 2000)) + .outputFluids(Fluid.of('gtceu:methanol', 4000)) + .itemOutputs('#forge:dusts/silicon_dioxide') + .duration(100) + .EUt(GTValues.VA[GTValues.MV]) + event.recipes.gtceu.large_chemical_reactor('tfg:silica_gel_synthesis') + .inputFluids(Fluid.of('tfg:tmos', 1000), Fluid.of('gtceu:ethanol', 2000), Fluid.of('gtceu:distilled_water', 500), + Fluid.of('gtceu:hydrochloric_acid', 100)) + .outputFluids(Fluid.of('tfg:silica_gel', 1000)) + .duration(300) + .EUt(GTValues.VA[GTValues.IV]) + event.recipes.gtceu.chemical_reactor('tfg:silica_gel_soaking') + .inputFluids(Fluid.of('tfg:silica_gel', 1000), Fluid.of('gtceu:acetone', 2000)) + .outputFluids(Fluid.of('tfg:soaked_silica_gel', 1000)) + .duration(400) + .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.large_chemical_reactor('tfg:silica_aerogel') + .inputFluids(Fluid.of('tfg:soaked_silica_gel', 1000), Fluid.of('gtceu:liquid_carbon_dioxide', 3000)) + .outputFluids(Fluid.of('gtceu:carbon_dioxide', 3000), Fluid.of('gtceu:acetone', 1000)) + .itemOutputs('tfg:silica_aerogel') + .duration(400) + .EUt(GTValues.VA[GTValues.IV]) + //endregion + + //Tier 3 insulation + event.recipes.gtceu.forming_press('tfg:mli_shielding') + .itemInputs('4x #forge:dusts/ammonia_borane', '2x tfg:aes_polyurethane', '4x gtceu:carbon_fiber_plate') + .itemOutputs('tfg:mli_shielding') + .duration(100) + .EUt(GTValues.VA[GTValues.IV]) + //endregion // Universal compost const COMPOST_COLORS = ['browns', 'greens']; diff --git a/kubejs/startup_scripts/ad_astra/constants.js b/kubejs/startup_scripts/ad_astra/constants.js index f3e8098af..7c891feb7 100644 --- a/kubejs/startup_scripts/ad_astra/constants.js +++ b/kubejs/startup_scripts/ad_astra/constants.js @@ -24,8 +24,6 @@ global.AD_ASTRA_DISABLED_ITEMS = 'ad_astra:fan', 'ad_astra:steel_tank', 'ad_astra:desh_tank', - 'ad_astra:ostrum_tank', - 'ad_astra:calorite_tank', 'ad_astra:ice_shard', 'ad_astra:oxygen_bucket', 'ad_astra:hydrogen_bucket', @@ -79,23 +77,30 @@ global.AD_ASTRA_DISABLED_ITEMS = // Disabled until IV planets 'ad_astra:tier_3_rocket', + 'ad_astra:ostrum_engine', + 'ad_astra:ostrum_tank', + 'tfg:rocket_fin_t3', + 'tfg:rocket_cone_t3', + 'tfg:elite_power_thruster', + 'tfg:better_space_suit_fabric', 'ad_astra:netherite_space_helmet', 'ad_astra:netherite_space_suit', 'ad_astra:netherite_space_pants', 'ad_astra:netherite_space_boots', - 'ad_astra:ostrum_engine', + // Disabled until LuV planet 'ad_astra:glacio_globe', // maybe 'ad_astra:tier_4_rocket', + 'ad_astra:calorite_engine', + 'ad_astra:calorite_tank', 'ad_astra:jet_suit_helmet', 'ad_astra:jet_suit', 'ad_astra:jet_suit_pants', - 'ad_astra:jet_suit_boots', - 'ad_astra:calorite_engine' + 'ad_astra:jet_suit_boots' ]; global.AD_ASTRA_DISABLED_FLUIDS = diff --git a/kubejs/startup_scripts/ad_astra/materials.js b/kubejs/startup_scripts/ad_astra/materials.js index 46bdbcbce..f9282a9fd 100644 --- a/kubejs/startup_scripts/ad_astra/materials.js +++ b/kubejs/startup_scripts/ad_astra/materials.js @@ -35,17 +35,21 @@ const registerAdAstraMaterials = (event) => { GTMaterialFlags.DISABLE_ALLOY_BLAST ) - // mars? + // mars event.create('ostrum') - //.components('2x scheelite', '1x hematite', '1x rutile', '4x oxygen') + //.components('3x scheelite', '2x hematite', '2x thorium', '4x oxygen') .color(0xbd7980) .secondaryColor(0xA66C8D) .iconSet(GTMaterialIconSet.getByName('tfc_cassiterite')) - .ore() + .dust() .ingot() + .liquid() + .blastTemp(2900, 'mid', GTValues.VA[GTValues.HV]) .flags( GTMaterialFlags.FORCE_GENERATE_BLOCK, - GTMaterialFlags.GENERATE_PLATE + GTMaterialFlags.GENERATE_PLATE, + GTMaterialFlags.DISABLE_ALLOY_BLAST + ) // venus? diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 2dc3221dd..8be649bd8 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -230,6 +230,8 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Cupronickel.addFlags(GENERATE_BOLT_SCREW, GENERATE_RING); + GTMaterials.Ultimet.addFlags(GENERATE_ROTOR) + GTMaterials.Invar.addFlags(GENERATE_RING); GTMaterials.Magnalium.addFlags(GENERATE_RING); GTMaterials.TinAlloy.addFlags(GENERATE_RING); @@ -360,5 +362,6 @@ const registerGTCEuMaterialModification = (event) => { GTCEuAPI.materialManager.getMaterial('tfg:kaolinite').setFormula("Al2Si2O5(OH)4", true) GTCEuAPI.materialManager.getMaterial('tfg:vitrified_pearl').setFormula("(Al2Si2O5(OH)4)(BeK4N5)", true) + GTCEuAPI.materialManager.getMaterial('tfg:tmos').setFormula("Si(OCH3)4", true) } diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index bb9374ffe..4c2935fb2 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -72,7 +72,6 @@ GTCEuStartupEvents.registry('gtceu:dimension_marker', event => { registerTFGDimensionMarkers(event) }) - GTCEuStartupEvents.registry("gtceu:element", event => { registerTFGElement(event) }) diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 203c405e8..a1523170d 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -340,7 +340,7 @@ const registerTFGItems = (event) => { .translationKey('tfg:nitrocellulose') //endregion - //RockWool + //Tier2 Insulation event.create('tfg:aes_wool') .translationKey('tfg:aes_wool') event.create('tfg:aes_compressed_wool') @@ -353,9 +353,21 @@ const registerTFGItems = (event) => { //Tier 2 Rocket Parts event.create('tfg:rocket_fin_t2') - .translationKey('tfg:rocket_fin_t2') event.create('tfg:rocket_cone_t2') - .translationKey('tfg:rocket_cone_t2') + //endregion + + //Tier 3 Insulation + event.create('tfg:aes_polyurethane') + event.create('tfg:mli_shielding') + event.create('tfg:silica_aerogel') + //endregion + + //Tier 3 Rocket Parts + event.create('tfg:rocket_fin_t3') + event.create('tfg:rocket_cone_t3') + event.create('tfg:elite_power_thruster') + + event.create('tfg:better_space_suit_fabric') //endregion //#region Universal compost items diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index c8c2cea83..30c5ee7d5 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -51,7 +51,9 @@ const registerTFGMaterials = (event) => { .color(0x333e47) .iconSet('metallic') .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR) - .blastTemp(1760, 'low', 256, 1200) + .blastTemp(1760, 'low', 256, 900) +/* + event.create('rocket_alloy_t2') .ingot() @@ -59,8 +61,19 @@ const registerTFGMaterials = (event) => { .color(0x3c253d) .iconSet('metallic') .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR) - .blastTemp(4500, 'mid', 1024, 1200) + .blastTemp(3200, 'mid', 1024, 1100) + event.create('rocket_alloy_t3') + .ingot() + .components('8x titanium', '9x tungsten_steel', '2x tantalum', '2x radon') + .color(0x6c678b) + //.secondaryColor(0xa59fc6) + .liquid() + .removeHazard() + .iconSet('metallic') + .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR) + .blastTemp(4200, 'high', 4096, 1300) + */ event.create('vitrified_asbestos') .dust() .fluid() @@ -149,6 +162,11 @@ const registerTFGMaterials = (event) => { .color(0xEDFFB3) //end region + event.create('liquid_carbon_dioxide') + .liquid(100) //Not realistic but I want it to be cryogenic + .components('1x carbon', '2x oxygen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xDBFBFF) //Region Rockwool event.create('tfg:aes_mix') @@ -165,6 +183,84 @@ const registerTFGMaterials = (event) => { .color(0xe65609) .secondaryColor(0xe65609) //end region + + //Region Ammonia Borane + event.create('tfg:sodium_hydride') + .dust() + .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) + .components('1x sodium', '1x hydrogen') + .color(0xEDF5F3) + event.create('tfg:boric_acid') + .dust() + .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) + .components('3x hydrogen', '1x boron', '3x oxygen') + .color(0xDFEDDF) + .secondaryColor(0xDFEDDF) + event.create('tfg:trimethyl_borate') + .liquid() + .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) + .components('3x carbon', '9x hydrogen', '1x boron', '3x oxygen') + .color(0xF7F7F7) + event.create('tfg:sodium_borohydride') + .dust() + .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) + .components('1x sodium', '1x boron', '4x hydrogen') + .color(0xE8F1FF) + .secondaryColor(0xE8F1FF) + event.create('tfg:sodium_methoxide') + .dust() + .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) + .components('1x sodium', '1x oxygen', '1x carbon', '3x hydrogen') + .color(0xE8E5DF) + .secondaryColor(0xE8E5DF) + event.create('tfg:ammonia_borane') + .dust() + .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING, GTMaterialFlags.GENERATE_PLATE) + .components('1x ammonia', '1x boron', '3x hydrogen') + .color(0xCCE3E3) + .secondaryColor(0xCCE3E3) + //endregion + + //region polyurethane + event.create('tfg:aniline') + .liquid() + .components('6x carbon', '5x hydrogen', '1x nitrogen', '2x hydrogen') + .color(0xBAB999) + event.create('tfg:dimethyl_carbonate') + .liquid() + .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) + .components('3x carbon','6x hydrogen', '3x oxygen') + .color(0xFFFFF2) + event.create('tfg:methyl_phenylcarbamate') + .liquid() + .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) + .components('8x carbon','9x hydrogen','1x nitrogen', '2x oxygen') + .color(0xB4EDB4) + event.create('tfg:methylene_diphenyl_dicarbamate') + .liquid() + .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) + .components('17x carbon','18x hydrogen','2x nitrogen', '4x oxygen') + .color(0x69C2C1) + event.create('tfg:methylene_diphenyl_diisocyanate') + .dust() + .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) + .components('13x carbon','10x hydrogen','2x nitrogen', '2x oxygen') + .color(0xFFFFBA) + //endregion + + //region aerogel + event.create('tfg:tmos') + .liquid() + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xC2C6CC) + event.create('tfg:silica_gel') + .liquid() + .color(0x60BABF) + .secondaryColor(0xFFD38C) + event.create('tfg:soaked_silica_gel') + .liquid() + .color(0x9ED5D9) + //endregion //#region Bromine Line @@ -219,5 +315,4 @@ const registerTFGMaterials = (event) => { .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(293)) .color(0x82a6ce) .formula('HI') - }