merge
This commit is contained in:
Pyritie
commit
a79652844d
63 changed files with 2593 additions and 1424 deletions
|
|
@ -1017,6 +1017,24 @@ const registerGTCEURecipes = (event) => {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Stick Packing
|
||||
|
||||
event.recipes.gtceu.packer('tfg:stick_bunch')
|
||||
.itemInputs('9x #forge:rods/wooden')
|
||||
.circuit(5)
|
||||
.itemOutputs('tfc:stick_bunch')
|
||||
.duration(50)
|
||||
.EUt(GTValues.VA[GTValues.ULV])
|
||||
|
||||
event.recipes.gtceu.packer('tfg:stick_bundle')
|
||||
.itemInputs('18x #forge:rods/wooden')
|
||||
.circuit(8)
|
||||
.itemOutputs('tfc:stick_bundle')
|
||||
.duration(50)
|
||||
.EUt(GTValues.VA[GTValues.ULV])
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Changing tiers of decomposition recipes
|
||||
|
||||
event.recipes.gtceu.electrolyzer('gtceu:decomposition_electrolyzing_clay')
|
||||
|
|
@ -1078,16 +1096,6 @@ const registerGTCEURecipes = (event) => {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Hopper
|
||||
|
||||
event.recipes.gtceu.assembler('gtceu:assembler/hopper_wrought_iron')
|
||||
.itemInputs('#forge:chests', '5x #forge:plates/wrought_iron')
|
||||
.itemOutputs('minecraft:hopper')
|
||||
.circuit(8)
|
||||
.duration(200)
|
||||
.EUt(2)
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Credits
|
||||
|
||||
|
|
@ -1125,6 +1133,13 @@ const registerGTCEURecipes = (event) => {
|
|||
|
||||
//#endregion
|
||||
|
||||
event.recipes.gtceu.laser_engraver('tfg:diamond_gear')
|
||||
.itemInputs('4x #forge:plates/diamond')
|
||||
.itemOutputs('#forge:gears/diamond')
|
||||
.notConsumable('gtceu:glass_lens')
|
||||
.duration(200)
|
||||
.EUt(GTValues.VA[GTValues.MV])
|
||||
|
||||
// TODO: Greate again...
|
||||
event.shapeless('gtceu:programmed_circuit', ['minecraft:stick', '#forge:tools/wrenches'])
|
||||
.id('tfg:shapeless/programmed_circuit_from_stick')
|
||||
|
|
|
|||
|
|
@ -411,7 +411,7 @@ function registerGTCEuMachineRecipes(event) {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region passthrough hatches
|
||||
//#region passthrough hatches
|
||||
event.recipes.shaped('gtceu:lv_item_passthrough_hatch', [
|
||||
' A ',
|
||||
'BCB',
|
||||
|
|
@ -665,6 +665,61 @@ function registerGTCEuMachineRecipes(event) {
|
|||
|
||||
//#endregion
|
||||
|
||||
// #region Assembly line stack size problems
|
||||
|
||||
event.remove({ id: 'gtceu:assembly_line/high_performance_computing_array' })
|
||||
event.recipes.gtceu.assembly_line('high_performace_computing_array')
|
||||
.itemInputs('gtceu:data_bank',
|
||||
'4x #gtceu:circuits/zpm',
|
||||
'8x gtceu:luv_field_generator',
|
||||
'gtceu:data_orb',
|
||||
'gtceu:computer_monitor_cover',
|
||||
'32x #forge:double_wires/uranium_rhodium_dinaquadide',
|
||||
'32x #forge:double_wires/uranium_rhodium_dinaquadide',
|
||||
'16x gtceu:normal_optical_pipe')
|
||||
.inputFluids(Fluid.of('gtceu:soldering_alloy', 1152),
|
||||
Fluid.of('gtceu:vanadium_gallium', 1152),
|
||||
Fluid.of('gtceu:pcb_coolant', 4000))
|
||||
.itemOutputs('gtceu:high_performance_computation_array')
|
||||
.duration(60 * 20)
|
||||
.EUt(100000)
|
||||
["scannerResearch(java.util.function.UnaryOperator)"](b =>
|
||||
b.researchStack(Item.of('gtceu:computer_monitor_cover')).EUt(GTValues.VA[GTValues.IV]).duration(120*20))
|
||||
|
||||
event.remove({ id: 'gtceu:assembly_line/me_pattern_buffer' })
|
||||
event.recipes.gtceu.assembly_line('me_pattern_buffer')
|
||||
.itemInputs('gtceu:luv_dual_input_hatch',
|
||||
'gtceu:luv_emitter',
|
||||
'4x #gtceu:circuits/luv',
|
||||
'3x ae2:pattern_provider',
|
||||
'3x ae2:interface',
|
||||
'4x ae2:speed_card',
|
||||
'2x ae2:capacity_card',
|
||||
'64x #forge:fine_wires/europium',
|
||||
'32x #forge:fine_wires/europium')
|
||||
.inputFluids(Fluid.of('gtceu:soldering_alloy', 576), Fluid.of('gtceu:lubricant', 500))
|
||||
.itemOutputs('gtceu:me_pattern_buffer')
|
||||
.duration(30 * 20)
|
||||
.EUt(GTValues.VA[GTValues.LuV])
|
||||
["scannerResearch(java.util.function.UnaryOperator)"](b =>
|
||||
b.researchStack(Item.of('gtceu:luv_dual_input_hatch')).EUt(GTValues.VA[GTValues.LuV]).duration(60*20))
|
||||
|
||||
event.remove({ id: 'gtceu:assembly_line/me_pattern_buffer_proxy' })
|
||||
event.recipes.gtceu.assembly_line('me_pattern_buffer_proxy')
|
||||
.itemInputs('gtceu:luv_machine_hull',
|
||||
'2x gtceu:luv_sensor',
|
||||
'#gtceu:circuits/luv',
|
||||
'ae2:quantum_link',
|
||||
'2x ae2:quantum_ring',
|
||||
'64x #forge:fine_wires/europium')
|
||||
.inputFluids(Fluid.of('gtceu:soldering_alloy', 576), Fluid.of('gtceu:lubricant', 500))
|
||||
.itemOutputs('gtceu:me_pattern_buffer_proxy')
|
||||
.duration(30 * 20)
|
||||
.EUt(GTValues.VA[GTValues.ZPM])
|
||||
.stationResearch(b => b.researchStack(Item.of('gtceu:me_pattern_buffer')).EUt(GTValues.VA[GTValues.LuV]).CWUt(32))
|
||||
|
||||
// #endregion
|
||||
|
||||
// Контроллер теплицы
|
||||
event.shaped('gtceu:greenhouse', [
|
||||
'ABA',
|
||||
|
|
@ -685,7 +740,7 @@ function registerGTCEuMachineRecipes(event) {
|
|||
|
||||
DRUMS_AND_CRATES.forEach(material => {
|
||||
event.shapeless(`gtceu:${material}_drum`, [`gtceu:${material}_drum`]).id(`tfg:shapeless/drum_nbt_${material}`)
|
||||
|
||||
|
||||
event.shaped(`gtceu:${material}_drum`, [
|
||||
' A ',
|
||||
'BCB',
|
||||
|
|
@ -788,13 +843,39 @@ function registerGTCEuMachineRecipes(event) {
|
|||
C: '#forge:small_fluid_pipes/steel'
|
||||
}).id('gtceu:shaped/steam_hatch')
|
||||
|
||||
event.replaceOutput({ id: 'gtceu:macerator/macerate_steel_machine_casing'}, 'gtceu:steel_dust', '4x gtceu:steel_dust')
|
||||
event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steel_machine_casing'}, 'gtceu:steel_ingot', '4x gtceu:steel_ingot')
|
||||
event.shaped('gtceu:steam_grinder', [
|
||||
'ABA',
|
||||
'ACA',
|
||||
'ABA'
|
||||
], {
|
||||
A: 'gtceu:steam_machine_casing',
|
||||
B: '#forge:gears/invar',
|
||||
C: 'gtceu:hp_steam_macerator'
|
||||
}).id('gtceu:shaped/steam_grinder')
|
||||
|
||||
event.replaceOutput({ id: 'gtceu:macerator/macerate_steam_input_bus'}, 'gtceu:steel_dust', '4x gtceu:steel_dust')
|
||||
event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steam_input_bus'}, 'gtceu:steel_ingot', '4x gtceu:steel_ingot')
|
||||
event.replaceOutput({ id: 'gtceu:macerator/macerate_steam_output_bus'}, 'gtceu:steel_dust', '4x gtceu:steel_dust')
|
||||
event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steam_output_bus'}, 'gtceu:steel_ingot', '4x gtceu:steel_ingot')
|
||||
event.shaped('gtceu:steam_oven', [
|
||||
'ABA',
|
||||
'ACA',
|
||||
'ABA'
|
||||
], {
|
||||
A: 'gtceu:steam_machine_casing',
|
||||
B: 'gtceu:heatproof_machine_casing',
|
||||
C: 'gtceu:hp_steam_furnace'
|
||||
}).id('gtceu:shaped/steam_oven')
|
||||
|
||||
event.replaceInput({ id: 'gtceu:shaped/hv_cutter' }, 'gtceu:red_steel_buzz_saw_blade', 'gtceu:diamond_buzz_saw_blade')
|
||||
|
||||
|
||||
event.replaceOutput({ id: 'gtceu:macerator/macerate_steel_machine_casing' }, 'gtceu:steel_dust', '4x gtceu:steel_dust')
|
||||
event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steel_machine_casing' }, 'gtceu:steel_ingot', '4x gtceu:steel_ingot')
|
||||
|
||||
event.replaceOutput({ id: 'gtceu:macerator/macerate_steam_input_bus' }, 'gtceu:steel_dust', '4x gtceu:steel_dust')
|
||||
event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steam_input_bus' }, 'gtceu:steel_ingot', '4x gtceu:steel_ingot')
|
||||
event.replaceOutput({ id: 'gtceu:macerator/macerate_steam_output_bus' }, 'gtceu:steel_dust', '4x gtceu:steel_dust')
|
||||
event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steam_output_bus' }, 'gtceu:steel_ingot', '4x gtceu:steel_ingot')
|
||||
|
||||
event.replaceOutput({ id: 'gtceu:macerator/macerate_steam_input_hatch' }, 'gtceu:steel_dust', '6x gtceu:steel_dust')
|
||||
event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steam_input_hatch' }, 'gtceu:steel_block', '6x gtceu:steel_ingot')
|
||||
|
||||
event.replaceOutput({ id: 'gtceu:macerator/macerate_steam_input_hatch'}, 'gtceu:steel_dust', '6x gtceu:steel_dust')
|
||||
event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steam_input_hatch'}, 'gtceu:steel_block', '6x gtceu:steel_ingot')
|
||||
|
|
|
|||
|
|
@ -122,14 +122,14 @@ function registerGTCEURecyclingRecipes(event) {
|
|||
|
||||
// Iron Door
|
||||
|
||||
event.recipes.gtceu.macerator('gtceu:macerator/macerate_iron_door')
|
||||
event.recipes.gtceu.macerator('gtceu:macerate_iron_door')
|
||||
.itemInputs('minecraft:iron_door')
|
||||
.itemOutputs('2x #forge:dusts/wrought_iron')
|
||||
.duration(GTMaterials.WroughtIron.getMass() * 2)
|
||||
.category(GTRecipeCategories.MACERATOR_RECYCLING)
|
||||
.EUt(GTValues.VA[GTValues.ULV])
|
||||
|
||||
event.recipes.gtceu.arc_furnace('gtceu:arc_furnace/arc_iron_door')
|
||||
event.recipes.gtceu.arc_furnace('gtceu:arc_iron_door')
|
||||
.itemInputs('minecraft:iron_door')
|
||||
.itemOutputs('2x #forge:ingots/wrought_iron')
|
||||
.duration(GTMaterials.WroughtIron.getMass() * 2)
|
||||
|
|
@ -138,14 +138,14 @@ function registerGTCEURecyclingRecipes(event) {
|
|||
|
||||
// Redstone lamp
|
||||
|
||||
event.recipes.gtceu.macerator('gtceu:macerator/macerate_redstone_lamp')
|
||||
event.recipes.gtceu.macerator('gtceu:macerate_redstone_lamp')
|
||||
.itemInputs('minecraft:redstone_lamp')
|
||||
.itemOutputs('2x #forge:small_dusts/red_alloy', '21x #forge:tiny_dusts/glass', '4x #forge:dusts/glowstone')
|
||||
.duration(GTMaterials.RedAlloy.getMass() * 2)
|
||||
.category(GTRecipeCategories.MACERATOR_RECYCLING)
|
||||
.EUt(GTValues.VA[GTValues.ULV])
|
||||
|
||||
event.recipes.gtceu.arc_furnace('gtceu:arc_furnace/arc_redstone_lamp')
|
||||
event.recipes.gtceu.arc_furnace('gtceu:arc_redstone_lamp')
|
||||
.itemInputs('minecraft:redstone_lamp')
|
||||
.itemOutputs('4x #forge:nuggets/red_alloy')
|
||||
.duration(GTMaterials.RedAlloy.getMass() * 2)
|
||||
|
|
@ -154,14 +154,14 @@ function registerGTCEURecyclingRecipes(event) {
|
|||
|
||||
// Dispenser
|
||||
|
||||
event.recipes.gtceu.macerator('gtceu:macerator/macerate_dispenser')
|
||||
event.recipes.gtceu.macerator('gtceu:macerate_dispenser')
|
||||
.itemInputs('minecraft:dispenser')
|
||||
.itemOutputs('6x #forge:dusts/stone', '1x #forge:dusts/redstone', '1x #forge:dusts/brass')
|
||||
.duration(GTMaterials.Brass.getMass() * 2)
|
||||
.category(GTRecipeCategories.MACERATOR_RECYCLING)
|
||||
.EUt(GTValues.VA[GTValues.ULV])
|
||||
|
||||
event.recipes.gtceu.arc_furnace('gtceu:arc_furnace/arc_dispenser')
|
||||
event.recipes.gtceu.arc_furnace('gtceu:arc_dispenser')
|
||||
.itemInputs('minecraft:dispenser')
|
||||
.itemOutputs('1x #forge:ingots/brass')
|
||||
.duration(GTMaterials.Brass.getMass() * 2)
|
||||
|
|
@ -170,17 +170,49 @@ function registerGTCEURecyclingRecipes(event) {
|
|||
|
||||
// Dropper
|
||||
|
||||
event.recipes.gtceu.macerator('gtceu:macerator/macerate_dropper')
|
||||
event.recipes.gtceu.macerator('gtceu:macerate_dropper')
|
||||
.itemInputs('minecraft:dropper')
|
||||
.itemOutputs('7x #forge:dusts/stone', '1x #forge:dusts/redstone', '1x #forge:dusts/brass')
|
||||
.duration(GTMaterials.Brass.getMass() * 2)
|
||||
.category(GTRecipeCategories.MACERATOR_RECYCLING)
|
||||
.EUt(GTValues.VA[GTValues.ULV])
|
||||
|
||||
event.recipes.gtceu.arc_furnace('gtceu:arc_furnace/arc_dropper')
|
||||
event.recipes.gtceu.arc_furnace('gtceu:arc_dropper')
|
||||
.itemInputs('minecraft:dropper')
|
||||
.itemOutputs('1x #forge:ingots/brass')
|
||||
.duration(GTMaterials.Brass.getMass() * 2)
|
||||
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
|
||||
.EUt(GTValues.VA[GTValues.LV])
|
||||
|
||||
// Steam oven
|
||||
|
||||
event.recipes.gtceu.macerator('gtceu:macerate_steam_oven')
|
||||
.itemInputs('gtceu:steam_oven')
|
||||
.itemOutputs('18x #forge:dusts/bronze', '8x #forge:dusts/invar', '7x #forge:dusts/wrought_iron', '2x #forge:dusts/steel')
|
||||
.duration(1972)
|
||||
.category(GTRecipeCategories.MACERATOR_RECYCLING)
|
||||
.EUt(GTValues.VA[GTValues.ULV])
|
||||
|
||||
event.recipes.gtceu.arc_furnace('gtceu:arc_steam_oven')
|
||||
.itemInputs('gtceu:steam_oven')
|
||||
.itemOutputs('18x #forge:ingots/bronze', '8x #forge:ingots/invar', '7x #forge:ingots/wrought_iron', '2x #forge:ingots/steel')
|
||||
.duration(1792)
|
||||
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
|
||||
.EUt(GTValues.VA[GTValues.LV])
|
||||
|
||||
// Steam grinder
|
||||
|
||||
event.recipes.gtceu.macerator('gtceu:macerate_steam_grinder')
|
||||
.itemInputs('gtceu:steam_grinder')
|
||||
.itemOutputs('18x #forge:dusts/bronze', '8x #forge:dusts/invar', '7x #forge:dusts/wrought_iron', '2x #forge:dusts/steel')
|
||||
.duration(1972)
|
||||
.category(GTRecipeCategories.MACERATOR_RECYCLING)
|
||||
.EUt(GTValues.VA[GTValues.ULV])
|
||||
|
||||
event.recipes.gtceu.arc_furnace('gtceu:arc_steam_grinder')
|
||||
.itemInputs('gtceu:steam_grinder')
|
||||
.itemOutputs('18x #forge:ingots/bronze', '8x #forge:ingots/invar', '7x #forge:ingots/wrought_iron', '2x #forge:ingots/steel')
|
||||
.duration(1792)
|
||||
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
|
||||
.EUt(GTValues.VA[GTValues.LV])
|
||||
}
|
||||
|
|
@ -602,6 +602,8 @@ function removeGTCEURecipes(event) {
|
|||
event.remove({ id: 'gtceu:shaped/activator_rail' })
|
||||
event.remove({ id: 'gtceu:shaped/shield' })
|
||||
event.remove({ id: 'gtceu:shaped/pickaxe_iron' })
|
||||
event.remove({ id: 'gtceu:shaped/gear_diamond' })
|
||||
event.remove({ id: 'gtceu:shaped/buzzsaw_blade_diamond' })
|
||||
|
||||
event.remove({ id: 'gtceu:shapeless/glass_full_dust_flint' })
|
||||
|
||||
|
|
@ -641,6 +643,8 @@ function removeGTCEURecipes(event) {
|
|||
|
||||
event.remove({ id: 'gtceu:smelting/sticky_resin_from_slime' })
|
||||
|
||||
event.remove({ id: 'gtceu:wiremill/string_from_polycaprolactam' })
|
||||
|
||||
// Remove vanilla Eye of Ender
|
||||
|
||||
event.remove({ id: 'minecraft:ender_eye' })
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue