diff --git a/client/cpw/mods/fml/client/FMLTextureFX.java b/client/cpw/mods/fml/client/FMLTextureFX.java index a85fac1a79..514302fcb5 100644 --- a/client/cpw/mods/fml/client/FMLTextureFX.java +++ b/client/cpw/mods/fml/client/FMLTextureFX.java @@ -52,7 +52,6 @@ public class FMLTextureFX extends TextureFX implements ITextureFX tileSizeSquare = tileSizeBase * tileSizeBase; tileSizeMask = tileSizeBase - 1; tileSizeSquareMask = tileSizeSquare - 1; - System.out.format("(%d,%d) %d %d %d %d\n", width, height, tileSizeBase, tileSizeSquare, tileSizeMask, tileSizeSquareMask); setErrored(false); setup(); } diff --git a/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/patches/minecraft/net/minecraft/src/RenderEngine.java.patch index d50ad31ad4..bdd5d2ea62 100644 --- a/patches/minecraft/net/minecraft/src/RenderEngine.java.patch +++ b/patches/minecraft/net/minecraft/src/RenderEngine.java.patch @@ -33,7 +33,7 @@ private IntBuffer field_1606_d = GLAllocation.func_1125_c(1); private ByteBuffer field_1605_e = GLAllocation.func_1127_b(16777216); - private List field_1604_f = new ArrayList(); -+ List field_1604_f = new ArrayList(); ++ public List field_1604_f = new ArrayList(); private Map field_1603_g = new HashMap(); private GameSettings field_1602_h; public boolean field_4281_i = false; @@ -64,18 +64,15 @@ int[] var5 = new int[var3 * var4]; byte[] var6 = new byte[var3 * var4 * 4]; p_1068_1_.getRGB(0, 0, var3, var4, var5, 0, var3); -@@ -448,8 +462,10 @@ +@@ -448,6 +462,7 @@ public void func_1066_a(TextureFX p_1066_1_) { + FMLClientHandler.instance().onPreRegisterEffect(p_1066_1_); this.field_1604_f.add(p_1066_1_); p_1066_1_.func_783_a(); -+ } - - public void func_1067_a() -@@ -460,7 +476,10 @@ +@@ -460,7 +475,10 @@ { TextureFX var3 = (TextureFX)this.field_1604_f.get(var2); var3.field_1131_c = this.field_1602_h.field_1578_g; @@ -87,7 +84,7 @@ this.field_1605_e.clear(); this.field_1605_e.put(var3.field_1127_a); this.field_1605_e.position(0).limit(var3.field_1127_a.length); -@@ -471,11 +490,16 @@ +@@ -471,11 +489,16 @@ var1 = var3.field_1126_b; } @@ -105,7 +102,7 @@ } } } -@@ -577,8 +601,9 @@ +@@ -577,8 +600,9 @@ this.field_4280_j = false; this.field_4281_i = false; } @@ -116,7 +113,7 @@ var7.printStackTrace(); } } -@@ -614,11 +639,13 @@ +@@ -614,11 +638,13 @@ this.field_4280_j = false; this.field_4281_i = false; } diff --git a/patches/minecraft/net/minecraft/src/TexturePortalFX.java.patch b/patches/minecraft/net/minecraft/src/TexturePortalFX.java.patch index ba16529a16..8e75276dc8 100644 --- a/patches/minecraft/net/minecraft/src/TexturePortalFX.java.patch +++ b/patches/minecraft/net/minecraft/src/TexturePortalFX.java.patch @@ -59,16 +59,15 @@ this.field_4226_h[var2][var16 * 4 + 0] = (byte)var13; this.field_4226_h[var2][var16 * 4 + 1] = (byte)var14; this.field_4226_h[var2][var16 * 4 + 2] = (byte)var6; -@@ -68,14 +78,15 @@ +@@ -68,6 +78,7 @@ } } } + field_4227_g = 0; } -- -+ + public void func_783_a() - { +@@ -75,7 +86,7 @@ ++this.field_4227_g; byte[] var1 = this.field_4226_h[this.field_4227_g & 31]; diff --git a/patches/minecraft/net/minecraft/src/TextureWatchFX.java.patch b/patches/minecraft/net/minecraft/src/TextureWatchFX.java.patch index f7e2bc5a62..75ceb672c1 100644 --- a/patches/minecraft/net/minecraft/src/TextureWatchFX.java.patch +++ b/patches/minecraft/net/minecraft/src/TextureWatchFX.java.patch @@ -20,7 +20,7 @@ { private Minecraft field_4225_g; private int[] field_4224_h = new int[256]; -@@ -18,22 +25,39 @@ +@@ -18,19 +25,36 @@ super(Item.field_4023_aQ.func_27009_a(0)); this.field_4225_g = p_i364_1_; this.field_1128_f = 1; @@ -64,11 +64,7 @@ + setErrored(true); } } -- -+ - public void func_783_a() - { - double var1 = 0.0D; + @@ -77,7 +101,7 @@ double var5 = Math.sin(this.field_4222_j); double var7 = Math.cos(this.field_4222_j); diff --git a/patches/minecraft/net/minecraft/src/TextureWaterFX.java.patch b/patches/minecraft/net/minecraft/src/TextureWaterFX.java.patch index 4e57e9713d..256720a353 100644 --- a/patches/minecraft/net/minecraft/src/TextureWaterFX.java.patch +++ b/patches/minecraft/net/minecraft/src/TextureWaterFX.java.patch @@ -17,7 +17,7 @@ + setup(); } -+ @Override ++ @Override + public void setup() + { + super.setup();