Merge branch 'minecraft132'

Yes, we are already on 1.3.2
2012-08-14 22:33:28 -04:00 · 2012-08-14 22:33:28 -04:00 · c1e0cbb7f1
commit c1e0cbb7f1
parent 75fb35b240 071caee228
30 changed files with 12854 additions and 12899 deletions
--- a/fml/commands.patch
+++ b/fml/commands.patch
@ -29,17 +29,18 @@
         return True
 
     def checkbins(self, side):
-@@ -1027,6 +1033,9 @@
+@@ -1027,6 +1033,10 @@
         pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
         pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
 
 +        if side == SERVER: #Disable server because FML recombines it into client
+            self.logger.info('Server side recompiling skipped, this is normal')
 +            return
 +        
         if not os.path.exists(pathbinlk[side]):
             os.makedirs(pathbinlk[side])
 
-@@ -1039,6 +1048,7 @@
+@@ -1039,6 +1049,7 @@
             all_files = True
             append_pattern = False
         pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=append_pattern, all_files=all_files)
@ -47,7 +48,7 @@
         dirs = ' '.join(pkglist)
         classpath = os.pathsep.join(cplk[side])
         forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side],
-@@ -1060,7 +1070,7 @@
+@@ -1060,7 +1071,7 @@
             raise
 
     def startserver(self):
@ -56,7 +57,7 @@
         classpath = [os.path.join('..', p) for p in classpath]
         classpath = os.pathsep.join(classpath)
         os.chdir(self.dirjars)
-@@ -1068,7 +1078,7 @@
+@@ -1068,7 +1079,7 @@
         self.runmc(forkcmd)
 
     def startclient(self):
@ -65,7 +66,7 @@
         classpath = [os.path.join('..', p) for p in classpath]
         classpath = os.pathsep.join(classpath)
         natives = os.path.join('..', self.dirnatives)
-@@ -1195,20 +1205,20 @@
+@@ -1195,20 +1206,20 @@
         with open(self.csvmethods, 'rb') as fh:
             methodsreader = csv.DictReader(fh)
             for row in methodsreader:
