diff --git a/kubejs/client_scripts/minecraft/constants.js b/kubejs/client_scripts/minecraft/constants.js index 488274c44..3823e83cc 100644 --- a/kubejs/client_scripts/minecraft/constants.js +++ b/kubejs/client_scripts/minecraft/constants.js @@ -150,7 +150,10 @@ const minecraftItemsToHide = [ 'minecraft:prismarine_brick_slab', 'minecraft:dark_prismarine_slab', 'minecraft:smooth_stone',*/ - + 'minecraft:sand', + 'minecraft:suspicious_sand', + 'minecraft:red_sand', + 'minecraft:wheat', 'minecraft:composter', 'minecraft:barrel', diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index a844540e6..864717dcd 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -37,10 +37,54 @@ const registerGTRecipes = (event) => { event.remove({id: 'gtceu:macerator/macerate_hay_block'}) event.remove({id: 'gtceu:shapeless/wheat_to_dust'}) - // Удаление других рецептов // + // Quartz Sand Dust + event.shaped('gtceu:quartz_sand_dust', [ + 'A', + 'B' + ], { + A: '#forge:sand', + B: '#forge:tools/mortars' + }).id('gtceu:shaped/quartz_sand') + + event.recipes.gtceu.macerator('quartz_sand_from_sand') + .itemInputs('#forge:sand') + .itemOutputs('gtceu:quartz_sand_dust') + .duration(30) + .EUt(2) + + // Silicon Dioxide Dust + event.recipes.gtceu.electrolyzer('sand_electrolysis') + .itemInputs('8x #forge:sand') + .itemOutputs('gtceu:silicon_dioxide_dust') + .duration(500) + .EUt(25) + + // Fertilizer + event.recipes.gtceu.mixer('fertilizer') + .itemInputs( + '#tfc:dirt', + '2x #forge:dusts/wood', + '4x #forge:sand' + ) + .inputFluids(Fluid.of('minecraft:water', 1000)) + .itemOutputs('4x gtceu:fertilizer') + .duration(300) + .EUt(30) + + event.recipes.gtceu.create_mixer('fertilizer') + .itemInputs( + '#tfc:dirt', + '2x #forge:dusts/wood', + '4x #forge:sand' + ) + .inputFluids(Fluid.of('minecraft:water', 1000)) + .itemOutputs('4x gtceu:fertilizer') + .duration(300) + .EUt(30) + // Low Pressure Steam Forge Hammer event.shaped('gtceu:lp_steam_forge_hammer', [ 'ABA', diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 5409bef4f..505a4b680 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -192,6 +192,26 @@ const registerMinecraftRecipes = (event) => { // Удаление рецептов связанных с Saddle event.remove({id: 'gtceu:shaped/saddle'}) + // Удаление рецептов связанных с песком + event.remove({id: 'gtceu:forge_hammer/smooth_sandstone_to_sand'}) + event.remove({id: 'gtceu:forge_hammer/sandstone_to_sand'}) + event.remove({id: 'gtceu:forge_hammer/chiseled_sandstone_to_sand'}) + + event.remove({id: 'gtceu:centrifuge/soul_sand_separation'}) + event.remove({id: 'gtceu:centrifuge/mycelium_separation'}) + event.remove({id: 'gtceu:centrifuge/endstone_separation'}) + + // Удаление рецептов связанных с красным песком + event.remove({id: 'gtceu:forge_hammer/smooth_red_sandstone_to_red_sand'}) + event.remove({id: 'gtceu:forge_hammer/red_sandstone_to_red_sand'}) + event.remove({id: 'gtceu:forge_hammer/chiseled_red_sandstone_to_red_sand'}) + + // Удаление рецептов связанных с SandStone + event.remove({id: 'minecraft:sandstone'}) + event.remove({id: 'gtceu:compressor/sandstone'}) + + // Удаление рецептов связанных с Red SandStone + // Удаление других рецептов event.remove({id: 'minecraft:blast_furnace'}) event.remove({id: 'minecraft:fire_charge'}) @@ -220,6 +240,20 @@ const registerMinecraftRecipes = (event) => { event.smelting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_smelting_raw_gold').xp(0.7) event.blasting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_blasting_raw_gold').xp(0.7) + // Стекло + event.recipes.gtceu.alloy_smelter('glass') + .itemInputs('#forge:dusts/glass') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:glass') + .duration(120) + .EUt(16) + + event.recipes.gtceu.arc_furnace('glass_from_sand') + .itemInputs('#forge:sand') + .itemOutputs('2x minecraft:glass') + .duration(20) + .EUt(30) + // Компаратор event.shaped('minecraft:comparator', [ ' A ', diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index fa1f9c804..6b310e86c 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -868,6 +868,61 @@ const registerTFCRecipes = (event) => { .itemOutputs('2x tfc:food/wheat_flour') .duration(400) .EUt(16) + + // Песок + event.recipes.gtceu.centrifuge('oilsands_ore_separation') + .itemInputs('#forge:ores/oilsands') + .chancedOutput('tfc:sand/yellow', 5000, 5000) + .outputFluids(Fluid.of('gtceu:oil', 2000)) + .duration(200) + .EUt(30) + + event.recipes.gtceu.centrifuge('oilsands_dust_separation') + .itemInputs('#forge:dusts/oilsands') + .chancedOutput('tfc:sand/yellow', 5000, 5000) + .outputFluids(Fluid.of('gtceu:heavy_oil', 2000)) + .duration(200) + .EUt(30) + + event.recipes.gtceu.centrifuge('red_sand_separation') + .itemInputs('tfc:sand/red') + .chancedOutput('gtceu:iron_dust', 5000, 500) + .chancedOutput('gtceu:diamond_tiny_dust', 100, 100) + .chancedOutput('tfc:sand/yellow', 5000, 500) + .duration(200) + .EUt(30) + + event.recipes.gtceu.forge_hammer('gravel_to_sand') + .itemInputs('#tfc:rock/gravel') + .itemOutputs('tfc:sand/yellow') + .duration(10) + .EUt(16) + + global.sandColors.forEach(sandColor => { + event.recipes.gtceu.forge_hammer(`raw_${sandColor}_sandstone_to_sand`) + .itemInputs(`tfc:raw_sandstone/${sandColor}`) + .itemOutputs(`tfc:sand/${sandColor}`) + .duration(400) + .EUt(2) + + event.recipes.gtceu.forge_hammer(`smooth_${sandColor}_sandstone_to_sand`) + .itemInputs(`tfc:smooth_sandstone/${sandColor}`) + .itemOutputs(`tfc:sand/${sandColor}`) + .duration(400) + .EUt(2) + + event.recipes.gtceu.forge_hammer(`cut_${sandColor}_sandstone_to_sand`) + .itemInputs(`tfc:cut_sandstone/${sandColor}`) + .itemOutputs(`tfc:sand/${sandColor}`) + .duration(400) + .EUt(2) + + event.recipes.gtceu.compressor(`${sandColor}_sandstone`) + .itemInputs(`4x tfc:sand/${sandColor}`) + .itemOutputs(`tfc:raw_sandstone/${sandColor}`) + .duration(300) + .EUt(2) + }) } const registerAutoTFCHeatingRecipes = (event) => { diff --git a/kubejs/startup_scripts/constants.js b/kubejs/startup_scripts/constants.js index 2cf0e3dc3..bf64475a3 100644 --- a/kubejs/startup_scripts/constants.js +++ b/kubejs/startup_scripts/constants.js @@ -57,4 +57,14 @@ global.slabTypes = [ 'mossy_bricks', 'mossy_cobble', 'cracked_bricks' -]; \ No newline at end of file +]; + +global.sandColors = [ + 'brown', + 'white', + 'black', + 'red', + 'yellow', + 'green', + 'pink' +] \ No newline at end of file