Code cleanup around checking for creative mode

TheRealWormbo · TheRealWormbo · commit dcd221d4b748 · 2025-10-23T21:27:02.000+02:00
Instead of checking for `player.getAbilities().instabuild` we now check for either `player.isCreative()` or `player.hasInfiniteMaterials()`, whichever is more thematic in context.
InventoryHelper::tryToSetLastRecipe also no longer bothers searching the inventory players with infinite materials, since it'll duplicate the expected ingredient stack anyway.
diff --git a/Fabric/src/main/java/vazkii/botania/fabric/FabricCommonInitializer.java b/Fabric/src/main/java/vazkii/botania/fabric/FabricCommonInitializer.java
@@ -312,11 +312,11 @@ private void registerCapabilities() {
 		BotaniaFabricCapabilities.AVATAR_WIELDABLE.registerForItems((stack, c) -> new BifrostRodItem.AvatarBehavior(), BotaniaItems.rainbowRod);
 		BotaniaFabricCapabilities.AVATAR_WIELDABLE.registerForItems((stack, c) -> new SkiesRodItem.AvatarBehavior(), BotaniaItems.tornadoRod);
 
-		BotaniaFabricCapabilities.BLOCK_PROVIDER.registerForItems((stack, c) -> new LandsRodItem.BlockProviderImpl(stack), BotaniaItems.dirtRod, BotaniaItems.skyDirtRod);
+		BotaniaFabricCapabilities.BLOCK_PROVIDER.registerForItems((stack, c) -> new LandsRodItem.BlockProviderImpl(),
+				BotaniaItems.dirtRod, BotaniaItems.skyDirtRod, BotaniaItems.terraformRod);
 		BotaniaFabricCapabilities.BLOCK_PROVIDER.registerForItems((stack, c) -> new BlackHoleTalismanItem.BlockProviderImpl(stack), BotaniaItems.blackHoleTalisman);
 		BotaniaFabricCapabilities.BLOCK_PROVIDER.registerForItems((stack, c) -> new DepthsRodItem.BlockProviderImpl(), BotaniaItems.cobbleRod);
 		BotaniaFabricCapabilities.BLOCK_PROVIDER.registerForItems((stack, c) -> new EnderHandItem.BlockProviderImpl(stack), BotaniaItems.enderHand);
-		BotaniaFabricCapabilities.BLOCK_PROVIDER.registerForItems((stack, c) -> new TerraFirmaRodItem.BlockProviderImpl(), BotaniaItems.terraformRod);
 
 		BotaniaFabricCapabilities.COORD_BOUND_ITEM.registerForItems((st, c) -> new EyeOfTheFlugelItem.CoordBoundItemImpl(st), BotaniaItems.flugelEye);
 		BotaniaFabricCapabilities.COORD_BOUND_ITEM.registerForItems((st, c) -> new ManaMirrorItem.CoordBoundItemImpl(st), BotaniaItems.manaMirror);
diff --git a/Fabric/src/main/java/vazkii/botania/fabric/xplat/FabricXplatImpl.java b/Fabric/src/main/java/vazkii/botania/fabric/xplat/FabricXplatImpl.java
@@ -286,7 +286,7 @@ public boolean extractFluidFromPlayerItem(Player player, InteractionHand hand, F
 		try (Transaction txn = Transaction.openOuter()) {
 			long extracted = fluidStorage.extract(FluidVariant.of(fluid), FluidConstants.BUCKET, txn);
 			if (extracted == FluidConstants.BUCKET) {
-				if (!player.getAbilities().instabuild) {
+				if (!player.hasInfiniteMaterials()) {
 					// Only perform inventory side effects in survival
 					txn.commit();
 				}
@@ -307,7 +307,7 @@ public boolean insertFluidIntoPlayerItem(Player player, InteractionHand hand, Fl
 		try (Transaction txn = Transaction.openOuter()) {
 			long inserted = fluidStorage.insert(FluidVariant.of(fluid), FluidConstants.BUCKET, txn);
 			if (inserted == FluidConstants.BUCKET) {
-				if (!player.getAbilities().instabuild) {
+				if (!player.hasInfiniteMaterials()) {
 					// Only perform inventory side effects in survival
 					txn.commit();
 				}
diff --git a/NeoForge/src/main/java/vazkii/botania/neoforge/ForgeCommonInitializer.java b/NeoForge/src/main/java/vazkii/botania/neoforge/ForgeCommonInitializer.java
@@ -473,12 +473,12 @@ private void registerEvents() {
 	));
 
 	private static final Supplier<Map<Item, Function<ItemStack, BlockProvider>>> BLOCK_PROVIDER = Suppliers.memoize(() -> Map.of(
-			BotaniaItems.dirtRod, LandsRodItem.BlockProviderImpl::new,
-			BotaniaItems.skyDirtRod, LandsRodItem.BlockProviderImpl::new,
+			BotaniaItems.dirtRod, s -> new LandsRodItem.BlockProviderImpl(),
+			BotaniaItems.skyDirtRod, s -> new LandsRodItem.BlockProviderImpl(),
 			BotaniaItems.blackHoleTalisman, BlackHoleTalismanItem.BlockProviderImpl::new,
 			BotaniaItems.cobbleRod, s -> new DepthsRodItem.BlockProviderImpl(),
 			BotaniaItems.enderHand, EnderHandItem.BlockProviderImpl::new,
-			BotaniaItems.terraformRod, s -> new TerraFirmaRodItem.BlockProviderImpl()
+			BotaniaItems.terraformRod, s -> new LandsRodItem.BlockProviderImpl()
 	));
 
 	private static final Supplier<Map<Item, Function<ItemStack, CoordBoundItem>>> COORD_BOUND_ITEM = Suppliers.memoize(() -> Map.of(
diff --git a/NeoForge/src/main/java/vazkii/botania/neoforge/xplat/ForgeXplatImpl.java b/NeoForge/src/main/java/vazkii/botania/neoforge/xplat/ForgeXplatImpl.java
@@ -250,7 +250,7 @@ public boolean extractFluidFromPlayerItem(Player player, InteractionHand hand, F
 		}
 		var extracted = h.drain(FluidType.BUCKET_VOLUME, IFluidHandler.FluidAction.SIMULATE);
 		var success = extracted.getFluid() == fluid && extracted.getAmount() == FluidType.BUCKET_VOLUME;
-		if (success && !player.getAbilities().instabuild) {
+		if (success && !player.hasInfiniteMaterials()) {
 			h.drain(extracted, IFluidHandler.FluidAction.EXECUTE);
 			player.setItemInHand(hand, h.getContainer());
 		}
@@ -275,7 +275,7 @@ public boolean insertFluidIntoPlayerItem(Player player, InteractionHand hand, Fl
 			int filled = fluidHandler.fill(fluidToFill, IFluidHandler.FluidAction.SIMULATE);
 
 			if (filled == FluidType.BUCKET_VOLUME) {
-				if (!player.getAbilities().instabuild) {
+				if (!player.hasInfiniteMaterials()) {
 					fluidHandler.fill(fluidToFill, IFluidHandler.FluidAction.EXECUTE);
 					stack.shrink(1);
 					ItemStack result = fluidHandler.getContainer();
diff --git a/Xplat/src/main/java/vazkii/botania/common/block/CocoonBlock.java b/Xplat/src/main/java/vazkii/botania/common/block/CocoonBlock.java
@@ -69,7 +69,7 @@ public void entityInside(BlockState state, Level world, BlockPos pos, Entity e)
 
 	@Override
 	public ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
-		return addStack(level, pos, stack, player.getAbilities().instabuild);
+		return addStack(level, pos, stack, player.hasInfiniteMaterials());
 	}
 
 	private ItemInteractionResult addStack(Level world, BlockPos pos, ItemStack stack, boolean creative) {
diff --git a/Xplat/src/main/java/vazkii/botania/common/block/IncensePlateBlock.java b/Xplat/src/main/java/vazkii/botania/common/block/IncensePlateBlock.java
@@ -81,7 +81,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
 				plate.ignite();
 				RandomSource randomsource = world.getRandom();
 				world.playSound(player, pos, SoundEvents.FIRECHARGE_USE, SoundSource.BLOCKS, 1.0F, (randomsource.nextFloat() - randomsource.nextFloat()) * 0.2F + 1.0F);
-				if (!player.getAbilities().instabuild) {
+				if (!player.hasInfiniteMaterials()) {
 					stack.shrink(1);
 				}
 			} else if (XplatAbstractions.INSTANCE.canToolLightFire(stack)) {
diff --git a/Xplat/src/main/java/vazkii/botania/common/block/TeruTeruBozuBlock.java b/Xplat/src/main/java/vazkii/botania/common/block/TeruTeruBozuBlock.java
@@ -61,7 +61,7 @@ public void entityInside(BlockState state, Level world, BlockPos pos, Entity e)
 	protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos,
 			Player player, InteractionHand hand, BlockHitResult hitResult) {
 		if (isSunflower(stack) && removeRain(level) || isBlueOrchid(stack) && startRain(level)) {
-			if (!player.getAbilities().instabuild) {
+			if (!player.hasInfiniteMaterials()) {
 				stack.shrink(1);
 			}
 			return ItemInteractionResult.sidedSuccess(level.isClientSide());
diff --git a/Xplat/src/main/java/vazkii/botania/common/block/block_entity/BreweryBlockEntity.java b/Xplat/src/main/java/vazkii/botania/common/block/block_entity/BreweryBlockEntity.java
@@ -77,7 +77,7 @@ public boolean addItem(@Nullable Player player, ItemStack stack, @Nullable Inter
 				ItemStack stackToAdd = stack.copyWithCount(1);
 				getItemHandler().setItem(i, stackToAdd);
 
-				if (player == null || !player.getAbilities().instabuild) {
+				if (player == null || !player.hasInfiniteMaterials()) {
 					stack.shrink(1);
 					if (stack.isEmpty() && player != null && hand != null) {
 						player.setItemInHand(hand, ItemStack.EMPTY);
diff --git a/Xplat/src/main/java/vazkii/botania/common/block/block_entity/LuminizerBlockEntity.java b/Xplat/src/main/java/vazkii/botania/common/block/block_entity/LuminizerBlockEntity.java
@@ -218,7 +218,7 @@ public boolean onPhantomInked(@Nullable Player player, ItemStack stack, Directio
 			return false;
 		}
 		if (!level.isClientSide) {
-			if (player == null || !player.getAbilities().instabuild) {
+			if (player == null || !player.hasInfiniteMaterials()) {
 				stack.shrink(1);
 			}
 			setNoParticle();
diff --git a/Xplat/src/main/java/vazkii/botania/common/block/block_entity/PlatformBlockEntity.java b/Xplat/src/main/java/vazkii/botania/common/block/block_entity/PlatformBlockEntity.java
@@ -68,7 +68,7 @@ public boolean onPhantomInked(@Nullable Player player, ItemStack stack, Directio
 			return false;
 		}
 		if (!level.isClientSide) {
-			if (player == null || !player.getAbilities().instabuild) {
+			if (player == null || !player.hasInfiniteMaterials()) {
 				stack.shrink(1);
 			}
 			setCamoState(Blocks.BARRIER.defaultBlockState());
diff --git a/Xplat/src/main/java/vazkii/botania/common/block/block_entity/RunicAltarBlockEntity.java b/Xplat/src/main/java/vazkii/botania/common/block/block_entity/RunicAltarBlockEntity.java
@@ -92,7 +92,7 @@ public boolean addItem(@Nullable Player player, ItemStack stack, @Nullable Inter
 
 		if (currentRecipe != null && currentRecipe.value().getReagent().test(stack)) {
 			if (!level.isClientSide) {
-				ItemStack toSpawn = player != null && player.getAbilities().instabuild ? stack.copy().split(1) : stack.split(1);
+				ItemStack toSpawn = player != null && player.hasInfiniteMaterials() ? stack.copy().split(1) : stack.split(1);
 				ItemEntity item = new ItemEntity(level, getBlockPos().getX() + 0.5, getBlockPos().getY() + 1, getBlockPos().getZ() + 0.5, toSpawn);
 				item.setPickUpDelay(40);
 				item.setDeltaMovement(Vec3.ZERO);
@@ -114,7 +114,7 @@ public boolean addItem(@Nullable Player player, ItemStack stack, @Nullable Inter
 				ItemStack stackToAdd = stack.copyWithCount(1);
 				getItemHandler().setItem(i, stackToAdd);
 
-				if (player == null || !player.getAbilities().instabuild) {
+				if (player == null || !player.hasInfiniteMaterials()) {
 					stack.shrink(1);
 				}
 
@@ -306,7 +306,7 @@ public boolean onUsedByWand(@Nullable Player player, ItemStack wand, Direction s
 				level.blockEvent(getBlockPos(), BotaniaBlocks.runeAltar, CRAFT_EFFECT_EVENT, 0);
 
 				saveLastRecipe();
-				if (player == null || !player.getAbilities().instabuild) {
+				if (player == null || !player.hasInfiniteMaterials()) {
 					for (ItemStack remainingStack : recipe.value().getRemainingItems(getRecipeInput())) {
 						if (remainingStack.isEmpty()) {
 							continue;
diff --git a/Xplat/src/main/java/vazkii/botania/common/block/block_entity/corporea/CorporeaCrystalCubeBlockEntity.java b/Xplat/src/main/java/vazkii/botania/common/block/block_entity/corporea/CorporeaCrystalCubeBlockEntity.java
@@ -185,7 +185,7 @@ public boolean onPhantomInked(@Nullable Player player, ItemStack stack, Directio
 			return false;
 		}
 		if (!level.isClientSide()) {
-			if (player == null || !player.getAbilities().instabuild) {
+			if (player == null || !player.hasInfiniteMaterials()) {
 				stack.shrink(1);
 			}
 			level.setBlock(getBlockPos(), getBlockState().setValue(BotaniaStateProperties.HIDDEN, true),
diff --git a/Xplat/src/main/java/vazkii/botania/common/block/flower/FloatingFlowerBaseBlock.java b/Xplat/src/main/java/vazkii/botania/common/block/flower/FloatingFlowerBaseBlock.java
@@ -88,7 +88,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
 					VanillaPacketDispatcher.dispatchTEToNearbyPlayers(te);
 				}
 
-				if (!player.getAbilities().instabuild) {
+				if (!player.hasInfiniteMaterials()) {
 					stack.shrink(1);
 				}
 				return ItemInteractionResult.sidedSuccess(level.isClientSide());
@@ -102,7 +102,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
 					SoundSource.BLOCKS, 1, 1);
 			player.awardStat(Stats.ITEM_USED.get(stack.getItem()));
 			level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(player, state));
-			if (!player.getAbilities().instabuild) {
+			if (!player.hasInfiniteMaterials()) {
 				stack.shrink(1);
 			}
 			return ItemInteractionResult.sidedSuccess(level.isClientSide());
diff --git a/Xplat/src/main/java/vazkii/botania/common/block/mana/ManaPoolBlock.java b/Xplat/src/main/java/vazkii/botania/common/block/mana/ManaPoolBlock.java
@@ -170,7 +170,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
 			if (!itemColor.equals(this.color)) {
 				ManaPoolBlock dyedBlock = BotaniaBlocks.findOptionallyDyedBlock(this, itemColor);
 				level.setBlockAndUpdate(pos, dyedBlock.withPropertiesOf(state));
-				if (!player.getAbilities().instabuild) {
+				if (!player.hasInfiniteMaterials()) {
 					stack.shrink(1);
 				}
 				return ItemInteractionResult.sidedSuccess(level.isClientSide());
@@ -179,7 +179,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
 		if (stack.is(BotaniaTags.Items.MANA_POOL_DYE_REMOVER) && this.color != null) {
 			ManaPoolBlock undyedBlock = getUndyedBlock(this);
 			level.setBlockAndUpdate(pos, undyedBlock.withPropertiesOf(state));
-			if (!player.getAbilities().instabuild) {
+			if (!player.hasInfiniteMaterials()) {
 				stack.shrink(1);
 			}
 			return ItemInteractionResult.sidedSuccess(level.isClientSide());
diff --git a/Xplat/src/main/java/vazkii/botania/common/entity/GaiaGuardianEntity.java b/Xplat/src/main/java/vazkii/botania/common/entity/GaiaGuardianEntity.java
@@ -768,8 +768,8 @@ public void aiStep() {
 		if (level().isClientSide) {
 			particles();
 			Player player = Proxy.INSTANCE.getClientPlayer();
-			if (getPlayersAround().contains(player)) {
-				player.getAbilities().flying &= player.getAbilities().instabuild;
+			if (!player.isCreative() && getPlayersAround().contains(player)) {
+				player.getAbilities().flying = false;
 			}
 			return;
 		}
@@ -806,7 +806,7 @@ public void aiStep() {
 
 				clearPotions(player);
 				keepInsideArena(player);
-				player.getAbilities().flying &= player.getAbilities().instabuild;
+				player.getAbilities().flying &= player.isCreative();
 			}
 		}
 
diff --git a/Xplat/src/main/java/vazkii/botania/common/helper/BlockProviderHelper.java b/Xplat/src/main/java/vazkii/botania/common/helper/BlockProviderHelper.java
@@ -20,7 +20,7 @@ private record ItemStackBlockProvider(ItemStack stack) implements BlockProvider
 		@Override
 		public boolean provideBlock(Player player, ItemStack requester, Block block, boolean doIt) {
 			final boolean canDo = !stack.isEmpty() && stack.is(block.asItem());
-			if (canDo && doIt && !player.getAbilities().instabuild) {
+			if (canDo && doIt && !player.hasInfiniteMaterials()) {
 				stack.shrink(1);
 			}
 			return canDo;
@@ -31,7 +31,7 @@ public int getBlockCount(Player player, ItemStack requester, Block block) {
 			if (!stack.is(block.asItem())) {
 				return 0;
 			}
-			return player.getAbilities().instabuild ? -1 : stack.getCount();
+			return player.hasInfiniteMaterials() ? -1 : stack.getCount();
 		}
 	}
 
diff --git a/Xplat/src/main/java/vazkii/botania/common/helper/InventoryHelper.java b/Xplat/src/main/java/vazkii/botania/common/helper/InventoryHelper.java
@@ -164,13 +164,16 @@ public static boolean tryToSetLastRecipe(Player player, Container inv, @Nullable
 				continue;
 			}
 
-			for (int i = 0; i < player.getInventory().getContainerSize(); i++) {
-				ItemStack pstack = player.getInventory().getItem(i);
-				if (player.isCreative() || (!pstack.isEmpty() && ItemStack.isSameItemSameComponents(stack, pstack))) {
-					inv.setItem(index, player.isCreative() ? stack.copy() : pstack.split(1));
+			if (player.hasInfiniteMaterials()) {
+				inv.setItem(index++, stack.copy());
+				didAny = true;
+			} else {
+				int slot = player.getInventory().findSlotMatchingItem(stack);
+				if (slot >= 0) {
+					inv.setItem(index++, player.getInventory().getItem(slot).split(1));
 					didAny = true;
-					index++;
-					break;
+				} else {
+					// TODO: find ingredient providers and pull matching items from those
 				}
 			}
 		}
diff --git a/Xplat/src/main/java/vazkii/botania/common/item/AstrolabeItem.java b/Xplat/src/main/java/vazkii/botania/common/item/AstrolabeItem.java
@@ -160,7 +160,7 @@ private boolean placeBlockAndConsume(ItemStack requester, Block blockToPlace, Bl
 	}
 
 	public static boolean hasBlocks(ItemStack requester, Player player, int required, Block block) {
-		if (player.getAbilities().instabuild) {
+		if (player.hasInfiniteMaterials()) {
 			return true;
 		}
 
@@ -171,7 +171,7 @@ public static List<BlockProvider> findBlockProviders(ItemStack requester, Player
 		if (block == Blocks.AIR || required == 0) {
 			return List.of();
 		}
-		if (player.getAbilities().instabuild) {
+		if (player.hasInfiniteMaterials()) {
 			return List.of(BlockProviderHelper.asInfiniteBlockProvider(new ItemStack(block)));
 		}
 
diff --git a/Xplat/src/main/java/vazkii/botania/common/item/BlackHoleTalismanItem.java b/Xplat/src/main/java/vazkii/botania/common/item/BlackHoleTalismanItem.java
@@ -93,7 +93,7 @@ public InteractionResult useOn(UseOnContext ctx) {
 				}
 				return InteractionResult.sidedSuccess(world.isClientSide());
 			} else {
-				if (player == null || player.getAbilities().instabuild || getBlockCount(stack) > 0) {
+				if (player == null || player.hasInfiniteMaterials() || getBlockCount(stack) > 0) {
 					ItemStack toUse = new ItemStack(bBlock);
 					InteractionResult result = PlayerHelper.substituteUse(ctx, toUse);
 
diff --git a/Xplat/src/main/java/vazkii/botania/common/item/LivingwoodSlingshotItem.java b/Xplat/src/main/java/vazkii/botania/common/item/LivingwoodSlingshotItem.java
@@ -37,15 +37,15 @@ public LivingwoodSlingshotItem(Properties builder) {
 	public void releaseUsing(ItemStack stack, Level world, LivingEntity living, int duration) {
 		int j = getUseDuration(stack, living) - duration;
 
-		if (!world.isClientSide && (!(living instanceof Player player) || player.getAbilities().instabuild || PlayerHelper.hasAmmo(player, AMMO_FUNC))) {
+		if (!world.isClientSide && (!(living instanceof Player player) || player.hasInfiniteMaterials() || PlayerHelper.hasAmmo(player, AMMO_FUNC))) {
 			float f = j / 20.0F;
 			f = (f * f + f * 2.0F) / 3.0F;
 
 			if (f < 1F) {
 				return;
 			}
 
-			if (living instanceof Player player && !player.getAbilities().instabuild) {
+			if (living instanceof Player player && !player.hasInfiniteMaterials()) {
 				PlayerHelper.consumeAmmo(player, AMMO_FUNC);
 			}
 
@@ -70,7 +70,7 @@ public UseAnim getUseAnimation(ItemStack stack) {
 	@Override
 	public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) {
 		ItemStack stack = player.getItemInHand(hand);
-		if (player.getAbilities().instabuild || PlayerHelper.hasAmmo(player, AMMO_FUNC)) {
+		if (player.hasInfiniteMaterials() || PlayerHelper.hasAmmo(player, AMMO_FUNC)) {
 			return ItemUtils.startUsingInstantly(world, player, hand);
 		}
 
diff --git a/Xplat/src/main/java/vazkii/botania/common/item/VineBallItem.java b/Xplat/src/main/java/vazkii/botania/common/item/VineBallItem.java
@@ -31,7 +31,7 @@ public VineBallItem(Properties builder) {
 
 	@Override
 	public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) {
-		if (!player.getAbilities().instabuild) {
+		if (!player.hasInfiniteMaterials()) {
 			player.getItemInHand(hand).shrink(1);
 		}
 
diff --git a/Xplat/src/main/java/vazkii/botania/common/item/brew/BaseBrewItem.java b/Xplat/src/main/java/vazkii/botania/common/item/brew/BaseBrewItem.java
@@ -82,7 +82,7 @@ public ItemStack finishUsingItem(ItemStack stack, Level world, LivingEntity livi
 			}
 
 			int swigs = getSwigsLeft(stack);
-			if (living instanceof Player player && !player.getAbilities().instabuild) {
+			if (living instanceof Player player && !player.hasInfiniteMaterials()) {
 				if (swigs <= 1) {
 					ItemStack result = getBaseStack();
 					if (!player.getInventory().add(result)) {
diff --git a/Xplat/src/main/java/vazkii/botania/common/item/equipment/bauble/FlugelTiaraItem.java b/Xplat/src/main/java/vazkii/botania/common/item/equipment/bauble/FlugelTiaraItem.java
@@ -166,7 +166,7 @@ public static void updatePlayerFlyStatus(Player player) {
 					}
 				}
 			} else {
-				if (!player.isSpectator() && !player.getAbilities().instabuild) {
+				if (!player.isSpectator() && !player.isCreative()) {
 					player.getAbilities().mayfly = false;
 					player.getAbilities().flying = false;
 					player.getAbilities().invulnerable = false;
diff --git a/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/bow/CrystalBowItem.java b/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/bow/CrystalBowItem.java
@@ -49,7 +49,7 @@ public InteractionResultHolder<ItemStack> use(Level worldIn, Player playerIn, In
 		ItemStack itemstack = playerIn.getItemInHand(handIn);
 		boolean canMaterializeArrow = canFire(itemstack, playerIn); // Botania - custom check
 
-		if (!playerIn.getAbilities().instabuild && !canMaterializeArrow) {
+		if (!playerIn.hasInfiniteMaterials() && !canMaterializeArrow) {
 			return InteractionResultHolder.fail(itemstack);
 		} else {
 			playerIn.startUsingItem(handIn);
@@ -76,7 +76,7 @@ public void releaseUsing(ItemStack stack, Level level, LivingEntity entityLiving
 
 				float power = getPowerForTime(i);
 				if (!((double) power < 0.1D)) {
-					boolean markUnpickable = player.getAbilities().instabuild || arrowStack.is(Items.ARROW); // Botania
+					boolean markUnpickable = player.hasInfiniteMaterials() || arrowStack.is(Items.ARROW); // Botania
 					if (!level.isClientSide) {
 						ArrowItem arrowItem = (ArrowItem) (arrowStack.getItem() instanceof ArrowItem ? arrowStack.getItem() : Items.ARROW);
 						AbstractArrow arrow = arrowItem.createArrow(level, arrowStack, player, stack);
@@ -96,7 +96,7 @@ public void releaseUsing(ItemStack stack, Level level, LivingEntity entityLiving
 							arrow.setRemainingFireTicks(100 * 20);
 						}
 
-						if (markUnpickable || player.getAbilities().instabuild && (arrowStack.is(Items.SPECTRAL_ARROW) || arrowStack.is(Items.TIPPED_ARROW))) {
+						if (markUnpickable || player.hasInfiniteMaterials() && (arrowStack.is(Items.SPECTRAL_ARROW) || arrowStack.is(Items.TIPPED_ARROW))) {
 							arrow.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
 						}
 
@@ -106,7 +106,7 @@ public void releaseUsing(ItemStack stack, Level level, LivingEntity entityLiving
 					level.playSound(null, player.getX(), player.getY(), player.getZ(),
 							SoundEvents.ARROW_SHOOT, SoundSource.PLAYERS,
 							1.0F, 1.0F / (player.getRandom().nextFloat() * 0.4F + 1.2F) + power * 0.5F);
-					if (!markUnpickable && !player.getAbilities().instabuild) {
+					if (!markUnpickable && !player.hasInfiniteMaterials()) {
 						arrowStack.shrink(1);
 						if (arrowStack.isEmpty()) {
 							player.getInventory().removeItem(arrowStack);
@@ -127,7 +127,7 @@ public float chargeVelocityMultiplier() {
 	private boolean canFire(ItemStack stack, Player player) {
 		HolderLookup<Enchantment> enchLookup = player.level().holderLookup(Registries.ENCHANTMENT);
 		boolean infinity = EnchantmentHelper.getItemEnchantmentLevel(enchLookup.getOrThrow(Enchantments.INFINITY), stack) > 0;
-		return player.getAbilities().instabuild || ManaItemHandler.instance().requestManaExactForTool(stack, player, ARROW_COST / (infinity ? 2 : 1), false);
+		return player.hasInfiniteMaterials() || ManaItemHandler.instance().requestManaExactForTool(stack, player, ARROW_COST / (infinity ? 2 : 1), false);
 	}
 
 	@Override
diff --git a/Xplat/src/main/java/vazkii/botania/common/item/material/EnderAirItem.java b/Xplat/src/main/java/vazkii/botania/common/item/material/EnderAirItem.java
@@ -95,7 +95,7 @@ public static boolean pickupFromEntity(Level level, AABB area) {
 	@Override
 	public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) {
 		ItemStack stack = player.getItemInHand(hand);
-		if (!player.getAbilities().instabuild) {
+		if (!player.hasInfiniteMaterials()) {
 			stack.shrink(1);
 		}
 
diff --git a/Xplat/src/main/java/vazkii/botania/common/item/rod/DepthsRodItem.java b/Xplat/src/main/java/vazkii/botania/common/item/rod/DepthsRodItem.java
diff --git a/Xplat/src/main/java/vazkii/botania/common/item/rod/LandsRodItem.java b/Xplat/src/main/java/vazkii/botania/common/item/rod/LandsRodItem.java
diff --git a/Xplat/src/main/java/vazkii/botania/common/item/rod/ShiftingCrustRodItem.java b/Xplat/src/main/java/vazkii/botania/common/item/rod/ShiftingCrustRodItem.java
diff --git a/Xplat/src/main/java/vazkii/botania/common/item/rod/TerraFirmaRodItem.java b/Xplat/src/main/java/vazkii/botania/common/item/rod/TerraFirmaRodItem.java
diff --git a/Xplat/src/main/java/vazkii/botania/mixin/InventoryMixin.java b/Xplat/src/main/java/vazkii/botania/mixin/InventoryMixin.java

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public void entityInside(BlockState state, Level world, BlockPos pos, Entity e)`
`69`	`69`
`70`	`70`	`@Override`
`71`	`71`	`public ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {`
`72`		`- return addStack(level, pos, stack, player.getAbilities().instabuild);`
	`72`	`+ return addStack(level, pos, stack, player.hasInfiniteMaterials());`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`private ItemInteractionResult addStack(Level world, BlockPos pos, ItemStack stack, boolean creative) {`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev`
`81`	`81`	`plate.ignite();`
`82`	`82`	`RandomSource randomsource = world.getRandom();`
`83`	`83`	`world.playSound(player, pos, SoundEvents.FIRECHARGE_USE, SoundSource.BLOCKS, 1.0F, (randomsource.nextFloat() - randomsource.nextFloat()) * 0.2F + 1.0F);`
`84`		`- if (!player.getAbilities().instabuild) {`
	`84`	`+ if (!player.hasInfiniteMaterials()) {`
`85`	`85`	`stack.shrink(1);`
`86`	`86`	`}`
`87`	`87`	`} else if (XplatAbstractions.INSTANCE.canToolLightFire(stack)) {`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public void entityInside(BlockState state, Level world, BlockPos pos, Entity e)`
`61`	`61`	`protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos,`
`62`	`62`	`Player player, InteractionHand hand, BlockHitResult hitResult) {`
`63`	`63`	`if (isSunflower(stack) && removeRain(level) \|\| isBlueOrchid(stack) && startRain(level)) {`
`64`		`- if (!player.getAbilities().instabuild) {`
	`64`	`+ if (!player.hasInfiniteMaterials()) {`
`65`	`65`	`stack.shrink(1);`
`66`	`66`	`}`
`67`	`67`	`return ItemInteractionResult.sidedSuccess(level.isClientSide());`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ public boolean onPhantomInked(@Nullable Player player, ItemStack stack, Directio`
`218`	`218`	`return false;`
`219`	`219`	`}`
`220`	`220`	`if (!level.isClientSide) {`
`221`		`- if (player == null \|\| !player.getAbilities().instabuild) {`
	`221`	`+ if (player == null \|\| !player.hasInfiniteMaterials()) {`
`222`	`222`	`stack.shrink(1);`
`223`	`223`	`}`
`224`	`224`	`setNoParticle();`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public boolean onPhantomInked(@Nullable Player player, ItemStack stack, Directio`
`68`	`68`	`return false;`
`69`	`69`	`}`
`70`	`70`	`if (!level.isClientSide) {`
`71`		`- if (player == null \|\| !player.getAbilities().instabuild) {`
	`71`	`+ if (player == null \|\| !player.hasInfiniteMaterials()) {`
`72`	`72`	`stack.shrink(1);`
`73`	`73`	`}`
`74`	`74`	`setCamoState(Blocks.BARRIER.defaultBlockState());`