From 2419d4913b8847b4ec3a529d267150acaaa0ffa7 Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Mon, 9 Feb 2015 02:46:01 +0300 Subject: [PATCH] made renderLayer ThreadLocal, now it should hold correct value for use inside custom baked models --- .../net/minecraftforge/client/ForgeHooksClient.java | 11 +++++++++-- .../minecraftforge/client/MinecraftForgeClient.java | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) 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);