Merge branch 'Theta-1-Main' into Theta-1-Quest-Lang

Author: trulyno

kubejs/assets/gtceu/lang/en_us.json

@@ -1445,6 +1445,23 @@
     "block.gtceu.exotic_tectonic_formation_apparatus": "Exotic Tectonic Formation Apparatus",
     "gtceu.exotic_rock_crushing": "Exotic Rock Crushing",
     "block.gtceu.exotic_tectonic_formation_apparatus.tooltip.0": "§7A machine that can create tectonic formations with unique properties, allowing for the extraction of rare resources and the creation of specialized environments.",
-    "block.gtceu.exotic_tectonic_formation_apparatus.tooltip.1": "Can only have §bone§r Energy Hatch"
-  
+    "block.gtceu.exotic_tectonic_formation_apparatus.tooltip.1": "Can only have §bone§r Energy Hatch",
+    "material.gtceu.ferrocene": "Ferrocene",
+    "material.gtceu.hexafluorophosphoric_acid": "Hexafluorophosphoric Acid",
+    "material.gtceu.iron_cyclopentadienyl_dichlorobenzene": "Iron Cyclopentadienyl Dichlorobenzene",
+    "material.gtceu.fluorinated_ferrocene": "Fluorinated Ferrocene",
+    "material.gtceu.ferrocenium_superoxide": "Ferrocenium Superoxide",
+    "material.gtceu.hydrazine": "Hydrazine",
+    "material.gtceu.ammonia_borane": "Ammonia Borane",
+    "material.gtceu.sorbitol_hypergolic_fuel": "Sorbitol Hypergolic Fuel",
+    "material.gtceu.fuming_nitric_acid": "Fuming Nitric Acid",
+    "material.gtceu.white_fuming_nitric_acid": "White Fuming Nitric Acid",
+    "material.gtceu.red_fuming_nitric_acid": "Red Fuming Nitric Acid",
+    "material.gtceu.monomethylhydrazine": "Monomethylhydrazine",
+    "material.gtceu.kerosene": "Kerosene",
+    "material.gtceu.rp_1": "RP-1",
+    "material.gtceu.hydrofined_kerosene": "Hydrofined Kerosene",
+    "material.gtceu.liquid_fluorine": "Liquid Fluorine",
+    "material.gtceu.dioxygen_difluoride": "Dioxygen Difluoride"
+    
 }

kubejs/client_scripts/common/addedByStarT.js

