Consolidating Development: 0.9.x (#846)
Signed-off-by: Pyritie <pyritie@gmail.com> Signed-off-by: TomPlop <tomdidome@gmail.com> Co-authored-by: Pyritie <Pyritie@gmail.com> Co-authored-by: Redeix <brayden.j.m.ford@gmail.com> Co-authored-by: TomPlop <tomdidome@gmail.com> Co-authored-by: aidie8 <aidenvanzuilen@gmail.com> Co-authored-by: Xikaro <os.valerievich@ya.ru> Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com> Co-authored-by: Zleub <debray.arnaud@gmail.com>
This commit is contained in:
parent
528672e95b
commit
d4c80a4b61
2192 changed files with 104647 additions and 53190 deletions
|
|
@ -1,180 +1,115 @@
|
|||
// priority: 0
|
||||
|
||||
const registerFirmaCivRecipes = (event) => {
|
||||
|
||||
//#region Удаление рецептов
|
||||
|
||||
event.remove({ id: '/firmaciv:quern/' })
|
||||
event.remove({ id: 'firmaciv:anvil/copper_bolt' })
|
||||
event.remove({ id: 'firmaciv:crafting/watercraft_frame_angled_2' }) // Как же меня заебал разраб со своими кривыми руками
|
||||
//#region Удаление рецептов
|
||||
|
||||
//#endregion
|
||||
event.remove({ id: '/firmaciv:quern/' })
|
||||
event.remove({ id: 'firmaciv:anvil/copper_bolt' })
|
||||
event.remove({ id: 'firmaciv:crafting/watercraft_frame_angled_2' }) // Как же меня заебал разраб со своими кривыми руками
|
||||
event.remove("firmaciv:heating/cleat")
|
||||
event.remove("firmaciv:heating/oarlock")
|
||||
event.remove("firmaciv:heating/cannonball")
|
||||
|
||||
//#region Unfinished Sextant
|
||||
event.recipes.tfc.heating('firmaciv:unfinished_sextant', 930)
|
||||
.resultFluid(Fluid.of('gtceu:brass', 288))
|
||||
.id(`firmaciv:heating/unfinished_sextant`)
|
||||
//#endregion
|
||||
//#endregion
|
||||
|
||||
//#region Sextant
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/sextant')
|
||||
.itemInputs('#forge:plates/brass', '2x #forge:rods/brass', '#forge:glass')
|
||||
.circuit(10)
|
||||
.itemOutputs('firmaciv:sextant')
|
||||
.duration(75)
|
||||
.EUt(4)
|
||||
//#region Unfinished Sextant
|
||||
event.recipes.tfc.heating('firmaciv:unfinished_sextant', 930)
|
||||
.resultFluid(Fluid.of('gtceu:brass', 288))
|
||||
.id(`firmaciv:heating/unfinished_sextant`)
|
||||
//#endregion
|
||||
|
||||
event.recipes.tfc.heating('firmaciv:sextant', 930)
|
||||
.resultFluid(Fluid.of('gtceu:brass', 288))
|
||||
.id(`firmaciv:heating/sextant`)
|
||||
//#endregion
|
||||
//#region Sextant
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/sextant')
|
||||
.itemInputs('#forge:plates/brass', '#forge:small_gears/brass', '#forge:glass_panes')
|
||||
.circuit(10)
|
||||
.itemOutputs('firmaciv:sextant')
|
||||
.duration(75)
|
||||
.EUt(4)
|
||||
|
||||
//#region Unfinished Navigator Timepiece
|
||||
event.recipes.tfc.heating('firmaciv:unfinished_nav_clock', 930)
|
||||
.resultFluid(Fluid.of('gtceu:brass', 288))
|
||||
.id(`firmaciv:heating/unfinished_nav_clock`)
|
||||
event.recipes.tfc.heating('firmaciv:sextant', 930)
|
||||
.resultFluid(Fluid.of('gtceu:brass', 288))
|
||||
.id(`firmaciv:heating/sextant`)
|
||||
//#endregion
|
||||
|
||||
event.replaceOutput( // This problem would come each time there's a double-plate recipe in an anvil. Dunno how to fix it other than that.
|
||||
'gtceu:arc_furnace/arc_unfinished_nav_clock',
|
||||
'gtceu:brass_ingot',
|
||||
'2x gtceu:brass_ingot')
|
||||
|
||||
event.replaceOutput(
|
||||
'gtceu:macerator/macerate_unfinished_nav_clock',
|
||||
'gtceu:brass_dust',
|
||||
'2x gtceu:brass_dust')
|
||||
//#endregion
|
||||
//#region Unfinished Navigator Timepiece
|
||||
event.recipes.tfc.heating('firmaciv:unfinished_nav_clock', 930)
|
||||
.resultFluid(Fluid.of('gtceu:brass', 288))
|
||||
.id(`firmaciv:heating/unfinished_nav_clock`)
|
||||
|
||||
//#region Navigator Timepiece
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/nav_clock')
|
||||
.itemInputs('2x #forge:plates/brass', '4x #forge:rods/brass', '2x #forge:glass')
|
||||
.circuit(11)
|
||||
.itemOutputs('firmaciv:nav_clock')
|
||||
.duration(75)
|
||||
.EUt(4)
|
||||
//#endregion
|
||||
|
||||
event.recipes.tfc.heating('firmaciv:nav_clock', 930)
|
||||
.resultFluid(Fluid.of('gtceu:brass', 576))
|
||||
.id(`firmaciv:heating/nav_clock`)
|
||||
//#endregion
|
||||
//#region Navigator Timepiece
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/nav_clock')
|
||||
.itemInputs('2x #forge:plates/brass', '3x #forge:small_gears/brass', '2x #forge:glass_panes')
|
||||
.circuit(11)
|
||||
.itemOutputs('firmaciv:nav_clock')
|
||||
.duration(75)
|
||||
.EUt(4)
|
||||
|
||||
//#region Unfinished Barometer
|
||||
event.recipes.tfc.heating('firmaciv:unfinished_barometer', 930)
|
||||
.resultFluid(Fluid.of('gtceu:brass', 144))
|
||||
.id(`firmaciv:heating/unfinished_barometer`)
|
||||
//#endregion
|
||||
event.recipes.tfc.heating('firmaciv:nav_clock', 930)
|
||||
.resultFluid(Fluid.of('gtceu:brass', 576))
|
||||
.id(`firmaciv:heating/nav_clock`)
|
||||
//#endregion
|
||||
|
||||
//#region Barometer
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/barometer')
|
||||
.itemInputs('2x #forge:plates/brass', '2x #forge:rods/brass', '#forge:glass')
|
||||
.inputFluids(Fluid.of('minecraft:water', 1000))
|
||||
.circuit(12)
|
||||
.itemOutputs('firmaciv:barometer')
|
||||
.duration(75)
|
||||
.EUt(4)
|
||||
//#region Unfinished Barometer
|
||||
event.recipes.tfc.heating('firmaciv:unfinished_barometer', 930)
|
||||
.resultFluid(Fluid.of('gtceu:brass', 144))
|
||||
.id(`firmaciv:heating/unfinished_barometer`)
|
||||
//#endregion
|
||||
|
||||
event.recipes.tfc.heating('firmaciv:barometer', 930)
|
||||
.resultFluid(Fluid.of('gtceu:brass', 216))
|
||||
.id(`firmaciv:heating/barometer`)
|
||||
//#endregion
|
||||
//#region Barometer
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/barometer')
|
||||
.itemInputs('#forge:plates/brass', '2x #forge:small_gears/brass', '#forge:glass_panes')
|
||||
.inputFluids(Fluid.of('minecraft:water', 1000))
|
||||
.circuit(12)
|
||||
.itemOutputs('firmaciv:barometer')
|
||||
.duration(75)
|
||||
.EUt(4)
|
||||
|
||||
//#region Compass
|
||||
event.recipes.gtceu.canner('tfg:firmaciv/compass')
|
||||
.itemInputs('minecraft:redstone', '#forge:plates/wrought_iron')
|
||||
.circuit(1)
|
||||
.itemOutputs('firmaciv:firmaciv_compass')
|
||||
.duration(100)
|
||||
.EUt(4)
|
||||
//#endregion
|
||||
event.recipes.tfc.heating('firmaciv:barometer', 930)
|
||||
.resultFluid(Fluid.of('gtceu:brass', 216))
|
||||
.id(`firmaciv:heating/barometer`)
|
||||
//#endregion
|
||||
|
||||
//#region Oarlock
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/oarlock')
|
||||
.itemInputs('#forge:double_plates/wrought_iron')
|
||||
.circuit(13)
|
||||
.itemOutputs('firmaciv:oarlock')
|
||||
.duration(75)
|
||||
.EUt(4)
|
||||
//#region Compass
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/compass')
|
||||
.itemInputs('#forge:plates/wrought_iron', '#forge:bolts/magnetic_iron', '#forge:glass_panes')
|
||||
.circuit(21)
|
||||
.itemOutputs('firmaciv:firmaciv_compass')
|
||||
.duration(100)
|
||||
.EUt(4)
|
||||
|
||||
event.recipes.tfc.heating('firmaciv:oarlock', 1535)
|
||||
.resultFluid(Fluid.of('gtceu:iron', 288))
|
||||
.id(`firmaciv:heating/oarlock`)
|
||||
//#endregion
|
||||
event.shapeless('firmaciv:firmaciv_compass', ['tfc:lens', '#tfc:bowls', '#tfc:magnetic_rocks'])
|
||||
//#endregion
|
||||
|
||||
//#region Cleat
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/cleat')
|
||||
.itemInputs('#forge:double_plates/steel')
|
||||
.circuit(14)
|
||||
.itemOutputs('firmaciv:cleat')
|
||||
.duration(75)
|
||||
.EUt(4)
|
||||
//#region Cannon Barrel
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/cannon_barrel')
|
||||
.itemInputs('#forge:double_plates/wrought_iron')
|
||||
.circuit(11)
|
||||
.itemOutputs('firmaciv:cannon_barrel')
|
||||
.duration(75)
|
||||
.EUt(4)
|
||||
|
||||
event.recipes.tfc.heating('firmaciv:cleat', 1535)
|
||||
.resultFluid(Fluid.of('gtceu:steel', 288))
|
||||
.id(`firmaciv:heating/cleat`)
|
||||
//#endregion
|
||||
event.recipes.tfc.heating('firmaciv:cannon_barrel', 1535)
|
||||
.resultFluid(Fluid.of('gtceu:iron', 288))
|
||||
.id(`firmaciv:heating/cannon_barrel`)
|
||||
//#endregion
|
||||
|
||||
//#region Anchor
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/anchor')
|
||||
.itemInputs('#forge:double_plates/steel')
|
||||
.circuit(10)
|
||||
.itemOutputs('firmaciv:anchor')
|
||||
.duration(75)
|
||||
.EUt(4)
|
||||
//#region Cannon
|
||||
event.recipes.tfc.heating('firmaciv:cannon', 1535)
|
||||
.resultFluid(Fluid.of('gtceu:iron', 1008))
|
||||
.id(`firmaciv:heating/cannon`)
|
||||
//#endregion
|
||||
|
||||
event.recipes.tfc.heating('firmaciv:anchor', 1535)
|
||||
.resultFluid(Fluid.of('gtceu:steel', 288))
|
||||
.id(`firmaciv:heating/anchor`)
|
||||
|
||||
event.replaceOutput(
|
||||
'gtceu:arc_furnace/arc_anchor',
|
||||
'gtceu:steel_ingot',
|
||||
'2x gtceu:steel_ingot')
|
||||
|
||||
event.replaceOutput(
|
||||
'gtceu:macerator/macerate_anchor',
|
||||
'gtceu:steel_dust',
|
||||
'2x gtceu:steel_dust')
|
||||
//#endregion
|
||||
|
||||
//#region Cannon Barrel
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/cannon_barrel')
|
||||
.itemInputs('#forge:double_plates/wrought_iron')
|
||||
.circuit(11)
|
||||
.itemOutputs('firmaciv:cannon_barrel')
|
||||
.duration(75)
|
||||
.EUt(4)
|
||||
|
||||
event.recipes.tfc.heating('firmaciv:cannon_barrel', 1535)
|
||||
.resultFluid(Fluid.of('gtceu:iron', 288))
|
||||
.id(`firmaciv:heating/cannon_barrel`)
|
||||
//#endregion
|
||||
|
||||
//#region Cannonball
|
||||
event.recipes.gtceu.assembler('tfg:firmaciv/cannonball')
|
||||
.itemInputs('#forge:double_plates/wrought_iron')
|
||||
.circuit(12)
|
||||
.itemOutputs('firmaciv:cannonball')
|
||||
.duration(75)
|
||||
.EUt(4)
|
||||
|
||||
event.recipes.tfc.heating('firmaciv:cannonball', 1535)
|
||||
.resultFluid(Fluid.of('gtceu:iron', 288))
|
||||
.id(`firmaciv:heating/cannonball`)
|
||||
|
||||
event.replaceOutput(
|
||||
'gtceu:arc_furnace/arc_cannon_barrel',
|
||||
'gtceu:wrought_iron_ingot',
|
||||
'2x gtceu:wrought_iron_ingot')
|
||||
|
||||
event.replaceOutput(
|
||||
'gtceu:macerator/macerate_cannon_barrel',
|
||||
'gtceu:iron_dust',
|
||||
'2x gtceu:iron_dust')
|
||||
//#endregion
|
||||
|
||||
//#region Cannon
|
||||
event.recipes.tfc.heating('firmaciv:cannon', 1535)
|
||||
.resultFluid(Fluid.of('gtceu:iron', 1872))
|
||||
.id(`firmaciv:heating/cannon`)
|
||||
//#endregion
|
||||
// #region More rope
|
||||
event.shaped('firmaciv:rope_coil', [
|
||||
'A ',
|
||||
'AB',
|
||||
'A '
|
||||
], {
|
||||
A: '#forge:cloth',
|
||||
B: '#forge:wax'
|
||||
}).id('tfg:firmaciv/rope_coil_from_cloth')
|
||||
// #endregion
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ const registerFirmaCivItemTags = (event) => {
|
|||
event.removeAllTagsFrom(item)
|
||||
event.add('c:hidden_from_recipe_viewers', item)
|
||||
})
|
||||
|
||||
event.add(`forge:rope`, `firmaciv:rope_coil`)
|
||||
}
|
||||
|
||||
const registerFirmaCivBlockTags = (event) => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue