diff --git a/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java b/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java
index 195bea0bc5..f5fe2f0500 100644
--- a/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java
+++ b/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java
@@ -192,7 +192,7 @@ public class MCPMerger
                 {
                     if (!copyToServer.contains(name))
                     {
-                        copyEntry(cInJar, cEntry, cOutJar);
+                        copyClass(cInJar, cEntry, cOutJar, null, true);
                         cAdded.add(name);
                     }
                     else
@@ -228,7 +228,7 @@ public class MCPMerger
             {
                 if (!copyToClient.contains(entry.getKey()))
                 {
-                    copyEntry(sInJar, entry.getValue(), sOutJar);
+                    copyClass(sInJar, entry.getValue(), null, sOutJar, false);
                 }
                 else
                 {
@@ -287,18 +287,28 @@ public class MCPMerger
         ClassNode classNode = new ClassNode();
 
         reader.accept(classNode, 0);
-        if (classNode.visibleAnnotations == null) classNode.visibleAnnotations = new ArrayList<AnnotationNode>();
-        classNode.visibleAnnotations.add(getSideAnn(isClientOnly));
+
+        if (!classNode.name.equals("ayn")) //Special case CodecMus so I dont have to make a new patch, anyone who uses this in production code is.. bad.
+        {
+            if (classNode.visibleAnnotations == null) classNode.visibleAnnotations = new ArrayList<AnnotationNode>();
+            classNode.visibleAnnotations.add(getSideAnn(isClientOnly));
+        }
 
         ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
         classNode.accept(writer);
         byte[] data = writer.toByteArray();
 
         ZipEntry newEntry = new ZipEntry(entry.getName());
-        outJar.putNextEntry(newEntry);
-        outJar.write(data);
-        outJar2.putNextEntry(newEntry);
-        outJar2.write(data);
+        if (outJar != null)
+        {
+            outJar.putNextEntry(newEntry);
+            outJar.write(data);
+        }
+        if (outJar2 != null)
+        {
+            outJar2.putNextEntry(newEntry);
+            outJar2.write(data);
+        }
     }
 
     private static AnnotationNode getSideAnn(boolean isClientOnly)
@@ -324,7 +334,9 @@ public class MCPMerger
             String entryName = entry.getName();
             if (!entryName.endsWith(".class") || entryName.startsWith("."))
             {
-                copyEntry(inFile, entry, outFile);
+                ZipEntry newEntry = new ZipEntry(entry.getName());
+                outFile.putNextEntry(newEntry);
+                outFile.write(readEntry(inFile, entry));
             }
             else
             {
@@ -333,12 +345,6 @@ public class MCPMerger
         }
         return ret;
     }
-    private static void copyEntry(ZipFile inFile, ZipEntry entry, ZipOutputStream outFile) throws IOException
-    {
-        ZipEntry newEntry = new ZipEntry(entry.getName());
-        outFile.putNextEntry(newEntry);
-        outFile.write(readEntry(inFile, entry));
-    }
     private static byte[] readEntry(ZipFile inFile, ZipEntry entry) throws IOException
     {
         return readFully(inFile.getInputStream(entry));
diff --git a/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java b/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java
index cb90572b4d..27b89c60ad 100644
--- a/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java
+++ b/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java
@@ -27,6 +27,15 @@ public class SideTransformer implements IClassTransformer
         ClassReader classReader = new ClassReader(bytes);
         classReader.accept(classNode, 0);
 
+        if (remove((List<AnnotationNode>)classNode.visibleAnnotations, SIDE))
+        {
+            if (DEBUG)
+            {
+                System.out.println(String.format("Attempted to load class %s for invalid side %s", classNode.name, SIDE));
+            }
+            return null;
+        }
+
         Iterator<FieldNode> fields = classNode.fields.iterator();
         while(fields.hasNext())
         {
diff --git a/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch b/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
index e8b1e31acf..4d89b8af7f 100644
--- a/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
+++ b/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/ClientBrandRetriever.java
 +++ ../src-work/minecraft/net/minecraft/client/ClientBrandRetriever.java
-@@ -4,6 +4,6 @@
+@@ -8,6 +8,6 @@
  {
      public static String getClientModName()
      {
diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
index bd5f40214e..0911f82643 100644
--- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/Minecraft.java
 +++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
-@@ -13,7 +13,9 @@
+@@ -15,7 +15,9 @@
  import java.text.DecimalFormat;
  import java.util.HashMap;
  import java.util.List;
@@ -10,7 +10,7 @@
  import net.minecraft.src.AchievementList;
  import net.minecraft.src.AnvilSaveConverter;
  import net.minecraft.src.AxisAlignedBB;
-@@ -114,6 +116,7 @@
+@@ -116,6 +118,7 @@
  import net.minecraft.src.WorldInfo;
  import net.minecraft.src.WorldRenderer;
  import net.minecraft.src.WorldSettings;
@@ -18,7 +18,7 @@
  import org.lwjgl.LWJGLException;
  import org.lwjgl.Sys;
  import org.lwjgl.input.Keyboard;
-@@ -125,6 +128,12 @@
+@@ -127,6 +130,12 @@
  import org.lwjgl.opengl.GLContext;
  import org.lwjgl.opengl.PixelFormat;
  import org.lwjgl.util.glu.GLU;
@@ -29,9 +29,9 @@
 +import cpw.mods.fml.relauncher.ArgsWrapper;
 +import cpw.mods.fml.relauncher.FMLRelauncher;
  
+ @SideOnly(Side.CLIENT)
  public abstract class Minecraft implements Runnable, IPlayerUsage
- {
-@@ -305,7 +314,7 @@
+@@ -308,7 +317,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 +40,7 @@
          if (this.field_71474_y.field_74363_ab != null)
          {
              StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab);
-@@ -350,6 +359,8 @@
+@@ -353,6 +362,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 +49,7 @@
          try
          {
              this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this);
-@@ -378,6 +389,7 @@
+@@ -381,6 +392,7 @@
          {
              this.func_71352_k();
          }
@@ -57,7 +57,7 @@
      }
  
      private void func_71357_I() throws LWJGLException
-@@ -738,9 +750,11 @@
+@@ -741,9 +753,11 @@
  
              if (!this.field_71454_w)
              {
@@ -69,7 +69,7 @@
              }
  
              GL11.glFlush();
-@@ -1261,11 +1275,13 @@
+@@ -1264,11 +1278,13 @@
  
      public void func_71407_l()
      {
@@ -83,7 +83,7 @@
          this.field_71424_I.func_76320_a("stats");
          this.field_71413_E.func_77449_e();
          this.field_71424_I.func_76318_c("gui");
-@@ -1633,6 +1649,7 @@
+@@ -1636,6 +1652,7 @@
              this.field_71453_ak.func_74428_b();
          }
  
@@ -91,7 +91,7 @@
          this.field_71424_I.func_76319_b();
          this.field_71423_H = func_71386_F();
      }
-@@ -1883,6 +1900,12 @@
+@@ -1886,6 +1903,12 @@
  
      public static void main(String[] p_main_0_)
      {
diff --git a/patches/minecraft/net/minecraft/client/MinecraftApplet.java.patch b/patches/minecraft/net/minecraft/client/MinecraftApplet.java.patch
index 2ee40fc121..7a879dd9ab 100644
--- a/patches/minecraft/net/minecraft/client/MinecraftApplet.java.patch
+++ b/patches/minecraft/net/minecraft/client/MinecraftApplet.java.patch
@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/MinecraftApplet.java
 +++ ../src-work/minecraft/net/minecraft/client/MinecraftApplet.java
-@@ -3,6 +3,8 @@
+@@ -5,6 +5,8 @@
  import java.applet.Applet;
  import java.awt.BorderLayout;
  import java.awt.Canvas;
@@ -9,7 +9,7 @@
  import net.minecraft.src.CanvasMinecraftApplet;
  import net.minecraft.src.MinecraftAppletImpl;
  import net.minecraft.src.Session;
-@@ -14,6 +16,11 @@
+@@ -17,6 +19,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"));
-@@ -60,6 +67,11 @@
+@@ -63,6 +70,11 @@
  
      public void start()
      {
diff --git a/patches/minecraft/net/minecraft/src/GuiCreateWorld.java.patch b/patches/minecraft/net/minecraft/src/GuiCreateWorld.java.patch
index e870719f3b..a92def98d2 100644
--- a/patches/minecraft/net/minecraft/src/GuiCreateWorld.java.patch
+++ b/patches/minecraft/net/minecraft/src/GuiCreateWorld.java.patch
@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/src/GuiCreateWorld.java
 +++ ../src-work/minecraft/net/minecraft/src/GuiCreateWorld.java
-@@ -196,7 +196,7 @@
+@@ -199,7 +199,7 @@
                          var2 = (long)var4.hashCode();
                      }
                  }
diff --git a/patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch b/patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch
index 04007d4dc7..e9aa2890e1 100644
--- a/patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch
+++ b/patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch
@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/src/GuiMainMenu.java
 +++ ../src-work/minecraft/net/minecraft/src/GuiMainMenu.java
-@@ -8,10 +8,17 @@
+@@ -10,10 +10,17 @@
  import java.util.ArrayList;
  import java.util.Calendar;
  import java.util.Date;
@@ -16,9 +16,9 @@
 +import cpw.mods.fml.client.GuiModList;
 +import cpw.mods.fml.common.FMLCommonHandler;
  
+ @SideOnly(Side.CLIENT)
  public class GuiMainMenu extends GuiScreen
- {
-@@ -118,7 +125,8 @@
+@@ -121,7 +128,8 @@
              this.func_73969_a(var4, 24, var2);
          }
  
@@ -28,7 +28,7 @@
  
          if (this.field_73882_e.field_71448_m)
          {
-@@ -182,6 +190,11 @@
+@@ -185,6 +193,11 @@
          if (p_73875_1_.field_73741_f == 4)
          {
              this.field_73882_e.func_71400_g();
@@ -40,7 +40,7 @@
          }
  
          if (p_73875_1_.field_73741_f == 11)
-@@ -400,7 +413,14 @@
+@@ -403,7 +416,14 @@
              var9 = var9 + " Demo";
          }
  
diff --git a/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch b/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch
index f3a4dd0bc9..da4b5c54a9 100644
--- a/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch
+++ b/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch
@@ -1,7 +1,7 @@
 --- ../src-base/minecraft/net/minecraft/src/IntegratedServer.java
 +++ ../src-work/minecraft/net/minecraft/src/IntegratedServer.java
-@@ -2,6 +2,8 @@
- 
+@@ -4,6 +4,8 @@
+ import cpw.mods.fml.common.asm.SideOnly;
  import java.io.File;
  import java.io.IOException;
 +
@@ -9,7 +9,7 @@
  import net.minecraft.client.Minecraft;
  import net.minecraft.server.MinecraftServer;
  
-@@ -94,6 +96,7 @@
+@@ -97,6 +99,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.func_71205_p(this.func_71214_G() + " - " + this.field_71305_c[0].func_72912_H().func_76065_j());
diff --git a/patches/minecraft/net/minecraft/src/MemoryConnection.java.patch b/patches/minecraft/net/minecraft/src/MemoryConnection.java.patch
index 95003d7935..380ee655f7 100644
--- a/patches/minecraft/net/minecraft/src/MemoryConnection.java.patch
+++ b/patches/minecraft/net/minecraft/src/MemoryConnection.java.patch
@@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/src/MemoryConnection.java
 +++ ../src-work/minecraft/net/minecraft/src/MemoryConnection.java
-@@ -6,6 +6,8 @@
+@@ -8,6 +8,8 @@
  import java.util.ArrayList;
  import java.util.Collections;
  import java.util.List;
 +
 +import cpw.mods.fml.common.network.FMLNetworkHandler;
  
+ @SideOnly(Side.CLIENT)
  public class MemoryConnection implements NetworkManager
- {
-@@ -67,6 +69,7 @@
+@@ -70,6 +72,7 @@
          if (this.field_74441_e && this.field_74442_b.isEmpty())
          {
              this.field_74440_d.func_72515_a(this.field_74438_f, this.field_74439_g);
diff --git a/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch b/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch
index 653b23a2da..bfcc4f39f9 100644
--- a/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch
+++ b/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch
@@ -1,16 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/src/NetClientHandler.java
 +++ ../src-work/minecraft/net/minecraft/src/NetClientHandler.java
-@@ -20,6 +20,9 @@
- import net.minecraft.client.Minecraft;
- import org.lwjgl.input.Keyboard;
+@@ -2,6 +2,8 @@
  
-+import cpw.mods.fml.common.LoaderException;
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
 +import cpw.mods.fml.common.network.FMLNetworkHandler;
 +
- public class NetClientHandler extends NetHandler
- {
-     private boolean field_72554_f = false;
-@@ -39,6 +42,7 @@
+ import java.io.BufferedReader;
+ import java.io.ByteArrayInputStream;
+ import java.io.DataInputStream;
+@@ -42,6 +44,7 @@
          this.field_72563_h = p_i3103_1_;
          Socket var4 = new Socket(InetAddress.getByName(p_i3103_2_), p_i3103_3_);
          this.field_72555_g = new TcpConnection(var4, "Client", this);
@@ -18,7 +17,7 @@
      }
  
      public NetClientHandler(Minecraft p_i3104_1_, IntegratedServer p_i3104_2_) throws IOException
-@@ -46,6 +50,7 @@
+@@ -49,6 +52,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);
@@ -26,7 +25,7 @@
      }
  
      public void func_72547_c()
-@@ -116,6 +121,7 @@
+@@ -119,6 +123,7 @@
  
      public void func_72513_a(Packet252SharedKey p_72513_1_)
      {
@@ -34,7 +33,7 @@
          this.func_72552_c(new Packet205ClientCommand(0));
      }
  
-@@ -131,6 +137,7 @@
+@@ -134,6 +139,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);
@@ -42,7 +41,7 @@
          this.func_72552_c(new Packet204ClientInfo(this.field_72563_h.field_71474_y.field_74363_ab, this.field_72563_h.field_71474_y.field_74339_e, this.field_72563_h.field_71474_y.field_74343_n, this.field_72563_h.field_71474_y.field_74344_o, this.field_72563_h.field_71474_y.field_74318_M));
      }
  
-@@ -1164,6 +1171,11 @@
+@@ -1167,6 +1173,11 @@
  
      public void func_72501_a(Packet250CustomPayload p_72501_1_)
      {
@@ -54,7 +53,7 @@
          if ("MC|TPack".equals(p_72501_1_.field_73630_a))
          {
              String[] var2 = (new String(p_72501_1_.field_73629_c)).split("\u0000");
-@@ -1208,4 +1220,10 @@
+@@ -1211,4 +1222,10 @@
      {
          return this.field_72555_g;
      }
diff --git a/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
index 40f7c411a4..2ae5362871 100644
--- a/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
+++ b/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/src/RenderBlocks.java
 +++ ../src-work/minecraft/net/minecraft/src/RenderBlocks.java
-@@ -126,7 +126,73 @@
+@@ -129,7 +129,73 @@
      {
          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_);
@@ -75,7 +75,7 @@
      }
  
      public boolean func_78567_v(Block p_78567_1_, int p_78567_2_, int p_78567_3_, int p_78567_4_)
-@@ -5991,6 +6057,10 @@
+@@ -5994,6 +6060,10 @@
  
                  p_78600_1_.func_71905_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
              }
@@ -86,7 +86,7 @@
          }
          else
          {
-@@ -6048,6 +6118,30 @@
+@@ -6051,6 +6121,30 @@
  
      public static boolean func_78597_b(int p_78597_0_)
      {
diff --git a/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/patches/minecraft/net/minecraft/src/RenderEngine.java.patch
index 9827584ce9..0a9ea84daa 100644
--- a/patches/minecraft/net/minecraft/src/RenderEngine.java.patch
+++ b/patches/minecraft/net/minecraft/src/RenderEngine.java.patch
@@ -1,14 +1,14 @@
 --- ../src-base/minecraft/net/minecraft/src/RenderEngine.java
 +++ ../src-work/minecraft/net/minecraft/src/RenderEngine.java
-@@ -1,6 +1,7 @@
- package net.minecraft.src;
- 
+@@ -3,6 +3,7 @@
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
  import java.awt.Color;
 +import java.awt.Dimension;
  import java.awt.Graphics;
  import java.awt.image.BufferedImage;
  import java.awt.image.ImageObserver;
-@@ -13,8 +14,14 @@
+@@ -15,8 +16,14 @@
  import java.util.Iterator;
  import java.util.List;
  import java.util.Map;
@@ -21,9 +21,9 @@
 +import cpw.mods.fml.client.TextureFXManager;
 +import cpw.mods.fml.common.FMLLog;
  
+ @SideOnly(Side.CLIENT)
  public class RenderEngine
- {
-@@ -30,6 +37,7 @@
+@@ -33,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 +31,7 @@
  
      public RenderEngine(TexturePackList p_i3192_1_, GameSettings p_i3192_2_)
      {
-@@ -94,8 +102,9 @@
+@@ -97,8 +105,9 @@
                  this.field_78359_d.put(p_78346_1_, var7);
                  return var7;
              }
@@ -43,7 +43,7 @@
                  var6.printStackTrace();
                  int[] var5 = this.func_78348_b(this.field_78364_l);
                  this.field_78359_d.put(p_78346_1_, var5);
-@@ -242,6 +251,7 @@
+@@ -245,6 +254,7 @@
  
          int var3 = p_78351_1_.getWidth();
          int var4 = p_78351_1_.getHeight();
@@ -51,7 +51,7 @@
          int[] var5 = new int[var3 * var4];
          byte[] var6 = new byte[var3 * var4 * 4];
          p_78351_1_.getRGB(0, 0, var3, var4, var5, 0, var3);
-@@ -397,6 +407,7 @@
+@@ -400,6 +410,7 @@
  
      public void func_78355_a(TextureFX p_78355_1_)
      {
@@ -59,7 +59,7 @@
          this.field_78367_h.add(p_78355_1_);
          p_78355_1_.func_76846_a();
      }
-@@ -404,16 +415,31 @@
+@@ -407,16 +418,31 @@
      public void func_78343_a()
      {
          int var1 = -1;
@@ -100,7 +100,7 @@
  
              if (var3.field_76850_b != var1)
              {
-@@ -423,9 +449,11 @@
+@@ -426,9 +452,11 @@
  
              for (int var4 = 0; var4 < var3.field_76849_e; ++var4)
              {
@@ -113,7 +113,7 @@
                  }
              }
          }
-@@ -490,8 +518,9 @@
+@@ -493,8 +521,9 @@
                  this.field_78361_b = false;
                  this.field_78363_a = false;
              }
@@ -125,7 +125,7 @@
                  var7.printStackTrace();
              }
          }
-@@ -527,8 +556,9 @@
+@@ -530,8 +559,9 @@
                  this.field_78361_b = false;
                  this.field_78363_a = false;
              }
