From 0dc6a8dc79242cd379a6963d9ea6e8b58a83e75f Mon Sep 17 00:00:00 2001 From: Gavin Lambert Date: Sun, 24 Nov 2024 22:56:46 +1300 Subject: [PATCH] Compat for waystones and productive bees (#10473) --- .../minecolonies/tags/blocks/protectionexception.json | 10 +--------- .../data/minecolonies/tags/blocks/tree.json | 6 +++++- .../generation/defaults/DefaultBlockTagsProvider.java | 7 +++---- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/datagen/generated/minecolonies/data/minecolonies/tags/blocks/protectionexception.json b/src/datagen/generated/minecolonies/data/minecolonies/tags/blocks/protectionexception.json index abb68029ff6..808dd4f76ca 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/tags/blocks/protectionexception.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/tags/blocks/protectionexception.json @@ -1,15 +1,7 @@ { "values": [ { - "id": "waystones:waystone", - "required": false - }, - { - "id": "waystones:sandy_waystone", - "required": false - }, - { - "id": "waystones:mossy_waystone", + "id": "#waystones:waystones", "required": false } ] diff --git a/src/datagen/generated/minecolonies/data/minecolonies/tags/blocks/tree.json b/src/datagen/generated/minecolonies/data/minecolonies/tags/blocks/tree.json index 65f442f3f5a..208fc51f615 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/tags/blocks/tree.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/tags/blocks/tree.json @@ -2,6 +2,10 @@ "values": [ "#minecraft:logs", "#minecolonies:mangrove_tree", - "minecraft:mushroom_stem" + "minecraft:mushroom_stem", + { + "id": "#productivebees:nests/wood_nests", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/java/com/minecolonies/core/generation/defaults/DefaultBlockTagsProvider.java b/src/main/java/com/minecolonies/core/generation/defaults/DefaultBlockTagsProvider.java index 07fbddd5d39..ab0fb59976f 100644 --- a/src/main/java/com/minecolonies/core/generation/defaults/DefaultBlockTagsProvider.java +++ b/src/main/java/com/minecolonies/core/generation/defaults/DefaultBlockTagsProvider.java @@ -186,12 +186,11 @@ protected void addTags(final HolderLookup.Provider holder) tag(ModTags.tree) .addTag(BlockTags.LOGS) .addTag(ModTags.mangroveTree) - .add(Blocks.MUSHROOM_STEM); + .add(Blocks.MUSHROOM_STEM) + .addOptionalTag(new ResourceLocation("productivebees", "nests/wood_nests")); tag(ModTags.colonyProtectionException) - .addOptional(new ResourceLocation("waystones:waystone")) - .addOptional(new ResourceLocation("waystones:sandy_waystone")) - .addOptional(new ResourceLocation("waystones:mossy_waystone")); + .addOptionalTag(new ResourceLocation("waystones", "waystones")); tag(ModTags.indestructible).add(Blocks.BEDROCK); tag(ModTags.oreChanceBlocks)