illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

I think this should show all the commented out mars content?

Browse source
This commit is contained in:
Pyritie 2025-09-26 23:37:23 +01:00
parent 104763481c
commit 030db1280c
13 changed files with 81 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kubejs/server_scripts/ad_astra/recipes.js
View file

@ -108,10 +108,10 @@ const registerAdAstraRecipes = (event) => {
//#endregion
//region tier 2 rocket DISABLED UNTIL EV
//region tier 2 rocket
event.remove({ mod: 'gtceu', input: 'gtceu:hot_rocket_alloy_t2_ingot' })
/*
event.recipes.gtceu.mixer('tfg:rocket_alloy_t2')
.itemInputs('19x #forge:dusts/titanium', '3x #forge:small_dusts/chromium', '3x #forge:small_dusts/tin', '3x #forge:small_dusts/aluminium')
.inputFluids(Fluid.of('gtceu:vanadium', 540))
@ -172,7 +172,7 @@ const registerAdAstraRecipes = (event) => {
.duration(1440)
.circuit(3)
.EUt(GTValues.VA[GTValues.EV])
*/
//#endregion
//region Tier 3 DISABLED UNTIL IV

10
kubejs/server_scripts/firmalife/recipes.js
View file

@ -178,16 +178,6 @@ const registerFirmaLifeRecipes = (event) => {
//#endregion
// TODO: Не работает потому что грегтех
// Доставание меда из сот
/*
event.recipes.gtceu.assembler(`tfg:firmalife/beehive_honey_decomposition`)
.itemInputs('firmalife:beehive_frame')
.circuit(1)
.itemOutputs('firmalife:beehive_frame', 'firmalife:beeswax')
.duration(10)
.EUt(2)*/
//#region Рецепты теплиц / Greenhouse
//#region Treated Wood

37
kubejs/server_scripts/gregtech/recipes.js
View file

@ -1335,29 +1335,28 @@ const registerGTCEURecipes = (event) => {
event.shapeless(Item.of('gtceu:matchbox', '{usesLeft:8}'), ['minecraft:paper', '8x gtceu:matches'])
.id('tfg:shapeless/matchbox')
// TODO: Nano CPU use Nuclear Tritiated Water COMMENTED UNTIL MARS IS OUT
/*
event.remove({ id: 'gtceu:chemical_reactor/nano_cpu_wafer' })
event.remove({ id: 'gtceu:large_chemical_reactor/nano_cpu_wafer' })
event.remove({ id: 'gtceu:chemical_reactor/nano_cpu_wafer' })
event.remove({ id: 'gtceu:large_chemical_reactor/nano_cpu_wafer' })
event.recipes.gtceu.chemical_reactor('tfg:nano_cpu_wafer')
.inputFluids(Fluid.of('gtceu:tritiated_water', 576))
.itemInputs('gtceu:cpu_wafer', '16x gtceu:carbon_fibers')
.itemOutputs('gtceu:nano_cpu_wafer')
.duration(20*60)
.EUt(GTValues.VA[GTValues.EV])
.cleanroom(CleanroomType.CLEANROOM)
event.recipes.gtceu.chemical_reactor('tfg:nano_cpu_wafer')
.inputFluids(Fluid.of('gtceu:tritiated_water', 576))
.itemInputs('gtceu:cpu_wafer', '16x gtceu:carbon_fibers')
.itemOutputs('gtceu:nano_cpu_wafer')
.duration(20*60)
.EUt(GTValues.VA[GTValues.EV])
.cleanroom(CleanroomType.CLEANROOM)
// Remove Plutonium from centrifuging Uranium dust
// Remove Plutonium from centrifuging Uranium dust
event.remove({ id: 'gtceu:centrifuge/uranium_238_separation' })
event.remove({ id: 'gtceu:centrifuge/uranium_238_separation' })
event.recipes.gtceu.centrifuge('tfg:uranium_238_separation')
.itemInputs('#forge:dusts/uranium')
.chancedOutput('#forge:tiny_dusts/uranium_235', 2300, 0)
.duration(20*40)
.EUt(GTValues.VA[GTValues.HV])
event.recipes.gtceu.centrifuge('tfg:uranium_238_separation')
.itemInputs('#forge:dusts/uranium')
.chancedOutput('#forge:tiny_dusts/uranium_235', 2300, 0)
.duration(20*40)
.EUt(GTValues.VA[GTValues.HV])
*/
// Change the Large Centrifugal Unit to be craftable at EV
event.remove({ id: 'gtceu:shaped/large_centrifuge' })

126
kubejs/server_scripts/gregtech/recipes.machines.js
View file

@ -286,7 +286,7 @@ function registerGTCEuMachineRecipes(event) {
D: 'tfc:crucible',
E: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1)
}).addMaterialInfo().id('gtceu:shaped/steam_boiler_coal_steel')
removeMaceratorRecipe(event, 'macerate_hp_steam_liquid_boiler')
event.recipes.gtceu.shaped('gtceu:hp_steam_liquid_boiler', [
'AEA',
@ -299,7 +299,7 @@ function registerGTCEuMachineRecipes(event) {
D: '#forge:glass',
E: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1)
}).addMaterialInfo().id('gtceu:shaped/steam_boiler_lava_steel')
removeMaceratorRecipe(event, 'macerate_hp_steam_solar_boiler')
event.recipes.gtceu.shaped('gtceu:hp_steam_solar_boiler', [
'AAA',
@ -804,7 +804,7 @@ function registerGTCEuMachineRecipes(event) {
A: ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 1),
B: '#forge:tools/hammers'
}).addMaterialInfo().id('gtceu:shaped/steel_hull')
removeMaceratorRecipe(event, 'macerate_steam_input_hatch')
event.recipes.gtceu.shaped('gtceu:steam_input_hatch', [
'ACA',
@ -815,7 +815,7 @@ function registerGTCEuMachineRecipes(event) {
B: 'gtceu:steel_machine_casing',
C: ChemicalHelper.get(TagPrefix.pipeSmallFluid, GTMaterials.Steel, 1)
}).addMaterialInfo().id('gtceu:shaped/steam_hatch')
removeMaceratorRecipe(event, 'macerate_steam_grinder')
event.recipes.gtceu.shaped('gtceu:steam_grinder', [
'ABA',
@ -826,7 +826,7 @@ function registerGTCEuMachineRecipes(event) {
B: ChemicalHelper.get(TagPrefix.gear, GTMaterials.Invar, 1),
C: 'gtceu:hp_steam_macerator'
}).addMaterialInfo().id('gtceu:shaped/steam_grinder')
removeMaceratorRecipe(event, 'macerate_steam_oven')
event.recipes.gtceu.shaped('gtceu:steam_oven', [
'ABA',
@ -910,16 +910,16 @@ function registerGTCEuMachineRecipes(event) {
.duration(100)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.compressor('tfg:compressed_treated_chipboard_composite')
.itemInputs('tfg:treated_chipboard_composite')
.itemOutputs('tfg:high_density_treated_fiberboard')
.duration(200)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.compressor('tfg:compressed_treated_chipboard_composite')
.itemInputs('tfg:treated_chipboard_composite')
.itemOutputs('tfg:high_density_treated_fiberboard')
.duration(200)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.assembler('tfg:resin_circuit_assembler')
.itemInputs('gtceu:wood_plate', '2x gtceu:sticky_resin')
.itemOutputs('gtceu:resin_circuit_board')
.duration(20*10)
.duration(20 * 10)
.EUt(GTValues.VA[GTValues.ULV])
//#region New Casings
@ -1143,25 +1143,20 @@ function registerGTCEuMachineRecipes(event) {
// Multiblock
/* LOCKED UNTIL MARS
event.shaped(
'gtceu:ostrum_linear_accelerator',
[ 'USU',
'WZW',
'PTP'],
{
S: 'tfg:casings/machine_casing_vacuum_engine_intake',
Z: 'gtceu:iv_machine_hull',
W: '#gtceu:circuits/iv',
U: '#forge:double_plates/stellite_100',
T: '#forge:single_cables/platinum',
P: 'gtceu:iv_electric_pump'
}
event.shaped('gtceu:ostrum_linear_accelerator', [
'USU',
'WZW',
'PTP'
], {
S: 'tfg:casings/machine_casing_vacuum_engine_intake',
Z: 'gtceu:iv_machine_hull',
W: '#gtceu:circuits/iv',
U: '#forge:double_plates/stellite_100',
T: '#forge:single_cables/platinum',
P: 'gtceu:iv_electric_pump'
}
).id('gtceu:shaped/ostrum_linear_accelerator')
*/
event.recipes.gtceu.assembler('tfg:ostrum_harvester')
.itemInputs(
'1x gtceu:ev_machine_hull',
@ -1192,7 +1187,7 @@ function registerGTCEuMachineRecipes(event) {
event.shaped(
'tfg:casings/machine_casing_vacuum_engine_intake',
[ 'USU',
['USU',
'WZW',
'UTU'],
{
@ -1235,51 +1230,44 @@ function registerGTCEuMachineRecipes(event) {
//#endregion
//#region Nuclear Controler - LOCKED UNTIL MARS
//#region Nuclear Controler
/*
event.shaped(
'gtceu:fission_reactor',
[ 'TUT',
'WZW',
'TUT'],
{
T: 'gtceu:atomic_casing',
W: '#gtceu:circuits/ev',
U: 'gtceu:hv_field_generator',
Z: 'gtceu:ev_machine_hull'
}
event.shaped('gtceu:fission_reactor', [
'TUT',
'WZW',
'TUT'
], {
T: 'gtceu:atomic_casing',
W: '#gtceu:circuits/ev',
U: 'gtceu:hv_field_generator',
Z: 'gtceu:ev_machine_hull'
}
).id('tfg:shaped/fission_reactor')
event.shaped(
'gtceu:nuclear_fuel_factory',
[ 'TUT',
'WZW',
'TBT'],
{
T: 'gtceu:atomic_casing',
W: '#gtceu:circuits/ev',
U: 'gtceu:ev_emitter',
Z: 'gtceu:ev_machine_hull',
B: 'gtceu:ev_robot_arm'
}
event.shaped('gtceu:nuclear_fuel_factory', [
'TUT',
'WZW',
'TBT'
], {
T: 'gtceu:atomic_casing',
W: '#gtceu:circuits/ev',
U: 'gtceu:ev_emitter',
Z: 'gtceu:ev_machine_hull',
B: 'gtceu:ev_robot_arm'
}
).id('tfg:shaped/nuclear_fuel_factory')
event.shaped(
'gtceu:heat_exchanger',
[ 'TUT',
'WZW',
'TBT'],
{
T: 'gtceu:high_temperature_smelting_casing',
W: '#gtceu:circuits/ev',
U: 'gtceu:ev_sensor',
Z: 'gtceu:ev_machine_hull',
B: 'gtceu:ev_fluid_regulator'
}
event.shaped('gtceu:heat_exchanger', [
'TUT',
'WZW',
'TBT'
], {
T: 'gtceu:high_temperature_smelting_casing',
W: '#gtceu:circuits/ev',
U: 'gtceu:ev_sensor',
Z: 'gtceu:ev_machine_hull',
B: 'gtceu:ev_fluid_regulator'
}
).id('tfg:shaped/heat_exchanger')
*/
}

1
kubejs/server_scripts/gregtech/tags.js
View file

@ -66,7 +66,6 @@ function registerGTCEUBlockTags(event) {
event.removeAllTagsFrom(item);
});
// TODO: Ores all broke for some reason? This is a workaround for now
event.add("minecraft:mineable/pickaxe", "#forge:ores");
event.add("minecraft:needs_iron_tool", "#forge:ores");

2
kubejs/server_scripts/minecraft/recipes.removes.js
View file

@ -887,7 +887,7 @@ function removeMinecraftRecipes(event) {
//#endregion
event.remove({ id: 'ae2:entropy/cool/grass_block_dirt' }) // TODO: Сделать с тфк землей
event.remove({ id: 'ae2:entropy/cool/grass_block_dirt' })
//#region Выход: Высохшая земля

3
kubejs/server_scripts/tfg/data.js
View file

@ -835,8 +835,7 @@ function registerTFGFLPlanters(event) {
"betterend:block/cave_pumpkin_greenhouse_2",
"betterend:block/cave_pumpkin_greenhouse_3",
],
//'betterend:block/cave_pumpkin_greenhouse_fruit'
"betterend:block/cave_pumpkin_top" // TODO: check
"betterend:block/cave_pumpkin_top"
);
event.firmalifePlantable(

4
kubejs/server_scripts/tfg/recipes.miscellaneous.js
View file

@ -163,7 +163,6 @@ function registerTFGMiscellaneousRecipes(event) {
.EUt(GTValues.VA[GTValues.ULV]);
//Airship Balloon
// TODO: Add the needle back here once #963 is fixed
event.shaped('tfg:airship_balloon', [
'ABA',
'BAB',
@ -1078,8 +1077,7 @@ function registerTFGMiscellaneousRecipes(event) {
.duration(80)
.EUt(GTValues.VA[GTValues.IV])
event.recipes.gtceu.mixer('tfg:aes_polyurethane_electric_only')
.itemInputs('tfg:aes_compressed_wool', //'2x #tfg:mineral_rich_wool' REVERT UNTIL MARS,
'#forge:dusts/methylene_diphenyl_diisocyanate')
.itemInputs('2x #tfg:mineral_rich_wool', '#forge:dusts/methylene_diphenyl_diisocyanate')
.inputFluids(Fluid.of('gtceu:diethylenetriamine', 250), Fluid.of('gtceu:acetone', 1000))
.itemOutputs('tfg:aes_polyurethane')
.duration(80)

2
kubejs/server_scripts/tfg/recipes.space.js
View file

@ -6,8 +6,6 @@
*/
function registerTFGSpaceRecipes(event) {
// TODO: Change these to work on any dim as long as they're in an oxygenated area?
const allowedCombustibleDims = [
{
dimension: "minecraft:the_nether",

8
kubejs/startup_scripts/ad_astra/constants.js
View file

@ -30,7 +30,6 @@ global.AD_ASTRA_DISABLED_ITEMS =
'ad_astra:oil_bucket',
'ad_astra:fuel_bucket',
'ad_astra:cryo_fuel_bucket',
'ad_astra_giselle_addon:gravity_normalizer',
'ad_astra:cable_duct',
'ad_astra:fluid_pipe_duct',
'ad_astra:iron_plate',
@ -69,13 +68,6 @@ global.AD_ASTRA_DISABLED_ITEMS =
'ad_astra:glacio_iron_ore',
'ad_astra:glacio_lapis_ore',
// Disabled until EV planet
'ad_astra:tier_2_rocket',
'ad_astra:desh_engine',
'tfg:rocket_fin_t2',
'tfg:rocket_cone_t2',
// Disabled until IV planets
'ad_astra:tier_3_rocket',

1
kubejs/startup_scripts/gtceu/machines.js
View file

@ -654,7 +654,6 @@ const registerGTCEuMachines = (event) => {
.where(' ', Block.getBlock('minecraft:air'))
.build()
)
.workableCasingModel(
'tfg:block/casings/machine_casing_mars',
'gtceu:block/machines/thermal_centrifuge')

5
kubejs/startup_scripts/minecraft/constants.js
View file

@ -629,7 +629,6 @@ global.MINECRAFT_DISABLED_ITEMS = [
'minecraft:ender_eye',
// Кримзон незер дерево
// TODO: Разблокировать после добавления ада
'minecraft:crimson_stem',
'minecraft:crimson_hyphae',
'minecraft:stripped_crimson_stem',
@ -647,7 +646,6 @@ global.MINECRAFT_DISABLED_ITEMS = [
'minecraft:crimson_hanging_sign',
// Варпед незер дерево
// TODO: Разблокировать после добавления ада
'minecraft:warped_stem',
'minecraft:warped_hyphae',
'minecraft:stripped_warped_stem',
@ -680,13 +678,10 @@ global.MINECRAFT_DISABLED_ITEMS = [
'minecraft:crying_obsidian',
'minecraft:piglin_head',
'minecraft:zombie_head',
'minecraft:nether_sprouts',
'minecraft:warped_roots',
'minecraft:dragon_head',
'minecraft:dragon_breath',
'minecraft:creeper_head',
'minecraft:wither_skeleton_skull',
'minecraft:crimson_roots',
'minecraft:nether_wart',
'minecraft:respawn_anchor',
'minecraft:ghast_tear',

1
kubejs/startup_scripts/tfg/register_climates.js
View file

@ -59,7 +59,6 @@ function calcCurrentTemp(averageTemp, seaLevel, playerY, calendarTicks, tempRang
return averageTemp + (tempDiff * (playerY / seaLevel));
} else {
// TODO: check this
let depthPercent = 1 - (playerY / 20);
let bedrockTemp = lerp(averageTemp, coreTemp, coreTempMult);