diff --git a/config/ad_astra.jsonc b/config/ad_astra.jsonc index 99282cb3a..05dfe308f 100644 --- a/config/ad_astra.jsonc +++ b/config/ad_astra.jsonc @@ -31,7 +31,7 @@ // Type: Long "steelTierMaxEnergyInOut": 150, // Type: Long - "deshTierMaxEnergyInOut": 250, + "deshTierMaxEnergyInOut": 256, // Type: Long "ostrumTierMaxEnergyInOut": 500, // Type: Long diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index b0726f3d0..7e490807f 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -105,6 +105,12 @@ const registerTooltips = (event) => }) + // Solar Panel + + event.addAdvanced(['ad_astra:solar_panel'], (item, advanced, text) => { + text.add(1, text.of('Produces §664 Eu/t§r on the §6moon§r during the §6day§r')) + }) + // MEGA Deprecated 0.10 event.addAdvanced(['#megacells:mega_interface'], (item, advanced, text) => { text.add(1, text.of('§cDeprecated cannot be craft anymore')) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 2b32e8d35..2e295b277 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1264,4 +1264,26 @@ const registerGTCEURecipes = (event) => { }); //#endregion + + //#region Chemical Reaction for Solar Panel + + event.recipes.gtceu.chemical_reactor('tfg:chlorine_pentafluoride') + .inputFluids(Fluid.of('gtceu:fluorine', 5000), Fluid.of('gtceu:chlorine', 1000)) + .outputFluids(Fluid.of('tfg:chlorine_pentafluoride', 1000)) + .duration(20*10) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.chemical_reactor('tfg:chloryl_fluoride') + .inputFluids(Fluid.of('tfg:chlorine_pentafluoride', 1000), Fluid.of('minecraft:water', 2000)) + .outputFluids(Fluid.of('tfg:chloryl_fluoride', 1000), Fluid.of('gtceu:hydrofluoric_acid', 4000)) + .duration(20*10) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.large_chemical_reactor('tfg:solar_coolant') + .inputFluids(Fluid.of('tfg:chloryl_fluoride', 3000), Fluid.of('gtceu:helium_3', 8000), Fluid.of('minecraft:water', 8000)) + .outputFluids(Fluid.of('tfg:solar_coolant', 1000), Fluid.of('gtceu:hydrofluoric_acid', 3000), Fluid.of('gtceu:hypochlorous_acid', 3000)) + .duration(20*10) + .EUt(GTValues.VA[GTValues.EV]) + + //#endregion } diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 657065eda..1fa773789 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -980,4 +980,76 @@ function registerGTCEuMachineRecipes(event) { .itemOutputs('gtceu:treated_wood_plate') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + + //#region New Casings + + event.recipes.gtceu.assembler('red_solar_casing') + .itemInputs('gtceu:steel_machine_casing', 'ad_astra:photovoltaic_vesnium_cell') + .itemOutputs('tfg:block/casings/machine_casing_red_solar_panel') + .circuit(6) + .duration(2.5*20) + .EUt(16) + + event.recipes.gtceu.assembler('iron_desh_casing') + .itemInputs('6x gtceu:steel_plate', 'gtceu:desh_frame') + .itemOutputs('2x tfg:block/casings/machine_casing_iron_desh') + .circuit(6) + .duration(2.5*20) + .EUt(16) + + //#endregion + + //#region Large Solar Panel + + event.shaped( + 'gtceu:large_solar_panel', + ['WSW', 'TZT', 'WUW'], + { + S: 'ad_astra:photovoltaic_vesnium_cell', + Z: 'ad_astra:solar_panel', + W: '#gtceu:circuits/ev', + U: '#forge:gears/rocket_alloy_t1', + T: '#forge:gears/desh' + } + ).id('gtceu:shaped/large_solar_panel') + + event.recipes.gtceu.chemical_reactor('advanced_photovoltaic_cell') + .itemInputs('ad_astra:photovoltaic_etrium_cell', + '6x gtceu:energium_dust', + 'gtceu:carbon_fiber_plate') + .inputFluids(Fluid.of('gtceu:helium_3', 128)) + .itemOutputs('ad_astra:photovoltaic_vesnium_cell') + .duration(20*10) + .EUt(GTValues.VA[GTValues.HV]) + + // LSP Generating recipes + + event.recipes.gtceu.large_solar_panel('solar_panel_t1') + .circuit(1) + .chancedInput('ad_astra:photovoltaic_vesnium_cell', 5, 0) // Slightly lower + .duration(20*20) + //.daytime(false) + .dimension('ad_astra:moon') + .EUt(-32*64/2) + + event.recipes.gtceu.large_solar_panel('solar_panel_t2') + .circuit(2) + .notConsumable(InputItem.of('ad_astra:photovoltaic_vesnium_cell')) + .chancedFluidInput('tfg:solar_coolant 100', 5000, 0) + .duration(20*20) + //.daytime(false) + .dimension('ad_astra:moon') + .EUt(-((GTValues.V[GTValues.IV])/2)) + + event.recipes.gtceu.large_solar_panel('solar_panel_t3') + .circuit(3) + .notConsumable(InputItem.of('ad_astra:photovoltaic_vesnium_cell')) + .chancedFluidInput(Fluid.of('tfg:solar_coolant', 100), 5000, 0) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) + .chancedFluidOutput('tfg:fluix 36', 7500, 0) + .duration(20*20) + //.daytime(false) + .dimension('ad_astra:moon') + .EUt(-((GTValues.V[GTValues.LuV])/2)) + } \ No newline at end of file diff --git a/kubejs/startup_scripts/ad_astra/materials.js b/kubejs/startup_scripts/ad_astra/materials.js index 457b78026..aed616e19 100644 --- a/kubejs/startup_scripts/ad_astra/materials.js +++ b/kubejs/startup_scripts/ad_astra/materials.js @@ -27,7 +27,8 @@ const registerAdAstraMaterials = (event) => { GTMaterialFlags.FORCE_GENERATE_BLOCK, GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, - GTMaterialFlags.GENERATE_DENSE + GTMaterialFlags.GENERATE_DENSE, + GTMaterialFlags.GENERATE_GEAR ) // mars? diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 01200e8fb..aae7ece5f 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -47,7 +47,7 @@ const registerTFGMaterials = (event) => { .components('6x aluminium', '2x stainless_steel', '1x red_steel') .color(0x333e47) .iconSet('metallic') - .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE) + .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR) .blastTemp(1760, 'low', 120, 1200) event.create('vitrified_asbestos') @@ -119,4 +119,21 @@ const registerTFGMaterials = (event) => { .components('2x aluminium', '2x silicon', '9x oxygen', '4x hydrogen', '1x ender_pearl') .color(0xFFFFFF) .secondaryColor(0x67FFE6) + + //#region Solar Panel Chemicals + + event.create('tfg:chloryl_fluoride') + .gas() + .components('1x fluorine', '1x chlorine', '2x oxygen') + .color(0x8AFAF4) + + event.create('tfg:chlorine_pentafluoride') + .gas() + .components('5x fluorine', '1x chlorine') + .color(0x51F7C0) + + event.create('tfg:solar_coolant') + .gas() + .components('8x helium_3', '11x oxygen', '11x hydrogen') + .color(0xEDFFB3) }