diff --git a/kubejs/server_scripts/functional storage/recipes.js b/kubejs/server_scripts/functional storage/recipes.js new file mode 100644 index 000000000..dad734620 --- /dev/null +++ b/kubejs/server_scripts/functional storage/recipes.js @@ -0,0 +1,268 @@ +// priority: 0 +//f storage + +const registerFunctionalStorageRecipes = (event) => { + + event.remove({ mod: 'functionalstorage' }); + event.remove({ mod: 'functional_tfc' }); + + // Виды деревянных дроверов + + for (var i = 0; i < 19; i++) { + event.shaped(`functionalstorage:tfc_${global.TYPE_OF_TREE_FOR_FS_NAMES[i]}_1`, [ + 'AAA', + 'CBC', + 'AAA' + ], + { + A: `tfc:wood/planks/${global.TYPE_OF_TREE_FOR_FS_NAMES[i]}`, + B: '#forge:chests/wooden', + C: '#forge:double_plates/steel' + }).id(`functionalstorage:tfc_${global.TYPE_OF_TREE_FOR_FS_NAMES[i]}_1_${i}`) + + event.shaped(`functionalstorage:tfc_${global.TYPE_OF_TREE_FOR_FS_NAMES[i]}_2`, [ + 'ABA', + 'CAC', + 'ABA' + ], { + A: `tfc:wood/planks/${global.TYPE_OF_TREE_FOR_FS_NAMES[i]}`, + B: '#forge:chests/wooden', + C: '#forge:double_plates/steel' + }).id(`functionalstorage:tfc_${global.TYPE_OF_TREE_FOR_FS_NAMES[i]}_2_${[i]}`) + + event.shaped(`functionalstorage:tfc_${global.TYPE_OF_TREE_FOR_FS_NAMES[i]}_4`, [ + 'BAB', + 'CAC', + 'BAB' + ], { + A: `tfc:wood/planks/${global.TYPE_OF_TREE_FOR_FS_NAMES[i]}`, + B: '#forge:chests/wooden', + C: '#forge:double_plates/steel' + }).id(`functionalstorage:tfc_${global.TYPE_OF_TREE_FOR_FS_NAMES[i]}_4_${[i]}`) + + } + + //дровер контроллер + event.shaped('functionalstorage:storage_controller', [ + 'ABA', + 'CDC', + 'EFE' + ], { + A: '#gtceu:circuits/lv', + B: 'create:electron_tube', + C: 'create:precision_mechanism', + D: '#functionalstorage:drawer', + E: 'gtceu:lv_conveyor_module', + F: 'gtceu:lv_robot_arm' + }).id('functionalstorage:storage_controller') + + //дровер воронка + event.shaped('functionalstorage:controller_extension', [ + 'ABA', + 'CDC', + 'EFE' + ], { + A: '#forge:double_plates/steel', + B: 'minecraft:hopper', + C: 'create:precision_mechanism', + D: '#functionalstorage:drawer', + E: 'gtceu:lv_conveyor_module', + F: 'gtceu:lv_electric_motor' + }).id('functionalstorage:controller_extension') + + //инструмент связывания + + event.shaped('functionalstorage:linking_tool', [ + ' A ', + 'BCB', + ' D ' + ], { + A: 'create:electron_tube', + B: '#forge:plates/steel', + C: '#functionalstorage:drawer' , + D: 'create:precision_mechanism' , + + }).id('functionalstorage:linking_tool') + + //инструмент конфигурации + + event.shaped('functionalstorage:configuration_tool', [ + ' A ', + 'BCB', + ' D ' + ], { + A: 'create:electron_tube', + B: '#forge:plates/wrought_iron', + C: '#functionalstorage:drawer', + D: 'create:precision_mechanism', + + }).id('functionalstorage:configuration_tool') + + // жидкостные дроверы + + event.shaped('functionalstorage:fluid_1', [ + 'ABA', + 'CDC', + 'EFE' + ], { + A: '#forge:plates/steel', + B: '#gtceu:circuits/lv' , + C: '#forge:double_plates/steel', + D: 'gtceu:steel_drum' , + E: 'create:fluid_tank', + F: 'gtceu:lv_electric_pump', + }).id('functionalstorage:fluid_1') + + event.shaped('functionalstorage:fluid_2', [ + 'ABA', + 'CDC', + 'EFE' + ], { + A: 'gtceu:fluid_cell', + B: '#gtceu:circuits/lv', + C: '#forge:double_plates/steel', + D: 'gtceu:steel_drum', + E: 'create:fluid_tank', + F: 'gtceu:lv_electric_pump', + }).id('functionalstorage:fluid_2') + + event.shaped('functionalstorage:fluid_4', [ + 'EBE', + 'CDC', + 'EFE' + ], { + B: '#gtceu:circuits/lv', + C: '#forge:plates/steel', + D: 'gtceu:steel_drum', + E: 'create:fluid_tank', + F: 'gtceu:lv_electric_pump', + }).id('functionalstorage:fluid_4') + + + // Дровер края + + event.shaped('functionalstorage:ender_drawer', [ + 'ABA', + 'CDC', + 'ABA' + ], { + B: '#gtceu:circuits/mv', + C: 'gtceu:mv_field_generator', + D: '#forge:chests/ender', + A: '#forge:double_sheets/aluminium', + }).id('functionalstorage:ender_drawer') + + // Улучшения взаимодействия + + event.shaped('functionalstorage:collector_upgrade', [ + 'ABA', + 'CDC', + 'ABA' + ], { + A: '#forge:stone' , + B: 'gtceu:lv_conveyor_module', + C: '#forge:dusts/redstone', + D: '#functionalstorage:drawer', + }).id('functionalstorage:collector_upgrade') + + event.shaped('functionalstorage:puller_upgrade', [ + 'ABA', + 'ADA', + 'ACA' + ], { + A: '#forge:stone', + B: 'gtceu:lv_conveyor_module', + C: '#forge:dusts/redstone', + D: '#functionalstorage:drawer', + }).id('functionalstorage:puller_upgrade') + + event.shaped('functionalstorage:pusher_upgrade', [ + 'ACA', + 'ADA', + 'ABA' + ], { + A: '#forge:stone', + B: 'gtceu:lv_conveyor_module', + C: '#forge:dusts/redstone', + D: '#functionalstorage:drawer', + }).id('functionalstorage:pusher_upgrade') + + // Улучшения вместимости + + event.shaped('functionalstorage:copper_upgrade', [ + 'ABA', + 'BCB', + 'ABA' + ], { + A: '#forge:plates/steel', + B: '#gtceu:circuits/lv', + C: 'gtceu:steel_crate', + + }).id('functionalstorage:copper_upgrade') + + event.shaped('functionalstorage:gold_upgrade', [ + 'ABA', + 'BCB', + 'ABA' + ], { + A: '#forge:plates/stainless_steel', + B: '#gtceu:circuits/hv', + C: 'gtceu:lv_field_generator', + + }).id('functionalstorage:gold_upgrade') + + event.shaped('functionalstorage:diamond_upgrade', [ + 'ABA', + 'BCB', + 'ABA' + ], { + A: '#forge:plates/titanium', + B: '#gtceu:circuits/ev', + C: 'gtceu:mv_field_generator', + + }).id('functionalstorage:diamond_upgrade') + + event.shaped('functionalstorage:iron_downgrade', [ + ' A ', + 'ABA', + ' A ' + ], { + A: '#forge:double_plates/steel', + B: '#gtceu:circuits/lv', + + + }).id('functionalstorage:iron_downgrade') + + // Улучшения разное + + event.shaped('functionalstorage:redstone_upgrade', [ + ' A ', + ' B ', + ' ' + ], { + A: 'gtceu:activity_detector_cover', + B: '#functionalstorage:drawer', + + + }).id('functionalstorage:redstone_upgrade') + + event.shaped('functionalstorage:void_upgrade', [ + 'ABA', + 'CDE', + 'FGF' + ], { + A: '#forge:screws/steel', + B: 'gtceu:item_detector_cover', + C: '#forge:tools/screwdrivers', + D: '#functionalstorage:drawer', + E: '#forge:tools/wrenches', + F: '#forge:normal_item_pipes/brass', + G: '#forge:ender_pearls', + }).id('functionalstorage:void_upgrade') + + + + + + +} \ No newline at end of file diff --git a/kubejs/server_scripts/functional storage/tags.js b/kubejs/server_scripts/functional storage/tags.js new file mode 100644 index 000000000..0a3e5cded --- /dev/null +++ b/kubejs/server_scripts/functional storage/tags.js @@ -0,0 +1,10 @@ +// priority: 0 +//f storage + +const registerFStorageItemTags = (event) => { + + global.FS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) +} diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 86d2a9e31..39b5f5882 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -17,6 +17,7 @@ ServerEvents.tags('item', event => { registerFirmaLifeItemTags(event) registerFramedBlocksItemTags(event) registerFTBQuestsItemTags(event) + registerFStorageItemTags(event) registerGTCEUItemTags(event) registerMegaCellsItemTags(event) registerMinecraftItemTags(event) @@ -27,6 +28,7 @@ ServerEvents.tags('item', event => { registerTFCAmbientalItemTags(event) registerTFCItemTags(event) registerTFGItemTags(event) + }) /** @@ -146,4 +148,6 @@ ServerEvents.recipes(event => { registerToolBeltRecipes(event) registerTreeTapRecipes(event) registerWaterFlasksRecipes(event) + registerFunctionalStorageRecipes(event) + }) diff --git a/kubejs/startup_scripts/functional storage/constants.js b/kubejs/startup_scripts/functional storage/constants.js new file mode 100644 index 000000000..b6173c28d --- /dev/null +++ b/kubejs/startup_scripts/functional storage/constants.js @@ -0,0 +1,71 @@ +// priority: 0 +// FS +global.FS_DISABLED_ITEMS = [ + + 'functionalstorage:rubber_1', + 'functionalstorage:rubber_2', + 'functionalstorage:rubber_4', + 'functionalstorage:birch_1', + 'functionalstorage:birch_2', + 'functionalstorage:birch_4', + 'functionalstorage:treated_1', + 'functionalstorage:treated_2', + 'functionalstorage:treated_4', + 'functionalstorage:rubber_1', + 'functionalstorage:crimson_1', + 'functionalstorage:crimson_2', + 'functionalstorage:crimson_4', + 'functionalstorage:acacia_1', + 'functionalstorage:acacia_2', + 'functionalstorage:acacia_4', + 'functionalstorage:warped_1', + 'functionalstorage:warped_2', + 'functionalstorage:warped_4', + 'functionalstorage:mangrove_1', + 'functionalstorage:mangrove_2', + 'functionalstorage:mangrove_4', + 'functionalstorage:jungle_1', + 'functionalstorage:jungle_2', + 'functionalstorage:jungle_4', + 'functionalstorage:spruce_1', + 'functionalstorage:spruce_2', + 'functionalstorage:spruce_4', + 'functionalstorage:dark_oak_1', + 'functionalstorage:dark_oak_2', + 'functionalstorage:dark_oak_4', + 'functionalstorage:cherry_1', + 'functionalstorage:cherry_2', + 'functionalstorage:cherry_4', + 'functionalstorage:oak_1', + 'functionalstorage:oak_2', + 'functionalstorage:oak_4', + 'functionalstorage:framed_simple_compacting_drawer', + 'functionalstorage:armory_cabinet', + 'functionalstorage:creative_vending_upgrade', + 'functionalstorage:netherite_upgrade', + 'functionalstorage:compacting_drawer', + 'functionalstorage:compacting_framed_drawer', + 'functionalstorage:simple_compacting_drawer', +] + +global.TYPE_OF_TREE_FOR_FS_NAMES = [ + 'acacia', + 'ash', + 'aspen', + 'birch', + 'blackwood', + 'chestnut', + 'douglas_fir', + 'hickory', + 'kapok', + 'mangrove', + 'maple', + 'oak', + 'palm', + 'rosewood', + 'sequoia', + 'spruce', + 'sycamore', + 'white_cedar', + 'willow', +]; \ No newline at end of file diff --git a/pakku-lock.json b/pakku-lock.json index 74dad37c9..68384dc22 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -3886,6 +3886,111 @@ } ] }, + { + "pakku_id": "7NI7Pp9Wt1WPCGnK", + "pakku_links": [ + "PoLmjPG7k4Yh69wn" + ], + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "functional-storage", + "modrinth": "functional-storage" + }, + "name": { + "curseforge": "Functional Storage", + "modrinth": "Functional Storage" + }, + "id": { + "curseforge": "556861", + "modrinth": "cO40ZIg3" + }, + "files": [ + { + "type": "curseforge", + "file_name": "functionalstorage-1.20.1-1.2.12.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "beta", + "url": "https://edge.forgecdn.net/files/5650/296/functionalstorage-1.20.1-1.2.12.jar", + "id": "5650296", + "parent_id": "556861", + "hashes": { + "sha1": "5e1c98a440f93eac4269a2ab3ac86912eab825bb", + "md5": "8f4dbd3c8bcd8c9eec454db0039dd864" + }, + "required_dependencies": [ + "287342" + ], + "size": 679572, + "date_published": "2024-08-21T16:02:26.030Z" + }, + { + "type": "modrinth", + "file_name": "functionalstorage-1.20.1-1.2.12.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "beta", + "url": "https://cdn.modrinth.com/data/cO40ZIg3/versions/HpvTQCZn/functionalstorage-1.20.1-1.2.12.jar", + "id": "HpvTQCZn", + "parent_id": "cO40ZIg3", + "hashes": { + "sha512": "36437ef7d88e45fc26424173542533fef4537ecd292cdb34c0802d91e55751986301e541704fbe3c29869f85a6c427be531817ffb01e46fe293f3ca400a42eae", + "sha1": "5e1c98a440f93eac4269a2ab3ac86912eab825bb" + }, + "required_dependencies": [ + "1Ro7m06l" + ], + "size": 679572, + "date_published": "2024-08-21T16:02:28.447568Z" + } + ] + }, + { + "pakku_id": "c5gyONkgqCoS63p7", + "type": "MOD", + "slug": { + "curseforge": "ftfc" + }, + "name": { + "curseforge": "Functional TFC" + }, + "id": { + "curseforge": "676893" + }, + "files": [ + { + "type": "curseforge", + "file_name": "Functional TFC 1.20.1-0.0.4.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5418/410/Functional TFC 1.20.1-0.0.4.jar", + "id": "5418410", + "parent_id": "676893", + "hashes": { + "sha1": "1b88546723085b5a151c4f58e0bfad2c3d2d6d01", + "md5": "9d50528b5ae309e9e902a3250714a7d8" + }, + "required_dependencies": [], + "size": 424673, + "date_published": "2024-06-11T15:09:18.583Z" + } + ] + }, { "pakku_id": "rSUHapr2idxvSjLh", "type": "MOD", @@ -8964,6 +9069,67 @@ } ] }, + { + "pakku_id": "PoLmjPG7k4Yh69wn", + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "titanium", + "modrinth": "titanium" + }, + "name": { + "curseforge": "Titanium", + "modrinth": "Titanium" + }, + "id": { + "curseforge": "287342", + "modrinth": "1Ro7m06l" + }, + "files": [ + { + "type": "curseforge", + "file_name": "titanium-1.20.1-3.8.32.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5468/426/titanium-1.20.1-3.8.32.jar", + "id": "5468426", + "parent_id": "287342", + "hashes": { + "sha1": "4672c64a8019e81a4a6c8239f20661d5edbd5da1", + "md5": "75baf7f67163a1da0fbb6a8bc98fa012" + }, + "required_dependencies": [], + "size": 622068, + "date_published": "2024-06-24T17:03:52.457Z" + }, + { + "type": "modrinth", + "file_name": "titanium-1.20.1-3.8.32.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "beta", + "url": "https://cdn.modrinth.com/data/1Ro7m06l/versions/8krhHkrZ/titanium-1.20.1-3.8.32.jar", + "id": "8krhHkrZ", + "parent_id": "1Ro7m06l", + "hashes": { + "sha512": "c4563176fad77499859691d8b5e18c35e08fec0a31f57f9e51f3538462f1ad738fb29335fc46d5857bffbdfc2dbd49bb32dc96614876d1f858b8cc81d6264057", + "sha1": "4672c64a8019e81a4a6c8239f20661d5edbd5da1" + }, + "required_dependencies": [], + "size": 622068, + "date_published": "2024-06-24T17:04:00.648306Z" + } + ] + }, { "pakku_id": "GHbgL2WA5TGX9dHv", "type": "MOD",