From ed3fbe03b3731748525decfecc2a2f064363d02a Mon Sep 17 00:00:00 2001 From: modmuss Date: Tue, 21 Jan 2025 18:52:30 +0000 Subject: [PATCH] Add pale oak to fence/fence gate tags (#4392) (cherry picked from commit 2f1398f1d216927c565d2fc07fb21246b3ad7ab8) --- .../convention/datagen/generators/BlockTagGenerator.java | 6 ++++-- .../resources/data/c/tags/block/fence_gates/wooden.json | 3 ++- .../resources/data/c/tags/block/fences/wooden.json | 3 ++- .../resources/data/c/tags/item/fence_gates/wooden.json | 3 ++- .../generated/resources/data/c/tags/item/fences/wooden.json | 3 ++- 5 files changed, 12 insertions(+), 6 deletions(-) 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 0b36f0b0ef..81f17ca0d7 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 @@ -268,7 +268,8 @@ private void generateFenceAndFenceGateTags() { .add(Blocks.WARPED_FENCE) .add(Blocks.MANGROVE_FENCE) .add(Blocks.BAMBOO_FENCE) - .add(Blocks.CHERRY_FENCE); + .add(Blocks.CHERRY_FENCE) + .add(Blocks.PALE_OAK_FENCE); getOrCreateTagBuilder(ConventionalBlockTags.NETHER_BRICK_FENCES) .add(Blocks.NETHER_BRICK_FENCE); getOrCreateTagBuilder(ConventionalBlockTags.FENCES) @@ -285,7 +286,8 @@ private void generateFenceAndFenceGateTags() { .add(Blocks.WARPED_FENCE_GATE) .add(Blocks.MANGROVE_FENCE_GATE) .add(Blocks.BAMBOO_FENCE_GATE) - .add(Blocks.CHERRY_FENCE_GATE); + .add(Blocks.CHERRY_FENCE_GATE) + .add(Blocks.PALE_OAK_FENCE_GATE); getOrCreateTagBuilder(ConventionalBlockTags.FENCE_GATES) .addOptionalTag(ConventionalBlockTags.WOODEN_FENCE_GATES); } diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fence_gates/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fence_gates/wooden.json index 88a130fa50..aa03ea9d63 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fence_gates/wooden.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fence_gates/wooden.json @@ -10,6 +10,7 @@ "minecraft:warped_fence_gate", "minecraft:mangrove_fence_gate", "minecraft:bamboo_fence_gate", - "minecraft:cherry_fence_gate" + "minecraft:cherry_fence_gate", + "minecraft:pale_oak_fence_gate" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences/wooden.json index 4f89951169..531539d470 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences/wooden.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/fences/wooden.json @@ -10,6 +10,7 @@ "minecraft:warped_fence", "minecraft:mangrove_fence", "minecraft:bamboo_fence", - "minecraft:cherry_fence" + "minecraft:cherry_fence", + "minecraft:pale_oak_fence" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fence_gates/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fence_gates/wooden.json index 88a130fa50..aa03ea9d63 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fence_gates/wooden.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fence_gates/wooden.json @@ -10,6 +10,7 @@ "minecraft:warped_fence_gate", "minecraft:mangrove_fence_gate", "minecraft:bamboo_fence_gate", - "minecraft:cherry_fence_gate" + "minecraft:cherry_fence_gate", + "minecraft:pale_oak_fence_gate" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences/wooden.json index 4f89951169..531539d470 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences/wooden.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/fences/wooden.json @@ -10,6 +10,7 @@ "minecraft:warped_fence", "minecraft:mangrove_fence", "minecraft:bamboo_fence", - "minecraft:cherry_fence" + "minecraft:cherry_fence", + "minecraft:pale_oak_fence" ] } \ No newline at end of file