diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js index c08d78872..872c69ba7 100644 --- a/kubejs/client_scripts/main_client_script.js +++ b/kubejs/client_scripts/main_client_script.js @@ -20,12 +20,12 @@ REIEvents.groupEntries(event => { }) REIEvents.removeCategories(event => { - /*registerMinecraftCategories(event) + registerMinecraftCategories(event) registerGTCEUCategories(event) - registerMoreRedCategories(event)*/ + registerMoreRedCategories(event) }) REIEvents.hide('fluid', event => { - /*hideTFCFluids(event) - hideFirmaLifeFluids(event)*/ + hideTFCFluids(event) + hideFirmaLifeFluids(event) }) diff --git a/kubejs/client_scripts/mods/minecraft.js b/kubejs/client_scripts/mods/minecraft.js index b939109b5..532e422d8 100644 --- a/kubejs/client_scripts/mods/minecraft.js +++ b/kubejs/client_scripts/mods/minecraft.js @@ -8,4 +8,11 @@ const hideMinecraftStuff = (event) => { const registerMinecraftCategories = (event) => { event.remove('minecraft:plugins/campfire') + event.remove('minecraft:plugins/composting') // TODO: Сделать с вариантами TFC + event.remove('minecraft:plugins/stripping') // TODO: Сделать с вариантами TFC + event.remove('minecraft:plugins/pathing') // TODO: Сделать с вариантами TFC + event.remove('minecraft:plugins/waxing') // TODO: Сделать с вариантами TFC + event.remove('minecraft:plugins/wax_scrapping') // TODO: Сделать с вариантами TFC + event.remove('minecraft:plugins/oxidizing') // TODO: Сделать с вариантами TFC + event.remove('minecraft:plugins/oxidation_scrapping') // TODO: Сделать с вариантами TFC } diff --git a/kubejs/server_scripts/ftb_quests/recipes.js b/kubejs/server_scripts/ftb_quests/recipes.js new file mode 100644 index 000000000..91b58da65 --- /dev/null +++ b/kubejs/server_scripts/ftb_quests/recipes.js @@ -0,0 +1,8 @@ +// priority: 0 + +const registerFTBQuestsRecipes = (event) => { + + // Удаление рецептов мода + event.remove({ mod: 'ftbquests' }) + event.remove({ mod: 'ftbfiltersystem' }); +} \ No newline at end of file diff --git a/kubejs/server_scripts/ftb_quests/tags.js b/kubejs/server_scripts/ftb_quests/tags.js new file mode 100644 index 000000000..c8d1e108b --- /dev/null +++ b/kubejs/server_scripts/ftb_quests/tags.js @@ -0,0 +1,9 @@ +// priority: 0 + +const registerFTBQuestsItemTags = (event) => { + + // Удаление тегов у отключенных предметов + global.FTB_QUESTS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) +} diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 6953e86c2..dba2d66e8 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -11,9 +11,10 @@ ServerEvents.tags('item', event => { // registerGTCEUItemTags(event) // registerAE2ItemTags(event) // registerCreateItemTags(event) - // registerAdAstraItemTags(event) - // registerMoreRedItemTags(event) - // registerSophisticatedBackpacksItemTags(event) + registerAdAstraItemTags(event) + registerMoreRedItemTags(event) + registerSophisticatedBackpacksItemTags(event) + registerFTBQuestsItemTags(event) }) /** @@ -61,22 +62,23 @@ TFCEvents.data(event => { * Срабатывает после инициализации датапаков. */ ServerEvents.recipes(event => { - //registerTFCRecipes(event) - //registerFirmaLifeRecipes(event) - //registerWaterFlasksRecipes(event) - //registerTreeTapRecipes(event) - //registerSmallShipsRecipes(event) + registerTFCRecipes(event) + // registerFirmaLifeRecipes(event) + registerWaterFlasksRecipes(event) + registerTreeTapRecipes(event) + registerSmallShipsRecipes(event) registerMinecraftRecipes(event) - //registerGTCEURecipes(event) + // registerGTCEURecipes(event) registerCreateRecipes(event) - //registerAE2Recipes(event) - //registerAE2WTLibRecipes(event) + // registerAE2Recipes(event) + // registerAE2WTLibRecipes(event) // registerComputerCraftRecipes(event) registerAdAstraRecipes(event) - //registerMoreRedRecipes(event) - //registerSophisticatedBackpacksRecipes(event) - //registerToolBeltRecipes(event) - //registerExposureRecipes(event) + registerMoreRedRecipes(event) + registerSophisticatedBackpacksRecipes(event) + registerToolBeltRecipes(event) + registerExposureRecipes(event) + registerFTBQuestsRecipes(event) }) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 7ae8879cf..b808da582 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -717,51 +717,10 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Песок - // Из песка душ - event.recipes.gtceu.centrifuge('soul_sand_separation') - .itemInputs('minecraft:soul_sand') - .chancedOutput('tfc:sand/yellow', 9000, 130) - .chancedOutput('gtceu:saltpeter_small_dust', 8000, 480) - .chancedOutput('gtceu:coal_tiny_dust', 2000, 340) - .outputFluids(Fluid.of('gtceu:oil', 80)) - .duration(200) - .EUt(80) - - // Из красного песка event.remove({ id: 'gtceu:centrifuge/red_sand_separation' }) - - // Из нефтеносного песка - 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('gtceu:oilsands_dust') - .chancedOutput('tfc:sand/yellow', 5000, 5000) - .outputFluids(Fluid.of('gtceu:oil', 2000)) - .duration(200) - .EUt(30) - - // Из мицелия event.remove({ id: 'gtceu:centrifuge/mycelium_separation' }) - - // Из травы event.remove({ id: 'gtceu:centrifuge/grass_block_separation' }) - // Из земли - event.recipes.gtceu.centrifuge('dirt_separation') - .itemInputs('#tfc:dirt') - .chancedOutput('gtceu:plant_ball', 1250, 700) - .chancedOutput('tfc:sand/yellow', 5000, 1200) - .chancedOutput('gtceu:clay_tiny_dust', 4000, 900) - .outputFluids(Fluid.of('gtceu:oil', 2000)) - .duration(250) - .EUt(30) - // TODO: Из пыли лунного грунта event.remove({ id: 'gtceu:centrifuge/endstone_separation' }) /* @@ -780,78 +739,6 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: 'gtceu:forge_hammer/smooth_sandstone_to_sand' }) event.remove({ id: 'gtceu:forge_hammer/chiseled_sandstone_to_sand' }) - global.SAND_COLORS.forEach(sandColor => { - // Raw SandStone -> Sand - event.recipes.gtceu.forge_hammer(`raw_${sandColor}_sandstone_to_sand`) - .itemInputs(`tfc:raw_sandstone/${sandColor}`) - .itemOutputs(`tfc:sand/${sandColor}`) - .duration(400) - .EUt(2) - - // Smooth SandStone -> Sand - event.recipes.gtceu.forge_hammer(`smooth_${sandColor}_sandstone_to_sand`) - .itemInputs(`tfc:smooth_sandstone/${sandColor}`) - .itemOutputs(`tfc:sand/${sandColor}`) - .duration(400) - .EUt(2) - - // Cut SandStone -> Sand - 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.forge_hammer('brown_gravel_to_sand') - .itemInputs('#tfc:brown_gravel') - .itemOutputs('tfc:sand/brown') - .duration(400) - .EUt(2) - - // Белый гравий -> Песок - event.recipes.gtceu.forge_hammer('white_gravel_to_sand') - .itemInputs('#tfc:white_gravel') - .itemOutputs('tfc:sand/white') - .duration(400) - .EUt(2) - - // Черный гравий -> Песок - event.recipes.gtceu.forge_hammer('black_gravel_to_sand') - .itemInputs('#tfc:black_gravel') - .itemOutputs('tfc:sand/black') - .duration(400) - .EUt(2) - - // Красный гравий -> Песок - event.recipes.gtceu.forge_hammer('red_gravel_to_sand') - .itemInputs('#tfc:red_gravel') - .itemOutputs('tfc:sand/red') - .duration(400) - .EUt(2) - - // Желтый гравий -> Песок - event.recipes.gtceu.forge_hammer('yellow_gravel_to_sand') - .itemInputs('#tfc:yellow_gravel') - .itemOutputs('tfc:sand/yellow') - .duration(400) - .EUt(2) - - // Зеленый гравий -> Песок - event.recipes.gtceu.forge_hammer('green_gravel_to_sand') - .itemInputs('#tfc:green_gravel') - .itemOutputs('tfc:sand/green') - .duration(400) - .EUt(2) - - // Розовый гравий -> Песок - event.recipes.gtceu.forge_hammer('pink_gravel_to_sand') - .itemInputs('#tfc:pink_gravel') - .itemOutputs('tfc:sand/pink') - .duration(400) - .EUt(2) - //#endregion //#region Выход: Песчанник @@ -988,31 +875,68 @@ const registerMinecraftRecipes = (event) => { //#endregion + //#region Выход: Dripstone - /* - // Sand -> Raw SandStone - event.recipes.gtceu.compressor(`${sandColor}_sandstone`) - .itemInputs(`4x tfc:sand/${sandColor}`) - .itemOutputs(`tfc:raw_sandstone/${sandColor}`) - .duration(300) - .EUt(2) + event.remove({ id: 'minecraft:dripstone_block' }) - // Raw SandStone -> Smooth SandStone - event.recipes.gtceu.laser_engraver(`raw_${sandColor}_sandstone_to_smooth`) - .itemInputs(`tfc:raw_sandstone/${sandColor}`) - .notConsumable('gtceu:magenta_glass_lens') - .itemOutputs(`tfc:smooth_sandstone/${sandColor}`) - .duration(60) - .EUt(32) + //#endregion - // Raw SandStone -> Cut SandStone - event.recipes.gtceu.laser_engraver(`raw_${sandColor}_sandstone_to_cut`) - .itemInputs(`tfc:raw_sandstone/${sandColor}`) - .notConsumable('gtceu:orange_glass_lens') - .itemOutputs(`tfc:cut_sandstone/${sandColor}`) - .duration(60) - .EUt(32) - */ + //#region Выход: Земля + + event.remove({ id: 'ae2:entropy/cool/grass_block_dirt' }) + event.remove({ id: 'gtceu:macerator/dirt_from_bio_chaff' }) + + //#endregion + + //#region Выход: Высохшая земля + + event.remove({ id: 'gtceu:mixer/mud' }) + event.remove({ id: 'gtceu:mixer/coarse_dirt' }) + event.remove({ id: 'gtceu:create_mixer/mud' }) + event.remove({ id: 'gtceu:create_mixer/coarse_dirt' }) + + //#endregion + + //#region Выход: Гравий + + event.remove({ id: 'gtceu:forge_hammer/cobblestone_to_gravel' }) + + //#endregion + + //#region Выход: Дерево + + global.VANILLA_WOOD_TYPES.forEach(wood => { + event.remove({ id: `minecraft:${wood}_planks` }) + event.remove({ id: `gtceu:shaped/${wood}_planks_saw` }) + event.remove({ id: `minecraft:stripped_${wood}_log_via_vanilla_stripping` }) + event.remove({ id: `minecraft:stripped_${wood}_wood` }) + event.remove({ id: `minecraft:stripped_${wood}_wood_via_vanilla_stripping` }) + event.remove({ id: `minecraft:${wood}_wood` }) + event.remove({ id: `minecraft:${wood}_slab` }) + event.remove({ id: `minecraft:${wood}_fence` }) + event.remove({ id: `gtceu:assembler/${wood}_fence` }) + event.remove({ id: `minecraft:${wood}_stairs` }) + event.remove({ id: `gtceu:assembler/${wood}_stairs` }) + event.remove({ id: `minecraft:${wood}_button` }) + event.remove({ id: `minecraft:${wood}_pressure_plate` }) + event.remove({ id: `minecraft:${wood}_door` }) + event.remove({ id: `minecraft:${wood}_trapdoor` }) + event.remove({ id: `minecraft:${wood}_fence_gate` }) + event.remove({ id: `gtceu:assembler/${wood}_fence_gate` }) + event.remove({ id: `minecraft:${wood}_sign` }) + event.remove({ id: `minecraft:${wood}_hanging_sign` }) + }); + + //#endregion + + + + + + + + + diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index f6ffe765c..52ac65f22 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -1,6 +1,9 @@ // priority: 0 const registerTFCRecipes = (event) => { + + //#region Металлы + Object.entries(global.METAL_TO_SPECS).forEach(keyValuePair => { let metal = keyValuePair[0] @@ -741,24 +744,6 @@ const registerTFCRecipes = (event) => { }) - global.TFC_WOOD_TYPES.forEach(wood => { - event.remove({ id: `tfc:crafting/wood/${wood}_axle` }) - event.remove({ id: `tfc:crafting/wood/${wood}_bladed_axle` }) - event.remove({ id: `tfc:crafting/wood/${wood}_encased_axle` }) - event.remove({ id: `tfc:crafting/wood/${wood}_clutch` }) - event.remove({ id: `tfc:crafting/wood/${wood}_gear_box` }) - event.remove({ id: `tfc:crafting/wood/${wood}_gear_box` }) - event.remove({ id: `tfc:crafting/wood/${wood}_water_wheel` }) - }) - - event.remove({ id: `tfc:crafting/trip_hammer` }) - event.remove({ id: `tfc:crafting/windmill_blade` }) - event.remove({ id: `tfc:barrel/dye/bleach_windmill_blades` }) - - global.MINECRAFT_DYE_NAMES.forEach(dye => { - event.remove({ id: `tfc:barrel/dye/${dye}_windmill_blade` }) - }) - //#region Вырезание предметов из CastIron // Слиток @@ -875,16 +860,16 @@ const registerTFCRecipes = (event) => { .resultFluid(Fluid.of('tfc:metal/cast_iron', 288)) .id(`tfc:heating/grill`) - // Ванильная дверь + // Ванильная дверь декрафт event.recipes.tfc.heating('minecraft:iron_door', 1535) .resultFluid(Fluid.of('tfc:metal/cast_iron', 288)) .id(`tfc:heating/iron_door`) - + + // Ванильная дверь на наковальне event.recipes.tfc.anvil('minecraft:iron_door', '#forge:plates/wrought_iron', ['hit_last', 'draw_not_last', 'punch_not_last']) .tier(3) .id(`tfc:anvil/iron_door`) - - + // Bloom -> Wrought Iron Ingot event.recipes.tfc.anvil('gtceu:wrought_iron_ingot', 'tfc:refined_iron_bloom', ['hit_last', 'hit_second_last', 'hit_third_last']).tier(2) .id('tfc:anvil/wrought_iron_from_bloom') @@ -909,6 +894,200 @@ const registerTFCRecipes = (event) => { event.recipes.tfc.bloomery('tfc:raw_iron_bloom', 'minecraft:charcoal', Fluid.of('tfc:metal/cast_iron', 144), 15000) .id('tfc:bloomery/raw_iron_bloom') + //#endregion + + //#region Камень + + global.TFC_STONE_TYPES.forEach(stoneTypeName => { + // Сырой камень -> Сырой камень + event.recipes.gtceu.rock_breaker(`raw_${stoneTypeName}`) + .notConsumable(`tfc:rock/raw/${stoneTypeName}`) + .itemOutputs(`tfc:rock/raw/${stoneTypeName}`) + .duration(16) + .EUt(7) + + // Булыжник -> Булыжник + event.recipes.gtceu.rock_breaker(`cobble_${stoneTypeName}`) + .notConsumable(`tfc:rock/cobble/${stoneTypeName}`) + .itemOutputs(`tfc:rock/cobble/${stoneTypeName}`) + .duration(16) + .EUt(7) + + // Сырой камень -> Булыжник + event.recipes.gtceu.forge_hammer(`raw_${stoneTypeName}_to_cobble`) + .itemInputs(`tfc:rock/raw/${stoneTypeName}`) + .itemOutputs(`tfc:rock/cobble/${stoneTypeName}`) + .duration(10) + .EUt(16) + + // Булыжник -> Гравий + event.recipes.gtceu.forge_hammer(`cobble_${stoneTypeName}_to_gravel`) + .itemInputs(`tfc:rock/cobble/${stoneTypeName}`) + .itemOutputs(`tfc:rock/gravel/${stoneTypeName}`) + .duration(10) + .EUt(16) + }) + + //#endregion + + //#region Песок + + // Песок душ -> Желтый песок + event.recipes.gtceu.centrifuge('soul_sand_separation') + .itemInputs('minecraft:soul_sand') + .chancedOutput('tfc:sand/yellow', 9000, 130) + .chancedOutput('gtceu:saltpeter_small_dust', 8000, 480) + .chancedOutput('gtceu:coal_tiny_dust', 2000, 340) + .outputFluids(Fluid.of('gtceu:oil', 80)) + .duration(200) + .EUt(80) + + // Нефтеносный -> Желтый песок + 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('gtceu:oilsands_dust') + .chancedOutput('tfc:sand/yellow', 5000, 5000) + .outputFluids(Fluid.of('gtceu:oil', 2000)) + .duration(200) + .EUt(30) + + // Земля -> Желтый песок + event.recipes.gtceu.centrifuge('dirt_separation') + .itemInputs('#tfc:dirt') + .chancedOutput('gtceu:plant_ball', 1250, 700) + .chancedOutput('tfc:sand/yellow', 5000, 1200) + .chancedOutput('gtceu:clay_tiny_dust', 4000, 900) + .outputFluids(Fluid.of('gtceu:oil', 2000)) + .duration(250) + .EUt(30) + + // Декрафт песчанных блоков в песок + global.SAND_COLORS.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) + + // Sand -> Raw SandStone + event.recipes.gtceu.compressor(`${sandColor}_sandstone`) + .itemInputs(`4x tfc:sand/${sandColor}`) + .itemOutputs(`tfc:raw_sandstone/${sandColor}`) + .duration(300) + .EUt(2) + + // Raw SandStone -> Smooth SandStone + event.recipes.gtceu.laser_engraver(`raw_${sandColor}_sandstone_to_smooth`) + .itemInputs(`tfc:raw_sandstone/${sandColor}`) + .notConsumable('gtceu:magenta_glass_lens') + .itemOutputs(`tfc:smooth_sandstone/${sandColor}`) + .duration(60) + .EUt(32) + + // Raw SandStone -> Cut SandStone + event.recipes.gtceu.laser_engraver(`raw_${sandColor}_sandstone_to_cut`) + .itemInputs(`tfc:raw_sandstone/${sandColor}`) + .notConsumable('gtceu:orange_glass_lens') + .itemOutputs(`tfc:cut_sandstone/${sandColor}`) + .duration(60) + .EUt(32) + }) + + // Коричневый гравий -> Песок + event.recipes.gtceu.forge_hammer('brown_gravel_to_sand') + .itemInputs('#tfc:brown_gravel') + .itemOutputs('tfc:sand/brown') + .duration(400) + .EUt(2) + + // Белый гравий -> Песок + event.recipes.gtceu.forge_hammer('white_gravel_to_sand') + .itemInputs('#tfc:white_gravel') + .itemOutputs('tfc:sand/white') + .duration(400) + .EUt(2) + + // Черный гравий -> Песок + event.recipes.gtceu.forge_hammer('black_gravel_to_sand') + .itemInputs('#tfc:black_gravel') + .itemOutputs('tfc:sand/black') + .duration(400) + .EUt(2) + + // Красный гравий -> Песок + event.recipes.gtceu.forge_hammer('red_gravel_to_sand') + .itemInputs('#tfc:red_gravel') + .itemOutputs('tfc:sand/red') + .duration(400) + .EUt(2) + + // Желтый гравий -> Песок + event.recipes.gtceu.forge_hammer('yellow_gravel_to_sand') + .itemInputs('#tfc:yellow_gravel') + .itemOutputs('tfc:sand/yellow') + .duration(400) + .EUt(2) + + // Зеленый гравий -> Песок + event.recipes.gtceu.forge_hammer('green_gravel_to_sand') + .itemInputs('#tfc:green_gravel') + .itemOutputs('tfc:sand/green') + .duration(400) + .EUt(2) + + // Розовый гравий -> Песок + event.recipes.gtceu.forge_hammer('pink_gravel_to_sand') + .itemInputs('#tfc:pink_gravel') + .itemOutputs('tfc:sand/pink') + .duration(400) + .EUt(2) + + //#endregion + + //#region Дерево + + //#endregion + + global.TFC_WOOD_TYPES.forEach(wood => { + event.remove({ id: `tfc:crafting/wood/${wood}_axle` }) + event.remove({ id: `tfc:crafting/wood/${wood}_bladed_axle` }) + event.remove({ id: `tfc:crafting/wood/${wood}_encased_axle` }) + event.remove({ id: `tfc:crafting/wood/${wood}_clutch` }) + event.remove({ id: `tfc:crafting/wood/${wood}_gear_box` }) + event.remove({ id: `tfc:crafting/wood/${wood}_gear_box` }) + event.remove({ id: `tfc:crafting/wood/${wood}_water_wheel` }) + }) + + event.remove({ id: `tfc:crafting/trip_hammer` }) + event.remove({ id: `tfc:crafting/windmill_blade` }) + event.remove({ id: `tfc:barrel/dye/bleach_windmill_blades` }) + + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.remove({ id: `tfc:barrel/dye/${dye}_windmill_blade` }) + }) + //#region Порошки event.remove({ id: 'tfc:quern/cryolite' }) @@ -1202,14 +1381,6 @@ const registerTFCRecipes = (event) => { .duration(250) .EUt(30) - // TFC Dirt -> Plant Ball (Centrifuge) - event.recipes.gtceu.centrifuge('dirt_separation') - .itemInputs('#tfc:dirt') - .chancedOutput('gtceu:plant_ball', 1250, 700) - .chancedOutput('gtceu:clay_tiny_dust', 4000, 900) - .duration(250) - .EUt(30) - // 8x Ванильная растительность -> Plant Ball (Compressor) event.remove({id: 'gtceu:compressor/plant_ball_from_wheat'}) event.remove({id: 'gtceu:compressor/plant_ball_from_warped_stem'}) @@ -1285,20 +1456,7 @@ const registerTFCRecipes = (event) => { .duration(128) .EUt(3) - // Рецепты бесконечного камня в RockBreaker - global.TFC_STONE_TYPES.forEach(stoneTypeName => { - event.recipes.gtceu.rock_breaker(`raw_${stoneTypeName}`) - .notConsumable(`tfc:rock/raw/${stoneTypeName}`) - .itemOutputs(`tfc:rock/raw/${stoneTypeName}`) - .duration(16) - .EUt(7) - - event.recipes.gtceu.rock_breaker(`cobble_${stoneTypeName}`) - .notConsumable(`tfc:rock/cobble/${stoneTypeName}`) - .itemOutputs(`tfc:rock/cobble/${stoneTypeName}`) - .duration(16) - .EUt(7) - }) + //#region Фикс рецептов связанных с песком event.recipes.gtceu.electrolyzer('sand_electrolysis') diff --git a/kubejs/startup_scripts/ftb_quests/constants.js b/kubejs/startup_scripts/ftb_quests/constants.js new file mode 100644 index 000000000..d254eff50 --- /dev/null +++ b/kubejs/startup_scripts/ftb_quests/constants.js @@ -0,0 +1,22 @@ +// priority: 0 + +/** + * Список хранит предметы, + * у которых должны быть удалены тэги и они должны быть скрыты в REI. + */ +global.FTB_QUESTS_DISABLED_ITEMS = [ + 'ftbquests:screen_7', + 'ftbquests:screen_5', + 'ftbquests:screen_3', + 'ftbquests:screen_1', + 'ftbquests:loot_crate_opener', + 'ftbquests:task_screen_configurator', + 'ftbquests:book', + 'ftbfiltersystem:smart_filter', + 'ftbquests:stage_barrier', + 'ftbquests:barrier', + 'ftbquests:custom_icon', + 'ftbquests:missing_item', + 'ftbquests:lootcrate' +]; + diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index d14ee57c0..99f5bd23a 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -158,10 +158,16 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:chiseled_red_sandstone', 'minecraft:red_sand', - // Другое - 'minecraft:netherite_scrap', - - /* + // Саженцы + 'minecraft:oak_sapling', + 'minecraft:spruce_sapling', + 'minecraft:birch_sapling', + 'minecraft:jungle_sapling', + 'minecraft:acacia_sapling', + 'minecraft:cherry_sapling', + 'minecraft:dark_oak_sapling', + 'minecraft:mangrove_propagule', + // Дерево // Дуб "minecraft:oak_wood", @@ -206,7 +212,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:dark_oak_sign", "minecraft:dark_oak_hanging_sign", - // Acacia + // Акация "minecraft:acacia_planks", "minecraft:acacia_sapling", "minecraft:acacia_log", @@ -227,7 +233,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:acacia_sign", "minecraft:acacia_hanging_sign", - // Birch + // Береза "minecraft:birch_planks", "minecraft:birch_sapling", "minecraft:birch_log", @@ -248,7 +254,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:birch_sign", "minecraft:birch_hanging_sign", - // Jungle + // Тропическое "minecraft:jungle_planks", "minecraft:jungle_sapling", "minecraft:jungle_log", @@ -269,7 +275,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:jungle_sign", "minecraft:jungle_hanging_sign", - // Spruce + // Ель "minecraft:spruce_planks", "minecraft:spruce_sapling", "minecraft:spruce_log", @@ -290,7 +296,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:spruce_sign", "minecraft:spruce_hanging_sign", - // Cherry + // Вишня "minecraft:cherry_planks", "minecraft:cherry_sapling", "minecraft:cherry_log", @@ -311,7 +317,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:cherry_sign", "minecraft:cherry_hanging_sign", - // Mangrove + // Мангровое "minecraft:mangrove_planks", "minecraft:mangrove_propagule", "minecraft:mangrove_log", @@ -334,6 +340,20 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:mangrove_sign", "minecraft:mangrove_hanging_sign", + // Другое + 'minecraft:calcite', + 'minecraft:tuff', + 'minecraft:dripstone_block', + 'minecraft:grass_block', + 'minecraft:dirt', + 'minecraft:coarse_dirt', + 'minecraft:podzol', + 'minecraft:rooted_dirt', + 'minecraft:mud', + 'minecraft:netherite_scrap', + 'minecraft:suspicious_gravel', + + /* // Other "minecraft:bookshelf", "minecraft:chiseled_bookshelf",