Merge branch '1.4'

2012-10-20 18:07:22 -04:00 · 2012-10-20 18:07:22 -04:00 · 76be826ffb
parent 9b1375f536 2fcea16485
commit 76be826ffb
132 changed files with 17934 additions and 16385 deletions
--- a/fml/.gitattributes
+++ b/fml/.gitattributes
@ -1 +1,7 @@
-* text=auto
+* text eol=lf
+*.bat text eol=crlf
+*.patch text
+*.png binary
+*.exe binary
+*.dll binary
+*.zip binary
--- a/fml/.gitignore
+++ b/fml/.gitignore
@ -4,8 +4,6 @@
 /fmlbuild.properties
 /fmlversion.properties
 /difflist.txt
-/.metadata/
-/eclipse/.metadata/
 /target
 fmlbranding.properties
 /fernflower.zip
--- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java
+++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java
@ -333,7 +333,7 @@ public class FMLClientHandler implements IFMLSidedHandler

            if (entity instanceof IThrowableEntity)
            {
-                Entity thrower = client.field_71439_g.field_70157_k == packet.throwerId ? client.field_71439_g : wc.func_73024_a(packet.throwerId);
+                Entity thrower = client.field_71439_g.field_70157_k == packet.throwerId ? client.field_71439_g : wc.func_73045_a(packet.throwerId);
                ((IThrowableEntity)entity).setThrower(thrower);
            }

@ -377,7 +377,7 @@ public class FMLClientHandler implements IFMLSidedHandler
    @Override
    public void adjustEntityLocationOnClient(EntitySpawnAdjustmentPacket packet)
    {
-        Entity ent = client.field_71441_e.func_73024_a(packet.entityId);
+        Entity ent = client.field_71441_e.func_73045_a(packet.entityId);
        if (ent != null)
        {
            ent.field_70118_ct = packet.serverX;
--- a/fml/client/cpw/mods/fml/client/FMLTextureFX.java
+++ b/fml/client/cpw/mods/fml/client/FMLTextureFX.java
@ -20,7 +20,7 @@ import java.util.logging.Logger;

 import net.minecraft.src.RenderEngine;
 import net.minecraft.src.TextureFX;
-import net.minecraft.src.TexturePackBase;
+import net.minecraft.src.ITexturePack;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;

@ -41,7 +41,7 @@ public class FMLTextureFX extends TextureFX implements ITextureFX
    @Override public void setErrored(boolean err){ errored = err; }
    @Override public boolean getErrored(){ return errored; }
    @Override
-    public void onTexturePackChanged(RenderEngine engine, TexturePackBase texturepack, Dimension dimensions)
+    public void onTexturePackChanged(RenderEngine engine, ITexturePack texturepack, Dimension dimensions)
    {
        onTextureDimensionsUpdate(dimensions.width, dimensions.height);
    }
--- a/fml/client/cpw/mods/fml/client/ITextureFX.java
+++ b/fml/client/cpw/mods/fml/client/ITextureFX.java
@ -17,11 +17,11 @@ package cpw.mods.fml.client;
 import java.awt.Dimension;

 import net.minecraft.src.RenderEngine;
-import net.minecraft.src.TexturePackBase;
+import net.minecraft.src.ITexturePack;

 public interface ITextureFX
 {
-    public void onTexturePackChanged(RenderEngine engine, TexturePackBase texturepack, Dimension dimensions);
+    public void onTexturePackChanged(RenderEngine engine, ITexturePack texturepack, Dimension dimensions);

    public void onTextureDimensionsUpdate(int width, int height);
    
--- a/fml/client/cpw/mods/fml/client/TextureFXManager.java
+++ b/fml/client/cpw/mods/fml/client/TextureFXManager.java
@ -22,7 +22,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.src.ModTextureStatic;
 import net.minecraft.src.RenderEngine;
 import net.minecraft.src.TextureFX;
-import net.minecraft.src.TexturePackBase;
+import net.minecraft.src.ITexturePack;

 import org.lwjgl.opengl.GL11;

@ -171,7 +171,7 @@ public class TextureFXManager
        return id;
    }

-    public void onTexturePackChange(RenderEngine engine, TexturePackBase texturepack, List<TextureFX> effects)
+    public void onTexturePackChange(RenderEngine engine, ITexturePack texturepack, List<TextureFX> effects)
    {
        pruneOldTextureFX(texturepack, effects);

@ -188,7 +188,7 @@ public class TextureFXManager

    private HashMap<Integer, Dimension> textureDims = new HashMap<Integer, Dimension>();
    private IdentityHashMap<TextureFX, Integer> effectTextures = new IdentityHashMap<TextureFX, Integer>();
-    private TexturePackBase earlyTexturePack;
+    private ITexturePack earlyTexturePack;
    public void setTextureDimensions(int id, int width, int height, List<TextureFX> effects)
    {
        Dimension dim = new Dimension(width, height);
@ -226,7 +226,7 @@ public class TextureFXManager
    }


-    public void loadTextures(TexturePackBase texturePack)
+    public void loadTextures(ITexturePack texturePack)
    {
        registerTextureOverrides(client.field_71446_o);
    }
@ -261,7 +261,7 @@ public class TextureFXManager
    {
    }

-    public void onEarlyTexturePackLoad(TexturePackBase fallback)
+    public void onEarlyTexturePackLoad(ITexturePack fallback)
    {
        if (client==null) {
            // We're far too early- let's wait
@ -272,7 +272,7 @@ public class TextureFXManager
    }


-    public void pruneOldTextureFX(TexturePackBase var1, List<TextureFX> effects)
+    public void pruneOldTextureFX(ITexturePack var1, List<TextureFX> effects)
    {
        ListIterator<TextureFX> li = addedTextureFX.listIterator();
        while (li.hasNext())
--- a/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java
+++ b/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java
@ -14,7 +14,7 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.KeyBinding;
 import net.minecraft.src.NetClientHandler;
 import net.minecraft.src.NetHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;
 import net.minecraft.src.Packet250CustomPayload;
 import net.minecraft.src.Render;
 import net.minecraft.src.RenderManager;
@ -155,9 +155,9 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper
        ((net.minecraft.src.BaseMod)mod).clientCustomPayload(client.field_71439_g.field_71174_a, packet);
    }

-    private Map<NetworkManager,NetHandler> managerLookups = new MapMaker().weakKeys().weakValues().makeMap();
+    private Map<INetworkManager,NetHandler> managerLookups = new MapMaker().weakKeys().weakValues().makeMap();
    @Override
-    public void clientConnectionOpened(NetHandler netClientHandler, NetworkManager manager, BaseModProxy mod)
+    public void clientConnectionOpened(NetHandler netClientHandler, INetworkManager manager, BaseModProxy mod)
    {
        managerLookups.put(manager, netClientHandler);
        ((BaseMod)mod).clientConnect((NetClientHandler)netClientHandler);
@ -165,7 +165,7 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper


    @Override
-    public boolean clientConnectionClosed(NetworkManager manager, BaseModProxy mod)
+    public boolean clientConnectionClosed(INetworkManager manager, BaseModProxy mod)
    {
        if (managerLookups.containsKey(manager))
        {
--- a/fml/client/net/minecraft/src/BaseMod.java
+++ b/fml/client/net/minecraft/src/BaseMod.java
@ -422,7 +422,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
     * Called when a client logs out of the server.
     */
    @Override
-    public void onClientLogout(NetworkManager mgr)
+    public void onClientLogout(INetworkManager mgr)
    {

    }
--- a/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java
+++ b/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java
@ -67,7 +67,7 @@ public class FMLRenderAccessLibrary
        return TextureFXManager.instance().getTextureDimensions(textureFX);
    }

-    public static void onTexturePackChange(RenderEngine engine, TexturePackBase texturePack, List<TextureFX> textureFXList)
+    public static void onTexturePackChange(RenderEngine engine, ITexturePack texturePack, List<TextureFX> textureFXList)
    {
        TextureFXManager.instance().onTexturePackChange(engine, texturePack, textureFXList);
    }
--- a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java
+++ b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java
@ -18,7 +18,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.logging.Level;
 import java.util.logging.Logger;

 import net.minecraft.server.MinecraftServer;
@ -33,13 +32,12 @@ import net.minecraft.src.NetHandler;
 import net.minecraft.src.Packet131MapData;
 import net.minecraft.src.SaveHandler;
 import net.minecraft.src.ServerListenThread;
-import net.minecraft.src.ThreadServerApplication;
+import net.minecraft.src.ThreadMinecraftServer;
 import net.minecraft.src.World;
 import net.minecraft.src.WorldInfo;

 import com.google.common.base.Objects;
 import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.Lists;
@ -176,7 +174,7 @@ public class FMLCommonHandler
    public Side getEffectiveSide()
    {
        Thread thr = Thread.currentThread();
-        if ((thr instanceof ThreadServerApplication) || (thr instanceof ServerListenThread))
+        if ((thr instanceof ThreadMinecraftServer) || (thr instanceof ServerListenThread))
        {
            return Side.SERVER;
        }
--- a/fml/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java
+++ b/fml/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java
@ -51,7 +51,7 @@ public class MCPMerger
    {
        if (args.length != 3)
        {
-            System.out.println("Usage: AccessTransformer <MapFile> <minecraft.jar> <minecraft_server.jar>");
+            System.out.println("Usage: MCPMerger <MapFile> <minecraft.jar> <minecraft_server.jar>");
            System.exit(1);
        }

@ -288,7 +288,7 @@ public class MCPMerger

        reader.accept(classNode, 0);

-        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.name.equals("bcs")) //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));
--- a/fml/common/cpw/mods/fml/common/modloader/BaseModProxy.java
+++ b/fml/common/cpw/mods/fml/common/modloader/BaseModProxy.java
@ -24,7 +24,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.NetClientHandler;
 import net.minecraft.src.NetHandler;
 import net.minecraft.src.NetServerHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;
 import net.minecraft.src.Packet250CustomPayload;
 import net.minecraft.src.World;
 import net.minecraft.src.WorldClient;
@ -59,7 +59,7 @@ public interface BaseModProxy
    void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory craftMatrix);
    void takenFromFurnace(EntityPlayer player, ItemStack item);

-    public abstract void onClientLogout(NetworkManager manager);
+    public abstract void onClientLogout(INetworkManager manager);

    public abstract void onClientLogin(EntityPlayer player);

--- a/fml/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java
+++ b/fml/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java
@ -5,7 +5,7 @@ import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
 import net.minecraft.src.Entity;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.NetHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;
 import net.minecraft.src.Packet250CustomPayload;

 public interface IModLoaderSidedHelper
@ -19,8 +19,8 @@ public interface IModLoaderSidedHelper

    void sendClientPacket(BaseModProxy mod, Packet250CustomPayload packet);

-    void clientConnectionOpened(NetHandler netClientHandler, NetworkManager manager, BaseModProxy mod);
+    void clientConnectionOpened(NetHandler netClientHandler, INetworkManager manager, BaseModProxy mod);

-    boolean clientConnectionClosed(NetworkManager manager, BaseModProxy mod);
+    boolean clientConnectionClosed(INetworkManager manager, BaseModProxy mod);

 }
--- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java
+++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java
@ -4,7 +4,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.NetHandler;
 import net.minecraft.src.NetLoginHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;
 import net.minecraft.src.Packet1Login;
 import cpw.mods.fml.common.network.IConnectionHandler;
 import cpw.mods.fml.common.network.Player;
@ -19,25 +19,25 @@ public class ModLoaderConnectionHandler implements IConnectionHandler
    }

    @Override
-    public void playerLoggedIn(Player player, NetHandler netHandler, NetworkManager manager)
+    public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager)
    {
        mod.onClientLogin((EntityPlayer)player);
    }

    @Override
-    public String connectionReceived(NetLoginHandler netHandler, NetworkManager manager)
+    public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager)
    {
        return null;
    }

    @Override
-    public void connectionOpened(NetHandler netClientHandler, String server, int port, NetworkManager manager)
+    public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager)
    {
        ModLoaderHelper.sidedHelper.clientConnectionOpened(netClientHandler, manager, mod);
    }

    @Override
-    public void connectionClosed(NetworkManager manager)
+    public void connectionClosed(INetworkManager manager)
    {
        if (!ModLoaderHelper.sidedHelper.clientConnectionClosed(manager, mod))
        {
@ -47,13 +47,13 @@ public class ModLoaderConnectionHandler implements IConnectionHandler
    }

    @Override
-    public void clientLoggedIn(NetHandler nh, NetworkManager manager, Packet1Login login)
+    public void clientLoggedIn(NetHandler nh, INetworkManager manager, Packet1Login login)
    {
        mod.serverConnect(nh);
    }

    @Override
-    public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, NetworkManager manager)
+    public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager)
    {
        ModLoaderHelper.sidedHelper.clientConnectionOpened(netClientHandler, manager, mod);
    }
--- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java
+++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java
@ -2,7 +2,7 @@ package cpw.mods.fml.common.modloader;

 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.EntityPlayerMP;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;
 import net.minecraft.src.Packet250CustomPayload;
 import cpw.mods.fml.common.network.IPacketHandler;
 import cpw.mods.fml.common.network.Player;
@ -17,7 +17,7 @@ public class ModLoaderPacketHandler implements IPacketHandler
    }

    @Override
-    public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player)
+    public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player)
    {
        if (player instanceof EntityPlayerMP)
        {
--- a/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java
+++ b/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java
@ -1,7 +1,7 @@
 package cpw.mods.fml.common.network;

 import net.minecraft.src.NetHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;

 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
@ -45,7 +45,7 @@ public class EntitySpawnAdjustmentPacket extends FMLPacket
    }

    @Override
-    public void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
+    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
    {
        FMLCommonHandler.instance().adjustEntityLocationOnClient(this);
    }
--- a/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java
+++ b/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java
@ -13,7 +13,7 @@ import net.minecraft.src.Entity;
 import net.minecraft.src.EntityLiving;
 import net.minecraft.src.MathHelper;
 import net.minecraft.src.NetHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;

 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
@ -168,7 +168,7 @@ public class EntitySpawnPacket extends FMLPacket
    }

    @Override
-    public void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
+    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
    {
        NetworkModHandler nmh = handler.findNetworkModHandler(networkId);
        ModContainer mc = nmh.getContainer();
--- a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
+++ b/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
@ -20,7 +20,7 @@ import net.minecraft.src.Item;
 import net.minecraft.src.NetHandler;
 import net.minecraft.src.NetLoginHandler;
 import net.minecraft.src.NetServerHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;
 import net.minecraft.src.Packet;
 import net.minecraft.src.Packet131MapData;
 import net.minecraft.src.Packet1Login;
@ -61,7 +61,7 @@ public class FMLNetworkHandler

    private Map<Integer, NetworkModHandler> networkIdLookup = Maps.newHashMap();

-    public static void handlePacket250Packet(Packet250CustomPayload packet, NetworkManager network, NetHandler handler)
+    public static void handlePacket250Packet(Packet250CustomPayload packet, INetworkManager network, NetHandler handler)
    {
        String target = packet.field_73630_a;

@ -79,12 +79,12 @@ public class FMLNetworkHandler
        }
    }

-    public static void onConnectionEstablishedToServer(NetHandler clientHandler, NetworkManager manager, Packet1Login login)
+    public static void onConnectionEstablishedToServer(NetHandler clientHandler, INetworkManager manager, Packet1Login login)
    {
        NetworkRegistry.instance().clientLoggedIn(clientHandler, manager, login);
    }

-    private void handleFMLPacket(Packet250CustomPayload packet, NetworkManager network, NetHandler netHandler)
+    private void handleFMLPacket(Packet250CustomPayload packet, INetworkManager network, NetHandler netHandler)
    {
        FMLPacket pkt = FMLPacket.readPacket(packet.field_73629_c);
        String userName = "";
@ -278,7 +278,7 @@ public class FMLNetworkHandler
        return networkModHandlers.keySet();
    }

-    public static void handlePlayerLogin(EntityPlayerMP player, NetServerHandler netHandler, NetworkManager manager)
+    public static void handlePlayerLogin(EntityPlayerMP player, NetServerHandler netHandler, INetworkManager manager)
    {
        NetworkRegistry.instance().playerLoggedIn(player, netHandler, manager);
        GameRegistry.onPlayerLogin(player);
@ -300,17 +300,17 @@ public class FMLNetworkHandler
        }
    }

-    public static void onClientConnectionToRemoteServer(NetHandler netClientHandler, String server, int port, NetworkManager networkManager)
+    public static void onClientConnectionToRemoteServer(NetHandler netClientHandler, String server, int port, INetworkManager networkManager)
    {
        NetworkRegistry.instance().connectionOpened(netClientHandler, server, port, networkManager);
    }

-    public static void onClientConnectionToIntegratedServer(NetHandler netClientHandler, MinecraftServer server, NetworkManager networkManager)
+    public static void onClientConnectionToIntegratedServer(NetHandler netClientHandler, MinecraftServer server, INetworkManager networkManager)
    {
        NetworkRegistry.instance().connectionOpened(netClientHandler, server, networkManager);
    }

-    public static void onConnectionClosed(NetworkManager manager, EntityPlayer player)
+    public static void onConnectionClosed(INetworkManager manager, EntityPlayer player)
    {
        NetworkRegistry.instance().connectionClosed(manager, player);
    }
--- a/fml/common/cpw/mods/fml/common/network/FMLPacket.java
+++ b/fml/common/cpw/mods/fml/common/network/FMLPacket.java
@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.logging.Level;

 import net.minecraft.src.NetHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;

 import com.google.common.base.Throwables;
 import com.google.common.primitives.Bytes;
@ -91,7 +91,7 @@ public abstract class FMLPacket

    public abstract FMLPacket consumePacket(byte[] data);

-    public abstract void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName);
+    public abstract void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName);
    {
        // TODO Auto-generated method stub

--- a/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java
+++ b/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java
@ -3,7 +3,7 @@ package cpw.mods.fml.common.network;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.src.NetHandler;
 import net.minecraft.src.NetLoginHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;
 import net.minecraft.src.Packet1Login;

 public interface IConnectionHandler
@ -16,7 +16,7 @@ public interface IConnectionHandler
     * @param netHandler
     * @param manager
     */
-    void playerLoggedIn(Player player, NetHandler netHandler, NetworkManager manager);
+    void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager);

    /**
     * If you don't want the connection to continue, return a non-empty string here
@ -28,7 +28,7 @@ public interface IConnectionHandler
     * @param netHandler
     * @param manager
     */
-    String connectionReceived(NetLoginHandler netHandler, NetworkManager manager);
+    String connectionReceived(NetLoginHandler netHandler, INetworkManager manager);

    /**
     * Fired when a remote connection is opened
@ -38,7 +38,7 @@ public interface IConnectionHandler
     * @param server
     * @param port
     */
-    void connectionOpened(NetHandler netClientHandler, String server, int port, NetworkManager manager);
+    void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager);
    /**
     *
     * Fired when a local connection is opened
@ -48,7 +48,7 @@ public interface IConnectionHandler
     * @param netClientHandler
     * @param server
     */
-    void connectionOpened(NetHandler netClientHandler, MinecraftServer server, NetworkManager manager);
+    void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager);

    /**
     * Fired when a connection closes
@ -57,7 +57,7 @@ public interface IConnectionHandler
     *
     * @param manager
     */
-    void connectionClosed(NetworkManager manager);
+    void connectionClosed(INetworkManager manager);

    /**
     * Fired when the client established the connection to the server
@ -67,6 +67,6 @@ public interface IConnectionHandler
     * @param manager
     * @param login
     */
-    void clientLoggedIn(NetHandler clientHandler, NetworkManager manager, Packet1Login login);
+    void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login);

 }
--- a/fml/common/cpw/mods/fml/common/network/IPacketHandler.java
+++ b/fml/common/cpw/mods/fml/common/network/IPacketHandler.java
@ -1,6 +1,6 @@
 package cpw.mods.fml.common.network;

-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;
 import net.minecraft.src.Packet250CustomPayload;

 public interface IPacketHandler
@ -11,5 +11,5 @@ public interface IPacketHandler
     * @param packet The packet itself
     * @param player A dummy interface representing the player - it can be cast into a real player instance if needed
     */
-    public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player);
+    public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player);
 }
--- a/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java
+++ b/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java
@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.Map.Entry;

 import net.minecraft.src.NetHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;

 import com.google.common.collect.Maps;
 import com.google.common.io.ByteArrayDataInput;
@ -56,7 +56,7 @@ public class ModIdentifiersPacket extends FMLPacket
    }

    @Override
-    public void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
+    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
    {
        for (Entry<String,Integer> idEntry : modIds.entrySet())
        {
--- a/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java
+++ b/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java
@ -9,7 +9,7 @@ import java.util.Map.Entry;
 import java.util.Set;

 import net.minecraft.src.NetHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;
 import net.minecraft.src.Packet250CustomPayload;

 import com.google.common.collect.Lists;
@ -73,10 +73,10 @@ public class ModListRequestPacket extends FMLPacket
     * This packet is executed on the client to evaluate the server's mod list against
     * the client
     *
-     * @see cpw.mods.fml.common.network.FMLPacket#execute(NetworkManager, FMLNetworkHandler, NetHandler, String)
+     * @see cpw.mods.fml.common.network.FMLPacket#execute(INetworkManager, FMLNetworkHandler, NetHandler, String)
     */
    @Override
-    public void execute(NetworkManager mgr, FMLNetworkHandler handler, NetHandler netHandler, String userName)
+    public void execute(INetworkManager mgr, FMLNetworkHandler handler, NetHandler netHandler, String userName)
    {
        List<String> missingMods = Lists.newArrayList();
        Map<String,String> modVersions = Maps.newHashMap();
--- a/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java
+++ b/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java
@ -11,7 +11,7 @@ import java.util.logging.Logger;

 import net.minecraft.src.NetHandler;
 import net.minecraft.src.NetLoginHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;
 import net.minecraft.src.Packet250CustomPayload;

 import com.google.common.collect.Lists;
@ -78,7 +78,7 @@ public class ModListResponsePacket extends FMLPacket
    }

    @Override
-    public void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
+    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
    {
        Map<String, ModContainer> indexedModList = Maps.newHashMap(Loader.instance().getIndexedModList());
        List<String> missingClientMods = Lists.newArrayList();
--- a/fml/common/cpw/mods/fml/common/network/ModMissingPacket.java
+++ b/fml/common/cpw/mods/fml/common/network/ModMissingPacket.java
@ -17,7 +17,7 @@ import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
 import cpw.mods.fml.common.versioning.VersionRange;

 import net.minecraft.src.NetHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;

 public class ModMissingPacket extends FMLPacket
 {
@ -86,7 +86,7 @@ public class ModMissingPacket extends FMLPacket
    }

    @Override
-    public void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
+    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
    {
        FMLCommonHandler.instance().getSidedDelegate().displayMissingMods(this);
    }
--- a/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java
+++ b/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java
@ -13,7 +13,7 @@ import net.minecraft.src.EntityPlayerMP;
 import net.minecraft.src.NetHandler;
 import net.minecraft.src.NetLoginHandler;
 import net.minecraft.src.NetServerHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;
 import net.minecraft.src.Packet131MapData;
 import net.minecraft.src.Packet1Login;
 import net.minecraft.src.Packet250CustomPayload;
@ -159,7 +159,7 @@ public class NetworkRegistry
        chatListeners.add(listener);
    }

-    void playerLoggedIn(EntityPlayerMP player, NetServerHandler netHandler, NetworkManager manager)
+    void playerLoggedIn(EntityPlayerMP player, NetServerHandler netHandler, INetworkManager manager)
    {
        generateChannelRegistration(player, netHandler, manager);
        for (IConnectionHandler handler : connectionHandlers)
@ -168,7 +168,7 @@ public class NetworkRegistry
        }
    }

-    String connectionReceived(NetLoginHandler netHandler, NetworkManager manager)
+    String connectionReceived(NetLoginHandler netHandler, INetworkManager manager)
    {
        for (IConnectionHandler handler : connectionHandlers)
        {
@ -181,7 +181,7 @@ public class NetworkRegistry
        return null;
    }

-    void connectionOpened(NetHandler netClientHandler, String server, int port, NetworkManager networkManager)
+    void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager networkManager)
    {
        for (IConnectionHandler handler : connectionHandlers)
        {
@ -189,7 +189,7 @@ public class NetworkRegistry
        }
    }

-    void connectionOpened(NetHandler netClientHandler, MinecraftServer server, NetworkManager networkManager)
+    void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager networkManager)
    {
        for (IConnectionHandler handler : connectionHandlers)
        {
@ -197,7 +197,7 @@ public class NetworkRegistry
        }
    }

