Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added potin, cobalt, and cobalt brass as tfc metals, fixed ratios of tfc brass/bronze

Browse Source
This commit is contained in:
Pyritie
2025-08-07 00:39:42 +01:00
parent 4327da326f
commit cbad72ecf8
15 changed files with 2780 additions and 2694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kubejs/server_scripts/gregtech/data.js
View File

@@ -116,6 +116,10 @@ const registerGTCEUMetals = (event) => {
event.metal('gtceu:tin_alloy', 1250, 0.00829, '#forge:ingots/tin_alloy', '#forge:double_ingots/tin_alloy', '#forge:plates/tin_alloy', 3, 'tfg:tin_alloy')
event.metal('gtceu:lead', 330, 0.01729, '#forge:ingots/lead', '#forge:double_ingots/lead', '#forge:plates/lead', 2, 'tfg:lead')
event.metal('gtceu:invar', 1494, 0.00741, '#forge:ingots/invar', '#forge:double_ingots/invar', '#forge:plates/invar', 3, 'tfg:invar')
event.metal('gtceu:potin', 807, 0.0124, '#forge:ingots/potin', '#forge:double_ingots/potin', '#forge:plates/potin', 2, 'tfg:potin')
event.metal('gtceu:cobalt', 1495, 0.00857, '#forge:ingots/cobalt', '#forge:double_ingots/cobalt', '#forge:plates/cobalt', 3, 'tfg:cobalt')
event.metal('gtceu:cobalt_brass', 1060, 0.00857, '#forge:ingots/cobalt_brass', '#forge:double_ingots/cobalt_brass', '#forge:plates/cobalt_brass', 3, 'tfg:cobalt_brass')
event.metal('gtceu:aluminium_silicate', 1540, 0.00857, '#forge:ingots/aluminium_silicate', null, null, 1, 'tfg:aluminium_silicate')
}

1
kubejs/server_scripts/gregtech/recipes.js
View File

