From b40b6bfba9ba959cd642bf40d5c30b332d34fdfa Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 2 Jan 2024 10:09:01 +0700 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=BC=D0=BF=D0=BB=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D1=8F=20Chisel=20And=20Bits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/chiselsandbits-client.toml | 4 +- kubejs/client_scripts/main_client_script.js | 1 + kubejs/client_scripts/mods/chisel_and_bits.js | 7 ++ .../server_scripts/chisel_and_bits/recipes.js | 115 ++++++++++++++++++ kubejs/server_scripts/main_server_script.js | 2 + .../chisel_and_bits/constants.js | 16 +++ 6 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 kubejs/client_scripts/mods/chisel_and_bits.js create mode 100644 kubejs/server_scripts/chisel_and_bits/recipes.js create mode 100644 kubejs/startup_scripts/chisel_and_bits/constants.js diff --git a/config/chiselsandbits-client.toml b/config/chiselsandbits-client.toml index b98948dee..17f4b5419 100644 --- a/config/chiselsandbits-client.toml +++ b/config/chiselsandbits-client.toml @@ -84,13 +84,13 @@ bit-storage-content-models = 100 #mod.scena.config.performance.caches.sizes.block-models.comment #Range: 3500 ~ 20000 - block-models = 1000 + block-models = 3500 #mod.scena.config.performance.caches.sizes.block-faces.comment #Range: 350000 ~ 2000000 block-faces = 1000000 #mod.scena.config.performance.caches.sizes.cull-testing.comment #Range: 3500 ~ 200000 - cull-testing = 1000 + cull-testing = 3500 #mod.scena.config.performance.caches.sizes.stack-models.comment #Range: 0 ~ 9223372036854775807 stack-models = 100 diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js index 10e735d32..f94b7324e 100644 --- a/kubejs/client_scripts/main_client_script.js +++ b/kubejs/client_scripts/main_client_script.js @@ -13,6 +13,7 @@ REIEvents.hide('item', event => { hideMoreRedStuff(event) hideRailWaysStuff(event) hideCreateAdditionsStuff(event) + hideChiselAndBitsStuff(event) }) REIEvents.groupEntries(event => { diff --git a/kubejs/client_scripts/mods/chisel_and_bits.js b/kubejs/client_scripts/mods/chisel_and_bits.js new file mode 100644 index 000000000..836c6b25e --- /dev/null +++ b/kubejs/client_scripts/mods/chisel_and_bits.js @@ -0,0 +1,7 @@ +// priority: 0 + +const hideChiselAndBitsStuff = (event) => { + global.CHISEL_AND_BITS_DISABLED_ITEMS.forEach(item => { + event.hide(item) + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/chisel_and_bits/recipes.js b/kubejs/server_scripts/chisel_and_bits/recipes.js new file mode 100644 index 000000000..ea663ddad --- /dev/null +++ b/kubejs/server_scripts/chisel_and_bits/recipes.js @@ -0,0 +1,115 @@ +// priority: 0 + +const registerChiselAndBitsRecipes = (event) => { + + event.remove({ not: [ + { id: 'chiselsandbits:quill' } + ], mod: 'chiselsandbits' }) + + // Мешок для кусочков блоков + event.recipes.tfc.knapping('chiselsandbits:bit_bag', 'tfc:leather', [ + " X X ", + "X X", + "X X", + "XXXXX" + ]).ingredient('#tfc:leather_knapping').id('tfg:chiselsandbits/knapping_leather/bit_bag') + + // Лупа + event.shaped('chiselsandbits:magnifying_glass', [ + 'A', + 'C', + 'B' + ], { + A: '#forge:glass', + B: '#forge:rods/wooden', + C: '#forge:rings/wrought_iron' + }).id('tfg:chiselsandbits/shaped/magnifying_glass') + + // Алмазная стамеска + event.shapeless('chiselsandbits:chisel_diamond', [ + '#tfc:chisels', + 'tfc:powder/diamond', + 'tfc:powder/diamond', + 'tfc:powder/diamond' + ]).id('tfg:chiselsandbits/shapeless/chisel_diamond') + + // Хранилище кусочков + event.shaped('chiselsandbits:bit_storage', [ + 'ABA', + 'C C', + 'ADA' + ], { + A: '#forge:rods/wrought_iron', + B: '#forge:tools/wrench', + C: 'forge:glass_panes', + D: 'minecraft:wooden_slabs', + }).id('tfg:chiselsandbits/shaped/bit_storage') + + // Рулетка + event.shaped('chiselsandbits:measuring_tape', [ + ' AB', + ' BA', + 'C ' + ], { + A: '#forge:dyes/yellow', + B: '#forge:string', + C: '#forge:rods/wrought_iron' + }).id('tfg:chiselsandbits/shaped/measuring_tape') + + // Герметик + event.shapeless('chiselsandbits:sealant', [ + 'minecraft:slimeball', + '#forge:honey_jar' + ]).id('tfg:chiselsandbits/shapeless/sealant_from_slimeballs') + + event.shapeless('chiselsandbits:sealant', [ + 'tfc:glue', + '#forge:honey_jar' + ]).id('tfg:chiselsandbits/shapeless/sealant_from_glue') + + // Резной принтер + event.shaped('chiselsandbits:chiseled_printer', [ + ' A ', + 'B B', + 'BCB' + ], { + A: '#forge:tools/wrench', + B: '#tfc:support_beams', + C: '#forge:smooth_stone_slab' + }).id('tfg:chiselsandbits/shaped/chiseled_printer') + + // Стол модификаций + event.shaped('chiselsandbits:modification_table', [ + 'ABA', + 'CDC', + 'C C' + ], { + A: '#minecraft:wooden_slabs', + B: '#forge:tools/wrench', + C: '#tfc:support_beams', + D: '#tfc:workbenches' + }).id('tfg:chiselsandbits/shaped/modification_table') + + // Принтер и сканер шаблонов + event.shaped('chiselsandbits:pattern_scanner', [ + ' A ', + 'B B', + 'BCB' + ], { + A: '#forge:tools/wrench', + B: '#tfc:lumber', + C: '#forge:smooth_stone_slab' + }).id('tfg:chiselsandbits/shaped/pattern_scanner') + + + // Удалятель герметика + event.shaped('chiselsandbits:wrench', [ + ' AB', + ' AA', + 'A ' + ], { + A: '#tfc:lumber', + B: 'chiselsandbits:block_bit', + }).id('tfg:chiselsandbits/shaped/wrench') + +} \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 8a25654dd..ea40e608a 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -102,6 +102,8 @@ ServerEvents.recipes(event => { registerExposureRecipes(event) registerFTBQuestsRecipes(event) + + registerChiselAndBitsRecipes(event) }) /** diff --git a/kubejs/startup_scripts/chisel_and_bits/constants.js b/kubejs/startup_scripts/chisel_and_bits/constants.js new file mode 100644 index 000000000..eda7db00b --- /dev/null +++ b/kubejs/startup_scripts/chisel_and_bits/constants.js @@ -0,0 +1,16 @@ +// priority: 0 + +global.CHISEL_AND_BITS_DISABLED_ITEMS = [ + 'chiselsandbits:block_bit', + 'chiselsandbits:chiseled_block', + + 'chiselsandbits:chisel_stone', + 'chiselsandbits:chisel_iron', + 'chiselsandbits:chisel_gold', + 'chiselsandbits:chisel_netherite', + + 'chiselsandbits:bit_bag_dyed', + 'chiselsandbits:pattern_single_use', + 'chiselsandbits:pattern_multi_use', + 'chiselsandbits:monocle' +]; \ No newline at end of file