From f7ebbb7b0d95282a888fa6a4dbd80d622748a0be Mon Sep 17 00:00:00 2001 From: Glitchlabs Date: Sat, 11 Jul 2026 11:09:42 +0200 Subject: [PATCH] + more Block Tags --- gradle.properties | 2 +- .../5537763371ce84515b2ba566a215878d32b7df83 | 7 +- .../minecraft/tags/block/impermeable.json | 20 ++++++ .../tags/block/incorrect_for_gold_tool.json | 16 +++++ .../tags/block/incorrect_for_iron_tool.json | 6 ++ .../tags/block/incorrect_for_stone_tool.json | 28 ++++++++ .../datagen/ModBlockTagProvider.java | 72 +++++++++++++++++++ 7 files changed, 148 insertions(+), 3 deletions(-) create mode 100644 src/generated/resources/data/minecraft/tags/block/impermeable.json create mode 100644 src/generated/resources/data/minecraft/tags/block/incorrect_for_iron_tool.json create mode 100644 src/generated/resources/data/minecraft/tags/block/incorrect_for_stone_tool.json diff --git a/gradle.properties b/gradle.properties index f6e004e..8f40c09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,7 +27,7 @@ mod_name=Ornamentum # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=0.0.8 +mod_version=0.0.9 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 b/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 index d89cc72..42a7b15 100644 --- a/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 +++ b/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 @@ -1,4 +1,4 @@ -// 1.21.1 2026-07-11T10:51:27.903776006 Tags for minecraft:block mod id ornamentum +// 1.21.1 2026-07-11T11:08:46.192387783 Tags for minecraft:block mod id ornamentum 35fa49b0851f186bcc89ff967128db964e58f3b1 data/c/tags/block/dyed.json 9312903e66801c504e2f995662f48688b68f93f7 data/c/tags/block/dyed/black.json 011500e8d6a99dc106d64223199f230b5db5cdd0 data/c/tags/block/dyed/blue.json @@ -18,7 +18,10 @@ cb872f67655fcdeb72e2904dcbafd1bc3cbf9208 data/c/tags/block/dyed/red.json 2254b76181eb94f95db7a87b8ddbc92f6ebe794c data/c/tags/block/dyed/yellow.json c79b0cf1b19fd14258867e1f8d2c87cf6481ae11 data/c/tags/block/glass_blocks.json f0db6cd47dabe41d4980b4bb0b2751ac66ce97c9 data/minecraft/tags/block/dampens_vibrations.json -08850911667adfe512ce46e315dc6e4b2e18b776 data/minecraft/tags/block/incorrect_for_gold_tool.json +c79b0cf1b19fd14258867e1f8d2c87cf6481ae11 data/minecraft/tags/block/impermeable.json +f8406c38e5830d8c6bd07167708879dda2fcee91 data/minecraft/tags/block/incorrect_for_gold_tool.json +8746b07cb20507229809e554193318dd4c83883e data/minecraft/tags/block/incorrect_for_iron_tool.json +19e3ad14a79a31b6a6492094d8ab1e89820fec91 data/minecraft/tags/block/incorrect_for_stone_tool.json f8406c38e5830d8c6bd07167708879dda2fcee91 data/minecraft/tags/block/incorrect_for_wooden_tool.json bd3ae5c128ff9d445079f1974c0dd74d6e31af24 data/minecraft/tags/block/mineable/pickaxe.json 8746b07cb20507229809e554193318dd4c83883e data/minecraft/tags/block/needs_diamond_tool.json diff --git a/src/generated/resources/data/minecraft/tags/block/impermeable.json b/src/generated/resources/data/minecraft/tags/block/impermeable.json new file mode 100644 index 0000000..cc3d976 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/block/impermeable.json @@ -0,0 +1,20 @@ +{ + "values": [ + "ornamentum:white_glow_stained_glass", + "ornamentum:orange_glow_stained_glass", + "ornamentum:magenta_glow_stained_glass", + "ornamentum:light_blue_glow_stained_glass", + "ornamentum:yellow_glow_stained_glass", + "ornamentum:lime_glow_stained_glass", + "ornamentum:pink_glow_stained_glass", + "ornamentum:gray_glow_stained_glass", + "ornamentum:light_gray_glow_stained_glass", + "ornamentum:cyan_glow_stained_glass", + "ornamentum:purple_glow_stained_glass", + "ornamentum:blue_glow_stained_glass", + "ornamentum:brown_glow_stained_glass", + "ornamentum:green_glow_stained_glass", + "ornamentum:red_glow_stained_glass", + "ornamentum:black_glow_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json b/src/generated/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json index 05461ea..5f3335b 100644 --- a/src/generated/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json @@ -6,6 +6,22 @@ "ornamentum:amethyst_grate", "ornamentum:obsidian_grate", "ornamentum:netherite_grate", + "ornamentum:lime_glow_block", + "ornamentum:white_glow_block", + "ornamentum:gray_glow_block", + "ornamentum:light_gray_glow_block", + "ornamentum:black_glow_block", + "ornamentum:brown_glow_block", + "ornamentum:red_glow_block", + "ornamentum:orange_glow_block", + "ornamentum:yellow_glow_block", + "ornamentum:green_glow_block", + "ornamentum:cyan_glow_block", + "ornamentum:light_blue_glow_block", + "ornamentum:blue_glow_block", + "ornamentum:purple_glow_block", + "ornamentum:magenta_glow_block", + "ornamentum:pink_glow_block", "ornamentum:pool_tiles", "ornamentum:pool_tiles1", "ornamentum:mesh_iron" diff --git a/src/generated/resources/data/minecraft/tags/block/incorrect_for_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/incorrect_for_iron_tool.json new file mode 100644 index 0000000..5523ab8 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/block/incorrect_for_iron_tool.json @@ -0,0 +1,6 @@ +{ + "values": [ + "ornamentum:obsidian_grate", + "ornamentum:netherite_grate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/incorrect_for_stone_tool.json b/src/generated/resources/data/minecraft/tags/block/incorrect_for_stone_tool.json new file mode 100644 index 0000000..e05a9a6 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/block/incorrect_for_stone_tool.json @@ -0,0 +1,28 @@ +{ + "values": [ + "ornamentum:gold_grate", + "ornamentum:diamond_grate", + "ornamentum:amethyst_grate", + "ornamentum:obsidian_grate", + "ornamentum:netherite_grate", + "ornamentum:lime_glow_block", + "ornamentum:white_glow_block", + "ornamentum:gray_glow_block", + "ornamentum:light_gray_glow_block", + "ornamentum:black_glow_block", + "ornamentum:brown_glow_block", + "ornamentum:red_glow_block", + "ornamentum:orange_glow_block", + "ornamentum:yellow_glow_block", + "ornamentum:green_glow_block", + "ornamentum:cyan_glow_block", + "ornamentum:light_blue_glow_block", + "ornamentum:blue_glow_block", + "ornamentum:purple_glow_block", + "ornamentum:magenta_glow_block", + "ornamentum:pink_glow_block", + "ornamentum:pool_tiles", + "ornamentum:pool_tiles1", + "ornamentum:mesh_iron" + ] +} \ No newline at end of file diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java index 725b866..f344aab 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java @@ -96,12 +96,64 @@ public class ModBlockTagProvider extends BlockTagsProvider { .add(ModBlocks.OBSIDIAN_GRATE.get()) .add(ModBlocks.NETHERITE_GRATE.get()) + .add(ModBlocks.LIME_GLOW_BLOCK.get()) + .add(ModBlocks.WHITE_GLOW_BLOCK.get()) + .add(ModBlocks.GRAY_GLOW_BLOCK.get()) + .add(ModBlocks.LIGHT_GRAY_GLOW_BLOCK.get()) + .add(ModBlocks.BLACK_GLOW_BLOCK.get()) + .add(ModBlocks.BROWN_GLOW_BLOCK.get()) + .add(ModBlocks.RED_GLOW_BLOCK.get()) + .add(ModBlocks.ORANGE_GLOW_BLOCK.get()) + .add(ModBlocks.YELLOW_GLOW_BLOCK.get()) + .add(ModBlocks.GREEN_GLOW_BLOCK.get()) + .add(ModBlocks.CYAN_GLOW_BLOCK.get()) + .add(ModBlocks.LIGHT_BLUE_GLOW_BLOCK.get()) + .add(ModBlocks.BLUE_GLOW_BLOCK.get()) + .add(ModBlocks.PURPLE_GLOW_BLOCK.get()) + .add(ModBlocks.MAGENTA_GLOW_BLOCK.get()) + .add(ModBlocks.PINK_GLOW_BLOCK.get()) + .add(ModBlocks.POOL_TILES.get()) .add(ModBlocks.POOL_TILES1.get()) .add(ModBlocks.MESH_IRON.get()) ; + tag(BlockTags.INCORRECT_FOR_STONE_TOOL) + .add(ModBlocks.GOLD_GRATE.get()) + .add(ModBlocks.DIAMOND_GRATE.get()) + .add(ModBlocks.AMETHYST_GRATE.get()) + .add(ModBlocks.OBSIDIAN_GRATE.get()) + .add(ModBlocks.NETHERITE_GRATE.get()) + + .add(ModBlocks.LIME_GLOW_BLOCK.get()) + .add(ModBlocks.WHITE_GLOW_BLOCK.get()) + .add(ModBlocks.GRAY_GLOW_BLOCK.get()) + .add(ModBlocks.LIGHT_GRAY_GLOW_BLOCK.get()) + .add(ModBlocks.BLACK_GLOW_BLOCK.get()) + .add(ModBlocks.BROWN_GLOW_BLOCK.get()) + .add(ModBlocks.RED_GLOW_BLOCK.get()) + .add(ModBlocks.ORANGE_GLOW_BLOCK.get()) + .add(ModBlocks.YELLOW_GLOW_BLOCK.get()) + .add(ModBlocks.GREEN_GLOW_BLOCK.get()) + .add(ModBlocks.CYAN_GLOW_BLOCK.get()) + .add(ModBlocks.LIGHT_BLUE_GLOW_BLOCK.get()) + .add(ModBlocks.BLUE_GLOW_BLOCK.get()) + .add(ModBlocks.PURPLE_GLOW_BLOCK.get()) + .add(ModBlocks.MAGENTA_GLOW_BLOCK.get()) + .add(ModBlocks.PINK_GLOW_BLOCK.get()) + + .add(ModBlocks.POOL_TILES.get()) + .add(ModBlocks.POOL_TILES1.get()) + + .add(ModBlocks.MESH_IRON.get()) + ; + + tag(BlockTags.INCORRECT_FOR_IRON_TOOL) + .add(ModBlocks.OBSIDIAN_GRATE.get()) + .add(ModBlocks.NETHERITE_GRATE.get()) + ; + tag(BlockTags.INCORRECT_FOR_WOODEN_TOOL) .add(ModBlocks.IRON_GRATE.get()) .add(ModBlocks.GOLD_GRATE.get()) @@ -154,6 +206,26 @@ public class ModBlockTagProvider extends BlockTagsProvider { ; + + tag(BlockTags.IMPERMEABLE) + .add(ModBlocks.WHITE_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.ORANGE_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.MAGENTA_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.LIGHT_BLUE_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.YELLOW_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.LIME_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.PINK_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.GRAY_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.LIGHT_GRAY_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.CYAN_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.PURPLE_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.BLUE_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.BROWN_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.GREEN_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.RED_GLOW_STAINED_GLASS.get()) + .add(ModBlocks.BLACK_GLOW_STAINED_GLASS.get()) + ; + tag(BlockTags.DAMPENS_VIBRATIONS) .add(ModBlocks.WHITE_WOOL_SLAB.get()) .add(ModBlocks.ORANGE_WOOL_SLAB.get())