diff --git a/kubejs/server_scripts/Early_Game.js b/kubejs/server_scripts/Early_Game.js index 612cac7b0..9439213e6 100644 --- a/kubejs/server_scripts/Early_Game.js +++ b/kubejs/server_scripts/Early_Game.js @@ -138,4 +138,19 @@ ServerEvents.recipes(event => { //Battery Alloy Dust event.shapeless("4x gtceu:battery_alloy_dust", ["4x gtceu:lead_dust", "gtceu:antimony_dust"]) + + // Remake of cobble to gravel recipe due to recipe conflicts with Ad Astra Forge Hammer Recipes + + event.remove({ id: "gtceu:forge_hammer/cobblestone_to_gravel" }) + function CobbleToGravel(id, input, output) { + event.recipes.gtceu.forge_hammer(`kubejs:${id}`) + .itemInputs(Item.of(input)) + .itemOutputs(output) + .duration(10) + .EUt(16) + } + + CobbleToGravel('cobbletogravel', 'minecraft:cobblestone', 'minecraft:gravel') + CobbleToGravel('blackstonetogravel', 'minecraft:blackstone', 'minecraft:gravel') + CobbleToGravel('deepslatetogravel', 'minecraft:cobbled_deepslate', 'minecraft:gravel') }) \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/rock_cycle_simulator.js b/kubejs/server_scripts/gregtech/rock_cycle_simulator.js index 9a357ecd3..1da460c3a 100644 --- a/kubejs/server_scripts/gregtech/rock_cycle_simulator.js +++ b/kubejs/server_scripts/gregtech/rock_cycle_simulator.js @@ -42,4 +42,24 @@ ServerEvents.recipes(event => { RockCycle('shale', 'quark:shale', 'quark:shale', 60) RockCycle('myalite', 'quark:myalite', 'quark:myalite', 60) + //Ad Astra Recipe Function + function AdAstraRockCycle(id, input, output, EUt, dimension) { + event.recipes.gtceu.rock_cycle_simulator(`kubejs:${id}`) + .notConsumable(Item.of(input)) + .itemOutputs(output) + .duration(16) + .EUt(EUt) + .dimension(dimension) + } + + AdAstraRockCycle('moonstone', 'ad_astra:moon_stone', 'ad_astra:moon_stone', 240, 'ad_astra:moon') + AdAstraRockCycle('moondeepslate', 'ad_astra:moon_deepslate', 'ad_astra:moon_deepslate', 240, 'ad_astra:moon') + AdAstraRockCycle('marsstone', 'ad_astra:mars_stone', 'ad_astra:mars_stone', 240, 'ad_astra:mars') + AdAstraRockCycle('conglomerate', 'ad_astra:conglomerate', 'ad_astra:conglomerate', 240, 'ad_astra:mars') + AdAstraRockCycle('venusstone', 'ad_astra:venus_stone', 'ad_astra:venus_stone', 960, 'ad_astra:venus') + AdAstraRockCycle('infernalspireblock', 'ad_astra:infernal_spire_block', 'ad_astra:infernal_spire_block', 960, 'ad_astra:venus') + AdAstraRockCycle('mercurystone', 'ad_astra:mercury_stone', 'ad_astra:mercury_stone', 960, 'ad_astra:mercury') + AdAstraRockCycle('glaciostone', 'ad_astra:glacio_stone', 'ad_astra:glacio_stone', 2160, 'ad_astra:glacio') + AdAstraRockCycle('permafrostadastra', 'ad_astra:permafrost', 'ad_astra:permafrost', 2160, 'ad_astra:glacio') + }) \ No newline at end of file diff --git a/kubejs/server_scripts/mods/Ad_Astra.js b/kubejs/server_scripts/mods/Ad_Astra.js index ec1fb14bf..bd649bc18 100644 --- a/kubejs/server_scripts/mods/Ad_Astra.js +++ b/kubejs/server_scripts/mods/Ad_Astra.js @@ -455,3 +455,45 @@ ServerEvents.tags("item", event => { event.add("ad_astra:freeze_resistant_armor", quarkTechArmor) event.add("ad_astra:heat_resistant_armor", quarkTechArmor) }) + +ServerEvents.recipes(event => { + // Ad Astra Rock Breaker + function AdAstraRockBreaker(id, input, output, EUt, dimension) { + event.recipes.gtceu.rock_breaker(`kubejs:${id}`) + .notConsumable(Item.of(input)) + .itemOutputs(output) + .duration(16) + .EUt(EUt) + .dimension(dimension) + .addDataString("fluidA", "minecraft:lava") + .addDataString("fluidB", "minecraft:water") + } + + AdAstraRockBreaker('moonstone', 'ad_astra:moon_stone', 'ad_astra:moon_stone', 240, 'ad_astra:moon') + AdAstraRockBreaker('moondeepslate', 'ad_astra:moon_deepslate', 'ad_astra:moon_deepslate', 240, 'ad_astra:moon') + AdAstraRockBreaker('marsstone', 'ad_astra:mars_stone', 'ad_astra:mars_stone', 240, 'ad_astra:mars') + AdAstraRockBreaker('conglomerate', 'ad_astra:conglomerate', 'ad_astra:conglomerate', 240, 'ad_astra:mars') + AdAstraRockBreaker('venusstone', 'ad_astra:venus_stone', 'ad_astra:venus_stone', 960, 'ad_astra:venus') + AdAstraRockBreaker('infernalspireblock', 'ad_astra:infernal_spire_block', 'ad_astra:infernal_spire_block', 960, 'ad_astra:venus') + AdAstraRockBreaker('mercurystone', 'ad_astra:mercury_stone', 'ad_astra:mercury_stone', 960, 'ad_astra:mercury') + AdAstraRockBreaker('glaciostone', 'ad_astra:glacio_stone', 'ad_astra:glacio_stone', 2160, 'ad_astra:glacio') + AdAstraRockBreaker('permafrost', 'ad_astra:permafrost', 'ad_astra:permafrost', 2160, 'ad_astra:glacio') + + // Ad Astra Rock Forge Hammers + function AdAstraForgeHammer(id, input, output, duration, EUt) { + event.recipes.gtceu.forge_hammer(`kubejs:${id}`) + .itemInputs(Item.of(input)) + .itemOutputs(output) + .duration(duration) + .EUt(EUt) + } + + AdAstraForgeHammer('mooncobble', 'ad_astra:moon_stone', 'ad_astra:moon_cobblestone', 12, 4) + AdAstraForgeHammer('moonsand', 'ad_astra:moon_cobblestone', 'ad_astra:moon_sand', 10, 16) + AdAstraForgeHammer('marscobble', 'ad_astra:mars_stone', 'ad_astra:mars_cobblestone', 12, 4) + AdAstraForgeHammer('marssand', 'ad_astra:mars_cobblestone', 'ad_astra:mars_sand', 10, 16) + AdAstraForgeHammer('venuscobble', 'ad_astra:venus_stone', 'ad_astra:venus_cobblestone', 12, 4) + AdAstraForgeHammer('venussand', 'ad_astra:venus_cobblestone', 'ad_astra:venus_sand', 10, 16) + AdAstraForgeHammer('mercurycobble', 'ad_astra:mercury_stone', 'ad_astra:mercury_cobblestone', 12, 4) + AdAstraForgeHammer('glaciocobble', 'ad_astra:glacio_stone', 'ad_astra:glacio_cobblestone', 12, 4) +}) \ No newline at end of file diff --git a/kubejs/server_scripts/random_recipes.js b/kubejs/server_scripts/random_recipes.js index 0c7a72c56..085c7f1c4 100644 --- a/kubejs/server_scripts/random_recipes.js +++ b/kubejs/server_scripts/random_recipes.js @@ -624,7 +624,7 @@ ServerEvents.recipes(event => { .duration(3000) .EUt(30720) .stationResearch(b => b.researchStack('gtceu:electric_blast_furnace').CWUt(16, 64000).EUt(30720)) - + event.remove({ id: 'gtceu:shaped/mega_vacuum_freezer' }) event.recipes.gtceu.assembly_line('kubejs:assembly_line/mega_vacuum_freezer') .itemInputs('gtceu:vacuum_freezer', '4x #gtceu:circuits/zpm', '4x gtceu:luv_field_generator', '4x gtceu:naquadah_normal_fluid_pipe', '4x gtceu:dense_naquadah_alloy_plate', '4x gtceu:uranium_rhodium_dinaquadide_quadruple_wire') diff --git a/kubejs/server_scripts/worldgen/fluidVeins.js b/kubejs/server_scripts/worldgen/fluidVeins.js index ba90ba81c..3369743c6 100644 --- a/kubejs/server_scripts/worldgen/fluidVeins.js +++ b/kubejs/server_scripts/worldgen/fluidVeins.js @@ -57,7 +57,7 @@ GTCEuServerEvents.fluidVeins(event => { // Mars fluid veins (haha water on Mars) event.add('kubejs:mars/ice', vein => { vein.dimensions('ad_astra:mars') - vein.biomes(1, martianPolarCapsResourceKey) + vein.biomes(20, martianPolarCapsResourceKey) vein.fluid(() => Fluid.of("gtceu:ice").fluid) vein.weight(0) vein.minimumYield(100) @@ -67,6 +67,28 @@ GTCEuServerEvents.fluidVeins(event => { vein.depletedYield(3) }) + event.add('kubejs:mars/ethylene', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of("gtceu:ethylene").fluid) + vein.weight(2) + vein.minimumYield(150) + vein.maximumYield(400) + vein.depletionAmount(1) + vein.depletionChance(50) + vein.depletedYield(10) + }) + + event.add('kubejs:mars/fluorine', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of("gtceu:fluorine").fluid) + vein.weight(1) + vein.minimumYield(100) + vein.maximumYield(250) + vein.depletionAmount(1) + vein.depletionChance(50) + vein.depletedYield(5) + }) + // Venus fluid veins event.add('kubejs:venus/sulfuric_acid', vein => { vein.dimensions('ad_astra:venus') @@ -149,6 +171,17 @@ GTCEuServerEvents.fluidVeins(event => { vein.depletedYield(40) }) + event.add('kubejs:glacio/chlorobenzene', vein => { + vein.dimensions('ad_astra:glacio') + vein.fluid(() => Fluid.of("gtceu:chlorobenzene").fluid) + vein.weight(3) + vein.minimumYield(100) + vein.maximumYield(200) + vein.depletionAmount(1) + vein.depletionChance(30) + vein.depletedYield(10) + }) + event.add('kubejs:glacio/cryotheum', vein => { vein.dimensions('ad_astra:glacio') vein.fluid(() => Fluid.of("kubejs:molten_cryotheum").fluid)