diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 2407f52212..971b1679a3 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -295,10 +295,17 @@ public class ForgeHooksClient renderPass = pass; } - static EnumWorldBlockLayer renderLayer = EnumWorldBlockLayer.SOLID; + static final ThreadLocal renderLayer = new ThreadLocal() + { + protected EnumWorldBlockLayer initialValue() + { + return EnumWorldBlockLayer.SOLID; + } + }; + public static void setRenderLayer(EnumWorldBlockLayer layer) { - renderLayer = layer; + renderLayer.set(layer); } public static ModelBase getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int slotID, ModelBase _default) diff --git a/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java b/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java index 39afb269da..ae5194ef69 100644 --- a/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java +++ b/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java @@ -49,7 +49,7 @@ public class MinecraftForgeClient public static EnumWorldBlockLayer getRenderLayer() { - return ForgeHooksClient.renderLayer; + return ForgeHooksClient.renderLayer.get(); } private static BitSet stencilBits = new BitSet(8);