From 8b1ed2d25515a43ab0cbfc049a7ca6f24ff156c3 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Tue, 20 Nov 2012 03:15:01 -0800
Subject: [PATCH] First half of new patches

---
 .../{src => client}/EntityFX.java.patch       |  6 +--
 .../{src => client}/GameSettings.java.patch   | 10 ++--
 .../{src => client}/GuiCreateWorld.java.patch | 10 ++--
 .../{src => client}/GuiErrorScreen.java.patch | 10 ++--
 .../{src => client}/GuiMainMenu.java.patch    | 33 ++++++++-----
 .../IntegratedServer.java.patch               | 18 ++++---
 .../IntegratedServerListenThread.java.patch   | 18 ++-----
 .../{src => client}/ItemRenderer.java.patch   | 21 ++++-----
 .../net/minecraft/client/Minecraft.java.patch | 34 ++++----------
 .../client/MinecraftApplet.java.patch         | 16 +++----
 .../NetClientHandler.java.patch               | 32 +++++--------
 .../{src => client}/RenderBlocks.java.patch   | 19 ++++++--
 .../{src => client}/RenderEngine.java.patch   | 47 +++++++++----------
 .../TextureCompassFX.java.patch               | 22 ++++-----
 .../TextureFlamesFX.java.patch                | 21 ++++-----
 .../{src => client}/TextureLavaFX.java.patch  | 20 ++++----
 .../TextureLavaFlowFX.java.patch              | 18 +++----
 .../TexturePortalFX.java.patch                | 14 +++---
 .../{src => client}/TextureWatchFX.java.patch | 42 ++++-------------
 .../{src => client}/TextureWaterFX.java.patch | 25 +++++-----
 .../TextureWaterFlowFX.java.patch             | 15 +++---
 .../minecraft/src/IBossDisplayData.java.patch | 12 -----
 22 files changed, 204 insertions(+), 259 deletions(-)
 rename fml/patches/minecraft/net/minecraft/{src => client}/EntityFX.java.patch (83%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/GameSettings.java.patch (57%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/GuiCreateWorld.java.patch (64%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/GuiErrorScreen.java.patch (57%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/GuiMainMenu.java.patch (74%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/IntegratedServer.java.patch (66%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/IntegratedServerListenThread.java.patch (55%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/ItemRenderer.java.patch (90%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/NetClientHandler.java.patch (82%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/RenderBlocks.java.patch (95%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/RenderEngine.java.patch (78%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/TextureCompassFX.java.patch (91%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/TextureFlamesFX.java.patch (92%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/TextureLavaFX.java.patch (91%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/TextureLavaFlowFX.java.patch (92%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/TexturePortalFX.java.patch (90%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/TextureWatchFX.java.patch (70%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/TextureWaterFX.java.patch (92%)
 rename fml/patches/minecraft/net/minecraft/{src => client}/TextureWaterFlowFX.java.patch (92%)
 delete mode 100644 fml/patches/minecraft/net/minecraft/src/IBossDisplayData.java.patch

diff --git a/fml/patches/minecraft/net/minecraft/src/EntityFX.java.patch b/fml/patches/minecraft/net/minecraft/client/EntityFX.java.patch
similarity index 83%
rename from fml/patches/minecraft/net/minecraft/src/EntityFX.java.patch
rename to fml/patches/minecraft/net/minecraft/client/EntityFX.java.patch
index a5a8750d2..69aea9e6e 100644
--- a/fml/patches/minecraft/net/minecraft/src/EntityFX.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/EntityFX.java.patch
@@ -1,6 +1,6 @@
---- ../src-base/minecraft/net/minecraft/src/EntityFX.java
-+++ ../src-work/minecraft/net/minecraft/src/EntityFX.java
-@@ -27,9 +27,9 @@
+--- ../src-base/minecraft/net/minecraft/client/EntityFX.java
++++ ../src-work/minecraft/net/minecraft/client/EntityFX.java
+@@ -31,9 +31,9 @@
          this.func_70105_a(0.2F, 0.2F);
          this.field_70129_M = this.field_70131_O / 2.0F;
          this.func_70107_b(p_i3154_2_, p_i3154_4_, p_i3154_6_);
diff --git a/fml/patches/minecraft/net/minecraft/src/GameSettings.java.patch b/fml/patches/minecraft/net/minecraft/client/GameSettings.java.patch
similarity index 57%
rename from fml/patches/minecraft/net/minecraft/src/GameSettings.java.patch
rename to fml/patches/minecraft/net/minecraft/client/GameSettings.java.patch
index a90b05324..9e45a8e6d 100644
--- a/fml/patches/minecraft/net/minecraft/src/GameSettings.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/GameSettings.java.patch
@@ -1,17 +1,17 @@
---- ../src-base/minecraft/net/minecraft/src/GameSettings.java
-+++ ../src-work/minecraft/net/minecraft/src/GameSettings.java
+--- ../src-base/minecraft/net/minecraft/client/GameSettings.java
++++ ../src-work/minecraft/net/minecraft/client/GameSettings.java
 @@ -1,5 +1,6 @@
- package net.minecraft.src;
+ package net.minecraft.client;
  
 +import cpw.mods.fml.client.FMLClientHandler;
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
  import java.io.BufferedReader;
-@@ -604,6 +605,7 @@
+@@ -606,6 +607,7 @@
  
      public void func_74303_b()
      {
-+        if (FMLClientHandler.instance().isLoading()) return;
++    	if (FMLClientHandler.instance().isLoading()) return;
          try
          {
              PrintWriter var1 = new PrintWriter(new FileWriter(this.field_74354_ai));
diff --git a/fml/patches/minecraft/net/minecraft/src/GuiCreateWorld.java.patch b/fml/patches/minecraft/net/minecraft/client/GuiCreateWorld.java.patch
similarity index 64%
rename from fml/patches/minecraft/net/minecraft/src/GuiCreateWorld.java.patch
rename to fml/patches/minecraft/net/minecraft/client/GuiCreateWorld.java.patch
index 0e1ca205f..31f4ed104 100644
--- a/fml/patches/minecraft/net/minecraft/src/GuiCreateWorld.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/GuiCreateWorld.java.patch
@@ -1,9 +1,11 @@
---- ../src-base/minecraft/net/minecraft/src/GuiCreateWorld.java
-+++ ../src-work/minecraft/net/minecraft/src/GuiCreateWorld.java
-@@ -205,6 +205,7 @@
+--- ../src-base/minecraft/net/minecraft/client/GuiCreateWorld.java
++++ ../src-work/minecraft/net/minecraft/client/GuiCreateWorld.java
+@@ -213,7 +213,8 @@
+                         var2 = (long)var4.hashCode();
                      }
                  }
- 
+-
++                
 +                WorldType.field_77139_a[this.field_73916_E].onGUICreateWorldPress();
                  EnumGameType var8 = EnumGameType.func_77142_a(this.field_73927_m);
                  WorldSettings var6 = new WorldSettings(var2, var8, this.field_73925_n, this.field_73933_r, WorldType.field_77139_a[this.field_73916_E]);
diff --git a/fml/patches/minecraft/net/minecraft/src/GuiErrorScreen.java.patch b/fml/patches/minecraft/net/minecraft/client/GuiErrorScreen.java.patch
similarity index 57%
rename from fml/patches/minecraft/net/minecraft/src/GuiErrorScreen.java.patch
rename to fml/patches/minecraft/net/minecraft/client/GuiErrorScreen.java.patch
index 20b4c8905..13b0a21d7 100644
--- a/fml/patches/minecraft/net/minecraft/src/GuiErrorScreen.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/GuiErrorScreen.java.patch
@@ -1,12 +1,10 @@
---- ../src-base/minecraft/net/minecraft/src/GuiErrorScreen.java
-+++ ../src-work/minecraft/net/minecraft/src/GuiErrorScreen.java
-@@ -9,6 +9,10 @@
+--- ../src-base/minecraft/net/minecraft/client/GuiErrorScreen.java
++++ ../src-work/minecraft/net/minecraft/client/GuiErrorScreen.java
+@@ -9,6 +9,8 @@
      private String field_74001_a;
      private String field_74000_b;
  
-+    public GuiErrorScreen()
-+    {
-+    }
++    public GuiErrorScreen(){}
 +
      public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
      {
diff --git a/fml/patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch b/fml/patches/minecraft/net/minecraft/client/GuiMainMenu.java.patch
similarity index 74%
rename from fml/patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch
rename to fml/patches/minecraft/net/minecraft/client/GuiMainMenu.java.patch
index 283b9e706..c04c21046 100644
--- a/fml/patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/GuiMainMenu.java.patch
@@ -1,24 +1,32 @@
---- ../src-base/minecraft/net/minecraft/src/GuiMainMenu.java
-+++ ../src-work/minecraft/net/minecraft/src/GuiMainMenu.java
-@@ -10,10 +10,17 @@
+--- ../src-base/minecraft/net/minecraft/client/GuiMainMenu.java
++++ ../src-work/minecraft/net/minecraft/client/GuiMainMenu.java
+@@ -1,5 +1,7 @@
+ package net.minecraft.client;
+ 
++import cpw.mods.fml.client.GuiModList;
++import cpw.mods.fml.common.FMLCommonHandler;
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
+ import java.awt.image.BufferedImage;
+@@ -10,6 +12,7 @@
  import java.util.ArrayList;
  import java.util.Calendar;
  import java.util.Date;
 +import java.util.List;
  import java.util.Random;
- import net.minecraft.client.Minecraft;
+ import net.minecraft.shared.DemoWorldServer;
+ import net.minecraft.shared.ISaveFormat;
+@@ -18,6 +21,9 @@
+ import net.minecraft.shared.WorldInfo;
  import org.lwjgl.opengl.GL11;
  import org.lwjgl.util.glu.GLU;
 +
 +import com.google.common.base.Strings;
 +import com.google.common.collect.Lists;
-+
-+import cpw.mods.fml.client.GuiModList;
-+import cpw.mods.fml.common.FMLCommonHandler;
  
  @SideOnly(Side.CLIENT)
  public class GuiMainMenu extends GuiScreen
-@@ -125,7 +132,8 @@
+@@ -129,7 +135,8 @@
              this.func_73969_a(var4, 24, var2);
          }
  
@@ -28,7 +36,7 @@
  
          if (this.field_73882_e.field_71448_m)
          {
-@@ -189,6 +197,11 @@
+@@ -193,6 +200,11 @@
          if (p_73875_1_.field_73741_f == 4)
          {
              this.field_73882_e.func_71400_g();
@@ -40,13 +48,14 @@
          }
  
          if (p_73875_1_.field_73741_f == 11)
-@@ -407,7 +420,14 @@
+@@ -411,7 +423,15 @@
              var9 = var9 + " Demo";
          }
  
 -        this.func_73731_b(this.field_73886_k, var9, 2, this.field_73881_g - 10, 16777215);
-+        List<String> brandings=Lists.reverse(FMLCommonHandler.instance().getBrandings());
-+        for (int i=0; i<brandings.size(); i++) {
++        List<String> brandings = Lists.reverse(FMLCommonHandler.instance().getBrandings());
++        for (int i = 0; i < brandings.size(); i++)
++        {
 +            String brd = brandings.get(i);
 +            if (!Strings.isNullOrEmpty(brd))
 +            {
diff --git a/fml/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch b/fml/patches/minecraft/net/minecraft/client/IntegratedServer.java.patch
similarity index 66%
rename from fml/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch
rename to fml/patches/minecraft/net/minecraft/client/IntegratedServer.java.patch
index afeab2937..da6b4efd8 100644
--- a/fml/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/IntegratedServer.java.patch
@@ -1,15 +1,13 @@
---- ../src-base/minecraft/net/minecraft/src/IntegratedServer.java
-+++ ../src-work/minecraft/net/minecraft/src/IntegratedServer.java
-@@ -4,6 +4,8 @@
+--- ../src-base/minecraft/net/minecraft/client/IntegratedServer.java
++++ ../src-work/minecraft/net/minecraft/client/IntegratedServer.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.client;
+ 
++import cpw.mods.fml.common.FMLCommonHandler;
+ import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
  import java.io.File;
- import java.io.IOException;
-+
-+import cpw.mods.fml.common.FMLCommonHandler;
- import net.minecraft.client.Minecraft;
- import net.minecraft.server.MinecraftServer;
- 
-@@ -97,6 +99,7 @@
+@@ -108,6 +109,7 @@
          this.func_71253_a(CryptManager.func_75891_b());
          this.func_71247_a(this.func_71270_I(), this.func_71221_J(), this.field_71350_m.func_77160_d(), this.field_71350_m.func_77165_h(), this.field_71350_m.func_82749_j());
          this.func_71205_p(this.func_71214_G() + " - " + this.field_71305_c[0].func_72912_H().func_76065_j());
diff --git a/fml/patches/minecraft/net/minecraft/src/IntegratedServerListenThread.java.patch b/fml/patches/minecraft/net/minecraft/client/IntegratedServerListenThread.java.patch
similarity index 55%
rename from fml/patches/minecraft/net/minecraft/src/IntegratedServerListenThread.java.patch
rename to fml/patches/minecraft/net/minecraft/client/IntegratedServerListenThread.java.patch
index 764578480..cfc66d26b 100644
--- a/fml/patches/minecraft/net/minecraft/src/IntegratedServerListenThread.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/IntegratedServerListenThread.java.patch
@@ -1,6 +1,6 @@
---- ../src-base/minecraft/net/minecraft/src/IntegratedServerListenThread.java
-+++ ../src-work/minecraft/net/minecraft/src/IntegratedServerListenThread.java
-@@ -2,8 +2,18 @@
+--- ../src-base/minecraft/net/minecraft/client/IntegratedServerListenThread.java
++++ ../src-work/minecraft/net/minecraft/client/IntegratedServerListenThread.java
+@@ -2,6 +2,8 @@
  
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
@@ -8,18 +8,8 @@
 +
  import java.io.IOException;
  import java.net.InetAddress;
-+import java.net.NetworkInterface;
-+import java.util.Arrays;
-+import java.util.Collections;
-+import java.util.List;
-+
-+import com.google.common.collect.Iterators;
-+import com.google.common.collect.Lists;
-+
  import net.minecraft.server.MinecraftServer;
- 
- @SideOnly(Side.CLIENT)
-@@ -57,7 +67,7 @@
+@@ -63,7 +65,7 @@
              }
          }
  
diff --git a/fml/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/fml/patches/minecraft/net/minecraft/client/ItemRenderer.java.patch
similarity index 90%
rename from fml/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch
rename to fml/patches/minecraft/net/minecraft/client/ItemRenderer.java.patch
index c726aee3a..fb695729f 100644
--- a/fml/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/ItemRenderer.java.patch
@@ -1,28 +1,27 @@
---- ../src-base/minecraft/net/minecraft/src/ItemRenderer.java
-+++ ../src-work/minecraft/net/minecraft/src/ItemRenderer.java
+--- ../src-base/minecraft/net/minecraft/client/ItemRenderer.java
++++ ../src-work/minecraft/net/minecraft/client/ItemRenderer.java
 @@ -1,5 +1,6 @@
- package net.minecraft.src;
+ package net.minecraft.client;
  
 +import cpw.mods.fml.client.TextureFXManager;
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
- import net.minecraft.client.Minecraft;
-@@ -26,8 +27,12 @@
+ import net.minecraft.shared.Block;
+@@ -33,7 +34,12 @@
      public void func_78443_a(EntityLiving p_78443_1_, ItemStack p_78443_2_, int p_78443_3_)
      {
          GL11.glPushMatrix();
 -        Block var4 = Block.field_71973_m[p_78443_2_.field_77993_c];
--
 +
 +        Block var4 = null;
 +        if (p_78443_2_.field_77993_c < Block.field_71973_m.length)
 +        {
 +            var4 = Block.field_71973_m[p_78443_2_.field_77993_c];
 +        }
+ 
          if (var4 != null && RenderBlocks.func_78597_b(var4.func_71857_b()))
          {
-             GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.field_78455_a.field_71446_o.func_78341_b("/terrain.png"));
-@@ -123,10 +128,17 @@
+@@ -130,10 +136,17 @@
          float var10;
          float var11;
  
@@ -44,7 +43,7 @@
              var11 = var6 * var9;
              p_78439_1_.func_78374_a((double)var11, 0.0D, (double)(0.0F - var7), (double)var10, (double)p_78439_5_);
              p_78439_1_.func_78374_a((double)var11, 0.0D, 0.0D, (double)var10, (double)p_78439_5_);
-@@ -138,11 +150,11 @@
+@@ -145,11 +158,11 @@
          p_78439_1_.func_78382_b();
          p_78439_1_.func_78375_b(1.0F, 0.0F, 0.0F);
  
@@ -61,7 +60,7 @@
              p_78439_1_.func_78374_a((double)var11, 1.0D, (double)(0.0F - var7), (double)var10, (double)p_78439_3_);
              p_78439_1_.func_78374_a((double)var11, 1.0D, 0.0D, (double)var10, (double)p_78439_3_);
              p_78439_1_.func_78374_a((double)var11, 0.0D, 0.0D, (double)var10, (double)p_78439_5_);
-@@ -153,11 +165,11 @@
+@@ -160,11 +173,11 @@
          p_78439_1_.func_78382_b();
          p_78439_1_.func_78375_b(0.0F, 1.0F, 0.0F);
  
@@ -78,7 +77,7 @@
              p_78439_1_.func_78374_a(0.0D, (double)var11, 0.0D, (double)p_78439_2_, (double)var10);
              p_78439_1_.func_78374_a((double)var6, (double)var11, 0.0D, (double)p_78439_4_, (double)var10);
              p_78439_1_.func_78374_a((double)var6, (double)var11, (double)(0.0F - var7), (double)p_78439_4_, (double)var10);
-@@ -168,10 +180,10 @@
+@@ -175,10 +188,10 @@
          p_78439_1_.func_78382_b();
          p_78439_1_.func_78375_b(0.0F, -1.0F, 0.0F);
  
diff --git a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
index 457425f5e..65ac30b36 100644
--- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@@ -1,24 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/Minecraft.java
 +++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
-@@ -15,7 +15,9 @@
- import java.text.DecimalFormat;
- import java.util.HashMap;
- import java.util.List;
-+
- import javax.swing.JPanel;
-+
- import net.minecraft.src.AchievementList;
- import net.minecraft.src.AnvilSaveConverter;
- import net.minecraft.src.AxisAlignedBB;
-@@ -122,6 +124,7 @@
- import net.minecraft.src.WorldInfo;
- import net.minecraft.src.WorldRenderer;
- import net.minecraft.src.WorldSettings;
-+
- import org.lwjgl.LWJGLException;
- import org.lwjgl.Sys;
- import org.lwjgl.input.Keyboard;
-@@ -134,6 +137,12 @@
+@@ -61,6 +61,12 @@
  import org.lwjgl.opengl.GLContext;
  import org.lwjgl.opengl.PixelFormat;
  import org.lwjgl.util.glu.GLU;
@@ -31,7 +13,7 @@
  
  @SideOnly(Side.CLIENT)
  public abstract class Minecraft implements Runnable, IPlayerUsage
-@@ -316,7 +325,7 @@
+@@ -243,7 +249,7 @@
          this.func_71357_I();
          this.field_71466_p = new FontRenderer(this.field_71474_y, "/font/default.png", this.field_71446_o, false);
          this.field_71464_q = new FontRenderer(this.field_71474_y, "/font/alternate.png", this.field_71446_o, false);
@@ -40,7 +22,7 @@
          if (this.field_71474_y.field_74363_ab != null)
          {
              StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab);
-@@ -361,6 +370,8 @@
+@@ -288,6 +294,8 @@
          GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
          this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
  
@@ -49,7 +31,7 @@
          try
          {
              this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this);
-@@ -389,6 +400,7 @@
+@@ -316,6 +324,7 @@
          {
              this.func_71352_k();
          }
@@ -57,7 +39,7 @@
      }
  
      private void func_71357_I() throws LWJGLException
-@@ -747,9 +759,11 @@
+@@ -674,9 +683,11 @@
  
              if (!this.field_71454_w)
              {
@@ -69,7 +51,7 @@
              }
  
              GL11.glFlush();
-@@ -1279,11 +1293,13 @@
+@@ -1206,11 +1217,13 @@
  
      public void func_71407_l()
      {
@@ -83,7 +65,7 @@
          this.field_71424_I.func_76320_a("stats");
          this.field_71413_E.func_77449_e();
          this.field_71424_I.func_76318_c("gui");
-@@ -1739,6 +1755,7 @@
+@@ -1666,6 +1679,7 @@
              this.field_71453_ak.func_74428_b();
          }
  
@@ -91,7 +73,7 @@
          this.field_71424_I.func_76319_b();
          this.field_71423_H = func_71386_F();
      }
-@@ -1993,6 +2010,12 @@
+@@ -1920,6 +1934,12 @@
  
      public static void main(String[] p_main_0_)
      {
diff --git a/fml/patches/minecraft/net/minecraft/client/MinecraftApplet.java.patch b/fml/patches/minecraft/net/minecraft/client/MinecraftApplet.java.patch
index 4a754ec50..ec6de2f84 100644
--- a/fml/patches/minecraft/net/minecraft/client/MinecraftApplet.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/MinecraftApplet.java.patch
@@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/client/MinecraftApplet.java
 +++ ../src-work/minecraft/net/minecraft/client/MinecraftApplet.java
-@@ -5,6 +5,8 @@
+@@ -2,6 +2,8 @@
+ 
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
++import cpw.mods.fml.relauncher.FMLRelauncher;
++
  import java.applet.Applet;
  import java.awt.BorderLayout;
  import java.awt.Canvas;
-+
-+import cpw.mods.fml.relauncher.FMLRelauncher;
- import net.minecraft.src.CanvasMinecraftApplet;
- import net.minecraft.src.MinecraftAppletImpl;
- import net.minecraft.src.Session;
-@@ -17,6 +19,11 @@
+@@ -14,6 +16,11 @@
      private Thread field_71482_c = null;
  
      public void init()
@@ -21,7 +21,7 @@
      {
          this.field_71483_a = new CanvasMinecraftApplet(this);
          boolean var1 = "true".equalsIgnoreCase(this.getParameter("fullscreen"));
-@@ -64,6 +71,11 @@
+@@ -61,6 +68,11 @@
  
      public void start()
      {
diff --git a/fml/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch b/fml/patches/minecraft/net/minecraft/client/NetClientHandler.java.patch
similarity index 82%
rename from fml/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch
rename to fml/patches/minecraft/net/minecraft/client/NetClientHandler.java.patch
index 8bf0183b8..beb866656 100644
--- a/fml/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/NetClientHandler.java.patch
@@ -1,5 +1,5 @@
---- ../src-base/minecraft/net/minecraft/src/NetClientHandler.java
-+++ ../src-work/minecraft/net/minecraft/src/NetClientHandler.java
+--- ../src-base/minecraft/net/minecraft/client/NetClientHandler.java
++++ ../src-work/minecraft/net/minecraft/client/NetClientHandler.java
 @@ -2,6 +2,8 @@
  
  import cpw.mods.fml.common.Side;
@@ -9,7 +9,7 @@
  import java.io.BufferedReader;
  import java.io.ByteArrayInputStream;
  import java.io.DataInputStream;
-@@ -37,11 +39,14 @@
+@@ -154,11 +156,14 @@
      public int field_72556_d = 20;
      Random field_72557_e = new Random();
  
@@ -24,7 +24,7 @@
      }
  
      public NetClientHandler(Minecraft p_i3104_1_, IntegratedServer p_i3104_2_) throws IOException
-@@ -49,6 +54,7 @@
+@@ -166,6 +171,7 @@
          this.field_72563_h = p_i3104_1_;
          this.field_72555_g = new MemoryConnection(this);
          p_i3104_2_.func_71343_a().func_71754_a((MemoryConnection)this.field_72555_g, p_i3104_1_.field_71449_j.field_74286_b);
@@ -32,15 +32,15 @@
      }
  
      public void func_72547_c()
-@@ -119,6 +125,7 @@
+@@ -236,6 +242,7 @@
  
      public void func_72513_a(Packet252SharedKey p_72513_1_)
      {
-+        this.func_72552_c(FMLNetworkHandler.getFMLFakeLoginPacket());
++    	this.func_72552_c(FMLNetworkHandler.getFMLFakeLoginPacket());
          this.func_72552_c(new Packet205ClientCommand(0));
      }
  
-@@ -134,6 +141,7 @@
+@@ -251,6 +258,7 @@
          this.field_72563_h.field_71439_g.field_70157_k = p_72455_1_.field_73561_a;
          this.field_72556_d = p_72455_1_.field_73562_h;
          this.field_72563_h.field_71442_b.func_78746_a(p_72455_1_.field_73557_d);
@@ -48,23 +48,15 @@
          this.field_72563_h.field_71474_y.func_82879_c();
      }
  
-@@ -580,6 +588,7 @@
-         {
-             this.field_72555_g.func_74429_a(p_72546_1_);
-             this.field_72555_g.func_74423_d();
-+            FMLNetworkHandler.onConnectionClosed(this.field_72555_g, this.getPlayer());
-         }
-     }
- 
-@@ -619,6 +628,7 @@
+@@ -736,6 +744,7 @@
  
      public void func_72481_a(Packet3Chat p_72481_1_)
      {
-+        p_72481_1_ = FMLNetworkHandler.handleChatMessage(this, p_72481_1_);
++    	FMLNetworkHandler.onConnectionClosed(this.field_72555_g, this.getPlayer());
          this.field_72563_h.field_71456_v.func_73827_b().func_73765_a(p_72481_1_.field_73476_b);
      }
  
-@@ -1108,6 +1118,11 @@
+@@ -1225,6 +1234,11 @@
  
      public void func_72494_a(Packet131MapData p_72494_1_)
      {
@@ -76,7 +68,7 @@
          if (p_72494_1_.field_73438_a == Item.field_77744_bd.field_77779_bT)
          {
              ItemMap.func_77874_a(p_72494_1_.field_73436_b, this.field_72563_h.field_71441_e).func_76192_a(p_72494_1_.field_73437_c);
-@@ -1217,6 +1232,11 @@
+@@ -1334,6 +1348,11 @@
  
      public void func_72501_a(Packet250CustomPayload p_72501_1_)
      {
@@ -88,7 +80,7 @@
          if ("MC|TPack".equals(p_72501_1_.field_73630_a))
          {
              String[] var2 = (new String(p_72501_1_.field_73629_c)).split("\u0000");
-@@ -1261,4 +1281,20 @@
+@@ -1378,4 +1397,20 @@
      {
          return this.field_72555_g;
      }
diff --git a/fml/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/fml/patches/minecraft/net/minecraft/client/RenderBlocks.java.patch
similarity index 95%
rename from fml/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
rename to fml/patches/minecraft/net/minecraft/client/RenderBlocks.java.patch
index af3bc9706..1094efca3 100644
--- a/fml/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/RenderBlocks.java.patch
@@ -1,6 +1,15 @@
---- ../src-base/minecraft/net/minecraft/src/RenderBlocks.java
-+++ ../src-work/minecraft/net/minecraft/src/RenderBlocks.java
-@@ -184,7 +184,81 @@
+--- ../src-base/minecraft/net/minecraft/client/RenderBlocks.java
++++ ../src-work/minecraft/net/minecraft/client/RenderBlocks.java
+@@ -33,6 +33,8 @@
+ import net.minecraft.shared.MathHelper;
+ import net.minecraft.shared.Vec3;
+ import net.minecraft.shared.World;
++import net.minecraft.src.FMLRenderAccessLibrary;
++
+ import org.lwjgl.opengl.GL11;
+ import org.lwjgl.opengl.GL12;
+ 
+@@ -214,7 +216,81 @@
          int var5 = p_78612_1_.func_71857_b();
          p_78612_1_.func_71902_a(this.field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_);
          this.func_83018_a(p_78612_1_);
@@ -83,7 +92,7 @@
      }
  
      public boolean func_78567_v(Block p_78567_1_, int p_78567_2_, int p_78567_3_, int p_78567_4_)
-@@ -6510,6 +6584,10 @@
+@@ -6540,6 +6616,10 @@
                  this.func_83020_a(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
                  this.func_78595_a();
              }
@@ -94,7 +103,7 @@
          }
          else
          {
-@@ -6568,6 +6646,36 @@
+@@ -6598,6 +6678,36 @@
  
      public static boolean func_78597_b(int p_78597_0_)
      {
diff --git a/fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/fml/patches/minecraft/net/minecraft/client/RenderEngine.java.patch
similarity index 78%
rename from fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch
rename to fml/patches/minecraft/net/minecraft/client/RenderEngine.java.patch
index d87f5c738..98b892d6c 100644
--- a/fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/RenderEngine.java.patch
@@ -1,6 +1,10 @@
---- ../src-base/minecraft/net/minecraft/src/RenderEngine.java
-+++ ../src-work/minecraft/net/minecraft/src/RenderEngine.java
-@@ -3,6 +3,7 @@
+--- ../src-base/minecraft/net/minecraft/client/RenderEngine.java
++++ ../src-work/minecraft/net/minecraft/client/RenderEngine.java
+@@ -1,8 +1,11 @@
+ package net.minecraft.client;
+ 
++import cpw.mods.fml.client.TextureFXManager;
++import cpw.mods.fml.common.FMLLog;
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
  import java.awt.Color;
@@ -8,7 +12,7 @@
  import java.awt.Graphics;
  import java.awt.image.BufferedImage;
  import java.awt.image.ImageObserver;
-@@ -15,8 +16,14 @@
+@@ -15,6 +18,9 @@
  import java.util.Iterator;
  import java.util.List;
  import java.util.Map;
@@ -16,14 +20,9 @@
 +import java.util.logging.Logger;
 +
  import javax.imageio.ImageIO;
+ import net.minecraft.shared.IntHashMap;
  import org.lwjgl.opengl.GL11;
-+
-+import cpw.mods.fml.client.TextureFXManager;
-+import cpw.mods.fml.common.FMLLog;
- 
- @SideOnly(Side.CLIENT)
- public class RenderEngine
-@@ -33,6 +40,7 @@
+@@ -34,6 +40,7 @@
      public boolean field_78361_b = false;
      public TexturePackList field_78366_k;
      private BufferedImage field_78364_l = new BufferedImage(64, 64, 2);
@@ -31,7 +30,7 @@
  
      public RenderEngine(TexturePackList p_i3192_1_, GameSettings p_i3192_2_)
      {
-@@ -97,8 +105,9 @@
+@@ -98,8 +105,9 @@
                  this.field_78359_d.put(p_78346_1_, var7);
                  return var7;
              }
@@ -39,11 +38,11 @@
 -            {
 +            catch (Exception var6)
 +            {
-+                log.log(Level.INFO, String.format("An error occured reading texture file %s (getTexture)", p_78346_1_), var6);
++            	log.log(Level.INFO, String.format("An error occured reading texture file %s (getTexture)", p_78346_1_), var6);
                  var6.printStackTrace();
                  int[] var5 = this.func_78348_b(this.field_78364_l);
                  this.field_78359_d.put(p_78346_1_, var5);
-@@ -245,6 +254,7 @@
+@@ -246,6 +254,7 @@
  
          int var3 = p_78351_1_.getWidth();
          int var4 = p_78351_1_.getHeight();
@@ -51,15 +50,15 @@
          int[] var5 = new int[var3 * var4];
          byte[] var6 = new byte[var3 * var4 * 4];
          p_78351_1_.getRGB(0, 0, var3, var4, var5, 0, var3);
-@@ -405,6 +415,7 @@
+@@ -406,6 +415,7 @@
  
      public void func_78355_a(TextureFX p_78355_1_)
      {
-+        TextureFXManager.instance().onPreRegisterEffect(p_78355_1_);
++    	TextureFXManager.instance().onPreRegisterEffect(p_78355_1_);
          this.field_78367_h.add(p_78355_1_);
          p_78355_1_.func_76846_a();
      }
-@@ -417,28 +428,44 @@
+@@ -418,28 +428,44 @@
          {
              TextureFX var3 = (TextureFX)this.field_78367_h.get(var2);
              var3.field_76851_c = this.field_78365_j.field_74337_g;
@@ -104,16 +103,16 @@
  
          for (int var3 = 0; var3 < p_82772_1_.field_76849_e; ++var3)
          {
-+            int xOffset = p_82772_1_.field_76850_b % 16 * tWidth + var3 * tWidth;
++        	int xOffset = p_82772_1_.field_76850_b % 16 * tWidth + var3 * tWidth;
              for (int var4 = 0; var4 < p_82772_1_.field_76849_e; ++var4)
              {
 -                GL11.glTexSubImage2D(GL11.GL_TEXTURE_2D, 0, p_82772_1_.field_76850_b % 16 * 16 + var3 * 16, p_82772_1_.field_76850_b / 16 * 16 + var4 * 16, 16, 16, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, this.field_78358_g);
-+                int yOffset = p_82772_1_.field_76850_b / 16 * tHeight + var4 * tHeight;
-+                GL11.glTexSubImage2D(GL11.GL_TEXTURE_2D, 0, xOffset, yOffset, tWidth, tHeight, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, this.field_78358_g);
++            	int yOffset = p_82772_1_.field_76850_b / 16 * tHeight + var4 * tHeight;
++            	GL11.glTexSubImage2D(GL11.GL_TEXTURE_2D, 0, xOffset, yOffset, tWidth, tHeight, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, this.field_78358_g);
              }
          }
  
-@@ -504,8 +531,9 @@
+@@ -505,8 +531,9 @@
                  this.field_78361_b = false;
                  this.field_78363_a = false;
              }
@@ -121,11 +120,11 @@
 -            {
 +            catch (Exception var7)
 +            {
-+                log.log(Level.INFO,String.format("An error occured reading texture file %s (refreshTexture)", var9),var7);
++            	log.log(Level.INFO,String.format("An error occured reading texture file %s (refreshTexture)", var9), var7);
                  var7.printStackTrace();
              }
          }
-@@ -541,8 +569,9 @@
+@@ -542,8 +569,9 @@
                  this.field_78361_b = false;
                  this.field_78363_a = false;
              }
@@ -133,7 +132,7 @@
 -            {
 +            catch (Exception var6)
 +            {
-+                log.log(Level.INFO,String.format("An error occured reading texture file data %s (refreshTexture)", var9),var6);
++            	log.log(Level.INFO,String.format("An error occured reading texture file data %s (refreshTexture)", var9), var6);
                  var6.printStackTrace();
              }
          }
diff --git a/fml/patches/minecraft/net/minecraft/src/TextureCompassFX.java.patch b/fml/patches/minecraft/net/minecraft/client/TextureCompassFX.java.patch
similarity index 91%
rename from fml/patches/minecraft/net/minecraft/src/TextureCompassFX.java.patch
rename to fml/patches/minecraft/net/minecraft/client/TextureCompassFX.java.patch
index 5e9d8a52b..2765f6be3 100644
--- a/fml/patches/minecraft/net/minecraft/src/TextureCompassFX.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/TextureCompassFX.java.patch
@@ -1,14 +1,14 @@
---- ../src-base/minecraft/net/minecraft/src/TextureCompassFX.java
-+++ ../src-work/minecraft/net/minecraft/src/TextureCompassFX.java
+--- ../src-base/minecraft/net/minecraft/client/TextureCompassFX.java
++++ ../src-work/minecraft/net/minecraft/client/TextureCompassFX.java
 @@ -1,5 +1,6 @@
- package net.minecraft.src;
+ package net.minecraft.client;
  
 +import cpw.mods.fml.client.FMLTextureFX;
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
  import java.awt.image.BufferedImage;
-@@ -8,26 +9,41 @@
- import net.minecraft.client.Minecraft;
+@@ -9,13 +10,17 @@
+ import net.minecraft.shared.Item;
  
  @SideOnly(Side.CLIENT)
 -public class TextureCompassFX extends TextureFX
@@ -26,10 +26,10 @@
  
      public TextureCompassFX(Minecraft p_i3212_1_)
      {
-         super(Item.field_77750_aQ.func_77617_a(0));
+@@ -23,12 +28,24 @@
          this.field_76865_g = p_i3212_1_;
          this.field_76847_f = 1;
--
+ 
 +        setup();
 +    }
 +
@@ -55,7 +55,7 @@
          }
          catch (IOException var5)
          {
-@@ -56,7 +72,7 @@
+@@ -57,7 +74,7 @@
          int var17;
          int var16;
  
@@ -64,7 +64,7 @@
          {
              int var11 = var8[var10] >> 24 & 255;
              int var12 = var8[var10] >> 16 & 255;
-@@ -139,11 +155,12 @@
+@@ -140,11 +157,11 @@
          int var24;
          int var26;
  
@@ -78,11 +78,10 @@
 +            var17 = (int)((stileSizeBase >> 1) + 0.5D + var31 * (double)var16 * 0.3D);
 +            var18 = (int)((stileSizeBase >> 1) - 0.5D - var30 * (double)var16 * 0.3D * 0.5D);
 +            var19 = var18 * stileSizeBase + var17;
-+
              var20 = 100;
              var21 = 100;
              var22 = 100;
-@@ -165,11 +182,12 @@
+@@ -166,11 +183,11 @@
              var9[var19 * 4 + 3] = (byte)var23;
          }
  
@@ -96,7 +95,6 @@
 +            var17 = (int)((stileSizeBase >> 1) + 0.5D + var30 * (double)var16 * 0.3D);
 +            var18 = (int)((stileSizeBase >> 1) - 0.5D + var31 * (double)var16 * 0.3D * 0.5D);
 +            var19 = var18 * stileSizeBase + var17;
-+            
              var20 = var16 >= 0 ? 255 : 100;
              var21 = var16 >= 0 ? 20 : 100;
              var22 = var16 >= 0 ? 20 : 100;
diff --git a/fml/patches/minecraft/net/minecraft/src/TextureFlamesFX.java.patch b/fml/patches/minecraft/net/minecraft/client/TextureFlamesFX.java.patch
similarity index 92%
rename from fml/patches/minecraft/net/minecraft/src/TextureFlamesFX.java.patch
rename to fml/patches/minecraft/net/minecraft/client/TextureFlamesFX.java.patch
index cff37f719..5fbbf1d14 100644
--- a/fml/patches/minecraft/net/minecraft/src/TextureFlamesFX.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/TextureFlamesFX.java.patch
@@ -1,11 +1,12 @@
---- ../src-base/minecraft/net/minecraft/src/TextureFlamesFX.java
-+++ ../src-work/minecraft/net/minecraft/src/TextureFlamesFX.java
-@@ -1,17 +1,31 @@
- package net.minecraft.src;
+--- ../src-base/minecraft/net/minecraft/client/TextureFlamesFX.java
++++ ../src-work/minecraft/net/minecraft/client/TextureFlamesFX.java
+@@ -1,18 +1,32 @@
+ package net.minecraft.client;
  
 +import cpw.mods.fml.client.FMLTextureFX;
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
+ import net.minecraft.shared.Block;
  
  @SideOnly(Side.CLIENT)
 -public class TextureFlamesFX extends TextureFX
@@ -33,15 +34,14 @@
      }
  
      public void func_76846_a()
-@@ -20,31 +34,36 @@
+@@ -20,32 +34,34 @@
+         int var3;
          float var4;
          int var6;
++        float fireFactor1 = 3.0F + (float)(tileSizeBase >> 4);
++        float fireFactor2 = 1.01F + (0.8F / tileSizeBase);
  
 -        for (int var1 = 0; var1 < 16; ++var1)
-+        float fireFactor1 = 3.0F + (float)(tileSizeBase >> 4);
-+        
-+        float fireFactor2 = 1.01F + (0.8F / tileSizeBase);
-+
 +        for (int var1 = 0; var1 < tileSizeBase; ++var1)
          {
 -            for (int var2 = 0; var2 < 20; ++var2)
@@ -50,7 +50,6 @@
 -                var3 = 18;
 -                var4 = this.field_76869_g[var1 + (var2 + 1) % 20 * 16] * (float)var3;
 +                var3 = fireTileSize - (tileSizeBase >> 3);
-+
 +                var4 = this.field_76869_g[var1 + (var2 + 1) % fireTileSize * tileSizeBase] * (float)var3;
  
                  for (int var5 = var1 - 1; var5 <= var1 + 1; ++var5)
@@ -79,7 +78,7 @@
                  }
              }
          }
-@@ -53,7 +72,7 @@
+@@ -54,7 +70,7 @@
          this.field_76870_h = this.field_76869_g;
          this.field_76869_g = var13;
  
diff --git a/fml/patches/minecraft/net/minecraft/src/TextureLavaFX.java.patch b/fml/patches/minecraft/net/minecraft/client/TextureLavaFX.java.patch
similarity index 91%
rename from fml/patches/minecraft/net/minecraft/src/TextureLavaFX.java.patch
rename to fml/patches/minecraft/net/minecraft/client/TextureLavaFX.java.patch
index 05088ccd4..eac7081e7 100644
--- a/fml/patches/minecraft/net/minecraft/src/TextureLavaFX.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/TextureLavaFX.java.patch
@@ -1,11 +1,13 @@
---- ../src-base/minecraft/net/minecraft/src/TextureLavaFX.java
-+++ ../src-work/minecraft/net/minecraft/src/TextureLavaFX.java
-@@ -1,10 +1,11 @@
- package net.minecraft.src;
+--- ../src-base/minecraft/net/minecraft/client/TextureLavaFX.java
++++ ../src-work/minecraft/net/minecraft/client/TextureLavaFX.java
+@@ -1,12 +1,13 @@
+ package net.minecraft.client;
  
 +import cpw.mods.fml.client.FMLTextureFX;
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
+ import net.minecraft.shared.Block;
+ import net.minecraft.shared.MathHelper;
  
  @SideOnly(Side.CLIENT)
 -public class TextureLavaFX extends TextureFX
@@ -13,11 +15,11 @@
  {
      protected float[] field_76876_g = new float[256];
      protected float[] field_76878_h = new float[256];
-@@ -14,6 +15,17 @@
+@@ -16,6 +17,17 @@
      public TextureLavaFX()
      {
          super(Block.field_71944_C.field_72059_bZ);
-+		setup();
++        setup();
 +    }
 +
 +    @Override
@@ -31,7 +33,7 @@
      }
  
      public void func_76846_a()
-@@ -26,9 +38,9 @@
+@@ -28,9 +40,9 @@
          int var8;
          int var9;
  
@@ -43,7 +45,7 @@
              {
                  var3 = 0.0F;
                  int var4 = (int)(MathHelper.func_76126_a((float)var2 * (float)Math.PI * 2.0F / 16.0F) * 1.2F);
-@@ -38,25 +50,25 @@
+@@ -40,25 +52,25 @@
                  {
                      for (var7 = var2 - 1; var7 <= var2 + 1; ++var7)
                      {
@@ -78,7 +80,7 @@
                  }
              }
          }
-@@ -65,7 +77,7 @@
+@@ -67,7 +79,7 @@
          this.field_76878_h = this.field_76876_g;
          this.field_76876_g = var11;
  
diff --git a/fml/patches/minecraft/net/minecraft/src/TextureLavaFlowFX.java.patch b/fml/patches/minecraft/net/minecraft/client/TextureLavaFlowFX.java.patch
similarity index 92%
rename from fml/patches/minecraft/net/minecraft/src/TextureLavaFlowFX.java.patch
rename to fml/patches/minecraft/net/minecraft/client/TextureLavaFlowFX.java.patch
index 8e47c17fb..b7cbbc686 100644
--- a/fml/patches/minecraft/net/minecraft/src/TextureLavaFlowFX.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/TextureLavaFlowFX.java.patch
@@ -1,11 +1,13 @@
---- ../src-base/minecraft/net/minecraft/src/TextureLavaFlowFX.java
-+++ ../src-work/minecraft/net/minecraft/src/TextureLavaFlowFX.java
-@@ -1,10 +1,11 @@
- package net.minecraft.src;
+--- ../src-base/minecraft/net/minecraft/client/TextureLavaFlowFX.java
++++ ../src-work/minecraft/net/minecraft/client/TextureLavaFlowFX.java
+@@ -1,12 +1,13 @@
+ package net.minecraft.client;
  
 +import cpw.mods.fml.client.FMLTextureFX;
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
+ import net.minecraft.shared.Block;
+ import net.minecraft.shared.MathHelper;
  
  @SideOnly(Side.CLIENT)
 -public class TextureLavaFlowFX extends TextureFX
@@ -13,7 +15,7 @@
  {
      protected float[] field_76871_g = new float[256];
      protected float[] field_76874_h = new float[256];
-@@ -16,6 +17,18 @@
+@@ -18,6 +19,18 @@
      {
          super(Block.field_71944_C.field_72059_bZ + 1);
          this.field_76849_e = 2;
@@ -32,7 +34,7 @@
      }
  
      public void func_76846_a()
-@@ -29,9 +42,9 @@
+@@ -31,9 +44,9 @@
          int var8;
          int var9;
  
@@ -44,7 +46,7 @@
              {
                  var3 = 0.0F;
                  int var4 = (int)(MathHelper.func_76126_a((float)var2 * (float)Math.PI * 2.0F / 16.0F) * 1.2F);
-@@ -41,25 +54,25 @@
+@@ -43,25 +56,25 @@
                  {
                      for (var7 = var2 - 1; var7 <= var2 + 1; ++var7)
                      {
@@ -79,7 +81,7 @@
                  }
              }
          }
-@@ -68,9 +81,9 @@
+@@ -70,9 +83,9 @@
          this.field_76874_h = this.field_76871_g;
          this.field_76871_g = var11;
  
diff --git a/fml/patches/minecraft/net/minecraft/src/TexturePortalFX.java.patch b/fml/patches/minecraft/net/minecraft/client/TexturePortalFX.java.patch
similarity index 90%
rename from fml/patches/minecraft/net/minecraft/src/TexturePortalFX.java.patch
rename to fml/patches/minecraft/net/minecraft/client/TexturePortalFX.java.patch
index 15b10fb91..dedcf9ff0 100644
--- a/fml/patches/minecraft/net/minecraft/src/TexturePortalFX.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/TexturePortalFX.java.patch
@@ -1,12 +1,14 @@
---- ../src-base/minecraft/net/minecraft/src/TexturePortalFX.java
-+++ ../src-work/minecraft/net/minecraft/src/TexturePortalFX.java
-@@ -1,35 +1,44 @@
- package net.minecraft.src;
+--- ../src-base/minecraft/net/minecraft/client/TexturePortalFX.java
++++ ../src-work/minecraft/net/minecraft/client/TexturePortalFX.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.client;
  
 +import cpw.mods.fml.client.FMLTextureFX;
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
  import java.util.Random;
+@@ -7,31 +8,39 @@
+ import net.minecraft.shared.MathHelper;
  
  @SideOnly(Side.CLIENT)
 -public class TexturePortalFX extends TextureFX
@@ -53,7 +55,7 @@
  
                          if (var9 < -1.0F)
                          {
-@@ -63,7 +72,7 @@
+@@ -65,7 +74,7 @@
                      int var13 = (int)(var5 * var5 * 200.0F + 55.0F);
                      int var14 = (int)(var5 * var5 * var5 * var5 * 255.0F);
                      int var15 = (int)(var5 * 100.0F + 155.0F);
@@ -62,7 +64,7 @@
                      this.field_76854_h[var2][var16 * 4 + 0] = (byte)var13;
                      this.field_76854_h[var2][var16 * 4 + 1] = (byte)var14;
                      this.field_76854_h[var2][var16 * 4 + 2] = (byte)var6;
-@@ -78,7 +87,7 @@
+@@ -80,7 +89,7 @@
          ++this.field_76853_g;
          byte[] var1 = this.field_76854_h[this.field_76853_g & 31];
  
diff --git a/fml/patches/minecraft/net/minecraft/src/TextureWatchFX.java.patch b/fml/patches/minecraft/net/minecraft/client/TextureWatchFX.java.patch
similarity index 70%
rename from fml/patches/minecraft/net/minecraft/src/TextureWatchFX.java.patch
rename to fml/patches/minecraft/net/minecraft/client/TextureWatchFX.java.patch
index 143ccf689..02c4e293d 100644
--- a/fml/patches/minecraft/net/minecraft/src/TextureWatchFX.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/TextureWatchFX.java.patch
@@ -1,7 +1,7 @@
---- ../src-base/minecraft/net/minecraft/src/TextureWatchFX.java
-+++ ../src-work/minecraft/net/minecraft/src/TextureWatchFX.java
+--- ../src-base/minecraft/net/minecraft/client/TextureWatchFX.java
++++ ../src-work/minecraft/net/minecraft/client/TextureWatchFX.java
 @@ -1,14 +1,20 @@
- package net.minecraft.src;
+ package net.minecraft.client;
  
 +import cpw.mods.fml.client.FMLTextureFX;
  import cpw.mods.fml.common.Side;
@@ -14,7 +14,7 @@
 +import java.util.logging.Level;
 +
  import javax.imageio.ImageIO;
- import net.minecraft.client.Minecraft;
+ import net.minecraft.shared.Item;
  
  @SideOnly(Side.CLIENT)
 -public class TextureWatchFX extends TextureFX
@@ -68,15 +68,6 @@
          }
      }
  
-@@ -44,7 +68,7 @@
-         if (this.field_76860_g.field_71441_e != null && this.field_76860_g.field_71439_g != null)
-         {
-             float var3 = this.field_76860_g.field_71441_e.func_72826_c(1.0F);
--            var1 = (double)(-var3 * (float)Math.PI * 2.0F);
-+            var1 = (double) (-var3 * (float) Math.PI * 2.0F);
- 
-             if (!this.field_76860_g.field_71441_e.field_73011_w.func_76569_d())
-             {
 @@ -80,7 +104,7 @@
          double var5 = Math.sin(this.field_76861_j);
          double var7 = Math.cos(this.field_76861_j);
@@ -92,30 +83,15 @@
              {
 -                double var14 = -((double)(var9 % 16) / 15.0D - 0.5D);
 -                double var16 = (double)(var9 / 16) / 15.0D - 0.5D;
-+                double var14 = -((double) (var9 % tileSizeBase) / tileSizeMask - 0.5D);
-+                double var16 = (double) (var9 / tileSizeBase) / tileSizeMask - 0.5D;
++                double var14 = -((double)(var9 % tileSizeSquare) / tileSizeMask - 0.5D);
++                double var16 = (double)(var9 / tileSizeSquare) / tileSizeMask - 0.5D;
                  int var18 = var11;
 -                int var19 = (int)((var14 * var7 + var16 * var5 + 0.5D) * 16.0D);
 -                int var20 = (int)((var16 * var7 - var14 * var5 + 0.5D) * 16.0D);
 -                int var21 = (var19 & 15) + (var20 & 15) * 16;
-+                int var19 = (int) ((var14 * var7 + var16 * var5 + 0.5D) * tileSizeBase);
-+                int var20 = (int) ((var16 * var7 - var14 * var5 + 0.5D) * tileSizeBase);
-+                int var21 = (var19 & tileSizeMask) + (var20 & tileSizeMask) * tileSizeBase;
++                int var19 = (int)((var14 * var7 + var16 * var5 + 0.5D) * tileSizeSquare);
++                int var20 = (int)((var16 * var7 - var14 * var5 + 0.5D) * tileSizeSquare);
++                int var21 = (var19 & tileSizeMask) + (var20 & tileSizeMask) * tileSizeSquare;
                  var10 = this.field_76864_i[var21] >> 24 & 255;
                  var11 = (this.field_76864_i[var21] >> 16 & 255) * var11 / 255;
                  var12 = (this.field_76864_i[var21] >> 8 & 255) * var18 / 255;
-@@ -111,10 +135,10 @@
-                 var13 = var24;
-             }
- 
--            this.field_76852_a[var9 * 4 + 0] = (byte)var11;
--            this.field_76852_a[var9 * 4 + 1] = (byte)var12;
--            this.field_76852_a[var9 * 4 + 2] = (byte)var13;
--            this.field_76852_a[var9 * 4 + 3] = (byte)var10;
-+            this.field_76852_a[var9 * 4 + 0] = (byte) var11;
-+            this.field_76852_a[var9 * 4 + 1] = (byte) var12;
-+            this.field_76852_a[var9 * 4 + 2] = (byte) var13;
-+            this.field_76852_a[var9 * 4 + 3] = (byte) var10;
-         }
-     }
- }
diff --git a/fml/patches/minecraft/net/minecraft/src/TextureWaterFX.java.patch b/fml/patches/minecraft/net/minecraft/client/TextureWaterFX.java.patch
similarity index 92%
rename from fml/patches/minecraft/net/minecraft/src/TextureWaterFX.java.patch
rename to fml/patches/minecraft/net/minecraft/client/TextureWaterFX.java.patch
index d87585b09..b60f0a222 100644
--- a/fml/patches/minecraft/net/minecraft/src/TextureWaterFX.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/TextureWaterFX.java.patch
@@ -1,11 +1,12 @@
---- ../src-base/minecraft/net/minecraft/src/TextureWaterFX.java
-+++ ../src-work/minecraft/net/minecraft/src/TextureWaterFX.java
-@@ -1,10 +1,11 @@
- package net.minecraft.src;
+--- ../src-base/minecraft/net/minecraft/client/TextureWaterFX.java
++++ ../src-work/minecraft/net/minecraft/client/TextureWaterFX.java
+@@ -1,11 +1,12 @@
+ package net.minecraft.client;
  
 +import cpw.mods.fml.client.FMLTextureFX;
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
+ import net.minecraft.shared.Block;
  
  @SideOnly(Side.CLIENT)
 -public class TextureWaterFX extends TextureFX
@@ -13,13 +14,13 @@
  {
      protected float[] field_76855_g = new float[256];
      protected float[] field_76858_h = new float[256];
-@@ -15,8 +16,20 @@
+@@ -16,6 +17,18 @@
      public TextureWaterFX()
      {
          super(Block.field_71942_A.field_72059_bZ);
 +        setup();
-     }
- 
++    }
++
 +    @Override
 +    public void setup()
 +    {
@@ -29,12 +30,10 @@
 +        field_76859_i = new float[tileSizeSquare];
 +        field_76856_j = new float[tileSizeSquare];
 +        field_76857_k = 0;
-+    }
-+    
+     }
+ 
      public void func_76846_a()
-     {
-         ++this.field_76857_k;
-@@ -26,39 +39,39 @@
+@@ -27,39 +40,39 @@
          int var5;
          int var6;
  
@@ -87,7 +86,7 @@
                  }
              }
          }
-@@ -67,7 +80,7 @@
+@@ -68,7 +81,7 @@
          this.field_76858_h = this.field_76855_g;
          this.field_76855_g = var12;
  
diff --git a/fml/patches/minecraft/net/minecraft/src/TextureWaterFlowFX.java.patch b/fml/patches/minecraft/net/minecraft/client/TextureWaterFlowFX.java.patch
similarity index 92%
rename from fml/patches/minecraft/net/minecraft/src/TextureWaterFlowFX.java.patch
rename to fml/patches/minecraft/net/minecraft/client/TextureWaterFlowFX.java.patch
index 3120c2c60..d252fe5b6 100644
--- a/fml/patches/minecraft/net/minecraft/src/TextureWaterFlowFX.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/TextureWaterFlowFX.java.patch
@@ -1,11 +1,12 @@
---- ../src-base/minecraft/net/minecraft/src/TextureWaterFlowFX.java
-+++ ../src-work/minecraft/net/minecraft/src/TextureWaterFlowFX.java
-@@ -1,10 +1,11 @@
- package net.minecraft.src;
+--- ../src-base/minecraft/net/minecraft/client/TextureWaterFlowFX.java
++++ ../src-work/minecraft/net/minecraft/client/TextureWaterFlowFX.java
+@@ -1,11 +1,12 @@
+ package net.minecraft.client;
  
 +import cpw.mods.fml.client.FMLTextureFX;
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
+ import net.minecraft.shared.Block;
  
  @SideOnly(Side.CLIENT)
 -public class TextureWaterFlowFX extends TextureFX
@@ -13,7 +14,7 @@
  {
      protected float[] field_76880_g = new float[256];
      protected float[] field_76883_h = new float[256];
-@@ -16,6 +17,18 @@
+@@ -17,6 +18,18 @@
      {
          super(Block.field_71942_A.field_72059_bZ + 1);
          this.field_76849_e = 2;
@@ -32,7 +33,7 @@
      }
  
      public void func_76846_a()
-@@ -27,39 +40,39 @@
+@@ -28,39 +41,39 @@
          int var5;
          int var6;
  
@@ -85,7 +86,7 @@
                  }
              }
          }
-@@ -68,9 +81,9 @@
+@@ -69,9 +82,9 @@
          this.field_76883_h = this.field_76880_g;
          this.field_76880_g = var12;
  
diff --git a/fml/patches/minecraft/net/minecraft/src/IBossDisplayData.java.patch b/fml/patches/minecraft/net/minecraft/src/IBossDisplayData.java.patch
deleted file mode 100644
index 5c8b1f964..000000000
--- a/fml/patches/minecraft/net/minecraft/src/IBossDisplayData.java.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../src-base/minecraft/net/minecraft/src/IBossDisplayData.java
-+++ ../src-work/minecraft/net/minecraft/src/IBossDisplayData.java
-@@ -1,9 +1,5 @@
- package net.minecraft.src;
- 
--import cpw.mods.fml.common.Side;
--import cpw.mods.fml.common.asm.SideOnly;
--
--@SideOnly(Side.CLIENT)
- public interface IBossDisplayData
- {
-     int func_70667_aM();