@@ -1355,5 +1355,4 @@ const registerGTCEURecipes = (event) => {
event.replaceOutput({ id: 'gtceu:cutter/treated_button' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button')
event.replaceOutput({ id: 'gtceu:cutter/treated_button_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button')
event.replaceOutput({ id: 'gtceu:cutter/treated_button_distilled_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button')
}

14
kubejs/server_scripts/gregtech/recipes.materials.js
View File

@@ -241,10 +241,10 @@ function registerGTCEUMetalRecipes(event) {
event.remove({ id: `gtceu:shaped/plate_double_${material.getName()}` })
if (material === GTMaterials.CobaltBrass || material === GTMaterials.Potin) {
if (material.getProperty(TFGPropertyKey.TFC_PROPERTY) === null) {
event.recipes.greate.compacting(doublePlateItem, [plateItem, plateItem, 'tfc:powder/flux'])
.heated()
.recipeTier(1)
.recipeTier(2)
.id(`greate:compacting/${material.getName()}_double_plate`)
event.remove({ id: `gtceu:bender/bend_${material.getName()}_plate_to_double_plate` })
@@ -254,11 +254,6 @@ function registerGTCEUMetalRecipes(event) {
.circuit(2)
.duration(20 * 5.8)
.EUt(24)
} else if (material.getProperty(TFGPropertyKey.TFC_PROPERTY) === null) {
event.recipes.greate.compacting(doublePlateItem, [plateItem, plateItem, 'tfc:powder/flux'])
.heated()
.recipeTier(2)
.id(`greate:compacting/${material.getName()}_double_plate`)
}
}
@@ -305,7 +300,7 @@ function registerGTCEUMetalRecipes(event) {
event.remove({ id: `gtceu:shaped/stick_long_stick_${material.getName()}` })
// Rod welding recipes for all of the other non-tfc materials, since those were handled in tfc/recipes.materials.js
if (material.getProperty(TFGPropertyKey.TFC_PROPERTY) === null) {
if (!material.hasProperty(TFGPropertyKey.TFC_PROPERTY)) {
event.recipes.greate.compacting(longRodItem, [shortRodItem, shortRodItem, 'tfc:powder/flux'])
.heated()
.recipeTier(1)
@@ -1078,7 +1073,7 @@ function registerGTCEUMetalRecipes(event) {
const doublePlateItem = ChemicalHelper.get(TagPrefix.plateDouble, material, 1)
if (buzzsawBladeItem === null || doublePlateItem === null) return;
let isLowTier = material === GTMaterials.CobaltBrass || material.hasProperty(TFGPropertyKey.TFC_PROPERTY)
let isLowTier = material.hasProperty(TFGPropertyKey.TFC_PROPERTY)
event.recipes.gtceu.lathe(`buzzsaw_gear_${material.getName()}`)
.itemInputs(doublePlateItem)
@@ -1167,6 +1162,7 @@ function registerGTCEUMetalRecipes(event) {
const toolProperty = material.getProperty(PropertyKey.TOOL)
const ingotProperty = material.getProperty(PropertyKey.INGOT)
const oreProperty = material.getProperty(PropertyKey.ORE)
if (toolProperty !== null) {
let circuit = 1;
makeToolRecipe(GTToolType.SWORD, TFGTagPrefix.toolHeadSword, 'tfg:sword_head_extruder_mold', circuit++, material)

23
kubejs/server_scripts/tfc/recipes.materials.js
View File

@@ -10,9 +10,6 @@ function registerTFCMaterialsRecipes(event) {
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()
// Ingots
@@ -227,7 +224,7 @@ function registerTFCMaterialsRecipes(event) {
}
// Tools (From Double Plate)
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) && !onlyHasGTTools) {
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
//#region Фурма
// Декрафт инструмента в жидкость
@@ -301,7 +298,7 @@ function registerTFCMaterialsRecipes(event) {
}
// Tools (From Plate)
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) && !onlyHasGTTools) {
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
//#region Удочка
// Декрафт оголовья в жидкость
@@ -328,7 +325,7 @@ function registerTFCMaterialsRecipes(event) {
}
// Tools (From Double Ingots)
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) || material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
//#region Меч
// Крафт инструмента
@@ -378,7 +375,7 @@ function registerTFCMaterialsRecipes(event) {
//#region Дубина
if (!onlyHasGTTools) {
if (!material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/mace/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
@@ -643,7 +640,7 @@ function registerTFCMaterialsRecipes(event) {
}
// Tools (From Ingot)
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) || material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
//#region pickaxe
@@ -693,7 +690,7 @@ function registerTFCMaterialsRecipes(event) {
//#endregion
// #region mattock
if (!onlyHasGTTools) {
if (!material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
event.recipes.tfc.heating(`rnr:metal/mattock/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.useDurability(true)
@@ -1106,7 +1103,7 @@ function registerTFCMaterialsRecipes(event) {
//#region shears
// Сварка оголовий
if (!onlyHasGTTools) {
if (!material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
event.recipes.tfc.welding(`tfc:metal/shears/${material.getName()}`, knifeHeadItem, knifeHeadItem, tfcProperty.getTier())
.id(`tfc:welding/${material.getName()}_shears`)
@@ -1135,7 +1132,7 @@ function registerTFCMaterialsRecipes(event) {
//#region prospector pick
if (!onlyHasGTTools) {
if (!material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/propick/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
@@ -1164,7 +1161,7 @@ function registerTFCMaterialsRecipes(event) {
//#endregion
//#region chisel
if (!onlyHasGTTools) {
if (!material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/chisel/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
@@ -1193,7 +1190,7 @@ function registerTFCMaterialsRecipes(event) {
//#endregion
//#region javelin
if (!onlyHasGTTools) {
if (!material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
// Декрафт инструмента в жидкость
event.recipes.tfc.heating(`tfc:metal/javelin/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))

28
kubejs/server_scripts/tfc/recipes.metals.js
View File

@@ -3,7 +3,21 @@
function registerTFCMetalsRecipes(event) {
//#region Рецепты для новых сплавов
//#region Alloying
// Fix ratios of TFC alloys to match GT's
event.recipes.tfc.alloy('tfc:bronze', [
TFC.alloyPart('tfc:copper', 0.7, 0.8),
TFC.alloyPart('tfc:tin', 0.2, 0.3)
]).id('tfc:alloy/bronze')
event.recipes.tfc.alloy('tfc:brass', [
TFC.alloyPart('tfc:copper', 0.7, 0.8),
TFC.alloyPart('tfc:zinc', 0.2, 0.3)
]).id('tfc:alloy/brass')
// New alloys
event.recipes.tfc.alloy('tfg:red_alloy', [
TFC.alloyPart('tfg:redstone', 0.75, 0.85),
@@ -20,6 +34,18 @@ function registerTFCMetalsRecipes(event) {
TFC.alloyPart('tfc:cast_iron', 0.30, 0.40)
]).id('tfg:alloy/invar')
event.recipes.tfc.alloy('tfg:potin', [
TFC.alloyPart('tfc:copper', 0.63, 0.69),
TFC.alloyPart('tfc:tin', 0.19, 0.25),
TFC.alloyPart('tfg:lead', 0.08, 0.14)
]).id('tfg:alloy/potin')
event.recipes.tfc.alloy('tfg:cobalt_brass', [
TFC.alloyPart('tfc:brass', 0.74, 0.81),
TFC.alloyPart('tfg:cobalt', 0.08, 0.14),
TFC.alloyPart('tfg:aluminium_silicate', 0.08, 0.14)
]).id('tfg:alloy/cobalt_brass')
//#endregion

7
kubejs/server_scripts/tfc/tags.js
View File

@@ -75,6 +75,9 @@ const registerTFCItemTags = (event) => {
event.add('tfc:pileable_double_ingots', 'gtceu:red_alloy_double_ingot')
event.add('tfc:pileable_double_ingots', 'gtceu:lead_double_ingot')
event.add('tfc:pileable_double_ingots', 'gtceu:invar_double_ingot')
event.add('tfc:pileable_double_ingots', 'gtceu:potin_double_ingot')
event.add('tfc:pileable_double_ingots', 'gtceu:cobalt_double_ingot')
event.add('tfc:pileable_double_ingots', 'gtceu:cobalt_brass_double_ingot')
// Рыба
event.add('minecraft:fishes', 'tfc:food/calamari')
@@ -490,6 +493,10 @@ const registerTFCFluidTags = (event) => {
event.add('tfc:usable_in_ingot_mold', 'gtceu:tin_alloy')
event.add('tfc:usable_in_ingot_mold', 'gtceu:lead')
event.add('tfc:usable_in_ingot_mold', 'gtceu:invar')
event.add('tfc:usable_in_ingot_mold', 'gtceu:potin')
event.add('tfc:usable_in_ingot_mold', 'gtceu:cobalt')
event.add('tfc:usable_in_ingot_mold', 'gtceu:cobalt_brass')
event.add('tfc:usable_in_ingot_mold', 'gtceu:aluminium_silicate')
event.add('tfc:usable_in_bell_mold', 'gtceu:bronze')
event.add('tfc:usable_in_bell_mold', 'gtceu:gold')