Define block tag botania:unsupported_platform_disguise

Excludes blocks from being used as disguise for Abstruse/Spectral Platform blocks, both for setting the disguise and rendering an existing disguise.

(workaround for #4951)

Author: TheRealWormbo

Fabric/src/main/java/vazkii/botania/fabric/client/FabricPlatformModel.java

@@ -19,6 +19,7 @@
 
 import vazkii.botania.common.block.PlatformBlock;
 import vazkii.botania.common.block.block_entity.PlatformBlockEntity;
+import vazkii.botania.common.lib.BotaniaTags;
 
 import java.util.function.Supplier;
 
@@ -45,7 +46,7 @@ public void emitBlockQuads(BlockAndTintGetter blockView, BlockState state, Block
 			BlockPos heldPos = ((PlatformBlockEntity.PlatformData) data).pos();
 			BlockState heldState = ((PlatformBlockEntity.PlatformData) data).state();
 
-			if (heldState == null) {
+			if (heldState == null || heldState.is(BotaniaTags.Blocks.UNSUPPORTED_PLATFORM_DISGUISE)) {
 				// No camo
 				super.emitBlockQuads(blockView, state, pos, randomSupplier, context);
 			} else {

NeoForge/src/main/java/vazkii/botania/neoforge/client/ForgePlatformModel.java

@@ -18,6 +18,7 @@
 
 import vazkii.botania.common.block.PlatformBlock;
 import vazkii.botania.common.block.block_entity.PlatformBlockEntity;
+import vazkii.botania.common.lib.BotaniaTags;
 
 import java.util.List;
 
@@ -49,7 +50,7 @@ public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction
 
 		BlockState heldState = data.state();
 
-		if (heldState == null) {
+		if (heldState == null || heldState.is(BotaniaTags.Blocks.UNSUPPORTED_PLATFORM_DISGUISE)) {
 			// No camo
 			return super.getQuads(state, side, rand, extraData, renderType);
 		} else {

Xplat/src/generated/resources/.cache/bfa01a6ca2555c100103725bf5c9e6da285f29c3

@@ -35,6 +35,7 @@
 
 import vazkii.botania.api.mana.ManaCollisionGhost;
 import vazkii.botania.common.block.block_entity.PlatformBlockEntity;
+import vazkii.botania.common.lib.BotaniaTags;
 
 import java.util.List;
 
@@ -91,10 +92,6 @@ public Behaviour getGhostBehaviour() {
 		return Behaviour.SKIP_ALL;
 	}
 
-	public static boolean isValidBlock(@Nullable BlockState state, Level world, BlockPos pos) {
-		return state != null && (state.isSolidRender(world, pos) || state.getRenderShape() == RenderShape.MODEL);
-	}
-
 	@Override
 	public void appendHoverText(ItemStack stack, @Nullable Item.TooltipContext context, List<Component> tooltip, TooltipFlag flagIn) {
 		if (requireCreativeInteractions()) {
@@ -115,7 +112,8 @@ public ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level
 			BlockPlaceContext ctx = new BlockPlaceContext(player, hand, currentStack, hit);
 			BlockState changeState = Block.byItem(currentStack.getItem()).getStateForPlacement(ctx);
 
-			if (isValidBlock(changeState, world, pos)
+			if (changeState != null && !changeState.is(BotaniaTags.Blocks.UNSUPPORTED_PLATFORM_DISGUISE)
+					&& (changeState.isSolidRender(world, pos) || changeState.getRenderShape() == RenderShape.MODEL)
 					&& !(changeState.getBlock() instanceof PlatformBlock)
 					&& !changeState.isAir()) {
 				if (!world.isClientSide) {

Xplat/src/generated/resources/data/botania/tags/block/unsupported_platform_disguise.json

@@ -34,6 +34,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.IronBarsBlock;
+import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.world.level.block.TransparentBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.redstone.NeighborUpdater;
@@ -47,7 +48,6 @@
 import vazkii.botania.api.mana.ManaItemHandler;
 import vazkii.botania.client.gui.ItemsRemainingRenderHandler;
 import vazkii.botania.common.CollectingNeighborUpdaterAccess;
-import vazkii.botania.common.block.PlatformBlock;
 import vazkii.botania.common.component.BotaniaDataComponents;
 import vazkii.botania.common.helper.DataComponentHelper;
 import vazkii.botania.common.helper.PlayerHelper;
@@ -78,7 +78,7 @@ public InteractionResult useOn(UseOnContext ctx) {
 
 		if (player != null && player.isSecondaryUseActive()) {
 			if (world.getBlockEntity(pos) == null && block.asItem() != Items.AIR
-					&& PlatformBlock.isValidBlock(wstate, world, pos)
+					&& (wstate.isSolidRender(world, pos) || wstate.getRenderShape() == RenderShape.MODEL)
 					&& (wstate.canOcclude() || block instanceof TransparentBlock || block instanceof IronBarsBlock)
 					&& block.asItem() instanceof BlockItem) {
 				setItemToPlace(stack, block.asItem());

Xplat/src/main/java/vazkii/botania/common/block/PlatformBlock.java

@@ -328,6 +328,13 @@ public static class Blocks {
 		 */
 		public static final TagKey<Block> MUNCHDEW_CONSUMABLE = tag("munchdew_consumable");
 
+		/**
+		 * Blocks in this tag work are likely to cause major issues when used with Abstruse/Spectral Platform blocks.
+		 * This tag can only be a last resort option, as it is likely an error in Botania or the block's origin mod
+		 * that causes the issues, which should be fixed properly.
+		 */
+		public static final TagKey<Block> UNSUPPORTED_PLATFORM_DISGUISE = tag("unsupported_platform_disguise");
+
 		private static TagKey<Block> tag(String name) {
 			return TagKey.create(Registries.BLOCK, botaniaRL(name));
 		}

Xplat/src/main/java/vazkii/botania/common/item/rod/ShiftingCrustRodItem.java

@@ -288,6 +288,8 @@ protected void addTags(HolderLookup.Provider provider) {
 
 		tag(BotaniaTags.Blocks.SINGLE_ITEM_INSERT).add(Blocks.CRAFTER);
 
+		tag(BotaniaTags.Blocks.UNSUPPORTED_PLATFORM_DISGUISE);
+
 		tag(BlockTags.FLOWER_POTS)
 				.add(ColorHelper.supportedColors()
 						.map(BotaniaBlocks::getPottedFlower)

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

@@ -22,6 +22,8 @@ of time the maintainers are able to spend on this effort.
 In the meantime, Botania for Minecraft 1.20.1 may still receive updates for bug fixes.
 
 * Add: Extrapolated Bucket can void fluids from modded blocks that support draining fluids into items used on them
+* Add: Block tag `botania:unsupported_platform_disguise` can be used to explicitly disallow incompatible blocks to be
+  used as the disguise for Abstruse or Spectral Platforms
 * Change: Terra Shatterer activation rules have been adjusted
   * With an item in the off-hand that item gets priority, unless sneaking and not aiming at any blocks
   * With an empty off-hand, sneak right-click toggles active state, unless at rank D (i.e. no stored mana)