merge
This commit is contained in:
commit
1d326f820e
12 changed files with 3326 additions and 3091 deletions
|
|
@ -9,6 +9,9 @@ function registerTFCMaterialsRecipes(event) {
|
|||
if (tfcProperty === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Add any other early game metals here with GT tools but no TFC ones
|
||||
const onlyHasGTTools = material === GTMaterials.Invar;
|
||||
|
||||
let outputMaterial = (tfcProperty.getOutputMaterial() === null) ? material : tfcProperty.getOutputMaterial()
|
||||
|
||||
|
|
@ -224,7 +227,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
}
|
||||
|
||||
// Tools (From Double Plate)
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) && !onlyHasGTTools) {
|
||||
//#region Фурма
|
||||
|
||||
// Декрафт инструмента в жидкость
|
||||
|
|
@ -298,7 +301,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
}
|
||||
|
||||
// Tools (From Plate)
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) && !onlyHasGTTools) {
|
||||
//#region Удочка
|
||||
|
||||
// Декрафт оголовья в жидкость
|
||||
|
|
@ -375,32 +378,32 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#region Дубина
|
||||
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/mace/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
|
||||
.useDurability(true)
|
||||
.id(`tfc:heating/metal/${material.getName()}_mace`)
|
||||
if (!onlyHasGTTools) {
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/mace/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
|
||||
.useDurability(true)
|
||||
.id(`tfc:heating/metal/${material.getName()}_mace`)
|
||||
|
||||
// Металл + Форма -> Оголовье
|
||||
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
|
||||
event.recipes.tfc.casting(`tfc:metal/mace_head/${material.getName()}`, 'tfc:ceramic/mace_head_mold', Fluid.of(outputMaterial.getFluid(), 288), 1)
|
||||
.id(`tfc:casting/${material.getName()}_mace_head`)
|
||||
// Металл + Форма -> Оголовье
|
||||
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
|
||||
event.recipes.tfc.casting(`tfc:metal/mace_head/${material.getName()}`, 'tfc:ceramic/mace_head_mold', Fluid.of(outputMaterial.getFluid(), 288), 1)
|
||||
.id(`tfc:casting/${material.getName()}_mace_head`)
|
||||
|
||||
event.recipes.create.filling(
|
||||
Item.of('tfc:ceramic/mace_head_mold', getFillingNBT(outputMaterial, 288)),
|
||||
[
|
||||
Fluid.of(outputMaterial.getFluid(), 288),
|
||||
Item.of('tfc:ceramic/mace_head_mold').strongNBT()
|
||||
]
|
||||
).id(`tfg:tfc/filling/${material.getName()}_mace_head`)
|
||||
event.recipes.create.filling(
|
||||
Item.of('tfc:ceramic/mace_head_mold', getFillingNBT(outputMaterial, 288)),
|
||||
[
|
||||
Fluid.of(outputMaterial.getFluid(), 288),
|
||||
Item.of('tfc:ceramic/mace_head_mold').strongNBT()
|
||||
]
|
||||
).id(`tfg:tfc/filling/${material.getName()}_mace_head`)
|
||||
}
|
||||
|
||||
// Декрафт оголовья в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/mace_head/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
|
||||
.id(`tfc:heating/metal/${material.getName()}_mace_head`)
|
||||
}
|
||||
|
||||
// Декрафт оголовья в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/mace_head/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
|
||||
.id(`tfc:heating/metal/${material.getName()}_mace_head`)
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Мясницкий нож
|
||||
|
|
@ -690,14 +693,16 @@ function registerTFCMaterialsRecipes(event) {
|
|||
//#endregion
|
||||
|
||||
// #region mattock
|
||||
event.recipes.tfc.heating(`rnr:metal/mattock/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.useDurability(true)
|
||||
.id(`rnr:heating/metal/${material.getName()}_mattock`)
|
||||
if (!onlyHasGTTools) {
|
||||
event.recipes.tfc.heating(`rnr:metal/mattock/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.useDurability(true)
|
||||
.id(`rnr:heating/metal/${material.getName()}_mattock`)
|
||||
|
||||
event.recipes.tfc.heating(`rnr:metal/mattock_head/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.id(`rnr:heating/metal/${material.getName()}_mattock_head`)
|
||||
event.recipes.tfc.heating(`rnr:metal/mattock_head/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.id(`rnr:heating/metal/${material.getName()}_mattock_head`)
|
||||
}
|
||||
//#endregion
|
||||
|
||||
// #region screwdriver
|
||||
|
|
@ -1101,20 +1106,21 @@ function registerTFCMaterialsRecipes(event) {
|
|||
//#region shears
|
||||
|
||||
// Сварка оголовий
|
||||
event.recipes.tfc.welding(`tfc:metal/shears/${material.getName()}`, knifeHeadItem, knifeHeadItem, tfcProperty.getTier())
|
||||
.id(`tfc:welding/${material.getName()}_shears`)
|
||||
if (!onlyHasGTTools) {
|
||||
event.recipes.tfc.welding(`tfc:metal/shears/${material.getName()}`, knifeHeadItem, knifeHeadItem, tfcProperty.getTier())
|
||||
.id(`tfc:welding/${material.getName()}_shears`)
|
||||
|
||||
event.recipes.greate.compacting(`tfc:metal/shears/${material.getName()}`, [knifeHeadItem, knifeHeadItem, 'tfc:powder/flux'])
|
||||
.heated()
|
||||
.recipeTier(tfcProperty.getTier() < 4 ? 0 : 1)
|
||||
.id(`greate:compacting/${material.getName()}_shears`)
|
||||
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/shears/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
|
||||
.useDurability(true)
|
||||
.id(`tfc:heating/metal/${material.getName()}_shears`)
|
||||
event.recipes.greate.compacting(`tfc:metal/shears/${material.getName()}`, [knifeHeadItem, knifeHeadItem, 'tfc:powder/flux'])
|
||||
.heated()
|
||||
.recipeTier(tfcProperty.getTier() < 4 ? 0 : 1)
|
||||
.id(`greate:compacting/${material.getName()}_shears`)
|
||||
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/shears/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
|
||||
.useDurability(true)
|
||||
.id(`tfc:heating/metal/${material.getName()}_shears`)
|
||||
}
|
||||
//#endregion
|
||||
|
||||
}
|
||||
|
|
@ -1123,89 +1129,90 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#region prospector pick
|
||||
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/propick/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.useDurability(true)
|
||||
.id(`tfc:heating/metal/${material.getName()}_propick`)
|
||||
if (!onlyHasGTTools) {
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/propick/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.useDurability(true)
|
||||
.id(`tfc:heating/metal/${material.getName()}_propick`)
|
||||
|
||||
// Декрафт оголовья в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/propick_head/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.id(`tfc:heating/metal/${material.getName()}_propick_head`)
|
||||
// Декрафт оголовья в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/propick_head/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.id(`tfc:heating/metal/${material.getName()}_propick_head`)
|
||||
|
||||
// Металл + Форма -> Оголовье
|
||||
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
|
||||
event.recipes.tfc.casting(`tfc:metal/propick_head/${material.getName()}`, 'tfc:ceramic/propick_head_mold', Fluid.of(outputMaterial.getFluid(), 144), 1)
|
||||
.id(`tfc:casting/${material.getName()}_propick_head`)
|
||||
// Металл + Форма -> Оголовье
|
||||
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
|
||||
event.recipes.tfc.casting(`tfc:metal/propick_head/${material.getName()}`, 'tfc:ceramic/propick_head_mold', Fluid.of(outputMaterial.getFluid(), 144), 1)
|
||||
.id(`tfc:casting/${material.getName()}_propick_head`)
|
||||
|
||||
event.recipes.create.filling(
|
||||
Item.of('tfc:ceramic/propick_head_mold', getFillingNBT(outputMaterial, 144)),
|
||||
[
|
||||
Fluid.of(outputMaterial.getFluid(), 144),
|
||||
Item.of('tfc:ceramic/propick_head_mold').strongNBT()
|
||||
]
|
||||
).id(`tfg:tfc/filling/${material.getName()}_propick_head_mold`)
|
||||
event.recipes.create.filling(
|
||||
Item.of('tfc:ceramic/propick_head_mold', getFillingNBT(outputMaterial, 144)),
|
||||
[
|
||||
Fluid.of(outputMaterial.getFluid(), 144),
|
||||
Item.of('tfc:ceramic/propick_head_mold').strongNBT()
|
||||
]
|
||||
).id(`tfg:tfc/filling/${material.getName()}_propick_head_mold`)
|
||||
}
|
||||
}
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region chisel
|
||||
if (!onlyHasGTTools) {
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/chisel/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.useDurability(true)
|
||||
.id(`tfc:heating/metal/${material.getName()}_chisel`)
|
||||
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/chisel/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.useDurability(true)
|
||||
.id(`tfc:heating/metal/${material.getName()}_chisel`)
|
||||
// Декрафт оголовья в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/chisel_head/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.id(`tfc:heating/metal/${material.getName()}_chisel_head`)
|
||||
|
||||
// Декрафт оголовья в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/chisel_head/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.id(`tfc:heating/metal/${material.getName()}_chisel_head`)
|
||||
// Металл + Форма -> Оголовье
|
||||
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
|
||||
event.recipes.tfc.casting(`tfc:metal/chisel_head/${material.getName()}`, 'tfc:ceramic/chisel_head_mold', Fluid.of(outputMaterial.getFluid(), 144), 1)
|
||||
.id(`tfc:casting/${material.getName()}_chisel_head`)
|
||||
|
||||
// Металл + Форма -> Оголовье
|
||||
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
|
||||
event.recipes.tfc.casting(`tfc:metal/chisel_head/${material.getName()}`, 'tfc:ceramic/chisel_head_mold', Fluid.of(outputMaterial.getFluid(), 144), 1)
|
||||
.id(`tfc:casting/${material.getName()}_chisel_head`)
|
||||
|
||||
event.recipes.create.filling(
|
||||
Item.of('tfc:ceramic/chisel_head_mold', getFillingNBT(outputMaterial, 144)),
|
||||
[
|
||||
Fluid.of(outputMaterial.getFluid(), 144),
|
||||
Item.of('tfc:ceramic/chisel_head_mold').strongNBT()
|
||||
]
|
||||
).id(`tfg:tfc/filling/${material.getName()}_chisel_head_mold`)
|
||||
event.recipes.create.filling(
|
||||
Item.of('tfc:ceramic/chisel_head_mold', getFillingNBT(outputMaterial, 144)),
|
||||
[
|
||||
Fluid.of(outputMaterial.getFluid(), 144),
|
||||
Item.of('tfc:ceramic/chisel_head_mold').strongNBT()
|
||||
]
|
||||
).id(`tfg:tfc/filling/${material.getName()}_chisel_head_mold`)
|
||||
}
|
||||
}
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region javelin
|
||||
if (!onlyHasGTTools) {
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/javelin/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.useDurability(true)
|
||||
.id(`tfc:heating/metal/${material.getName()}_javelin`)
|
||||
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/javelin/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.useDurability(true)
|
||||
.id(`tfc:heating/metal/${material.getName()}_javelin`)
|
||||
// Декрафт оголовья в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/javelin_head/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.id(`tfc:heating/metal/${material.getName()}_javelin_head`)
|
||||
|
||||
// Декрафт оголовья в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/javelin_head/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.id(`tfc:heating/metal/${material.getName()}_javelin_head`)
|
||||
// Металл + Форма -> Оголовье
|
||||
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
|
||||
event.recipes.tfc.casting(`tfc:metal/javelin_head/${material.getName()}`, 'tfc:ceramic/javelin_head_mold', Fluid.of(outputMaterial.getFluid(), 144), 1)
|
||||
.id(`tfc:casting/${material.getName()}_javelin_head`)
|
||||
|
||||
// Металл + Форма -> Оголовье
|
||||
if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) {
|
||||
event.recipes.tfc.casting(`tfc:metal/javelin_head/${material.getName()}`, 'tfc:ceramic/javelin_head_mold', Fluid.of(outputMaterial.getFluid(), 144), 1)
|
||||
.id(`tfc:casting/${material.getName()}_javelin_head`)
|
||||
|
||||
event.recipes.create.filling(
|
||||
Item.of('tfc:ceramic/javelin_head_mold', getFillingNBT(outputMaterial, 144)),
|
||||
[
|
||||
Fluid.of(outputMaterial.getFluid(), 144),
|
||||
Item.of('tfc:ceramic/javelin_head_mold').strongNBT()
|
||||
]
|
||||
).id(`tfg:tfc/filling/${material.getName()}_javelin_head_mold`)
|
||||
event.recipes.create.filling(
|
||||
Item.of('tfc:ceramic/javelin_head_mold', getFillingNBT(outputMaterial, 144)),
|
||||
[
|
||||
Fluid.of(outputMaterial.getFluid(), 144),
|
||||
Item.of('tfc:ceramic/javelin_head_mold').strongNBT()
|
||||
]
|
||||
).id(`tfg:tfc/filling/${material.getName()}_javelin_head_mold`)
|
||||
}
|
||||
}
|
||||
|
||||
//#endregion
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue