Pick Block finds block providers that can place blocks as well

Author: TheRealWormbo

Xplat/src/generated/resources/.cache/5e449fe289648869bd1f4d4d99715c8b4e0c057d

@@ -107,6 +107,12 @@ public static class Items {
 		public static final TagKey<Item> MANA_USING_ITEMS = tag("mana_using_items");
 		public static final TagKey<Item> SEED_APOTHECARY_REAGENT = tag("seed_apothecary_reagent");
 
+		/**
+		 * Block provider items in this tag can be auto-selected via the vanilla "Pick Block" feature.
+		 * (Not every block provider makes sense here, e.g. the Hand of Ender cannot place blocks.)
+		 */
+		public static final TagKey<Item> PICKABLE_BLOCK_PROVIDER = tag("pickable_block_providers");
+
 		public static TagKey<Item> getPetalTag(DyeColor color) {
 			return switch (color) {
 				case WHITE -> PETALS_WHITE;

Xplat/src/generated/resources/data/botania/tags/item/pickable_block_providers.json

@@ -240,6 +240,9 @@ protected void addTags(HolderLookup.Provider provider) {
 		this.tag(BotaniaTags.Items.SEED_APOTHECARY_REAGENT)
 				.add(Items.WHEAT_SEEDS, Items.BEETROOT_SEEDS, Items.MELON_SEEDS, Items.PUMPKIN_SEEDS)
 				.addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", "seeds"));
+
+		this.tag(BotaniaTags.Items.PICKABLE_BLOCK_PROVIDER)
+				.add(dirtRod, skyDirtRod, cobbleRod, blackHoleTalisman);
 	}
 
 	private static Item[] getItems(Predicate<Item> predicate) {

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

@@ -0,0 +1,54 @@
+package vazkii.botania.mixin;
+
+import net.minecraft.core.NonNullList;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import vazkii.botania.common.lib.BotaniaTags;
+import vazkii.botania.xplat.XplatAbstractions;
+
+@Mixin(Inventory.class)
+public class InventoryMixin {
+	@Shadow
+	@Final
+	public Player player;
+
+	@Shadow
+	@Final
+	public NonNullList<ItemStack> items;
+
+	/**
+	 * Also look for block providers when picking a block, if the actual block item could not be found.
+	 */
+	@Inject(method = "findSlotMatchingItem", at = @At("RETURN"), cancellable = true)
+	private void findBlockProviderItem(ItemStack searchStack, CallbackInfoReturnable<Integer> cir) {
+		if (this.player.getAbilities().instabuild || cir.getReturnValue() != -1
+				|| !(searchStack.getItem() instanceof BlockItem blockItem)) {
+			// skip when in creative mode, when an exact match was already found, or when not looking for a block item
+			return;
+		}
+
+		Block block = blockItem.getBlock();
+		for (int i = 0; i < this.items.size(); ++i) {
+			ItemStack invStack = this.items.get(i);
+			if (!invStack.is(BotaniaTags.Items.PICKABLE_BLOCK_PROVIDER)) {
+				continue;
+			}
+			var provider = XplatAbstractions.INSTANCE.findBlockProvider(invStack);
+			if (provider != null && provider.provideBlock(this.player, searchStack, block, false)) {
+				cir.setReturnValue(i);
+				return;
+			}
+		}
+	}
+}

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

@@ -30,6 +30,7 @@
     "HurtByTargetGoalAccessor",
     "HurtByTargetGoalMixin",
     "InventoryAccessor",
+    "InventoryMixin",
     "ItemEntityAccessor",
     "ItemEntityMixin",
     "ItemMixin",