diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bfbe9dc4..6226ff56f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased] ### Changes +- Remove various overlapping recipe conflicts. @Oosyrag ## [0.9.7] - 17.05.2025 ### Changes diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index e4a24671d..7af1fedb1 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1449,6 +1449,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:windmill_bearing') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(1) // #endregion @@ -1848,6 +1849,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:gantry_carriage') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(2) event.shaped('create:weighted_ejector', [ ' B ', diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 694169ff2..38eed5558 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -454,9 +454,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('4x firmalife:food/pizza_dough', ['firmalife:spice/basil_leaves', '#tfc:foods/dough', 'tfc:powder/salt', Fluid.of('tfc:olive_oil', 1000)]) - .id('firmalife:create/mixer/food/pizza_dough') - // Vanilla Ice Cream event.recipes.gtceu.mixer('firmalife:food/vanilla_ice_cream') .itemInputs('firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla') @@ -465,9 +462,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/vanilla_ice_cream', ['firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla', Fluid.of('firmalife:cream', 1000)]) - .id('firmalife:create/mixer/food/vanilla_ice_cream') - // Pumpkin Pie Dough event.recipes.gtceu.mixer('firmalife:food/pumpkin_pie_dough') .itemInputs('#tfc:sweetener', '#forge:eggs', '2x tfc:food/pumpkin_chunks', '#tfc:foods/flour') @@ -477,9 +471,6 @@ const registerFirmaLifeRecipes = (event) => { .EUt(16) .circuit(2) - event.recipes.create.mixing('firmalife:food/pumpkin_pie_dough', ['#tfc:sweetener', '#forge:eggs', '2x tfc:food/pumpkin_chunks', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)] - ).id('firmalife:create/mixer/food/pumpkin_pie_dough') - // Butter event.recipes.gtceu.mixer('firmalife:food/butter') .itemInputs('tfc:powder/salt') @@ -488,9 +479,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('firmalife:food/butter', ['tfc:powder/salt', Fluid.of('firmalife:cream', 1000)]) - .id('firmalife:create/mixer/food/butter') - // Pie Dough event.recipes.gtceu.mixer('firmalife:food/pie_dough') .itemInputs('#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour') @@ -500,9 +488,6 @@ const registerFirmaLifeRecipes = (event) => { .EUt(16) .circuit(2) - event.recipes.create.mixing('firmalife:food/pie_dough', ['#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)]) - .id('firmalife:create/mixer/food/pie_dough') - // Cookie Dough event.recipes.gtceu.mixer('firmalife:food/cookie_dough') .itemInputs('#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', '#forge:eggs', 'firmalife:spice/vanilla') @@ -510,9 +495,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('4x firmalife:food/cookie_dough', ['#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', '#forge:eggs', 'firmalife:spice/vanilla']) - .id('firmalife:create/mixer/food/cookie_dough') - // Hardtack Dough event.recipes.gtceu.mixer('firmalife:food/hardtack_dough') .itemInputs('tfc:powder/salt', '#tfc:foods/flour') @@ -522,9 +504,6 @@ const registerFirmaLifeRecipes = (event) => { .EUt(16) .circuit(2) - event.recipes.create.mixing('4x firmalife:food/hardtack_dough', ['tfc:powder/salt', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)]) - .id('firmalife:create/mixer/food/hardtack_dough') - // Yeast starter event.recipes.gtceu.mixer('firmalife:yeast_starter') .inputFluids(Fluid.of('firmalife:yeast_starter', 100)) @@ -534,9 +513,6 @@ const registerFirmaLifeRecipes = (event) => { .EUt(8) .circuit(1) - event.recipes.create.mixing(Fluid.of('firmalife:yeast_starter', 600), ['#tfc:foods/flour', Fluid.of('firmalife:yeast_starter', 100)]) - .id('firmalife:create/mixer/yeast_starter') - // Cocoa Powder event.recipes.gtceu.macerator('firmalife:food/cocoa_powder') .itemInputs('gtceu:cocoa_dust') @@ -558,9 +534,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('firmalife:food/chocolate_ice_cream', ['firmalife:food/vanilla_ice_cream', Fluid.of('firmalife:chocolate', 1000)]) - .id('firmalife:create/mixer/food/chocolate_ice_cream') - // White Chocolate Blend event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/milk') .itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener') @@ -569,9 +542,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('minecraft:milk', 1000)]) - .id('firmalife:create/mixer/food/white_chocolate_blend/milk') - event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/yak_milk') .itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:yak_milk', 1000)) @@ -579,9 +549,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:yak_milk', 1000)]) - .id('firmalife:create/mixer/food/white_chocolate_blend/yak_milk') - event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/goat_milk') .itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:goat_milk', 1000)) @@ -589,9 +556,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:goat_milk', 1000)]) - .id('firmalife:create/mixer/food/white_chocolate_blend/goat_milk') - event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/coconut_milk') .itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:coconut_milk', 1000)) @@ -599,9 +563,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:coconut_milk', 1000)]) - .id('firmalife:create/mixer/food/white_chocolate_blend/coconut_milk') - // Dark Chocolate Blend event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/milk') .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') @@ -610,9 +571,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('minecraft:milk', 1000)]) - .id('firmalife:create/mixer/food/dark_chocolate_blend/milk') - event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/yak_milk') .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:yak_milk', 1000)) @@ -620,9 +578,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('firmalife:yak_milk', 1000)]) - .id('firmalife:create/mixer/food/dark_chocolate_blend/yak_milk') - event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/goat_milk') .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:goat_milk', 1000)) @@ -630,8 +585,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('firmalife:goat_milk', 1000)]) - .id('firmalife:create/mixer/food/dark_chocolate_blend/goat_milk') event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/coconut_milk') .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') @@ -640,9 +593,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('firmalife:coconut_milk', 1000)]) - .id('firmalife:create/mixer/food/dark_chocolate_blend/coconut_milk') - // Milk Chocolate Blend event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/milk') .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') @@ -651,9 +601,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('minecraft:milk', 1000)]) - .id('firmalife:create/mixer/food/milk_chocolate_blend/milk') - event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/yak_milk') .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:yak_milk', 1000)) @@ -661,9 +608,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:yak_milk', 1000)]) - .id('firmalife:create/mixer/food/milk_chocolate_blend/yak_milk') - event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/goat_milk') .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:goat_milk', 1000)) @@ -671,9 +615,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:goat_milk', 1000)]) - .id('firmalife:create/mixer/food/milk_chocolate_blend/goat_milk') - event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/coconut_milk') .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:coconut_milk', 1000)) @@ -681,9 +622,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:coconut_milk', 1000)]) - .id('firmalife:create/mixer/food/milk_chocolate_blend/coconut_milk') - // Strawberry Ice Cream event.recipes.gtceu.mixer('firmalife:food/strawberry_ice_cream') .itemInputs('firmalife:food/vanilla_ice_cream', '2x tfc:food/strawberry') @@ -691,9 +629,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('firmalife:food/strawberry_ice_cream', ['firmalife:food/vanilla_ice_cream', '2x tfc:food/strawberry'] - ).id('firmalife:create/mixer/food/strawberry_ice_cream') - // Hardtack Dough event.recipes.gtceu.mixer('firmalife:food/chocolate_chip_cookie_dough') .itemInputs('4x firmalife:food/cookie_dough', '#firmalife:chocolate_blends') @@ -701,9 +636,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('4x firmalife:food/chocolate_chip_cookie_dough', ['4x firmalife:food/cookie_dough', '#firmalife:chocolate_blends']) - .id('firmalife:create/mixer/food/chocolate_chip_cookie_dough') - //#endregion //#region Обжарка некоторой еды