From 31b7f728eee8526173168e781e61c601844c032b Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sun, 1 Jun 2025 19:02:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=96=B9=E5=9D=97tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aea51f45d35dbbd3220b84682ce1417a457a0246 | 8 +++++++- .../resources/data/c/tags/block/ores.json | 7 +++++++ .../resources/data/c/tags/block/ores/lead.json | 6 ++++++ .../resources/data/c/tags/block/ores/silver.json | 6 ++++++ .../data/c/tags/block/ores/tungsten.json | 6 ++++++ .../c/tags/block/ores_in_ground/deepslate.json | 7 +++++++ .../data/c/tags/block/ores_in_ground/stone.json | 7 +++++++ .../datagen/ModBlockTagProvider.java | 15 +++++++++++++++ 8 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/data/c/tags/block/ores.json create mode 100644 src/generated/resources/data/c/tags/block/ores/lead.json create mode 100644 src/generated/resources/data/c/tags/block/ores/silver.json create mode 100644 src/generated/resources/data/c/tags/block/ores/tungsten.json create mode 100644 src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json create mode 100644 src/generated/resources/data/c/tags/block/ores_in_ground/stone.json diff --git a/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 b/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 index 77833202b..66f2d4a06 100644 --- a/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 +++ b/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 @@ -1,4 +1,10 @@ -// 1.21.1 2025-05-12T23:49:56.0102777 Tags for minecraft:block mod id superbwarfare +// 1.21.1 2025-06-01T19:55:44.140652 Tags for minecraft:block mod id superbwarfare +d3607e34f27546886470700c887fcc13572b29ad data/c/tags/block/ores.json +af38bb7460b2d1c0b07f5ac3a4cb1af53a41a456 data/c/tags/block/ores/lead.json +6b4ec9b667b534e868b5463f06acf89fe114be9a data/c/tags/block/ores/silver.json +65265b2e95bae5071f132b1aa92d3c90fd8199d8 data/c/tags/block/ores/tungsten.json +91ca1b4d467e94a2f407f7465b3cadade7ff661b data/c/tags/block/ores_in_ground/deepslate.json +2227e4cdbfc8a9c9af4975fa5ed1360146623768 data/c/tags/block/ores_in_ground/stone.json 0acfd31854bf15f2c108138b3df7206bd2593e6b data/minecraft/tags/block/mineable/axe.json cd3701aa4a886404eb31c2e2e9d8342673710960 data/minecraft/tags/block/mineable/pickaxe.json 3da7f021790388a122717f16f51c7ec5232eebcb data/minecraft/tags/block/mineable/shovel.json diff --git a/src/generated/resources/data/c/tags/block/ores.json b/src/generated/resources/data/c/tags/block/ores.json new file mode 100644 index 000000000..f4c04b35e --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#c:ores/lead", + "#c:ores/tungsten", + "#c:ores/silver" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/lead.json b/src/generated/resources/data/c/tags/block/ores/lead.json new file mode 100644 index 000000000..b8f2be6ac --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/lead.json @@ -0,0 +1,6 @@ +{ + "values": [ + "superbwarfare:galena_ore", + "superbwarfare:deepslate_galena_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/silver.json b/src/generated/resources/data/c/tags/block/ores/silver.json new file mode 100644 index 000000000..1ce3b263a --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/silver.json @@ -0,0 +1,6 @@ +{ + "values": [ + "superbwarfare:silver_ore", + "superbwarfare:deepslate_silver_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores/tungsten.json b/src/generated/resources/data/c/tags/block/ores/tungsten.json new file mode 100644 index 000000000..205fed423 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores/tungsten.json @@ -0,0 +1,6 @@ +{ + "values": [ + "superbwarfare:scheelite_ore", + "superbwarfare:deepslate_scheelite_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json b/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json new file mode 100644 index 000000000..149565cc8 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json @@ -0,0 +1,7 @@ +{ + "values": [ + "superbwarfare:deepslate_galena_ore", + "superbwarfare:deepslate_scheelite_ore", + "superbwarfare:deepslate_silver_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores_in_ground/stone.json b/src/generated/resources/data/c/tags/block/ores_in_ground/stone.json new file mode 100644 index 000000000..f47372895 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/ores_in_ground/stone.json @@ -0,0 +1,7 @@ +{ + "values": [ + "superbwarfare:galena_ore", + "superbwarfare:scheelite_ore", + "superbwarfare:silver_ore" + ] +} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockTagProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockTagProvider.java index b562db8d7..1ae22878d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockTagProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockTagProvider.java @@ -5,7 +5,10 @@ import com.atsuishio.superbwarfare.init.ModBlocks; import com.atsuishio.superbwarfare.init.ModTags; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.data.BlockTagsProvider; @@ -46,5 +49,17 @@ public class ModBlockTagProvider extends BlockTagsProvider { this.tag(ModTags.Blocks.HARD_COLLISION) .addTags(BlockTags.LOGS, BlockTags.PLANKS, Tags.Blocks.GLASS_BLOCKS) .add(Blocks.ICE, Blocks.FROSTED_ICE, Blocks.PACKED_ICE, Blocks.BLUE_ICE); + + this.tag(Tags.Blocks.ORES).addTags(cTag("ores/lead"), cTag("ores/tungsten"), cTag("ores/silver")); + this.tag(cTag("ores/lead")).add(ModBlocks.GALENA_ORE.get(), ModBlocks.DEEPSLATE_GALENA_ORE.get()); + this.tag(cTag("ores/tungsten")).add(ModBlocks.SCHEELITE_ORE.get(), ModBlocks.DEEPSLATE_SCHEELITE_ORE.get()); + this.tag(cTag("ores/silver")).add(ModBlocks.SILVER_ORE.get(), ModBlocks.DEEPSLATE_SILVER_ORE.get()); + + this.tag(Tags.Blocks.ORES_IN_GROUND_STONE).add(ModBlocks.GALENA_ORE.get(), ModBlocks.SCHEELITE_ORE.get(), ModBlocks.SILVER_ORE.get()); + this.tag(Tags.Blocks.ORES_IN_GROUND_DEEPSLATE).add(ModBlocks.DEEPSLATE_GALENA_ORE.get(), ModBlocks.DEEPSLATE_SCHEELITE_ORE.get(), ModBlocks.DEEPSLATE_SILVER_ORE.get()); + } + + public static TagKey cTag(String name) { + return BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", name)); } }