From b1dfc5c379286d96fdf2c60b0805bf73f12ec96c Mon Sep 17 00:00:00 2001 From: Redeix Date: Mon, 28 Apr 2025 19:38:29 -0500 Subject: [PATCH 1/2] - Added recipe to separate fertilizer into pure sources, and mix them back together. - Added recipes to sew hides together and cut them apart. --- CHANGELOG.md | 2 + kubejs/server_scripts/tfc/recipes.js | 74 +++++++++++++++++++ kubejs/server_scripts/tfc/recipes.machines.js | 3 + 3 files changed, 79 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bf502701..1d81d7377 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,8 @@ - Allowed more blocks to be used as oven, forge, and bloomery insulation. - Fixed lang error with treated wood planks recipe. - Fixed bug with mmc package. +- Added recipe to separate fertilizer into pure sources, and mix them back together. +- Added recipes to sew hides together and cut them apart. ## [0.9.1] - 18.04.2025 ### Changes diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index f59f52eb7..274f75e06 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -238,4 +238,78 @@ const registerTFCRecipes = (event) => { event.recipes.shapeless('gtceu:small_brass_gear', [ 'tfc:brass_mechanisms' ]).id('tfg:replace_brass_mechanisms') event.replaceInput({ input: 'tfc:brass_mechanisms' }, 'tfc:brass_mechanisms', 'gtceu:small_brass_gear') + // Fertilizers + event.recipes.gtceu.centrifuge('tfg:gtceu/centrifuge/pure_fertilizers') + .itemInputs('1x gtceu:fertilizer') + .itemOutputs('1x tfc:pure_nitrogen', '1x tfc:pure_potassium', '1x tfc:pure_phosphorus') + .duration(340) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.mixer('tfg:tfc/mixer/fertilizer') + .itemInputs('1x tfc:pure_nitrogen', '1x tfc:pure_potassium', '1x tfc:pure_phosphorus', ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Clay, 1)) + .itemOutputs('1x gtceu:fertilizer') + .duration(160) + .EUt(GTValues.VA[GTValues.ULV]) + + //Hide Sewing + const stages = [ + 'raw', + 'soaked', + 'scraped', + 'prepared', + 'sheepskin' + ]; + + const sizes = [ + 'small', + 'medium', + 'large' + ]; + + stages.forEach((stage) => { + sizes.forEach((size, index) => { + // Find the next larger size. + const nextLarger = sizes[index + 1]; + + // If a larger size exists, sew the hides together. + if (nextLarger) { + event.recipes.tfc.damage_inputs_shapeless_crafting( + event.shapeless(`1x tfc:${nextLarger}_${stage}_hide`, [ + `2x tfc:${size}_${stage}_hide`, + '#tfc:sewing_needles', + '#forge:string', + 'tfc:glue' + ]).id(`tfg:tfc/${size}_to_${nextLarger}_${stage}_hide`) + ) + + event.recipes.gtceu.assembler(`tfg:gtceu/assembler/${size}_to_${nextLarger}_${stage}_hide`) + .inputFluids(Fluid.of('gtceu:glue', 25)) + .itemOutputs(`1x tfc:${nextLarger}_${stage}_hide`) + .itemInputs(`2x tfc:${size}_${stage}_hide`) + .duration(60) + .circuit(7) + .EUt(GTValues.VA[GTValues.ULV]) + } + + // Find the next smaller size. + const nextSmaller = sizes[index - 1]; + + // If a smaller size exists, cut the hide. + if (nextSmaller) { + event.recipes.tfc.damage_inputs_shapeless_crafting( + event.shapeless(`2x tfc:${nextSmaller}_${stage}_hide`, [ + `1x tfc:${size}_${stage}_hide`, + '#forge:shears' + ]).id(`tfg:tfc/${size}_to_${nextSmaller}_${stage}_hide`) + ) + + event.recipes.gtceu.assembler(`tfg:gtceu/assembler/${size}_to_${nextSmaller}_${stage}_hide`) + .itemOutputs(`2x tfc:${nextSmaller}_${stage}_hide`) + .itemInputs(`1x tfc:${size}_${stage}_hide`) + .duration(60) + .circuit(4) + .EUt(GTValues.VA[GTValues.ULV]) + } + }); + }); } diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index 3d92f1b3c..2a37bf77f 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -409,6 +409,7 @@ function registerTFCMachineRecipes(event) { .itemInputs('tfc:small_sheepskin_hide') .itemOutputs('tfc:wool') .duration(100) + .circuit(3) .EUt(4) // 1x Medium SheepSkin -> 1x Wool @@ -416,6 +417,7 @@ function registerTFCMachineRecipes(event) { .itemInputs('tfc:medium_sheepskin_hide') .itemOutputs('2x tfc:wool') .duration(100) + .circuit(3) .EUt(4) // 1x Large SheepSkin -> 1x Wool @@ -423,6 +425,7 @@ function registerTFCMachineRecipes(event) { .itemInputs('tfc:large_sheepskin_hide') .itemOutputs('3x tfc:wool') .duration(100) + .circuit(3) .EUt(4) // Wool Yarn From b276adafbede9fcc9a076f874ec1a4cf48dd3fb0 Mon Sep 17 00:00:00 2001 From: Redeix Date: Wed, 30 Apr 2025 11:59:43 -0500 Subject: [PATCH 2/2] - Fixed supports --- CHANGELOG.md | 1 + kubejs/server_scripts/tfc/data.js | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b690294c..99e7982b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Fixed speed of bulk washing - Lowered SU requirements of some more Create machines - Reduced how many sticks were being placed in the nether +- Fixed new supports to work correctly ## [0.9.2] ### Changes diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index d161fa580..c9d94bb9a 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -266,19 +266,19 @@ const registerTFCFoodData = (event) => { //#region registerTFCSupportData //up, down, horizontal const registerTFCSupportData = (event) => { - event.support('tfg:light_concrete_support', 4, 4, 8, 'light_concrete_support') - event.support('tfg:dark_concrete_support', 4, 4, 8, 'dark_concrete_support') - event.support('tfg:reinforced_light_concrete_support', 6, 6, 16, 'reinforced_light_concrete_support') - event.support('tfg:reinforced_dark_concrete_support', 6, 6, 16, 'reinforced_dark_concrete_support') - event.support('tfg:rebar_support', 4, 4, 8, 'rebar_support') - event.support('tfg:steel_support', 6, 6, 16, 'steel_support') + event.support('tfg:light_concrete_support_horizontal', 4, 4, 8, 'light_concrete_support') + event.support('tfg:dark_concrete_support_horizontal', 4, 4, 8, 'dark_concrete_support') + event.support('tfg:reinforced_light_concrete_support_horizontal', 6, 6, 16, 'reinforced_light_concrete_support') + event.support('tfg:reinforced_dark_concrete_support_horizontal', 6, 6, 16, 'reinforced_dark_concrete_support') + event.support('tfg:rebar_support_horizontal', 4, 4, 8, 'rebar_support') + event.support('tfg:steel_support_horizontal', 6, 6, 16, 'steel_support') const other_stone = ['pyroxenite', 'migmatite', 'travertine'] const stone_types = global.TFC_STONE_TYPES.concat(other_stone) stone_types.forEach(stone => { - event.support(`tfg:${stone}_support`, 2, 2, 4, `${stone}_support`) + event.support(`tfg:${stone}_support_horizontal`, 2, 2, 4, `${stone}_support`) }) } //#endregion