-    void clientLoggedIn(NetHandler clientHandler, NetworkManager manager, Packet1Login login)
+    void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login)
    {
        generateChannelRegistration(clientHandler.getPlayer(), clientHandler, manager);
        for (IConnectionHandler handler : connectionHandlers)
@ -206,7 +206,7 @@ public class NetworkRegistry
        }
    }

-    void connectionClosed(NetworkManager manager, EntityPlayer player)
+    void connectionClosed(INetworkManager manager, EntityPlayer player)
    {
        for (IConnectionHandler handler : connectionHandlers)
        {
@ -215,7 +215,7 @@ public class NetworkRegistry
        activeChannels.removeAll(player);
    }

-    void generateChannelRegistration(EntityPlayer player, NetHandler netHandler, NetworkManager manager)
+    void generateChannelRegistration(EntityPlayer player, NetHandler netHandler, INetworkManager manager)
    {
        Packet250CustomPayload pkt = new Packet250CustomPayload();
        pkt.field_73630_a = "REGISTER";
@ -224,7 +224,7 @@ public class NetworkRegistry
        manager.func_74429_a(pkt);
    }

-    void handleCustomPacket(Packet250CustomPayload packet, NetworkManager network, NetHandler handler)
+    void handleCustomPacket(Packet250CustomPayload packet, INetworkManager network, NetHandler handler)
    {
        if ("REGISTER".equals(packet.field_73630_a))
        {
@ -241,7 +241,7 @@ public class NetworkRegistry
    }


-    private void handlePacket(Packet250CustomPayload packet, NetworkManager network, Player player)
+    private void handlePacket(Packet250CustomPayload packet, INetworkManager network, Player player)
    {
        String channel = packet.field_73630_a;
        for (IPacketHandler handler : Iterables.concat(universalPacketHandlers.get(channel), player instanceof EntityPlayerMP ? serverPacketHandlers.get(channel) : clientPacketHandlers.get(channel)))
--- a/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java
+++ b/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java
@ -2,7 +2,7 @@ package cpw.mods.fml.common.network;

 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.NetHandler;
-import net.minecraft.src.NetworkManager;
+import net.minecraft.src.INetworkManager;

 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
@ -49,7 +49,7 @@ public class OpenGuiPacket extends FMLPacket
    }

    @Override
-    public void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
+    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
    {
        EntityPlayer player = netHandler.getPlayer();
        player.openGui(networkId, modGuiId, player.field_70170_p, x, y, z);
--- a/fml/common/fml_at.cfg
+++ b/fml/common/fml_at.cfg
@ -1,75 +1,71 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public aji.a(Ljava/lang/Class;Ljava/lang/String;)V
+public aml.a(Ljava/lang/Class;Ljava/lang/String;)V
 # EntityList addMappings
-public jr.a(Ljava/lang/Class;Ljava/lang/String;I)V
-public jr.a(Ljava/lang/Class;Ljava/lang/String;III)V
+public le.a(Ljava/lang/Class;Ljava/lang/String;I)V
+public le.a(Ljava/lang/Class;Ljava/lang/String;III)V
 # EntityList nameToClassMap and idToClassMap and classToNameMap
-public jr.b
-public jr.d
-public jr.c
+public le.b
+public le.d
+public le.c
 # RenderEngine
-public avf.k # texturePack
+public azb.h # textureList
+public azb.k # texturePack
 # RenderManager renderers
-public avy.o
+public azv.o
 # RenderBlocks - everything
-public avg.*
-public avg.*()
-#RenderEngine - make TextureFX list public
-public avf.h
-public avf.k # texturePack
+public azc.*
+public azc.*()
 #RenderPlayer - make armorlist public and not final
-public-f awr.j
+public-f bap.h
 #StringTranslate - make the current table and language public
-public ak.b
-public ak.d
+public bd.b
+public bd.d
 # TileEntityRenderer - make the list of renderers public
-public axs.m
+public bbx.m
 # CraftingManager - make the add recipe methods public
-public td.a(Lrj;[Ljava/lang/Object;)V
-public td.b(Lrj;[Ljava/lang/Object;)V
+public vp.a(Ltu;[Ljava/lang/Object;)V
+public vp.b(Ltu;[Ljava/lang/Object;)V
 # WeightedRandomItem - make the "probability" public
-public is.a
+public kf.a
 # ItemStack - make itemId final
-#public+f rj.c
+#public+f tu.c
 # StatBase - Make statName public, no server side getter
-public hp.a
+public jb.a
 # NetLoginHandler make the "complete connection" callback public so I can reset it during FML negotiation
-public gx.a(Lgx;Z)Z
+public ij.a(Lij;Z)Z
 # NetLoginHandler userName field
-public gx.h
+public ij.h
 # EntityPlayerMP getNextWindowId
-public gu.bO()V
-public gu.cq
+public ig.cd()V
+public ig.cu
 # EntityAITaskEntry class -> public
-public kx
+public mn
 # EntityAITasks taskList
-public kw.a
+public mm.a
 # BlockChest isOcelotBlockingChest (a bounding box check actually)
-public afe.n(Lup;III)Z
+public ahy.n(Lxd;III)Z
 # EntityLiving
-public jw.aM # carryoverDamage
-# EntityLiving tasks
-public jw.bg
-# EntityAIOcelotSit nearestSittableBlock and isblocksittable
-protected li.a(Lup;III)Z
-protected li.f()Z
+public lm.aS # carryoverDamage
+public lm.bn # tasks
+public lm.bF # isJumping
+# EntityAIOcelotSit
+protected mz.a(Lxd;III)Z # nearestSittableBlock
+protected mz.f()Z # isblocksittable
 # CallableMinecraftVersion - sanity check the MC version
 public b
 public b.<init>(La;)V # constructor
 # EntityAnimal
-public mn.d # inLove
-# EntityLiving
-public jw.bu # isJumping
+public og.d # inLove
 # WorldType
-public va.<init>(ILjava/lang/String;)V
-public va.<init>(ILjava/lang/String;I)V
+public xo.<init>(ILjava/lang/String;)V
+public xo.<init>(ILjava/lang/String;I)V
 # ComponentVillage
-public aby
+public aep
 # EntityVillager - addbuy and addsell and minmax lists
-public od.a(Luj;ILjava/util/Random;F)V
-public od.b(Luj;ILjava/util/Random;F)V
-public od.bB
-public od.bC
+public qc.a(Lwv;ILjava/util/Random;F)V
+public qc.b(Lwv;ILjava/util/Random;F)V
+public qc.bO
+public qc.bP
 # GuiButtonMerchant
-public aqw
+public aul
--- 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
-og cpw/mods/fml/common/network/Player
+qf cpw/mods/fml/common/network/Player
 net.minecraft.src.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-aig cpw/mods/fml/common/registry/BlockProxy
+ale cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.src.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-rh cpw/mods/fml/common/registry/ItemProxy
+ts cpw/mods/fml/common/registry/ItemProxy
 net.minecraft.src.Item cpw/mods/fml/common/registry/ItemProxy
--- a/fml/conf/fields.csv
+++ b/fml/conf/fields.csv
@ -1072,6 +1072,7 @@ field_72699_b,players,2,players in the current instance
 field_72700_c,playerInstances,2,A map of chunk position (two ints concatenated into a long) to PlayerInstance
 field_72701_a,theWorldServer,2,
 field_72737_D,maxBlockZ,2,Maximum block Z
+field_72738_E,damagedBlocks,2,Stores blocks currently being broken. Key is entity ID of the thing doing the breaking. Value is a DestroyBlockProgress
 field_72739_F,renderDistance,2,
 field_72740_G,renderEntitiesStartupCounter,2,Render entities startup counter (init value=2)
 field_72741_A,minBlockZ,2,Minimum block Z
@ -1223,7 +1224,7 @@ field_73139_h,lastPitch,2,
 field_73140_i,lastHeadMotion,2,
 field_73141_v,ridingEntity,2,
 field_73142_u,ticksSinceLastForcedTeleport,2,"every 400 ticks a  full teleport packet is sent, rather than just a ""move me +x"" command, so that position remains fully synced."
-field_73143_t,trackMotion,2,
+field_73143_t,sendVelocityUpdates,2,
 field_73144_s,isDataInitialized,2,set to true on first sendLocationToClients
 field_73145_r,posZ,2,
 field_73146_q,posY,2,
--- a/fml/conf/joined.exc
+++ b/fml/conf/joined.exc
--- 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  = 969699f13e5bbe7f12e40ac4f32b7d9a
-MD5Server  = c047f82522e53f2ec3c6b64304dfad0f
+MD5Client  = 32a654388b54d3e4bb29c1a46e7d6a12
+MD5Server  = 99f84541e184979c5b0312e9afc56ce1

 [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           = 80000
-ParamIndex        = 4000
+RGIndex           = 82000
+ParamIndex        = 5000

 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg
--- a/fml/conf/methods.csv
+++ b/fml/conf/methods.csv
@ -121,7 +121,9 @@ func_70220_a,moveTowards,2,"The location the eye should float/move towards. Curr
 func_70227_a,onImpact,2,Called when this EntityFireball hits a block or entity.
 func_70239_b,setDamage,2,
 func_70240_a,setKnockbackStrength,2,Sets the amount of knockback the arrow applies when it hits a mob.
+func_70241_g,getIsCritical,2,Whether the arrow has a stream of critical hit particles flying behind it.
 func_70242_d,getDamage,2,
+func_70243_d,setIsCritical,2,Whether the arrow has a stream of critical hit particles flying behind it.
 func_70244_c,setArrowHeading,2,"Uses the provided coordinates as a heading and determines the velocity from it with the set force and random variance. Args: x, y, z, force, forceVariation"
 func_70265_b,setTimeSinceHit,2,Sets the time to count down from since the last time entity was hit.
 func_70266_a,setDamageTaken,2,Sets the damage taken from the last hit.
@ -765,7 +767,7 @@ func_71548_a,saveProfilerResults,2,
 func_71549_c,getWittyComment,2,"Returns a random ""witty"" comment."
 func_71552_a,setTime,2,Set the time in the server object.
 func_71553_b,addTime,2,Adds (or removes) time in the server object.
-func_71554_c,reallyToggleDownfall,2,Toggle rain and enable thundering.
+func_71554_c,toggleDownfall,2,Toggle rain and enable thundering.
 func_71555_a,getCommands,2,"returns a map of string to commads. All commands are returned, not just ones which someone has permission to use."
 func_71556_a,executeCommand,2,
 func_71557_a,getPossibleCommands,2,returns all commands that the commandSender can use
@ -1862,6 +1864,7 @@ func_74192_a,drawSlotInventory,2,Draws an inventory slot
 func_74199_h,getIMerchant,2,Gets the Instance of IMerchant interface.
 func_74221_h,displayDebuffEffects,2,Displays debuff/potion effects that are currently being applied to the player
 func_74226_k,needsScrollBars,2,returns (if you are not on the inventoryTab) and (the flag isn't set) and( you have more than 1 page of items)
+func_74228_j,updateCreativeSearch,2,
 func_74229_i,getInventory,2,Returns the creative inventory
 func_74231_b,renderCreativeInventoryHoveringText,2,"Renders the creative inventory hovering text if mouse is over it. Returns true if did render or false otherwise. Params: current creative tab to be checked, current mouse x position, current mouse y position."
 func_74233_a,renderCreativeTab,2,Renders passed creative inventory tab into the screen.
@ -3338,6 +3341,7 @@ func_77871_c,createMapDataPacket,2,returns null if no update is to be sent
 func_77872_a,updateMapData,2,
 func_77873_a,getMapData,2,
 func_77874_a,getMPMapData,2,
+func_77875_a,tryPlaceContainedLiquid,2,Attempts to place the liquid contained inside the bucket.
 func_77877_c,getMaxDamageArray,2,"Returns the 'max damage' factor array for the armor, each piece of armor have a durability factor (that gets multiplied by armor material factor)"
 func_77883_f,getBlockID,2,Returns the blockID for this Item
 func_77884_a,canPlaceItemBlockOnSide,2,Returns true if the given ItemBlock can be placed on the given side of the given block position.
@ -3351,6 +3355,7 @@ func_77913_a,applyIngredient,2,"Generate a data value for a potion, given its pr
 func_77914_a,checkFlag,2,Is the bit given set to 1?
 func_77916_d,isFlagUnset,2,"Returns 0 if the flag is set, 1 if it is not set."
 func_77917_b,getPotionEffects,2,Returns a list of effects for the specified potion damage value.
+func_77941_a,onBlockDestroyed,2,
 func_77942_o,hasTagCompound,2,Returns true if the ItemStack has an NBTTagCompound. Currently used to store enchantments.
 func_77943_a,tryPlaceItemIntoWorld,2,
 func_77944_b,copyItemStack,2,"Creates a copy of a ItemStack, a null parameters will return a null."
--- a/fml/conf/params.csv
+++ b/fml/conf/params.csv
--- a/fml/conf/patches/minecraft_ff.patch
+++ b/fml/conf/patches/minecraft_ff.patch
@ -1,7 +1,7 @@
 diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- 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 @@
+--- minecraft\net\minecraft\client\Minecraft.java	Sat Oct 20 04:10:42 2012
+++ minecraft_patched\net\minecraft\client\Minecraft.java	Sat Oct 20 04:20:32 2012
+@@ -541,9 +541,8 @@
          return;
       }
 
@ -12,7 +12,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
                if(this.field_71434_R && this.field_71433_S != null) {
                   this.func_71377_b(this.field_71433_S);
                   return;
-@@ -559,7 +558,6 @@
+@@ -561,7 +560,6 @@
                   this.func_71373_a(new GuiMemoryErrorScreen());
                   System.gc();
                }
@ -20,7 +20,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
             }
          } catch (MinecraftError var12) {
             ;
-@@ -577,8 +575,6 @@
+@@ -579,8 +577,6 @@
             this.func_71405_e();
          }
 
@ -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	Tue Aug 14 20:15:26 2012
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Tue Aug 14 20:18:48 2012
+--- minecraft\net\minecraft\src\CodecMus.java	Sat Oct 20 04:10:43 2012
+++ minecraft_patched\net\minecraft\src\CodecMus.java	Sat Oct 20 04:17:33 2012
@@ -1,5 +1,6 @@
 package net.minecraft.src;
 
@ -43,16 +43,17 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
 public class CodecMus extends CodecJOrbis {
 
    protected InputStream openInputStream() {
+-      return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
 +      try {
-       return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
-+      } catch(IOException ex) {
+         return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
+      } catch (IOException e) {
 +         return null;
 +      }
    }
 }
 diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
--- 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
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Oct 20 04:10:43 2012
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Oct 20 04:16:45 2012
@@ -11,6 +11,10 @@
 
 public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@ -65,18 +66,9 @@ 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	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 p_71230_1_;
-@@ -193,7 +193,7 @@
+--- minecraft\net\minecraft\src\DedicatedServer.java	Sat Oct 20 04:10:43 2012
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sat Oct 20 04:16:25 2012
+@@ -194,7 +194,7 @@
       System.exit(0);
    }
 
@ -85,10 +77,33 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
       super.func_71190_q();
       this.func_71333_ah();
    }
+diff -r -U 3 minecraft\net\minecraft\src\EnumFacing.java minecraft_patched\net\minecraft\src\EnumFacing.java
+--- minecraft\net\minecraft\src\EnumFacing.java	Sat Oct 20 04:10:44 2012
+++ minecraft_patched\net\minecraft\src\EnumFacing.java	Sat Oct 20 04:15:54 2012
+@@ -15,10 +15,6 @@
+    private final int field_82612_k;
+    private static final EnumFacing[] field_82609_l = new EnumFacing[6];
+ 
+-   public static EnumFacing[] func_82598_values() {
+-      return (EnumFacing[])field_82610_m.clone();
+-   }
+-
+    private EnumFacing(int p_i5027_3_, int p_i5027_4_, int p_i5027_5_, int p_i5027_6_, int p_i5027_7_) {
+       this.field_82603_g = p_i5027_3_;
+       this.field_82613_h = p_i5027_4_;
+@@ -40,7 +36,7 @@
+    }
+ 
+    static {
+-      EnumFacing[] var0 = func_82598_values();
+      EnumFacing[] var0 = values();
+       int var1 = var0.length;
+ 
+       for(int var2 = 0; var2 < var1; ++var2) {
 diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
--- 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 @@
+--- minecraft\net\minecraft\src\FontRenderer.java	Sat Oct 20 04:10:44 2012
+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sat Oct 20 04:21:56 2012
+@@ -713,8 +713,6 @@
       for(boolean var7 = false; var5 < var3; ++var5) {
          char var8 = p_78259_1_.charAt(var5);
          switch(var8) {
@ -97,18 +112,18 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
          case 167:
             if(var5 < var3 - 1) {
                ++var5;
-@@ -726,6 +724,8 @@
+@@ -728,6 +726,8 @@
                }
             }
             break;
 +         case 32:
-+            var6 = var5;
+             var6 = var5;
          default:
             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	Tue Aug 14 20:15:26 2012
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Tue Aug 14 20:24:49 2012
+--- minecraft\net\minecraft\src\IntegratedServer.java	Sat Oct 20 04:10:44 2012
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sat Oct 20 04:15:39 2012
@@ -98,7 +98,7 @@
       return true;
    }
@ -118,38 +133,10 @@ 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) {
-@@ -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));
-diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
--- 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 @@
-    }
- 
-    public static MapData func_77874_a(short p_77874_0_, World p_77874_1_) {
-      "map_" + p_77874_0_;
-       MapData var3 = (MapData)p_77874_1_.func_72943_a(MapData.class, "map_" + p_77874_0_);
-       if(var3 == null) {
-          int var4 = p_77874_1_.func_72841_b("map");
-@@ -37,7 +36,6 @@
-    }
- 
-    public MapData func_77873_a(ItemStack p_77873_1_, World p_77873_2_) {
-      "map_" + p_77873_1_.func_77960_j();
-       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\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
--- 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 @@
+--- minecraft\net\minecraft\src\RenderGlobal.java	Sat Oct 20 04:10:45 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sat Oct 20 04:15:23 2012
+@@ -1443,7 +1443,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_;
          double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
@ -159,8 +146,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	Tue Aug 14 20:15:27 2012
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Tue Aug 14 20:18:48 2012
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Sat Oct 20 04:10:45 2012
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sat Oct 20 04:22:25 2012
@@ -11,6 +11,7 @@
       this.field_74504_a = p_i3285_1_;
    }
@ -170,15 +157,15 @@ 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	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 @@
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Sat Oct 20 04:10:45 2012
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Oct 20 04:23:05 2012
+@@ -20,7 +20,8 @@
    }
 
    public void run() {
-+      while(true) {
-       this.func_75736_b();
-+      }
+-      this.func_75736_b();
+      while(true)
+         this.func_75736_b();
    }
 
    private void func_75736_b() {
--- 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	Tue Aug 14 20:16:02 2012
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Aug 14 20:19:30 2012
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Oct 20 04:11:53 2012
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Oct 20 04:14:21 2012
@@ -11,6 +11,10 @@
 
 public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@ -13,18 +13,9 @@ 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	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 p_71230_1_;
-@@ -194,7 +194,7 @@
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Sat Oct 20 04:11:53 2012
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sat Oct 20 04:13:58 2012
+@@ -195,7 +195,7 @@
       System.exit(0);
    }
 
@ -33,20 +24,32 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
       super.func_71190_q();
       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	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 @@
+diff -r -U 3 minecraft_server\net\minecraft\src\EnumFacing.java minecraft_server_patched\net\minecraft\src\EnumFacing.java
+--- minecraft_server\net\minecraft\src\EnumFacing.java	Sat Oct 20 04:11:53 2012
+++ minecraft_server_patched\net\minecraft\src\EnumFacing.java	Sat Oct 20 04:13:22 2012
+@@ -15,10 +15,6 @@
+    private final int field_82612_k;
+    private static final EnumFacing[] field_82609_l = new EnumFacing[6];
+ 
+-   public static EnumFacing[] func_82598_values() {
+-      return (EnumFacing[])field_82610_m.clone();
+-   }
+-
+    private EnumFacing(int p_i5027_3_, int p_i5027_4_, int p_i5027_5_, int p_i5027_6_, int p_i5027_7_) {
+       this.field_82603_g = p_i5027_3_;
+       this.field_82613_h = p_i5027_4_;
+@@ -40,7 +36,7 @@
    }
 
-    public MapData func_77873_a(ItemStack p_77873_1_, World p_77873_2_) {
-      "map_" + p_77873_1_.func_77960_j();
-       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"));
+    static {
+-      EnumFacing[] var0 = func_82598_values();
+      EnumFacing[] var0 = values();
+       int var1 = var0.length;
+ 
+       for(int var2 = 0; var2 < var1; ++var2) {
 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	Tue Aug 14 20:16:03 2012
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Tue Aug 14 20:19:30 2012
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Sat Oct 20 04:11:54 2012
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sat Oct 20 04:18:38 2012
@@ -11,6 +11,7 @@
       this.field_74504_a = p_i3285_1_;
    }
@ -56,26 +59,15 @@ 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	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 @@
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Sat Oct 20 04:11:54 2012
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Oct 20 04:19:13 2012
+@@ -20,7 +20,8 @@
    }
 
    public void run() {
-+      while(true) {
-       this.func_75736_b();
-+      }
+-      this.func_75736_b();
+      while(true)
+         this.func_75736_b();
    }
 
    private void func_75736_b() {
-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
-@@ -24,7 +24,6 @@
-    }
- 
-    public static MapData func_77874_a(short p_77874_0_, World p_77874_1_) {
-      "map_" + p_77874_0_;
-       MapData var3 = (MapData)p_77874_1_.func_72943_a(MapData.class, "map_" + p_77874_0_);
-       if(var3 == null) {
-          int var4 = p_77874_1_.func_72841_b("map");
--- a/fml/conf/version.cfg
+++ b/fml/conf/version.cfg
@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.2
-ClientVersion = 1.3.2
-ServerVersion = 1.3.2
+MCPVersion = 7.17
+ClientVersion = 1.4
+ServerVersion = 1.4
--- a/fml/eclipse/.gitignore
+++ b/fml/eclipse/.gitignore
@ -1,6 +1,43 @@
-/*/bin
-/*/.settings/org.eclipse.ltk.core.refactoring.prefs
-*.cdt.*
-*.ajdt.*
-/.log
-*.m2e.*
+/*
+!.gitignore
+!/Clean/
+/Clean/*
+!/Clean/.classpath
+!/Clean/.project
+!/Clean/.settings/
+/Clean/.settings/*
+!/Clean/.settings/org.eclipse.jdt.core.prefs
+!/FML/
+/FML/*
+!/FML/.classpath
+!/FML/.project
+!/FML/.settings/
+/FML/.settings/*
+!/FML/.settings/org.eclipse.jdt.core.prefs
+!/.metadata/
+/.metadata/*
+!/.metadata/.plugins/
+/.metadata/.plugins/*
+!/.metadata/.plugins/org.eclipse.core.runtime/
+/.metadata/.plugins/org.eclipse.core.runtime/*
+!/.metadata/.plugins/org.eclipse.core.runtime/.settings/
+/.metadata/.plugins/org.eclipse.core.runtime/.settings/*
+!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
+!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
+!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs
+!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
+!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
+!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
+!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
+!/.metadata/.plugins/org.eclipse.debug.core/
+/.metadata/.plugins/org.eclipse.debug.core/*
+!/.metadata/.plugins/org.eclipse.debug.core/.launches/
+/.metadata/.plugins/org.eclipse.debug.core/.launches/*
+!/.metadata/.plugins/org.eclipse.debug.core/.launches/CleanClient.launch
+!/.metadata/.plugins/org.eclipse.debug.core/.launches/CleanServer.launch
+!/.metadata/.plugins/org.eclipse.debug.core/.launches/FMLClient.launch
+!/.metadata/.plugins/org.eclipse.debug.core/.launches/FMLServer.launch
+!/.metadata/.plugins/org.eclipse.debug.ui/
+/.metadata/.plugins/org.eclipse.debug.ui/*
+!/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
+
--- a/fml/eclipse/.metadata/.gitignore
+++ b/fml/eclipse/.metadata/.gitignore
@ -1,3 +0,0 @@
-/.mylyn/
-.lock
-version.ini
--- a/fml/eclipse/.metadata/.plugins/.gitignore
+++ b/fml/eclipse/.metadata/.plugins/.gitignore
@ -1,12 +0,0 @@
-/org.eclipse.epp.usagedata.recording/
-/org.eclipse.jdt.core/
-/org.eclipse.jdt.launching/
-/org.eclipse.jdt.ui/
-/org.eclipse.ltk.core.refactoring/
-/org.eclipse.ltk.ui.refactoring/
-/org.eclipse.m2e.logback.configuration/
-/org.eclipse.mylyn.bugzilla.core/
-/org.eclipse.mylyn.tasks.ui/
-/org.eclipse.team.cvs.core/
-/org.eclipse.ui.workbench/
-/org.eclipse.wb.discovery.core/
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.gitignore
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.gitignore
@ -1,7 +0,0 @@
-/.safetable/
-/.history/
-/.projects/*/*.snap
-/.projects/*/.syncinfo
-/.projects/*/.markers
-/.projects/*/*/
-/.root/
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Clean/placeholder
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Clean/placeholder
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/FML/placeholder
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/FML/placeholder
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/.gitignore
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/.gitignore
@ -1,12 +0,0 @@
-/org.eclipse.jdt.launching.prefs
-/org.eclipse.m2e.discovery.prefs
-/org.eclipse.mylyn.context.core.prefs
-/org.eclipse.mylyn.monitor.ui.prefs
-/org.eclipse.team.cvs.ui.prefs
-/org.eclipse.team.ui.prefs
-/org.eclipse.ui.workbench.prefs
-/org.eclipse.wst.sse.core.prefs
-/org.eclipse.epp.usagedata.gathering.prefs
-/org.eclipse.debug.ui.prefs
-/org.eclipse.jdt.ui.prefs
-/org.eclipse.ui.ide.prefs
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
@ -1,3 +1,4 @@
+#Sun Jun 05 18:58:07 CEST 2011
+version=1
 eclipse.preferences.version=1
 refresh.enabled=true
-version=1
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
@ -0,0 +1,6 @@
+Console.highWaterMark=88000
+StringVariablePreferencePage=130,107,107,86,
+eclipse.preferences.version=1
+org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\n<launchPerspectives/>\n
+org.eclipse.debug.ui.UseContextualLaunch=false
+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
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs
+++ b/fml/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/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
@ -1,305 +1,14 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+#Sun Sep 18 16:44:39 NZST 2011
 org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=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
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=true
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=true
-org.eclipse.jdt.core.formatter.lineSplit=160
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.timeoutForParameterNameFromAttachedJavadoc=50
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
@ -1,5 +1,4 @@
-eclipse.preferences.version=1
-lineNumberRuler=true
-overviewRuler_migration=migrated_3.1
-showWhitespaceCharacters=true
+#Sun Jun 05 18:58:05 CEST 2011
 spacesForTabs=true
+eclipse.preferences.version=1
+overviewRuler_migration=migrated_3.1
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
@ -0,0 +1,9 @@
+IMPORT_FILES_AND_FOLDERS_MODE=prompt
+IMPORT_FILES_AND_FOLDERS_VIRTUAL_FOLDER_MODE=prompt
+PROBLEMS_FILTERS_MIGRATE=true
+SAVE_ALL_BEFORE_BUILD=true
+TASKS_FILTERS_MIGRATE=true
+eclipse.preferences.version=1
+platformState=1349115159163
+quickStart=false
+tipsAndTricks=true
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Client.launch
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Client.launch
@ -1,13 +0,0 @@
-<?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="/Clean-Client/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="Clean-Client"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:Clean-Client/jars}"/>
-</launchConfiguration>
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Server.launch
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Server.launch
@ -1,13 +0,0 @@
-<?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="/Clean-Server/src/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="Clean-Server"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:Clean-Server/jars}"/>
-</launchConfiguration>
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch
@ -1,31 +0,0 @@
-<?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="/FML-Client/src/Start.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DATA_COLLECTOR" value="org.eclipse.tptp.trace.jvmti.jvmtiMechanism:org.eclipse.tptp.analysisType.jvmti.execution"/>
-<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_FILE" value=""/>
-<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_MONITOR" value="DefaultMonitor"/>
-<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_PROJECT" value="ProfileProject"/>
-<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_PROFILE_TO_FILE" value="false"/>
-<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_PROFILING_SET" value="tptp-dummy-profiling-set-FML-Client"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6&quot; javaProject=&quot;FML-Client&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;FML-Client&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;FML-MockMod&quot; type=&quot;1&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;simpletestmod&quot; type=&quot;1&quot;/&gt;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="Start"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="FML-Client"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:FML-Client/jars}"/>
-<booleanAttribute key="org.eclipse.tptp.platform.jvmti.client.ATTR_EXEC_AUTO_POLLING" value="true"/>
-<booleanAttribute key="org.eclipse.tptp.platform.jvmti.client.ATTR_EXEC_CPU_TIME" value="true"/>
-<booleanAttribute key="org.eclipse.tptp.platform.jvmti.client.ATTR_EXEC_FLOW" value="true"/>
-<booleanAttribute key="org.eclipse.tptp.platform.jvmti.client.ATTR_EXEC_MANUAL_POLLING" value="false"/>
-<intAttribute key="org.eclipse.tptp.platform.jvmti.client.ATTR_EXEC_POLLING_TIME" value="60"/>
-</launchConfiguration>
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch
@ -1,19 +0,0 @@
-<?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="/FML-Client/src-common/net/minecraft/server/MinecraftServer.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6&quot; javaProject=&quot;FML-Client&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;FML-Client&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;FML-MockMod&quot; type=&quot;1&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;yourcraft&quot; type=&quot;1&quot;/&gt;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraft.server.MinecraftServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="FML-Client"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:FML-Client/jars}"/>
-</launchConfiguration>
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/.gitignore
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/.gitignore
@ -1,2 +0,0 @@
-/dialog_settings.xml
-/launchConfigurationHistory.xml
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
+++ b/fml/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/eclipse/Clean-Server/.classpath
+++ b/fml/eclipse/Clean-Server/.classpath
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-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="output" path="bin"/>
-</classpath>
--- a/fml/eclipse/Clean-Server/.project
+++ b/fml/eclipse/Clean-Server/.project
@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Clean-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-base/minecraft_server</locationURI>
-		</link>
-		<link>
-			<name>src-common</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/src-base/common</locationURI>
-		</link>
-	</linkedResources>
-	<filteredResources>
-		<filter>
-			<id>0</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-2-WORKSPACE_LOC%7D</value>
-		</variable>
-	</variableList>
-</projectDescription>
--- a/fml/eclipse/Clean-Client/.classpath
+++ b/fml/eclipse/Clean-Client/.classpath
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-common"/>
+	<classpathentry kind="src" path="mc-common"/>
+	<classpathentry kind="src" path="mc-client"/>
 	<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>
@ -10,15 +10,14 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="jars/bin/lwjgl_util.jar">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Clean-Client/jars/bin/natives"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Client/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="Clean-Client/jars/bin/natives"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Client/jars/bin/natives"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="jars/bin/minecraft.jar"/>
-	<classpathentry kind="lib" path="lib/argo-2.25.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/fml/eclipse/Clean-Client/.project
+++ b/fml/eclipse/Clean-Client/.project
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Clean-Client</name>
+	<name>Clean</name>
 	<comment></comment>
 	<projects>
 	</projects>
@ -21,17 +21,12 @@
 			<locationURI>MCP_LOC/jars</locationURI>
 		</link>
 		<link>
-			<name>lib</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/lib</locationURI>
-		</link>
-		<link>
-			<name>src</name>
+			<name>mc-client</name>
 			<type>2</type>
 			<locationURI>MCP_LOC/src-base/minecraft</locationURI>
 		</link>
 		<link>
-			<name>src-common</name>
+			<name>mc-common</name>
 			<type>2</type>
 			<locationURI>MCP_LOC/src-base/common</locationURI>
 		</link>
@ -47,7 +42,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1307293504507</id>
+			<id>0</id>
 			<name>jars/bin</name>
 			<type>5</type>
 			<matcher>
@ -56,7 +51,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1307293480435</id>
+			<id>0</id>
 			<name>jars/bin/natives</name>
 			<type>6</type>
 			<matcher>
--- a/fml/eclipse/Clean-Client/.settings/org.eclipse.jdt.core.prefs
+++ b/fml/eclipse/Clean-Client/.settings/org.eclipse.jdt.core.prefs
--- a/fml/eclipse/FML-Client/.classpath
+++ b/fml/eclipse/FML-Client/.classpath
@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-common"/>
-	<classpathentry kind="src" path="common"/>
-	<classpathentry kind="src" path="transformers"/>
-	<classpathentry kind="src" path="client"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="lib" path="jars/bin/jinput.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="FML-Client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="jars/bin/lwjgl_util.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="FML-Client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="jars/bin/lwjgl.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="FML-Client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="jars/bin/minecraft.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/argo-2.25.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-all-4.0-source.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
--- a/fml/eclipse/FML-Client/.project
+++ b/fml/eclipse/FML-Client/.project
@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>FML-Client</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>build.xml</name>
-			<type>1</type>
-			<locationURI>MCP_LOC/FML/build.xml</locationURI>
-		</link>
-		<link>
-			<name>client</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/FML/client</locationURI>
-		</link>
-		<link>
-			<name>common</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/FML/common</locationURI>
-		</link>
-		<link>
-			<name>jars</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/jars</locationURI>
-		</link>
-		<link>
-			<name>lib</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/lib</locationURI>
-		</link>
-		<link>
-			<name>src</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/src-work/minecraft</locationURI>
-		</link>
-		<link>
-			<name>src-common</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/src-work/common</locationURI>
-		</link>
-		<link>
-			<name>transformers</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/FML/transformers</locationURI>
-		</link>
-		<link>
-			<name>common/fmlversion.properties</name>
-			<type>1</type>
-			<locationURI>MCP_LOC/FML/fmlversion.properties</locationURI>
-		</link>
-	</linkedResources>
-	<filteredResources>
-		<filter>
-			<id>0</id>
-			<name>jars</name>
-			<type>13</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-bin</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1307293504507</id>
-			<name>jars/bin</name>
-			<type>5</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*.jar</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1307293480435</id>
-			<name>jars/bin/natives</name>
-			<type>6</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-	<variableList>
-		<variable>
-			<name>MCP_LOC</name>
-			<value>$%7BPARENT-2-WORKSPACE_LOC%7D</value>
-		</variable>
-	</variableList>
-</projectDescription>
--- a/fml/eclipse/FML-Client/.settings/org.eclipse.jdt.core.prefs
+++ b/fml/eclipse/FML-Client/.settings/org.eclipse.jdt.core.prefs
@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
--- a/fml/eclipse/FML-Client/tstann.jpage
+++ b/fml/eclipse/FML-Client/tstann.jpage
@ -1,44 +0,0 @@
-java.io.FileInputStream fis = new java.io.FileInputStream(new java.io.File("/home/cpw/projects/FML/mc131/FML/eclipse/FML-MockMod/bin/cpw/mods/mockmod/MockMod.class"));
-
-System.out.println(new cpw.mods.fml.common.discovery.asm.ASMModParser(fis));
-com.sun.jdi.VMDisconnectedException: Got IOException from Virtual Machine
-	at org.eclipse.jdi.internal.connect.PacketReceiveManager.getReply(PacketReceiveManager.java:179)
-	at org.eclipse.jdi.internal.connect.PacketReceiveManager.getReply(PacketReceiveManager.java:197)
-	at org.eclipse.jdi.internal.MirrorImpl.requestVM(MirrorImpl.java:191)
-	at org.eclipse.jdi.internal.MirrorImpl.requestVM(MirrorImpl.java:226)
-	at org.eclipse.jdi.internal.ObjectReferenceImpl.invokeMethod(ObjectReferenceImpl.java:428)
-	at org.eclipse.jdt.internal.debug.core.model.JDIThread.invokeMethod(JDIThread.java:958)
-	at org.eclipse.jdt.internal.debug.core.model.JDIObjectValue.sendMessage(JDIObjectValue.java:95)
-	at org.eclipse.jdt.internal.debug.eval.LocalEvaluationEngine.run(LocalEvaluationEngine.java:226)
-	at org.eclipse.jdt.internal.debug.core.model.JDIThread.runEvaluation(JDIThread.java:764)
-	at org.eclipse.jdt.internal.debug.eval.LocalEvaluationEngine.acceptClassFiles(LocalEvaluationEngine.java:212)
-	at org.eclipse.jdt.internal.core.eval.RequestorWrapper.acceptClassFiles(RequestorWrapper.java:48)
-	at org.eclipse.jdt.internal.eval.EvaluationContext.evaluate(EvaluationContext.java:296)
-	at org.eclipse.jdt.internal.eval.EvaluationContext.evaluate(EvaluationContext.java:315)
-	at org.eclipse.jdt.internal.core.eval.EvaluationContextWrapper.evaluateCodeSnippet(EvaluationContextWrapper.java:244)
-	at org.eclipse.jdt.internal.debug.eval.LocalEvaluationEngine$1.run(LocalEvaluationEngine.java:444)
-	at java.lang.Thread.run(Thread.java:679)
-
-
-java.io.FileInputStream fis = new java.io.FileInputStream(new java.io.File("/home/cpw/projects/FML/mcsnapshot/FML/eclipse/simpletestmod/bin/net/minecraft/src/mod_testMod.class"));
-
-System.out.println(new cpw.mods.fml.common.asm.ASMModParser(fis));
-
-
-
-org.objectweb.asm.Type.getDescriptor(net.minecraft.src.CraftingManager.class.getDeclaredMethods()[1])
-
-
-com.google.common.collect.Tables.newCustomTable(new HashMap<String,Map<String,List<String>>(), new com.google.common.base.Supplier() {
-
-});
-
-
-
-
-
-
-byte[] bytes = new byte[] {0, 0, 0, 1, 0, 0, 0, -107, 0, 0, 22, 83, 0, 0, 25, -48, 0, 0, 8, 70, 0, 0, 32, 80, 0, 0, 0, 0, 0, 33, 1, 44, 74, 0, 0, 0, 0, 75, 0, 0, 0, 0, 76, 0, 0, 0, 0, 77, 0, 0, 0, 0, 78, 0, 0, 0, 0, 79, 0, 0, 0, 0, 81, 0, 0, 0, 0, 80, 0, 0, 0, 0, 83, 0, 0, 0, 0, 82, 0, 0, 0, 0, 85, 0, 0, 0, 0, 84, 0, 0, 0, 0, 23, 0, 22, 0, 25, 0, 24, 0, -102, 0, 0, 127, 0, 0, 0, 0};
-new cpw.mods.fml.common.network.EntitySpawnPacket().consumePacket(bytes)
-
-108 - 27 - 4 
--- a/fml/eclipse/FML-MockMod/.classpath
+++ b/fml/eclipse/FML-MockMod/.classpath
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="src" path="/FML-Client"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
--- a/fml/eclipse/FML-MockMod/.project
+++ b/fml/eclipse/FML-MockMod/.project
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>FML-MockMod</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>
-</projectDescription>
--- a/fml/eclipse/FML-MockMod/.settings/org.eclipse.jdt.core.prefs
+++ b/fml/eclipse/FML-MockMod/.settings/org.eclipse.jdt.core.prefs
@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
--- a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockBlock.java
+++ b/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockBlock.java
@ -1,20 +0,0 @@
-package cpw.mods.mockmod;
-
-import cpw.mods.fml.common.Mod.Instance;
-import net.minecraft.src.Block;
-import net.minecraft.src.Material;
-
-public class MockBlock extends Block
-{
-    static
-    {
-        Thread.dumpStack();
-    }
-    @Instance("mod_testMod")
-    public static Object tstInstance;
-
-    public MockBlock(int id)
-    {
-        super(id,Material.field_76259_v);
-    }
-}
--- a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java
+++ b/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java
@ -1,80 +0,0 @@
-package cpw.mods.mockmod;
-
-import net.minecraft.src.GuiErrorScreen;
-import net.minecraft.src.ItemBlock;
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.NetworkManager;
-import net.minecraft.src.Packet131MapData;
-import net.minecraft.src.Packet250CustomPayload;
-import net.minecraft.src.FontRenderer;
-import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.Block;
-import cpw.mods.fml.common.Mod.Init;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.Mod.Metadata;
-import cpw.mods.fml.common.Mod.PreInit;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.asm.SideOnly;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.network.IPacketHandler;
-import cpw.mods.fml.common.network.ITinyPacketHandler;
-import cpw.mods.fml.common.network.NetworkMod;
-import cpw.mods.fml.common.network.NetworkMod.SidedPacketHandler;
-import cpw.mods.fml.common.network.Player;
-import cpw.mods.fml.common.ModMetadata;
-
-@Mod(modid="MockMod", name="Mock Mod",version="1.2.3", dependencies="after:FML@[3.1.29,)", useMetadata=true,acceptedMinecraftVersions="[1.3,),[12w27a,)")
-@NetworkMod(channels={"MockMod"},clientSideRequired=true,packetHandler=MockMod.PacketHandler.class,clientPacketHandlerSpec=
-@SidedPacketHandler(packetHandler=TestClass.class,channels={"Fish"}),tinyPacketHandler=MockMod.PacketHandler.class)
-public class MockMod
-{
-    public static class PacketHandler implements IPacketHandler, ITinyPacketHandler
-    {
-        @Override
-        public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player)
-        {
-        }
-
-        @Override
-        public void handle(NetHandler handler, Packet131MapData mapData)
-        {
-
-        }
-    }
-    public class TestItem extends ItemBlock
-    {
-
-        public TestItem(int id)
-        {
-            super(id);
-        }
-
-    }
-
-    @Instance
-    public static MockMod myInstance;
-
-    @Metadata
-    private ModMetadata meta;
-
-    @SidedProxy(clientSide="cpw.mods.mockmod.MockProxyClient", serverSide="cpw.mods.mockmod.MockProxy")
-    public static MockProxy proxy;
-//    @Block(name="MyBlock", itemTypeClass=TestItem.class)
-//    private MockBlock myBlock;
-
-    @PreInit
-    public void preinit(FMLPreInitializationEvent evt)
-    {
-        System.out.printf("Hello from mockmod preinit %s\n", evt.getSourceFile());
-        evt.getModMetadata().description="Fishy fish head";
-        evt.getModMetadata().autogenerated = false;
-    }
-    @Init
-    public void init(FMLInitializationEvent evt)
-    {
-        System.out.printf("Hello from mockmod init : %s %s %s\n", myInstance, meta, MockBlock.tstInstance);
-    }
-}
--- a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockProxy.java
+++ b/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockProxy.java
@ -1,9 +0,0 @@
-package cpw.mods.mockmod;
-
-public class MockProxy
-{
-    public void throwError()
-    {
-        throw new RuntimeException();
-    }
-}
--- a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockProxyClient.java
+++ b/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockProxyClient.java
@ -1,29 +0,0 @@
-package cpw.mods.mockmod;
-
-import net.minecraft.src.FontRenderer;
-import net.minecraft.src.GuiErrorScreen;
-import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
-
-public class MockProxyClient extends MockProxy
-{
-    @Override
-    public void throwError()
-    {
-        throw new CustomModLoadingErrorDisplayException()
-        {
-
-            @Override
-            public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int par1, int par2, float par3)
-            {
-                errorScreen.func_73732_a(fontRenderer, "MockMod doesn't like your installation", errorScreen.field_73880_f / 2, 75, 0xFFFFFF);
-
-            }
-
-            @Override
-            public void initGui(GuiErrorScreen errorScreen, FontRenderer renderer)
-            {
-                // noop
-            }
-        };
-    }
-}
--- a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/TestClass.java
+++ b/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/TestClass.java
@ -1,26 +0,0 @@
-package cpw.mods.mockmod;
-
-import net.minecraft.src.NetworkManager;
-import net.minecraft.src.Packet250CustomPayload;
-import cpw.mods.fml.common.Side;
-
-import cpw.mods.fml.common.asm.SideOnly;
-import cpw.mods.fml.common.network.IPacketHandler;
-import cpw.mods.fml.common.network.Player;
-
-@SideOnly(Side.CLIENT)
-public class TestClass implements IPacketHandler
-{
-
-    static
-    {
-        Thread.dumpStack();
-    }
-    @Override
-    public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player)
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-}
--- a/fml/eclipse/FML-Server/.classpath
+++ b/fml/eclipse/FML-Server/.classpath
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-common"/>
-	<classpathentry kind="src" path="common"/>
-	<classpathentry kind="src" path="server"/>
-	<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/eclipse/FML-Server/.project
+++ b/fml/eclipse/FML-Server/.project
@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>FML-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>build.xml</name>
-			<type>1</type>
-			<location>/home/cpw/projects/mcworkspace/fmltestbed/FML/build.xml</location>
-		</link>
-		<link>
-			<name>common</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/FML/common</locationURI>
-		</link>
-		<link>
-			<name>jars</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/jars</locationURI>
-		</link>
-		<link>
-			<name>lib</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/lib</locationURI>
-		</link>
-		<link>
-			<name>server</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/FML/server</locationURI>
-		</link>
-		<link>
-			<name>src</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/src-work/minecraft_server</locationURI>
-		</link>
-		<link>
-			<name>src-common</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/src-work/common</locationURI>
-		</link>
-		<link>
-			<name>common/fmlversion.properties</name>
-			<type>1</type>
-			<locationURI>MCP_LOC/FML/fmlversion.properties</locationURI>
-		</link>
-	</linkedResources>
-	<filteredResources>
-		<filter>
-			<id>0</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-2-WORKSPACE_LOC%7D</value>
-		</variable>
-	</variableList>
-</projectDescription>
--- a/fml/eclipse/FML-Server/.settings/org.eclipse.jdt.core.prefs
+++ b/fml/eclipse/FML-Server/.settings/org.eclipse.jdt.core.prefs
@ -1,12 +0,0 @@
-#Thu Jun 02 15:56:50 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
--- a/fml/eclipse/FML/.classpath
+++ b/fml/eclipse/FML/.classpath
@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="mc-common"/>
+	<classpathentry kind="src" path="fml-client"/>
+	<classpathentry kind="src" path="fml-common"/>
+	<classpathentry kind="src" path="mc-client"/>
+	<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="FML/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="FML/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="FML/jars/bin/natives"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="jars/bin/minecraft.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/eclipse/MCP-Client/.project
+++ b/fml/eclipse/MCP-Client/.project
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>MCP-Client</name>
+	<name>FML</name>
 	<comment></comment>
 	<projects>
 	</projects>
@ -15,6 +15,16 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>fml-client</name>
+			<type>2</type>
+			<locationURI>FML_LOC/client</locationURI>
+		</link>
+		<link>
+			<name>fml-common</name>
+			<type>2</type>
+			<locationURI>FML_LOC/common</locationURI>
+		</link>
 		<link>
 			<name>jars</name>
 			<type>2</type>
@ -26,19 +36,19 @@
 			<locationURI>MCP_LOC/lib</locationURI>
 		</link>
 		<link>
-			<name>minecraft</name>
+			<name>mc-client</name>
 			<type>2</type>
-			<locationURI>MCP_LOC/src-renamed/minecraft</locationURI>
+			<locationURI>MCP_LOC/src-work/minecraft</locationURI>
 		</link>
 		<link>
-			<name>minecraft/fmlversion.properties</name>
-			<type>1</type>
-			<locationURI>MCP_LOC/FML/fmlversion.properties</locationURI>
+			<name>mc-common</name>
+			<type>2</type>
+			<locationURI>MCP_LOC/src-work/common</locationURI>
 		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1341586110750</id>
+			<id>0</id>
 			<name>jars</name>
 			<type>13</type>
 			<matcher>
@ -48,6 +58,10 @@
 		</filter>
 	</filteredResources>
 	<variableList>
+		<variable>
+			<name>FML_LOC</name>
+			<value>$%7BPARENT-1-WORKSPACE_LOC%7D</value>
+		</variable>
 		<variable>
 			<name>MCP_LOC</name>
 			<value>$%7BPARENT-2-WORKSPACE_LOC%7D</value>
--- a/fml/eclipse/Clean-Server/.settings/org.eclipse.jdt.core.prefs
+++ b/fml/eclipse/Clean-Server/.settings/org.eclipse.jdt.core.prefs
--- a/fml/eclipse/MCP-Client/.classpath
+++ b/fml/eclipse/MCP-Client/.classpath
@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="minecraft"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="lib" path="jars/bin/jinput.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="MCP-Client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="jars/bin/lwjgl_util.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="MCP-Client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="jars/bin/lwjgl.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="MCP-Client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="jars/bin/minecraft.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/argo-2.25.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-all-4.0-source.jar"/>
-	<classpathentry exported="true" 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/eclipse/MCP-Client/.settings/org.eclipse.jdt.core.prefs
+++ b/fml/eclipse/MCP-Client/.settings/org.eclipse.jdt.core.prefs
@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
--- a/fml/eclipse/coremodtest/.classpath
+++ b/fml/eclipse/coremodtest/.classpath
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/FML-Client"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
--- a/fml/eclipse/coremodtest/.project
+++ b/fml/eclipse/coremodtest/.project
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>coremodtest</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>
-</projectDescription>
--- a/fml/eclipse/coremodtest/.settings/org.eclipse.jdt.core.prefs
+++ b/fml/eclipse/coremodtest/.settings/org.eclipse.jdt.core.prefs
@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
--- a/fml/eclipse/coremodtest/manifest.mf
+++ b/fml/eclipse/coremodtest/manifest.mf
@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-FMLCorePlugin: cpw.mods.testcoremod.FMLLoadPlugin
-
--- a/fml/eclipse/coremodtest/src/cpw/mods/testcoremod/FMLLoadPlugin.java
+++ b/fml/eclipse/coremodtest/src/cpw/mods/testcoremod/FMLLoadPlugin.java
@ -1,42 +0,0 @@
-package cpw.mods.testcoremod;
-
-import java.util.Map;
-
-import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
-
-public class FMLLoadPlugin implements IFMLLoadingPlugin
-{
-    @Override
-    public String[] getLibraryRequestClass()
-    {
-        return null;
-    }
-
-    @Override
-    public String[] getASMTransformerClass()
-    {
-        return null;
-    }
-
-    @Override
-    public String getModContainerClass()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public String getSetupClass()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void injectData(Map<String, Object> data)
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-}
--- a/fml/eclipse/simpletestmod/.classpath
+++ b/fml/eclipse/simpletestmod/.classpath
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/FML-Client"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
--- a/fml/eclipse/simpletestmod/.project
+++ b/fml/eclipse/simpletestmod/.project
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>simpletestmod</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>
-</projectDescription>
--- a/fml/eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs
+++ b/fml/eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs
@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
--- a/fml/eclipse/simpletestmod/src/net/minecraft/src/mod_testMod.java
+++ b/fml/eclipse/simpletestmod/src/net/minecraft/src/mod_testMod.java
@ -1,121 +0,0 @@
-package net.minecraft.src;
-
-import java.util.EnumSet;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.IScheduledTickHandler;
-import cpw.mods.fml.common.ITickHandler;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.TickType;
-import cpw.mods.fml.common.asm.SideOnly;
-import cpw.mods.fml.common.network.IPacketHandler;
-import cpw.mods.fml.common.network.NetworkMod;
-import cpw.mods.fml.common.network.Player;
-import cpw.mods.fml.common.registry.TickRegistry;
-import net.minecraft.client.Minecraft;
-
-@NetworkMod(channels={"mod_TestMod"},clientSideRequired=true,packetHandler=mod_testMod.PacketHandler.class)
-public class mod_testMod extends BaseMod {
-
-    @MLProp
-    public static int test = 0;
-    public static class PacketHandler implements IPacketHandler
-    {
-        @Override
-        public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player)
-        {
-        }
-    }
-
-    private long ts;
-    @Override
-    public String getVersion() {
-        return "test";
-    }
-
-    @Override
-    public void load() {
-//        if (1==1) throw new RuntimeException();
-//        ModLoader.setInGameHook(this, true, false);
-//        ModLoader.setInGUIHook(this, true, false);
-//        FMLCommonHandler.instance().registerTickHandler(this);
-        ModLoader.registerKey(this, new KeyBinding("Fishhead",Keyboard.KEY_O), true);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void keyboardEvent(KeyBinding event)
-    {
-        Mouse.setGrabbed(false);
-        System.out.println(event.field_74515_c);
-    }
-
-    @Override
-    public boolean onTickInGame(float time, Minecraft minecraftInstance)
-    {
-        long now = System.currentTimeMillis();
-        long del=now-ts;
-        ts=now;
-        System.out.printf("%d %d %d MLTICK\n",del, ts, now);
-        return true;
-    }
-
-    @Override
-    public boolean onTickInGUI(float tick, Minecraft game, GuiScreen gui)
-    {
-        System.out.printf("%d MLGUITICK\n",System.currentTimeMillis());
-        return true;
-    }
-
-    public class TickTester implements IScheduledTickHandler
-    {
-        public int interval;
-        public long tsg = System.currentTimeMillis();
-        @Override
-        public void tickStart(EnumSet<TickType> type, Object... tickData)
-        {
-            long now = System.currentTimeMillis();
-            long del=now-tsg;
-            System.out.printf("Begin GAMETICK [%d] %d\n",interval, del);
-        }
-
-        @Override
-        public void tickEnd(EnumSet<TickType> type, Object... tickData)
-        {
-            long now = System.currentTimeMillis();
-            long del=now-tsg;
-            tsg=now;
-            System.out.printf("End GAMETICK [%d] %d\n",interval, del);
-        }
-
-        @Override
-        public EnumSet<TickType> ticks()
-        {
-            return EnumSet.of(TickType.CLIENT);
-        }
-
-        /* (non-Javadoc)
-         * @see cpw.mods.fml.common.ITickHandler#getLabel()
-         */
-        @Override
-        public String getLabel()
-        {
-            return "TickTester";
-        }
-
-        @Override
-        public int nextTickSpacing()
-        {
-            return interval;
-        }
-    }
-
-    @Override
-    public String getPriorities()
-    {
-        return "before:MockMod";
-    }
-}
--- a/fml/eclipse/testmod.zip
+++ b/fml/eclipse/testmod.zip
--- a/fml/ignore-git.sh
+++ b/fml/ignore-git.sh
@ -0,0 +1,3 @@
+#!/bin/sh
+
+git update-index --assume-unchanged eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree
--- 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 = "969699f13e5bbe7f12e40ac4f32b7d9a"
-    clean_s = "c047f82522e53f2ec3c6b64304dfad0f"
+    clean_c = "32a654388b54d3e4bb29c1a46e7d6a12"
+    clean_s = "99f84541e184979c5b0312e9afc56ce1"
    
    if not md5_c == clean_c:
        print 'Warning, Modified Client jar detected'
@ -249,8 +249,8 @@ def setup_fml(fml_dir, mcp_dir):
        Commands.applyrg = applyrg_shunt
        Commands.checkjars = checkjars_shunt
        #decompile -d -n -r
-        #         Conf  JAD    CSV    -r    -d    -a     -n    -p     -o     -l     -g
-        decompile(None, False, False, True, True, False, True, False, False, False, False)
+        #         Conf  JAD    CSV    -r    -d    -a     -n    -p     -o     -l     -g     -c     -s
+        decompile(None, False, False, True, True, False, True, False, False, False, False, False, False)
        reset_logger()
        os.chdir(fml_dir)
        
@ -322,6 +322,9 @@ def merge_client_server(mcp_dir):
    if not os.path.isdir(shared):
        os.makedirs(shared)
        
+    #Nasty hack, but these three files sometimes decompile differently, but are identical, so just take the client file
+    special_cases = ['GuiStatsComponent.java', 'HttpUtilRunnable.java', 'PlayerUsageSnooper.java', 'RConThreadClient.java']
+        
    for path, _, filelist in os.walk(client, followlinks=True):
        for cur_file in filelist:
            f_client = os.path.normpath(os.path.join(client, path[len(client)+1:], cur_file)).replace(os.path.sep, '/')
@ -338,7 +341,7 @@ def merge_client_server(mcp_dir):
            with open(f_server, 'rb') as fh:
                md5_s = md5(fh.read()).hexdigest()
                
-            if md5_c != md5_s:
+            if md5_c != md5_s and not cur_file in special_cases:
                continue
                
            new_dir = os.path.join(shared, path[len(client)+1:])
@ -375,7 +378,7 @@ def apply_fml_patches(fml_dir, mcp_dir, src_dir, copy_files=True):
        apply_patches(mcp_dir, os.path.join(fml_dir, 'patches', 'common'), src_dir)
    if copy_files and os.path.isdir(os.path.join(fml_dir, 'common')):
        copytree(os.path.join(fml_dir, 'common'), os.path.join(src_dir, 'common'))
-            
+
 def finish_setup_fml(fml_dir, mcp_dir):
    sys.path.append(mcp_dir)
    from runtime.updatenames import updatenames
@ -582,7 +585,7 @@ def setup_mcp(fml_dir, mcp_dir, dont_gen_conf=True):
        commands_sanity_check()
    except ImportError as ex:
        print 'Could not verify commands.py patch integrity, this typically means that you are not in a clean MCP environment.'
-        print 'Download a clean version of MCP 7.0a and try again'
+        print 'Download a clean version of MCP 7.17 and try again'
        print ex
        sys.exit(1)
    
@ -626,7 +629,7 @@ def normaliselines(in_filename):

 def get_conf_copy(mcp_dir, fml_dir):
    #Lets grab the files we dont work on
-    for file in ['astyle.cfg', 'version.cfg', 'patches/minecraft_ff.patch', 'patches/minecraft_server_ff.patch', 'newids.csv']:
+    for file in ['astyle.cfg', 'version.cfg', 'newids.csv']:
        dst_file = os.path.normpath(os.path.join(fml_dir, 'conf', file))
        src_file = os.path.normpath(os.path.join(mcp_dir, 'conf', file))
        if not os.path.isdir(os.path.dirname(dst_file)):
@ -636,27 +639,6 @@ def get_conf_copy(mcp_dir, fml_dir):
        shutil.copy(src_file, dst_file)
        normaliselines(dst_file)
        print 'Grabbing: ' + src_file
-        
-    ff_server = os.path.normpath(os.path.join(fml_dir, 'conf', 'patches', 'minecraft_server_ff.patch'))
-    data = []
-    with open(ff_server) as f: data = f.readlines();
-    data = data + [
-        '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',
-        '@@ -24,7 +24,6 @@',
-        '    }',
-        ' ',
-        '    public static MapData func_77874_a(short p_77874_0_, World p_77874_1_) {',
-        '-      "map_" + p_77874_0_;',
-        '       MapData var3 = (MapData)p_77874_1_.func_72943_a(MapData.class, "map_" + p_77874_0_);',
-        '       if(var3 == null) {',
-        '          int var4 = p_77874_1_.func_72841_b("map");'
-    ]
-    os.remove(ff_server)
-    with open(ff_server, 'wb') as f:
-        for line in data:
-            f.write(line.rstrip('\r\n') + '\n')

    common_srg = gen_merged_srg(mcp_dir, fml_dir)
    common_exc = gen_merged_exc(mcp_dir, fml_dir)
@ -665,7 +647,7 @@ def get_conf_copy(mcp_dir, fml_dir):
    gen_merged_csv(common_map, os.path.join(mcp_dir, 'conf', 'fields.csv'), os.path.join(fml_dir, 'conf', 'fields.csv'))
    gen_merged_csv(common_map, os.path.join(mcp_dir, 'conf', 'methods.csv'), os.path.join(fml_dir, 'conf', 'methods.csv'))
    gen_merged_csv(common_map, os.path.join(mcp_dir, 'conf', 'params.csv'), os.path.join(fml_dir, 'conf', 'params.csv'), main_key='param')
-        
+    
 def gen_merged_srg(mcp_dir, fml_dir):
    print 'Generating merged Retroguard data'
    srg_client = os.path.join(mcp_dir, 'conf', 'client.srg')
@ -719,48 +701,17 @@ def gen_merged_srg(mcp_dir, fml_dir):
    return common

 def gen_merged_exc(mcp_dir, fml_dir):
-    print 'Generating merged MCInjector config'
-    exc_client = os.path.join(mcp_dir, 'conf', 'client.exc')
-    exc_server = os.path.join(mcp_dir, 'conf', 'server.exc')
+    print 'Reading merged MCInjector config'
+    exc_joined = os.path.join(mcp_dir, 'conf', 'joined.exc')
    
-    client = {}
-    with open(exc_client, 'r') as fh:
+    joined = {}
+    with open(exc_joined, 'r') as fh:
        for line in fh:
            if not line.startswith('#'):
                pts = line.rstrip('\r\n').split('=')
-                client[pts[0]] = pts[1]
-            
-    server = {}
-    with open(exc_server, 'r') as fh:
-        for line in fh:
-            if not line.startswith('#'):
-                pts = line.rstrip('\r\n').split('=')
-                server[pts[0]] = pts[1]
+                joined[pts[0]] = pts[1]
    
-    common = {}
-    for key, value in client.items():
-        if key in server:
-            if value != server[key]:
-                print 'Error: Exec for shared function does not match client and server:'
-                print 'Function: ' + key
-                print 'Client: ' + value
-                print 'Server: ' + server[value]
-            if value != '|':
-                common[key] = value
-            client.pop(key)
-            server.pop(key)
-        else:
-            if value != '|':
-                common[key] = value
-    
-    joined = dict(common.items() + server.items())
-    
-    #Print joined mcinjector files
-    with open(os.path.join(fml_dir, 'conf', 'joined.exc'), 'wb') as f:
-        for key in sorted(joined):
-            f.write('%s=%s\n' % (key, joined[key]))
-            
-    return common
+    return joined

 def gen_shared_searge_names(common_srg, common_exc):
    field = re.compile(r'field_[0-9]+_[a-zA-Z_]+$')
--- a/fml/mcp_merge.cfg
+++ b/fml/mcp_merge.cfg
@ -1,19 +1,20 @@
-<fz
-<ga
-<gd
-<ge
->ake
-<gf
-<gg
->akj
-<gb
-<gc
-<gh
->un
->uo
-<eo
->aeh
->rt
->hm
->ia
->hz
+>ot
+>iy
+>xc
+>wz
+>ang
+>anl
+>jm
+>ue
+>agy
+>jn
+<fn
+<hl
+<hm
+<hn
+<ho
+<hp
+<hq
+<hr
+<hs
+<ht
--- a/fml/patches/common/net/minecraft/server/MinecraftServer.java.patch
+++ b/fml/patches/common/net/minecraft/server/MinecraftServer.java.patch
@ -9,8 +9,8 @@
 +import cpw.mods.fml.relauncher.FMLRelauncher;
 import net.minecraft.src.AnvilSaveConverter;
 import net.minecraft.src.AxisAlignedBB;
- import net.minecraft.src.CallableIsServerModded;
-@@ -364,7 +367,10 @@
+ import net.minecraft.src.BehaviorArrowDispense;
+@@ -385,7 +388,10 @@
         {
             if (this.func_71197_b())
             {
@ -21,7 +21,7 @@
 
                 for (long var50 = 0L; this.field_71317_u; this.field_71296_Q = true)
                 {
-@@ -403,6 +409,7 @@
+@@ -424,6 +430,7 @@
 
                     Thread.sleep(1L);
                 }
@ -29,19 +29,18 @@
             }
             else
             {
-@@ -466,9 +473,11 @@
+@@ -487,8 +494,10 @@
 
     public void func_71217_p()
     {
 +        FMLCommonHandler.instance().rescheduleTicks(Side.SERVER);
         long var1 = System.nanoTime();
         AxisAlignedBB.func_72332_a().func_72298_a();
-         Vec3.func_72437_a().func_72343_a();
 +        FMLCommonHandler.instance().onPreServerTick();
         ++this.field_71315_w;
 
         if (this.field_71295_T)
-@@ -514,6 +523,7 @@
+@@ -534,6 +543,7 @@
 
         this.field_71304_b.func_76319_b();
         this.field_71304_b.func_76319_b();
@ -49,17 +48,18 @@
     }
 
     public void func_71190_q()
-@@ -537,7 +547,9 @@
+@@ -560,8 +570,10 @@
                 }
 
                 this.field_71304_b.func_76320_a("tick");
 +                FMLCommonHandler.instance().onPreWorldTick(var4);
                 var4.func_72835_b();
+                 var4.func_72939_s();
 +                FMLCommonHandler.instance().onPostWorldTick(var4);
-                 this.field_71304_b.func_76318_c("lights");
- 
-                 while (true)
-@@ -1118,6 +1130,12 @@
+                 this.field_71304_b.func_76319_b();
+                 this.field_71304_b.func_76320_a("tracker");
+                 var4.func_73039_n().func_72788_a();
+@@ -1149,6 +1161,12 @@
     @SideOnly(Side.SERVER)
     public static void main(String[] p_main_0_)
     {
--- a/fml/patches/common/net/minecraft/src/ChunkProviderServer.java.patch
+++ b/fml/patches/common/net/minecraft/src/ChunkProviderServer.java.patch
@ -9,7 +9,7 @@
 
 public class ChunkProviderServer implements IChunkProvider
 {
-@@ -177,6 +179,7 @@
+@@ -182,6 +184,7 @@
             if (this.field_73246_d != null)
             {
                 this.field_73246_d.func_73153_a(p_73153_1_, p_73153_2_, p_73153_3_);
--- a/fml/patches/common/net/minecraft/src/DedicatedServer.java.patch
+++ b/fml/patches/common/net/minecraft/src/DedicatedServer.java.patch
@ -24,7 +24,7 @@
         this.func_71210_a(new DedicatedPlayerList(this));
         long var4 = System.nanoTime();
 
-@@ -160,7 +164,7 @@
+@@ -161,7 +165,7 @@
             this.field_71339_n = new RConThreadMain(this);
             this.field_71339_n.func_72602_a();
         }
--- a/fml/patches/common/net/minecraft/src/EntityAIVillagerMate.java.patch
+++ b/fml/patches/common/net/minecraft/src/EntityAIVillagerMate.java.patch
@ -7,7 +7,7 @@
 
 public class EntityAIVillagerMate extends EntityAIBase
 {
-@@ -104,7 +106,7 @@
+@@ -111,7 +113,7 @@
         this.field_75451_c.func_70873_a(6000);
         this.field_75450_b.func_70873_a(6000);
         var1.func_70873_a(-24000);
--- a/Show More
+++ b/Show More