Merge branch 'main' into patch-5

Signed-off-by: Pyritie <pyritie@gmail.com>
This commit is contained in:
Pyritie 2025-01-06 15:11:55 +00:00 committed by GitHub
commit 11e8626e91
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
71 changed files with 3774 additions and 85 deletions

View file

@ -5,7 +5,6 @@ const registerAE2Recipes = (event) => {
// Удаление рецептов мода
event.remove({ not: [
{ id: 'ae2:transform/entangled_singularity_from_pearl' },
{ id: 'ae2:transform/fluix_crystals' },
{ id: 'ae2:network/parts/energy_acceptor' },
{ id: 'ae2:network/blocks/energy_energy_acceptor_alt' },
{ id: 'ae2:network/blocks/pattern_providers_interface_part' },
@ -24,6 +23,27 @@ const registerAE2Recipes = (event) => {
//#endregion
// Cutting knives (for renaming things)
event.shaped('ae2:certus_quartz_cutting_knife', [
' A',
'BA ',
'CCB',
], {
A: '#forge:rods/aluminium',
B: '#forge:plates/steel',
C: '#forge:exquisite_gems/certus_quartz',
}).id('tfg:crafting/certus_quartz_cutting_knife')
event.shaped('ae2:nether_quartz_cutting_knife', [
' A',
'BA ',
'CCB',
], {
A: '#forge:rods/aluminium',
B: '#forge:plates/steel',
C: '#forge:exquisite_gems/nether_quartz',
}).id('tfg:crafting/nether_quartz_cutting_knife')
// Network tool
event.shaped('ae2:network_tool', [
'AB',
@ -573,7 +593,7 @@ const registerAE2Recipes = (event) => {
.itemInputs(
'3x ae2:fluix_glass_cable')
.inputFluids(Fluid.of('gtceu:rubber', 432))
.itemOutputs('ae2:fluix_covered_cable')
.itemOutputs('3x ae2:fluix_covered_cable')
.circuit(1)
.duration(20)
.EUt(480)
@ -582,7 +602,7 @@ const registerAE2Recipes = (event) => {
.itemInputs(
'3x ae2:fluix_glass_cable')
.inputFluids(Fluid.of('gtceu:silicone_rubber', 216))
.itemOutputs('ae2:fluix_covered_cable')
.itemOutputs('3x ae2:fluix_covered_cable')
.circuit(1)
.duration(20)
.EUt(480)
@ -591,7 +611,7 @@ const registerAE2Recipes = (event) => {
.itemInputs(
'3x ae2:fluix_glass_cable')
.inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 108))
.itemOutputs('ae2:fluix_covered_cable')
.itemOutputs('3x ae2:fluix_covered_cable')
.circuit(1)
.duration(20)
.EUt(480)
@ -603,18 +623,18 @@ const registerAE2Recipes = (event) => {
'#forge:dusts/glowstone',
'#forge:dusts/redstone')
.inputFluids(Fluid.of('gtceu:rubber', 432))
.itemOutputs('ae2:fluix_smart_cable')
.itemOutputs('3x ae2:fluix_smart_cable')
.circuit(2)
.duration(20)
.EUt(480)
event.recipes.gtceu.assembler('fluix_smart_cable_silicone_rubber')
event.recipes.gtceu.assembler('fluix_smart_cable_silicone_rubber')
.itemInputs(
'3x ae2:fluix_glass_cable',
'#forge:dusts/glowstone',
'#forge:dusts/redstone')
.inputFluids(Fluid.of('gtceu:silicone_rubber', 216))
.itemOutputs('ae2:fluix_smart_cable')
.itemOutputs('3x ae2:fluix_smart_cable')
.circuit(2)
.duration(20)
.EUt(480)
@ -625,7 +645,7 @@ const registerAE2Recipes = (event) => {
'#forge:dusts/glowstone',
'#forge:dusts/redstone')
.inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 108))
.itemOutputs('ae2:fluix_smart_cable')
.itemOutputs('3x ae2:fluix_smart_cable')
.circuit(2)
.duration(20)
.EUt(480)
@ -645,7 +665,7 @@ const registerAE2Recipes = (event) => {
.itemInputs(
'12x ae2:fluix_glass_cable')
.inputFluids(Fluid.of('gtceu:rubber', 1728))
.itemOutputs('ae2:fluix_covered_dense_cable')
.itemOutputs('3x ae2:fluix_covered_dense_cable')
.circuit(3)
.duration(20)
.EUt(480)
@ -654,7 +674,7 @@ const registerAE2Recipes = (event) => {
.itemInputs(
'12x ae2:fluix_glass_cable')
.inputFluids(Fluid.of('gtceu:silicone_rubber', 864))
.itemOutputs('ae2:fluix_covered_dense_cable')
.itemOutputs('3x ae2:fluix_covered_dense_cable')
.circuit(3)
.duration(20)
.EUt(480)
@ -663,7 +683,7 @@ const registerAE2Recipes = (event) => {
.itemInputs(
'12x ae2:fluix_glass_cable')
.inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 432))
.itemOutputs('ae2:fluix_covered_dense_cable')
.itemOutputs('3x ae2:fluix_covered_dense_cable')
.circuit(3)
.duration(20)
.EUt(480)
@ -676,41 +696,41 @@ const registerAE2Recipes = (event) => {
.duration(20)
.EUt(480)
// Smart dence cable
event.recipes.gtceu.assembler('fluix_smart_dence_cable_rubber')
// Smart dense cable
event.recipes.gtceu.assembler('fluix_smart_dense_cable_rubber')
.itemInputs(
'12x ae2:fluix_glass_cable',
'#forge:dusts/glowstone',
'#forge:dusts/redstone')
.inputFluids(Fluid.of('gtceu:rubber', 1728))
.itemOutputs('ae2:fluix_smart_dense_cable')
.itemOutputs('3x ae2:fluix_smart_dense_cable')
.circuit(4)
.duration(20)
.EUt(480)
event.recipes.gtceu.assembler('fluix_smart_dence_cable_silicone_rubber')
event.recipes.gtceu.assembler('fluix_smart_dense_cable_silicone_rubber')
.itemInputs(
'12x ae2:fluix_glass_cable',
'#forge:dusts/glowstone',
'#forge:dusts/redstone')
.inputFluids(Fluid.of('gtceu:silicone_rubber', 864))
.itemOutputs('ae2:fluix_smart_dense_cable')
.itemOutputs('3x ae2:fluix_smart_dense_cable')
.circuit(4)
.duration(20)
.EUt(480)
event.recipes.gtceu.assembler('fluix_smart_dence_cable_styrene_butadiene_rubber')
event.recipes.gtceu.assembler('fluix_smart_dense_cable_styrene_butadiene_rubber')
.itemInputs(
'12x ae2:fluix_glass_cable',
'#forge:dusts/glowstone',
'#forge:dusts/redstone')
.inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 432))
.itemOutputs('ae2:fluix_smart_dense_cable')
.itemOutputs('3x ae2:fluix_smart_dense_cable')
.circuit(4)
.duration(20)
.EUt(480)
event.recipes.gtceu.assembler('fluix_smart_dence_cable_covered_cable')
event.recipes.gtceu.assembler('fluix_smart_dense_cable_covered_cable')
.itemInputs(
'4x ae2:fluix_covered_cable',
'#forge:dusts/glowstone',
@ -720,7 +740,7 @@ const registerAE2Recipes = (event) => {
.duration(20)
.EUt(480)
event.recipes.gtceu.assembler('fluix_smart_dence_cable_smart_cable')
event.recipes.gtceu.assembler('fluix_smart_dense_cable_smart_cable')
.itemInputs(
'4x ae2:fluix_smart_cable',)
.itemOutputs('ae2:fluix_smart_dense_cable')
@ -728,7 +748,7 @@ const registerAE2Recipes = (event) => {
.duration(20)
.EUt(480)
event.recipes.gtceu.assembler('fluix_smart_dence_cable')
event.recipes.gtceu.assembler('fluix_smart_dense_cable')
.itemInputs(
'ae2:fluix_covered_dense_cable',
'#forge:dusts/glowstone',
@ -2052,11 +2072,11 @@ const registerAE2Recipes = (event) => {
event.recipes.gtceu.mixer('ae2:fluix_crystal')
.itemInputs(
'#forge:gems/nether_quartz',
'4x #forge:dusts/redstone',
'#forge:dusts/redstone',
'ae2:charged_certus_quartz_crystal')
.inputFluids(Fluid.of('minecraft:water', 144))
.itemOutputs('ae2:fluix_crystal')
.duration(420)
.itemOutputs('2x ae2:fluix_crystal')
.duration(120)
.EUt(256)
event.recipes.gtceu.mixer('ae2:fluix_crystal_ruby')
@ -2065,18 +2085,18 @@ const registerAE2Recipes = (event) => {
'#forge:exquisite_gems/ruby',
'ae2:charged_certus_quartz_crystal')
.inputFluids(Fluid.of('minecraft:water', 144))
.itemOutputs('4x ae2:fluix_crystal')
.duration(440)
.itemOutputs('8x ae2:fluix_crystal')
.duration(80)
.EUt(256)
event.recipes.gtceu.mixer('ae2:fluix_crystal_quartz')
.itemInputs(
'#forge:exquisite_gems/nether_quartz',
'4x #forge:dusts/redstone',
'#forge:dusts/redstone',
'ae2:charged_certus_quartz_crystal')
.inputFluids(Fluid.of('minecraft:water', 144))
.itemOutputs('4x ae2:fluix_crystal')
.duration(460)
.itemOutputs('8x ae2:fluix_crystal')
.duration(80)
.EUt(256)
event.recipes.gtceu.mixer('ae2:fluix_crystal_quartz_ruby')
@ -2084,9 +2104,9 @@ const registerAE2Recipes = (event) => {
'#forge:exquisite_gems/nether_quartz',
'#forge:exquisite_gems/ruby',
'ae2:charged_certus_quartz_crystal')
.inputFluids(Fluid.of('minecraft:water', 144))
.itemOutputs('12x ae2:fluix_crystal')
.duration(480)
.inputFluids(Fluid.of('gtceu:distilled_water', 144))
.itemOutputs('24x ae2:fluix_crystal')
.duration(60)
.EUt(256)
//charger
@ -2098,4 +2118,4 @@ const registerAE2Recipes = (event) => {
.itemOutputs('ae2:charger')
.duration(200)
.EUt(480)
}
}

View file

@ -1185,4 +1185,15 @@ const registerCreateRecipes = (event) => {
})
//#endregion
}
//#region Механизм точности
e.recipes.gtceu.assembler('tfg:create/precision_mechanism')
.itemInputs('#forge:sheets/gold','3x create:cogwheel', '3x create:large_cogwheel', '3x #forge:nuggets/iron')
.itemOutputs('create:precision_mechanism')
.duration(2000)
.EUt(20)
//#endregion
}

View file

@ -1280,7 +1280,7 @@ const registerGTCEURecipes = (event) => {
//#region remove LV casing exploit
event.remove({ id: 'gtceu:assembler/casing_lv' })
event.remove({ id: 'gtceu:assembler/casing_lv' })
event.recipes.gtceu.assembler('tfg:assembler/casing_lv')
.itemInputs('4x gtceu:blue_steel_plate', '4x gtceu:red_steel_plate')
.itemOutputs('gtceu:lv_machine_casing')
@ -1353,6 +1353,16 @@ const registerGTCEURecipes = (event) => {
.EUt(20)
//#endregion
// Add circuit to assembler recipe for redstone lamp.
// Avoids conflict with AE2 smart cables.
event.remove({ id: 'gtceu:assembler/redstone_lamp' })
event.recipes.gtceu.assembler('redstone_lamp')
.itemInputs('4x #forge:dusts/redstone', '4x #forge:dusts/glowstone')
.itemOutputs('1x minecraft:redstone_lamp')
.circuit(1)
.duration(100)
.EUt(1)
//#region Рецепты, которые итерируются по всем материалам
@ -1531,6 +1541,194 @@ const registerGTCEURecipes = (event) => {
}
});
//#endregion
// Fix LV recycling producing red/blue steel.
// Replace red steel outputs with 8x steel, delete blue steel outputs.
event.replaceOutput(
/gtceu:arc_furnace\/arc_lv_.*/,
'#forge:ingots/red_steel',
'8x #forge:ingots/steel')
event.replaceOutput(
/gtceu:arc_furnace\/arc_lv_.*/,
'#forge:ingots/blue_steel',
'')
event.replaceOutput(
/gtceu:macerator\/macerate_lv_.*/,
'#forge:dusts/red_steel',
'8x #forge:dusts/steel')
event.replaceOutput(
/gtceu:macerator\/macerate_lv_.*/,
'#forge:dusts/blue_steel',
'')
// Clear NBT on tanks with shapeless crafts.
[
"lv_super",
"mv_super",
"hv_super",
"ev_super",
"iv_quantum",
"luv_quantum",
"zpm_quantum",
"uv_quantum",
"uhv_quantum",
].forEach(prefix => {
// Craft super tanks to remove their NBT data.
event.shapeless(`gtceu:${prefix}_tank`, [`gtceu:${prefix}_tank`])
// Craft super chests to remove their NBT data.
event.shapeless(`gtceu:${prefix}_chest`, [`gtceu:${prefix}_chest`])
});
//#region fix more duping
// red alloy, because crucible always makes 4+1=5
event.remove({id: 'gtceu:mixer/red_alloy' })
event.recipes.gtceu.mixer('tfg:red_alloy_mixer')
.itemInputs('1x gtceu:copper_dust', '4x minecraft:redstone')
.itemOutputs('5x gtceu:red_alloy_dust')
.circuit(2)
.duration(100)
.EUt(7)
event.remove({id: 'gtceu:centrifuge/red_alloy_separation' })
event.recipes.gtceu.centrifuge('tfg:red_alloy_separation')
.itemInputs('5x gtceu:red_alloy_dust')
.itemOutputs('1x gtceu:copper_dust', '4x minecraft:redstone')
.duration(900)
.EUt(30)
event.remove({id: 'gtceu:alloy_smelter/copper_dust_and_redstone_dust_into_red_alloy' })
event.recipes.gtceu.alloy_smelter('tfg:copper_dust_and_redstone_dust_into_red_alloy')
.itemInputs('1x gtceu:copper_dust', '4x minecraft:redstone')
.itemOutputs('5x gtceu:red_alloy_ingot')
.duration(50)
.EUt(16)
event.remove({id: 'gtceu:alloy_smelter/annealed_copper_dust_and_redstone_dust_into_red_alloy' })
event.recipes.gtceu.alloy_smelter('tfg:annealed_copper_dust_and_redstone_dust_into_red_alloy')
.itemInputs('1x gtceu:annealed_copper_dust', '4x minecraft:redstone')
.itemOutputs('5x gtceu:red_alloy_ingot')
.duration(50)
.EUt(16)
event.remove({id: 'gtceu:alloy_smelter/copper_ingot_and_redstone_dust_into_red_alloy' })
event.recipes.gtceu.alloy_smelter('tfg:copper_ingot_and_redstone_dust_into_red_alloy')
.itemInputs('1x minecraft:copper_ingot', '4x minecraft:redstone')
.itemOutputs('5x gtceu:red_alloy_ingot')
.duration(50)
.EUt(16)
event.remove({id: 'gtceu:alloy_smelter/annealed_copper_ingot_and_redstone_dust_into_red_alloy' })
event.recipes.gtceu.alloy_smelter('tfg:annealed_copper_ingot_and_redstone_dust_into_red_alloy')
.itemInputs('1x gtceu:annealed_copper_ingot', '4x minecraft:redstone')
.itemOutputs('5x gtceu:red_alloy_ingot')
.duration(50)
.EUt(16)
// steam machines
event.remove({id: 'gtceu:arc_furnace/arc_hp_steam_forge_hammer' })
event.recipes.gtceu.arc_furnace('tfg:arc_hp_steam_forge_hammer')
.itemInputs('1x gtceu:hp_steam_forge_hammer')
.itemOutputs('8x gtceu:wrought_iron_ingot', '3x gtceu:steel_ingot', '2x gtceu:tin_alloy_ingot')
.duration(3310)
.EUt(30)
event.remove({id: 'gtceu:macerator/macerate_hp_steam_forge_hammer' })
event.recipes.gtceu.macerator('tfg:macerate_hp_steam_forge_hammer')
.itemInputs('1x gtceu:hp_steam_forge_hammer')
.itemOutputs('8x gtceu:iron_dust', '3x gtceu:steel_dust', '2x gtceu:tin_alloy_dust', '12x gtceu:brick_dust')
.duration(3254)
.EUt(8)
event.remove({id: 'gtceu:arc_furnace/arc_hp_steam_extractor' })
event.recipes.gtceu.arc_furnace('tfg:arc_hp_steam_extractor')
.itemInputs('1x gtceu:hp_steam_extractor')
.itemOutputs('7x gtceu:wrought_iron_ingot', '2x gtceu:steel_ingot', '3x gtceu:tin_alloy_ingot')
.duration(3310)
.EUt(30)
event.remove({id: 'gtceu:macerator/macerate_hp_steam_extractor' })
event.recipes.gtceu.macerator('tfg:macerate_hp_steam_extractor')
.itemInputs('1x gtceu:hp_steam_extractor')
.itemOutputs('7x gtceu:iron_dust', '2x gtceu:steel_dust', '3x gtceu:tin_alloy_dust', '12x gtceu:brick_dust')
.duration(3254)
.EUt(8)
event.remove({id: 'gtceu:arc_furnace/arc_hp_steam_macerator' })
event.recipes.gtceu.arc_furnace('tfg:arc_hp_steam_macerator')
.itemInputs('1x gtceu:hp_steam_macerator')
.itemOutputs('8x gtceu:wrought_iron_ingot', '3x gtceu:steel_ingot', '2x gtceu:tin_alloy_ingot')
.duration(3310)
.EUt(30)
event.remove({id: 'gtceu:macerator/macerate_hp_steam_macerator' })
event.recipes.gtceu.macerator('tfg:macerate_hp_steam_macerator')
.itemInputs('1x gtceu:hp_steam_macerator')
.itemOutputs('8x gtceu:iron_dust', '3x gtceu:steel_dust', '2x gtceu:tin_alloy_dust', '12x gtceu:brick_dust')
.duration(3254)
.EUt(8)
event.remove({id: 'gtceu:arc_furnace/arc_hp_steam_compressor' })
event.recipes.gtceu.arc_furnace('tfg:arc_hp_steam_compressor')
.itemInputs('1x gtceu:hp_steam_compressor')
.itemOutputs('7x gtceu:wrought_iron_ingot', '1x gtceu:steel_ingot', '5x gtceu:tin_alloy_ingot')
.duration(3310)
.EUt(30)
event.remove({id: 'gtceu:macerator/macerate_hp_steam_compressor' })
event.recipes.gtceu.macerator('tfg:macerate_hp_steam_compressor')
.itemInputs('1x gtceu:hp_steam_compressor')
.itemOutputs('7x gtceu:iron_dust', '1x gtceu:steel_dust', '5x gtceu:tin_alloy_dust', '12x gtceu:brick_dust')
.duration(3254)
.EUt(8)
event.remove({id: 'gtceu:arc_furnace/arc_hp_steam_furnace' })
event.recipes.gtceu.arc_furnace('tfg:arc_hp_steam_furnace')
.itemInputs('1x gtceu:hp_steam_furnace')
.itemOutputs('7x gtceu:wrought_iron_ingot', '2x gtceu:steel_ingot', '4x gtceu:tin_alloy_ingot')
.duration(3310)
.EUt(30)
event.remove({id: 'gtceu:macerator/macerate_hp_steam_furnace' })
event.recipes.gtceu.macerator('tfg:macerate_hp_steam_furnace')
.itemInputs('1x gtceu:hp_steam_furnace')
.itemOutputs('7x gtceu:iron_dust', '2x gtceu:steel_dust', '4x gtceu:tin_alloy_dust', '12x gtceu:brick_dust')
.duration(3254)
.EUt(8)
event.remove({id: 'gtceu:arc_furnace/arc_hp_steam_alloy_smelter' })
event.recipes.gtceu.arc_furnace('tfg:arc_hp_steam_alloy_smelter')
.itemInputs('1x gtceu:hp_steam_alloy_smelter')
.itemOutputs('11x gtceu:wrought_iron_ingot', '1x gtceu:steel_ingot', '1x gtceu:tin_alloy_ingot')
.duration(3310)
.EUt(30)
event.remove({id: 'gtceu:macerator/macerate_hp_steam_alloy_smelter' })
event.recipes.gtceu.macerator('tfg:macerate_hp_steam_alloy_smelter')
.itemInputs('1x gtceu:hp_steam_alloy_smelter')
.itemOutputs('11x gtceu:iron_dust', '1x gtceu:steel_dust', '1x gtceu:tin_alloy_dust', '12x gtceu:brick_dust')
.duration(3254)
.EUt(8)
event.remove({id: 'gtceu:arc_furnace/arc_hp_steam_rock_crusher' })
event.recipes.gtceu.arc_furnace('tfg:arc_hp_steam_rock_crusher')
.itemInputs('1x gtceu:hp_steam_rock_crusher')
.itemOutputs('10x gtceu:wrought_iron_ingot', '1x gtceu:steel_ingot', '2x gtceu:tin_alloy_ingot')
.duration(3310)
.EUt(30)
event.remove({id: 'gtceu:macerator/macerate_hp_steam_rock_crusher' })
event.recipes.gtceu.macerator('tfg:macerate_hp_steam_rock_crusher')
.itemInputs('1x gtceu:hp_steam_rock_crusher')
.itemOutputs('10x gtceu:iron_dust', '1x gtceu:steel_dust', '2x gtceu:tin_alloy_dust', '12x gtceu:brick_dust')
.duration(3254)
.EUt(8)
//#endregion
}

View file

@ -3258,4 +3258,16 @@ const registerMinecraftRecipes = (event) => {
event.remove({ id: 'minecraft:raw_iron' })
//#endregion
}
//#region Glowstone
event.recipes.gtceu.mixer('gtceu:lv_glowstone')
.inputFluids(Fluid.of('gtceu:creosote', 1000), Fluid.of('gtceu:distilled_water', 1000))
.itemInputs('gtceu:stone_dust', 'minecraft:redstone', 'gtceu:sulfur_dust', 'gtceu:sodium_dust')
.itemOutputs('minecraft:glowstone_dust')
.circuit(32)
.duration(1200)
.EUt(32)
//#endregion
}