Make rendering blocks thread safe with Angelica (#65)

This commit is contained in:
DarkShadow44 authored and GitHub committed 2025-09-05 09:48:11 +02:00
1 parent 4ce0134bed
commit 40144a0fa5
6 files changed
+57 -18

No files matched your search

@@ -75,7 +75,13 @@ public class SubmapManagerAntiblock extends SubmapManagerBase {
};
@SideOnly(Side.CLIENT)
private RenderBlocksCTMFullbright rb;
private static ThreadLocal<RenderBlocksCTMFullbright> renderBlocksThreadLocal;
private static void initStatics() {
if (renderBlocksThreadLocal == null) {
renderBlocksThreadLocal = ThreadLocal.withInitial(RenderBlocksCTMFullbright::new);
}
}
private String color;
private TextureSubmap submap, submapSmall;
@@ -99,9 +105,8 @@ public class SubmapManagerAntiblock extends SubmapManagerBase {
@Override
@SideOnly(Side.CLIENT)
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
if (rb == null) {
rb = new RenderBlocksCTMFullbright();
}
initStatics();
RenderBlocksCTMFullbright rb = renderBlocksThreadLocal.get();
rb.setRenderBoundsFromBlock(block);
rb.submap = submap;
rb.submapSmall = submapSmall;
@@ -14,7 +14,13 @@ import team.chisel.ctmlib.TextureSubmap;
public class SubmapManagerCarpetFloor extends SubmapManagerBase {
@SideOnly(Side.CLIENT)
private RenderBlocksCTM rb;
private static ThreadLocal<RenderBlocksCTM> renderBlocksThreadLocal;
private static void initStatics() {
if (renderBlocksThreadLocal == null) {
renderBlocksThreadLocal = ThreadLocal.withInitial(RenderBlocksCTM::new);
}
}
private TextureSubmap submap;
private TextureSubmap submapSmall;
@@ -45,9 +51,8 @@ public class SubmapManagerCarpetFloor extends SubmapManagerBase {
@Override
@SideOnly(Side.CLIENT)
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
if (rb == null) {
rb = new RenderBlocksCTM();
}
initStatics();
RenderBlocksCTM rb = renderBlocksThreadLocal.get();
rb.setRenderBoundsFromBlock(block);
rb.submap = submap;
rb.submapSmall = submapSmall;
@@ -99,7 +99,13 @@ public class SubmapManagerCombinedCTM extends SubmapManagerBase {
}
@SideOnly(Side.CLIENT)
private RenderBlocksCTM rb;
private static ThreadLocal<RenderBlocksCombinedCTM> renderBlocksThreadLocal;
private static void initStatics() {
if (renderBlocksThreadLocal == null) {
renderBlocksThreadLocal = new ThreadLocal<>();
}
}
private TextureSubmap submap, smallSubmap;
private int size;
@@ -133,8 +139,11 @@ public class SubmapManagerCombinedCTM extends SubmapManagerBase {
@Override
@SideOnly(Side.CLIENT)
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
initStatics();
RenderBlocksCombinedCTM rb = renderBlocksThreadLocal.get();
if (rb == null) {
rb = new RenderBlocksCombinedCTM();
renderBlocksThreadLocal.set(rb);
}
rb.setRenderBoundsFromBlock(block);
return rb;
@@ -16,7 +16,13 @@ import team.chisel.ctmlib.TextureSubmap;
public class SubmapManagerSlab implements ISubmapManager {
@SideOnly(Side.CLIENT)
private RenderBlocksCTM rb;
private static ThreadLocal<RenderBlocksCTM> renderBlocksThreadLocal;
private static void initStatics() {
if (renderBlocksThreadLocal == null) {
renderBlocksThreadLocal = ThreadLocal.withInitial(RenderBlocksCTM::new);
}
}
private TextureSubmap submap;
private TextureSubmap submapSmall;
@@ -49,9 +55,8 @@ public class SubmapManagerSlab implements ISubmapManager {
@Override
@SideOnly(Side.CLIENT)
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
if (rb == null) {
rb = new RenderBlocksCTM();
}
initStatics();
RenderBlocksCTM rb = renderBlocksThreadLocal.get();
rb.setRenderBoundsFromBlock(block);
rb.submap = submap;
rb.submapSmall = submapSmall;
@@ -48,7 +48,14 @@ public class SubmapManagerSpecialMaterial extends SubmapManagerBase {
}
};
private RenderBlocksCTMFullbright renderBlocksFullbright;
@SideOnly(Side.CLIENT)
private static ThreadLocal<RenderBlocksCTMFullbright> renderBlocksThreadLocal;
private static void initStatics() {
if (renderBlocksThreadLocal == null) {
renderBlocksThreadLocal = ThreadLocal.withInitial(RenderBlocksCTMFullbright::new);
}
}
private String color;
private MaterialType materialType;
@@ -76,9 +83,8 @@ public class SubmapManagerSpecialMaterial extends SubmapManagerBase {
@Override
@SideOnly(Side.CLIENT)
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
if (renderBlocksFullbright == null) {
renderBlocksFullbright = new RenderBlocksCTMFullbright();
}
initStatics();
RenderBlocksCTMFullbright renderBlocksFullbright = renderBlocksThreadLocal.get();
renderBlocksFullbright.setRenderBoundsFromBlock(block);
renderBlocksFullbright.submap = submap;
renderBlocksFullbright.submapSmall = submapSmall;
@@ -79,7 +79,13 @@ public class SubmapManagerVoidstone extends SubmapManagerBase {
}
@SideOnly(Side.CLIENT)
private RenderBlocksVoidstone rb;
private static ThreadLocal<RenderBlocksVoidstone> renderBlocksThreadLocal;
private static void initStatics() {
if (renderBlocksThreadLocal == null) {
renderBlocksThreadLocal = new ThreadLocal<>();
}
}
private ISubmapManager overlay;
private TextureSubmap base;
@@ -123,8 +129,11 @@ public class SubmapManagerVoidstone extends SubmapManagerBase {
@Override
@SideOnly(Side.CLIENT)
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
initStatics();
RenderBlocksVoidstone rb = renderBlocksThreadLocal.get();
if (rb == null) {
rb = new RenderBlocksVoidstone();
renderBlocksThreadLocal.set(rb);
}
RenderBlocks ctx = overlay.createRenderContext(rendererOld, block, world);
rb.setRenderBoundsFromBlock(block);