Forge, Anvil Tweaks (#1417)
* rearrange anvil sequences to match convention * add heating and melting to basic forgeable gears * another anvil tweak * Update changelog * typo! * refactor heating and forging of small gears * refactor gear forging to use built-in material forge tier * one last fix --------- Signed-off-by: Gustavo <77560533+gustovafing@users.noreply.github.com> Co-authored-by: Gustavo <77560533+gustovafing@users.noreply.github.com> Co-authored-by: Pyritie <pyritie@gmail.com>
This commit is contained in:
Zippity
GitHub
parent
87f9d0cf6d
commit
5f151cdab2
6 changed files with 41 additions and 46 deletions
|
|
@ -289,7 +289,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
.id(`tfc:heating/metal/${material.getName()}_fish_hook`)
|
||||
|
||||
// Крюк удочки
|
||||
event.recipes.tfc.anvil(`tfc:metal/fish_hook/${material.getName()}`, plateItem, ['draw_not_last', 'bend_any', 'hit_any'])
|
||||
event.recipes.tfc.anvil(`tfc:metal/fish_hook/${material.getName()}`, plateItem, ['bend_any', 'hit_any', 'draw_not_last'])
|
||||
.tier(tfcProperty.getTier())
|
||||
.bonus(true)
|
||||
.id(`tfc:anvil/${material.getName()}_fish_hook`)
|
||||
|
|
@ -604,10 +604,27 @@ function registerTFCMaterialsRecipes(event) {
|
|||
}
|
||||
}
|
||||
|
||||
// Small Gears
|
||||
let smallGearItem = ChemicalHelper.get(TagPrefix.gearSmall, material, 1)
|
||||
if (!smallGearItem.isEmpty()) {
|
||||
|
||||
if (tfcProperty.getMeltTemp() <= 1540) {
|
||||
event.recipes.tfc.heating(`gtceu:small_${material.getName()}_gear`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(`gtceu:${material.getName()}`, 144))
|
||||
.id(`tfc:heating/small_${material.getName()}_gear`)
|
||||
}
|
||||
|
||||
if (material.hasFlag(MaterialFlags.GENERATE_SMALL_GEAR)) {
|
||||
event.recipes.tfc.anvil(`gtceu:small_${material.getName()}_gear`, `#forge:ingots/${material.getName()}`, ['hit_last', 'shrink_second_last', 'draw_third_last'])
|
||||
.tier(tfcProperty.getTier())
|
||||
.id(`tfc:anvil/small_${material.getName()}_gear`)
|
||||
}
|
||||
}
|
||||
|
||||
// Tools (From Ingot)
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
|
||||
|
||||
//#region Кирка
|
||||
//#region pickaxe
|
||||
|
||||
// Крафт инструмента
|
||||
event.remove({ id: `tfc:crafting/metal/pickaxe/${material.getName()}` })
|
||||
|
|
@ -654,7 +671,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
}
|
||||
//#endregion
|
||||
|
||||
// #region Mattock
|
||||
// #region mattock
|
||||
event.recipes.tfc.heating(`rnr:metal/mattock/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.useDurability(true)
|
||||
|
|
@ -710,7 +727,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
.id(`gtceu:anvil/${material.getName()}_wire_cutter_head`)
|
||||
//#endregion
|
||||
|
||||
//#region Топор
|
||||
//#region axe
|
||||
|
||||
// Крафт инструмента
|
||||
event.remove({ id: `tfc:crafting/metal/axe/${material.getName()}` })
|
||||
|
|
@ -756,7 +773,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Лопата
|
||||
//#region shovel
|
||||
|
||||
// Крафт инструмента
|
||||
event.remove({ id: `tfc:crafting/metal/shovel/${material.getName()}` })
|
||||
|
|
@ -804,7 +821,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Мотыга
|
||||
//#region hoe
|
||||
|
||||
// Крафт инструмента
|
||||
event.remove({ id: `tfc:crafting/metal/hoe/${material.getName()}` })
|
||||
|
|
@ -850,7 +867,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Молот
|
||||
//#region crafting hammer
|
||||
|
||||
// Крафт инструмента
|
||||
event.remove({ id: `tfc:crafting/metal/hammer/${material.getName()}` })
|
||||
|
|
@ -898,7 +915,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Пила
|
||||
//#region saw
|
||||
|
||||
// Крафт инструмента
|
||||
event.remove({ id: `tfc:crafting/metal/saw/${material.getName()}` })
|
||||
|
|
@ -946,7 +963,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Коса
|
||||
//#region scythe
|
||||
|
||||
// Крафт инструмента
|
||||
event.remove({ id: `tfc:crafting/metal/scythe/${material.getName()}` })
|
||||
|
|
@ -992,7 +1009,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Напильник
|
||||
//#region file
|
||||
|
||||
// Декрафт инструмента в жидкость
|
||||
let fileItem = ToolHelper.get(GTToolType.FILE, material)
|
||||
|
|
@ -1021,7 +1038,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Нож
|
||||
//#region knife
|
||||
|
||||
// Крафт инструмента
|
||||
event.remove({ id: `tfc:crafting/metal/knife/${material.getName()}` })
|
||||
|
|
@ -1063,7 +1080,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
).id(`tfg:tfc/filling/${material.getName()}_knife_blade_mold`)
|
||||
}
|
||||
|
||||
//#region Ножницы
|
||||
//#region shears
|
||||
|
||||
// Сварка оголовий
|
||||
event.recipes.tfc.welding(`tfc:metal/shears/${material.getName()}`, knifeHeadItem, knifeHeadItem, tfcProperty.getTier())
|
||||
|
|
@ -1086,7 +1103,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Проспектор
|
||||
//#region prospector pick
|
||||
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/propick/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
|
|
@ -1115,7 +1132,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Стамеска
|
||||
//#region chisel
|
||||
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/chisel/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
|
|
@ -1144,7 +1161,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Копье
|
||||
//#region javelin
|
||||
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/javelin/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
|
|
@ -1240,7 +1257,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
.id(`tfc:heating/metal/${material.getName()}_anvil`)
|
||||
}
|
||||
|
||||
//#region Щипцы
|
||||
//#region tongs
|
||||
let tongsStack = Item.of(`tfchotornot:tongs/${material.getName()}`)
|
||||
let tongPartStack = Item.of(`tfchotornot:tong_part/${material.getName()}`)
|
||||
|
||||
|
|
@ -1255,12 +1272,12 @@ function registerTFCMaterialsRecipes(event) {
|
|||
C: '#forge:tools/hammers'
|
||||
}, 0, 0).id(`tfchotornot:crafting/tongs/${material.getName()}`)
|
||||
|
||||
// Ручка щипцов
|
||||
// tong parts
|
||||
event.recipes.tfc.heating(tongPartStack, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.id(`tfchotornot:heating/tong_part/${material.getName()}`)
|
||||
|
||||
// Щипцы
|
||||
// tong heating
|
||||
event.recipes.tfc.heating(tongsStack, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
|
||||
.useDurability(true)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue