diff --git a/kubejs/client_scripts/tfc/constants.js b/kubejs/client_scripts/tfc/constants.js index 3dba033bb..3b76d3625 100644 --- a/kubejs/client_scripts/tfc/constants.js +++ b/kubejs/client_scripts/tfc/constants.js @@ -1,9 +1,30 @@ // priority: 199 const tfcItemsToHide = [ + // Ingots + 'tfc:metal/ingot/bismuth', + 'tfc:metal/ingot/bismuth_bronze', + 'tfc:metal/ingot/black_bronze', + 'tfc:metal/ingot/bronze', + 'tfc:metal/ingot/rose_gold', + 'tfc:metal/ingot/sterling_silver', + 'tfc:metal/ingot/wrought_iron', + 'tfc:metal/ingot/cast_iron', + 'tfc:metal/ingot/steel', + 'tfc:metal/ingot/black_steel', + 'tfc:metal/ingot/red_steel', + 'tfc:metal/ingot/blue_steel', + 'tfc:metal/ingot/brass', + 'tfc:metal/ingot/copper', + 'tfc:metal/ingot/gold', + 'tfc:metal/ingot/nickel', + 'tfc:metal/ingot/silver', + 'tfc:metal/ingot/tin', + 'tfc:metal/ingot/zinc', + // Simple metals // Bismuth - 'tfc:metal/ingot/bismuth', + 'tfc:metal/sheet/bismuth', 'tfc:metal/double_sheet/bismuth', 'tfc:metal/rod/bismuth', @@ -17,7 +38,7 @@ const tfcItemsToHide = [ 'tfc:metal/double_sheet/nickel', // Rose Gold - 'tfc:metal/ingot/rose_gold', + 'tfc:metal/sheet/rose_gold', 'tfc:metal/double_sheet/rose_gold', 'tfc:metal/rod/rose_gold', @@ -39,7 +60,7 @@ const tfcItemsToHide = [ 'tfc:metal/double_sheet/zinc', // Sterling Silver - 'tfc:metal/ingot/sterling_silver', + 'tfc:metal/sheet/sterling_silver', 'tfc:metal/double_sheet/sterling_silver', 'tfc:metal/rod/sterling_silver', @@ -52,7 +73,6 @@ const tfcItemsToHide = [ // Metals with tools // Copper - // 'tfc:metal/ingot/copper', 'tfc:metal/sheet/copper', 'tfc:metal/double_sheet/copper', 'tfc:metal/rod/copper', @@ -76,7 +96,7 @@ const tfcItemsToHide = [ 'tfc:metal/scythe_blade/copper', // Bismuth Bronze - 'tfc:metal/ingot/bismuth_bronze', + 'tfc:metal/sheet/bismuth_bronze', 'tfc:metal/double_sheet/bismuth_bronze', 'tfc:metal/rod/bismuth_bronze', @@ -100,7 +120,7 @@ const tfcItemsToHide = [ 'tfc:metal/scythe_blade/bismuth_bronze', // Bronze - 'tfc:metal/ingot/bronze', + 'tfc:metal/sheet/bronze', 'tfc:metal/double_sheet/bronze', 'tfc:metal/rod/bronze', @@ -124,7 +144,7 @@ const tfcItemsToHide = [ 'tfc:metal/scythe_blade/bronze', // Black Bronze - 'tfc:metal/ingot/black_bronze', + 'tfc:metal/sheet/black_bronze', 'tfc:metal/double_sheet/black_bronze', 'tfc:metal/rod/black_bronze', @@ -148,7 +168,7 @@ const tfcItemsToHide = [ 'tfc:metal/scythe_blade/black_bronze', // Wrought Iron - 'tfc:metal/ingot/wrought_iron', + 'tfc:metal/sheet/wrought_iron', 'tfc:metal/double_sheet/wrought_iron', 'tfc:metal/rod/wrought_iron', @@ -172,7 +192,6 @@ const tfcItemsToHide = [ 'tfc:metal/scythe_blade/wrought_iron', // Steel - 'tfc:metal/ingot/steel', 'tfc:metal/sheet/steel', 'tfc:metal/double_sheet/steel', 'tfc:metal/rod/steel', @@ -196,7 +215,6 @@ const tfcItemsToHide = [ 'tfc:metal/scythe_blade/steel', // Black Steel - 'tfc:metal/ingot/black_steel', 'tfc:metal/sheet/black_steel', 'tfc:metal/double_sheet/black_steel', 'tfc:metal/rod/black_steel', @@ -220,7 +238,6 @@ const tfcItemsToHide = [ 'tfc:metal/scythe_blade/black_steel', // Red Steel - 'tfc:metal/ingot/red_steel', 'tfc:metal/sheet/red_steel', 'tfc:metal/double_sheet/red_steel', 'tfc:metal/rod/red_steel', @@ -244,7 +261,6 @@ const tfcItemsToHide = [ 'tfc:metal/scythe_blade/red_steel', // Blue Steel - 'tfc:metal/ingot/blue_steel', 'tfc:metal/sheet/blue_steel', 'tfc:metal/double_sheet/blue_steel', 'tfc:metal/rod/blue_steel', diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js index f7fabb802..e700500a4 100644 --- a/kubejs/server_scripts/mainServerScript.js +++ b/kubejs/server_scripts/mainServerScript.js @@ -20,7 +20,7 @@ ServerEvents.tags('block', event => { */ ServerEvents.tags('item', event => { registerCreateTags(event) - registerTFCItemsTags(event) + registerTFCItemTags(event) }) /** @@ -37,6 +37,7 @@ ServerEvents.recipes(event => { registerSBRecipes(event) registerExtendedCraftingRecipes(event) registerTreeTapRecipes(event) + registerMCWRecipes(event) }) /** diff --git a/kubejs/server_scripts/mcw/recipes.js b/kubejs/server_scripts/mcw/recipes.js new file mode 100644 index 000000000..f20e25e29 --- /dev/null +++ b/kubejs/server_scripts/mcw/recipes.js @@ -0,0 +1,6 @@ +// priority: 0 + +const registerMCWRecipes = (event) => { + // Удаление рецептов мода create + event.remove({ mod: 'mcw_tfc_aio' }); +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 95dda9d8e..60f962a46 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -1,10 +1,31 @@ // priority: 0 -const registerTFCItemsTags = (event) => { +const registerTFCItemTags = (event) => { removeAllTagsItems.forEach(item => { event.removeAllTagsFrom(item) }) + // Unification + event.remove('forge:ingots/bismuth', 'tfc:metal/ingot/bismuth') + event.remove('forge:ingots/bismuth_bronze', 'tfc:metal/ingot/bismuth_bronze') + event.remove('forge:ingots/black_bronze', 'tfc:metal/ingot/black_bronze') + event.remove('forge:ingots/bronze', 'tfc:metal/ingot/bronze') + event.remove('forge:ingots/rose_gold', 'tfc:metal/ingot/rose_gold') + event.remove('forge:ingots/sterling_silver', 'tfc:metal/ingot/sterling_silver') + event.remove('forge:ingots/wrought_iron', 'tfc:metal/ingot/wrought_iron') + event.remove('forge:ingots/cast_iron', 'tfc:metal/ingot/cast_iron') + event.remove('forge:ingots/steel', 'tfc:metal/ingot/steel') + event.remove('forge:ingots/black_steel', 'tfc:metal/ingot/black_steel') + event.remove('forge:ingots/red_steel', 'tfc:metal/ingot/red_steel') + event.remove('forge:ingots/blue_steel', 'tfc:metal/ingot/blue_steel') + event.remove('forge:ingots/brass', 'tfc:metal/ingot/brass') + event.remove('forge:ingots/copper', 'tfc:metal/ingot/copper') + event.remove('forge:ingots/gold', 'tfc:metal/ingot/gold') + event.remove('forge:ingots/nickel', 'tfc:metal/ingot/nickel') + event.remove('forge:ingots/silver', 'tfc:metal/ingot/silver') + event.remove('forge:ingots/tin', 'tfc:metal/ingot/tin') + event.remove('forge:ingots/zinc', 'tfc:metal/ingot/zinc') + event.add('forge:ingots/double/bismuth', 'tfc:metal/double_ingot/bismuth') event.add('forge:ingots/double/bismuth_bronze', 'tfc:metal/double_ingot/bismuth_bronze') event.add('forge:ingots/double/black_bronze', 'tfc:metal/double_ingot/black_bronze')