From 8787781f2777f6c76814b6ca32daf461cc5dc698 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 13 Aug 2025 21:29:56 +0100 Subject: [PATCH] this doesn't fix dyed toolbelts (#368), but it does fix the other long-standing issue with upgrading them --- config/toolbelt-common.toml | 4 ++-- defaultconfigs/toolbelt-server.toml | 2 +- kubejs/server_scripts/toolbelt/recipes.js | 23 +++++++++++++++++++---- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/config/toolbelt-common.toml b/config/toolbelt-common.toml index 7f42d7886..5febf8a57 100644 --- a/config/toolbelt-common.toml +++ b/config/toolbelt-common.toml @@ -1,13 +1,13 @@ [general] #If set to FALSE, support for sewing recipes will not be enabled regardless of the mod's presence. - enableSewingKitSupport = true + enableSewingKitSupport = false #If AUTO, the crafting and upgrade recipes will use the Sewing mechanics if the Sewing Kit mod is present. Off disables anvil upgrading regardless. #Allowed Values: OFF, AUTO, ON anvilUpgrading = "AUTO" #If AUTO, the belt and pouch crafting recipes will be disabled if the Sewing Kit mod is present, sewing recipes will be used instead. #Allowed Values: OFF, AUTO, ON - enableGridCraftingRecipes = "AUTO" + enableGridCraftingRecipes = "ON" #If AUTO, the belt slot will be disabled if Curios is present. If OFF, the belt slot will be disabled permanently. #Allowed Values: OFF, AUTO, ON customBeltSlotMode = "ON" diff --git a/defaultconfigs/toolbelt-server.toml b/defaultconfigs/toolbelt-server.toml index 936a23ea7..2224bd62b 100644 --- a/defaultconfigs/toolbelt-server.toml +++ b/defaultconfigs/toolbelt-server.toml @@ -3,7 +3,7 @@ #List of items to force-allow placing in the belt. Takes precedence over blacklist. whitelist = [] #List of items to disallow from placing in the belt. (whitelist takes precedence) - blacklist = [] + blacklist = ["tfclunchbox:lunchbox", "tfclunchbox:cooling_lunchbox", "tfclunchbox:electric_lunchbox", "sophisticatedbackpacks:backpack", "sophisticatedbackpacks:iron_backpack", "sophisticatedbackpacks:gold_backpack", "sophisticatedbackpacks:diamond_backpack", "sophisticatedbackpacks:netherite_backpack", "tfc:ceramic/cyan_glazed_vessel", "tfc:ceramic/purple_glazed_vessel", "tfc:ceramic/blue_glazed_vessel", "tfc:ceramic/brown_glazed_vessel", "tfc:ceramic/green_glazed_vessel", "tfc:ceramic/red_glazed_vessel", "tfc:ceramic/black_glazed_vessel", "tfc:ceramic/large_vessel/gray", "tfc:ceramic/large_vessel/pink", "tfc:ceramic/large_vessel/lime", "tfc:ceramic/large_vessel/yellow", "tfc:ceramic/large_vessel/light_blue", "tfc:ceramic/large_vessel/magenta", "tfc:ceramic/large_vessel/orange", "tfc:ceramic/large_vessel/white", "tfc:ceramic/large_vessel", "tfc:ceramic/large_vessel/light_gray", "tfc:ceramic/large_vessel/cyan", "tfc:ceramic/large_vessel/purple", "tfc:ceramic/large_vessel/blue", "tfc:ceramic/large_vessel/brown", "tfc:ceramic/large_vessel/green", "tfc:ceramic/large_vessel/red", "tfc:ceramic/large_vessel/black", "tfc:ceramic/vessel", "tfc:ceramic/light_gray_glazed_vessel", "tfc:ceramic/gray_glazed_vessel", "tfc:ceramic/pink_glazed_vessel", "tfc:ceramic/lime_glazed_vessel", "tfc:ceramic/yellow_glazed_vessel", "tfc:ceramic/light_blue_glazed_vessel", "tfc:ceramic/magenta_glazed_vessel", "tfc:ceramic/orange_glazed_vessel", "tfc:ceramic/white_glazed_vessel"] #When set to false, stackable items will no longer be allowed by default. allowAllNonStackableItems = true diff --git a/kubejs/server_scripts/toolbelt/recipes.js b/kubejs/server_scripts/toolbelt/recipes.js index edeaf6c45..416eb646d 100644 --- a/kubejs/server_scripts/toolbelt/recipes.js +++ b/kubejs/server_scripts/toolbelt/recipes.js @@ -14,7 +14,7 @@ const registerToolBeltRecipes = (event) => { ], { A: '#forge:string', B: '#forge:leather', - C: '#forge:plates/wrought_iron' + C: '#forge:bolts/rose_gold' }).id('tfg:toolbelt/shaped/pouch') // ToolBelt с размером 2 @@ -26,13 +26,28 @@ const registerToolBeltRecipes = (event) => { A: '#forge:string', B: '#forge:leather', C: '#forge:plates/wrought_iron' - }).id(`tfg:toolbelt/shaped/belt_${ 2}`) + }).id(`tfg:toolbelt/shaped/belt_${2}`) + + event.shapeless(Item.of('toolbelt:belt', {Size:3}), [ + Ingredient.of(Item.of('toolbelt:belt').strongNBT()), + 'toolbelt:pouch' + ]).id(`tfg:toolbelt/shaped/first_upgrade`) + + event.shapeless(Item.of('toolbelt:belt', {Size:3,Items:[]}), [ + Ingredient.of(Item.of('toolbelt:belt', {Items:[]}).strongNBT()), + 'toolbelt:pouch' + ]).id(`tfg:toolbelt/shaped/first_upgrade_alt`) // 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())), + Ingredient.of(Item.of('toolbelt:belt', {Size:i-1}).strongNBT()), 'toolbelt:pouch' - ]).id(`tfg:toolbelt/shaped/belt_${ i}`) + ]).id(`tfg:toolbelt/shaped/belt_${i}`) + + event.shapeless(Item.of('toolbelt:belt', {Size:i}), [ + Ingredient.of(Item.of('toolbelt:belt', {Size:i-1,Items:[]}).strongNBT()), + 'toolbelt:pouch' + ]).id(`tfg:toolbelt/shaped/belt_${i}_alt`) } }