diff --git a/gradle.properties b/gradle.properties
index b282dd38c..72edbf388 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -57,7 +57,7 @@ replaceGradleTokenInFile =
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
# leave this property empty.
# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
-apiPackage =
+apiPackage = api
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
# There can be multiple files in a comma-separated list.
diff --git a/src/main/java/com/gtnewhorizons/angelica/api/ThreadSafeISBRH.java b/src/main/java/com/gtnewhorizons/angelica/api/ThreadSafeISBRH.java
new file mode 100644
index 000000000..c773f5abe
--- /dev/null
+++ b/src/main/java/com/gtnewhorizons/angelica/api/ThreadSafeISBRH.java
@@ -0,0 +1,35 @@
+package com.gtnewhorizons.angelica.api;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Marks an ISBRH as thread-safe, allowing Angelica to run it off-thread.
+ *
+ *
Note: Any tessellator access must be done within the methods of the ISBRH and not cached in the class.
+ */
+@Documented
+@Target({ TYPE })
+@Retention(RUNTIME)
+public @interface ThreadSafeISBRH {
+ /**
+ * Specifies whether Angelica should create a thread local instance of the class for each thread.
+ *
+ * - If this is set to true, a new instance will be created using the default constructor on each thread.
+ *
+ * - Note: If your renderer requires arguments to the constructor, do not use this annotation;
+ * instead use the {@link ThreadSafeISBRHFactory} interface and implement the {@link ThreadSafeISBRHFactory#newInstance} method.
+ *
+ * - If this is set to false, the main thread instance will be used on all threads.
+ * Use this option if your renderer class has no state, and can be safely used from multiple threads as is.
+ *
+ * - No state/non final variables should be stored in the ISBRH as it is not guaranteed to be thread safe.
+ *
+ *
+ */
+ boolean perThread();
+}
diff --git a/src/main/java/com/gtnewhorizons/angelica/api/ThreadSafeISBRHFactory.java b/src/main/java/com/gtnewhorizons/angelica/api/ThreadSafeISBRHFactory.java
new file mode 100644
index 000000000..0354d715b
--- /dev/null
+++ b/src/main/java/com/gtnewhorizons/angelica/api/ThreadSafeISBRHFactory.java
@@ -0,0 +1,22 @@
+package com.gtnewhorizons.angelica.api;
+
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+
+/**
+ * Marks an ISBRH as thread-safe using a thread local instance, allowing Angelica to run it off-thread.
+ * Use this when your ISBRH uses a non-default constructor.
+ * To avoid a hard dependency on Angelica, you will likely want to mark this as an optional interface using:
+ *
+ * @Optional.Interface(modid = "angelica", iface = "com.gtnewhorizons.angelica.api.ThreadSafeISBRHFactory")
+ *
+ *
+ * Notes
+ *
+ * - Any tessellator access must be done within the methods of the ISBRH and not cached in the class.
+ * - If your class uses a default constructor or is thread-safe by default, consider using the simpler {@link ThreadSafeISBRH}
+ * annotation instead.
+ *
+ */
+public interface ThreadSafeISBRHFactory extends ISimpleBlockRenderingHandler {
+ ThreadSafeISBRHFactory newInstance();
+}
diff --git a/src/main/java/com/gtnewhorizons/angelica/interfaces/IThreadSafeISBRH.java b/src/main/java/com/gtnewhorizons/angelica/interfaces/IThreadSafeISBRH.java
deleted file mode 100644
index 8bdab2753..000000000
--- a/src/main/java/com/gtnewhorizons/angelica/interfaces/IThreadSafeISBRH.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.gtnewhorizons.angelica.interfaces;
-
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-
-public interface IThreadSafeISBRH extends ISimpleBlockRenderingHandler {
- IThreadSafeISBRH getThreadLocal();
-
-}
diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderingRegistry.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderingRegistry.java
index 6cc5710ed..f05936a87 100644
--- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderingRegistry.java
+++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderingRegistry.java
@@ -1,21 +1,26 @@
package com.gtnewhorizons.angelica.mixins.early.sodium;
-import com.gtnewhorizons.angelica.interfaces.IThreadSafeISBRH;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRHFactory;
+import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.mixins.interfaces.IRenderingRegistryExt;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
+import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
+import java.lang.reflect.InvocationTargetException;
import java.util.Map;
@Mixin(value = RenderingRegistry.class, remap = false)
public class MixinRenderingRegistry implements IRenderingRegistryExt {
@Shadow private Map blockRenderers;
+ private ThreadLocal