diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 87ed684dd..488fac711 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -926,6 +926,11 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:rock_breaker/obsidian' }) event.remove({ id: 'gtceu:alloy_smelter/alloy_smelt_magnesia_refractory_brick_to_nugget' }) + + event.remove({ id: 'gtceu:mixer/concrete_from_calcite' }) + event.remove({ id: 'greate:mixing/integration/gtceu/mixer/concrete_from_calcite' }) + event.remove({ id: 'gtceu:mixer/concrete_from_clay' }) + event.remove({ id: 'greate:mixing/integration/gtceu/mixer/concrete_from_clay' }) } function removeMaceratorRecipe(event, id) { diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.concrete.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.concrete.js index 1fe0048ff..4e23c83d1 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.concrete.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.concrete.js @@ -7,7 +7,7 @@ function registerTFGConcreteRecipes(event) { event.recipes.gtceu.mixer('tfg:concrete_from_marble') .itemInputs( - Ingredient.of('#tfg:stone_dusts').subtract('tfg:sedimentary_carbonate_dust').withCount(2), + Ingredient.of('#tfg:stone_dusts').subtract('tfg:sedimentary_carbonate_dust').withCount(3), '#forge:dusts/sedimentary_carbonate', 'gtceu:gypsum_dust') .inputFluids("#tfg:clean_water 1000") @@ -15,13 +15,25 @@ function registerTFGConcreteRecipes(event) { .duration(40) .EUt(16) - generateMixerRecipe(event, ['3x #tfg:stone_dusts', 'gtceu:clay_dust'], - "#tfg:clean_water 500", [], null, 'gtceu:concrete 576', 20, 16, 64, 'tfg:concrete_from_clay') - - generateMixerRecipe(event, ['3x #tfg:stone_dusts', 'gtceu:calcite_dust', 'gtceu:gypsum_dust'], - "#tfg:clean_water 1000", [], null, 'gtceu:concrete 1152', 40, 16, 64, 'tfg:concrete_from_calcite') - + event.recipes.gtceu.mixer('tfg:concrete_from_clay') + .itemInputs( + Ingredient.of('#tfg:stone_dusts').subtract('tfg:sedimentary_carbonate_dust').withCount(3), + '#forge:dusts/sedimentary_carbonate', + 'gtceu:clay_dust') + .inputFluids("#tfg:clean_water 500") + .outputFluids('gtceu:concrete 576') + .duration(40) + .EUt(16) + event.recipes.gtceu.mixer('tfg:concrete_from_calcite') + .itemInputs( + Ingredient.of('#tfg:stone_dusts').subtract('tfg:sedimentary_carbonate_dust').withCount(3), + 'gtceu:calcite_dust', + 'gtceu:gypsum_dust') + .inputFluids("#tfg:clean_water 1000") + .outputFluids('gtceu:concrete 1152') + .duration(40) + .EUt(16) //GT light/dark concrete recipe fix @@ -70,11 +82,11 @@ function registerTFGConcreteRecipes(event) { // Handcrafted artisanal concrete event.recipes.firmalife.mixing_bowl() - .ingredients(['#tfg:stone_dusts', '#tfg:stone_dusts', '#forge:dusts/sedimentary_carbonate', '#forge:dusts/gypsum'], Fluid.of('minecraft:water', 1000)) + .ingredients(['#tfg:stone_dusts', '#tfg:stone_dusts', '#tfg:stone_dusts', '#forge:dusts/sedimentary_carbonate', '#forge:dusts/gypsum'], Fluid.of('minecraft:water', 1000)) .outputFluid(Fluid.of('gtceu:concrete', 1000)) event.recipes.firmalife.mixing_bowl() - .ingredients(['#tfg:stone_dusts', '#tfg:stone_dusts', '#tfg:stone_dusts', '#forge:dusts/clay'], Fluid.of('minecraft:water', 500)) + .ingredients(['#tfg:stone_dusts', '#tfg:stone_dusts', '#tfg:stone_dusts', '#forge:dusts/sedimentary_carbonate', '#forge:dusts/clay'], Fluid.of('minecraft:water', 500)) .outputFluid(Fluid.of('gtceu:concrete', 500)) event.recipes.firmalife.mixing_bowl()