diff --git a/config/ftbquests/quests/chapters/gregtech_energy.snbt b/config/ftbquests/quests/chapters/gregtech_energy.snbt index 9e2589b6e..6122cd3d9 100644 --- a/config/ftbquests/quests/chapters/gregtech_energy.snbt +++ b/config/ftbquests/quests/chapters/gregtech_energy.snbt @@ -745,7 +745,6 @@ item: "gtceu:large_solar_panel" type: "item" }] - title: "{quests.gregtech_energy.large_solar.title}" x: -6.0d y: -1.0d } @@ -1017,6 +1016,42 @@ x: -4.5d y: -1.0d } + { + dependencies: [ + "0585527D1854628B" + "05E2F203DA46A5E8" + ] + description: [ + "{quests.gregtech_energy.large_solar_t2.desc.1}" + "{@pagebreak}" + "{quests.gregtech_energy.large_solar_t2.desc.2}" + ] + id: "3AEAB1930F4CC034" + subtitle: "{quests.gregtech_energy.large_solar_t2.subtitle}" + tasks: [{ + id: "149BF93064D121D3" + item: "gtceu:large_solar_panel_tier2" + type: "item" + }] + x: -6.0d + y: 1.0d + } + { + dependencies: [ + "3AEAB1930F4CC034" + "1DB543EFEEB67238" + ] + description: ["{quests.gregtech_energy.large_solar_t3.desc}"] + id: "7CA3A5EFE3D5B688" + subtitle: "{quests.gregtech_energy.large_solar_t3.subtitle}" + tasks: [{ + id: "612817A7FA759E03" + item: "gtceu:large_solar_panel_tier3" + type: "item" + }] + x: -6.0d + y: 3.0d + } ] subtitle: ["{quests.gregtech_energy.subtitle}"] title: "{quests.gregtech_energy}" diff --git a/kubejs/assets/tfg/textures/item/photo_cell_t1.png b/kubejs/assets/tfg/textures/item/photo_cell_t1.png new file mode 100644 index 000000000..1cb401b3a Binary files /dev/null and b/kubejs/assets/tfg/textures/item/photo_cell_t1.png differ diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 48bc9ca79..507207135 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -116,6 +116,18 @@ const registerTooltips = (event) => { text.add(1, text.of('Produces §6256 FE/t§r (64 EU/t) on the §6moon§r during the §6day§r')) }) + event.addAdvanced(['gtceu:large_solar_panel'], (item, advanced, text) => { + text.add(1, text.of('Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r')) + }) + + event.addAdvanced(['gtceu:large_solar_panel_tier2'], (item, advanced, text) => { + text.add(1, text.of('Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r')) + }) + + event.addAdvanced(['gtceu:large_solar_panel_tier3'], (item, advanced, text) => { + text.add(1, text.of('Massive structure producing from §616384 to 65536 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 crafted any more')) diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 14dcf1dcd..a1d7d2d9c 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -416,25 +416,25 @@ const registerAdAstraRecipes = (event) => { event.recipes.gtceu.laser_engraver('ad_astra:photovoltaic_etrium_cell_silicon') .itemInputs('gtceu:silicon_wafer', '#forge:glass_panes', 'gtceu:carbon_fiber_plate') - .itemOutputs('ad_astra:photovoltaic_etrium_cell') + .itemOutputs('tfg:photo_cell_t1') .EUt(GTValues.VA[GTValues.MV]) .duration(100) event.recipes.gtceu.laser_engraver('ad_astra:photovoltaic_etrium_cell_phosphorous') .itemInputs('gtceu:phosphorus_wafer', '#forge:glass_panes', 'gtceu:carbon_fiber_plate') - .itemOutputs('2x ad_astra:photovoltaic_etrium_cell') + .itemOutputs('2x tfg:photo_cell_t1') .EUt(GTValues.VA[GTValues.MV]) .duration(100) event.recipes.gtceu.laser_engraver('ad_astra:photovoltaic_etrium_cell_naquadah') .itemInputs('gtceu:naquadah_wafer', '#forge:glass_panes', 'gtceu:carbon_fiber_plate') - .itemOutputs('4x ad_astra:photovoltaic_etrium_cell') + .itemOutputs('4x tfg:photo_cell_t1') .EUt(GTValues.VA[GTValues.MV]) .duration(100) event.recipes.gtceu.laser_engraver('ad_astra:photovoltaic_etrium_cell_neutronium') .itemInputs('gtceu:neutronium_wafer', '#forge:glass_panes', 'gtceu:carbon_fiber_plate') - .itemOutputs('8x ad_astra:photovoltaic_etrium_cell') + .itemOutputs('8x tfg:photo_cell_t1') .EUt(GTValues.VA[GTValues.MV]) .duration(100) @@ -443,7 +443,7 @@ const registerAdAstraRecipes = (event) => { ' C ', 'BFE' ], { - A: 'ad_astra:photovoltaic_etrium_cell', + A: 'tfg:photo_cell_t1', B: '#gtceu:batteries/mv', C: '#forge:rods/long/aluminium', E: '#gtceu:circuits/mv', diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 006a91b88..4ded56c29 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1216,20 +1216,27 @@ const registerGTCEURecipes = (event) => { 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) + .duration(20*5) .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) + .duration(20*5) .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]) + .duration(20*5) + .EUt(GTValues.VH[GTValues.EV]) + + event.recipes.gtceu.large_chemical_reactor('tfg:solar_coolant_t2') + .inputFluids(Fluid.of('tfg:solar_coolant', 1000), Fluid.of('gtceu:argon', 1000)) + .itemInputs(Item.of('#forge:aerogels')) + .outputFluids(Fluid.of('tfg:solar_coolant_tier2', 1000)) + .duration(20*15) + .EUt(GTValues.VH[GTValues.IV]) //#endregion diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index a8b5777a3..183feaa64 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -989,8 +989,24 @@ function registerGTCEuMachineRecipes(event) { //#region New Casings - event.recipes.gtceu.assembler('red_solar_casing') - .itemInputs('gtceu:steel_machine_casing', 'ad_astra:photovoltaic_vesnium_cell') + event.recipes.gtceu.assembler('basic_solar_casing') + .itemInputs('gtceu:steel_machine_casing', 'tfg:photo_cell_t1') + .itemOutputs('8x tfg:casings/machine_casing_blue_solar_panel') + .inputFluids(Fluid.of('gtceu:soldering_alloy', 288)) + .circuit(6) + .duration(2.5 * 20) + .EUt(16) + + event.recipes.gtceu.assembler('advanced_solar_casing') + .itemInputs('8x tfg:casings/machine_casing_blue_solar_panel', 'ad_astra:photovoltaic_etrium_cell') + .itemOutputs('8x tfg:casings/machine_casing_green_solar_panel') + .inputFluids(Fluid.of('gtceu:soldering_alloy', 288)) + .circuit(6) + .duration(2.5 * 20) + .EUt(16) + + event.recipes.gtceu.assembler('elite_solar_casing') + .itemInputs('8x tfg:casings/machine_casing_green_solar_panel', 'ad_astra:photovoltaic_vesnium_cell') .itemOutputs('8x tfg:casings/machine_casing_red_solar_panel') .inputFluids(Fluid.of('gtceu:soldering_alloy', 288)) .circuit(6) @@ -1019,7 +1035,7 @@ function registerGTCEuMachineRecipes(event) { 'gtceu:large_solar_panel', ['WSW', 'TZT', 'WUW'], { - S: 'ad_astra:photovoltaic_vesnium_cell', + S: 'tfg:photo_cell_t1', Z: 'ad_astra:solar_panel', W: '#gtceu:circuits/ev', U: '#forge:gears/rocket_alloy_t1', @@ -1027,37 +1043,112 @@ function registerGTCEuMachineRecipes(event) { } ).id('gtceu:shaped/large_solar_panel') + event.shaped( + 'gtceu:large_solar_panel_tier2', + ['WSW', 'TZT', 'WUW'], + { + S: 'ad_astra:photovoltaic_etrium_cell', + Z: 'gtceu:large_solar_panel', + W: '#gtceu:circuits/iv', + U: '#forge:gears/rocket_alloy_t1', + T: '#forge:gears/desh' + } + ).id('gtceu:shaped/large_solar_panel_tier2') + + event.shaped( + 'gtceu:large_solar_panel_tier3', + ['WSW', 'TZT', 'WUW'], + { + S: 'ad_astra:photovoltaic_vesnium_cell', + Z: 'gtceu:large_solar_panel_tier2', + W: '#gtceu:circuits/luv', + U: '#forge:gears/rocket_alloy_t1', + T: '#forge:gears/desh' + } + ).id('gtceu:shaped/large_solar_panel_tier3') + 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') + .itemInputs('8x tfg:photo_cell_t1', + '6x #forge:dusts/vanadium_gallium', + '#forge:insulation_t2/sheet') + .inputFluids(Fluid.of('gtceu:helium_3', 1000)) + .itemOutputs('8x ad_astra:photovoltaic_etrium_cell') .duration(20 * 10) - .EUt(GTValues.VA[GTValues.HV]) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.chemical_reactor('expert_photovoltaic_cell') + .itemInputs('8x ad_astra:photovoltaic_etrium_cell', + '6x gtceu:energium_dust', + '#forge:insulation_t3/sheet') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 1000)) + .itemOutputs('8x ad_astra:photovoltaic_vesnium_cell') + .duration(20 * 10) + .EUt(GTValues.VA[GTValues.IV]) // LSP Generating recipes - event.recipes.gtceu.large_solar_panel('solar_panel_t1') + // Solar T1 + + event.recipes.gtceu.large_solar_panel('solar_panel_t1_cheap') + .notConsumable('tfg:photo_cell_t1') .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') - .EUt(-32 * 64 / 2) + .EUt(-(GTValues.V[GTValues.HV]), 2) + .circuit(1) + + event.recipes.gtceu.large_solar_panel('solar_panel_t1') + .chancedInput('tfg:photo_cell_t1', 500, 0) + .duration(20 * 20) + .daytime(false) + .dimension('ad_astra:moon') + .EUt(-((GTValues.V[GTValues.EV])), 2) + .circuit(2) + + // Solar T2 + + event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_cheap') + .chancedInput('ad_astra:photovoltaic_etrium_cell', 500, 0) + .duration(20 * 20) + .daytime(false) + .dimension('ad_astra:moon') + .EUt(-(GTValues.V[GTValues.EV]), 2) + .circuit(1) event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2') - .chancedFluidInput('tfg:solar_coolant 100', 5000, 0) + .notConsumable('ad_astra:photovoltaic_etrium_cell') + .perTick(true) + .chancedFluidInput('tfg:solar_coolant 10', 5000, 0) + .inputFluids('tfg:cryogenized_fluix 40') + .outputFluids('tfg:fluix 10') + .perTick(false) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') - .EUt(-((GTValues.V[GTValues.IV]) / 2)) + .EUt(-(GTValues.V[GTValues.IV]), 2) + .circuit(2) + + // Solar T3 + + event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_cheap') + .chancedInput('ad_astra:photovoltaic_vesnium_cell', 500, 0) + .duration(20 * 20) + .daytime(false) + .dimension('ad_astra:moon') + .EUt(-(GTValues.V[GTValues.IV]), 2) + .circuit(1) event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3') - .chancedFluidInput(Fluid.of('tfg:solar_coolant', 100), 5000, 0) - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) - .chancedFluidOutput('tfg:fluix 36', 7500, 0) + .notConsumable('ad_astra:photovoltaic_vesnium_cell') + .perTick(true) + .chancedFluidInput('tfg:solar_coolant_tier2 10', 5000, 0) + .inputFluids('tfg:cryogenized_fluix 40') + .outputFluids('tfg:fluix 10') + .perTick(false) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') - .EUt(-((GTValues.V[GTValues.LuV]) / 2)) + .EUt(-(GTValues.V[GTValues.LuV]), 2) + .circuit(2) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index c43032725..58938b23d 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -1035,15 +1035,14 @@ function registerTFGMiscellaneousRecipes(event) { event.recipes.gtceu.assembler('tfg:assembler/machine_casing_aluminium_plated_steel') .itemInputs( - GTBlocks.STEEL_HULL.get(), - ChemicalHelper.get(TagPrefix.plate, GTMaterials.Aluminium, 2), - ChemicalHelper.get(TagPrefix.bolt, GTMaterials.Aluminium, 2), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Silicon, 1) + ChemicalHelper.get(TagPrefix.plate, GTMaterials.Aluminium, 6), + ChemicalHelper.get(TagPrefix.frameGt, GTMaterials.Steel, 1), ) - .itemOutputs('3x tfg:machine_casing_aluminium_plated_steel') - .circuit(4) - .duration(600) - .EUt(GTValues.VA[GTValues.MV]) + .inputFluids(Fluid.of('gtceu:silicon', 72)) + .itemOutputs('2x tfg:machine_casing_aluminium_plated_steel') + .circuit(6) + .duration(20 * (2.5)) + .EUt(GTValues.VH[GTValues.LV]) //#endregion //region ammonia borane diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index 8ef60c0c7..c34118ad5 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -23,21 +23,21 @@ const registerGTCEuRecipeTypes = (event) => { event.create('large_solar_panel') .category('generator') .setEUIO('out') - .setMaxIOSize(0, 0, 0, 0) + .setMaxIOSize(2, 0, 0, 0) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COOLING) event.create('large_solar_panel_tier2') .category('generator') .setEUIO('out') - .setMaxIOSize(0, 0, 1, 0) + .setMaxIOSize(2, 0, 2, 1) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COOLING) event.create('large_solar_panel_tier3') .category('generator') .setEUIO('out') - .setMaxIOSize(0, 0, 2, 1) + .setMaxIOSize(2, 0, 2, 1) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COOLING) diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index a1523170d..6014b8c03 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -382,4 +382,10 @@ const registerTFGItems = (event) => { event.create('tfg:etching_diamond_tip') .translationKey("item.tfg.etching_diamond_tip") //#endregion + + //#region Solar Panel + + event.create('tfg:photo_cell_t1') + .translationKey("item.tfg.basic.photovoltaic.cell") + .texture('tfg:item/photo_cell_t1') } diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 30c5ee7d5..b412296a0 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -157,10 +157,15 @@ const registerTFGMaterials = (event) => { .color(0x51F7C0) event.create('tfg:solar_coolant') - .gas() + .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(163)) .components('8x helium_3', '11x oxygen', '11x hydrogen') .color(0xEDFFB3) + event.create('tfg:solar_coolant_tier2') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(73)) + .formula('(He³8O11H11)(Ar)(?)') + .color(0xfeff5d) + //end region event.create('liquid_carbon_dioxide') .liquid(100) //Not realistic but I want it to be cryogenic