Stage 1 of merging the client and server for MCP.

Results:
Client: 362
Server: 3 (Only due to issues of FF decompilation inconsistancies)
Common: 910

Stage 2: Write runtime transformer to remove annotated fields/methods with invalid side annotation.

Author: LexManos

commands.patch

@@ -10,15 +10,25 @@
 
      def creatergcfg(self, reobf=False, keep_lvt=False, keep_generics=False, rg_update=False):
          """Create the files necessary for RetroGuard"""
-@@ -1039,6 +1042,7 @@
+@@ -779,7 +782,8 @@
+         testlk = {CLIENT: self.testclient, SERVER: self.testserver}
+ 
+         if not os.path.exists(os.path.join(srclk[side], os.path.normpath(testlk[side] + '.java'))):
+-            return False
++            if not os.path.exists(os.path.join(self.srcshared, os.path.normpath(testlk[side] + '.java'))):
++                return False
+         return True
+ 
+     def checkbins(self, side):
+@@ -1039,6 +1043,7 @@
              all_files = True
              append_pattern = False
          pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=append_pattern, all_files=all_files)
 +        pkglist = pkglist + filterdirs(self.srcshared, '*.java', append_pattern=append_pattern, all_files=all_files) #FML, Add Common folder
          dirs = ' '.join(pkglist)
          classpath = os.pathsep.join(cplk[side])
          forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side],
-@@ -1195,20 +1199,20 @@
+@@ -1195,20 +1200,20 @@
          with open(self.csvmethods, 'rb') as fh:
              methodsreader = csv.DictReader(fh)
              for row in methodsreader:
@@ -42,7 +52,7 @@
                          names['params'][row['param']] = row['name']
 
          regexps = {
-@@ -1238,6 +1242,11 @@
+@@ -1238,6 +1243,11 @@
 
          # HINT: We pathwalk the sources
          for path, _, filelist in os.walk(pathsrclk[side], followlinks=True):
@@ -54,7 +64,7 @@
              for cur_file in fnmatch.filter(filelist, '*.java'):
                  updatefile(os.path.normpath(os.path.join(path, cur_file)))
          return True
-@@ -1320,12 +1329,14 @@
+@@ -1320,12 +1330,14 @@
          pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
 
          strip_comments(pathsrclk[side])
@@ -69,7 +79,7 @@
 
      def process_javadoc(self, side):
          """Add CSV descriptions to methods and fields as javadoc"""
-@@ -1334,6 +1345,21 @@
+@@ -1334,6 +1346,21 @@
          if not self.has_doc_csv:
              self.logger.warning('!! javadoc disabled due to no csvs !!')
              return False
@@ -91,7 +101,7 @@
 
          #HINT: We read the relevant CSVs
          methodsreader = csv.DictReader(open(self.csvmethods, 'r'))
-@@ -1342,13 +1368,13 @@
+@@ -1342,13 +1369,13 @@
          methods = {}
          for row in methodsreader:
              #HINT: Only include methods that have a non-empty description
@@ -107,15 +117,15 @@
                  fields[row['searge']] = row['desc'].replace('*/', '* /')
 
          regexps = {
-@@ -1420,6 +1446,7 @@
+@@ -1420,6 +1447,7 @@
 
          # HINT: We create the list of source directories based on the list of packages
          pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=True)
 +        pkglist = pkglist + filterdirs(self.srcshared, '*.java', append_pattern=True) #FML, Add Common folder
          dirs = ' '.join(pkglist)
          forkcmd = self.cmdastyle.format(classes=dirs, conffile=self.astyleconf)
          self.runcmd(forkcmd)
-@@ -1592,6 +1619,9 @@
+@@ -1592,6 +1620,9 @@
                  sys.exit(1)
 
          for entry in newfiles:

common/cpw/mods/fml/common/asm/SideOnly.java

@@ -0,0 +1,14 @@
+package cpw.mods.fml.common.asm;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import cpw.mods.fml.common.Side;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR})
+public @interface SideOnly
+{
+    public Side side();
+}

common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java

@@ -269,21 +269,7 @@ public static void main(String[] args)
             System.out.println("Could not find target jar: " + orig);
             return;
         }
-/*
-        if (temp.exists())
-        {
-            if (orig.exists() && !orig.renameTo(new File(args[0] + (new SimpleDateFormat(".yyyy.MM.dd.HHmmss")).format(new Date()))))
-            {
-                System.out.println("Could not backup existing file: " + orig);
-                return;
-            }
-            if (!temp.renameTo(orig))
-            {
-                System.out.println("Could not restore backup from previous run: " + temp);
-                return;
-            }
-        }
-*/
+
         if (!orig.renameTo(temp))
         {
             System.out.println("Could not rename file: " + orig + " -> " + temp);