From b0f0635eb3e6c5ea18ee90642d6ed276c8359096 Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 15 Nov 2012 14:08:41 -0800 Subject: [PATCH] Fix for ModLoader static overrides not displaying. --- client/net/minecraft/src/ModTextureStatic.java | 4 ++-- .../net/minecraft/src/RenderEngine.java.patch | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/client/net/minecraft/src/ModTextureStatic.java b/client/net/minecraft/src/ModTextureStatic.java index 86e6958733..734771e426 100644 --- a/client/net/minecraft/src/ModTextureStatic.java +++ b/client/net/minecraft/src/ModTextureStatic.java @@ -32,7 +32,7 @@ public class ModTextureStatic extends FMLTextureFX private String targetTex = null; private int storedSize; private BufferedImage overrideData = null; - private int needApply = 2; + private int needApply = 10; public ModTextureStatic(int icon, int target, BufferedImage image) @@ -106,7 +106,7 @@ public class ModTextureStatic extends FMLTextureFX public void update() { - needApply = 2; + needApply = 10; for (int idx = 0; idx < pixels.length; idx++) { int i = idx * 4; diff --git a/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/patches/minecraft/net/minecraft/src/RenderEngine.java.patch index 9ac118b593..de93b81cb5 100644 --- a/patches/minecraft/net/minecraft/src/RenderEngine.java.patch +++ b/patches/minecraft/net/minecraft/src/RenderEngine.java.patch @@ -59,10 +59,11 @@ this.field_78367_h.add(p_78355_1_); p_78355_1_.func_76846_a(); } -@@ -418,15 +429,30 @@ +@@ -417,16 +428,30 @@ + { TextureFX var3 = (TextureFX)this.field_78367_h.get(var2); var3.field_76851_c = this.field_78365_j.field_74337_g; - var3.func_76846_a(); +- var3.func_76846_a(); - var1 = this.func_82772_a(var3, var1); + if (TextureFXManager.instance().onUpdateTextureEffect(var3)) + { @@ -94,7 +95,7 @@ if (p_82772_1_.field_76850_b != p_82772_2_) { -@@ -436,9 +462,11 @@ +@@ -436,9 +461,11 @@ for (int var3 = 0; var3 < p_82772_1_.field_76849_e; ++var3) { @@ -107,7 +108,7 @@ } } -@@ -504,8 +532,9 @@ +@@ -504,8 +531,9 @@ this.field_78361_b = false; this.field_78363_a = false; } @@ -119,7 +120,7 @@ var7.printStackTrace(); } } -@@ -541,8 +570,9 @@ +@@ -541,8 +569,9 @@ this.field_78361_b = false; this.field_78363_a = false; }