diff --git a/kubejs/client_scripts/create/constants.js b/kubejs/client_scripts/create/constants.js index c7f4eda76..99a6b99b7 100644 --- a/kubejs/client_scripts/create/constants.js +++ b/kubejs/client_scripts/create/constants.js @@ -12,4 +12,6 @@ const createItemsToHide = [ "create:golden_sheet", "create:zinc_ingot", "create:brass_ingot", + 'create:wheat_flour', + 'create:wheat_flour' ] diff --git a/kubejs/client_scripts/gregtech/constants.js b/kubejs/client_scripts/gregtech/constants.js index a88b3e7c2..2787caf31 100644 --- a/kubejs/client_scripts/gregtech/constants.js +++ b/kubejs/client_scripts/gregtech/constants.js @@ -6,7 +6,10 @@ const gtItemsToHide = [ 'gtceu:firebrick', 'gtceu:firebricks', 'gtceu:wood_drum', - 'gtceu:primitive_blast_furnace' + 'gtceu:primitive_blast_furnace', + 'gtceu:wheat_dust', + 'gtceu:wheat_small_dust', + 'gtceu:wheat_tiny_dust' ] const stoneTypesToHide = [ diff --git a/kubejs/client_scripts/minecraft/constants.js b/kubejs/client_scripts/minecraft/constants.js index 90a23dafd..488274c44 100644 --- a/kubejs/client_scripts/minecraft/constants.js +++ b/kubejs/client_scripts/minecraft/constants.js @@ -151,6 +151,8 @@ const minecraftItemsToHide = [ 'minecraft:dark_prismarine_slab', 'minecraft:smooth_stone',*/ + 'minecraft:wheat', + 'minecraft:composter', 'minecraft:barrel', 'minecraft:blast_furnace', 'minecraft:furnace', diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 77189d77a..a844540e6 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -24,6 +24,20 @@ const registerGTRecipes = (event) => { // Удаление рецептов связанных с BioChaff event.remove({id: 'gtceu:macerator/dirt_from_bio_chaff'}) + // Удаление рецептов связанных с Wheat Dust + event.remove({id: 'gtceu:packer/package_wheat_tiny_dust'}) + event.remove({id: 'gtceu:packer/package_wheat_small_dust'}) + event.remove({id: 'gtceu:packer/unpackage_wheat_tiny_dust'}) + event.remove({id: 'gtceu:packer/unpackage_wheat_small_dust'}) + event.remove({id: 'gtceu:shaped/tiny_dust_assembling_wheat'}) + event.remove({id: 'gtceu:shaped/small_dust_assembling_wheat'}) + event.remove({id: 'gtceu:shaped/tiny_dust_disassembling_wheat'}) + event.remove({id: 'gtceu:shaped/small_dust_disassembling_wheat'}) + event.remove({id: 'gtceu:macerator/macerate_wheat'}) + event.remove({id: 'gtceu:macerator/macerate_hay_block'}) + event.remove({id: 'gtceu:shapeless/wheat_to_dust'}) + + // Удаление других рецептов // diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 7b56a598f..257ede2fb 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -163,6 +163,13 @@ const registerMinecraftRecipes = (event) => { event.remove({id: 'gtceu:shaped/iron_bars'}) event.remove({id: 'gtceu:assembler/iron_bars'}) + // Удаление рецептов связанных с Wheat + event.remove({id: 'minecraft:packed_mud'}) + event.remove({id: 'minecraft:cookie'}) + event.remove({id: 'minecraft:cake'}) + event.remove({id: 'minecraft:bread'}) + event.remove({id: 'gtceu:packer/hay_block'}) + // Удаление других рецептов event.remove({id: 'minecraft:tripwire_hook'}) event.remove({id: 'minecraft:blast_furnace'}) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 26cfacd03..fa1f9c804 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -826,6 +826,48 @@ const registerTFCRecipes = (event) => { .itemOutputs('16x tfc:mortar') .duration(800) .EUt(8) + + // Barley Grain -> Barley Floor + event.recipes.gtceu.macerator('barley_flour') + .itemInputs('tfc:food/barley_grain') + .itemOutputs('2x tfc:food/barley_flour') + .duration(400) + .EUt(16) + + // Maize Grain -> Maize Floor + event.recipes.gtceu.macerator('maize_flour') + .itemInputs('tfc:food/maize_grain') + .itemOutputs('2x tfc:food/maize_flour') + .duration(400) + .EUt(16) + + // Oat Grain -> Oat Floor + event.recipes.gtceu.macerator('oat_flour') + .itemInputs('tfc:food/oat_grain') + .itemOutputs('2x tfc:food/oat_flour') + .duration(400) + .EUt(16) + + // Rye Grain -> Rye Floor + event.recipes.gtceu.macerator('rye_flour') + .itemInputs('tfc:food/rye_grain') + .itemOutputs('2x tfc:food/rye_flour') + .duration(400) + .EUt(16) + + // Rice Grain -> Rice Floor + event.recipes.gtceu.macerator('rice_flour') + .itemInputs('tfc:food/rice_grain') + .itemOutputs('2x tfc:food/rice_flour') + .duration(400) + .EUt(16) + + // Wheat Grain -> Wheat Floor + event.recipes.gtceu.macerator('wheat_flour') + .itemInputs('tfc:food/wheat_grain') + .itemOutputs('2x tfc:food/wheat_flour') + .duration(400) + .EUt(16) } const registerAutoTFCHeatingRecipes = (event) => { diff --git a/mods/almostunified-forge-1.20.1-0.7.2.jard b/mods/almostunified-forge-1.20.1-0.7.2.jard deleted file mode 100644 index fd9a78afd..000000000 Binary files a/mods/almostunified-forge-1.20.1-0.7.2.jard and /dev/null differ