@ -89,7 +90,7 @@
                         names['params'][row['param']] = row['name']
 
         regexps = {
-@@ -1238,6 +1248,11 @@
+@@ -1238,6 +1249,11 @@
 
         # HINT: We pathwalk the sources
         for path, _, filelist in os.walk(pathsrclk[side], followlinks=True):
@ -101,7 +102,7 @@
             for cur_file in fnmatch.filter(filelist, '*.java'):
                 updatefile(os.path.normpath(os.path.join(path, cur_file)))
         return True
-@@ -1320,12 +1335,14 @@
+@@ -1320,12 +1336,14 @@
         pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
 
         strip_comments(pathsrclk[side])
@ -116,7 +117,7 @@
 
     def process_javadoc(self, side):
         """Add CSV descriptions to methods and fields as javadoc"""
-@@ -1334,6 +1351,21 @@
+@@ -1334,6 +1352,21 @@
         if not self.has_doc_csv:
             self.logger.warning('!! javadoc disabled due to no csvs !!')
             return False
@ -138,7 +139,7 @@
 
         #HINT: We read the relevant CSVs
         methodsreader = csv.DictReader(open(self.csvmethods, 'r'))
-@@ -1342,13 +1374,13 @@
+@@ -1342,13 +1375,13 @@
         methods = {}
         for row in methodsreader:
             #HINT: Only include methods that have a non-empty description
@ -154,7 +155,7 @@
                 fields[row['searge']] = row['desc'].replace('*/', '* /')
 
         regexps = {
-@@ -1420,12 +1452,13 @@
+@@ -1420,12 +1453,13 @@
 
         # HINT: We create the list of source directories based on the list of packages
         pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=True)
@ -169,7 +170,7 @@
         if not reobf:
             md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
         else:
-@@ -1440,6 +1473,9 @@
+@@ -1440,6 +1474,9 @@
                     class_path = ''
                 else:
                     class_path += '/'
@ -179,7 +180,7 @@
                 for class_file in fnmatch.filter(filelist, '*.class'):
                     class_name = class_path + os.path.splitext(class_file)[0]
                     bin_file = os.path.normpath(os.path.join(path, class_file))
-@@ -1592,6 +1628,9 @@
+@@ -1592,6 +1629,9 @@
                 sys.exit(1)
 
         for entry in newfiles:
@ -189,7 +190,7 @@
             if entry[3] == 'U':
                 self.logger.info('Retrieving file from server : %s', entry[0])
                 cur_file = os.path.normpath(entry[0])
-@@ -1654,3 +1693,6 @@
+@@ -1654,3 +1694,6 @@
                 except IOError:
                     self.logger.error('* File %s copy failed', in_class)
 
--- a/fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
+++ b/fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
@ -177,14 +177,18 @@ public class AccessTransformer implements IClassTransformer
            {
                for (FieldNode n : (List<FieldNode>) classNode.fields)
                {
-                    if (n.name.equals(m.name))
+                    if (n.name.equals(m.name) || m.name.equals("*"))
                    {
                        n.access = getFixedAccess(n.access, m);
                        if (DEBUG)
                        {
-                            System.out.println(String.format("Field: %s.%s %s -> %s", name, m.name, toBinary(m.oldAccess), toBinary(m.newAccess)));
+                            System.out.println(String.format("Field: %s.%s %s -> %s", name, n.name, toBinary(m.oldAccess), toBinary(m.newAccess)));
+                        }
+
+                        if (!m.name.equals("*"))
+                        {
+                            break;
                        }
-                        break;
                    }
                }
            }
@ -192,14 +196,18 @@ public class AccessTransformer implements IClassTransformer
            {
                for (MethodNode n : (List<MethodNode>) classNode.methods)
                {
-                    if (n.name.equals(m.name) && n.desc.equals(m.desc))
+                    if ((n.name.equals(m.name) && n.desc.equals(m.desc)) || m.name.equals("*"))
                    {
                        n.access = getFixedAccess(n.access, m);
                        if (DEBUG)
                        {
-                            System.out.println(String.format("Method: %s.%s%s %s -> %s", name, m.name, m.desc, toBinary(m.oldAccess), toBinary(m.newAccess)));
+                            System.out.println(String.format("Method: %s.%s%s %s -> %s", name, n.name, n.desc, toBinary(m.oldAccess), toBinary(m.newAccess)));
+                        }
+
+                        if (!m.name.equals("*"))
+                        {
+                            break;
                        }
-                        break;
                    }
                }
            }
--- a/fml/common/fml_at.cfg
+++ b/fml/common/fml_at.cfg
@ -1,201 +1,65 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public ajh.a(Ljava/lang/Class;Ljava/lang/String;)V
+public aji.a(Ljava/lang/Class;Ljava/lang/String;)V
 # EntityList addMappings
-public jq.a(Ljava/lang/Class;Ljava/lang/String;I)V
-public jq.a(Ljava/lang/Class;Ljava/lang/String;III)V
+public jr.a(Ljava/lang/Class;Ljava/lang/String;I)V
+public jr.a(Ljava/lang/Class;Ljava/lang/String;III)V
 # EntityList nameToClassMap and idToClassMap
-public jq.b
-public jq.d
+public jr.b
+public jr.d
 # RenderManager renderers
-public avx.o
+public avy.o
 # RenderBlocks - everything
-public avf.A
-public avf.B
-public avf.C
-public avf.D
-public avf.E
-public avf.F
-public avf.G
-public avf.H
-public avf.I
-public avf.J
-public avf.K
-public avf.L
-public avf.M
-public avf.N
-public avf.S
-public avf.T
-public avf.U
-public avf.V
-public avf.W
-public avf.X
-public avf.Y
-public avf.Z
-public avf.a
-public avf.aA
-public avf.aB
-public avf.aC
-public avf.aD
-public avf.aE
-public avf.aF
-public avf.aG
-public avf.aH
-public avf.aI
-public avf.aJ
-public avf.aK
-public avf.aL
-public avf.aM
-public avf.aN
-public avf.aO
-public avf.aa
-public avf.ab
-public avf.ac
-public avf.ad
-public avf.ae
-public avf.af
-public avf.ag
-public avf.ah
-public avf.ai
-public avf.aj
-public avf.ak
-public avf.al
-public avf.am
-public avf.an
-public avf.ao
-public avf.ap
-public avf.aq
-public avf.ar
-public avf.as
-public avf.at
-public avf.au
-public avf.av
-public avf.aw
-public avf.ax
-public avf.ay
-public avf.az
-public avf.b
-public avf.c
-public avf.d
-public avf.e
-public avf.f
-public avf.g
-public avf.h
-public avf.i
-public avf.j
-public avf.k
-public avf.l
-public avf.m
-public avf.n
-public avf.o
-public avf.p
-public avf.q
-public avf.r
-public avf.s
-public avf.t
-public avf.u
-public avf.v
-public avf.w
-public avf.x
-public avf.y
-public avf.z
-public avf.a()V
-public avf.a(DDDDDDFD)V
-public avf.a(IIII)I
-public avf.a(IIILacn;)F
-public avf.a(Laex;III)Z
-public avf.a(Lafc;III)Z
-public avf.a(Lafg;III)Z
-public avf.a(Lafq;III)Z
-public avf.a(Lafv;III)Z
-public avf.a(Lafw;III)Z
-public avf.a(Lahg;III)Z
-public avf.a(Laie;III)Z
-public avf.a(Laif;DDDDD)V
-public avf.a(Laif;DDDI)V
-public avf.a(Laif;IDDD)V
-public avf.a(Laif;IDDDD)V
-public avf.a(Laif;IF)V
-public avf.a(Laif;IIDDDD)V
-public avf.a(Laif;III)V
-public avf.a(Laif;IIIFFF)Z
-public avf.a(Laif;IIII)V
-public avf.a(Laif;IIIZ)V
-public avf.a(Laif;Luo;IIII)V
-public avf.b(DDDDDDFD)V
-public avf.b(I)Z
-public avf.b(Laif;DDDI)V
-public avf.b(Laif;IDDD)V
-public avf.b(Laif;III)Z
-public avf.b(Laif;IIIZ)Z
-public avf.c(DDDDDDFD)V
-public avf.c(Laif;DDDI)V
-public avf.c(Laif;III)Z
-public avf.c(Laif;IIIFFF)Z
-public avf.c(Laif;IIIZ)Z
-public avf.d(Laif;DDDI)V
-public avf.d(Laif;III)V
-public avf.d(Laif;IIIFFF)Z
-public avf.e(Laif;DDDI)V
-public avf.e(Laif;III)Z
-public avf.f(Laif;DDDI)V
-public avf.f(Laif;III)Z
-public avf.g(Laif;III)Z
-public avf.h(Laif;III)Z
-public avf.i(Laif;III)Z
-public avf.j(Laif;III)Z
-public avf.k(Laif;III)Z
-public avf.l(Laif;III)Z
-public avf.m(Laif;III)Z
-public avf.n(Laif;III)Z
-public avf.o(Laif;III)Z
-public avf.p(Laif;III)Z
-public avf.q(Laif;III)Z
-public avf.r(Laif;III)Z
-public avf.s(Laif;III)Z
-public avf.t(Laif;III)Z
-public avf.u(Laif;III)Z
-public avf.v(Laif;III)Z
-public avf.w(Laif;III)Z
-public avf.x(Laif;III)Z
+public avg.*
+public avg.*()
 #RenderEngine - make TextureFX list public
-public ave.h
+public avf.h
+public avf.k # texturePack
 #RenderPlayer - make armorlist public and not final
-public-f awq.j
+public-f awr.j
 #StringTranslate - make the current table and language public
 public ak.b
 public ak.d
 # TileEntityRenderer - make the list of renderers public
-public axr.m
+public axs.m
 # CraftingManager - make the add recipe methods public
-public tc.a(Lri;[Ljava/lang/Object;)V
-public tc.b(Lri;[Ljava/lang/Object;)V
+public td.a(Lrj;[Ljava/lang/Object;)V
+public td.b(Lrj;[Ljava/lang/Object;)V
 # WeightedRandomItem - make the "probability" public
-public ir.a
+public is.a
 # ItemStack - make itemId final
-#public+f ri.c
+#public+f rj.c
 # StatBase - Make statName public, no server side getter
- public ho.a
+public hp.a
 # NetLoginHandler make the "complete connection" callback public so I can reset it during FML negotiation
-public gw.a(Lgw;Z)Z
+public gx.a(Lgx;Z)Z
 # NetLoginHandler userName field
-public gw.h
+public gx.h
 # EntityPlayerMP getNextWindowId
-public gt.bO()V
-public gt.cq
+public gu.bO()V
+public gu.cq
 # EntityAITaskEntry class -> public
-public kw
+public kx
 # EntityAITasks taskList
-public kv.a
+public kw.a
 # BlockChest isOcelotBlockingChest (a bounding box check actually)
-public afd.n(Luo;III)Z
+public afe.n(Lup;III)Z
 # EntityLiving tasks
-public jv.bg
+public jw.bg
 # EntityAIOcelotSit nearestSittableBlock and isblocksittable
-protected lh.a(Luo;III)Z
-protected lh.f()Z
+protected li.a(Lup;III)Z
+protected li.f()Z
 # CallableMinecraftVersion - sanity check the MC version
 public b
 public b.<init>(La;)V # constructor
-# RenderEngine
-public ave.k # texturePack
+# EntityAnimal
+public mn.d # inLove
+# RailLogic
+public ahi
+#ItemAxe
+public rf.<init>(ILri;)V
+#ItemPickaxe
+public rq.<init>(ILri;)V
+# WorldType
+public va.<init>(ILjava/lang/String;)V
+public va.<init>(ILjava/lang/String;I)V
--- a/fml/common/fml_marker.cfg
+++ b/fml/common/fml_marker.cfg
@ -2,11 +2,11 @@
 # Only runs at runtime because it's not necessary at compile time
 # has deobf and obf mappings so it runs OK in mcp
 # entityplayer -> network/player
-of cpw/mods/fml/common/network/Player
+og cpw/mods/fml/common/network/Player
 net.minecraft.src.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-aif cpw/mods/fml/common/registry/BlockProxy
+aig cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.src.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-rg cpw/mods/fml/common/registry/ItemProxy
+rh cpw/mods/fml/common/registry/ItemProxy
 net.minecraft.src.Item cpw/mods/fml/common/registry/ItemProxy
--- a/fml/conf/joined.exc
+++ b/fml/conf/joined.exc
@ -1469,6 +1469,9 @@ net/minecraft/src/CommandServerKick.func_71515_b(Lnet/minecraft/src/ICommandSend
 net/minecraft/src/CommandServerKick.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
 net/minecraft/src/CommandServerKick.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
 net/minecraft/src/CommandServerList.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
+net/minecraft/src/CommandServerMessage.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
+net/minecraft/src/CommandServerMessage.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
+net/minecraft/src/CommandServerMessage.func_71519_b(Lnet/minecraft/src/ICommandSender;)Z=|p_71519_1_
 net/minecraft/src/CommandServerOp.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
 net/minecraft/src/CommandServerOp.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
 net/minecraft/src/CommandServerOp.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
@ -1495,6 +1498,7 @@ net/minecraft/src/CommandServerWhitelist.func_71515_b(Lnet/minecraft/src/IComman
 net/minecraft/src/CommandServerWhitelist.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
 net/minecraft/src/CommandServerWhitelist.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
 net/minecraft/src/CommandShowSeed.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
+net/minecraft/src/CommandShowSeed.func_71519_b(Lnet/minecraft/src/ICommandSender;)Z=|p_71519_1_
 net/minecraft/src/CommandTime.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
 net/minecraft/src/CommandTime.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
 net/minecraft/src/CommandTime.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
@ -3415,6 +3419,7 @@ net/minecraft/src/IntHashMapEntry.equals(Ljava/lang/Object;)Z=|p_equals_1_
 net/minecraft/src/IntegratedPlayerList.<init>(Lnet/minecraft/src/IntegratedServer;)V=|p_i3125_1_
 net/minecraft/src/IntegratedPlayerList.func_72391_b(Lnet/minecraft/src/EntityPlayerMP;)V=|p_72391_1_
 net/minecraft/src/IntegratedServer.<init>(Lnet/minecraft/client/Minecraft;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/src/WorldSettings;)V=|p_i3118_1_,p_i3118_2_,p_i3118_3_,p_i3118_4_
+net/minecraft/src/IntegratedServer.func_70000_a(Lnet/minecraft/src/PlayerUsageSnooper;)V=|p_70000_1_
 net/minecraft/src/IntegratedServer.func_71197_b()Z=java/io/IOException|
 net/minecraft/src/IntegratedServer.func_71206_a(Lnet/minecraft/src/EnumGameType;Z)Ljava/lang/String;=|p_71206_1_,p_71206_2_
 net/minecraft/src/IntegratedServer.func_71228_a(Lnet/minecraft/src/CrashReport;)V=|p_71228_1_
@ -6056,15 +6061,19 @@ net/minecraft/src/WorldProvider.func_76563_a(JF)F=|p_76563_1_,p_76563_3_
 net/minecraft/src/WorldProvider.func_76566_a(II)Z=|p_76566_1_,p_76566_2_
 net/minecraft/src/WorldProvider.func_76568_b(II)Z=|p_76568_1_,p_76568_2_
 net/minecraft/src/WorldProvider.func_76570_a(I)Lnet/minecraft/src/WorldProvider;=|p_76570_0_
+net/minecraft/src/WorldProvider.func_80004_l()Ljava/lang/String;=|
 net/minecraft/src/WorldProviderEnd.func_76560_a(FF)[F=|p_76560_1_,p_76560_2_
 net/minecraft/src/WorldProviderEnd.func_76562_b(FF)Lnet/minecraft/src/Vec3;=|p_76562_1_,p_76562_2_
 net/minecraft/src/WorldProviderEnd.func_76563_a(JF)F=|p_76563_1_,p_76563_3_
 net/minecraft/src/WorldProviderEnd.func_76566_a(II)Z=|p_76566_1_,p_76566_2_
 net/minecraft/src/WorldProviderEnd.func_76568_b(II)Z=|p_76568_1_,p_76568_2_
+net/minecraft/src/WorldProviderEnd.func_80004_l()Ljava/lang/String;=|
 net/minecraft/src/WorldProviderHell.func_76562_b(FF)Lnet/minecraft/src/Vec3;=|p_76562_1_,p_76562_2_
 net/minecraft/src/WorldProviderHell.func_76563_a(JF)F=|p_76563_1_,p_76563_3_
 net/minecraft/src/WorldProviderHell.func_76566_a(II)Z=|p_76566_1_,p_76566_2_
 net/minecraft/src/WorldProviderHell.func_76568_b(II)Z=|p_76568_1_,p_76568_2_
+net/minecraft/src/WorldProviderHell.func_80004_l()Ljava/lang/String;=|
+net/minecraft/src/WorldProviderSurface.func_80004_l()Ljava/lang/String;=|
 net/minecraft/src/WorldRenderer.<init>(Lnet/minecraft/src/World;Ljava/util/List;IIII)V=|p_i3196_1_,p_i3196_2_,p_i3196_3_,p_i3196_4_,p_i3196_5_,p_i3196_6_
 net/minecraft/src/WorldRenderer.func_78908_a(Lnet/minecraft/src/ICamera;)V=|p_78908_1_
 net/minecraft/src/WorldRenderer.func_78909_a(I)I=|p_78909_1_
--- a/fml/conf/joined.srg
+++ b/fml/conf/joined.srg
--- a/fml/conf/mcp.cfg
+++ b/fml/conf/mcp.cfg
@ -36,8 +36,8 @@ DirNatives = %(DirJars)s/bin/natives
 Client     = %(DirJars)s/bin/minecraft.jar
 Server     = %(DirJars)s/minecraft_server.jar
 LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-MD5Client  = 266ccbc9798afd2eadf3d6c01b4c562a
-MD5Server  = f44a3cfe6ec35b1ac3f2b635e73d96fe
+MD5Client  = 969699f13e5bbe7f12e40ac4f32b7d9a
+MD5Server  = c047f82522e53f2ec3c6b64304dfad0f

 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@ -123,8 +123,8 @@ LogFile           = %(DirLogs)s/mcp.log
 LogFileErr        = %(DirLogs)s/mcperr.log
 UpdateUrl         = 
 IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
-RGIndex           = 70000
-ParamIndex        = 3000
+RGIndex           = 80000
+ParamIndex        = 4000

 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg
--- a/fml/conf/patches/minecraft_ff.patch
+++ b/fml/conf/patches/minecraft_ff.patch
@ -1,6 +1,6 @@
 diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- minecraft\net\minecraft\client\Minecraft.java	Wed Aug 01 18:13:27 2012
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Wed Aug 01 18:23:13 2012
+--- minecraft\net\minecraft\client\Minecraft.java	Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\client\Minecraft.java	Tue Aug 14 20:18:48 2012
@@ -539,9 +539,8 @@
          return;
       }
@ -30,8 +30,8 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
 
    private void func_71411_J() {
 diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
--- minecraft\net\minecraft\src\CodecMus.java	Wed Aug 01 18:13:28 2012
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Wed Aug 01 18:24:06 2012
+--- minecraft\net\minecraft\src\CodecMus.java	Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\src\CodecMus.java	Tue Aug 14 20:18:48 2012
@@ -1,5 +1,6 @@
 package net.minecraft.src;
 
@ -51,8 +51,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
    }
 }
 diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Wed Aug 01 18:13:28 2012
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Wed Aug 01 18:26:33 2012
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Aug 14 20:18:48 2012
@@ -11,6 +11,10 @@
 
 public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@ -65,18 +65,18 @@ diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minec
       if(this.field_74885_f != 2 && this.field_74885_f != 3) {
          this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
--- minecraft\net\minecraft\src\DedicatedServer.java	Wed Aug 01 18:13:29 2012
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Wed Aug 01 18:31:22 2012
+--- minecraft\net\minecraft\src\DedicatedServer.java	Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Tue Aug 14 20:25:02 2012
@@ -183,7 +183,7 @@
 
    }
 
 -   protected CrashReport func_71230_b(CrashReport p_71230_1_) {
 +   public CrashReport func_71230_b(CrashReport p_71230_1_) {
+       p_71230_1_ = super.func_71230_b(p_71230_1_);
       p_71230_1_.func_71500_a("Type", new CallableType(this));
-       return super.func_71230_b(p_71230_1_);
-    }
-@@ -192,7 +192,7 @@
+       return p_71230_1_;
+@@ -193,7 +193,7 @@
       System.exit(0);
    }
 
@ -86,8 +86,8 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
       this.func_71333_ah();
    }
 diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
--- minecraft\net\minecraft\src\FontRenderer.java	Thu Aug 02 02:35:41 2012
-+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Thu Aug 02 02:37:34 2012
+--- minecraft\net\minecraft\src\FontRenderer.java	Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Tue Aug 14 20:18:48 2012
@@ -711,8 +711,6 @@
       for(boolean var7 = false; var5 < var3; ++var5) {
          char var8 = p_78259_1_.charAt(var5);
@ -107,9 +107,9 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
             var4 += this.func_78263_a(var8);
             if(var7) {
 diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
--- minecraft\net\minecraft\src\IntegratedServer.java	Wed Aug 01 18:13:30 2012
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Wed Aug 01 18:32:27 2012
-@@ -97,7 +97,7 @@
+--- minecraft\net\minecraft\src\IntegratedServer.java	Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Tue Aug 14 20:24:49 2012
+@@ -98,7 +98,7 @@
       return true;
    }
 
@ -118,18 +118,18 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched
       boolean var1 = this.field_71348_o;
       this.field_71348_o = this.field_71347_n.func_71752_f();
       if(!var1 && this.field_71348_o) {
-@@ -144,7 +144,7 @@
+@@ -145,7 +145,7 @@
       this.field_71349_l.func_71404_a(p_71228_1_);
    }
 
 -   protected CrashReport func_71230_b(CrashReport p_71230_1_) {
 +   public CrashReport func_71230_b(CrashReport p_71230_1_) {
+       p_71230_1_ = super.func_71230_b(p_71230_1_);
       p_71230_1_.func_71500_a("Type", new CallableType3(this));
       p_71230_1_.func_71500_a("Is Modded", new CallableIsModded(this));
-       return super.func_71230_b(p_71230_1_);
 diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
--- minecraft\net\minecraft\src\ItemMap.java	Wed Aug 01 18:13:31 2012
-+++ minecraft_patched\net\minecraft\src\ItemMap.java	Wed Aug 01 18:27:03 2012
+--- minecraft\net\minecraft\src\ItemMap.java	Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\src\ItemMap.java	Tue Aug 14 20:18:48 2012
@@ -24,7 +24,6 @@
    }
 
@ -146,9 +146,32 @@ diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\mine
       MapData var4 = (MapData)p_77873_2_.func_72943_a(MapData.class, "map_" + p_77873_1_.func_77960_j());
       if(var4 == null) {
          p_77873_1_.func_77964_b(p_77873_2_.func_72841_b("map"));
+diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched\net\minecraft\src\RConThreadClient.java
+--- minecraft\net\minecraft\src\RConThreadClient.java	Tue Aug 14 20:15:27 2012
+++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Tue Aug 14 20:18:48 2012
+@@ -40,13 +40,13 @@
+ 
+             BufferedInputStream var1 = new BufferedInputStream(this.field_72659_h.getInputStream());
+             int var2 = var1.read(this.field_72660_i, 0, 1460);
+-            if(10 <= var2) {
+-               byte var3 = 0;
+-               int var4 = RConUtils.func_72665_b(this.field_72660_i, 0, var2);
+-               if(var4 != var2 - 4) {
+-                  return;
+-               }
+            if(10 > var2) {
+               return;
+            }
+ 
+            byte var3 = 0;
+            int var4 = RConUtils.func_72665_b(this.field_72660_i, 0, var2);
+            if(var4 == var2 - 4) {
+                int var21 = var3 + 4;
+                int var5 = RConUtils.func_72665_b(this.field_72660_i, var21, var2);
+                var21 += 4;
 diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
--- minecraft\net\minecraft\src\RenderGlobal.java	Wed Aug 01 18:13:32 2012
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Wed Aug 01 18:33:03 2012
+--- minecraft\net\minecraft\src\RenderGlobal.java	Tue Aug 14 20:15:27 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Tue Aug 14 20:18:48 2012
@@ -1431,7 +1431,7 @@
          double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
          double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
@ -159,8 +182,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
             this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
          } else if(p_72726_1_.equals("largeexplode")) {
 diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
--- minecraft\net\minecraft\src\TcpMasterThread.java	Wed Aug 01 18:13:32 2012
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Wed Aug 01 18:27:42 2012
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Tue Aug 14 20:15:27 2012
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Tue Aug 14 20:18:48 2012
@@ -11,6 +11,7 @@
       this.field_74504_a = p_i3285_1_;
    }
@ -170,8 +193,8 @@ diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\
       try {
          Thread.sleep(5000L);
 diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Wed Aug 01 18:13:32 2012
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Wed Aug 01 18:28:10 2012
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Tue Aug 14 20:15:27 2012
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Aug 14 20:18:48 2012
@@ -20,7 +20,9 @@
    }
 
--- a/fml/conf/patches/minecraft_server_ff.patch
+++ b/fml/conf/patches/minecraft_server_ff.patch
@ -1,6 +1,6 @@
 diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Wed Aug 01 18:15:36 2012
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Wed Aug 01 18:26:32 2012
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Aug 14 20:16:02 2012
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Aug 14 20:19:30 2012
@@ -11,6 +11,10 @@
 
 public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@ -13,18 +13,18 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.jav
       if(this.field_74885_f != 2 && this.field_74885_f != 3) {
          this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
--- minecraft_server\net\minecraft\src\DedicatedServer.java	Wed Aug 01 18:15:36 2012
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Wed Aug 01 18:31:22 2012
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Tue Aug 14 20:16:03 2012
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Tue Aug 14 20:24:26 2012
@@ -184,7 +184,7 @@
 
    }
 
 -   protected CrashReport func_71230_b(CrashReport p_71230_1_) {
 +   public CrashReport func_71230_b(CrashReport p_71230_1_) {
+       p_71230_1_ = super.func_71230_b(p_71230_1_);
       p_71230_1_.func_71500_a("Type", new CallableType(this));
-       return super.func_71230_b(p_71230_1_);
-    }
-@@ -193,7 +193,7 @@
+       return p_71230_1_;
+@@ -194,7 +194,7 @@
       System.exit(0);
    }
 
@ -34,8 +34,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
       this.func_71333_ah();
    }
 diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_patched\net\minecraft\src\ItemMap.java
--- minecraft_server\net\minecraft\src\ItemMap.java	Wed Aug 01 18:15:37 2012
-+++ minecraft_server_patched\net\minecraft\src\ItemMap.java	Wed Aug 01 18:27:23 2012
+--- minecraft_server\net\minecraft\src\ItemMap.java	Tue Aug 14 20:16:03 2012
+++ minecraft_server_patched\net\minecraft\src\ItemMap.java	Tue Aug 14 20:19:30 2012
@@ -24,7 +24,6 @@
    }
 
@ -45,8 +45,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_pa
       if(var4 == null) {
          p_77873_1_.func_77964_b(p_77873_2_.func_72841_b("map"));
 diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java
--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Wed Aug 01 18:15:38 2012
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Wed Aug 01 18:28:41 2012
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Tue Aug 14 20:16:03 2012
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Tue Aug 14 20:19:30 2012
@@ -11,6 +11,7 @@
       this.field_74504_a = p_i3285_1_;
    }
@ -56,8 +56,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_s
       try {
          Thread.sleep(5000L);
 diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Wed Aug 01 18:15:38 2012
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Wed Aug 01 18:28:56 2012
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Tue Aug 14 20:16:03 2012
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Aug 14 20:19:30 2012
@@ -20,7 +20,9 @@
    }
 
--- a/fml/conf/version.cfg
+++ b/fml/conf/version.cfg
@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.0a
-ClientVersion = 1.3.1
-ServerVersion = 1.3.1
+MCPVersion = 7.2
+ClientVersion = 1.3.2
+ServerVersion = 1.3.2
--- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
+++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
@ -0,0 +1,4 @@
+#Sun Jun 05 18:58:07 CEST 2011
+version=1
+eclipse.preferences.version=1
+refresh.enabled=true
--- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
+++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
@ -0,0 +1,7 @@
+#Sun Jun 05 19:03:53 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.debug.ui.UseContextualLaunch=false
+Console.highWaterMark=88000
+org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<launchPerspectives/>\r\n
+org.eclipse.debug.ui.user_view_bindings=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<viewBindings>\r\n<view id\="org.eclipse.ui.console.ConsoleView">\r\n<perspective id\="org.eclipse.jdt.ui.JavaPerspective" userAction\="opened"/>\r\n</view>\r\n</viewBindings>\r\n
+StringVariablePreferencePage=130,107,107,86,
--- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs
+++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs
@ -0,0 +1,3 @@
+#Sun Jun 05 18:58:07 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.epp.usagedata.gathering.enabled=false
--- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
+++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,14 @@
+#Sun Sep 18 16:44:39 NZST 2011
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.source=1.6
--- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
+++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
@ -0,0 +1,4 @@
+#Sun Jun 05 18:58:05 CEST 2011
+spacesForTabs=true
+eclipse.preferences.version=1
+overviewRuler_migration=migrated_3.1
--- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
+++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
@ -0,0 +1,9 @@
+#Sun Jun 05 18:58:07 CEST 2011
+IMPORT_FILES_AND_FOLDERS_MODE=prompt
+IMPORT_FILES_AND_FOLDERS_VIRTUAL_FOLDER_MODE=prompt
+SAVE_ALL_BEFORE_BUILD=true
+eclipse.preferences.version=1
+tipsAndTricks=true
+platformState=1287081747687
+quickStart=false
+PROBLEMS_FILTERS_MIGRATE=true
--- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
+++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
@ -0,0 +1,3 @@
+#Sun Jun 05 18:50:08 CEST 2011
+eclipse.preferences.version=1
+showIntro=false
--- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch
+++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/Minecraft/src/Start.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="Start"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Minecraft"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:Minecraft/jars}"/>
+</launchConfiguration>
--- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch
+++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/Minecraft/common/net/minecraft/server/MinecraftServer.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraft.server.MinecraftServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Minecraft"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:Minecraft/jars}"/>
+</launchConfiguration>
--- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
+++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchHistory>
+<launchGroup id="org.eclipse.ui.externaltools.launchGroup">
+<mruHistory/>
+<favorites/>
+</launchGroup>
+<launchGroup id="org.eclipse.debug.ui.launchGroup.profile">
+<mruHistory/>
+<favorites/>
+</launchGroup>
+<launchGroup id="org.eclipse.debug.ui.launchGroup.debug">
+<mruHistory>
+<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Client&quot;/&gt;&#13;&#10;"/>
+<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Server&quot;/&gt;&#13;&#10;"/>
+</mruHistory>
+<favorites/>
+</launchGroup>
+<launchGroup id="org.eclipse.debug.ui.launchGroup.run">
+<mruHistory>
+<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Client&quot;/&gt;&#13;&#10;"/>
+<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Server&quot;/&gt;&#13;&#10;"/>
+</mruHistory>
+<favorites/>
+</launchGroup>
+</launchHistory>
--- a/fml/install/eclipse/Minecraft/.classpath
+++ b/fml/install/eclipse/Minecraft/.classpath
@ -5,17 +5,17 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="jars/bin/jinput.jar">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Client/jars/bin/natives"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft/jars/bin/natives"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="jars/bin/lwjgl_util.jar">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Client/jars/bin/natives"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft/jars/bin/natives"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="jars/bin/lwjgl.jar">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Client/jars/bin/natives"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft/jars/bin/natives"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="jars/bin/minecraft.jar"/>
--- a/fml/install/eclipse/Minecraft/.project
+++ b/fml/install/eclipse/Minecraft/.project
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Client</name>
+	<name>Minecraft</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/fml/install/eclipse/Server/.classpath
+++ b/fml/install/eclipse/Server/.classpath
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="common"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="jars/minecraft_server.jar"/>
-	<classpathentry kind="lib" path="lib/argo-2.25.jar"/>
-	<classpathentry kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-all-4.0-source.jar"/>
-	<classpathentry kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
--- a/fml/install/eclipse/Server/.project
+++ b/fml/install/eclipse/Server/.project
@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Server</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>jars</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/jars</locationURI>
-		</link>
-		<link>
-			<name>src</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/src/minecraft_server</locationURI>
-		</link>
-		<link>
-			<name>common</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/src/common</locationURI>
-		</link>
-		<link>
-			<name>lib</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/lib</locationURI>
-		</link>
-	</linkedResources>
-	<filteredResources>
-		<filter>
-			<id>1307293529292</id>
-			<name>jars</name>
-			<type>13</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*.jar</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-	<variableList>
-		<variable>
-			<name>MCP_LOC</name>
-			<value>$%7BPARENT-1-WORKSPACE_LOC%7D</value>
-		</variable>
-	</variableList>
-</projectDescription>
--- a/fml/install/fml.py
+++ b/fml/install/fml.py
@ -61,8 +61,8 @@ def pre_decompile(mcp_dir, fml_dir):
    with open(server_jar, 'rb') as fh:
        md5_s = md5(fh.read()).hexdigest()
        
-    clean_c = "266ccbc9798afd2eadf3d6c01b4c562a"
-    clean_s = "f44a3cfe6ec35b1ac3f2b635e73d96fe"
+    clean_c = "969699f13e5bbe7f12e40ac4f32b7d9a"
+    clean_s = "c047f82522e53f2ec3c6b64304dfad0f"
    
    if not md5_c == clean_c:
        print 'Warning, Modified Client jar detected'
@ -292,12 +292,12 @@ def runcmd(commands, command, echo=True):
    
    if echo:
        for line in output.splitlines():
-            self.logger.info(line)
+            commands.logger.info(line)

    if process.returncode:
        if not echo:        
            for line in output.splitlines():
-                self.logger.info(line)
+                commands.logger.info(line)
        return False
    return True

@ -614,7 +614,10 @@ def setup_mcp(fml_dir, mcp_dir, dont_gen_conf=True):
    #update workspace
    print 'Fixing MCP Workspace'
    if not os.path.isdir(os.path.join(fml_dir, 'eclipse', 'Clean-Client')):
-        merge_tree(os.path.join(fml_dir, 'eclipse'), os.path.join(mcp_dir, 'eclipse'))
+        mcp_eclipse = os.path.join(mcp_dir, 'eclipse')
+        if os.path.isdir(mcp_eclipse):
+            shutil.rmtree(mcp_eclipse)
+        shutil.copytree(os.path.join(fml_dir, 'eclipse'), mcp_eclipse)

 def normaliselines(in_filename):
    in_filename = os.path.normpath(in_filename)
--- a/fml/mcp_merge.cfg
+++ b/fml/mcp_merge.cfg
@ -1,19 +1,19 @@
 <fz
-<fy
-<gc
-<gd
->akd
-<ge
-<gf
->aki
 <ga
-<gb
+<gd
+<ge
+>ake
+<gf
 <gg
->um
+>akj
+<gb
+<gc
+<gh
 >un
+>uo
 <eo
->aeg
->rs
->hl
+>aeh
+>rt
+>hm
+>ia
 >hz
->hy
--- a/fml/patches/common/net/minecraft/server/MinecraftServer.java.patch
+++ b/fml/patches/common/net/minecraft/server/MinecraftServer.java.patch
@ -59,7 +59,7 @@
                 this.field_71304_b.func_76318_c("lights");
 
                 while (true)
-@@ -1117,6 +1129,12 @@
+@@ -1118,6 +1130,12 @@
     @SideOnly(Side.SERVER)
     public static void main(String[] p_main_0_)
     {
--- a/fml/patches/common/net/minecraft/src/DedicatedServer.java.patch
+++ b/fml/patches/common/net/minecraft/src/DedicatedServer.java.patch
@ -7,15 +7,16 @@
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
 import java.io.File;
-@@ -36,6 +37,7 @@
-         var1.start();
-         ConsoleLogManager.func_73699_a();
-         field_71306_a.info("Starting minecraft server version 1.3.1");
-+        FMLCommonHandler.instance().onServerStart(this);
+@@ -42,6 +43,8 @@
+             field_71306_a.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
+         }
 
-         if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L)
-         {
-@@ -101,6 +103,7 @@
+        FMLCommonHandler.instance().onServerStart(this);
+
+         field_71306_a.info("Loading properties");
+         this.field_71340_o = new PropertyManager(new File("server.properties"));
+ 
+@@ -101,6 +104,7 @@
             field_71306_a.warning("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
         }
 
@ -23,7 +24,7 @@
         this.func_71210_a(new DedicatedPlayerList(this));
         long var4 = System.nanoTime();
 
-@@ -160,7 +163,7 @@
+@@ -160,7 +164,7 @@
             this.field_71339_n = new RConThreadMain(this);
             this.field_71339_n.func_72602_a();
         }
--- a/fml/patches/common/net/minecraft/src/NetServerHandler.java.patch
+++ b/fml/patches/common/net/minecraft/src/NetServerHandler.java.patch
@ -9,7 +9,7 @@
 import net.minecraft.server.MinecraftServer;
 
 public class NetServerHandler extends NetHandler
-@@ -956,6 +958,11 @@
+@@ -957,6 +959,11 @@
 
     public void func_72501_a(Packet250CustomPayload p_72501_1_)
     {
@ -21,7 +21,7 @@
         DataInputStream var2;
         ItemStack var3;
         ItemStack var4;
-@@ -1028,4 +1035,10 @@
+@@ -1029,4 +1036,10 @@
             }
         }
     }
--- a/fml/patches/common/net/minecraft/src/WorldType.java.patch
+++ b/fml/patches/common/net/minecraft/src/WorldType.java.patch
@ -28,7 +28,7 @@
 +
 +    protected BiomeGenBase[] biomesForWorldType;
 
-     private WorldType(int p_i3737_1_, String p_i3737_2_)
+     public WorldType(int p_i3737_1_, String p_i3737_2_)
     {
@@ -26,6 +38,14 @@
         this.field_77134_g = p_i3738_3_;