diff --git a/patches/minecraft/net/minecraft/src/TextureCompassFX.java.patch b/patches/minecraft/net/minecraft/src/TextureCompassFX.java.patch
index 5e13964c7a..3e3dffcca1 100644
--- a/patches/minecraft/net/minecraft/src/TextureCompassFX.java.patch
+++ b/patches/minecraft/net/minecraft/src/TextureCompassFX.java.patch
@@ -1,18 +1,22 @@
 --- ../src-base/minecraft/net/minecraft/src/TextureCompassFX.java
 +++ ../src-work/minecraft/net/minecraft/src/TextureCompassFX.java
-@@ -3,9 +3,10 @@
- import java.awt.image.BufferedImage;
- import java.io.IOException;
- import javax.imageio.ImageIO;
+@@ -1,5 +1,6 @@
+ package net.minecraft.src;
+ 
 +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,7 +9,7 @@
  import net.minecraft.client.Minecraft;
  
+ @SideOnly(Side.CLIENT)
 -public class TextureCompassFX extends TextureFX
 +public class TextureCompassFX extends FMLTextureFX
  {
      private Minecraft field_76865_g;
      private int[] field_76867_h = new int[256];
-@@ -17,13 +18,19 @@
+@@ -20,13 +21,19 @@
          super(Item.field_77750_aQ.func_77617_a(0));
          this.field_76865_g = p_i3212_1_;
          this.field_76847_f = 1;
@@ -37,7 +41,7 @@
          }
          catch (IOException var5)
          {
-@@ -33,7 +40,7 @@
+@@ -36,7 +43,7 @@
  
      public void func_76846_a()
      {
@@ -46,7 +50,7 @@
          {
              int var2 = this.field_76867_h[var1] >> 24 & 255;
              int var3 = this.field_76867_h[var1] >> 16 & 255;
-@@ -110,11 +117,11 @@
+@@ -113,11 +120,11 @@
          int var19;
          int var18;
  
@@ -62,7 +66,7 @@
              var13 = 100;
              var14 = 100;
              var15 = 100;
-@@ -136,11 +143,11 @@
+@@ -139,11 +146,11 @@
              this.field_76852_a[var12 * 4 + 3] = (byte)var16;
          }
  
diff --git a/patches/minecraft/net/minecraft/src/TextureFlamesFX.java.patch b/patches/minecraft/net/minecraft/src/TextureFlamesFX.java.patch
index dc667c213e..cff37f7190 100644
--- a/patches/minecraft/net/minecraft/src/TextureFlamesFX.java.patch
+++ b/patches/minecraft/net/minecraft/src/TextureFlamesFX.java.patch
@@ -1,23 +1,25 @@
 --- ../src-base/minecraft/net/minecraft/src/TextureFlamesFX.java
 +++ ../src-work/minecraft/net/minecraft/src/TextureFlamesFX.java
-@@ -1,13 +1,29 @@
+@@ -1,17 +1,31 @@
  package net.minecraft.src;
  
--public class TextureFlamesFX extends TextureFX
 +import cpw.mods.fml.client.FMLTextureFX;
-+
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
+ 
+ @SideOnly(Side.CLIENT)
+-public class TextureFlamesFX extends TextureFX
 +public class TextureFlamesFX extends FMLTextureFX
  {
      protected float[] field_76869_g = new float[320];
      protected float[] field_76870_h = new float[320];
 +    private int fireTileSize = 20;
 +    private int fireGridSize = 320;
-+
  
      public TextureFlamesFX(int p_i3215_1_)
      {
          super(Block.field_72067_ar.field_72059_bZ + p_i3215_1_ * 16);
-+		setup();
++        setup();
 +    }
 +
 +    @Override
@@ -31,7 +33,7 @@
      }
  
      public void func_76846_a()
-@@ -16,31 +32,36 @@
+@@ -20,31 +34,36 @@
          float var4;
          int var6;
  
@@ -77,7 +79,7 @@
                  }
              }
          }
