From abee6d2507adc12d576272753c9bbce9092619d1 Mon Sep 17 00:00:00 2001 From: Christian Weeks Date: Thu, 17 May 2012 15:39:04 -0400 Subject: [PATCH] Some logging of texture overrides- also, only unregister if it's an actual ModTextureStatic, not if it's a subclass. --- .../cpw/mods/fml/client/FMLClientHandler.java | 2 ++ fml/client/net/minecraft/src/ModTextureStatic.java | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java index 6000ab43d4..ae6d78a6d1 100644 --- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java @@ -741,6 +741,7 @@ public class FMLClientHandler implements IFMLSidedHandler for (OverrideInfo animationOverride : animationSet) { renderer.func_1066_a(animationOverride.textureFX); addedTextureFX.add(animationOverride.textureFX); + FMLCommonHandler.instance().getFMLLogger().finer(String.format("Registered texture override %d (%d) on %s (%d)", animationOverride.index, animationOverride.textureFX.field_1126_b, animationOverride.textureFX.getClass().getSimpleName(), animationOverride.textureFX.field_1128_f)); } for (String fileToOverride : overrideInfo.keySet()) { @@ -751,6 +752,7 @@ public class FMLClientHandler implements IFMLSidedHandler ModTextureStatic mts=new ModTextureStatic(override.index, 1, override.texture, image); renderer.func_1066_a(mts); addedTextureFX.add(mts); + FMLCommonHandler.instance().getFMLLogger().finer(String.format("Registered texture override %d (%d) on %s (%d)", override.index, mts.field_1126_b, override.texture, mts.field_1128_f)); } catch (IOException e) { diff --git a/fml/client/net/minecraft/src/ModTextureStatic.java b/fml/client/net/minecraft/src/ModTextureStatic.java index 0864996771..893eec4c19 100644 --- a/fml/client/net/minecraft/src/ModTextureStatic.java +++ b/fml/client/net/minecraft/src/ModTextureStatic.java @@ -155,4 +155,17 @@ public class ModTextureStatic extends TextureFX return tmp; } + + /* (non-Javadoc) + * @see net.minecraft.src.TextureFX#unregister(net.minecraft.src.RenderEngine) + */ + @Override + public boolean unregister(RenderEngine engine) + { + if (this.getClass()==ModTextureStatic.class) { + return super.unregister(engine); + } else { + return false; + } + } }