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

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

View file

@ -108,10 +108,10 @@ const registerAdAstraRecipes = (event) => {
//#endregion //#endregion
//region tier 2 rocket DISABLED UNTIL EV //region tier 2 rocket
event.remove({ mod: 'gtceu', input: 'gtceu:hot_rocket_alloy_t2_ingot' }) event.remove({ mod: 'gtceu', input: 'gtceu:hot_rocket_alloy_t2_ingot' })
/*
event.recipes.gtceu.mixer('tfg:rocket_alloy_t2') 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') .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)) .inputFluids(Fluid.of('gtceu:vanadium', 540))
@ -172,7 +172,7 @@ const registerAdAstraRecipes = (event) => {
.duration(1440) .duration(1440)
.circuit(3) .circuit(3)
.EUt(GTValues.VA[GTValues.EV]) .EUt(GTValues.VA[GTValues.EV])
*/
//#endregion //#endregion
//region Tier 3 DISABLED UNTIL IV //region Tier 3 DISABLED UNTIL IV

View file

@ -178,16 +178,6 @@ const registerFirmaLifeRecipes = (event) => {
//#endregion //#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 Рецепты теплиц / Greenhouse
//#region Treated Wood //#region Treated Wood

View file

@ -1335,8 +1335,7 @@ const registerGTCEURecipes = (event) => {
event.shapeless(Item.of('gtceu:matchbox', '{usesLeft:8}'), ['minecraft:paper', '8x gtceu:matches']) event.shapeless(Item.of('gtceu:matchbox', '{usesLeft:8}'), ['minecraft:paper', '8x gtceu:matches'])
.id('tfg:shapeless/matchbox') .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:chemical_reactor/nano_cpu_wafer' })
event.remove({ id: 'gtceu:large_chemical_reactor/nano_cpu_wafer' }) event.remove({ id: 'gtceu:large_chemical_reactor/nano_cpu_wafer' })
@ -1357,7 +1356,7 @@ const registerGTCEURecipes = (event) => {
.chancedOutput('#forge:tiny_dusts/uranium_235', 2300, 0) .chancedOutput('#forge:tiny_dusts/uranium_235', 2300, 0)
.duration(20*40) .duration(20*40)
.EUt(GTValues.VA[GTValues.HV]) .EUt(GTValues.VA[GTValues.HV])
*/
// Change the Large Centrifugal Unit to be craftable at EV // Change the Large Centrifugal Unit to be craftable at EV
event.remove({ id: 'gtceu:shaped/large_centrifuge' }) event.remove({ id: 'gtceu:shaped/large_centrifuge' })

View file

@ -919,7 +919,7 @@ function registerGTCEuMachineRecipes(event) {
event.recipes.gtceu.assembler('tfg:resin_circuit_assembler') event.recipes.gtceu.assembler('tfg:resin_circuit_assembler')
.itemInputs('gtceu:wood_plate', '2x gtceu:sticky_resin') .itemInputs('gtceu:wood_plate', '2x gtceu:sticky_resin')
.itemOutputs('gtceu:resin_circuit_board') .itemOutputs('gtceu:resin_circuit_board')
.duration(20*10) .duration(20 * 10)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(GTValues.VA[GTValues.ULV])
//#region New Casings //#region New Casings
@ -1143,14 +1143,11 @@ function registerGTCEuMachineRecipes(event) {
// Multiblock // Multiblock
/* LOCKED UNTIL MARS event.shaped('gtceu:ostrum_linear_accelerator', [
'USU',
event.shaped(
'gtceu:ostrum_linear_accelerator',
[ 'USU',
'WZW', 'WZW',
'PTP'], 'PTP'
{ ], {
S: 'tfg:casings/machine_casing_vacuum_engine_intake', S: 'tfg:casings/machine_casing_vacuum_engine_intake',
Z: 'gtceu:iv_machine_hull', Z: 'gtceu:iv_machine_hull',
W: '#gtceu:circuits/iv', W: '#gtceu:circuits/iv',
@ -1160,8 +1157,6 @@ function registerGTCEuMachineRecipes(event) {
} }
).id('gtceu:shaped/ostrum_linear_accelerator') ).id('gtceu:shaped/ostrum_linear_accelerator')
*/
event.recipes.gtceu.assembler('tfg:ostrum_harvester') event.recipes.gtceu.assembler('tfg:ostrum_harvester')
.itemInputs( .itemInputs(
'1x gtceu:ev_machine_hull', '1x gtceu:ev_machine_hull',
@ -1192,7 +1187,7 @@ function registerGTCEuMachineRecipes(event) {
event.shaped( event.shaped(
'tfg:casings/machine_casing_vacuum_engine_intake', 'tfg:casings/machine_casing_vacuum_engine_intake',
[ 'USU', ['USU',
'WZW', 'WZW',
'UTU'], 'UTU'],
{ {
@ -1235,16 +1230,13 @@ function registerGTCEuMachineRecipes(event) {
//#endregion //#endregion
//#region Nuclear Controler - LOCKED UNTIL MARS //#region Nuclear Controler
/* event.shaped('gtceu:fission_reactor', [
'TUT',
event.shaped(
'gtceu:fission_reactor',
[ 'TUT',
'WZW', 'WZW',
'TUT'], 'TUT'
{ ], {
T: 'gtceu:atomic_casing', T: 'gtceu:atomic_casing',
W: '#gtceu:circuits/ev', W: '#gtceu:circuits/ev',
U: 'gtceu:hv_field_generator', U: 'gtceu:hv_field_generator',
@ -1252,12 +1244,11 @@ function registerGTCEuMachineRecipes(event) {
} }
).id('tfg:shaped/fission_reactor') ).id('tfg:shaped/fission_reactor')
event.shaped( event.shaped('gtceu:nuclear_fuel_factory', [
'gtceu:nuclear_fuel_factory', 'TUT',
[ 'TUT',
'WZW', 'WZW',
'TBT'], 'TBT'
{ ], {
T: 'gtceu:atomic_casing', T: 'gtceu:atomic_casing',
W: '#gtceu:circuits/ev', W: '#gtceu:circuits/ev',
U: 'gtceu:ev_emitter', U: 'gtceu:ev_emitter',
@ -1266,12 +1257,11 @@ function registerGTCEuMachineRecipes(event) {
} }
).id('tfg:shaped/nuclear_fuel_factory') ).id('tfg:shaped/nuclear_fuel_factory')
event.shaped( event.shaped('gtceu:heat_exchanger', [
'gtceu:heat_exchanger', 'TUT',
[ 'TUT',
'WZW', 'WZW',
'TBT'], 'TBT'
{ ], {
T: 'gtceu:high_temperature_smelting_casing', T: 'gtceu:high_temperature_smelting_casing',
W: '#gtceu:circuits/ev', W: '#gtceu:circuits/ev',
U: 'gtceu:ev_sensor', U: 'gtceu:ev_sensor',
@ -1280,6 +1270,4 @@ function registerGTCEuMachineRecipes(event) {
} }
).id('tfg:shaped/heat_exchanger') ).id('tfg:shaped/heat_exchanger')
*/
} }

View file

@ -66,7 +66,6 @@ function registerGTCEUBlockTags(event) {
event.removeAllTagsFrom(item); 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:mineable/pickaxe", "#forge:ores");
event.add("minecraft:needs_iron_tool", "#forge:ores"); event.add("minecraft:needs_iron_tool", "#forge:ores");

View file

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

View file

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

View file

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

View file

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

View file

@ -30,7 +30,6 @@ global.AD_ASTRA_DISABLED_ITEMS =
'ad_astra:oil_bucket', 'ad_astra:oil_bucket',
'ad_astra:fuel_bucket', 'ad_astra:fuel_bucket',
'ad_astra:cryo_fuel_bucket', 'ad_astra:cryo_fuel_bucket',
'ad_astra_giselle_addon:gravity_normalizer',
'ad_astra:cable_duct', 'ad_astra:cable_duct',
'ad_astra:fluid_pipe_duct', 'ad_astra:fluid_pipe_duct',
'ad_astra:iron_plate', 'ad_astra:iron_plate',
@ -69,13 +68,6 @@ global.AD_ASTRA_DISABLED_ITEMS =
'ad_astra:glacio_iron_ore', 'ad_astra:glacio_iron_ore',
'ad_astra:glacio_lapis_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 // Disabled until IV planets
'ad_astra:tier_3_rocket', 'ad_astra:tier_3_rocket',

View file

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

View file

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

View file

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