-@@ -49,7 +70,7 @@
+@@ -53,7 +72,7 @@
          this.field_76870_h = this.field_76869_g;
          this.field_76869_g = var13;
  
diff --git a/patches/minecraft/net/minecraft/src/TextureLavaFX.java.patch b/patches/minecraft/net/minecraft/src/TextureLavaFX.java.patch
index 4c69b43803..05088ccd4d 100644
--- a/patches/minecraft/net/minecraft/src/TextureLavaFX.java.patch
+++ b/patches/minecraft/net/minecraft/src/TextureLavaFX.java.patch
@@ -1,16 +1,19 @@
 --- ../src-base/minecraft/net/minecraft/src/TextureLavaFX.java
 +++ ../src-work/minecraft/net/minecraft/src/TextureLavaFX.java
-@@ -1,6 +1,8 @@
+@@ -1,10 +1,11 @@
  package net.minecraft.src;
  
--public class TextureLavaFX extends TextureFX
 +import cpw.mods.fml.client.FMLTextureFX;
-+
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
+ 
+ @SideOnly(Side.CLIENT)
+-public class TextureLavaFX extends TextureFX
 +public class TextureLavaFX extends FMLTextureFX
  {
      protected float[] field_76876_g = new float[256];
      protected float[] field_76878_h = new float[256];
-@@ -10,6 +12,17 @@
+@@ -14,6 +15,17 @@
      public TextureLavaFX()
      {
          super(Block.field_71944_C.field_72059_bZ);
@@ -28,7 +31,7 @@
      }
  
      public void func_76846_a()
-@@ -22,9 +35,9 @@
+@@ -26,9 +38,9 @@
          int var8;
          int var9;
  
@@ -40,7 +43,7 @@
              {
                  var3 = 0.0F;
                  int var4 = (int)(MathHelper.func_76126_a((float)var2 * (float)Math.PI * 2.0F / 16.0F) * 1.2F);
-@@ -34,25 +47,25 @@
+@@ -38,25 +50,25 @@
                  {
                      for (var7 = var2 - 1; var7 <= var2 + 1; ++var7)
                      {
@@ -75,7 +78,7 @@
                  }
              }
          }
-@@ -61,7 +74,7 @@
+@@ -65,7 +77,7 @@
          this.field_76878_h = this.field_76876_g;
          this.field_76876_g = var11;
  
diff --git a/patches/minecraft/net/minecraft/src/TextureLavaFlowFX.java.patch b/patches/minecraft/net/minecraft/src/TextureLavaFlowFX.java.patch
index a7e74849e5..8e47c17fb6 100644
--- a/patches/minecraft/net/minecraft/src/TextureLavaFlowFX.java.patch
+++ b/patches/minecraft/net/minecraft/src/TextureLavaFlowFX.java.patch
@@ -1,16 +1,19 @@
 --- ../src-base/minecraft/net/minecraft/src/TextureLavaFlowFX.java
 +++ ../src-work/minecraft/net/minecraft/src/TextureLavaFlowFX.java
-@@ -1,6 +1,8 @@
+@@ -1,10 +1,11 @@
  package net.minecraft.src;
  
--public class TextureLavaFlowFX extends TextureFX
 +import cpw.mods.fml.client.FMLTextureFX;
-+
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
+ 
+ @SideOnly(Side.CLIENT)
+-public class TextureLavaFlowFX extends TextureFX
 +public class TextureLavaFlowFX extends FMLTextureFX
  {
      protected float[] field_76871_g = new float[256];
      protected float[] field_76874_h = new float[256];
-@@ -12,6 +14,18 @@
+@@ -16,6 +17,18 @@
      {
          super(Block.field_71944_C.field_72059_bZ + 1);
          this.field_76849_e = 2;
@@ -29,7 +32,7 @@
      }
  
      public void func_76846_a()
-@@ -25,9 +39,9 @@
+@@ -29,9 +42,9 @@
          int var8;
          int var9;
  
@@ -41,7 +44,7 @@
              {
                  var3 = 0.0F;
                  int var4 = (int)(MathHelper.func_76126_a((float)var2 * (float)Math.PI * 2.0F / 16.0F) * 1.2F);
-@@ -37,25 +51,25 @@
+@@ -41,25 +54,25 @@
                  {
                      for (var7 = var2 - 1; var7 <= var2 + 1; ++var7)
                      {
@@ -76,7 +79,7 @@
                  }
              }
          }
-@@ -64,9 +78,9 @@
+@@ -68,9 +81,9 @@
          this.field_76874_h = this.field_76871_g;
          this.field_76871_g = var11;
  
diff --git a/patches/minecraft/net/minecraft/src/TexturePortalFX.java.patch b/patches/minecraft/net/minecraft/src/TexturePortalFX.java.patch
index ef9f054224..15b10fb91d 100644
--- a/patches/minecraft/net/minecraft/src/TexturePortalFX.java.patch
+++ b/patches/minecraft/net/minecraft/src/TexturePortalFX.java.patch
@@ -1,12 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/src/TexturePortalFX.java
 +++ ../src-work/minecraft/net/minecraft/src/TexturePortalFX.java
-@@ -2,31 +2,41 @@
+@@ -1,35 +1,44 @@
+ package net.minecraft.src;
  
++import cpw.mods.fml.client.FMLTextureFX;
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
  import java.util.Random;
  
+ @SideOnly(Side.CLIENT)
 -public class TexturePortalFX extends TextureFX
-+import cpw.mods.fml.client.FMLTextureFX;
-+
 +public class TexturePortalFX extends FMLTextureFX
  {
      private int field_76853_g = 0;
@@ -16,8 +19,8 @@
      public TexturePortalFX()
      {
          super(Block.field_72015_be.field_72059_bZ);
-+		setup();
-+	}
++        setup();
++    }
 +
 +    @Override
 +    public void setup()
@@ -50,7 +53,7 @@
  
                          if (var9 < -1.0F)
                          {
-@@ -60,7 +70,7 @@
+@@ -63,7 +72,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);
@@ -59,7 +62,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;
-@@ -75,7 +85,7 @@
+@@ -78,7 +87,7 @@
          ++this.field_76853_g;
          byte[] var1 = this.field_76854_h[this.field_76853_g & 31];
  
diff --git a/patches/minecraft/net/minecraft/src/TextureWatchFX.java.patch b/patches/minecraft/net/minecraft/src/TextureWatchFX.java.patch
index 8ca3c4ce99..143ccf6895 100644
--- a/patches/minecraft/net/minecraft/src/TextureWatchFX.java.patch
+++ b/patches/minecraft/net/minecraft/src/TextureWatchFX.java.patch
@@ -1,8 +1,12 @@
 --- ../src-base/minecraft/net/minecraft/src/TextureWatchFX.java
 +++ ../src-work/minecraft/net/minecraft/src/TextureWatchFX.java
-@@ -1,11 +1,17 @@
+@@ -1,14 +1,20 @@
  package net.minecraft.src;
  
++import cpw.mods.fml.client.FMLTextureFX;
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
++
 +import java.awt.Graphics2D;
  import java.awt.image.BufferedImage;
 +import java.awt.image.ImageObserver;
@@ -10,16 +14,15 @@
 +import java.util.logging.Level;
 +
  import javax.imageio.ImageIO;
-+
-+import cpw.mods.fml.client.FMLTextureFX;
  import net.minecraft.client.Minecraft;
  
+ @SideOnly(Side.CLIENT)
 -public class TextureWatchFX extends TextureFX
 +public class TextureWatchFX extends FMLTextureFX
  {
      private Minecraft field_76860_g;
      private int[] field_76863_h = new int[256];
-@@ -18,19 +24,37 @@
+@@ -21,19 +27,37 @@
          super(Item.field_77752_aS.func_77617_a(0));
          this.field_76860_g = p_i3214_1_;
          this.field_76847_f = 1;
@@ -65,7 +68,7 @@
          }
      }
  
-@@ -41,7 +65,7 @@
+@@ -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);
@@ -74,7 +77,7 @@
  
              if (!this.field_76860_g.field_71441_e.field_73011_w.func_76569_d())
              {
-@@ -77,7 +101,7 @@
+@@ -80,7 +104,7 @@
          double var5 = Math.sin(this.field_76861_j);
          double var7 = Math.cos(this.field_76861_j);
  
@@ -83,7 +86,7 @@
          {
              int var10 = this.field_76863_h[var9] >> 24 & 255;
              int var11 = this.field_76863_h[var9] >> 16 & 255;
-@@ -86,12 +110,12 @@
+@@ -89,12 +113,12 @@
  
              if (var11 == var13 && var12 == 0 && var13 > 0)
              {
@@ -101,7 +104,7 @@
                  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;
-@@ -108,10 +132,10 @@
+@@ -111,10 +135,10 @@
                  var13 = var24;
              }
  
diff --git a/patches/minecraft/net/minecraft/src/TextureWaterFX.java.patch b/patches/minecraft/net/minecraft/src/TextureWaterFX.java.patch
index 67049f5d1e..d87585b095 100644
--- a/patches/minecraft/net/minecraft/src/TextureWaterFX.java.patch
+++ b/patches/minecraft/net/minecraft/src/TextureWaterFX.java.patch
@@ -1,20 +1,23 @@
 --- ../src-base/minecraft/net/minecraft/src/TextureWaterFX.java
 +++ ../src-work/minecraft/net/minecraft/src/TextureWaterFX.java
-@@ -1,6 +1,8 @@
+@@ -1,10 +1,11 @@
  package net.minecraft.src;
  
--public class TextureWaterFX extends TextureFX
 +import cpw.mods.fml.client.FMLTextureFX;
-+
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
+ 
+ @SideOnly(Side.CLIENT)
+-public class TextureWaterFX extends TextureFX
 +public class TextureWaterFX extends FMLTextureFX
  {
      protected float[] field_76855_g = new float[256];
      protected float[] field_76858_h = new float[256];
-@@ -11,8 +13,20 @@
+@@ -15,8 +16,20 @@
      public TextureWaterFX()
      {
          super(Block.field_71942_A.field_72059_bZ);
-+		setup();
++        setup();
      }
  
 +    @Override
@@ -31,7 +34,7 @@
      public void func_76846_a()
      {
          ++this.field_76857_k;
-@@ -22,39 +36,39 @@
+@@ -26,39 +39,39 @@
          int var5;
          int var6;
  
@@ -84,7 +87,7 @@
                  }
              }
          }
-@@ -63,7 +77,7 @@
+@@ -67,7 +80,7 @@
          this.field_76858_h = this.field_76855_g;
          this.field_76855_g = var12;
  
diff --git a/patches/minecraft/net/minecraft/src/TextureWaterFlowFX.java.patch b/patches/minecraft/net/minecraft/src/TextureWaterFlowFX.java.patch
index d86a37fa7c..3120c2c60b 100644
--- a/patches/minecraft/net/minecraft/src/TextureWaterFlowFX.java.patch
+++ b/patches/minecraft/net/minecraft/src/TextureWaterFlowFX.java.patch
@@ -1,20 +1,23 @@
 --- ../src-base/minecraft/net/minecraft/src/TextureWaterFlowFX.java
 +++ ../src-work/minecraft/net/minecraft/src/TextureWaterFlowFX.java
-@@ -1,6 +1,8 @@
+@@ -1,10 +1,11 @@
  package net.minecraft.src;
  
--public class TextureWaterFlowFX extends TextureFX
 +import cpw.mods.fml.client.FMLTextureFX;
-+
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
+ 
+ @SideOnly(Side.CLIENT)
+-public class TextureWaterFlowFX extends TextureFX
 +public class TextureWaterFlowFX extends FMLTextureFX
  {
      protected float[] field_76880_g = new float[256];
      protected float[] field_76883_h = new float[256];
-@@ -12,6 +14,18 @@
+@@ -16,6 +17,18 @@
      {
          super(Block.field_71942_A.field_72059_bZ + 1);
          this.field_76849_e = 2;
-+		setup();
++        setup();
 +    }
 +
 +    @Override
@@ -29,7 +32,7 @@
      }
  
      public void func_76846_a()
-@@ -23,39 +37,39 @@
+@@ -27,39 +40,39 @@
          int var5;
          int var6;
  
@@ -82,7 +85,7 @@
                  }
              }
          }
-@@ -64,9 +78,9 @@
+@@ -68,9 +81,9 @@
          this.field_76883_h = this.field_76880_g;
          this.field_76880_g = var12;