diff --git a/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java index b44c05bd96..a587559c00 100644 --- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java @@ -138,7 +138,7 @@ public class FMLClientHandler implements IFMLSidedHandler private HashMap keyBindings = new HashMap(); private HashSet animationSet = new HashSet(); - private List addedTextureFX; + private List addedTextureFX = new ArrayList(); /** * Called to start the whole game off from diff --git a/fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch index eca30c1423..a64f733a8a 100644 --- a/fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch +++ b/fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch @@ -95,9 +95,9 @@ } + GL11.glBindTexture(GL11.GL_TEXTURE_2D, func_1070_a("/terrain.png")); + int tileSize = GL11.glGetTexLevelParameteri(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH ) >> 4; -+ int tileSizeSquare = TextureFX.tileSize*TextureFX.tileSize; -+ int tileSizeMask = TextureFX.tileSize - 1; -+ int tileSizeSquareMask = TextureFX.tileSizeSquare - 1; ++ int tileSizeSquare = tileSize*tileSize; ++ int tileSizeMask = tileSize - 1; ++ int tileSizeSquareMask = tileSizeSquare - 1; + + FMLClientHandler.instance().preTexturePackChange(var1, tileSize, tileSizeSquare, tileSizeMask, tileSizeSquareMask); +