feat(threading): Improved tracking for threadsafe blocks

Author: basdxz

src/main/java/com/falsepattern/falsetweaks/mixin/mixins/client/threadedupdates/BlockMixin.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of FalseTweaks.
+ *
+ * Copyright (C) 2022-2025 FalsePattern
+ * All Rights Reserved
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * FalseTweaks is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, only version 3 of the License.
+ *
+ * FalseTweaks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with FalseTweaks. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.falsepattern.falsetweaks.mixin.mixins.client.threadedupdates;
+
+import com.falsepattern.falsetweaks.modules.threadedupdates.saftey.IBlockExt;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+import net.minecraft.block.Block;
+
+@Mixin(Block.class)
+public abstract class BlockMixin implements IBlockExt {
+    @Unique
+    private boolean ft$isThreadSafe = false;
+
+    @Override
+    public void ft$isThreadSafe(boolean value) {
+        ft$isThreadSafe = value;
+    }
+
+    @Override
+    public boolean ft$isThreadSafe() {
+        return ft$isThreadSafe;
+    }
+}

src/main/java/com/falsepattern/falsetweaks/mixin/mixins/client/threadedupdates/RenderingRegistryMixin.java

@@ -39,7 +39,7 @@ public abstract class RenderingRegistryMixin implements IRenderingRegistryExt {
     private Map<Integer, ISimpleBlockRenderingHandler> blockRenderers;
 
     @Override
-    public ISimpleBlockRenderingHandler getISBRH(Block block) {
+    public ISimpleBlockRenderingHandler ft$getRenderer(Block block) {
         return blockRenderers.get(block.getRenderType());
     }
 }

src/main/java/com/falsepattern/falsetweaks/mixin/plugin/standard/Mixin.java

@@ -192,6 +192,7 @@ public enum Mixin implements IMixins {
                            "threadedupdates.RenderingRegistryMixin",
                            "threadedupdates.TessellatorMixin",
                            "threadedupdates.ChunkCacheMixin",
+                           "threadedupdates.BlockMixin",
                            "threadedupdates.blockbounds.BlockMixin_Root",
                            "threadedupdates.blockbounds.BlockMixin_Impl")),
     ThreadedUpdates_blockBounds(Phase.EARLY,

src/main/java/com/falsepattern/falsetweaks/modules/beddium/FTChunkBuilderMeshingTask.java

@@ -26,7 +26,7 @@
 import com.falsepattern.falsetweaks.config.ModuleConfig;
 import com.falsepattern.falsetweaks.modules.threadedupdates.ThreadTessellator;
 import com.falsepattern.falsetweaks.modules.threadedupdates.ThreadedUpdateHooks;
-import com.falsepattern.falsetweaks.modules.threadedupdates.saftey.ThreadedBlockSafetyRegistry;
+import com.falsepattern.falsetweaks.modules.threadedupdates.saftey.IBlockExt;
 import com.ventooth.beddium.api.task.SimpleChunkBuilderMeshingTask;
 import com.ventooth.beddium.api.task.WorldRenderRegion;
 import it.unimi.dsi.fastutil.ints.IntList;
@@ -99,12 +99,8 @@ protected boolean isThreaded() {
 
         @Override
         protected boolean canRenderOffThread(int pass, Block block, int x, int y, int z) {
-            val rt = block.getRenderType();
-            // Vanilla render types end at 42
-            if (rt < 42) {
-                return true;
-            }
-            return ThreadedBlockSafetyRegistry.canBlockRenderOffThread(block);
+            return IBlockExt.of(block)
+                            .ft$isThreadSafe();
         }
 
         @Override

src/main/java/com/falsepattern/falsetweaks/modules/threadedupdates/saftey/IBlockExt.java

@@ -0,0 +1,36 @@
+/*
+ * This file is part of FalseTweaks.
+ *
+ * Copyright (C) 2022-2025 FalsePattern
+ * All Rights Reserved
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * FalseTweaks is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, only version 3 of the License.
+ *
+ * FalseTweaks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with FalseTweaks. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.falsepattern.falsetweaks.modules.threadedupdates.saftey;
+
+import net.minecraft.block.Block;
+
+public interface IBlockExt {
+    @SuppressWarnings("CastToIncompatibleInterface")
+    static IBlockExt of(Block thiz) {
+        return (IBlockExt) thiz;
+    }
+
+    void ft$isThreadSafe(boolean value);
+
+    boolean ft$isThreadSafe();
+}

src/main/java/com/falsepattern/falsetweaks/modules/threadedupdates/saftey/IRenderingRegistryExt.java

@@ -24,8 +24,14 @@
 
 import net.minecraft.block.Block;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 
 // Ported from Angelica
 public interface IRenderingRegistryExt {
-    ISimpleBlockRenderingHandler getISBRH(Block block);
+    @SuppressWarnings("CastToIncompatibleInterface")
+    static IRenderingRegistryExt of(RenderingRegistry thiz) {
+        return (IRenderingRegistryExt) thiz;
+    }
+
+    ISimpleBlockRenderingHandler ft$getRenderer(Block block);
 }

src/main/java/com/falsepattern/falsetweaks/modules/threadedupdates/saftey/ThreadSafeBlockRendererMap.java

@@ -26,11 +26,15 @@
 import lombok.Data;
 import lombok.SneakyThrows;
 import lombok.val;
+import lombok.var;
 import org.apache.logging.log4j.LogManager;
 
+import net.minecraft.block.Block;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.registry.GameData;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -117,6 +121,46 @@ public static void logBrokenISBRHs() {
         logger.error(Strings.repeat("+=", 25));
     }
 
+    public static void markThreadsafeBlocks() {
+        val logger = LOG_ISBRH_ERRORS ? LogManager.getLogger("FT|THREAD SAFETY") : null;
+
+        //noinspection deprecation
+        val renderingRegistry = IRenderingRegistryExt.of(RenderingRegistry.instance());
+        //noinspection unchecked
+        val blockRegistry = (Iterable<Block>) GameData.getBlockRegistry();
+        for (val block : blockRegistry) {
+            val isThreadsafe = isBlockThreadsafe(renderingRegistry, block);
+            IBlockExt.of(block)
+                     .ft$isThreadSafe(isThreadsafe);
+            if (logger != null) {
+                val blockId = GameRegistry.findUniqueIdentifierFor(block);
+                final String blockName;
+                if (blockId == null) {
+                    //noinspection ObjectToString
+                    blockName = "UNKNOWN(" + block + ")";
+                } else {
+                    blockName = "(" + blockId + ")";
+                }
+
+                if (isThreadsafe) {
+                    logger.debug("Block Threadsafe: {}", blockName);
+                } else {
+                    logger.warn("Block NOT Threadsafe: {}", blockName);
+                }
+            }
+        }
+    }
+
+    private static boolean isBlockThreadsafe(IRenderingRegistryExt renderingRegistry, Block block) {
+        val renderType = block.getRenderType();
+        // Vanilla render types end at 42
+        if (renderType < 42) {
+            return true;
+        }
+        val renderer = renderingRegistry.ft$getRenderer(block);
+        return renderer instanceof ThreadSafeBlockRenderer;
+    }
+
     @Override
     public ISimpleBlockRenderingHandler put(Integer key, ISimpleBlockRenderingHandler value) {
         log:

src/main/java/com/falsepattern/falsetweaks/modules/threadedupdates/saftey/ThreadedBlockSafetyRegistry.java

@@ -174,6 +174,7 @@ public void postInit(FMLPostInitializationEvent e) {
     public void loadComplete(FMLLoadCompleteEvent e) {
         super.loadComplete(e);
         ThreadSafeBlockRendererMap.logBrokenISBRHs();
+        ThreadSafeBlockRendererMap.markThreadsafeBlocks();
     }
 
     @SubscribeEvent