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 000000000..1b2d3870a Binary files /dev/null and b/kubejs/assets/ad_astra/textures/entity/armor/netherite_space_suit.png differ diff --git a/kubejs/assets/ad_astra/textures/entity/rocket/tier_3_rocket.png b/kubejs/assets/ad_astra/textures/entity/rocket/tier_3_rocket.png new file mode 100644 index 000000000..134dbe1dd Binary files /dev/null and b/kubejs/assets/ad_astra/textures/entity/rocket/tier_3_rocket.png differ 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 000000000..57aac97e8 Binary files /dev/null and b/kubejs/assets/ad_astra/textures/item/netherite_space_boots.png differ diff --git a/kubejs/assets/ad_astra/textures/item/netherite_space_helmet.png b/kubejs/assets/ad_astra/textures/item/netherite_space_helmet.png new file mode 100644 index 000000000..272bf2624 Binary files /dev/null and b/kubejs/assets/ad_astra/textures/item/netherite_space_helmet.png differ diff --git a/kubejs/assets/ad_astra/textures/item/netherite_space_pants.png b/kubejs/assets/ad_astra/textures/item/netherite_space_pants.png new file mode 100644 index 000000000..68c2a314f Binary files /dev/null and b/kubejs/assets/ad_astra/textures/item/netherite_space_pants.png differ 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 000000000..4e1e26bfa Binary files /dev/null and b/kubejs/assets/ad_astra/textures/item/netherite_space_suit.png differ 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/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 6145f3518..000000000 Binary files a/kubejs/assets/tfg/textures/item/aes_insulation_sheet.png and /dev/null differ 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 000000000..8aed04336 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/t2_rocket/aes_insulation_sheet.png differ diff --git a/kubejs/assets/tfg/textures/item/aes_wool.png b/kubejs/assets/tfg/textures/item/t2_rocket/aes_wool.png similarity index 100% rename from kubejs/assets/tfg/textures/item/aes_wool.png rename to kubejs/assets/tfg/textures/item/t2_rocket/aes_wool.png diff --git a/kubejs/assets/tfg/textures/item/rocket_cone_t2.png b/kubejs/assets/tfg/textures/item/t2_rocket/rocket_cone_t2.png similarity index 100% rename from kubejs/assets/tfg/textures/item/rocket_cone_t2.png rename to kubejs/assets/tfg/textures/item/t2_rocket/rocket_cone_t2.png diff --git a/kubejs/assets/tfg/textures/item/rocket_fin_t2.png b/kubejs/assets/tfg/textures/item/t2_rocket/rocket_fin_t2.png similarity index 100% rename from kubejs/assets/tfg/textures/item/rocket_fin_t2.png rename to kubejs/assets/tfg/textures/item/t2_rocket/rocket_fin_t2.png diff --git a/kubejs/assets/tfg/textures/item/t3_rocket/aes_polyurethane.png b/kubejs/assets/tfg/textures/item/t3_rocket/aes_polyurethane.png new file mode 100644 index 000000000..823fa2dd1 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/t3_rocket/aes_polyurethane.png differ diff --git a/kubejs/assets/tfg/textures/item/t3_rocket/better_space_suit_fabric.png b/kubejs/assets/tfg/textures/item/t3_rocket/better_space_suit_fabric.png new file mode 100644 index 000000000..0d958cd23 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/t3_rocket/better_space_suit_fabric.png differ diff --git a/kubejs/assets/tfg/textures/item/t3_rocket/elite_power_thruster.png b/kubejs/assets/tfg/textures/item/t3_rocket/elite_power_thruster.png new file mode 100644 index 000000000..af7b7a29d Binary files /dev/null and b/kubejs/assets/tfg/textures/item/t3_rocket/elite_power_thruster.png differ diff --git a/kubejs/assets/tfg/textures/item/t3_rocket/mli_shielding.png b/kubejs/assets/tfg/textures/item/t3_rocket/mli_shielding.png new file mode 100644 index 000000000..8180e1d69 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/t3_rocket/mli_shielding.png differ 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 000000000..3f805bec5 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/t3_rocket/rocket_cone_t3.png differ 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 000000000..65b3940d7 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/t3_rocket/rocket_fin_t3.png differ diff --git a/kubejs/assets/tfg/textures/item/t3_rocket/silica_aerogel.png b/kubejs/assets/tfg/textures/item/t3_rocket/silica_aerogel.png new file mode 100644 index 000000000..8c61912fd Binary files /dev/null and b/kubejs/assets/tfg/textures/item/t3_rocket/silica_aerogel.png differ 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 a46918719..daf1ab7e2 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/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.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/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)) 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/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) 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') - }