Pick Block finds block providers that can place blocks as well

Author: TheRealWormbo

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

@@ -124,6 +124,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/items/pickable_block_providers.json

@@ -236,5 +236,8 @@ 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(new ResourceLocation("forge", "seeds"));
+
+		this.tag(BotaniaTags.Items.PICKABLE_BLOCK_PROVIDER)
+				.add(dirtRod, skyDirtRod, cobbleRod, blackHoleTalisman);
 	}
 }

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",

Xplat/src/main/java/vazkii/botania/mixin/InventoryMixin.java

@@ -24,6 +24,8 @@ of time the maintainers are able to spend on this effort. For the time being, up
 * Add: Munchdew displays particles while in cooldown, similar to a Thermalily (this used to be a thing a long time ago already, but somehow got lost)
 * Change: Sparks can no longer be hit by projectiles other than mana bursts
 * Change: Fake players using a wand of the forest on either type of spark are now treated as if the player was sneaking, since that is likely the intended interaction
+* Add: While not in Creative mode, the "Pick Block" feature (usually middle mouse button) can also select certain block
+providers, such as the Rod of the Lands or Black Hole Talisman, if the targeted block's item itself is not available
 * Fix: The boss bar for the gaia ritual no longer starts full and quickly empties at the start of the spawn sequence
 * Fix: Potential NullPointerException in Bergamute's SoundEngineMixin (LostLuma)
 * Fix: Potential divide-by-zero error related to Runic Altar wand HUD rendering (YukkuriC)