Fix crashes with invalid camo blocks

Also added `modularrouters:camo_blacklist` block tag

#232

Author: desht

src/generated/resources/data/modularrouters/tags/block/camo_blacklist.json

@@ -0,0 +1,3 @@
+{
+  "values": []
+}

src/main/java/me/desht/modularrouters/ModularRoutersTags.java

@@ -5,6 +5,7 @@
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
 
 public class ModularRoutersTags {
     public static class Items {
@@ -18,6 +19,14 @@ private static TagKey<Item> modTag(String name) {
         }
     }
 
+    public static class Blocks {
+        public static final TagKey<Block> CAMO_BLACKLIST = modTag("camo_blacklist");
+
+        private static TagKey<Block> modTag(String name) {
+            return TagKey.create(Registries.BLOCK, MiscUtil.RL(name));
+        }
+    }
+
     public static class EntityTypes {
         public static final TagKey<EntityType<?>> activatorInteractBlacklist = modTag("activator_interact_blacklist");
         public static final TagKey<EntityType<?>> activatorAttackBlacklist = modTag("activator_attack_blacklist");

src/main/java/me/desht/modularrouters/block/CamouflageableBlock.java

@@ -87,7 +87,7 @@ public boolean propagatesSkylightDown(BlockState state, BlockGetter reader, Bloc
     ICamouflageable getCamoState(BlockGetter blockAccess, BlockPos pos) {
         if (blockAccess == null || pos == null) return null;
         BlockEntity te = blockAccess.getBlockEntity(pos);
-        return te instanceof ICamouflageable c && c.getCamouflage() != null ? c : null;
+        return te instanceof ICamouflageable c && c.getCamouflage() != null && !(c.getCamouflage().getBlock() instanceof CamouflageableBlock) ? c : null;
     }
 
     @Override

src/main/java/me/desht/modularrouters/client/model/CamouflagingModel.java

@@ -36,8 +36,8 @@ public abstract class CamouflagingModel implements IDynamicBakedModel {
         if (renderType == null) {
             renderType = RenderType.solid(); // workaround for when this isn't set (digging, etc.)
         }
-        if (camoState == null && renderType == RenderType.solid()) {
-            // No camo
+        if ((camoState == null || camoState.getBlock() instanceof CamouflageableBlock) && renderType == RenderType.solid()) {
+            // No camo (or bad camo!)
             return baseModel.getQuads(state, side, rand, modelData, renderType);
         } else if (camoState != null && getRenderTypes(camoState, rand, modelData).contains(renderType)) {
             // Steal camo's model

src/main/java/me/desht/modularrouters/datagen/ModBlockTagsProvider.java

@@ -1,6 +1,7 @@
 package me.desht.modularrouters.datagen;
 
 import me.desht.modularrouters.ModularRouters;
+import me.desht.modularrouters.ModularRoutersTags;
 import me.desht.modularrouters.core.ModBlocks;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.DataGenerator;
@@ -20,5 +21,7 @@ public ModBlockTagsProvider(DataGenerator dataGenerator, CompletableFuture<Holde
     protected void addTags(HolderLookup.Provider provider) {
         tag(BlockTags.MINEABLE_WITH_PICKAXE).add(ModBlocks.MODULAR_ROUTER.get());
         tag(BlockTags.NEEDS_IRON_TOOL).add(ModBlocks.MODULAR_ROUTER.get());
+
+        tag(ModularRoutersTags.Blocks.CAMO_BLACKLIST);
     }
 }

src/main/java/me/desht/modularrouters/item/upgrade/CamouflageUpgrade.java

@@ -1,5 +1,7 @@
 package me.desht.modularrouters.item.upgrade;
 
+import me.desht.modularrouters.ModularRoutersTags;
+import me.desht.modularrouters.block.CamouflageableBlock;
 import me.desht.modularrouters.block.tile.ModularRouterBlockEntity;
 import me.desht.modularrouters.config.ConfigHolder;
 import me.desht.modularrouters.core.ModBlocks;
@@ -62,6 +64,7 @@ public InteractionResult useOn(UseOnContext ctx) {
             return InteractionResult.SUCCESS;
         } else if (ctx.getLevel().isClientSide) {
             player.playSound(ModSounds.ERROR.get(), 1.0f, 1.0f);
+            player.displayClientMessage(Component.translatable("modularrouters.chatText.misc.badCamoBlock").withStyle(ChatFormatting.RED), true);
             return InteractionResult.FAIL;
         }
         return InteractionResult.PASS;
@@ -79,8 +82,9 @@ public Component getName(ItemStack stack) {
     }
 
     private static boolean isBlockOKForCamo(BlockState state) {
-        // trying to camo a router as itself = recursion hell
-        return state.getRenderShape() == RenderShape.MODEL && state.getBlock() != ModBlocks.MODULAR_ROUTER.get()
+        // trying to camo a router as another camo block = recursion hell
+        return state.getRenderShape() == RenderShape.MODEL && !(state.getBlock() instanceof CamouflageableBlock)
+                && !state.is(ModularRoutersTags.Blocks.CAMO_BLACKLIST)
                 && !BuiltInRegistries.BLOCK.getKey(state.getBlock()).getNamespace().equals("chiselsandbits");
     }
 }

src/main/resources/assets/modularrouters/lang/en_us.json

@@ -58,6 +58,7 @@
    "key.modularrouters.category" : "Modular Routers",
    "key.modularrouters.configure" : "Configure Installed Module (GUI)",
    "key.modularrouters.moduleInfo" : "Extra Tooltip Info (GUI)",
+   "modularrouters.chatText.misc.badCamoBlock" : "Invalid camouflage block!",
    "modularrouters.chatText.misc.inventoryMerged" : "Merged %d item(s) into the %s",
    "modularrouters.chatText.misc.targetAdded" : "Target added (%d/%d): ",
    "modularrouters.chatText.misc.targetCleared" : "Target cleared",