From 23653817364c506a163cfb2ffc29a81d9e8ccd5d Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 29 Dec 2023 16:49:03 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B0=D0=BD=20CreateAdditions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/client_scripts/main_client_script.js | 2 + .../client_scripts/mods/create_additions.js | 12 ++ .../create_additions/recipes.js | 146 ++++++++++++++++++ .../create_additions/constants.js | 32 +++- mods | 2 +- 5 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 kubejs/client_scripts/mods/create_additions.js diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js index 537985c33..33632481e 100644 --- a/kubejs/client_scripts/main_client_script.js +++ b/kubejs/client_scripts/main_client_script.js @@ -12,6 +12,7 @@ REIEvents.hide('item', event => { hideSophisticatedBackpacksStuff(event) hideMoreRedStuff(event)*/ hideRailWaysStuff(event) + hideCreateAdditionsStuff(event) }) @@ -29,4 +30,5 @@ REIEvents.removeCategories(event => { REIEvents.hide('fluid', event => { hideTFCFluids(event) hideFirmaLifeFluids(event) + hideCreateAdditionsFluids(event) }) diff --git a/kubejs/client_scripts/mods/create_additions.js b/kubejs/client_scripts/mods/create_additions.js new file mode 100644 index 000000000..f09c56a26 --- /dev/null +++ b/kubejs/client_scripts/mods/create_additions.js @@ -0,0 +1,12 @@ +// priority: 0 + +const hideCreateAdditionsStuff = (event) => { + global.CREATE_ADDITIONS_DISABLED_ITEMS.forEach(item => { + event.hide(item) + }) +} + +const hideCreateAdditionsFluids = (event) => { + event.hide('createaddition:seed_oil') + event.hide('createaddition:bioethanol') +} \ No newline at end of file diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 6c977c5ea..e93e37cd8 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -18,5 +18,151 @@ const registerCreateAdditionsRecipes = (event) => { */ + // Электрический мотор + event.shaped('createaddition:electric_motor', [ + 'ABA', + 'CDC', + 'CEC' + ], { + A: '#forge:plates/brass', + B: 'create:shaft', + C: 'createaddition:copper_spool', + D: 'create:cogwheel', + E: '#forge:gears/wrought_iron', + }).id('tfg:railways/shaped/electric_motor') + // Конвертер энергии в механику + event.shaped('createaddition:alternator', [ + 'CEC', + 'CDC', + 'ABA', + ], { + A: '#forge:plates/wrought_iron', + B: 'create:shaft', + C: 'createaddition:copper_spool', + D: 'create:cogwheel', + E: '#forge:gears/wrought_iron', + }).id('tfg:railways/shaped/alternator') + + // Прокатный стан + event.shaped('createaddition:rolling_mill', [ + 'ABA', + 'CBC', + 'DED' + ], { + A: '#forge:plates/wrought_iron', + B: 'create:shaft', + C: '#forge:gears/wrought_iron', + D: '#forge:rings/wrought_iron', + E: 'create:andesite_casing', + }).id('tfg:railways/shaped/rolling_mill') + + // Цифровой адаптер + event.shaped('createaddition:digital_adapter', [ + 'ABA', + 'BCB', + 'ABA' + ], { + A: '#forge:plates/brass', + B: '#forge:wires/single/red_alloy', + C: 'computercraft:wired_modem', + }).id('tfg:railways/shaped/digital_adapter') + + // Портативный энергетический интерфейс + event.shaped('createaddition:portable_energy_interface', [ + 'ABC', + 'DEC', + 'ADC' + ], { + A: '#forge:plates/brass', + B: 'create:chute', + C: '#forge:wires/octal/copper', + D: '#forge:cables/single/copper', + E: 'create:brass_casing' + }).id('tfg:railways/shaped/portable_energy_interface') + + // Батарейный блок + event.recipes.gtceu.assembler('create_additions/battery') + .itemInputs('gtceu:bronze_frame', '6x gtceu:bronze_plate', '24x gtceu:bronze_screw', '#forge:batteries/hv') + .itemOutputs('createaddition:modular_accumulator') + .duration(400) + .EUt(512) + + // Коннектор обычный + event.shaped('createaddition:connector', [ + 'ABA', + 'CBC' + ], { + A: 'tfc:glue', + B: '#forge:cables/double/copper', + C: '#forge:plates/wrought_iron', + }).id('tfg:railways/shaped/connector') + + // Коннектор большой + /* + event.shaped('createaddition:large_connector', [ + 'ABA', + 'CBC', + 'CBC' + ], { + A: 'tfc:glue', + B: '#forge:cables/double/copper', + C: '#forge:plates/wrought_iron', + }).id('tfg:railways/shaped/large_connector') + */ + + // Редстоун реле + event.shaped('createaddition:redstone_relay', [ + ' D ', + 'BCB', + 'AAA' + ], { + A: '#tfc:rock/raw', + B: 'createaddition:connector', + C: 'create:electron_tube', + D: '#forge:dusts/redstone' + }).id('tfg:railways/shaped/redstone_relay') + + // Катушка + event.shaped('8x createaddition:spool', [ + 'A', + 'B', + 'A' + ], { + A: '#forge:screws/wood', + B: '#forge:rods/long/wood' + }).id('tfg:railways/shaped/spool') + + // Катушка с медными проводами + event.shaped('createaddition:copper_spool', [ + ' A ', + 'ABA', + ' A ' + ], { + A: '#forge:fine_wires/copper', + B: 'createaddition:spool' + }).id('tfg:railways/shaped/copper_spool') + + // Катушка с праздничными проводами + event.shaped('createaddition:festive_spool', [ + ' A ', + 'ABA', + ' A ' + ], { + A: 'gtceu:plant_ball', + B: 'createaddition:spool' + }).id('tfg:railways/shaped/festive_spool') + + // Колючая проволка + event.shapeless('4x createaddition:barbed_wire', [ + '#forge:rods/wrought_iron', + '#forge:rods/long/wrought_iron', + '#forge:rods/wrought_iron', + '#forge:rods/long/wrought_iron', + '#forge:rods/wrought_iron', + '#forge:rods/long/wrought_iron', + '#forge:rods/wrought_iron', + '#forge:rods/long/wrought_iron', + '#forge:tools/hammers' + ]).id('tfg:railways/shapeless/barbed_wire') } \ No newline at end of file diff --git a/kubejs/startup_scripts/create_additions/constants.js b/kubejs/startup_scripts/create_additions/constants.js index 3857aede7..961bedc01 100644 --- a/kubejs/startup_scripts/create_additions/constants.js +++ b/kubejs/startup_scripts/create_additions/constants.js @@ -1,5 +1,35 @@ // priority: 0 global.CREATE_ADDITIONS_DISABLED_ITEMS = [ - + 'createaddition:electrum_ingot', + 'createaddition:electrum_nugget', + 'createaddition:diamond_grit_sandpaper', + 'createaddition:electrum_amulet', + 'createaddition:biomass_pellet', + 'createaddition:diamond_grit', + 'createaddition:honey_cake', + 'createaddition:biomass', + 'createaddition:chocolate_cake', + 'createaddition:creative_energy', + 'createaddition:electrum_rod', + 'createaddition:gold_rod', + 'createaddition:copper_rod', + 'createaddition:iron_rod', + 'createaddition:electrum_wire', + 'createaddition:brass_rod', + 'createaddition:cake_base', + 'createaddition:iron_wire', + 'createaddition:gold_wire', + 'createaddition:electrum_sheet', + 'createaddition:zinc_sheet', + 'createaddition:cake_base_baked', + 'createaddition:straw', + 'createaddition:copper_wire', + 'createaddition:seed_oil_bucket', + 'createaddition:bioethanol_bucket', + 'createaddition:tesla_coil', + 'createaddition:capacitor', + 'createaddition:large_connector', + 'createaddition:electrum_spool', + 'createaddition:gold_spool' ]; \ No newline at end of file diff --git a/mods b/mods index 8596bf723..d376003e8 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 8596bf723eae7fa6a45dd66f87949d0a83ef47c7 +Subproject commit d376003e8957c30f24f49d8ab4439bb839655309