From bd7a4d6f5c8d30b964278659ec980cfb7c730700 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 20 Oct 2024 13:23:56 +0700 Subject: [PATCH] aleki roofs fixes --- kubejs/server_scripts/alekiroofs/tags.js | 27 ++------ kubejs/server_scripts/tfc/tags.js | 18 +++-- .../startup_scripts/alekiroofs/constants.js | 36 ++++++++++ kubejs/startup_scripts/tfc/constants.js | 65 +------------------ 4 files changed, 50 insertions(+), 96 deletions(-) create mode 100644 kubejs/startup_scripts/alekiroofs/constants.js diff --git a/kubejs/server_scripts/alekiroofs/tags.js b/kubejs/server_scripts/alekiroofs/tags.js index 3815da580..8c0074cf6 100644 --- a/kubejs/server_scripts/alekiroofs/tags.js +++ b/kubejs/server_scripts/alekiroofs/tags.js @@ -1,25 +1,11 @@ // priority: 0 const registerAlekiRoofsItemTags = (event) => { - global.MINECRAFT_DISABLED_ITEMS.forEach(item => { - // event.removeAllTagsFrom(item) - // event.add('c:hidden_from_recipe_viewers', item) + global.ALEKI_ROOFS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) }) - // global.MINECRAFT_HIDED_ITEMS.forEach(item => { - // event.add('c:hidden_from_recipe_viewers', item) - // }) - - // event.add('tfc:lumber', 'tfg:crimson_lumber') - // event.add('tfc:lumber', 'tfg:warped_lumber') - - // // Теперь обсидиан сторадж блок - // event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') - - // // Бамбуковые полублоки - // event.add('tfg:bamboo_slabs', 'minecraft:bamboo_slab') - // event.add('tfg:bamboo_slabs', 'minecraft:bamboo_mosaic_slab') - //#region Бамбуковые крыши в один тег event.add('tfg:bamboo_roofings', 'alekiroofs:bamboo_roofing') event.add('tfg:bamboo_roofings', 'alekiroofs:bamboo_mosaic_roofing') @@ -27,10 +13,7 @@ const registerAlekiRoofsItemTags = (event) => { } const registerAlekiRoofsBlockTags = (event) => { - global.MINECRAFT_DISABLED_ITEMS.forEach(item => { - // event.removeAllTagsFrom(item) + global.ALEKI_ROOFS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) }) - - // // Теперь обсидиан сторадж блок - // event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index e40db939d..677619c10 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -241,12 +241,11 @@ const registerTFCItemTags = (event) => { }) //#endregion - // todo: // Удаление тегов у отключенных предметов - // global.TFC_DISABLED_ITEMS.forEach(item => { - // event.removeAllTagsFrom(item) - // event.add('c:hidden_from_recipe_viewers', item) - // }) + global.TFC_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) } const registerTFCBlockTags = (event) => { @@ -324,11 +323,10 @@ const registerTFCBlockTags = (event) => { }) //#endregion - // todo: - // // Удаление тегов у отключенных предметов - // global.TFC_DISABLED_ITEMS.forEach(item => { - // event.removeAllTagsFrom(item) - // }) + // Удаление тегов у отключенных предметов + global.TFC_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) } const registerTFCFluidTags = (event) => { diff --git a/kubejs/startup_scripts/alekiroofs/constants.js b/kubejs/startup_scripts/alekiroofs/constants.js new file mode 100644 index 000000000..a37c9bb08 --- /dev/null +++ b/kubejs/startup_scripts/alekiroofs/constants.js @@ -0,0 +1,36 @@ +// priority: 0 + +global.ALEKI_ROOFS_DISABLED_ITEMS = [ + "alekiroofs:mud_brick_roofing", + "alekiroofs:sandstone_roofing", + "alekiroofs:smooth_sandstone_roofing", + "alekiroofs:red_sandstone_roofing", + "alekiroofs:smooth_red_sandstone_roofing", + "alekiroofs:oak_roofing", + "alekiroofs:spruce_roofing", + "alekiroofs:birch_roofing", + "alekiroofs:jungle_roofing", + "alekiroofs:acacia_roofing", + "alekiroofs:dark_oak_roofing", + "alekiroofs:mangrove_roofing", + "alekiroofs:cherry_roofing", + "alekiroofs:crimson_roofing", + "alekiroofs:warped_roofing", + "alekiroofs:cobbled_deepslate_roofing", + "alekiroofs:polished_deepslate_roofing", + "alekiroofs:deepslate_tile_roofing", + "alekiroofs:deepslate_brick_roofing", + "alekiroofs:andesite_roofing", + "alekiroofs:polished_andesite_roofing", + "alekiroofs:granite_roofing", + "alekiroofs:polished_granite_roofing", + "alekiroofs:diorite_roofing", + "alekiroofs:polished_diorite_roofing", + "alekiroofs:stone_roofing", + "alekiroofs:cobblestone_roofing", + "alekiroofs:mossy_cobblestone_roofing", + "alekiroofs:stone_brick_roofing", + "alekiroofs:mossy_stone_brick_roofing", + "alekiroofs:purpur_roofing", + "alekiroofs:end_stone_brick_roofing", +]; \ No newline at end of file diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 9c2783bd4..07cf47a25 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -5,69 +5,6 @@ * у которых должны быть удалены тэги и они должны быть скрыты в REI. */ global.TFC_DISABLED_ITEMS = [ - // Blocks - 'tfc:metal/block/bismuth', - 'tfc:metal/block/bismuth_bronze', - 'tfc:metal/block/black_bronze', - 'tfc:metal/block/bronze', - 'tfc:metal/block/brass', - 'tfc:metal/block/copper', - 'tfc:metal/block/gold', - 'tfc:metal/block/nickel', - 'tfc:metal/block/rose_gold', - 'tfc:metal/block/silver', - 'tfc:metal/block/tin', - 'tfc:metal/block/zinc', - 'tfc:metal/block/sterling_silver', - 'tfc:metal/block/wrought_iron', - 'tfc:metal/block/cast_iron', - 'tfc:metal/block/steel', - 'tfc:metal/block/black_steel', - 'tfc:metal/block/blue_steel', - 'tfc:metal/block/red_steel', - - // Stairs - 'tfc:metal/block/bismuth_stairs', - 'tfc:metal/block/bismuth_bronze_stairs', - 'tfc:metal/block/black_bronze_stairs', - 'tfc:metal/block/bronze_stairs', - 'tfc:metal/block/brass_stairs', - 'tfc:metal/block/copper_stairs', - 'tfc:metal/block/gold_stairs', - 'tfc:metal/block/nickel_stairs', - 'tfc:metal/block/rose_gold_stairs', - 'tfc:metal/block/silver_stairs', - 'tfc:metal/block/tin_stairs', - 'tfc:metal/block/zinc_stairs', - 'tfc:metal/block/sterling_silver_stairs', - 'tfc:metal/block/wrought_iron_stairs', - 'tfc:metal/block/cast_iron_stairs', - 'tfc:metal/block/steel_stairs', - 'tfc:metal/block/black_steel_stairs', - 'tfc:metal/block/blue_steel_stairs', - 'tfc:metal/block/red_steel_stairs', - - // Slabs - 'tfc:metal/block/bismuth_slab', - 'tfc:metal/block/bismuth_bronze_slab', - 'tfc:metal/block/black_bronze_slab', - 'tfc:metal/block/bronze_slab', - 'tfc:metal/block/brass_slab', - 'tfc:metal/block/copper_slab', - 'tfc:metal/block/gold_slab', - 'tfc:metal/block/nickel_slab', - 'tfc:metal/block/rose_gold_slab', - 'tfc:metal/block/silver_slab', - 'tfc:metal/block/tin_slab', - 'tfc:metal/block/zinc_slab', - 'tfc:metal/block/sterling_silver_slab', - 'tfc:metal/block/wrought_iron_slab', - 'tfc:metal/block/cast_iron_slab', - 'tfc:metal/block/steel_slab', - 'tfc:metal/block/black_steel_slab', - 'tfc:metal/block/blue_steel_slab', - 'tfc:metal/block/red_steel_slab', - // Ingots "tfc:metal/ingot/bismuth", "tfc:metal/ingot/bismuth_bronze", @@ -650,7 +587,7 @@ global.TFC_DISABLED_ITEMS = [ 'tfc:stone/hoe/sedimentary', // Other - "tfc:trip_hammer", + 'tfc:trip_hammer', 'tfc:steel_pipe', 'tfc:steel_pump', 'tfc:crankshaft',