From 90b2a48065bb503cca8ac5b334ebec0ddce79f28 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 19 Jan 2024 15:50:43 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B3=D0=BE,=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20toolbelt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_EN.md | 2 +- CHANGELOG_RU.md | 2 +- kubejs/server_scripts/main_server_script.js | 2 ++ kubejs/server_scripts/toolbelt/recipes.js | 37 +++++++++++++++++++++ mods | 2 +- 5 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 kubejs/server_scripts/toolbelt/recipes.js diff --git a/CHANGELOG_EN.md b/CHANGELOG_EN.md index f404d8769..b4c166dbe 100644 --- a/CHANGELOG_EN.md +++ b/CHANGELOG_EN.md @@ -25,6 +25,7 @@ - Fixed conflicting compass crafting. - Fixed a bug where chests in REI could have a vanilla texture. - Extended debug information is enabled back. +- Fixed Toolbelt recipes again. - Perhaps something else, thank you for helping the project develop. ### New Mods - Fps Reducer @@ -36,7 +37,6 @@ - TerraFirmaGreg 0.3.2 -> 0.4.0 - ... ### Deleted mods -- Toolbelts - FastLoad-Reforged - ... diff --git a/CHANGELOG_RU.md b/CHANGELOG_RU.md index 386bd614a..85bbef6bb 100644 --- a/CHANGELOG_RU.md +++ b/CHANGELOG_RU.md @@ -25,6 +25,7 @@ - Исправлены конфликтующие крафты компасов. - Исправлен баг, когда сундуки в REI могли быть с ванильной текстурой. - Включено обратно расширенная дебаг информация. +- Исправлены рецепты ToolBelt еще раз. - Возможно, что-то еще, спасибо, что помогаете развиваться проекту. ### Новые моды - Fps Reducer @@ -36,7 +37,6 @@ - TerraFirmaGreg 0.3.2 -> 0.4.0 - ... ### Удаленные моды -- Toolbelts - FastLoad-Reforged - ... diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 313238eea..1184969ad 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -98,6 +98,8 @@ ServerEvents.recipes(event => { registerMoreRedRecipes(event) registerSophisticatedBackpacksRecipes(event) + + registerToolBeltRecipes(event) registerExposureRecipes(event) diff --git a/kubejs/server_scripts/toolbelt/recipes.js b/kubejs/server_scripts/toolbelt/recipes.js new file mode 100644 index 000000000..59e620ec9 --- /dev/null +++ b/kubejs/server_scripts/toolbelt/recipes.js @@ -0,0 +1,37 @@ +// priority: 0 + +const registerToolBeltRecipes = (event) => { + + // Удаление всех рецептов мода + event.remove({ mod: 'toolbelt' }); + + // Мешочек + event.shaped('toolbelt:pouch', [ + 'ACA', + 'B B', + 'ABA' + ], { + A: '#forge:string', + B: '#forge:leather', + C: '#forge:plates/wrought_iron' + }) + + // ToolBelt с размером 2 + event.shaped(Item.of('toolbelt:belt', {Size:2}), [ + 'ABA', + 'B B', + 'BCB' + ], { + A: '#forge:string', + B: '#forge:leather', + C: '#forge:plates/wrought_iron' + }) + + // ToolBelt с размером 3 - 9 + for (let i = 3; i < 10; i++) { + event.shapeless(Item.of('toolbelt:belt', {Size:i}), [ + Ingredient.of(Item.of('toolbelt:belt', {Size:i-1}).strongNBT()).or(Ingredient.of(Item.of('toolbelt:belt', {Size:i-1,Items:[]}).strongNBT())), + 'toolbelt:pouch' + ]).id('tfg:toolbelt/shaped/belt_' + i) + } +} diff --git a/mods b/mods index cd11e2324..75be5db17 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit cd11e2324ef50eb5759cf738eced79409b89a36f +Subproject commit 75be5db172ca623a3891715041888e68c3693c8c