Add tag support to Horn/Drum of the Wild

(fixes #4286)

Xplat/src/main/java/vazkii/botania/common/item/HornItem.java

@@ -78,23 +78,14 @@ private static boolean canHarvest(Level level, ItemStack stack, BlockPos pos,
 		HornHarvestable harvestable = XplatAbstractions.INSTANCE.findHornHarvestable(level, pos, state, be);
 		if (harvestable != null) {
 			return harvestable.canHornHarvest(level, pos, stack, type, user);
-		} else {
-			switch (type) {
-				default:
-				case WILD:
-					return state.getBlock() instanceof BushBlock && !state.is(BotaniaTags.Blocks.SPECIAL_FLOWERS);
-				case CANOPY: {
-					if (state.getBlock() instanceof LeavesBlock
-							&& state.getValue(LeavesBlock.PERSISTENT)) {
-						return false;
-					}
-
-					return state.is(BotaniaTags.Blocks.HORN_OF_THE_CANOPY_BREAKABLE);
-				}
-				case COVERING:
-					return state.is(BotaniaTags.Blocks.HORN_OF_THE_COVERING_BREAKABLE);
-			}
 		}
+		return switch (type) {
+			default -> state.getBlock() instanceof BushBlock && !state.is(BotaniaTags.Blocks.SPECIAL_FLOWERS)
+					|| state.is(BotaniaTags.Blocks.HORN_OF_THE_WILD_BREAKABLE);
+			case CANOPY -> state.is(BotaniaTags.Blocks.HORN_OF_THE_CANOPY_BREAKABLE)
+					&& !(state.getBlock() instanceof LeavesBlock && state.getValue(LeavesBlock.PERSISTENT));
+			case COVERING -> state.is(BotaniaTags.Blocks.HORN_OF_THE_COVERING_BREAKABLE);
+		};
 	}
 
 	public static void breakGrass(Level world, ItemStack stack, BlockPos srcPos, @Nullable LivingEntity user) {

Xplat/src/main/java/vazkii/botania/common/lib/BotaniaTags.java

@@ -216,6 +216,12 @@ public static class Blocks {
 		 */
 		public static final TagKey<Block> WEIGHT_LENS_WHITELIST = tag("weight_lens_whitelist");
 
+		/**
+		 * Blocks in this tag can be broken by the Horn of the Wild,
+		 * in addition to any {@code BushBlock}s that are not part of the {@link #SPECIAL_FLOWERS} tag.
+		 */
+		public static final TagKey<Block> HORN_OF_THE_WILD_BREAKABLE = tag("horn_of_the_wild_breakable");
+
 		/**
 		 * Blocks in this tag can be broken by the Horn of the Canopy
 		 */

Xplat/src/main/java/vazkii/botania/data/BlockTagProvider.java

@@ -200,6 +200,8 @@ protected void addTags(HolderLookup.Provider provider) {
 				BotaniaBlocks.biomeCobblestoneFungal, BotaniaBlocks.biomeCobblestoneFungalSlab, BotaniaBlocks.biomeCobblestoneFungalStairs, BotaniaBlocks.biomeCobblestoneFungalWall,
 				BotaniaBlocks.biomeChiseledBrickFungal, fungalAltar);
 
+		tag(BotaniaTags.Blocks.HORN_OF_THE_WILD_BREAKABLE).add(Blocks.MOSS_CARPET);
+
 		tag(BlockTags.LEAVES);
 		tag(BotaniaTags.Blocks.HORN_OF_THE_CANOPY_BREAKABLE).addTag(BlockTags.LEAVES);