diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index 4b545a6f4e..34d83b3d86 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -513,6 +513,7 @@ private void generateLogTags() { .add(Blocks.STRIPPED_JUNGLE_LOG) .add(Blocks.STRIPPED_MANGROVE_LOG) .add(Blocks.STRIPPED_OAK_LOG) + .add(Blocks.STRIPPED_PALE_OAK_LOG) .add(Blocks.STRIPPED_SPRUCE_LOG); getOrCreateTagBuilder(ConventionalBlockTags.STRIPPED_WOODS) @@ -523,6 +524,7 @@ private void generateLogTags() { .add(Blocks.STRIPPED_JUNGLE_WOOD) .add(Blocks.STRIPPED_MANGROVE_WOOD) .add(Blocks.STRIPPED_OAK_WOOD) + .add(Blocks.STRIPPED_PALE_OAK_WOOD) .add(Blocks.STRIPPED_SPRUCE_WOOD); } diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 799c62e368..b012897e98 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -471,10 +471,6 @@ private void generateOreAndRelatedTags() { .addOptionalTag(ConventionalItemTags.COPPER_RAW_MATERIALS) .addOptionalTag(ConventionalItemTags.GOLD_RAW_MATERIALS) .addOptionalTag(ConventionalItemTags.IRON_RAW_MATERIALS); - getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS) - .addOptionalTag(ConventionalItemTags.COPPER_RAW_MATERIALS) - .addOptionalTag(ConventionalItemTags.IRON_RAW_MATERIALS) - .addOptionalTag(ConventionalItemTags.GOLD_RAW_MATERIALS); getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS) .addOptionalTag(ConventionalItemTags.COPPER_RAW_BLOCKS) diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_logs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_logs.json index ae69c996ad..baaed5b50e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_logs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_logs.json @@ -8,6 +8,7 @@ "minecraft:stripped_jungle_log", "minecraft:stripped_mangrove_log", "minecraft:stripped_oak_log", + "minecraft:stripped_pale_oak_log", "minecraft:stripped_spruce_log" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_woods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_woods.json index 197542891d..5870f97bc4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_woods.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_woods.json @@ -7,6 +7,7 @@ "minecraft:stripped_jungle_wood", "minecraft:stripped_mangrove_wood", "minecraft:stripped_oak_wood", + "minecraft:stripped_pale_oak_wood", "minecraft:stripped_spruce_wood" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/raw_materials.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/raw_materials.json index d344ab6282..687e969aec 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/raw_materials.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/raw_materials.json @@ -11,18 +11,6 @@ { "id": "#c:raw_materials/iron", "required": false - }, - { - "id": "#c:raw_materials/copper", - "required": false - }, - { - "id": "#c:raw_materials/iron", - "required": false - }, - { - "id": "#c:raw_materials/gold", - "required": false } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_logs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_logs.json index ae69c996ad..baaed5b50e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_logs.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_logs.json @@ -8,6 +8,7 @@ "minecraft:stripped_jungle_log", "minecraft:stripped_mangrove_log", "minecraft:stripped_oak_log", + "minecraft:stripped_pale_oak_log", "minecraft:stripped_spruce_log" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_woods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_woods.json index 197542891d..5870f97bc4 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_woods.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_woods.json @@ -7,6 +7,7 @@ "minecraft:stripped_jungle_wood", "minecraft:stripped_mangrove_wood", "minecraft:stripped_oak_wood", + "minecraft:stripped_pale_oak_wood", "minecraft:stripped_spruce_wood" ] } \ No newline at end of file