@@ -1,32 +1,31 @@
 global.addedByStarT = {
     machines: [
         'kiln', 'large_farm', 'large_barrel', 'large_stone_barrel', 'primitive_ore_factory', 'steam_ore_factory', 'latex_plantation',
-        'solid_blast_furnace', 'steam_kiln', 'high_pressure_steam_hammer', 'electric_ore_factory', 'mechanical_sieve', 'void_extractor',
-        'rock_filtrator', 'greenhouse', 'ore_processing_plant', 'industrial_barrel', 'large_sieve', 'composting_factory', 'hydroponic_garden',
-        'industrial_fishery', 'tree_synthesizer', 'large_me_assembler', 'dimensional_destabiliser', 'rock_sifter', 'void_excavator',
-        'chemical_plant', 'mega_abs', 't_large_bender', 't_large_centrifuge', 't_large_electrolyzer', 't_large_extruder',
+        'solid_blast_furnace', 'steam_kiln', 'high_pressure_steam_hammer', 'electric_ore_factory', 'mechanical_sieve', 'void_extractor', 
+        'rock_filtrator', 'greenhouse', 'ore_processing_plant', 'industrial_barrel', 'large_sieve', 'composting_factory', 'hydroponic_garden', 
+        'industrial_fishery', 'tree_synthesizer', 'large_me_assembler', 'dimensional_destabiliser', 'rock_sifter', 'void_excavator', 
+        'chemical_plant', 'mega_abs', 't_large_bender', 't_large_centrifuge', 't_large_electrolyzer', 't_large_extruder', 
         't_large_forming_press', 't_large_lathe', 't_large_macerator', 't_large_mixer', 't_large_ore_washer', 't_large_sifter',
-        't_large_thermal_centrifuge', 't_large_wiremill', 't_large_autoclave', 't_large_rock_crusher', 'bulk_ore_processing_array',
-        'folding_akreyrium_stabiliser', 'molten_destabiliser', 'component_nexus', 'cyclonic_sifter', 'injection_mixer',
-        'manifold_centrifuge', 'atomic_synthesis_plant', 'component_part_hub', 'draco_circuit_assembler', 'draco_infusion', 'cryostate_quantum_chiller',
-        'hellforge', 'fornaxs_infernal_rotary_engine', 'abyssal_harvester', 'abyssal_containment_room', 'dimensional_finder', 'gate_assembly', 'large_rotor_machine',
-        'ev_solar_cell', 'iv_solar_cell', 'luv_solar_cell', 'zpm_solar_cell', 'uv_solar_cell', 'uhv_solar_cell',
-        'ev_solar_panel', 'iv_solar_panel', 'luv_solar_panel', 'uv_solar_array', 'uhv_solar_array',
-        'large_quantum_compressor', 'runic_circuitry_assembling_station', 'runic_inscribe_manipulate', 'stargate_component_assembly',
-        'super_pressure_heat_chamber', 'omega_pressure_heat_chamber', 'super_compact_heat_chamber', 'heat_chamber', 'super_abs', 'super_cutter',
+        't_large_thermal_centrifuge', 't_large_wiremill', 't_large_autoclave', 't_large_rock_crusher', 'bulk_ore_processing_array', 
+        'folding_akreyrium_stabiliser', 'molten_destabiliser', 'fornaxs_infernal_rotary_engine', 'component_nexus', 'cyclonic_sifter', 'injection_mixer', 
+        'manifold_centrifuge', 'atomic_synthesis_plant', 'component_part_hub', 'draco_circuit_assembler', 'draco_infusion', 'cryostate_quantum_chiller', 
+        'hellforge', 'abyssal_harvester', 'abyssal_containment_room', 'dimensional_finder', 'gate_assembly', 'large_rotor_machine',
+        'ev_solar_cell', 'iv_solar_cell', 'luv_solar_cell', 'zpm_solar_cell', 'uv_solar_cell', 'uhv_solar_cell', 'ev_solar_panel', 'iv_solar_panel',
+        'luv_solar_panel', 'uv_solar_array', 'uhv_solar_array', 'large_quantum_compressor', 'runic_circuitry_assembling_station', 'runic_inscribe_manipulate', 
+        'stargate_component_assembly', 'super_pressure_heat_chamber', 'omega_pressure_heat_chamber', 'super_compact_heat_chamber', 'heat_chamber', 'super_abs', 'super_cutter', 
         'super_ebf', 'super_implosion_compressor', 'super_vacuum_freezer', 'super_electric_ore_factory', 'super_barrel', 'super_cracker', 'super_pyrolyse', 'super_gas_collector',
-        'aqueous_transformation_processing_center', 'ascendant_engraving_matrix', 'byteforce_unified_incomparable_logistics_depot',
-        'electro_magnetic_material_ripper', 'fermenting_arboreal_rejuvination_monstronsity', 'gravitational_compression_chamber', 'material_annihilation_array',
-        'molecular_inducing_xanadu', 'multithreaded_component_synthesis_forge', 'subatomic_particle_lattice_isolation_terminal', 'superior_particulate_isolation_nexus',
+        'aqueous_transformation_processing_center', 'ascendant_engraving_matrix', 'byteforce_unified_incomparable_logistics_depot', 'electro_magnetic_material_ripper', 
+        'fermenting_arboreal_rejuvination_monstronsity', 'gravitational_compression_chamber', 'material_annihilation_array', 'molecular_inducing_xanadu', 
+        'multithreaded_component_synthesis_forge', 'subatomic_particle_lattice_isolation_terminal', 'superior_particulate_isolation_nexus', 
         'yielding_excression_advanced_seperation_transformator', 'luv_fusion_reactor', 'zpm_fusion_reactor', 'uv_fusion_reactor', 'uhv_fusion_reactor', 'uev_fusion_reactor', 
-        'uiv_fusion_reactor', 'exotic_gas_siphon', 'ultimate_ebf', 'compact_assembly_line', 'supreme_plasma_turbine', 'vacuum_chemical_reaction_chamber', 
-        'dual_chambered_vacuum_complex', 'auroric_vacuum_isolation_reactor', 'advanced_synthesis_plant', 'nyinsane_plasma_turbine', 'ulv_barrel', 'ulv_stone_barrel', 
-        'ulv_advanced_composter', 'exotic_tectonic_formation_apparatus', 'primordial_infusion'
+        'uiv_fusion_reactor', 'exotic_gas_siphon', 'ultimate_ebf', 'compact_assembly_line', 'supreme_plasma_turbine', 'vacuum_chemical_reaction_chamber', 'dual_chambered_vacuum_complex', 
+        'auroric_vacuum_isolation_reactor', 'advanced_synthesis_plant', 'nyinsane_plasma_turbine', 'component_part_assembly', 'luv_combustion_module', 'zpm_combustion_module', 
+        'uv_combustion_module', 'uev_combustion_module', 'modular_combustion_frame', 'exotic_tectonic_formation_apparatus', 'ulv_barrel', 'ulv_stone_barrel', 'ulv_advanced_composter'
     ],
     isCore: [
-        'hellforge', 'fornaxs_infernal_rotary_engine', 'abyssal_harvester', 'abyssal_containment_room', 'luv_fusion_reactor', 'zpm_fusion_reactor', 'uv_fusion_reactor', 'uhv_fusion_reactor',
-        'uev_fusion_reactor', 'uiv_fusion_reactor', 'ev_solar_cell', 'iv_solar_cell', 'luv_solar_cell', 'zpm_solar_cell', 'uv_solar_cell', 'uhv_solar_cell', 'ev_solar_panel', 'iv_solar_panel',
-        'luv_solar_panel', 'uv_solar_array', 'uhv_solar_array'
+        'hellforge', 'abyssal_harvester', 'abyssal_containment_room', 'luv_fusion_reactor', 'zpm_fusion_reactor', 'uv_fusion_reactor', 'uhv_fusion_reactor', 'uev_fusion_reactor',
+        'uiv_fusion_reactor', 'ev_solar_cell', 'iv_solar_cell', 'luv_solar_cell', 'zpm_solar_cell', 'uv_solar_cell', 'uhv_solar_cell', 'ev_solar_panel', 'iv_solar_panel', 
+        'luv_solar_panel', 'uv_solar_array', 'uhv_solar_array', 'luv_combustion_module', 'zpm_combustion_module', 'uv_combustion_module', 'uev_combustion_module', 'modular_combustion_frame'
     ],
     modifiers: [
         'batch', 'paraBatch', 'subBatch', 'pocBatch', 'throughBatch', 'coilBatch', 'paraLayered', 'paraSubBatch', 'paraPocBatch', 'subThroughBatch', 'threadSubBatch', 'paraSubAssBatch',
@@ -36,20 +35,19 @@ global.addedByStarT = {
         'greenhouse', 'draco_infusion', 'luv_fusion_reactor', 'zpm_fusion_reactor', 'uv_fusion_reactor', 'uhv_fusion_reactor', 'uev_fusion_reactor', 'uiv_fusion_reactor', 'vacuum_chemical_reaction_chamber'
     ],
     paraBatch: [
-        'ore_processing_plant', 'large_sieve', 'large_me_assembler', 'rock_sifter', 'void_excavator',
+        'ore_processing_plant', 'large_sieve', 'large_me_assembler', 'rock_sifter', 'void_excavator', 
         'folding_akreyrium_stabiliser', 'molten_destabiliser', 'cyclonic_sifter', 'injection_mixer', 'manifold_centrifuge',
-        'large_quantum_compressor', 'runic_circuitry_assembling_station', 'exotic_gas_siphon', 'auroric_vacuum_isolation_reactor', 
-        'exotic_tectonic_formation_apparatus'
+        'large_quantum_compressor', 'runic_circuitry_assembling_station', 'exotic_gas_siphon', 'auroric_vacuum_isolation_reactor'
     ],
     subBatch: [
-        'industrial_barrel'
+        'industrial_barrel', 'component_part_assembly'
     ],
     pocBatch: [
-        't_large_bender', 't_large_centrifuge', 't_large_electrolyzer', 't_large_extruder', 't_large_forming_press', 't_large_lathe', 't_large_macerator',
+        't_large_bender', 't_large_centrifuge', 't_large_electrolyzer', 't_large_extruder', 't_large_forming_press', 't_large_lathe', 't_large_macerator', 
         't_large_mixer', 't_large_ore_washer', 't_large_sifter', 't_large_thermal_centrifuge', 't_large_wiremill', 't_large_autoclave', 't_large_rock_crusher'
     ],
     throughBatch: [
-        'super_cutter', 'super_electric_ore_factory', 'dual_chambered_vacuum_complex', 'dimensional_destabiliser'
+        'super_cutter', 'super_electric_ore_factory', 'dual_chambered_vacuum_complex', 'dimensional_destabiliser', 'exotic_tectonic_formation_apparatus'
     ],
     coilBatch: [
         'super_implosion_compressor'

kubejs/server_scripts/common/additions/multiblock_recipes/chemical_plant.js

@@ -71,7 +71,7 @@ ServerEvents.recipes(event => {
         .duration(1200);
 
     // === Chemical Skips ===
-    const getDataItem = (cwu) => (cwu >= 160) ? 'start_core:data_dna_disk' : (cwu >=32) ? 'gtceu:data_module' : 'gtceu:data_orb' ;
+    const getDataItem = global.getDataItem;
 
     const chemicalSkip = (recId, notConsumable, inputsI, inputsF, outputsI, outputsF, circuit, circuitNum, duration, cleanroomType, cwuT, voltage, researched) => {
 

kubejs/server_scripts/common/additions/progression/circuitry/circuit_parts.js

@@ -3,7 +3,7 @@ ServerEvents.recipes(event => {
     const id = global.id;
 
     const scalerMCSF = 32; //Should be 16n variant (cap64) //having from 64 given large quantities
-    const getDataItem = (cwu) => (cwu >= 160) ? 'start_core:data_dna_disk' : (cwu >=32) ? 'gtceu:data_module' : 'gtceu:data_orb' ;
+    const getDataItem = global.getDataItem;
 
 // === Living SMDs ===
     const livingSMD = (type, quantity, inputs, polymerAmount, cwu) => {

kubejs/server_scripts/common/additions/progression/components/component_parts.js

@@ -68,7 +68,7 @@ ServerEvents.recipes(event => {
 
         const b2exponentialMultiplier = (base) => base * (2 ** scaler);
         const scaled = (base) => base * scaler;
-        const getDataItem = (cwu) => (cwu >= 160) ? 'start_core:data_dna_disk' : (cwu >=32) ? 'gtceu:data_module' : 'gtceu:data_orb' ;
+        const getDataItem = global.getDataItem;
 
         const componentPart = (type, inputs, fluids, duration, researched) => {
 

kubejs/server_scripts/common/additions/progression/lines/combustion_lines.js

@@ -0,0 +1,136 @@
+ServerEvents.recipes(event => {
+    const id = global.id;
+
+    event.remove('gtceu:distillation_tower/distill_coal_tar');
+    event.remove('gtceu:mixer/rocket_fuel_from_oxygen');
+    event.remove('gtceu:mixer/rocket_fuel_from_dinitrogen_tetroxide');
+    event.remove('gtceu:combustion_generator/rocket_fuel');
+
+    event.recipes.gtceu.distillation_tower(id('distill_coal_tar'))
+        .inputFluids('gtceu:coal_tar 1000')
+        .outputFluids('gtceu:naphthalene 400', 'gtceu:creosote 200', 'gtceu:kerosene 175', 'gtceu:hydrogen_sulfide 125', 'gtceu:phenol 100')
+        .itemOutputs('1x gtceu:coke_dust')
+        .duration(80)
+        .EUt(GTValues.VA[GTValues.MV]);
+
+    event.recipes.gtceu.large_chemical_reactor(id('hydrofined_kerosene'))
+        .inputFluids('gtceu:kerosene 1000', 'gtceu:hydrogen 200')
+        .outputFluids('gtceu:hydrofined_kerosene 1000', 'gtceu:hydrogen_sulfide 200')
+        .duration(80)
+        .EUt(GTValues.VA[GTValues.MV]);
+
+    event.recipes.gtceu.distillation_tower(id('distill_hydrofined_kerosene'))
+        .inputFluids('gtceu:hydrofined_kerosene 500')
+        .outputFluids('gtceu:rp_1 350', 'gtceu:light_fuel 100', 'gtceu:refinery_gas 50')
+        .duration(100)
+        .EUt(GTValues.VA[GTValues.MV]);
+
+    event.recipes.gtceu.vacuum_freezer(id('liquid_flourine'))
+        .inputFluids('gtceu:fluorine 1000')
+        .outputFluids('gtceu:liquid_fluorine 1000')
+        .duration(240)
+        .EUt(GTValues.VA[GTValues.EV]);
+
+    event.recipes.gtceu.mixer(id('dioxygen_difluoride'))
+        .inputFluids('gtceu:liquid_oxygen 2000', 'gtceu:liquid_fluorine 2000')
+        .outputFluids('gtceu:dioxygen_difluoride 1000')
+        .duration(120)
+        .EUt(GTValues.VHA[GTValues.EV])
+
+    event.recipes.gtceu.fluid_heater(id('fuming_nitric_acid'))
+        .inputFluids('gtceu:nitration_mixture 1000')
+        .outputFluids('gtceu:fuming_nitric_acid 1000', 'gtceu:hydrogen_sulfide 1000')
+        .duration(160)
+        .EUt(GTValues.VA[GTValues.MV]);
+
+    event.recipes.gtceu.distillation_tower(id('white_fuming_nitric_acid'))
+        .inputFluids('gtceu:fuming_nitric_acid 1000')
+        .outputFluids('gtceu:white_fuming_nitric_acid 950', 'gtceu:nitrogen_dioxide 50')
+        .duration(120)
+        .EUt(GTValues.VA[GTValues.MV]);
+
+    event.recipes.gtceu.large_chemical_reactor(id('red_fuming_nitric_acid'))
+        .inputFluids('gtceu:white_fuming_nitric_acid 1000', 'gtceu:nitrogen_dioxide 150')
+        .outputFluids('gtceu:red_fuming_nitric_acid 1000')
+        .duration(160)
+        .EUt(GTValues.VA[GTValues.MV]);
+
+    event.recipes.gtceu.large_chemical_reactor(id('hydrazine'))
+        .inputFluids('gtceu:ammonia 2000', 'gtceu:hydrogen_peroxide 1000')
+        .outputFluids('gtceu:hydrazine 1000', 'water 2000')
+        .duration(160)
+        .EUt(GTValues.VA[GTValues.MV]);
+
+    event.recipes.gtceu.large_chemical_reactor(id('monomethylhydrazine'))
+        .inputFluids('gtceu:hydrazine 1000', 'gtceu:methylamine 1000')
+        .outputFluids('gtceu:monomethylhydrazine 1000', 'gtceu:ammonia 1000')
+        .duration(200)
+        .EUt(GTValues.VA[GTValues.MV])
+
+
+    event.recipes.gtceu.chemical_reactor(id('ammonium_chloride'))
+        .inputFluids('gtceu:hydrochloric_acid 1000', 'gtceu:ammonia 1000')
+        .itemOutputs('2x gtceu:ammonium_chloride_dust')
+        .duration(80)
+        .EUt(GTValues.VA[GTValues.LV]);
+
+    event.recipes.gtceu.chemical_reactor(id('ammonia_borane'))
+        .itemInputs('4x gtceu:sodium_borohydride_dust', '4x gtceu:ammonium_chloride_dust')
+        .itemOutputs('4x gtceu:ammonia_borane_dust', '4x gtceu:salt_dust')
+        .outputFluids('gtceu:hydrogen 1000')
+        .duration(120)
+        .EUt(GTValues.VA[GTValues.LV]);
+
+    event.recipes.gtceu.mixer(id('sorbitol_hypergolic_fuel'))
+        .inputFluids('gtceu:sorbitol 6000')
+        .itemInputs('1x gtceu:ammonia_borane_dust')
+        .outputFluids('gtceu:sorbitol_hypergolic_fuel 6000')
+        .duration(80)
+        .EUt(GTValues.VA[GTValues.LV]);
+
+    event.recipes.gtceu.large_chemical_reactor(id('hexafluorophosphoric_acid'))
+        .inputFluids('gtceu:phosphoric_acid 1000', 'gtceu:hydrofluoric_acid 1000', 'gtceu:fluorine 1000')
+        .outputFluids('gtceu:hexafluorophosphoric_acid 1000', 'water 2000')
+        .duration(160)
+        .EUt(GTValues.VA[GTValues.MV]);
+
+    event.recipes.gtceu.chemical_reactor(id('ferrocene'))
+        .inputFluids('gtceu:iron_ii_chloride 1000', 'gtceu:hydrogen 1000')
+        .itemInputs('10x gtceu:carbon_dust')
+        .outputFluids('gtceu:ferrocene 1000', 'gtceu:hydrochloric_acid 1000', 'water 1000')
+        .duration(160)
+        .EUt(GTValues.VA[GTValues.IV]);
+
+    event.recipes.gtceu.large_chemical_reactor(id('iron_cyclopentadienyl_dichlorobenzene'))
+        .inputFluids('gtceu:ferrocene 1000', 'gtceu:dichlorobenzene 1000', 'gtceu:hexafluorophosphoric_acid 1000')
+        .outputFluids('gtceu:iron_cyclopentadienyl_dichlorobenzene 1000', 'gtceu:hydrochloric_acid 1000', 'water 1000')
+        .duration(200)
+        .EUt(GTValues.VA[GTValues.LuV]);
+
+    event.recipes.gtceu.large_chemical_reactor(id('fluorinated_ferrocene'))
+        .inputFluids('gtceu:iron_cyclopentadienyl_dichlorobenzene 1000', 'gtceu:fluorine 1000')
+        .outputFluids('gtceu:fluorinated_ferrocene 1000', 'gtceu:dichlorobenzene 1000')
+        .duration(200)
+        .EUt(GTValues.VA[GTValues.LuV]);
+
+    event.recipes.gtceu.large_chemical_reactor(id('ferrocenium_superoxide'))
+        .inputFluids('gtceu:fluorinated_ferrocene 1000', 'gtceu:oxygen 1000')
+        .outputFluids('gtceu:ferrocenium_superoxide 1000')
+        .duration(200)
+        .EUt(GTValues.VA[GTValues.ZPM]);
+
+    event.recipes.gtceu.modular_rocket_module(id('rp_1'))
+        .inputFluids('gtceu:rp_1 1')
+        .duration(200)
+        .EUt(-32);
+
+    event.recipes.gtceu.modular_rocket_module(id('monomethylhydrazine'))
+        .inputFluids('gtceu:monomethylhydrazine 1')
+        .duration(400)
+        .EUt(-32);
+
+    event.recipes.gtceu.modular_rocket_module(id('sorbitol_hypergolic_fuel'))
+        .inputFluids('gtceu:sorbitol_hypergolic_fuel 1')
+        .duration(600)
+        .EUt(-32);
+});