Merge pull request #299 from StarT-Dev-Team/Eta-3-hf-2

Eta 3 hf 2

Author: trulyno

config/ftbquests/quests/chapters/draconic_age_part_1.snbt

@@ -1141,7 +1141,7 @@
 				item: "kubejs:coin"
 				type: "item"
 			}]
-			subtitle: "&74069x Parallel Hatch"
+			subtitle: "&74096x Parallel Hatch"
 			tasks: [{
 				id: "1A9F5B4EAFB66C03"
 				item: "start_core:uiv_parallel_hatch"

config/jei/blacklist.cfg

@@ -1698,6 +1698,7 @@ gtceu:netherrack_granitic_mineral_sand_ore
 gtceu:red_sand_olivine_ore
 xycraft_world:raw_aluminum
 woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:plutonium"}}
+gtceu:molten_polonium_flux_bucket
 gtceu:red_sand_zapolite_ore
 gtceu:silver_ore
 gtceu:endstone_tricalcium_phosphate_ore
@@ -4288,7 +4289,6 @@ woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:tungste
 gtceu:gravel_vanadium_magnetite_ore
 exdeorum:crimson_compressed_sieve
 thermal_extra:abyssal_block
-exnihilosequentia:tuff_hammer
 gtceu:granitic_mineral_sand_ore
 gtceu:red_granite_lazurite_ore
 gtceu:tuff_wulfenite_ore
@@ -4839,6 +4839,7 @@ woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:astrena
 thermal:light_oil_bucket
 woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:sulfuric_naphtha"}}
 thermal:iron_gear
+exnihilosequentia:tuff_hammer
 woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:delta_state_void_residue"}}
 gtceu:gravel_tricalcium_phosphate_ore
 nuclearcraft:rhodochrosite_dust

kubejs/server_scripts/HM/pre-lv/misc.js

@@ -112,6 +112,18 @@ ServerEvents.recipes(event => {
 	event.replaceInput({ type: 'gtceu:fluid_solidifier' }, 'gtceu:ball_casting_mold', '#kubejs:ball_casting_mold');
 	event.replaceInput({ type: 'gtceu:fluid_solidifier' }, 'gtceu:ingot_casting_mold', '#kubejs:ingot_casting_mold');
 
+	event.recipes.gtceu.coke_oven(id('coke_from_coal'))
+        .itemInputs('minecraft:coal')
+        .outputFluids('gtceu:creosote 500')
+        .itemOutputs('gtceu:coke_gem')
+        .duration(1200)
+
+	event.recipes.gtceu.coke_oven(id('coke_from_coal_block'))
+        .itemInputs('minecraft:coal_block')
+        .outputFluids('gtceu:creosote 4500')
+        .itemOutputs('gtceu:coke_block')
+        .duration(9000)
+
 	// ================================ Post Cobble-Gen, Pre-Circuit ================================
 
 	event.recipes.create.mechanical_crafting('gtceu:latex_plantation', [

kubejs/server_scripts/circuit_etching.js

@@ -69,7 +69,7 @@ ServerEvents.recipes(event => {
     [
         {board: 'runic_convergence', foil: 'yttrium_barium_cuprate', foil_count: 24, amount: 5000, duration: 2100, energy: 1920},
         {board: 'draconic_wetware', foil: 'europium', foil_count: 32, amount: 10000, duration: 2400, energy: 7680},
-        {board: 'awakened_draconic_wetware', foil: 'polonium_bismide', foil_count: 48, amount: 20000, duration: 2700, energy: 30720}
+        {board: 'awakened_draconic_wetware', foil: 'polonium_bismide', foil_count: 40, amount: 20000, duration: 2700, energy: 30720}
     ].forEach(type=> {
         [
           {id: 'copper', name: 'cupric_chloride_solution', multiplier: 1},

kubejs/server_scripts/endgame content/advanced_fusion/plasma_turbines.js

@@ -105,7 +105,7 @@ ServerEvents.recipes(event => {
             '8x gtceu:magmada_alloy_round','gtceu:mythrolic_alloy_ring','2x kubejs:uev_transmission_assembly','kubejs:uev_precision_drive_mechanism',
             '#gtceu:circuits/uev','12x gtceu:fine_adamantine_wire'
         )
-        .inputFluids('gtceu:polyether_ether_ketone 576','gtceu:lubricant 10000')
+        .inputFluids('gtceu:polyether_ether_ketone 576','gtceu:tungsten_disulfide 5000')
         .itemOutputs('gtceu:uev_rotor_holder')
         .duration(400)
         .stationResearch(
@@ -122,7 +122,7 @@ ServerEvents.recipes(event => {
             '8x gtceu:abyssal_alloy_round','gtceu:chaotixic_alloy_ring','2x kubejs:uiv_transmission_assembly','kubejs:uiv_precision_drive_mechanism',
             '#gtceu:circuits/uiv','gtceu:uiv_field_generator','16x gtceu:fine_xeproda_wire'
         )
-        .inputFluids('gtceu:poly_34_ethylenedioxythiophene_polystyrene_sulfate 432','gtceu:tungsten_disulfide 5000')
+        .inputFluids('gtceu:poly_34_ethylenedioxythiophene_polystyrene_sulfate 432','gtceu:tungsten_disulfide 10000')
         .itemOutputs('gtceu:uiv_rotor_holder')
         .duration(400)
         .stationResearch(

kubejs/server_scripts/endgame content/circuits.js

@@ -72,29 +72,29 @@ ServerEvents.recipes(event => {
         .inputFluids('gtceu:neutronium 576')
         .itemOutputs('kubejs:uepic_wafer')
         .duration(1200)
-        .EUt(GTValues.VA[GTValues.UV])
+        .EUt(GTValues.VA[GTValues.ZPM])
         .cleanroom(CleanroomType.CLEANROOM);
 
     event.recipes.gtceu.cutter(id('uepic_chip'))
         .itemInputs('kubejs:uepic_wafer')
         .itemOutputs('2x kubejs:uepic_chip')
         .duration(900)
-        .EUt(GTValues.VA[GTValues.UV])
+        .EUt(GTValues.VA[GTValues.ZPM])
         .cleanroom(CleanroomType.STERILE_CLEANROOM);
 
     event.recipes.gtceu.draco_infusion(id('uipic_wafer'))
         .itemInputs('kubejs:uepic_wafer','1x gtceu:draconyallium_foil','16x gtceu:silicon_carbide_over_bismuth_tritelluride_dust',
             'gtceu:naquadah_foil','gtceu:neutronium_foil','4x kubejs:draconic_stem_cells','gtceu:vanadium_gallium_foil')
         .inputFluids('gtceu:pure_dragon_breath 2000')
         .itemOutputs('kubejs:uipic_wafer')
-        .duration(800)
-        .EUt(GTValues.VA[GTValues.UEV]);
+        .duration(3600)
+        .EUt(GTValues.VA[GTValues.UV]);
 
     event.recipes.gtceu.cutter(id('uipic_chip'))
         .itemInputs('kubejs:uipic_wafer')
         .itemOutputs('2x kubejs:uipic_chip')
         .duration(900)
-        .EUt(GTValues.VA[GTValues.UEV])
+        .EUt(GTValues.VA[GTValues.UV])
         .cleanroom(CleanroomType.STERILE_CLEANROOM);
 
     event.recipes.gtceu.cutter(id('draco_soc'))
@@ -107,8 +107,8 @@ ServerEvents.recipes(event => {
     event.recipes.gtceu.cutter(id('draco_wafer'))
         .itemInputs('kubejs:draco_boule')
         .itemOutputs('64x kubejs:draco_wafer', '64x kubejs:draco_wafer')
-        .duration(4000)
-        .EUt(GTValues.VA[GTValues.UV])
+        .duration(3200)
+        .EUt(GTValues.VA[GTValues.ZPM])
         .cleanroom(CleanroomType.STERILE_CLEANROOM);
 
     event.recipes.gtceu.circuit_assembler(id('3d_nand_chip'))
@@ -139,7 +139,7 @@ ServerEvents.recipes(event => {
         .itemInputs('kubejs:qram_wafer')
         .itemOutputs('12x kubejs:qram_chip')
         .duration(900)
-        .EUt(GTValues.VHA[GTValues.UHV])
+        .EUt(GTValues.VHA[GTValues.UHV] * .6)
         .cleanroom(CleanroomType.STERILE_CLEANROOM);
 
     const DracoWaferEngraving = (ModID, Output, WaferTier, Lens, LensIsTag) => {

kubejs/server_scripts/endgame content/draco_lines/draco_infusion.js

@@ -86,9 +86,9 @@ ServerEvents.recipes(event => {
     'gtceu:nether_star_plate','8x gtceu:quantum_star','8x minecraft:popped_chorus_fruit','gtceu:echo_shard_lens',
     'gtceu:nether_star_lens',640,GTValues.VHA[GTValues.UHV]);
 
-    Infusion('draco_brain_matter_cells','2x kubejs:draconic_brain_matter_cells','thermal:ender 10000','2x kubejs:draconic_stem_cells',
+    Infusion('draco_brain_matter_cells','4x kubejs:draconic_brain_matter_cells','thermal:ender 10000','4x kubejs:draconic_stem_cells',
     '8x gtceu:fine_prismalium_wire','16x gtceu:carbon_fibers','kubejs:runic_convergence_circuit_board','8x gtceu:fine_borosilicate_glass_wire',
-    'gtceu:luv_emitter','gtceu:wetware_circuit_board',320,GTValues.VHA[GTValues.UHV]);
+    'gtceu:luv_emitter','gtceu:wetware_circuit_board',640,GTValues.VHA[GTValues.UHV]);
 
     Infusion('draco_scale_cells','32x kubejs:draconic_scale_cells','gtceu:neutronium 6804','32x kubejs:draconic_stem_cells','gtceu:dense_naquadah_alloy_plate',
     'gtceu:dense_tungsten_steel_plate','gtceu:dense_ancient_netherite_plate','gtceu:dense_darmstadtium_plate','gtceu:dense_obsidian_plate',

kubejs/server_scripts/endgame content/high_tier_machinery/better_sub-uhv_components.js

@@ -54,19 +54,19 @@ ServerEvents.recipes(event => {
         componentTypesAssemblyLine('robot_arm',[`4x gtceu:long_${Primary}_rod`,`1x gtceu:${Primary}_gear`,`3x gtceu:small_${Primary}_gear`,`2x gtceu:${Tier}_electric_motor`,`1x gtceu:${Tier}_electric_piston`,`1x #gtceu:circuits/${Tier}`,`2x #gtceu:circuits/${Tier1}`,`4x #gtceu:circuits/${Tier2}`,`4x gtceu:${Cable}_single_cable`],
             [`gtceu:soldering_alloy ${576*scale}`,`gtceu:lubricant ${125*(2**scale)}`],4);
 
-        componentTypesAssemblyLine('field_generator',[`1x gtceu:${Frame}_frame`,`6x gtceu:${Frame}_plate`,`1x gtceu:${Catalyst}`,`2x gtceu:${Tier}_emitter`,`2x #gtceu:circuits/${Tier}`,`128x gtceu:fine_${SuperConductor}_wire`,`4x gtceu:${Cable}_single_cable`],
+        componentTypesAssemblyLine('field_generator',[`1x gtceu:${Frame}_frame`,`6x gtceu:${Frame}_plate`,`${Catalyst}`,`2x gtceu:${Tier}_emitter`,`2x #gtceu:circuits/${Tier}`,`128x gtceu:fine_${SuperConductor}_wire`,`4x gtceu:${Cable}_single_cable`],
             [`gtceu:soldering_alloy ${576*scale}`],5);
 
-        componentTypesAssemblyLine('emitter',[`1x gtceu:${Frame}_frame`,`1x gtceu:${Tier}_electric_motor`,`4x gtceu:long_${SenMat}_rod`,`1x gtceu:${Catalyst}`,`2x #gtceu:circuits/${Tier}`,`96x gtceu:${SenFoil}_foil`,`4x gtceu:${Cable}_single_cable`],
+        componentTypesAssemblyLine('emitter',[`1x gtceu:${Frame}_frame`,`1x gtceu:${Tier}_electric_motor`,`4x gtceu:long_${SenMat}_rod`,`${Catalyst}`,`2x #gtceu:circuits/${Tier}`,`96x gtceu:${SenFoil}_foil`,`4x gtceu:${Cable}_single_cable`],
             [`gtceu:soldering_alloy ${144*(2**scale)}`],6);
 
-        componentTypesAssemblyLine('sensor',[`1x gtceu:${Frame}_frame`,`1x gtceu:${Tier}_electric_motor`,`4x gtceu:${SenMat}_plate`,`1x gtceu:${Catalyst}`,`2x #gtceu:circuits/${Tier}`,`96x gtceu:${SenFoil}_foil`,`4x gtceu:${Cable}_single_cable`],
+        componentTypesAssemblyLine('sensor',[`1x gtceu:${Frame}_frame`,`1x gtceu:${Tier}_electric_motor`,`4x gtceu:${SenMat}_plate`,`${Catalyst}`,`2x #gtceu:circuits/${Tier}`,`96x gtceu:${SenFoil}_foil`,`4x gtceu:${Cable}_single_cable`],
             [`gtceu:soldering_alloy ${144*(2**scale)}`],7);
 
         }
 
-        assemblyMaterials(1,'luv','iv','ev','hsss','hsss','ruridit','niobium_titanium','niobium_titanium','indium_tin_barium_titanium_cuprate','quantum_star','ruridit','palladium','hsss',6000);
-        assemblyMaterials(2,'zpm','luv','iv','osmiridium','osmiridium','europium','vanadium_gallium','polybenzimidazole','uranium_rhodium_dinaquadide','quantum_star','osmiridium','trinium','naquadah_alloy',24000);
-        assemblyMaterials(3,'uv','zpm','luv','tritanium','naquadah_alloy','americium','yttrium_barium_cuprate','naquadah','enriched_naquadah_trinium_europium_duranide','gravi_star','tritanium','naquadria','tritanium',100000);
+        assemblyMaterials(1,'luv','iv','ev','hsss','hsss','ruridit','niobium_titanium','niobium_titanium','indium_tin_barium_titanium_cuprate','1x gtceu:quantum_star','ruridit','palladium','hsss',6000);
+        assemblyMaterials(2,'zpm','luv','iv','osmiridium','osmiridium','europium','vanadium_gallium','polybenzimidazole','uranium_rhodium_dinaquadide','2x gtceu:quantum_star','osmiridium','trinium','naquadah_alloy',24000);
+        assemblyMaterials(3,'uv','zpm','luv','tritanium','naquadah_alloy','americium','yttrium_barium_cuprate','naquadah','enriched_naquadah_trinium_europium_duranide','1x gtceu:gravi_star','tritanium','naquadria','tritanium',100000);
 
 });