From d3ac84c19039f7fd8e2371b2b2397ab7408fdc75 Mon Sep 17 00:00:00 2001 From: Satherov Date: Mon, 20 Apr 2026 09:21:07 +0200 Subject: [PATCH] fix modium-ore mining tags --- .../incorrect_for_allthemodium_tool.json | 36 +-------- .../block/incorrect_for_vibranium_tool.json | 33 +------- .../provider/tags/ATMBlockTagsProvider.java | 79 +++---------------- 3 files changed, 11 insertions(+), 137 deletions(-) diff --git a/src/generated/resources/data/allthemodium/tags/block/incorrect_for_allthemodium_tool.json b/src/generated/resources/data/allthemodium/tags/block/incorrect_for_allthemodium_tool.json index 3d742b4b..4910788a 100644 --- a/src/generated/resources/data/allthemodium/tags/block/incorrect_for_allthemodium_tool.json +++ b/src/generated/resources/data/allthemodium/tags/block/incorrect_for_allthemodium_tool.json @@ -1,42 +1,8 @@ { "values": [ - "allthemodium:vibranium_ore", - "allthemodium:other_vibranium_ore", - "allthemodium:raw_vibranium_block", - "allthemodium:vibranium_block", "allthemodium:unobtainium_ore", "allthemodium:raw_unobtainium_block", "allthemodium:unobtainium_block", - "allthemodium:unobtainium_allthemodium_block", - "allthemodium:unobtainium_vibranium_block", - "allthemodium:vibranium_allthemodium_block", - "allthemodium:ancient_stone", - "allthemodium:smooth_ancient_stone", - "allthemodium:mossy_ancient_stone", - "allthemodium:ancient_stone_bricks", - "allthemodium:chiseled_ancient_stone_bricks", - "allthemodium:cracked_ancient_stone_bricks", - "allthemodium:polished_ancient_stone", - "allthemodium:ancient_stone_wall", - "allthemodium:smooth_ancient_stone_wall", - "allthemodium:mossy_ancient_stone_wall", - "allthemodium:ancient_stone_brick_wall", - "allthemodium:chiseled_ancient_stone_brick_wall", - "allthemodium:cracked_ancient_stone_brick_wall", - "allthemodium:polished_ancient_stone_wall", - "allthemodium:ancient_stone_stairs", - "allthemodium:smooth_ancient_stone_stairs", - "allthemodium:mossy_ancient_stone_stairs", - "allthemodium:ancient_stone_brick_stairs", - "allthemodium:chiseled_ancient_stone_brick_stairs", - "allthemodium:cracked_ancient_stone_brick_stairs", - "allthemodium:polished_ancient_stone_stairs", - "allthemodium:ancient_stone_slab", - "allthemodium:smooth_ancient_stone_slab", - "allthemodium:mossy_ancient_stone_slab", - "allthemodium:ancient_stone_brick_slab", - "allthemodium:chiseled_ancient_stone_brick_slab", - "allthemodium:cracked_ancient_stone_brick_slab", - "allthemodium:polished_ancient_stone_slab" + "#allthemodium:incorrect_for_vibranium_tool" ] } \ No newline at end of file diff --git a/src/generated/resources/data/allthemodium/tags/block/incorrect_for_vibranium_tool.json b/src/generated/resources/data/allthemodium/tags/block/incorrect_for_vibranium_tool.json index f7bb1377..b3535934 100644 --- a/src/generated/resources/data/allthemodium/tags/block/incorrect_for_vibranium_tool.json +++ b/src/generated/resources/data/allthemodium/tags/block/incorrect_for_vibranium_tool.json @@ -1,38 +1,7 @@ { "values": [ - "allthemodium:unobtainium_ore", - "allthemodium:raw_unobtainium_block", - "allthemodium:unobtainium_block", "allthemodium:unobtainium_allthemodium_block", "allthemodium:unobtainium_vibranium_block", - "allthemodium:vibranium_allthemodium_block", - "allthemodium:ancient_stone", - "allthemodium:smooth_ancient_stone", - "allthemodium:mossy_ancient_stone", - "allthemodium:ancient_stone_bricks", - "allthemodium:chiseled_ancient_stone_bricks", - "allthemodium:cracked_ancient_stone_bricks", - "allthemodium:polished_ancient_stone", - "allthemodium:ancient_stone_wall", - "allthemodium:smooth_ancient_stone_wall", - "allthemodium:mossy_ancient_stone_wall", - "allthemodium:ancient_stone_brick_wall", - "allthemodium:chiseled_ancient_stone_brick_wall", - "allthemodium:cracked_ancient_stone_brick_wall", - "allthemodium:polished_ancient_stone_wall", - "allthemodium:ancient_stone_stairs", - "allthemodium:smooth_ancient_stone_stairs", - "allthemodium:mossy_ancient_stone_stairs", - "allthemodium:ancient_stone_brick_stairs", - "allthemodium:chiseled_ancient_stone_brick_stairs", - "allthemodium:cracked_ancient_stone_brick_stairs", - "allthemodium:polished_ancient_stone_stairs", - "allthemodium:ancient_stone_slab", - "allthemodium:smooth_ancient_stone_slab", - "allthemodium:mossy_ancient_stone_slab", - "allthemodium:ancient_stone_brick_slab", - "allthemodium:chiseled_ancient_stone_brick_slab", - "allthemodium:cracked_ancient_stone_brick_slab", - "allthemodium:polished_ancient_stone_slab" + "allthemodium:vibranium_allthemodium_block" ] } \ No newline at end of file diff --git a/src/main/java/net/allthemods/allthemodium/data/provider/tags/ATMBlockTagsProvider.java b/src/main/java/net/allthemods/allthemodium/data/provider/tags/ATMBlockTagsProvider.java index 7a3cab9e..92cd2aa3 100644 --- a/src/main/java/net/allthemods/allthemodium/data/provider/tags/ATMBlockTagsProvider.java +++ b/src/main/java/net/allthemods/allthemodium/data/provider/tags/ATMBlockTagsProvider.java @@ -41,82 +41,17 @@ protected void addTags(HolderLookup.Provider registries) { this.tag(ATMTags.Blocks.INCORRECT_FOR_ALLTHEMODIUM_TOOL) .add( - ATMBlocks.VIBRANIUM_ORE.get(), - ATMBlocks.OTHER_VIBRANIUM_ORE.get(), - ATMBlocks.RAW_VIBRANIUM_BLOCK.get(), - ATMBlocks.VIBRANIUM_BLOCK.get(), ATMBlocks.UNOBTAINIUM_ORE.get(), ATMBlocks.RAW_UNOBTAINIUM_BLOCK.get(), - ATMBlocks.UNOBTAINIUM_BLOCK.get(), - ATMBlocks.UNOBTAINIUM_ALLTHEMODIUM_BLOCK.get(), - ATMBlocks.UNOBTAINIUM_VIBRANIUM_BLOCK.get(), - ATMBlocks.VIBRANIUM_ALLTHEMODIUM_BLOCK.get(), - ATMBlocks.ANCIENT_STONE.get(), - ATMBlocks.SMOOTH_ANCIENT_STONE.get(), - ATMBlocks.MOSSY_ANCIENT_STONE.get(), - ATMBlocks.ANCIENT_STONE_BRICKS.get(), - ATMBlocks.CHISELED_ANCIENT_STONE_BRICKS.get(), - ATMBlocks.CRACKED_ANCIENT_STONE_BRICKS.get(), - ATMBlocks.POLISHED_ANCIENT_STONE.get(), - ATMBlocks.ANCIENT_STONE_WALL.get(), - ATMBlocks.SMOOTH_ANCIENT_STONE_WALL.get(), - ATMBlocks.MOSSY_ANCIENT_STONE_WALL.get(), - ATMBlocks.ANCIENT_STONE_BRICK_WALL.get(), - ATMBlocks.CHISELED_ANCIENT_STONE_BRICK_WALL.get(), - ATMBlocks.CRACKED_ANCIENT_STONE_BRICK_WALL.get(), - ATMBlocks.POLISHED_ANCIENT_STONE_WALL.get(), - ATMBlocks.ANCIENT_STONE_STAIRS.get(), - ATMBlocks.SMOOTH_ANCIENT_STONE_STAIRS.get(), - ATMBlocks.MOSSY_ANCIENT_STONE_STAIRS.get(), - ATMBlocks.ANCIENT_STONE_BRICK_STAIRS.get(), - ATMBlocks.CHISELED_ANCIENT_STONE_BRICK_STAIRS.get(), - ATMBlocks.CRACKED_ANCIENT_STONE_BRICK_STAIRS.get(), - ATMBlocks.POLISHED_ANCIENT_STONE_STAIRS.get(), - ATMBlocks.ANCIENT_STONE_SLAB.get(), - ATMBlocks.SMOOTH_ANCIENT_STONE_SLAB.get(), - ATMBlocks.MOSSY_ANCIENT_STONE_SLAB.get(), - ATMBlocks.ANCIENT_STONE_BRICK_SLAB.get(), - ATMBlocks.CHISELED_ANCIENT_STONE_BRICK_SLAB.get(), - ATMBlocks.CRACKED_ANCIENT_STONE_BRICK_SLAB.get(), - ATMBlocks.POLISHED_ANCIENT_STONE_SLAB.get() - ); + ATMBlocks.UNOBTAINIUM_BLOCK.get() + ) + .addTag(ATMTags.Blocks.INCORRECT_FOR_VIBRANIUM_TOOL); this.tag(ATMTags.Blocks.INCORRECT_FOR_VIBRANIUM_TOOL) .add( - ATMBlocks.UNOBTAINIUM_ORE.get(), - ATMBlocks.RAW_UNOBTAINIUM_BLOCK.get(), - ATMBlocks.UNOBTAINIUM_BLOCK.get(), ATMBlocks.UNOBTAINIUM_ALLTHEMODIUM_BLOCK.get(), ATMBlocks.UNOBTAINIUM_VIBRANIUM_BLOCK.get(), - ATMBlocks.VIBRANIUM_ALLTHEMODIUM_BLOCK.get(), - ATMBlocks.ANCIENT_STONE.get(), - ATMBlocks.SMOOTH_ANCIENT_STONE.get(), - ATMBlocks.MOSSY_ANCIENT_STONE.get(), - ATMBlocks.ANCIENT_STONE_BRICKS.get(), - ATMBlocks.CHISELED_ANCIENT_STONE_BRICKS.get(), - ATMBlocks.CRACKED_ANCIENT_STONE_BRICKS.get(), - ATMBlocks.POLISHED_ANCIENT_STONE.get(), - ATMBlocks.ANCIENT_STONE_WALL.get(), - ATMBlocks.SMOOTH_ANCIENT_STONE_WALL.get(), - ATMBlocks.MOSSY_ANCIENT_STONE_WALL.get(), - ATMBlocks.ANCIENT_STONE_BRICK_WALL.get(), - ATMBlocks.CHISELED_ANCIENT_STONE_BRICK_WALL.get(), - ATMBlocks.CRACKED_ANCIENT_STONE_BRICK_WALL.get(), - ATMBlocks.POLISHED_ANCIENT_STONE_WALL.get(), - ATMBlocks.ANCIENT_STONE_STAIRS.get(), - ATMBlocks.SMOOTH_ANCIENT_STONE_STAIRS.get(), - ATMBlocks.MOSSY_ANCIENT_STONE_STAIRS.get(), - ATMBlocks.ANCIENT_STONE_BRICK_STAIRS.get(), - ATMBlocks.CHISELED_ANCIENT_STONE_BRICK_STAIRS.get(), - ATMBlocks.CRACKED_ANCIENT_STONE_BRICK_STAIRS.get(), - ATMBlocks.POLISHED_ANCIENT_STONE_STAIRS.get(), - ATMBlocks.ANCIENT_STONE_SLAB.get(), - ATMBlocks.SMOOTH_ANCIENT_STONE_SLAB.get(), - ATMBlocks.MOSSY_ANCIENT_STONE_SLAB.get(), - ATMBlocks.ANCIENT_STONE_BRICK_SLAB.get(), - ATMBlocks.CHISELED_ANCIENT_STONE_BRICK_SLAB.get(), - ATMBlocks.CRACKED_ANCIENT_STONE_BRICK_SLAB.get(), - ATMBlocks.POLISHED_ANCIENT_STONE_SLAB.get() + ATMBlocks.VIBRANIUM_ALLTHEMODIUM_BLOCK.get() ); this.tag(ATMTags.Blocks.INCORRECT_FOR_UNOBTAINIUM_TOOL); @@ -151,7 +86,11 @@ protected void addTags(HolderLookup.Provider registries) { ); this.tag(BlockTags.BEACON_BASE_BLOCKS) - .add(ATMBlocks.ALLTHEMODIUM_BLOCK.get(), ATMBlocks.VIBRANIUM_BLOCK.get(), ATMBlocks.UNOBTAINIUM_BLOCK.get()); + .add( + ATMBlocks.ALLTHEMODIUM_BLOCK.get(), + ATMBlocks.VIBRANIUM_BLOCK.get(), + ATMBlocks.UNOBTAINIUM_BLOCK.get() + ); this.tag(BlockTags.SOUL_FIRE_BASE_BLOCKS) .add(