Update to 1.4.3

I'm looking at you Rei's!

.gitattributes

@@ -1 +1,7 @@
-* text=auto
+* text eol=lf
+*.bat text eol=crlf
+*.patch text
+*.png binary
+*.exe binary
+*.dll binary
+*.zip binary

.gitignore

@@ -4,8 +4,6 @@
 /fmlbuild.properties
 /fmlversion.properties
 /difflist.txt
-/.metadata/
-/eclipse/.metadata/
 /target
 fmlbranding.properties
 /fernflower.zip

build.xml

@@ -173,10 +173,13 @@
     <jar destfile="${basedir}/target/${universal.jarname}.zip" duplicate="preserve">
       <manifest>
         <attribute name="Main-Class" value="net.minecraft.server.MinecraftServer"/>
+        <attribute name="Class-Path" value="minecraft_server.jar"/>
       </manifest>
       <fileset dir="${client.mcp.obfoutput}" includes="**/*.class" />
       <zipfileset dir="${basedir}" includes="fmlversion.properties"/>
       <zipfileset dir="${basedir}" includes="LICENSE-fml.txt" />
+        <zipfileset dir="${common.src.dir}" includes="mcpmod.info" />
+        <zipfileset dir="${client.src.dir}" includes="mcp.png" />
       <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" fullpath="CREDITS-fml.txt"/>
       <zipfileset dir="${common.src.dir}" includes="*.cfg" />
       <mappedresources>
@@ -203,8 +206,10 @@
       <zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt,commands.patch,mcp_merge.cfg" prefix="fml" />
       <zipfileset dir="${common.src.dir}" includes="**/*.java" prefix="fml/common" />
       <zipfileset dir="${client.src.dir}" includes="**/*.java" prefix="fml/client" />
+      <zipfileset dir="${client.src.dir}" includes="mcp.png" prefix="fml/client" />
       <zipfileset dir="${basedir}" includes="fmlversion.properties" prefix="fml/common" />
       <zipfileset dir="${common.src.dir}" includes="*.cfg" prefix="fml/common" />
+      <zipfileset dir="${common.src.dir}" includes="mcpmod.info" prefix="fml/common" />
       <zipfileset dir="${patch.src.dir}" includes="**/*.patch" prefix="fml/patches" />
       <zipfileset dir="${fml.conf.dir}" prefix="fml/conf" />
       <mappedresources>

client/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java

@@ -0,0 +1,43 @@
+package cpw.mods.fml.client;
+
+import cpw.mods.fml.common.IFMLHandledException;
+import cpw.mods.fml.common.Side;
+import cpw.mods.fml.common.asm.SideOnly;
+import net.minecraft.src.FontRenderer;
+import net.minecraft.src.GuiErrorScreen;
+
+/**
+ * If a mod throws this exception during loading, it will be called back to render
+ * the error screen through the methods below. This error will not be cleared, and will
+ * not allow the game to carry on, but might be useful if your mod wishes to report
+ * a fatal configuration error in a pretty way.
+ *
+ * Throw this through a proxy. It won't work on the dedicated server environment.
+ * @author cpw
+ *
+ */
+@SideOnly(Side.CLIENT)
+public abstract class CustomModLoadingErrorDisplayException extends RuntimeException implements IFMLHandledException
+{
+    /**
+     * Called after the GUI is inited by the parent code. You can do extra stuff here, maybe?
+     *
+     * @param errorScreen The error screen we're painting
+     * @param fontRenderer A font renderer for you
+     */
+    public abstract void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer);
+
+    /**
+     * Draw your error to the screen.
+     *
+     * <br/><em>Warning: Minecraft is in a deep error state.</em> <strong>All</strong> it can do is stop.
+     * Do not try and do anything involving complex user interaction here.
+     *
+     * @param errorScreen The error screen to draw to
+     * @param fontRenderer A font renderer for you
+     * @param mouseRelX Mouse X
+     * @param mouseRelY Mouse Y
+     * @param tickTime tick time
+     */
+    public abstract void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int mouseRelX, int mouseRelY, float tickTime);
+}

client/cpw/mods/fml/client/FMLClientHandler.java

@@ -43,6 +43,7 @@ import cpw.mods.fml.client.modloader.ModLoaderClientHelper;
 import cpw.mods.fml.client.registry.KeyBindingRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.DummyModContainer;
+import cpw.mods.fml.common.DuplicateModsFoundException;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.IFMLSidedHandler;
@@ -54,6 +55,7 @@ import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.ModMetadata;
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
 import cpw.mods.fml.common.Side;
+import cpw.mods.fml.common.WrongMinecraftVersionException;
 import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
 import cpw.mods.fml.common.network.EntitySpawnPacket;
 import cpw.mods.fml.common.network.ModMissingPacket;
@@ -66,8 +68,8 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 /**
  * Handles primary communication from hooked code into the system
  *
- * The FML entry point is {@link #beginMinecraftLoading(MinecraftServer)} called from
- * {@link MinecraftServer}
+ * The FML entry point is {@link #beginMinecraftLoading(Minecraft)} called from
+ * {@link Minecraft}
  *
  * Obfuscated code should focus on this class and other members of the "server"
  * (or "client") code
@@ -94,13 +96,6 @@ public class FMLClientHandler implements IFMLSidedHandler
      */
     private Minecraft client;
 
-    /**
-     * Called to start the whole game off from
-     * {@link MinecraftServer#startServer}
-     *
-     * @param minecraftServer
-     */
-
     private DummyModContainer optifineContainer;
 
     private boolean guiLoaded;
@@ -111,6 +106,17 @@ public class FMLClientHandler implements IFMLSidedHandler
 
     private boolean loading;
 
+    private WrongMinecraftVersionException wrongMC;
+
+    private CustomModLoadingErrorDisplayException customError;
+
+	private DuplicateModsFoundException dupesFound;
+
+    /**
+     * Called to start the whole game off
+     *
+     * @param minecraft The minecraft instance being launched
+     */
     public void beginMinecraftLoading(Minecraft minecraft)
     {
         if (minecraft.func_71355_q())
@@ -143,10 +149,23 @@ public class FMLClientHandler implements IFMLSidedHandler
         {
             Loader.instance().loadMods();
         }
+        catch (WrongMinecraftVersionException wrong)
+        {
+            wrongMC = wrong;
+        }
+        catch (DuplicateModsFoundException dupes)
+        {
+        	dupesFound = dupes;
+        }
         catch (MissingModsException missing)
         {
             modsMissing = missing;
         }
+        catch (CustomModLoadingErrorDisplayException custom)
+        {
+            FMLLog.log(Level.SEVERE, custom, "A custom exception was thrown by a mod, the game will now halt");
+            customError = custom;
+        }
         catch (LoaderException le)
         {
             haltGame("There was a severe problem during mod loading that has caused the game to fail", le);
@@ -168,7 +187,7 @@ public class FMLClientHandler implements IFMLSidedHandler
     @SuppressWarnings("deprecation")
     public void finishMinecraftLoading()
     {
-        if (modsMissing != null)
+        if (modsMissing != null || wrongMC != null || customError!=null || dupesFound!=null)
         {
             return;
         }
@@ -176,6 +195,12 @@ public class FMLClientHandler implements IFMLSidedHandler
         {
             Loader.instance().initializeMods();
         }
+        catch (CustomModLoadingErrorDisplayException custom)
+        {
+            FMLLog.log(Level.SEVERE, custom, "A custom exception was thrown by a mod, the game will now halt");
+            customError = custom;
+            return;
+        }
         catch (LoaderException le)
         {
             haltGame("There was a severe problem during mod loading that has caused the game to fail", le);
@@ -190,10 +215,22 @@ public class FMLClientHandler implements IFMLSidedHandler
 
     public void onInitializationComplete()
     {
-        if (modsMissing != null)
+        if (wrongMC != null)
+        {
+            client.func_71373_a(new GuiWrongMinecraft(wrongMC));
+        }
+        else if (modsMissing != null)
         {
             client.func_71373_a(new GuiModsMissing(modsMissing));
         }
+        else if (dupesFound != null)
+        {
+        	client.func_71373_a(new GuiDupesFound(dupesFound));
+        }
+        else if (customError != null)
+        {
+            client.func_71373_a(new GuiCustomModLoadingErrorScreen(customError));
+        }
         else
         {
             TextureFXManager.instance().loadTextures(client.field_71418_C.func_77292_e());
@@ -201,8 +238,6 @@ public class FMLClientHandler implements IFMLSidedHandler
     }
     /**
      * Get the server instance
-     *
-     * @return
      */
     public Minecraft getClient()
     {
@@ -308,7 +343,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);
             }
 
@@ -352,7 +387,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;
@@ -386,7 +421,10 @@ public class FMLClientHandler implements IFMLSidedHandler
     @Override
     public void sendPacket(Packet packet)
     {
-        client.field_71439_g.field_71174_a.func_72552_c(packet);
+        if(client.field_71439_g != null)
+        {
+            client.field_71439_g.field_71174_a.func_72552_c(packet);
+        }
     }
 
     @Override
@@ -397,7 +435,6 @@ public class FMLClientHandler implements IFMLSidedHandler
 
     /**
      * If the client is in the midst of loading, we disable saving so that custom settings aren't wiped out
-     * @return
      */
     public boolean isLoading()
     {

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);
     }

client/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java

@@ -0,0 +1,26 @@
+package cpw.mods.fml.client;
+
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.WrongMinecraftVersionException;
+import net.minecraft.src.GuiErrorScreen;
+
+public class GuiCustomModLoadingErrorScreen extends GuiErrorScreen
+{
+    private CustomModLoadingErrorDisplayException customException;
+    public GuiCustomModLoadingErrorScreen(CustomModLoadingErrorDisplayException customException)
+    {
+        this.customException = customException;
+    }
+    @Override
+    public void func_73866_w_()
+    {
+        super.func_73866_w_();
+        this.customException.initGui(this, field_73886_k);
+    }
+    @Override
+    public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
+    {
+        this.func_73873_v_();
+        this.customException.drawScreen(this, field_73886_k, p_73863_1_, p_73863_2_, p_73863_3_);
+    }
+}

client/cpw/mods/fml/client/GuiDupesFound.java

@@ -0,0 +1,44 @@
+package cpw.mods.fml.client;
+
+import java.io.File;
+import java.util.Map.Entry;
+
+import cpw.mods.fml.common.DuplicateModsFoundException;
+import cpw.mods.fml.common.MissingModsException;
+import cpw.mods.fml.common.ModContainer;
+import cpw.mods.fml.common.versioning.ArtifactVersion;
+import net.minecraft.src.GuiErrorScreen;
+
+public class GuiDupesFound extends GuiErrorScreen
+{
+
+    private DuplicateModsFoundException dupes;
+
+    public GuiDupesFound(DuplicateModsFoundException dupes)
+    {
+        this.dupes = dupes;
+    }
+
+    @Override
+    public void func_73866_w_()
+    {
+        super.func_73866_w_();
+    }
+    @Override
+    public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
+    {
+        this.func_73873_v_();
+        int offset = Math.max(85 - dupes.dupes.size() * 10, 10);
+        this.func_73732_a(this.field_73886_k, "Forge Mod Loader has found a problem with your minecraft installation", this.field_73880_f / 2, offset, 0xFFFFFF);
+        offset+=10;
+        this.func_73732_a(this.field_73886_k, "You have mod sources that are duplicate within your system", this.field_73880_f / 2, offset, 0xFFFFFF);
+        offset+=10;
+        this.func_73732_a(this.field_73886_k, "Mod Id : File name", this.field_73880_f / 2, offset, 0xFFFFFF);
+        offset+=5;
+        for (Entry<ModContainer, File> mc : dupes.dupes.entries())
+        {
+            offset+=10;
+            this.func_73732_a(this.field_73886_k, String.format("%s : %s", mc.getKey().getModId(), mc.getValue().getName()), this.field_73880_f / 2, offset, 0xEEEEEE);
+        }
+    }
+}

client/cpw/mods/fml/client/GuiModList.java

@@ -27,6 +27,8 @@ import net.minecraft.src.Tessellator;
 
 import org.lwjgl.opengl.GL11;
 
+import com.google.common.base.Strings;
+
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
 
@@ -44,7 +46,7 @@ public class GuiModList extends GuiScreen
     private ArrayList<ModContainer> mods;
 
     /**
-     * @param guiMainMenu
+     * @param mainMenu
      */
     public GuiModList(GuiScreen mainMenu)
     {
@@ -52,8 +54,15 @@ public class GuiModList extends GuiScreen
         this.mods=new ArrayList<ModContainer>();
         FMLClientHandler.instance().addSpecialModEntries(mods);
         for (ModContainer mod : Loader.instance().getModList()) {
-            if (mod.getMetadata()!=null && mod.getMetadata().parentMod != null) {
-                continue;
+            if (mod.getMetadata()!=null && !Strings.isNullOrEmpty(mod.getMetadata().parent)) {
+                String parentMod = mod.getMetadata().parent;
+                ModContainer parentContainer = Loader.instance().getIndexedModList().get(parentMod);
+                if (parentContainer != null)
+                {
+                    mod.getMetadata().parentMod = parentContainer;
+                    parentContainer.getMetadata().childMods.add(mod);
+                    continue;
+                }
             }
             mods.add(mod);
         }
@@ -166,10 +175,6 @@ public class GuiModList extends GuiScreen
         }
     }
 
-    /**
-     * @param var1
-     * @return
-     */
     public boolean modIndexSelected(int var1)
     {
         return var1==selected;

client/cpw/mods/fml/client/GuiModsMissing.java

@@ -23,7 +23,7 @@ public class GuiModsMissing extends GuiErrorScreen
     public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
     {
         this.func_73873_v_();
-        int offset = 85 - modsMissing.missingMods.size() * 10;
+        int offset = Math.max(85 - modsMissing.missingMods.size() * 10, 10);
         this.func_73732_a(this.field_73886_k, "Forge Mod Loader has found a problem with your minecraft installation", this.field_73880_f / 2, offset, 0xFFFFFF);
         offset+=10;
         this.func_73732_a(this.field_73886_k, "The mods and versions listed below could not be found", this.field_73880_f / 2, offset, 0xFFFFFF);

client/cpw/mods/fml/client/GuiModsMissingForServer.java

@@ -35,7 +35,7 @@ public class GuiModsMissingForServer extends GuiScreen
     public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
     {
         this.func_73873_v_();
-        int offset = 85 - modsMissing.getModList().size() * 10;
+        int offset = Math.max(85 - modsMissing.getModList().size() * 10, 10);
         this.func_73732_a(this.field_73886_k, "Forge Mod Loader could not connect to this server", this.field_73880_f / 2, offset, 0xFFFFFF);
         offset += 10;
         this.func_73732_a(this.field_73886_k, "The mods and versions listed below could not be found", this.field_73880_f / 2, offset, 0xFFFFFF);

client/cpw/mods/fml/client/GuiWrongMinecraft.java

@@ -0,0 +1,35 @@
+package cpw.mods.fml.client;
+
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.WrongMinecraftVersionException;
+import cpw.mods.fml.common.versioning.ArtifactVersion;
+import net.minecraft.src.GuiErrorScreen;
+import net.minecraft.src.GuiScreen;
+
+public class GuiWrongMinecraft extends GuiErrorScreen
+{
+    private WrongMinecraftVersionException wrongMC;
+    public GuiWrongMinecraft(WrongMinecraftVersionException wrongMC)
+    {
+        this.wrongMC = wrongMC;
+    }
+    @Override
+    public void func_73866_w_()
+    {
+        super.func_73866_w_();
+    }
+    @Override
+    public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
+    {
+        this.func_73873_v_();
+        int offset = 75;
+        this.func_73732_a(this.field_73886_k, "Forge Mod Loader has found a problem with your minecraft installation", this.field_73880_f / 2, offset, 0xFFFFFF);
+        offset+=10;
+        this.func_73732_a(this.field_73886_k, String.format("The mod listed below does not want to run in Minecraft version %s", Loader.instance().getMinecraftModContainer().getVersion()), this.field_73880_f / 2, offset, 0xFFFFFF);
+        offset+=5;
+        offset+=10;
+        this.func_73732_a(this.field_73886_k, String.format("%s (%s) wants Minecraft %s", wrongMC.mod.getName(), wrongMC.mod.getModId(), wrongMC.mod.acceptableMinecraftVersionRange()), this.field_73880_f / 2, offset, 0xEEEEEE);
+        offset+=20;
+        this.func_73732_a(this.field_73886_k, "The file 'ForgeModLoader-client-0.log' contains more information", this.field_73880_f / 2, offset, 0xFFFFFF);
+    }
+}

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);
     

client/cpw/mods/fml/client/SpriteHelper.java

@@ -34,7 +34,7 @@ public class SpriteHelper
                 SpriteHelper.toBitSet(
                 "0000000000000000" +
                 "0000000000110000" +
-                "0000000001100000" +
+                "0000000000100000" +
                 "0000000001100000" +
                 "0000000000000000" +
                 "0000000000000000" +
@@ -43,10 +43,10 @@ public class SpriteHelper
                 "0000000000000000" +
                 "0000000000000000" +
                 "0000000000000000" +
-                "0000000011111111" +
-                "0000000011111000" +
-                "0000000111111100" +
-                "0000000111111000" +
+                "0000000000011111" +
+                "0000000000000000" +
+                "0000000001111100" +
+                "0000000001111000" +
                 "0000000000000000");
         spriteInfo.put("/terrain.png", slots);
 
@@ -57,15 +57,15 @@ public class SpriteHelper
                 "0000000000000000" +
                 "0000000000000000" +
                 "0000000000000000" +
-                "0000001000000000" +
-                "0000001110000000" +
-                "0000001000000000" +
-                "1111101010000000" +
-                "1111101010000000" +
-                "1111101110000000" +
-                "1111111111110000" +
-                "1111111111111111" +
-                "1111111111111111" +
+                "0000000000000000" +
+                "0000000000000000" +
+                "0000000000000000" +
+                "0111100000000000" +
+                "1111100010000000" +
+                "0000101110000000" +
+                "0111000000000000" +
+                "1100001100001111" +
+                "0000000000001111" +
                 "0000000000000000");
         spriteInfo.put("/gui/items.png", slots);
     }
@@ -130,10 +130,6 @@ public class SpriteHelper
         return next;
     }
 
-    /**
-     * @param textureToOverride
-     * @return
-     */
     public static int freeSlotCount(String textureToOverride)
     {
         return spriteInfo.get(textureToOverride).cardinality();

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);
@@ -213,9 +213,6 @@ public class TextureFXManager
         return textureDims.get(id);
     }
 
-    /**
-     * @param anim
-     */
     public void addAnimation(TextureFX anim)
     {
         OverrideInfo info=new OverrideInfo();
@@ -229,10 +226,7 @@ public class TextureFXManager
     }
 
 
-    /**
-     * @param p_6531_1_
-     */
-    public void loadTextures(TexturePackBase texturePack)
+    public void loadTextures(ITexturePack texturePack)
     {
         registerTextureOverrides(client.field_71446_o);
     }
@@ -263,17 +257,11 @@ public class TextureFXManager
         }
     }
 
-    /**
-     * @param mod
-     */
     protected void registerAnimatedTexturesFor(ModContainer mod)
     {
     }
 
-    /**
-     * @param field_6539_c
-     */
-    public void onEarlyTexturePackLoad(TexturePackBase fallback)
+    public void onEarlyTexturePackLoad(ITexturePack fallback)
     {
         if (client==null) {
             // We're far too early- let's wait
@@ -284,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())
@@ -313,11 +301,6 @@ public class TextureFXManager
         FMLLog.fine("Overriding %s @ %d with %s. %d slots remaining",textureToOverride, location, overridingTexturePath, SpriteHelper.freeSlotCount(textureToOverride));
     }
 
-    /**
-     * @param renderEngine
-     * @param path
-     * @return
-     */
     public BufferedImage loadImageFromTexturePack(RenderEngine renderEngine, String path) throws IOException
     {
         InputStream image=client.field_71418_C.func_77292_e().func_77532_a(path);

client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java

@@ -12,6 +12,9 @@ import net.minecraft.src.Entity;
 import net.minecraft.src.EntityClientPlayerMP;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.KeyBinding;
+import net.minecraft.src.NetClientHandler;
+import net.minecraft.src.NetHandler;
+import net.minecraft.src.INetworkManager;
 import net.minecraft.src.Packet250CustomPayload;
 import net.minecraft.src.Render;
 import net.minecraft.src.RenderManager;
@@ -23,6 +26,7 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.MapDifference;
 import com.google.common.collect.MapDifference.ValueDifference;
+import com.google.common.collect.MapMaker;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
@@ -41,12 +45,6 @@ import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
 
 public class ModLoaderClientHelper implements IModLoaderSidedHelper
 {
-
-    /**
-     * @param mod
-     * @param inventoryRenderer
-     * @return
-     */
     public static int obtainBlockModelIdFor(BaseMod mod, boolean inventoryRenderer)
     {
         int renderId=RenderingRegistry.getNextAvailableRenderId();
@@ -156,4 +154,24 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper
     {
         ((net.minecraft.src.BaseMod)mod).clientCustomPayload(client.field_71439_g.field_71174_a, packet);
     }
+
+    private Map<INetworkManager,NetHandler> managerLookups = new MapMaker().weakKeys().weakValues().makeMap();
+    @Override
+    public void clientConnectionOpened(NetHandler netClientHandler, INetworkManager manager, BaseModProxy mod)
+    {
+        managerLookups.put(manager, netClientHandler);
+        ((BaseMod)mod).clientConnect((NetClientHandler)netClientHandler);
+    }
+
+
+    @Override
+    public boolean clientConnectionClosed(INetworkManager manager, BaseModProxy mod)
+    {
+        if (managerLookups.containsKey(manager))
+        {
+            ((BaseMod)mod).clientDisconnect((NetClientHandler) managerLookups.get(manager));
+            return true;
+        }
+        return false;
+    }
 }

client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java

@@ -40,9 +40,6 @@ public class ModLoaderKeyBindingHandler extends KeyBindingRegistry.KeyHandler
     private boolean[] mlRepeats = new boolean[0];
     private boolean[] armed = new boolean[0];
 
-    /**
-     * @param keyHandler
-     */
     public ModLoaderKeyBindingHandler()
     {
         super(new KeyBinding[0], new boolean[0]);

client/cpw/mods/fml/client/registry/KeyBindingRegistry.java

@@ -129,7 +129,7 @@ public class KeyBindingRegistry
          * Called when the key is first in the down position on any tick from the {@link #ticks()}
          * set. Will be called subsequently with isRepeat set to true
          *
-         * @see #keyUp(EnumSet, boolean)
+         * @see #keyUp(EnumSet, KeyBinding, boolean)
          *
          * @param types the type(s) of tick that fired when this key was first down
          * @param tickEnd was it an end or start tick which fired the key
@@ -139,7 +139,7 @@ public class KeyBindingRegistry
         /**
          * Fired once when the key changes state from down to up
          *
-         * @see #keyDown(EnumSet, boolean, boolean)
+         * @see #keyDown(EnumSet, KeyBinding, boolean, boolean)
          *
          * @param types the type(s) of tick that fired when this key was first down
          * @param tickEnd was it an end or start tick which fired the key

client/cpw/mods/fml/client/registry/RenderingRegistry.java

@@ -7,6 +7,7 @@ import net.minecraft.src.Block;
 import net.minecraft.src.Entity;
 import net.minecraft.src.IBlockAccess;
 import net.minecraft.src.Render;
+import net.minecraft.src.RenderBiped;
 import net.minecraft.src.RenderBlocks;
 import net.minecraft.src.RenderManager;
 import net.minecraft.src.RenderPlayer;
@@ -26,7 +27,7 @@ public class RenderingRegistry
 {
     private static final RenderingRegistry INSTANCE = new RenderingRegistry();
 
-    private int nextRenderId = 32;
+    private int nextRenderId = 36;
 
     private Map<Integer, ISimpleBlockRenderingHandler> blockRenderers = Maps.newHashMap();
 
@@ -36,11 +37,11 @@ public class RenderingRegistry
      * Add a new armour prefix to the RenderPlayer
      *
      * @param armor
-     * @return
      */
     public static int addNewArmourRendererPrefix(String armor)
     {
         RenderPlayer.field_77110_j = ObjectArrays.concat(RenderPlayer.field_77110_j, armor);
+        RenderBiped.field_82424_k = RenderPlayer.field_77110_j;
         return RenderPlayer.field_77110_j.length - 1;
     }
 
@@ -80,8 +81,6 @@ public class RenderingRegistry
     }
     /**
      * Get the next available renderId from the block render ID list
-     *
-     * @return
      */
     public static int getNextAvailableRenderId()
     {
@@ -93,7 +92,6 @@ public class RenderingRegistry
      *
      * @param fileToOverride
      * @param fileToAdd
-     * @return
      */
     public static int addTextureOverride(String fileToOverride, String fileToAdd)
     {
@@ -118,7 +116,6 @@ public class RenderingRegistry
      * Get and reserve a unique texture index for the supplied path
      *
      * @param path
-     * @return
      */
     public static int getUniqueTextureIndex(String path)
     {
@@ -141,16 +138,6 @@ public class RenderingRegistry
         private Render renderer;
     }
 
-    /**
-     * @param renderer
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     * @param block
-     * @param modelId
-     * @return
-     */
     public boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelId)
     {
         if (!blockRenderers.containsKey(modelId)) { return false; }
@@ -158,12 +145,6 @@ public class RenderingRegistry
         return bri.renderWorldBlock(world, x, y, z, block, modelId, renderer);
     }
 
-    /**
-     * @param renderer
-     * @param block
-     * @param metadata
-     * @param modelID
-     */
     public void renderInventoryBlock(RenderBlocks renderer, Block block, int metadata, int modelID)
     {
         if (!blockRenderers.containsKey(modelID)) { return; }
@@ -171,10 +152,6 @@ public class RenderingRegistry
         bri.renderInventoryBlock(block, metadata, modelID, renderer);
     }
 
-    /**
-     * @param p_1219_0_
-     * @return
-     */
     public boolean renderItemAsFull3DBlock(int modelId)
     {
         ISimpleBlockRenderingHandler bri = blockRenderers.get(modelId);

client/net/minecraft/src/BaseMod.java

@@ -51,23 +51,12 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
         return true;
     }
 
-    /**
-     * @param minecraftInstance
-     * @return
-     *//*
-
-    *//**
-     * @param renderers
-     *//*
+   /*
     public final void onRenderHarvest(Map renderers)
     {
         addRenderer((Map<Class<? extends Entity>,Render>)renderers);
-
     }
 
-    *//**
-     *
-     *//*
     public final void onRegisterAnimations()
     {
         registerAnimation(FMLClientHandler.instance().getClient());
@@ -156,22 +145,19 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
         }
     }
 
-    *//**
-     * NO-OP on client side
-     *//*
     @Override
     public final boolean handleCommand(String command, Object... data)
     {
         return false;
     }
 
-*/    // BASEMOD API
+    */
+    // BASEMOD API
     /**
      * Override if you wish to provide a fuel item for the furnace and return the fuel value of the item
      *
      * @param id
      * @param metadata
-     * @return
      */
     public int addFuel(int id, int metadata)
     {
@@ -183,24 +169,6 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
     {
     }
 
-    /**
-     * Override if you wish to perform some action other than just dispensing the item from the dispenser
-     *
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     * @param xVel
-     * @param zVel
-     * @param item
-     * @return
-     */
-    @Override
-    public int dispenseEntity(World world, ItemStack item, Random rnd, int x, int y, int z, int xVel, int zVel, double entX, double entY, double entZ)
-    {
-        return -1;
-    }
-
     /**
      * Override if you wish to generate Nether (Hell biome) blocks
      *
@@ -232,7 +200,6 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
      * @param x
      * @param y
      * @param z
-     * @return
      */
     @SideOnly(CLIENT)
     public GuiContainer getContainerGUI(EntityClientPlayerMP player, int containerID, int x, int y, int z)
@@ -242,8 +209,6 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
 
     /**
      * Return the name of your mod. Defaults to the class name
-     *
-     * @return
      */
     public String getName()
     {
@@ -252,8 +217,6 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
 
     /**
      * Get your mod priorities
-     *
-     * @return
      */
     public String getPriorities()
     {
@@ -262,8 +225,6 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
 
     /**
      * Return the version of your mod
-     *
-     * @return
      */
     public abstract String getVersion();
 
@@ -321,16 +282,34 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
 
     /**
      * Only implemented on the client side
-     * {@link #serverChat(EntityPlayer, Packet3Chat)}
+     * {@link #serverChat(NetServerHandler, String)}
      *
      * @param text
      */
     @Override
     public void clientChat(String text)
     {
-        // TODO
     }
 
+    /**
+     * Called when a client connects
+     * @param handler
+     */
+    @SideOnly(CLIENT)
+    public void clientConnect(NetClientHandler handler)
+    {
+
+    }
+
+    /**
+     * Called when the client disconnects
+     * @param handler
+     */
+    @SideOnly(CLIENT)
+    public void clientDisconnect(NetClientHandler handler)
+    {
+
+    }
     /**
      * Called client side to receive a custom payload for this mod
      *
@@ -339,7 +318,6 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
     @Override
     public void receiveCustomPacket(Packet250CustomPayload packet)
     {
-        // TODO
     }
 
     @SideOnly(CLIENT)
@@ -408,10 +386,6 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
 
     /**
      * Called when a chat message is received. Return true to stop further processing
-     *
-     * @param source
-     * @param chat
-     * @return true if you want to consume the message so it is not available for further processing
      */
     @Override
     public void serverChat(NetServerHandler source, String message)
@@ -429,24 +403,15 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
 
     /**
      * Called when a client logs out of the server.
-     *
-     * @param player
      */
     @Override
-    public void onClientLogout(NetworkManager mgr)
+    public void onClientLogout(INetworkManager mgr)
     {
 
     }
 
     /**
-     *
      * Spawn the entity of the supplied type, if it is your mod's
-     * @param entityId
-     * @param world
-     * @param scaledX
-     * @param scaledY
-     * @param scaledZ
-     * @return
      */
     @SideOnly(CLIENT)
     public Entity spawnEntity(int entityId, World world, double scaledX, double scaledY, double scaledZ)

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);
     }

client/net/minecraft/src/ModLoader.java

@@ -45,22 +45,19 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.server.FMLServerHandler;
 
-/**
- * @author cpw
- *
- */
 public class ModLoader
 {
     public static final String fmlMarker = "This is an FML marker";
     // TODO dirty workaround for millinaire
     @Deprecated
     public static final Map<String,Map<String,String>> localizedStrings=Collections.emptyMap();
+
     /**
-     * Not used on the server.
+     * Adds localization info for an achievement, Not used on the server.
      *
-     * @param achievement
-     * @param name
-     * @param description
+     * @param achievement The achievement to name
+     * @param name The name
+     * @param description The description
      */
     public static void addAchievementDesc(Achievement achievement, String name, String description)
     {
@@ -72,11 +69,11 @@ public class ModLoader
     /**
      * This method is a call in hook from modified external code. Implemented elsewhere.
      *
-     * {@link FMLCommonHandler#fuelLookup(int, int)}
+     * {@link GameRegistry#getFuelValue(ItemStack)}
      *
-     * @param id
-     * @param metadata
-     * @return
+     * @param id The Item ID
+     * @param metadata The Item Metadata
+     * @return The fuel strength, in ticks, 0 if unhandled
      */
     @Deprecated
     public static int addAllFuel(int id, int metadata)
@@ -97,9 +94,12 @@ public class ModLoader
     }
 
     /**
+     * Adds a new prefix to the armor texture list
      *
-     * @param armor
-     * @return
+     * {@link RenderingRegistry#addNewArmourRendererPrefix(String)}
+     *
+     * @param armor The new armor prefix
+     * @return The new armor index
      */
     @SideOnly(CLIENT)
     public static int addArmor(String armor)
@@ -110,7 +110,7 @@ public class ModLoader
     /**
      * This method adds the supplied biome to the set of candidate biomes for the default world generator type.
      *
-     * @param biome
+     * @param biome The biome to add
      */
     public static void addBiome(BiomeGenBase biome)
     {
@@ -126,11 +126,22 @@ public class ModLoader
     {
         ModLoaderHelper.addCommand(command);
     }
+
+    /**
+     * Add a behaviour to the dispenser
+     *
+     * @param item
+     * @param behavior
+     */
+    public static void addDispenserBehavior(Item item, IBehaviorDispenseItem behavior)
+    {
+    	BlockDispenser.field_82527_a.func_82595_a(item, behavior);
+    }
     /**
      * Add localization for the specified string
      *
-     * @param key
-     * @param value
+     * @param key Key
+     * @param value Value
      */
     public static void addLocalization(String key, String value)
     {
@@ -140,9 +151,9 @@ public class ModLoader
     /**
      * Add localization for the specified string
      *
-     * @param key
-     * @param lang
-     * @param value
+     * @param key Key
+     * @param lang Language identifier
+     * @param value Value
      */
     public static void addLocalization(String key, String lang, String value)
     {
@@ -152,8 +163,8 @@ public class ModLoader
     /**
      * Name the specified minecraft object with the supplied name
      *
-     * @param instance
-     * @param name
+     * @param instance Item to name
+     * @param name The name to give it
      */
     public static void addName(Object instance, String name)
     {
@@ -163,9 +174,9 @@ public class ModLoader
     /**
      * Unimplemented on the server as it does not generate names
      *
-     * @param instance
-     * @param lang
-     * @param name
+     * @param instance Item to name
+     * @param lang Languge identifier
+     * @param name Name to give it
      */
     public static void addName(Object instance, String lang, String name)
     {
@@ -173,11 +184,18 @@ public class ModLoader
     }
 
     /**
+     * Attempts to register a small image to be applied to a larger texture image,
+     * typically how old ModLoader mods add custom Item/Block textures.
+     *
+     * Forge mods should use setTextureFile in Item/Block
+     *
+     * Will return the icon index it was applied to.
+     *
      * Unimplemented on the server as it does not render textures
      *
-     * @param fileToOverride
-     * @param fileToAdd
-     * @return
+     * @param fileToOverride The texture to apply the new image to
+     * @param fileToAdd The new image
+     * @return The 'icon index' in the main image that the new image will be applied to
      */
     @SideOnly(CLIENT)
     public static int addOverride(String fileToOverride, String fileToAdd)
@@ -186,11 +204,16 @@ public class ModLoader
     }
 
     /**
+     * Attempts to register a small image to be applied to a larger texture image,
+     * typically how old ModLoader mods add custom Item/Block textures.
+     *
+     * Forge mods should use setTextureFile in Item/Block
+     *
      * Unimplemented on the server as it does not render textures
      *
-     * @param path
-     * @param overlayPath
-     * @param index
+     * @param path The texture to apply the new image to
+     * @param overlayPath The new image
+     * @param index Where on the texture to apply it
      */
     @SideOnly(CLIENT)
     public static void addOverride(String path, String overlayPath, int index)
@@ -201,8 +224,8 @@ public class ModLoader
     /**
      * Add a Shaped Recipe
      *
-     * @param output
-     * @param params
+     * @param output The result
+     * @param params The input
      */
     public static void addRecipe(ItemStack output, Object... params)
     {
@@ -212,8 +235,8 @@ public class ModLoader
     /**
      * Add a shapeless recipe
      *
-     * @param output
-     * @param params
+     * @param output The result
+     * @param params The input
      */
     public static void addShapelessRecipe(ItemStack output, Object... params)
     {
@@ -322,7 +345,7 @@ public class ModLoader
      * @param xVel
      * @param zVel
      * @param item
-     * @return
+     * @return Always false, not implemented here
      */
     @Deprecated
     public static boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item)
@@ -392,7 +415,7 @@ public class ModLoader
      * Get a list of all BaseMod loaded into the system
      * {@link ModLoaderModContainer#findAll}
      *
-     * @return
+     * @return A list containing all loaded ModLoader mods
      */
     public static List<BaseMod> getLoadedMods()
     {
@@ -402,7 +425,7 @@ public class ModLoader
     /**
      * Get a logger instance {@link FMLCommonHandler#getFMLLogger()}
      *
-     * @return
+     * @return The current logger
      */
     public static Logger getLogger()
     {
@@ -415,10 +438,6 @@ public class ModLoader
         return FMLClientHandler.instance().getClient();
     }
 
-    /**
-     *
-     * @return
-     */
     public static MinecraftServer getMinecraftServerInstance()
     {
         return FMLCommonHandler.instance().getMinecraftServerInstance();
@@ -431,7 +450,7 @@ public class ModLoader
      * @param instanceclass
      * @param instance
      * @param fieldindex
-     * @return
+     * @return The value in the specified field.
      */
     public static <T, E> T getPrivateValue(Class<? super E> instanceclass, E instance, int fieldindex)
     {
@@ -440,12 +459,12 @@ public class ModLoader
 
     /**
      * Get a value from a field using reflection
-     * {@link ObfuscationReflectionHelper#getPrivateValue(Class, Object, String)}
+     * {@link ObfuscationReflectionHelper#getPrivateValue(Class, Object, String[])}
      *
      * @param instanceclass
      * @param instance
      * @param field
-     * @return
+     * @return The value in the specified field.
      */
     public static <T, E> T getPrivateValue(Class<? super E> instanceclass, E instance, String field)
     {
@@ -464,9 +483,9 @@ public class ModLoader
 
     /**
      * Get a new unique entity id
-     * {@link Entity#getNextId()}
+     * {@link EntityRegistry#findGlobalUniqueEntityId()}
      *
-     * @return
+     * @return A unique entity ID
      */
     public static int getUniqueEntityId()
     {
@@ -485,7 +504,7 @@ public class ModLoader
      *
      * @param player
      * @param channel
-     * @return
+     * @return If the channel is registered to the current connection.
      */
     public static boolean isChannelActive(EntityPlayer player, String channel)
     {
@@ -503,7 +522,7 @@ public class ModLoader
      * {@link Loader#isModLoaded(String)}
      *
      * @param modname
-     * @return
+     * @return If the specified mod is loaded
      */
     public static boolean isModLoaded(String modname)
     {
@@ -555,7 +574,6 @@ public class ModLoader
 
     /**
      * This method is a call in hook from modified external code. Implemented elsewhere.
-     * {@link FMLServerHandler#handlePacket250(Packet250CustomPayload, EntityPlayer)}
      *
      * @param packet
      */
@@ -636,7 +654,7 @@ public class ModLoader
 
     /**
      * Register the mod for packets on this channel.
-     * {@link FMLCommonHandler#registerChannel(cpw.mods.fml.common.ModContainer, String)}
+     * {@link NetworkRegistry#registerChannel(IPacketHandler, String)}
      *
      * @param mod
      * @param channel
@@ -759,7 +777,6 @@ public class ModLoader
     }
     /**
      * Send a chat message to the server
-     * {@link FMLClientHandler#handleChatPacket(Packet3Chat, EntityPlayer)}
      *
      * @param text
      */

client/net/minecraft/src/ModTextureAnimation.java

@@ -18,11 +18,13 @@ import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.ImageObserver;
 
+import org.lwjgl.opengl.GL11;
+
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.FMLTextureFX;
 
 /**
- * A texture override for animations, it takes a vertical image of 
+ * A texture override for animations, it takes a vertical image of
  * texture frames and constantly rotates them in the texture.
  */
 public class ModTextureAnimation extends FMLTextureFX
@@ -31,45 +33,45 @@ public class ModTextureAnimation extends FMLTextureFX
     private byte[][] images;
     private int index = 0;
     private int ticks = 0;
-    
+
     private String targetTex = null;
     private BufferedImage imgData = null;
-    
+
     public ModTextureAnimation(int icon, int target, BufferedImage image, int tickCount)
     {
         this(icon, 1, target, image, tickCount);
     }
 
-    public ModTextureAnimation(int icon, int size, int target, BufferedImage image, int tickCount)    
+    public ModTextureAnimation(int icon, int size, int target, BufferedImage image, int tickCount)
     {
         this(icon, size, (target == 0 ? "/terrain.png" : "/gui/items.png"), image, tickCount);
     }
-    
+
     public ModTextureAnimation(int icon, int size, String target, BufferedImage image, int tickCount)
     {
         super(icon);
         RenderEngine re = FMLClientHandler.instance().getClient().field_71446_o;
-        
+
         targetTex = target;
         field_76849_e = size;
         field_76847_f = re.func_78341_b(target);
-        
+
         tickRate = tickCount;
         ticks = tickCount;
         imgData = image;
     }
-    
+
     @Override
     public void setup()
     {
         super.setup();
-        
+
         int sWidth  = imgData.getWidth();
         int sHeight = imgData.getHeight();
         int tWidth  = tileSizeBase;
         int tHeight = tileSizeBase;
-        
-        
+
+
         int frames = (int)Math.floor((double)(sHeight / sWidth));
 
         if (frames < 1)
@@ -80,7 +82,7 @@ public class ModTextureAnimation extends FMLTextureFX
         {
             images = new byte[frames][];
             BufferedImage image = imgData;
-            
+
             if (sWidth != tWidth)
             {
                 BufferedImage b = new BufferedImage(tWidth, tHeight * frames, 6);
@@ -107,8 +109,8 @@ public class ModTextureAnimation extends FMLTextureFX
             }
         }
     }
-    
-    public void func_783_a()
+
+    public void func_76846_a()
     {
         if (++ticks >= tickRate)
         {
@@ -121,4 +123,17 @@ public class ModTextureAnimation extends FMLTextureFX
             ticks = 0;
         }
     }
+
+    public void func_76845_a(RenderEngine renderEngine)
+    {
+        GL11.glBindTexture(GL11.GL_TEXTURE_2D, field_76847_f);
+    }
+
+    // TODO: REMOVE THIS - just for you dan200
+    @Deprecated
+    public void func_783_a()
+    {
+        func_76846_a();
+    }
+
 }

commands.patch

@@ -19,7 +19,7 @@
  
      def creatergcfg(self, reobf=False, keep_lvt=False, keep_generics=False, rg_update=False):
          """Create the files necessary for RetroGuard"""
-@@ -781,7 +786,8 @@
+@@ -781,13 +786,16 @@
          testlk = {CLIENT: self.testclient, SERVER: self.testserver}
  
          if not os.path.exists(os.path.join(srclk[side], os.path.normpath(testlk[side] + '.java'))):
@@ -29,7 +29,15 @@
          return True
  
      def checkbins(self, side):
-@@ -1029,6 +1035,10 @@
+         binlk = {CLIENT: self.binclient, SERVER: self.binserver}
+         testlk = {CLIENT: self.testclient, SERVER: self.testserver}
+ 
++        if side == SERVER:
++            return self.checkbins(CLIENT)
+         if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
+             return False
+         return True
+@@ -1029,6 +1037,10 @@
          pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
          pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
  
@@ -40,7 +48,7 @@
          if not os.path.exists(pathbinlk[side]):
              os.makedirs(pathbinlk[side])
  
-@@ -1041,6 +1051,7 @@
+@@ -1041,6 +1053,7 @@
              all_files = True
              append_pattern = False
          pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=append_pattern, all_files=all_files)
@@ -48,16 +56,16 @@
          dirs = ' '.join(pkglist)
          classpath = os.pathsep.join(cplk[side])
          forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side],
-@@ -1062,7 +1073,7 @@
+@@ -1062,7 +1075,7 @@
              raise
  
      def startserver(self):
 -        classpath = [self.binserver] + self.cpathserver
-+        classpath = [self.binserver, self.srcshared] + self.cpathserver
++        classpath = [self.binclient, self.srcshared] + self.cpathserver
          classpath = [os.path.join('..', p) for p in classpath]
          classpath = os.pathsep.join(classpath)
          os.chdir(self.dirjars)
-@@ -1070,7 +1081,7 @@
+@@ -1070,7 +1083,7 @@
          self.runmc(forkcmd)
  
      def startclient(self):
@@ -66,7 +74,7 @@
          classpath = [os.path.join('..', p) for p in classpath]
          classpath = os.pathsep.join(classpath)
          natives = os.path.join('..', self.dirnatives)
-@@ -1197,20 +1208,20 @@
+@@ -1197,20 +1210,20 @@
          with open(self.csvmethods, 'rb') as fh:
              methodsreader = csv.DictReader(fh)
              for row in methodsreader:
@@ -90,7 +98,7 @@
                          names['params'][row['param']] = row['name']
  
          regexps = {
-@@ -1240,6 +1251,11 @@
+@@ -1240,6 +1253,11 @@
  
          # HINT: We pathwalk the sources
          for path, _, filelist in os.walk(pathsrclk[side], followlinks=True):
@@ -102,7 +110,7 @@
              for cur_file in fnmatch.filter(filelist, '*.java'):
                  updatefile(os.path.normpath(os.path.join(path, cur_file)))
          return True
-@@ -1322,12 +1338,14 @@
+@@ -1322,12 +1340,14 @@
          pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
  
          strip_comments(pathsrclk[side])
@@ -117,7 +125,7 @@
  
      def process_javadoc(self, side):
          """Add CSV descriptions to methods and fields as javadoc"""
-@@ -1336,6 +1354,21 @@
+@@ -1336,6 +1356,21 @@
          if not self.has_doc_csv:
              self.logger.warning('!! javadoc disabled due to no csvs !!')
              return False
@@ -139,7 +147,7 @@
  
          #HINT: We read the relevant CSVs
          methodsreader = csv.DictReader(open(self.csvmethods, 'r'))
-@@ -1344,13 +1377,13 @@
+@@ -1344,13 +1379,13 @@
          methods = {}
          for row in methodsreader:
              #HINT: Only include methods that have a non-empty description
@@ -155,7 +163,7 @@
                  fields[row['searge']] = row['desc'].replace('*/', '* /')
  
          regexps = {
-@@ -1422,12 +1455,13 @@
+@@ -1422,12 +1457,13 @@
  
          # HINT: We create the list of source directories based on the list of packages
          pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=True)
@@ -170,7 +178,7 @@
          if not reobf:
              md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
          else:
-@@ -1442,6 +1476,9 @@
+@@ -1442,6 +1478,9 @@
                      class_path = ''
                  else:
                      class_path += '/'
@@ -180,7 +188,7 @@
                  for class_file in fnmatch.filter(filelist, '*.class'):
                      class_name = class_path + os.path.splitext(class_file)[0]
                      bin_file = os.path.normpath(os.path.join(path, class_file))
-@@ -1594,6 +1631,9 @@
+@@ -1594,6 +1633,9 @@
                  sys.exit(1)
  
          for entry in newfiles:
@@ -190,7 +198,7 @@
              if entry[3] == 'U':
                  self.logger.info('Retrieving file from server : %s', entry[0])
                  cur_file = os.path.normpath(entry[0])
-@@ -1614,6 +1654,9 @@
+@@ -1614,6 +1656,9 @@
          md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
          outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
          src = {CLIENT: self.srcclient, SERVER: self.srcserver}
@@ -200,10 +208,28 @@
  
          # HINT: We need a table for the old md5 and the new ones
          md5table = {}
-@@ -1656,3 +1699,6 @@
+@@ -1646,6 +1691,7 @@
+         # HINT: We extract the source files for the modified class files
+         for in_class in trgclasses:
+             src_file = os.path.normpath(os.path.join(src[side], in_class + '.java'))
++            cmn_file = os.path.normpath(os.path.join(self.srcshared, in_class + '.java'))
+             dest_file = os.path.normpath(os.path.join(outpathlk[side], in_class + '.java'))
+             if os.path.isfile(src_file):
+                 if not os.path.exists(os.path.dirname(dest_file)):
+@@ -1655,4 +1701,15 @@
+                     self.logger.info('> Outputted %s to %s', in_class.ljust(35), outpathlk[side])
                  except IOError:
                      self.logger.error('* File %s copy failed', in_class)
- 
+-
++            elif os.path.isfile(cmn_file):
++                if not os.path.exists(os.path.dirname(dest_file)):
++                    os.makedirs(os.path.dirname(dest_file))
++                try:
++                    shutil.copyfile(cmn_file, dest_file)
++                    self.logger.info('> Outputted %s to %s', in_class.ljust(35), outpathlk[side])
++                except IOError:
++                    self.logger.error('* File %s copy failed', in_class)
++
 +def commands_sanity_check():
 +    print 'Commands patch applied successfully'
 +    

common/cpw/mods/fml/common/BukkitPluginRef.java

@@ -0,0 +1,29 @@
+package cpw.mods.fml.common;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Declare a variable to be populated by a Bukkit Plugin proxy instance if the bukkit coremod
+ * is available. It can only be applied to field typed as {@link BukkitProxy}
+ * Generally it should be used in conjunction with {@link Mod#bukkitPlugin()} specifying the
+ * plugin to load.
+ *
+ * @author cpw
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface BukkitPluginRef
+{
+    /**
+     * A reference (possibly version specific) to a Bukkit Plugin by name, using the name@versionbound
+     * specification. If this is a bukkit enabled environment the field annotated by this
+     * will be populated with a {@link BukkitProxy} instance if possible. This proxy will be gotten by
+     * reflectively calling the "getModProxy" method on the bukkit plugin instance.
+     * @return The name of the plugin which we will inject into this field
+     */
+    String value();
+}

common/cpw/mods/fml/common/BukkitProxy.java

@@ -0,0 +1,12 @@
+package cpw.mods.fml.common;
+
+/**
+ * A marker interface for retrieving a proxy to a bukkit plugin.
+ * Fields associated with {@link BukkitPluginRef} annotations should be should probably
+ * declare this type and cast down if the target is available (not null)
+ * @author cpw
+ *
+ */
+public interface BukkitProxy
+{
+}

common/cpw/mods/fml/common/DummyModContainer.java

@@ -9,6 +9,7 @@ import com.google.common.eventbus.EventBus;
 
 import cpw.mods.fml.common.versioning.ArtifactVersion;
 import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
+import cpw.mods.fml.common.versioning.VersionRange;
 
 public class DummyModContainer implements ModContainer
 {
@@ -132,4 +133,9 @@ public class DummyModContainer implements ModContainer
     {
         return md.version;
     }
+    @Override
+    public VersionRange acceptableMinecraftVersionRange()
+    {
+        return Loader.instance().getMinecraftModContainer().getStaticVersionRange();
+    }
 }

common/cpw/mods/fml/common/DuplicateModsFoundException.java

@@ -0,0 +1,16 @@
+package cpw.mods.fml.common;
+
+import java.io.File;
+import java.util.List;
+
+import com.google.common.collect.SetMultimap;
+
+public class DuplicateModsFoundException extends LoaderException {
+
+	public SetMultimap<ModContainer,File> dupes;
+
+	public DuplicateModsFoundException(SetMultimap<ModContainer, File> dupes) {
+		this.dupes = dupes;
+	}
+
+}

common/cpw/mods/fml/common/FMLCommonHandler.java

@@ -15,28 +15,36 @@ package cpw.mods.fml.common;
 
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
-import java.util.logging.Level;
+import java.util.Set;
 import java.util.logging.Logger;
 
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.src.CrashReport;
+import net.minecraft.src.CrashReportCategory;
 import net.minecraft.src.DedicatedServer;
 import net.minecraft.src.Entity;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.EntityPlayerMP;
+import net.minecraft.src.NBTBase;
+import net.minecraft.src.NBTTagCompound;
 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;
+import com.google.common.collect.MapMaker;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 
 import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
 import cpw.mods.fml.common.network.EntitySpawnPacket;
@@ -75,6 +83,8 @@ public class FMLCommonHandler
     private boolean noForge;
     private List<String> brandings;
     private List<ICrashCallable> crashCallables = Lists.newArrayList(Loader.instance().getCallableCrashInformation());
+    private Set<SaveHandler> handlerSet = Sets.newSetFromMap(new MapMaker().weakKeys().<SaveHandler,Boolean>makeMap());
+
 
 
     public void beginLoading(IFMLSidedHandler handler)
@@ -138,7 +148,6 @@ public class FMLCommonHandler
     /**
      * Find the container that associates with the supplied mod object
      * @param mod
-     * @return
      */
     public ModContainer findContainerFor(Object mod)
     {
@@ -146,23 +155,13 @@ public class FMLCommonHandler
     }
     /**
      * Get the forge mod loader logging instance (goes to the forgemodloader log file)
-     * @return
+     * @return The log instance for the FML log file
      */
     public Logger getFMLLogger()
     {
         return FMLLog.getLogger();
     }
 
-    /**
-     * @param key
-     * @param lang
-     * @param value
-     */
-    /**
-     * @param languagePack
-     * @param lang
-     */
-
     public Side getSide()
     {
         return sidedDelegate.getSide();
@@ -172,13 +171,11 @@ public class FMLCommonHandler
      * Return the effective side for the context in the game. This is dependent
      * on thread analysis to try and determine whether the code is running in the
      * server or not. Use at your own risk
-     *
-     * @return
      */
     public Side getEffectiveSide()
     {
         Thread thr = Thread.currentThread();
-        if ((thr instanceof ThreadServerApplication) || (thr instanceof ServerListenThread))
+        if ((thr instanceof ThreadMinecraftServer) || (thr instanceof ServerListenThread))
         {
             return Side.SERVER;
         }
@@ -187,10 +184,6 @@ public class FMLCommonHandler
     }
     /**
      * Raise an exception
-     *
-     * @param exception
-     * @param message
-     * @param stopGame
      */
     public void raiseException(Throwable exception, String message, boolean stopGame)
     {
@@ -229,23 +222,24 @@ public class FMLCommonHandler
             return null;
         }
     }
-    /**
-     * @param string
-     * @return
-     */
+
     public void computeBranding()
     {
         if (brandings == null)
         {
             Builder brd = ImmutableList.<String>builder();
             brd.add(Loader.instance().getMCVersionString());
+            brd.add(Loader.instance().getMCPVersionString());
             brd.add("FML v"+Loader.instance().getFMLVersionString());
             String forgeBranding = (String) callForgeMethod("getBrandingVersion");
             if (!Strings.isNullOrEmpty(forgeBranding))
             {
                 brd.add(forgeBranding);
             }
-            brd.addAll(sidedDelegate.getAdditionalBrandingInformation());
+            if (sidedDelegate!=null)
+            {
+            	brd.addAll(sidedDelegate.getAdditionalBrandingInformation());
+            }
             try {
                 Properties props=new Properties();
                 props.load(getClass().getClassLoader().getResourceAsStream("fmlbranding.properties"));
@@ -268,9 +262,6 @@ public class FMLCommonHandler
         return ImmutableList.copyOf(brandings);
     }
 
-    /**
-     * @return
-     */
     public IFMLSidedHandler getSidedDelegate()
     {
         return sidedDelegate;
@@ -396,11 +387,11 @@ public class FMLCommonHandler
         crashCallables.add(callable);
     }
 
-    public void enhanceCrashReport(CrashReport crashReport)
+    public void enhanceCrashReport(CrashReport crashReport, CrashReportCategory category)
     {
         for (ICrashCallable call: crashCallables)
         {
-            crashReport.func_71500_a(call.getLabel(), call);
+            category.func_71500_a(call.getLabel(), call);
         }
     }
 
@@ -408,4 +399,46 @@ public class FMLCommonHandler
     {
         sidedDelegate.handleTinyPacket(handler, mapData);
     }
+
+    public void handleWorldDataSave(SaveHandler handler, WorldInfo worldInfo, NBTTagCompound tagCompound)
+    {
+        for (ModContainer mc : Loader.instance().getModList())
+        {
+            if (mc instanceof InjectedModContainer)
+            {
+                WorldAccessContainer wac = ((InjectedModContainer)mc).getWrappedWorldAccessContainer();
+                if (wac != null)
+                {
+                    NBTTagCompound dataForWriting = wac.getDataForWriting(handler, worldInfo);
+                    tagCompound.func_74766_a(mc.getModId(), dataForWriting);
+                }
+            }
+        }
+    }
+
+    public void handleWorldDataLoad(SaveHandler handler, WorldInfo worldInfo, NBTTagCompound tagCompound)
+    {
+        if (getEffectiveSide()!=Side.SERVER)
+        {
+            return;
+        }
+        if (handlerSet.contains(handler))
+        {
+            return;
+        }
+        handlerSet.add(handler);
+        Map<String,NBTBase> additionalProperties = Maps.newHashMap();
+        worldInfo.setAdditionalProperties(additionalProperties);
+        for (ModContainer mc : Loader.instance().getModList())
+        {
+            if (mc instanceof InjectedModContainer)
+            {
+                WorldAccessContainer wac = ((InjectedModContainer)mc).getWrappedWorldAccessContainer();
+                if (wac != null)
+                {
+                    wac.readData(handler, worldInfo, additionalProperties, tagCompound.func_74775_l(mc.getModId()));
+                }
+            }
+        }
+    }
 }

common/cpw/mods/fml/common/FMLDummyContainer.java

@@ -15,14 +15,26 @@
 package cpw.mods.fml.common;
 
 import java.util.Arrays;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
 
+import net.minecraft.src.NBTBase;
+import net.minecraft.src.NBTTagCompound;
+import net.minecraft.src.NBTTagList;
+import net.minecraft.src.NBTTagString;
+import net.minecraft.src.SaveHandler;
+import net.minecraft.src.WorldInfo;
+
+import com.google.common.collect.MapMaker;
+import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;
 
 /**
  * @author cpw
  *
  */
-public class FMLDummyContainer extends DummyModContainer
+public class FMLDummyContainer extends DummyModContainer implements WorldAccessContainer
 {
     public FMLDummyContainer()
     {
@@ -49,4 +61,45 @@ public class FMLDummyContainer extends DummyModContainer
     {
         return true;
     }
+
+    @Override
+    public NBTTagCompound getDataForWriting(SaveHandler handler, WorldInfo info)
+    {
+        NBTTagCompound fmlData = new NBTTagCompound();
+        NBTTagList list = new NBTTagList();
+        for (ModContainer mc : Loader.instance().getActiveModList())
+        {
+            NBTTagCompound mod = new NBTTagCompound();
+            mod.func_74778_a("ModId", mc.getModId());
+            mod.func_74778_a("ModVersion", mc.getVersion());
+            list.func_74742_a(mod);
+        }
+        fmlData.func_74782_a("ModList", list);
+        return fmlData;
+    }
+
+    @Override
+    public void readData(SaveHandler handler, WorldInfo info, Map<String, NBTBase> propertyMap, NBTTagCompound tag)
+    {
+        if (tag.func_74764_b("ModList"))
+        {
+            NBTTagList modList = tag.func_74761_m("ModList");
+            for (int i = 0; i < modList.func_74745_c(); i++)
+            {
+                NBTTagCompound mod = (NBTTagCompound) modList.func_74743_b(i);
+                String modId = mod.func_74779_i("ModId");
+                String modVersion = mod.func_74779_i("ModVersion");
+                ModContainer container = Loader.instance().getIndexedModList().get(modId);
+                if (container == null)
+                {
+                    FMLLog.severe("This world was saved with mod %s which appears to be missing, things may not work well", modId);
+                    continue;
+                }
+                if (!modVersion.equals(container.getVersion()))
+                {
+                    FMLLog.info("This world was saved with mod %s version %s and it is now at version %s, things may not work well", modId, modVersion, container.getVersion());
+                }
+            }
+        }
+    }
 }

common/cpw/mods/fml/common/FMLModContainer.java

@@ -13,6 +13,7 @@
 package cpw.mods.fml.common;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -20,8 +21,12 @@ import java.lang.reflect.Modifier;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 import java.util.logging.Level;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
 
 import com.google.common.base.Function;
 import com.google.common.base.Strings;
@@ -41,7 +46,9 @@ import cpw.mods.fml.common.Mod.Metadata;
 import cpw.mods.fml.common.discovery.ASMDataTable;
 import cpw.mods.fml.common.discovery.ASMDataTable.ASMData;
 import cpw.mods.fml.common.event.FMLConstructionEvent;
+import cpw.mods.fml.common.event.FMLEvent;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartedEvent;
@@ -51,6 +58,8 @@ import cpw.mods.fml.common.event.FMLStateEvent;
 import cpw.mods.fml.common.network.FMLNetworkHandler;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
 import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
+import cpw.mods.fml.common.versioning.VersionParser;
+import cpw.mods.fml.common.versioning.VersionRange;
 
 public class FMLModContainer implements ModContainer
 {
@@ -69,16 +78,18 @@ public class FMLModContainer implements ModContainer
     private DefaultArtifactVersion processedVersion;
     private boolean isNetworkMod;
 
-    private static final BiMap<Class<? extends FMLStateEvent>, Class<? extends Annotation>> modAnnotationTypes = ImmutableBiMap.<Class<? extends FMLStateEvent>, Class<? extends Annotation>>builder()
+    private static final BiMap<Class<? extends FMLEvent>, Class<? extends Annotation>> modAnnotationTypes = ImmutableBiMap.<Class<? extends FMLEvent>, Class<? extends Annotation>>builder()
         .put(FMLPreInitializationEvent.class, Mod.PreInit.class)
         .put(FMLInitializationEvent.class, Mod.Init.class)
         .put(FMLPostInitializationEvent.class, Mod.PostInit.class)
         .put(FMLServerStartingEvent.class, Mod.ServerStarting.class)
         .put(FMLServerStartedEvent.class, Mod.ServerStarted.class)
         .put(FMLServerStoppingEvent.class, Mod.ServerStopping.class)
+        .put(IMCEvent.class,Mod.IMCCallback.class)
         .build();
-    private static final BiMap<Class<? extends Annotation>, Class<? extends FMLStateEvent>> modTypeAnnotations = modAnnotationTypes.inverse();
+    private static final BiMap<Class<? extends Annotation>, Class<? extends FMLEvent>> modTypeAnnotations = modAnnotationTypes.inverse();
     private String annotationDependencies;
+    private VersionRange minecraftAccepted;
 
 
     public FMLModContainer(String className, File modSource, Map<String,Object> modDescriptor)
@@ -123,9 +134,9 @@ public class FMLModContainer implements ModContainer
     {
         modMetadata = mc.getMetadataForId(getModId(), descriptor);
 
-        if (descriptor.containsKey("usesMetadata"))
+        if (descriptor.containsKey("useMetadata"))
         {
-            overridesMetadata = !((Boolean)descriptor.get("usesMetadata")).booleanValue();
+            overridesMetadata = !((Boolean)descriptor.get("useMetadata")).booleanValue();
         }
 
         if (overridesMetadata || !modMetadata.useDependencyInformation)
@@ -150,16 +161,74 @@ public class FMLModContainer implements ModContainer
             modMetadata.name = getModId();
         }
         internalVersion = (String) descriptor.get("version");
+        if (Strings.isNullOrEmpty(internalVersion))
+        {
+            Properties versionProps = searchForVersionProperties();
+            if (versionProps != null)
+            {
+                internalVersion = versionProps.getProperty(getModId()+".version");
+                FMLLog.fine("Found version %s for mod %s in version.properties, using", internalVersion, getModId());
+            }
+
+        }
         if (Strings.isNullOrEmpty(internalVersion) && !Strings.isNullOrEmpty(modMetadata.version))
         {
-            FMLLog.warning("Mod %s is missing the required element 'version'. Falling back to metadata version %s", getModId(), modMetadata.version);
-            modMetadata.version = internalVersion;
+            FMLLog.warning("Mod %s is missing the required element 'version' and a version.properties file could not be found. Falling back to metadata version %s", getModId(), modMetadata.version);
+            internalVersion = modMetadata.version;
         }
         if (Strings.isNullOrEmpty(internalVersion))
         {
             FMLLog.warning("Mod %s is missing the required element 'version' and no fallback can be found. Substituting '1.0'.", getModId());
             modMetadata.version = internalVersion = "1.0";
         }
+
+        String mcVersionString = (String) descriptor.get("acceptedMinecraftVersions");
+        if (!Strings.isNullOrEmpty(mcVersionString))
+        {
+            minecraftAccepted = VersionParser.parseRange(mcVersionString);
+        }
+        else
+        {
+            minecraftAccepted = Loader.instance().getMinecraftModContainer().getStaticVersionRange();
+        }
+    }
+
+    public Properties searchForVersionProperties()
+    {
+        try
+        {
+            FMLLog.fine("Attempting to load the file version.properties from %s to locate a version number for %s", getSource().getName(), getModId());
+            Properties version = null;
+            if (getSource().isFile())
+            {
+                ZipFile source = new ZipFile(getSource());
+                ZipEntry versionFile = source.getEntry("version.properties");
+                if (versionFile!=null)
+                {
+                    version = new Properties();
+                    version.load(source.getInputStream(versionFile));
+                }
+                source.close();
+            }
+            else if (getSource().isDirectory())
+            {
+                File propsFile = new File(getSource(),"version.properties");
+                if (propsFile.exists() && propsFile.isFile())
+                {
+                    version = new Properties();
+                    FileInputStream fis = new FileInputStream(propsFile);
+                    version.load(fis);
+                    fis.close();
+                }
+            }
+            return version;
+        }
+        catch (Exception e)
+        {
+            Throwables.propagateIfPossible(e);
+            FMLLog.fine("Failed to find a usable version.properties file");
+            return null;
+        }
     }
 
     @Override
@@ -356,7 +425,7 @@ public class FMLModContainer implements ModContainer
     }
 
     @Subscribe
-    public void handleModStateEvent(FMLStateEvent event)
+    public void handleModStateEvent(FMLEvent event)
     {
         Class<? extends Annotation> annotation = modAnnotationTypes.get(event.getClass());
         if (annotation == null)
@@ -404,4 +473,10 @@ public class FMLModContainer implements ModContainer
     {
         return modMetadata.version;
     }
+
+    @Override
+    public VersionRange acceptableMinecraftVersionRange()
+    {
+        return minecraftAccepted;
+    }
 }

common/cpw/mods/fml/common/ICraftingHandler.java

@@ -29,15 +29,15 @@ public interface ICraftingHandler
      * The object array contains these three arguments
      *
      * @param player
-     * @param craftedItem
-     * @param craftingGrid
+     * @param item
+     * @param craftMatrix
      */
     void onCrafting(EntityPlayer player, ItemStack item, IInventory craftMatrix);
 
     /**
      * The object array contains these two arguments
      * @param player
-     * @param smeltedItem
+     * @param item
      */
     void onSmelting(EntityPlayer player, ItemStack item);
 }

common/cpw/mods/fml/common/IDispenseHandler.java

@@ -35,7 +35,6 @@ public interface IDispenseHandler
      * @param entX
      * @param entY
      * @param entZ
-     * @return
      */
     @Deprecated
     int dispense(double x, double y, double z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY, double entZ);

common/cpw/mods/fml/common/IDispenserHandler.java

@@ -24,7 +24,6 @@ public interface IDispenserHandler
      * @param entX
      * @param entY
      * @param entZ
-     * @return
      */
     int dispense(int x, int y, int z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY, double entZ);
 }

common/cpw/mods/fml/common/IFMLHandledException.java

@@ -0,0 +1,6 @@
+package cpw.mods.fml.common;
+
+public interface IFMLHandledException
+{
+
+}

common/cpw/mods/fml/common/IScheduledTickHandler.java

@@ -6,8 +6,7 @@ public interface IScheduledTickHandler extends ITickHandler
      * Return the number of actual ticks that will pass
      * before your next tick will fire. This will be called
      * just after your last tick fired to compute the next delay.
-     * @param tick
-     * @return
+     * @return Time until next tick
      */
     public int nextTickSpacing();
 }

common/cpw/mods/fml/common/ITickHandler.java

@@ -51,14 +51,11 @@ public interface ITickHandler
     
     /**
      * Returns the list of ticks this tick handler is interested in receiving at the minute
-     * 
-     * @return
      */
     public EnumSet<TickType> ticks();
     
     /**
      * A profiling label for this tick handler
-     * @return
      */
     public String getLabel();
 }

common/cpw/mods/fml/common/IWorldGenerator.java

@@ -19,8 +19,7 @@ import net.minecraft.src.IChunkProvider;
 import net.minecraft.src.World;
 
 /**
- * This is called back during world generation. The {@link #generate(Random, int, int, Object...)} method passes in some additional data that
- * can be cast into minecraft objects.
+ * This is called back during world generation. 
  *
  * @author cpw
  *
@@ -34,7 +33,7 @@ public interface IWorldGenerator
      * @param chunkX the chunk X coordinate of this chunk.
      * @param chunkZ the chunk Z coordinate of this chunk.
      * @param world : additionalData[0] The minecraft {@link World} we're generating for.
-     * @param generator : additionalData[1] The {@link IChunkProvider} that is generating.
+     * @param chunkGenerator : additionalData[1] The {@link IChunkProvider} that is generating.
      * @param chunkProvider : additionalData[2] {@link IChunkProvider} that is requesting the world generation.
      *
      */

common/cpw/mods/fml/common/InjectedModContainer.java

@@ -7,6 +7,7 @@ import java.util.Set;
 import com.google.common.eventbus.EventBus;
 
 import cpw.mods.fml.common.versioning.ArtifactVersion;
+import cpw.mods.fml.common.versioning.VersionRange;
 
 public class InjectedModContainer implements ModContainer
 {
@@ -110,4 +111,22 @@ public class InjectedModContainer implements ModContainer
     {
         return wrappedContainer.getDisplayVersion();
     }
+
+    @Override
+    public VersionRange acceptableMinecraftVersionRange()
+    {
+        return wrappedContainer.acceptableMinecraftVersionRange();
+    }
+
+    public WorldAccessContainer getWrappedWorldAccessContainer()
+    {
+        if (wrappedContainer instanceof WorldAccessContainer)
+        {
+            return (WorldAccessContainer) wrappedContainer;
+        }
+        else
+        {
+            return null;
+        }
+    }
 }

common/cpw/mods/fml/common/LoadController.java

@@ -1,5 +1,6 @@
 package cpw.mods.fml.common;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -18,6 +19,7 @@ import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 
 import cpw.mods.fml.common.LoaderState.ModState;
+import cpw.mods.fml.common.event.FMLEvent;
 import cpw.mods.fml.common.event.FMLLoadEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLStateEvent;
@@ -88,6 +90,7 @@ public class LoadController
         state = state.transition(!errors.isEmpty());
         if (state != desiredState)
         {
+            Throwable toThrow = null;
             FMLLog.severe("Fatal errors were detected during the transition from %s to %s. Loading cannot continue", oldState, desiredState);
             StringBuilder sb = new StringBuilder();
             printModStates(sb);
@@ -96,10 +99,23 @@ public class LoadController
             for (Entry<String, Throwable> error : errors.entries())
             {
                 FMLLog.log(Level.SEVERE, error.getValue(), "Caught exception from %s", error.getKey());
+                if (error.getValue() instanceof IFMLHandledException)
+                {
+                    toThrow = error.getValue();
+                }
+                else if (toThrow == null)
+                {
+                    toThrow = error.getValue();
+                }
+            }
+            if (toThrow != null && toThrow instanceof RuntimeException)
+            {
+                throw (RuntimeException)toThrow;
+            }
+            else
+            {
+                throw new LoaderException(toThrow);
             }
-
-            // Throw embedding the first error (usually the only one)
-            throw new LoaderException(errors.values().iterator().next());
         }
     }
 
@@ -109,7 +125,7 @@ public class LoadController
     }
 
     @Subscribe
-    public void propogateStateMessage(FMLStateEvent stateEvent)
+    public void propogateStateMessage(FMLEvent stateEvent)
     {
         if (stateEvent instanceof FMLPreInitializationEvent)
         {
@@ -120,17 +136,20 @@ public class LoadController
             activeContainer = mc;
             String modId = mc.getModId();
             stateEvent.applyModContainer(activeContainer());
-            FMLLog.finer("Posting state event %s to mod %s", stateEvent, modId);
+            FMLLog.finer("Sending event %s to mod %s", stateEvent.getEventType(), modId);
             eventChannels.get(modId).post(stateEvent);
-            FMLLog.finer("State event %s delivered to mod %s", stateEvent, modId);
+            FMLLog.finer("Sent event %s to mod %s", stateEvent.getEventType(), modId);
             activeContainer = null;
-            if (!errors.containsKey(modId))
+            if (stateEvent instanceof FMLStateEvent)
             {
-                modStates.put(modId, stateEvent.getModState());
-            }
-            else
-            {
-                modStates.put(modId, ModState.ERRORED);
+	            if (!errors.containsKey(modId))
+	            {
+	                modStates.put(modId, ((FMLStateEvent)stateEvent).getModState());
+	            }
+	            else
+	            {
+	                modStates.put(modId, ModState.ERRORED);
+	            }
             }
         }
     }
@@ -158,7 +177,14 @@ public class LoadController
 
     public void errorOccurred(ModContainer modContainer, Throwable exception)
     {
-        errors.put(modContainer.getModId(), exception);
+        if (exception instanceof InvocationTargetException)
+        {
+            errors.put(modContainer.getModId(), ((InvocationTargetException)exception).getCause());
+        }
+        else
+        {
+            errors.put(modContainer.getModId(), exception);
+        }
     }
 
     public void printModStates(StringBuilder ret)
@@ -207,4 +233,8 @@ public class LoadController
     {
         return this.state == state;
     }
+
+	boolean hasReachedState(LoaderState state) {
+		return this.state.ordinal()>=state.ordinal() && this.state!=LoaderState.ERRORED;
+	}
 }

common/cpw/mods/fml/common/Loader.java

@@ -18,6 +18,7 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -31,14 +32,17 @@ import com.google.common.base.CharMatcher;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
+import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultiset;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.SetMultimap;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Multiset.Entry;
 import com.google.common.collect.Multisets;
@@ -48,6 +52,7 @@ import com.google.common.collect.TreeMultimap;
 
 import cpw.mods.fml.common.LoaderState.ModState;
 import cpw.mods.fml.common.discovery.ModDiscoverer;
+import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLLoadEvent;
 import cpw.mods.fml.common.functions.ModIdFunction;
 import cpw.mods.fml.common.modloader.BaseModProxy;
@@ -104,7 +109,7 @@ public class Loader
     private static String rev;
     private static String build;
     private static String mccversion;
-    private static String mcsversion;
+    private static String mcpversion;
 
     /**
      * The class loader we load the mods into.
@@ -132,6 +137,8 @@ public class Loader
     private Exception capturedError;
     private File canonicalModsDir;
     private LoadController modController;
+    private MinecraftDummyContainer minecraft;
+	private MCPDummyContainer mcp;
 
     private static File minecraftDir;
     private static List<String> injectedContainers;
@@ -153,7 +160,7 @@ public class Loader
         rev = (String) data[2];
         build = (String) data[3];
         mccversion = (String) data[4];
-        mcsversion = (String) data[5];
+        mcpversion = (String) data[5];
         minecraftDir = (File) data[6];
         injectedContainers = (List<String>)data[7];
     }
@@ -167,6 +174,9 @@ public class Loader
             FMLLog.severe("This version of FML is built for Minecraft %s, we have detected Minecraft %s in your minecraft jar file", mccversion, actualMCVersion);
             throw new LoaderException();
         }
+
+        minecraft = new MinecraftDummyContainer(actualMCVersion);
+        mcp = new MCPDummyContainer(MetadataCollection.from(getClass().getResourceAsStream("/mcpmod.info"), "MCP").getMetadataForId("mcp", null));
     }
 
     /**
@@ -187,6 +197,11 @@ public class Loader
 
             for (ModContainer mod : getActiveModList())
             {
+                if (!mod.acceptableMinecraftVersionRange().containsVersion(minecraft.getProcessedVersion()))
+                {
+                    FMLLog.severe("The mod %s does not wish to run in Minecraft version %s. You will have to remove it to play.", mod.getModId(), getMCVersionString());
+                    throw new WrongMinecraftVersionException(mod);
+                }
                 Map<String,ArtifactVersion> names = Maps.uniqueIndex(mod.getRequirements(), new Function<ArtifactVersion, String>()
                 {
                     public String apply(ArtifactVersion v)
@@ -194,8 +209,8 @@ public class Loader
                         return v.getLabel();
                     }
                 });
-                Set<String> missingMods = Sets.difference(names.keySet(), modVersions.keySet());
                 Set<ArtifactVersion> versionMissingMods = Sets.newHashSet();
+                Set<String> missingMods = Sets.difference(names.keySet(), modVersions.keySet());
                 if (!missingMods.isEmpty())
                 {
                     FMLLog.severe("The mod %s (%s) requires mods %s to be available", mod.getModId(), mod.getName(), missingMods);
@@ -291,6 +306,8 @@ public class Loader
     private ModDiscoverer identifyMods()
     {
         FMLLog.fine("Building injected Mod Containers %s", injectedContainers);
+        // Add in the MCP mod container
+        mods.add(new InjectedModContainer(mcp,new File("minecraft.jar")));
         File coremod = new File(minecraftDir,"coremods");
         for (String cont : injectedContainers)
         {
@@ -333,7 +350,6 @@ public class Loader
 
     private void identifyDuplicates(List<ModContainer> mods)
     {
-        boolean foundDupe = false;
         TreeMultimap<ModContainer, File> dupsearch = TreeMultimap.create(new ModIdComparator(), Ordering.arbitrary());
         for (ModContainer mc : mods)
         {
@@ -344,15 +360,19 @@ public class Loader
         }
 
         ImmutableMultiset<ModContainer> duplist = Multisets.copyHighestCountFirst(dupsearch.keys());
+        SetMultimap<ModContainer, File> dupes = LinkedHashMultimap.create();
         for (Entry<ModContainer> e : duplist.entrySet())
         {
             if (e.getCount() > 1)
             {
                 FMLLog.severe("Found a duplicate mod %s at %s", e.getElement().getModId(), dupsearch.get(e.getElement()));
-                foundDupe = true;
+                dupes.putAll(e.getElement(),dupsearch.get(e.getElement()));
             }
         }
-        if (foundDupe) { throw new LoaderException(); }
+        if (!dupes.isEmpty())
+        {
+        	throw new DuplicateModsFoundException(dupes);
+        }
     }
 
     /**
@@ -419,12 +439,12 @@ public class Loader
 
     public List<ModContainer> getModList()
     {
-        return ImmutableList.copyOf(instance().mods);
+        return instance().mods != null ? ImmutableList.copyOf(instance().mods) : ImmutableList.<ModContainer>of();
     }
 
     /**
      * Called from the hook to start mod loading. We trigger the
-     * {@link #identifyMods()} and {@link #preModInit()} phases here. Finally,
+     * {@link #identifyMods()} and Constructing, Preinitalization, and Initalization phases here. Finally,
      * the mod list is frozen completely and is consider immutable from then on.
      */
     public void loadMods()
@@ -443,7 +463,7 @@ public class Loader
         {
             if (nonMod.isFile())
             {
-                FMLLog.severe("FML has found a non-mod file %s in your mods directory. It will now be injected into your classpath. This could severe stability issues, it should be removed if possible.", nonMod.getName());
+                FMLLog.info("FML has found a non-mod file %s in your mods directory. It will now be injected into your classpath. This could severe stability issues, it should be removed if possible.", nonMod.getName());
                 try
                 {
                     modClassLoader.addFile(nonMod);
@@ -512,16 +532,13 @@ public class Loader
      * Query if we know of a mod named modname
      *
      * @param modname
-     * @return
+     * @return If the mod is loaded
      */
     public static boolean isModLoaded(String modname)
     {
         return instance().namedMods.containsKey(modname) && instance().modController.getModState(instance.namedMods.get(modname))!=ModState.DISABLED;
     }
 
-    /**
-     * @return
-     */
     public File getConfigDir()
     {
         return canonicalConfigDir;
@@ -540,17 +557,11 @@ public class Loader
         return ret.toString();
     }
 
-    /**
-     * @return
-     */
     public String getFMLVersionString()
     {
         return String.format("%s.%s.%s.%s", major, minor, rev, build);
     }
 
-    /**
-     * @return
-     */
     public ClassLoader getModClassLoader()
     {
         return modClassLoader;
@@ -639,6 +650,7 @@ public class Loader
         // Mod controller should be in the initialization state here
         modController.distributeStateMessage(LoaderState.INITIALIZATION);
         modController.transition(LoaderState.POSTINITIALIZATION);
+        modController.distributeStateMessage(FMLInterModComms.IMCEvent.class);
         modController.distributeStateMessage(LoaderState.POSTINITIALIZATION);
         modController.transition(LoaderState.AVAILABLE);
         modController.distributeStateMessage(LoaderState.AVAILABLE);
@@ -664,7 +676,7 @@ public class Loader
 
     public List<ModContainer> getActiveModList()
     {
-        return modController.getActiveModList();
+        return modController != null ? modController.getActiveModList() : ImmutableList.<ModContainer>of();
     }
 
     public ModState getModState(ModContainer selectedMod)
@@ -716,4 +728,17 @@ public class Loader
     {
         return modController.isInState(state);
     }
+
+    public MinecraftDummyContainer getMinecraftModContainer()
+    {
+        return minecraft;
+    }
+
+	public boolean hasReachedState(LoaderState state) {
+		return modController.hasReachedState(state);
+	}
+
+	public String getMCPVersionString() {
+		return String.format("MCP v%s", mcpversion);
+	}
 }

common/cpw/mods/fml/common/LoaderState.java

@@ -3,6 +3,7 @@ package cpw.mods.fml.common;
 import com.google.common.base.Throwables;
 
 import cpw.mods.fml.common.event.FMLConstructionEvent;
+import cpw.mods.fml.common.event.FMLEvent;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
@@ -59,7 +60,7 @@ public enum LoaderState
     {
         return eventClass != null;
     }
-    
+
     public FMLStateEvent getEvent(Object... eventData)
     {
         try
@@ -87,7 +88,7 @@ public enum LoaderState
         AVAILABLE("Available"),
         DISABLED("Disabled"),
         ERRORED("Errored");
-        
+
         private String label;
 
         private ModState(String label)

common/cpw/mods/fml/common/MCPDummyContainer.java

@@ -0,0 +1,14 @@
+package cpw.mods.fml.common;
+
+import com.google.common.eventbus.EventBus;
+
+public class MCPDummyContainer extends DummyModContainer {
+	public MCPDummyContainer(ModMetadata metadata) {
+		super(metadata);
+	}
+
+	@Override
+	public boolean registerBus(EventBus bus, LoadController controller) {
+		return true;
+	}
+}

common/cpw/mods/fml/common/MinecraftDummyContainer.java

@@ -0,0 +1,26 @@
+package cpw.mods.fml.common;
+
+import cpw.mods.fml.common.versioning.ArtifactVersion;
+import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
+import cpw.mods.fml.common.versioning.VersionParser;
+import cpw.mods.fml.common.versioning.VersionRange;
+
+public class MinecraftDummyContainer extends DummyModContainer
+{
+
+    private VersionRange staticRange;
+    public MinecraftDummyContainer(String actualMCVersion)
+    {
+        super(new ModMetadata());
+        getMetadata().modId = "Minecraft";
+        getMetadata().name = "Minecraft";
+        getMetadata().version = actualMCVersion;
+        staticRange = VersionParser.parseRange("["+actualMCVersion+"]");
+    }
+
+
+    public VersionRange getStaticVersionRange()
+    {
+        return staticRange;
+    }
+}

common/cpw/mods/fml/common/Mod.java

@@ -18,6 +18,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
+
 import net.minecraft.src.ItemBlock;
 
 /**
@@ -32,31 +35,71 @@ public @interface Mod
 {
     /**
      * The unique mod identifier for this mod
-     * @return
      */
     String modid();
     /**
      * A user friendly name for the mod
-     * @return
      */
     String name() default "";
     /**
      * A version string for this mod
-     * @return
      */
     String version() default "";
     /**
      * A simple dependency string for this mod (see modloader's "priorities" string specification)
-     * @return
      */
     String dependencies() default "";
     /**
      * Whether to use the mcmod.info metadata by default for this mod.
      * If true, settings in the mcmod.info file will override settings in these annotations.
-     * @return
      */
     boolean useMetadata() default false;
 
+    /**
+     * The acceptable range of minecraft versions that this mod will load and run in
+     * The default ("empty string") indicates that only the current minecraft version is acceptable.
+     * FML will refuse to run with an error if the minecraft version is not in this range across all mods.
+     * @return A version range as specified by the maven version range specification or the empty string
+     */
+    String acceptedMinecraftVersions() default "";
+    /**
+     * An optional bukkit plugin that will be injected into the bukkit plugin framework if
+     * this mod is loaded into the FML framework and the bukkit coremod is present.
+     * Instances of the bukkit plugin can be obtained via the {@link BukkitPluginRef} annotation on fields.
+     * @return The name of the plugin to load for this mod
+     */
+    String bukkitPlugin() default "";
+    /**
+     * Mods that this mod will <strong>not</strong> load with.
+     * An optional comma separated string of (+|-)(*|modid[@value]) which specify mods that
+     * this mod will refuse to load with, resulting in the game failing to start.
+     * Entries can be prefixed with a + for a positive exclusion assertion, or - for a negative exclusion
+     * assertion. Asterisk is the wildcard and represents <strong>all</strong> mods.
+     *
+     * The <strong>only</strong> mods that cannot be excluded are FML and MCP, trivially.
+     * Other special values:
+     * <ul>
+     * <li>+f indicates that the mod will accept a minecraft forge environment.</li>
+     * <li>-* indicates that the mod will not accept any other mods.</li>
+     * </ul>
+     *
+     * Some examples:
+     * <ul>
+     * <li><em>-*,+f,+IronChest</em>: Will run only in a minecraft forge environment with the mod IronChests.
+     * The -* forces all mods to be excluded, then the +f and +IronChest add into the "allowed list".</li>
+     * <li><em>+f,-IC2</em>: Will run in a minecraft forge environment but will <strong>not</strong> run if
+     * IndustrialCraft 2 (IC2) is loaded alongside.</li>
+     * <li><em>-*</em>: Will not run if <strong>any</strong> othe mod is loaded except MCP/FML itself.</li>
+     * </ul>
+     *
+     * If a mod is present on the excluded list, the game will stop and show an error screen. If the
+     * class containing the {@link Mod} annotation has a "getCustomErrorException" method, it will be
+     * called to retrieve a custom error message for display in this case. If two mods have a declared
+     * exclusion which is matched, the screen that is shown is indeterminate.
+     *
+     * @return A string listing modids to exclude from loading with this mod.
+     */
+    String modExclusionList() default "";
     /**
      * Mark the designated method as being called at the "pre-initialization" phase
      * @author cpw
@@ -90,7 +133,7 @@ public @interface Mod
     @Target(ElementType.METHOD)
     public @interface ServerStarting {}
     /**
-     * Mark the designated method as being called at the "post-initialization" phase
+     * Mark the designated method as being called at the "server-started" phase
      * @author cpw
      *
      */
@@ -98,13 +141,22 @@ public @interface Mod
     @Target(ElementType.METHOD)
     public @interface ServerStarted {}
     /**
-     * Mark the designated method as being called at the "post-initialization" phase
+     * Mark the designated method as being called at the "server-stopping" phase
      * @author cpw
      *
      */
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.METHOD)
     public @interface ServerStopping {}
+    /**
+     * Mark the designated method as the receiver for {@link FMLInterModComms} messages
+     * Called between {@link Init} and {@link PostInit}
+     * @author cpw
+     *
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface IMCCallback {}
     /**
      * Populate the annotated field with the mod instance.
      * @author cpw
@@ -115,7 +167,6 @@ public @interface Mod
     public @interface Instance {
         /**
          * The mod object to inject into this field
-         * @return
          */
         String value() default "";
     }
@@ -129,7 +180,6 @@ public @interface Mod
     public @interface Metadata {
         /**
          * The mod id specifying the metadata to load here
-         * @return
          */
         String value() default "";
     }
@@ -143,12 +193,10 @@ public @interface Mod
     public @interface Block {
         /**
          * The block's name
-         * @return
          */
         String name();
         /**
          * The associated ItemBlock subtype for the item (can be null for an ItemBlock)
-         * @return
          */
         Class<?> itemTypeClass() default ItemBlock.class;
     }
@@ -162,12 +210,10 @@ public @interface Mod
     public @interface Item {
         /**
          * The name of the item
-         * @return
          */
         String name();
         /**
          * The type of the item
-         * @return
          */
         String typeClass();
     }

common/cpw/mods/fml/common/ModContainer.java

@@ -20,6 +20,7 @@ import java.util.Set;
 import com.google.common.eventbus.EventBus;
 
 import cpw.mods.fml.common.versioning.ArtifactVersion;
+import cpw.mods.fml.common.versioning.VersionRange;
 
 /**
  * The container that wraps around mods in the system.
@@ -38,66 +39,48 @@ public interface ModContainer
 {
     /**
      * The globally unique modid for this mod
-     *
-     * @return
      */
     String getModId();
 
     /**
      * A human readable name
-     *
-     * @return
      */
 
     String getName();
 
     /**
      * A human readable version identifier
-     *
-     * @return
      */
     String getVersion();
 
     /**
      * The location on the file system which this mod came from
-     *
-     * @return
      */
     File getSource();
 
     /**
      * The metadata for this mod
-     *
-     * @return
      */
     ModMetadata getMetadata();
 
     /**
      * Attach this mod to it's metadata from the supplied metadata collection
-     *
-     * @param mc
      */
     void bindMetadata(MetadataCollection mc);
 
     /**
      * Set the enabled/disabled state of this mod
-     *
-     * @param enabled
      */
     void setEnabledState(boolean enabled);
 
     /**
      * A list of the modids that this mod requires loaded prior to loading
-     *
-     * @return
      */
     Set<ArtifactVersion> getRequirements();
 
     /**
      * A list of modids that should be loaded prior to this one. The special
      * value <strong>*</strong> indicates to load <em>before</em> any other mod.
-     *
-     * @return
      */
     List<ArtifactVersion> getDependencies();
 
@@ -105,16 +88,12 @@ public interface ModContainer
      * A list of modids that should be loaded <em>after</em> this one. The
      * special value <strong>*</strong> indicates to load <em>after</em> any
      * other mod.
-     *
-     * @return
      */
     List<ArtifactVersion> getDependants();
 
     /**
      * A representative string encapsulating the sorting preferences for this
      * mod
-     *
-     * @return
      */
     String getSortingRules();
 
@@ -126,7 +105,6 @@ public interface ModContainer
      *
      * @param bus
      * @param controller
-     * @return
      */
     boolean registerBus(EventBus bus, LoadController controller);
 
@@ -134,14 +112,11 @@ public interface ModContainer
      * Does this mod match the supplied mod
      *
      * @param mod
-     * @return
      */
     boolean matches(Object mod);
 
     /**
      * Get the actual mod object
-     *
-     * @return
      */
     Object getMod();
 
@@ -152,4 +127,6 @@ public interface ModContainer
     boolean isNetworkMod();
 
     String getDisplayVersion();
+
+    VersionRange acceptableMinecraftVersionRange();
 }

common/cpw/mods/fml/common/ModMetadata.java

@@ -91,10 +91,6 @@ public class ModMetadata
     public List<ArtifactVersion> dependants;
     public boolean autogenerated;
 
-    /**
-     * @param mod2
-     * @param type2
-     */
     public ModMetadata(JsonNode node)
     {
         Map<JsonStringNode, Object> processedFields = Maps.transformValues(node.getFields(), new JsonStringConverter());
@@ -145,9 +141,7 @@ public class ModMetadata
         }
         return res;
     }
-    /**
-     * @return
-     */
+
     public String getChildModCountString()
     {
         return String.format("%d child mod%s", childMods.size(), childMods.size() != 1 ? "s" : "");
@@ -158,9 +152,6 @@ public class ModMetadata
         return Joiner.on(", ").join(authorList);
     }
 
-    /**
-     * @return
-     */
     public String getChildModList()
     {
         return Joiner.on(", ").join(Lists.transform(childMods, new ModNameFunction()));

common/cpw/mods/fml/common/Side.java

@@ -18,7 +18,7 @@ public enum Side {
     CLIENT, SERVER, BUKKIT;
 
     /**
-     * @return
+     * @return If this is the server environment
      */
     public boolean isServer()
     {
@@ -26,7 +26,7 @@ public enum Side {
     }
 
     /**
-     * @return
+     * @return if this is the Client environment
      */
     public boolean isClient()
     {

common/cpw/mods/fml/common/SidedProxy.java

@@ -29,13 +29,11 @@ public @interface SidedProxy
 {
     /**
      * The name of the client side class to load and populate
-     * @return
      */
     String clientSide() default "";
 
     /**
      * The name of the server side class to load and populate
-     * @return
      */
     String serverSide() default "";
 

common/cpw/mods/fml/common/TickType.java

@@ -69,8 +69,6 @@ public enum TickType {
 
     /**
      * Partner ticks that are also cancelled by returning false from onTickInGame
-     *
-     * @return
      */
     public EnumSet<TickType> partnerTicks()
     {

common/cpw/mods/fml/common/WorldAccessContainer.java

@@ -0,0 +1,14 @@
+package cpw.mods.fml.common;
+
+import java.util.Map;
+
+import net.minecraft.src.NBTBase;
+import net.minecraft.src.NBTTagCompound;
+import net.minecraft.src.SaveHandler;
+import net.minecraft.src.WorldInfo;
+
+public interface WorldAccessContainer
+{
+    public NBTTagCompound getDataForWriting(SaveHandler handler, WorldInfo info);
+    public void readData(SaveHandler handler, WorldInfo info, Map<String,NBTBase> propertyMap, NBTTagCompound tag);
+}

common/cpw/mods/fml/common/WrongMinecraftVersionException.java

@@ -0,0 +1,13 @@
+package cpw.mods.fml.common;
+
+public class WrongMinecraftVersionException extends RuntimeException
+{
+
+    public ModContainer mod;
+
+    public WrongMinecraftVersionException(ModContainer mod)
+    {
+        this.mod = mod;
+    }
+
+}

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

@@ -145,6 +145,7 @@ public class AccessTransformer implements IClassTransformer
     @Override
     public byte[] transform(String name, byte[] bytes)
     {
+    	if (bytes == null) { return null; }
         if (!modifiers.containsKey(name)) { return bytes; }
 
         ClassNode classNode = new ClassNode();

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);
         }
 
@@ -134,8 +134,9 @@ public class MCPMerger
             String line;
             while ((line = br.readLine()) != null)
             {
+		line = line.split("#")[0];
                 boolean toClient = line.charAt(0) == '<';
-                line = line.substring(1);
+                line = line.substring(1).trim();
                 if (toClient) copyToClient.add(line);
                 else copyToServer.add(line);
             }
@@ -288,7 +289,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("bdz")) //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));

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

@@ -89,6 +89,7 @@ public class MarkerTransformer implements IClassTransformer
     @Override
     public byte[] transform(String name, byte[] bytes)
     {
+    	if (bytes == null) { return null; }
         if (!markers.containsKey(name)) { return bytes; }
 
         ClassNode classNode = new ClassNode();

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

@@ -23,6 +23,8 @@ public class SideTransformer implements IClassTransformer
     @Override
     public byte[] transform(String name, byte[] bytes)
     {
+    	if (bytes == null) { return null; }
+
         ClassNode classNode = new ClassNode();
         ClassReader classReader = new ClassReader(bytes);
         classReader.accept(classNode, 0);
@@ -33,7 +35,7 @@ public class SideTransformer implements IClassTransformer
             {
                 System.out.println(String.format("Attempted to load class %s for invalid side %s", classNode.name, SIDE));
             }
-            return null;
+            throw new RuntimeException(String.format("Attempted to load class %s for invalid side %s", classNode.name, SIDE));
         }
 
         Iterator<FieldNode> fields = classNode.fields.iterator();

common/cpw/mods/fml/common/event/FMLEvent.java

@@ -1,9 +1,15 @@
 package cpw.mods.fml.common.event;
 
+import cpw.mods.fml.common.ModContainer;
+
 public class FMLEvent
 {
     public final String getEventType()
     {
         return getClass().getSimpleName();
     }
+
+	public void applyModContainer(ModContainer activeContainer) {
+	    // NO OP
+	}
 }

common/cpw/mods/fml/common/event/FMLInterModComms.java

@@ -0,0 +1,92 @@
+package cpw.mods.fml.common.event;
+
+import java.util.List;
+
+import com.google.common.base.Function;
+import com.google.common.base.Functions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimaps;
+
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.LoaderState;
+import cpw.mods.fml.common.ModContainer;
+import cpw.mods.fml.common.Mod.Init;
+import cpw.mods.fml.common.Mod.PostInit;
+
+
+/**
+ * Simple intermod communications to receive simple messages directed at you from
+ * other mods
+ *
+ * @author cpw
+ *
+ */
+public class FMLInterModComms {
+	private static ArrayListMultimap<String, IMCMessage> modMessages = ArrayListMultimap.create();
+	/**
+	 * Subscribe to this event to receive your messages (they are sent between {@link Init} and {@link PostInit})
+	 *
+	 * @author cpw
+	 *
+	 */
+	public static class IMCEvent extends FMLEvent {
+		@Override
+		public void applyModContainer(ModContainer activeContainer) {
+			currentList = ImmutableList.copyOf(modMessages.get(activeContainer.getModId()));
+		}
+		private ImmutableList<IMCMessage> currentList;
+
+		public ImmutableList<IMCMessage> getMessages()
+		{
+			return currentList;
+		}
+	}
+
+	/**
+	 * You will receive an instance of this for each message sent
+	 * @author cpw
+	 *
+	 */
+	public static final class IMCMessage {
+		/**
+		 * This is the modid of the mod that sent you the message
+		 */
+		public final String sender;
+
+		/**
+		 * This field, and {@link #value} are both at the mod's discretion
+		 */
+		public final String key;
+		/**
+		 * This field, and {@link #key} are both at the mod's discretion
+		 */
+		public final String value;
+
+		private IMCMessage(String sender, String key, String value)
+		{
+			this.key = key;
+			this.value = value;
+			this.sender = sender;
+		}
+		@Override
+		public String toString() {
+			return sender;
+		}
+	}
+
+	public static boolean sendMessage(String modId, String key, String value)
+	{
+		if (Loader.instance().activeModContainer()==null)
+		{
+			return false;
+		}
+		modMessages.put(modId, new IMCMessage(Loader.instance().activeModContainer().getModId(), key, value));
+		return Loader.isModLoaded(modId) && !Loader.instance().hasReachedState(LoaderState.POSTINITIALIZATION);
+	}
+}

common/cpw/mods/fml/common/event/FMLPreInitializationEvent.java

@@ -1,8 +1,10 @@
 package cpw.mods.fml.common.event;
 
 import java.io.File;
+import java.util.Properties;
 
 import cpw.mods.fml.common.LoaderState.ModState;
+import cpw.mods.fml.common.FMLModContainer;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.ModMetadata;
 import cpw.mods.fml.common.discovery.ASMDataTable;
@@ -14,6 +16,7 @@ public class FMLPreInitializationEvent extends FMLStateEvent
     private File configurationDir;
     private File suggestedConfigFile;
     private ASMDataTable asmData;
+    private ModContainer modContainer;
 
     public FMLPreInitializationEvent(Object... data)
     {
@@ -31,6 +34,7 @@ public class FMLPreInitializationEvent extends FMLStateEvent
     @Override
     public void applyModContainer(ModContainer activeContainer)
     {
+        this.modContainer = activeContainer;
         this.modMetadata = activeContainer.getMetadata();
         this.sourceFile = activeContainer.getSource();
         this.suggestedConfigFile = new File(configurationDir, activeContainer.getModId()+".cfg");
@@ -60,4 +64,14 @@ public class FMLPreInitializationEvent extends FMLStateEvent
     {
         return asmData;
     }
+
+    public Properties getVersionProperties()
+    {
+        if (this.modContainer instanceof FMLModContainer)
+        {
+            return ((FMLModContainer)this.modContainer).searchForVersionProperties();
+        }
+
+        return null;
+    }
 }

common/cpw/mods/fml/common/event/FMLStateEvent.java

@@ -2,7 +2,6 @@ package cpw.mods.fml.common.event;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.LoaderState.ModState;
-import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.Side;
 
 public abstract class FMLStateEvent extends FMLEvent
@@ -14,11 +13,6 @@ public abstract class FMLStateEvent extends FMLEvent
 
     public abstract ModState getModState();
 
-    public void applyModContainer(ModContainer activeContainer)
-    {
-        // NO OP
-    }
-
     public Side getSide()
     {
         return FMLCommonHandler.instance().getSide();

common/cpw/mods/fml/common/modloader/BaseModProxy.java

@@ -21,9 +21,10 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.GuiScreen;
 import net.minecraft.src.IInventory;
 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;
@@ -40,29 +41,14 @@ import cpw.mods.fml.common.asm.SideOnly;
  */
 public interface BaseModProxy
 {
-    /**
-     *
-     */
     void modsLoaded();
 
-    /**
-     *
-     */
     void load();
 
-    /**
-     * @return
-     */
     String getName();
 
-    /**
-     * @return
-     */
     String getPriorities();
 
-    /**
-     * @return
-     */
     String getVersion();
 
     boolean doTickInGUI(TickType type, boolean end, Object... tickData);
@@ -73,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);
 
@@ -87,9 +73,6 @@ public interface BaseModProxy
 
     public abstract void onItemPickup(EntityPlayer player, ItemStack item);
 
-    public abstract int dispenseEntity(World world, ItemStack item, Random rnd, int x, int y, int z, int xVel, int zVel, double entX,
-            double entY, double entZ);
-
     public abstract void serverCustomPayload(NetServerHandler handler, Packet250CustomPayload packet);
 
     public abstract void serverChat(NetServerHandler source, String message);

common/cpw/mods/fml/common/modloader/BaseModTicker.java

@@ -122,9 +122,6 @@ public class BaseModTicker implements ITickHandler
         return mod.getClass().getSimpleName();
     }
 
-    /**
-     * @param mod2
-     */
     public void setMod(BaseModProxy mod)
     {
         this.mod = mod;

common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java

@@ -4,6 +4,8 @@ import cpw.mods.fml.common.network.EntitySpawnPacket;
 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.INetworkManager;
 import net.minecraft.src.Packet250CustomPayload;
 
 public interface IModLoaderSidedHelper
@@ -17,4 +19,8 @@ public interface IModLoaderSidedHelper
 
     void sendClientPacket(BaseModProxy mod, Packet250CustomPayload packet);
 
+    void clientConnectionOpened(NetHandler netClientHandler, INetworkManager manager, BaseModProxy mod);
+
+    boolean clientConnectionClosed(INetworkManager manager, BaseModProxy mod);
+
 }

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,40 +19,43 @@ 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)
     {
-        // noop
+        ModLoaderHelper.sidedHelper.clientConnectionOpened(netClientHandler, manager, mod);
     }
 
     @Override
-    public void connectionClosed(NetworkManager manager)
+    public void connectionClosed(INetworkManager manager)
     {
-        mod.serverDisconnect();
-        mod.onClientLogout(manager);
+        if (!ModLoaderHelper.sidedHelper.clientConnectionClosed(manager, mod))
+        {
+            mod.serverDisconnect();
+            mod.onClientLogout(manager);
+        }
     }
 
     @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)
     {
-        // noop
+        ModLoaderHelper.sidedHelper.clientConnectionOpened(netClientHandler, manager, mod);
     }
 
 }

common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java

@@ -21,8 +21,7 @@ public class ModLoaderDispenseHelper implements IDispenserHandler
     public int dispense(int x, int y, int z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY,
             double entZ)
     {
-        int ret = mod.dispenseEntity(world, item, random, x, y, z, xVelocity, zVelocity, entX, entY, entZ);
-        return ret == 0 ? -1 : ret;
+    	return -1;
     }
 
 }

common/cpw/mods/fml/common/modloader/ModLoaderHelper.java

@@ -32,6 +32,7 @@ import net.minecraft.src.IAnimals;
 import net.minecraft.src.ICommand;
 import net.minecraft.src.TradeEntry;
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.ICraftingHandler;
 import cpw.mods.fml.common.IDispenseHandler;
 import cpw.mods.fml.common.IDispenserHandler;
@@ -63,7 +64,16 @@ public class ModLoaderHelper
 
     public static void updateStandardTicks(BaseModProxy mod, boolean enable, boolean useClock)
     {
-        ModLoaderModContainer mlmc = (ModLoaderModContainer) Loader.instance().activeModContainer();
+        ModLoaderModContainer mlmc = (ModLoaderModContainer) Loader.instance().getReversedModObjectList().get(mod);
+        if (mlmc==null)
+        {
+            mlmc = (ModLoaderModContainer) Loader.instance().activeModContainer();
+        }
+        if (mlmc == null)
+        {
+            FMLLog.severe("Attempted to register ModLoader ticking for invalid BaseMod %s",mod);
+            return;
+        }
         BaseModTicker ticker = mlmc.getGameTickHandler();
         EnumSet<TickType> ticks = ticker.ticks();
         // If we're enabled we get render ticks
@@ -84,7 +94,16 @@ public class ModLoaderHelper
 
     public static void updateGUITicks(BaseModProxy mod, boolean enable, boolean useClock)
     {
-        ModLoaderModContainer mlmc = (ModLoaderModContainer) Loader.instance().activeModContainer();
+        ModLoaderModContainer mlmc = (ModLoaderModContainer) Loader.instance().getReversedModObjectList().get(mod);
+        if (mlmc==null)
+        {
+            mlmc = (ModLoaderModContainer) Loader.instance().activeModContainer();
+        }
+        if (mlmc == null)
+        {
+            FMLLog.severe("Attempted to register ModLoader ticking for invalid BaseMod %s",mod);
+            return;
+        }
         EnumSet<TickType> ticks = mlmc.getGUITickHandler().ticks();
         // If we're enabled and we don't want clock ticks we get render ticks
         if (enable && !useClock) {

common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java

@@ -65,6 +65,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.TickRegistry;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
 import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
+import cpw.mods.fml.common.versioning.VersionRange;
 
 public class ModLoaderModContainer implements ModContainer
 {
@@ -357,7 +358,6 @@ public class ModLoaderModContainer implements ModContainer
     /**
      * Find all the BaseMods in the system
      * @param <A>
-     * @return
      */
     public static <A extends BaseModProxy> List<A> findAll(Class<A> clazz)
     {
@@ -426,16 +426,11 @@ public class ModLoaderModContainer implements ModContainer
         return mod.getVersion();
     }
 
-    /**
-     * @return
-     */
     public BaseModTicker getGameTickHandler()
     {
         return this.gameTickHandler;
     }
-    /**
-     * @return
-     */
+
     public BaseModTicker getGUITickHandler()
     {
         return this.guiTickHandler;
@@ -615,4 +610,10 @@ public class ModLoaderModContainer implements ModContainer
     {
         serverCommands .add(command);
     }
+
+    @Override
+    public VersionRange acceptableMinecraftVersionRange()
+    {
+        return Loader.instance().getMinecraftModContainer().getStaticVersionRange();
+    }
 }

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)
         {

common/cpw/mods/fml/common/modloader/ModProperty.java

@@ -41,30 +41,22 @@ public class ModProperty
     {
         this(field, (String)annotationInfo.get("info"), (Double)annotationInfo.get("min"), (Double)annotationInfo.get("max"), (String)annotationInfo.get("name"));
     }
-    /**
-     * @return
-     */
+
     public String name()
     {
         return name;
     }
-    /**
-     * @return
-     */
+
     public double min()
     {
         return min;
     }
-    /**
-     * @return
-     */
+
     public double max()
     {
         return max;
     }
-    /**
-     * @return
-     */
+
     public String info()
     {
         return info;

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);
     }

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();

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 = "";
@@ -120,6 +120,12 @@ public class FMLNetworkHandler
                 netLoginHandler.completeConnection("You don't have FML installed, you cannot connect to this server");
                 return;
             }
+            else
+            {
+                // Vanilla kicked us for some reason - bye now!
+                FMLLog.fine("Connection from %s was closed by vanilla minecraft", userName);
+                return;
+            }
 
         }
         switch (loginStates.get(netLoginHandler))
@@ -272,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);
@@ -294,19 +300,19 @@ 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)
+    public static void onConnectionClosed(INetworkManager manager, EntityPlayer player)
     {
-        NetworkRegistry.instance().connectionClosed(manager);
+        NetworkRegistry.instance().connectionClosed(manager, player);
     }
 
 

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
 

common/cpw/mods/fml/common/network/IChatListener.java

@@ -18,7 +18,6 @@ public interface IChatListener
      *
      * @param handler
      * @param message
-     * @return
      */
     public Packet3Chat clientChat(NetHandler handler, Packet3Chat message);
 }

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
@@ -27,9 +27,8 @@ public interface IConnectionHandler
      *
      * @param netHandler
      * @param manager
-     * @return
      */
-    String connectionReceived(NetLoginHandler netHandler, NetworkManager manager);
+    String connectionReceived(NetLoginHandler netHandler, INetworkManager manager);
 
     /**
      * Fired when a remote connection is opened
@@ -39,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
@@ -49,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
@@ -58,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
@@ -68,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);
 
 }

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);
 }

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())
         {

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()
+     * @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();

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();

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);
     }

common/cpw/mods/fml/common/network/NetworkMod.java

@@ -13,25 +13,19 @@ public @interface NetworkMod
 {
     /**
      * Does this mod require the client side to be present when installed on a server?
-     *
-     * @return
      */
     boolean clientSideRequired() default false;
     /**
      * Does this mod require the server side to be present when installed on a client?
-     * @return
      */
     boolean serverSideRequired() default false;
     /**
      * A list of Packet250 network channels to register for this mod - these channels
      * will be universal and will require a universal packethandler to handle them
-     *
-     * @return
      */
     String[] channels() default {};
     /**
      * An optional range check for client to server communication version compatibility
-     * @return
      */
     String versionBounds() default "";
 
@@ -39,34 +33,25 @@ public @interface NetworkMod
      * A packet handler implementation for channels registered through this annotation
      * - this packet handler will be universal and handle both client and server
      * requests.
-     *
-     * @return
      */
     Class<? extends IPacketHandler> packetHandler() default NULL.class;
 
     /**
      * A tiny packet handler implementation based on {@link Packet131MapData} for "small"
      * data packet loads.
-     *
-     * @return
      */
     Class<? extends ITinyPacketHandler> tinyPacketHandler() default NULL.class;
     /**
      * A connection handler implementation for this network mod
-     *
-     * @return
      */
     Class<? extends IConnectionHandler> connectionHandler() default NULL.class;
     /**
      * A packet handler and channels to register for the client side
-     *
-     * @return
      */
     SidedPacketHandler clientPacketHandlerSpec() default @SidedPacketHandler(channels = {}, packetHandler = NULL.class );
 
     /**
      * A packet handler and channels to register for the server side
-     * @return
      */
     SidedPacketHandler serverPacketHandlerSpec() default @SidedPacketHandler(channels = {}, packetHandler = NULL.class );
 

common/cpw/mods/fml/common/network/NetworkModHandler.java

@@ -100,15 +100,15 @@ public class NetworkModHandler
             }
         }
 
-        FMLLog.finest("Testing mod %s to very it can accept it's own version in a remote connection", container.getModId());
+        FMLLog.finest("Testing mod %s to verify it accepts its own version in a remote connection", container.getModId());
         boolean acceptsSelf = acceptVersion(container.getVersion());
         if (!acceptsSelf)
         {
-            FMLLog.severe("The mod %s appears to reject it's own version number (%s) in it's version handling. This is likely a severe bug in the mod!", container.getModId(), container.getVersion());
+            FMLLog.severe("The mod %s appears to reject its own version number (%s) in its version handling. This is likely a severe bug in the mod!", container.getModId(), container.getVersion());
         }
         else
         {
-            FMLLog.finest("The mod %s accepts it's own version (%s)", container.getModId(), container.getVersion());
+            FMLLog.finest("The mod %s accepts its own version (%s)", container.getModId(), container.getVersion());
         }
 
         tryCreatingPacketHandler(container, mod.packetHandler(), mod.channels(), null);

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;
@@ -80,7 +80,6 @@ public class NetworkRegistry
      * Is the specified channel active for the player?
      * @param channel
      * @param player
-     * @return
      */
     public boolean isChannelActive(String channel, Player player)
     {
@@ -160,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)
@@ -169,7 +168,7 @@ public class NetworkRegistry
         }
     }
 
-    String connectionReceived(NetLoginHandler netHandler, NetworkManager manager)
+    String connectionReceived(NetLoginHandler netHandler, INetworkManager manager)
     {
         for (IConnectionHandler handler : connectionHandlers)
         {
@@ -182,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)
         {
@@ -190,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)
         {
@@ -198,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)
@@ -207,15 +206,16 @@ public class NetworkRegistry
         }
     }
 
-    void connectionClosed(NetworkManager manager)
+    void connectionClosed(INetworkManager manager, EntityPlayer player)
     {
         for (IConnectionHandler handler : connectionHandlers)
         {
             handler.connectionClosed(manager);
         }
+        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)))
@@ -266,10 +266,7 @@ public class NetworkRegistry
             deactivateChannel(player, channel);
         }
     }
-    /**
-     * @param packet
-     * @return
-     */
+
     private List<String> extractChannelList(Packet250CustomPayload packet)
     {
         String request = new String(packet.field_73629_c, Charsets.UTF_8);

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);

common/cpw/mods/fml/common/registry/EntityRegistry.java

@@ -363,7 +363,6 @@ public class EntityRegistry
      * @param updateRange
      * @param updateInterval
      * @param sendVelocityInfo
-     * @return
      */
     @Deprecated
     public static EntityRegistration registerModLoaderEntity(Object mod, Class<? extends Entity> entityClass, int entityTypeId, int updateRange, int updateInterval,

common/cpw/mods/fml/common/registry/GameRegistry.java

@@ -118,7 +118,6 @@ public class GameRegistry
      * @param xVelocity
      * @param zVelocity
      * @param item
-     * @return
      */
     public static int tryDispense(World world, int x, int y, int z, int xVelocity, int zVelocity, ItemStack item, Random random, double entX, double entY, double entZ)
     {
@@ -137,7 +136,6 @@ public class GameRegistry
      * @param container
      * @param type
      * @param annotation
-     * @return
      * @throws Exception
      */
     public static Object buildBlock(ModContainer container, Class<?> type, Block annotation) throws Exception

common/cpw/mods/fml/common/registry/LanguageRegistry.java

@@ -1,5 +1,8 @@
 package cpw.mods.fml.common.registry;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -20,6 +23,25 @@ public class LanguageRegistry
         return INSTANCE;
     }
 
+    public String getStringLocalization(String key)
+    {
+        return getStringLocalization(key, StringTranslate.func_74808_a().func_74811_c());
+    }
+
+    public String getStringLocalization(String key, String lang)
+    {
+        String localizedString = "";
+        Properties langPack = modLanguageData.get(lang);
+
+        if (langPack != null) {
+            if (langPack.getProperty(key) != null) {
+                localizedString = langPack.getProperty(key);
+            }
+        }
+
+        return localizedString;
+    }
+
     public void addStringLocalization(String key, String value)
     {
         addStringLocalization(key, "en_US", value);
@@ -34,6 +56,21 @@ public class LanguageRegistry
         langPack.put(key,value);
     }
 
+    public void addStringLocalization(Properties langPackAdditions) {
+        addStringLocalization(langPackAdditions, "en_US");
+    }
+
+    public void addStringLocalization(Properties langPackAdditions, String lang) {
+        Properties langPack = modLanguageData.get(lang);
+        if (langPack == null) {
+            langPack = new Properties();
+            modLanguageData.put(lang, langPack);
+        }
+        if (langPackAdditions != null) {
+            langPack.putAll(langPackAdditions);
+        }
+    }
+
     public static void reloadLanguageTable()
     {
         // reload language table by forcing lang to null and reloading the properties file
@@ -58,7 +95,7 @@ public class LanguageRegistry
         objectName+=".name";
         addStringLocalization(objectName, lang, name);
     }
-    
+
     public static void addName(Object objectToName, String name)
     {
         instance().addNameForObject(objectToName, "en_US", name);
@@ -76,4 +113,41 @@ public class LanguageRegistry
         }
         languagePack.putAll(langPack);
     }
+
+    public void loadLocalization(String localizationFile, String lang, boolean isXML)
+    {
+        loadLocalization(this.getClass().getResource(localizationFile), lang, isXML);
+    }
+
+    public void loadLocalization(URL localizationFile, String lang, boolean isXML)
+    {
+        InputStream langStream = null;
+        Properties langPack = new Properties();
+
+        try    {
+            langStream = localizationFile.openStream();
+
+            if (isXML) {
+                langPack.loadFromXML(langStream);
+            }
+            else {
+                langPack.load(langStream);
+            }
+
+            addStringLocalization(langPack, lang);
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+        finally    {
+            try    {
+                if (langStream != null)    {
+                    langStream.close();
+                }
+            }
+            catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
 }

common/cpw/mods/fml/common/registry/VillagerRegistry.java

@@ -15,6 +15,7 @@ import net.minecraft.src.StructureVillagePieces;
 import net.minecraft.src.Tuple;
 
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 
@@ -33,6 +34,7 @@ public class VillagerRegistry
     private Multimap<Integer, IVillageTradeHandler> tradeHandlers = ArrayListMultimap.create();
     private Map<Class<?>, IVillageCreationHandler> villageCreationHandlers = Maps.newHashMap();
     private Map<Integer, String> newVillagers = Maps.newHashMap();
+    private List<Integer> newVillagerIds = Lists.newArrayList();
 
     /**
      * Allow access to the {@link StructureVillagePieces} array controlling new village
@@ -48,13 +50,11 @@ public class VillagerRegistry
          *
          * @param random
          * @param i
-         * @return
          */
         StructureVillagePieceWeight getVillagePieceWeight(Random random, int i);
 
         /**
          * The class of the root structure component to add to the village
-         * @return
          */
         Class<?> getComponentClass();
 
@@ -70,7 +70,6 @@ public class VillagerRegistry
          * @param p3
          * @param p4
          * @param p5
-         * @return
          */
         Object buildComponent(StructureVillagePieceWeight villagePiece, ComponentVillageStartPiece startPiece, List pieces, Random random, int p1,
                 int p2, int p3, int p4, int p5);
@@ -90,7 +89,6 @@ public class VillagerRegistry
          *
          * @param villager
          * @param recipeList
-         * @param random
          */
         void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random);
     }
@@ -114,6 +112,7 @@ public class VillagerRegistry
             throw new RuntimeException();
         }
         newVillagers.put(villagerId, villagerSkin);
+        newVillagerIds.add(villagerId);
     }
 
     /**
@@ -142,7 +141,6 @@ public class VillagerRegistry
      *
      * @param villagerType
      * @param defaultSkin
-     * @return
      */
     public static String getVillagerSkin(int villagerType, String defaultSkin)
     {
@@ -202,4 +200,11 @@ public class VillagerRegistry
         }
         villager.func_70949_b(list, item.func_77612_l(), random, chance);
     }
+
+    public static void applyRandomTrade(EntityVillager villager, Random rand)
+    {
+        int extra = instance().newVillagerIds.size();
+        int trade = rand.nextInt(5 + extra);
+        villager.func_70938_b(trade < 5 ? trade : instance().newVillagerIds.get(trade - 5));
+    }
 }

common/cpw/mods/fml/common/toposort/TopologicalSort.java

@@ -125,7 +125,7 @@ public class TopologicalSort
      *
      * Uses the reverse depth first search as outlined in ...
      * @param graph
-     * @return
+     * @return The sorted mods list.
      */
     public static <T> List<T> topologicalSort(DirectedGraph<T> graph)
     {

common/cpw/mods/fml/relauncher/Downloader.java

@@ -16,7 +16,7 @@ import javax.swing.JProgressBar;
 
 import cpw.mods.fml.common.FMLLog;
 
-public class Downloader extends JOptionPane
+public class Downloader extends JOptionPane implements IDownloadDisplay
 {
     private JDialog container;
     private JLabel currentActivity;
@@ -45,7 +45,7 @@ public class Downloader extends JOptionPane
         return box;
     }
 
-    JDialog makeDialog()
+    public JDialog makeDialog()
     {
         setMessageType(JOptionPane.INFORMATION_MESSAGE);
         setMessage(makeProgressPanel());
@@ -94,7 +94,7 @@ public class Downloader extends JOptionPane
         }
     }
 
-    void updateProgressString(String progressUpdate, Object... data)
+    public void updateProgressString(String progressUpdate, Object... data)
     {
         FMLLog.finest(progressUpdate, data);
         if (currentActivity!=null)
@@ -103,7 +103,7 @@ public class Downloader extends JOptionPane
         }
     }
 
-    void resetProgress(int sizeGuess)
+    public void resetProgress(int sizeGuess)
     {
         if (progress!=null)
         {
@@ -111,7 +111,7 @@ public class Downloader extends JOptionPane
         }
     }
 
-    void updateProgress(int fullLength)
+    public void updateProgress(int fullLength)
     {
         if (progress!=null)
         {
@@ -119,10 +119,22 @@ public class Downloader extends JOptionPane
         }
     }
 
-    void makeHeadless()
+    public void makeHeadless()
     {
         container = null;
         progress = null;
         currentActivity = null;
     }
+
+    @Override
+    public void setPokeThread(Thread currentThread)
+    {
+        this.pokeThread = currentThread;
+    }
+
+    @Override
+    public boolean shouldStopIt()
+    {
+        return stopIt;
+    }
 }

common/cpw/mods/fml/relauncher/DummyDownloader.java

@@ -0,0 +1,55 @@
+package cpw.mods.fml.relauncher;
+
+public class DummyDownloader implements IDownloadDisplay
+{
+
+    @Override
+    public void resetProgress(int sizeGuess)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void setPokeThread(Thread currentThread)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void updateProgress(int fullLength)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public boolean shouldStopIt()
+    {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public void updateProgressString(String string, Object... data)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public Object makeDialog()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void makeHeadless()
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+}

common/cpw/mods/fml/relauncher/FMLInjectionData.java

@@ -16,7 +16,7 @@ public class FMLInjectionData
     static String rev;
     static String build;
     static String mccversion;
-    static String mcsversion;
+    static String mcpversion;
     public static List<String> containers = new ArrayList<String>();
 
     static void build(File mcHome, RelaunchClassLoader classLoader)
@@ -41,14 +41,14 @@ public class FMLInjectionData
         minor = properties.getProperty("fmlbuild.minor.number", "missing");
         rev = properties.getProperty("fmlbuild.revision.number", "missing");
         build = properties.getProperty("fmlbuild.build.number", "missing");
-        mccversion = properties.getProperty("fmlbuild.mcclientversion", "missing");
-        mcsversion = properties.getProperty("fmlbuild.mcserverversion", "missing");
+        mccversion = properties.getProperty("fmlbuild.mcversion", "missing");
+        mcpversion = properties.getProperty("fmlbuild.mcpversion", "missing");
 
 
     }
 
     public static Object[] data()
     {
-        return new Object[] { major, minor, rev, build, mccversion, mcsversion, minecraftHome, containers };
+        return new Object[] { major, minor, rev, build, mccversion, mcpversion, minecraftHome, containers };
     }
 }

common/cpw/mods/fml/relauncher/FMLRelaunchLog.java

@@ -22,13 +22,18 @@ public class FMLRelaunchLog
         @Override
         public void publish(LogRecord record)
         {
+            boolean currInt = Thread.interrupted();
             try
             {
                 ConsoleLogThread.recordQueue.put(record);
             }
             catch (InterruptedException e)
             {
-                Thread.interrupted();
+                e.printStackTrace(errCache);
+            }
+            if (currInt)
+            {
+                Thread.currentThread().interrupt();
             }
         }
 
@@ -61,6 +66,7 @@ public class FMLRelaunchLog
                 }
                 catch (InterruptedException e)
                 {
+                    e.printStackTrace(errCache);
                     Thread.interrupted();
                     // Stupid
                 }
@@ -89,14 +95,14 @@ public class FMLRelaunchLog
                 record = this.toString();
                 super.reset();
 
-                currentMessage.append(record);
-                if (currentMessage.lastIndexOf(FMLLogFormatter.LINE_SEPARATOR)>=0)
+                currentMessage.append(record.replace(FMLLogFormatter.LINE_SEPARATOR, "\n"));
+                if (currentMessage.lastIndexOf("\n")>=0)
                 {
                     // Are we longer than just the line separator?
-                    if (currentMessage.length()>FMLLogFormatter.LINE_SEPARATOR.length())
+                    if (currentMessage.length()>1)
                     {
                         // Trim the line separator
-                        currentMessage.setLength(currentMessage.length()-FMLLogFormatter.LINE_SEPARATOR.length());
+                        currentMessage.setLength(currentMessage.length()-1);
                         log.log(Level.INFO, currentMessage.toString());
                     }
                     currentMessage.setLength(0);
@@ -114,6 +120,8 @@ public class FMLRelaunchLog
     private static boolean configured;
 
     private static Thread consoleLogThread;
+
+    private static PrintStream errCache;
     private Logger myLog;
 
     private FMLRelaunchLog()
@@ -157,6 +165,8 @@ public class FMLRelaunchLog
         }
 
         // Set system out to a log stream
+        errCache = System.err;
+
         System.setOut(new PrintStream(new LoggingOutStream(stdOut), true));
         System.setErr(new PrintStream(new LoggingOutStream(stdErr), true));
 

common/cpw/mods/fml/relauncher/FMLRelauncher.java

@@ -56,16 +56,28 @@ public class FMLRelauncher
         if (RelaunchLibraryManager.downloadMonitor != null) { return; }
         try
         {
-            RelaunchLibraryManager.downloadMonitor = new Downloader();
             if (showIt)
             {
-                popupWindow = RelaunchLibraryManager.downloadMonitor.makeDialog();
+                RelaunchLibraryManager.downloadMonitor = new Downloader();
+                popupWindow = (JDialog) RelaunchLibraryManager.downloadMonitor.makeDialog();
+            }
+            else
+            {
+                RelaunchLibraryManager.downloadMonitor = new DummyDownloader();
             }
         }
-        catch (Exception e)
+        catch (Throwable e)
         {
+            if (RelaunchLibraryManager.downloadMonitor == null)
+            {
+                RelaunchLibraryManager.downloadMonitor = new DummyDownloader();
+                e.printStackTrace();
+            }
+            else
+            {
+                RelaunchLibraryManager.downloadMonitor.makeHeadless();
+            }
             popupWindow = null;
-            RelaunchLibraryManager.downloadMonitor.makeHeadless();
         }
     }
 
@@ -90,7 +102,7 @@ public class FMLRelauncher
             }
         }
 
-        if (RelaunchLibraryManager.downloadMonitor.stopIt)
+        if (RelaunchLibraryManager.downloadMonitor.shouldStopIt())
         {
             System.exit(1);
         }
@@ -108,7 +120,7 @@ public class FMLRelauncher
     private Class<? super Object> setupNewClientHome(File minecraftHome)
     {
         Class<? super Object> client = ReflectionHelper.getClass(classLoader, "net.minecraft.client.Minecraft");
-        ReflectionHelper.setPrivateValue(client, null, minecraftHome, "field_71463_am", "am", "minecraftDir");
+        ReflectionHelper.setPrivateValue(client, null, minecraftHome, "field_71463_am", "an", "minecraftDir");
         return client;
     }
 
@@ -135,8 +147,8 @@ public class FMLRelauncher
     {
         FMLInjectionData.build(minecraftHome, classLoader);
         FMLRelaunchLog.minecraftHome = minecraftHome;
-        FMLRelaunchLog.info("Forge Mod Loader version %s.%s.%s.%s for Minecraft client:%s, server:%s loading", FMLInjectionData.major, FMLInjectionData.minor,
-                FMLInjectionData.rev, FMLInjectionData.build, FMLInjectionData.mccversion, FMLInjectionData.mcsversion);
+        FMLRelaunchLog.info("Forge Mod Loader version %s.%s.%s.%s for Minecraft %s loading", FMLInjectionData.major, FMLInjectionData.minor,
+                FMLInjectionData.rev, FMLInjectionData.build, FMLInjectionData.mccversion, FMLInjectionData.mcpversion);
 
         try
         {
@@ -176,7 +188,7 @@ public class FMLRelauncher
         if (str != null)
         {
             str = str.replace('/', File.separatorChar);
-            ReflectionHelper.setPrivateValue(mcMaster, null, new File(str), "minecraftDir", "am", "minecraftDir");
+            ReflectionHelper.setPrivateValue(mcMaster, null, new File(str), "minecraftDir", "an", "minecraftDir");
         }
         // We force minecraft to setup it's homedir very early on so we can
         // inject stuff into it
@@ -189,7 +201,7 @@ public class FMLRelauncher
         {
             // Hmmm
         }
-        File minecraftHome = ReflectionHelper.getPrivateValue(mcMaster, null, "field_71463_am", "am", "minecraftDir");
+        File minecraftHome = ReflectionHelper.getPrivateValue(mcMaster, null, "field_71463_am", "an", "minecraftDir");
         return minecraftHome;
     }
 
@@ -280,7 +292,7 @@ public class FMLRelauncher
                 popupWindow.setVisible(false);
                 popupWindow.dispose();
             }
-            if (RelaunchLibraryManager.downloadMonitor.stopIt)
+            if (RelaunchLibraryManager.downloadMonitor.shouldStopIt())
             {
                 System.exit(1);
             }

common/cpw/mods/fml/relauncher/IDownloadDisplay.java

@@ -0,0 +1,22 @@
+package cpw.mods.fml.relauncher;
+
+import javax.swing.JDialog;
+
+public interface IDownloadDisplay
+{
+
+    void resetProgress(int sizeGuess);
+
+    void setPokeThread(Thread currentThread);
+
+    void updateProgress(int fullLength);
+
+    boolean shouldStopIt();
+
+    void updateProgressString(String string, Object ... data);
+
+    Object makeDialog();
+
+    void makeHeadless();
+
+}

common/cpw/mods/fml/relauncher/IFMLLoadingPlugin.java

@@ -18,12 +18,12 @@ public interface IFMLLoadingPlugin
     /**
      * Return a list of classes that implement the ILibrarySet interface
      *
-     * @return
+     * @return a list of classes that implement the ILibrarySet interface
      */
     String[] getLibraryRequestClass();
     /**
      * Return a list of classes that implements the IClassTransformer interface
-     * @return
+     * @return a list of classes that implements the IClassTransformer interface
      */
     String[] getASMTransformerClass();
 

common/cpw/mods/fml/relauncher/ILibrarySet.java

@@ -12,19 +12,19 @@ public interface ILibrarySet
     /**
      * Return a list of libraries available from a common location
      *
-     * @return
+     * @return a list of libraries available from a common location
      */
     String[] getLibraries();
     /**
      * Return the string encoded sha1 hash for each library in the returned list
      *
-     * @return
+     * @return the string encoded sha1 hash for each library in the returned list
      */
     String[] getHashes();
     /**
      * Return the root URL format string from which this library set can be obtained
      * There needs to be a single %s string substitution which is the library name
-     * @return
+     * @return the root URL format string from which this library set can be obtained
      */
     String getRootURL();
 }

common/cpw/mods/fml/relauncher/RelaunchClassLoader.java

@@ -27,6 +27,7 @@ public class RelaunchClassLoader extends URLClassLoader
 
     private List<IClassTransformer> transformers;
     private Map<String, Class> cachedClasses;
+    private Set<String> invalidClasses;
 
     private Set<String> classLoaderExceptions = new HashSet<String>();
     private Set<String> transformerExceptions = new HashSet<String>();
@@ -37,6 +38,7 @@ public class RelaunchClassLoader extends URLClassLoader
         this.sources = new ArrayList<URL>(Arrays.asList(sources));
         this.parent = getClass().getClassLoader();
         this.cachedClasses = new HashMap<String,Class>(1000);
+        this.invalidClasses = new HashSet<String>(1000);
         this.transformers = new ArrayList<IClassTransformer>(2);
 //        ReflectionHelper.setPrivateValue(ClassLoader.class, null, this, "scl");
         Thread.currentThread().setContextClassLoader(this);
@@ -49,9 +51,10 @@ public class RelaunchClassLoader extends URLClassLoader
 
         // standard transformer exclusions
         addTransformerExclusion("javax.");
-        addTransformerExclusion("cpw.mods.fml.");
         addTransformerExclusion("org.objectweb.asm.");
         addTransformerExclusion("com.google.common.");
+        addTransformerExclusion("cpw.mods.fml.common.asm.SideOnly");
+        addTransformerExclusion("cpw.mods.fml.common.Side");
     }
 
     public void registerTransformer(String transformerClassName)
@@ -68,6 +71,10 @@ public class RelaunchClassLoader extends URLClassLoader
     @Override
     public Class<?> findClass(String name) throws ClassNotFoundException
     {
+        if (invalidClasses.contains(name))
+        {
+            throw new ClassNotFoundException(name);
+        }
         // NEI/CCC compatibility code
         if (excludedPackages.length != 0)
         {
@@ -97,9 +104,17 @@ public class RelaunchClassLoader extends URLClassLoader
         {
             if (name.startsWith(st))
             {
-                Class<?> cl = super.findClass(name);
-                cachedClasses.put(name, cl);
-                return cl;
+                try
+                {
+                    Class<?> cl = super.findClass(name);
+                    cachedClasses.put(name, cl);
+                    return cl;
+                }
+                catch (ClassNotFoundException e)
+                {
+                    invalidClasses.add(name);
+                    throw e;
+                }
             }
         }
 
@@ -122,15 +137,11 @@ public class RelaunchClassLoader extends URLClassLoader
         }
         catch (Throwable e)
         {
+            invalidClasses.add(name);
             throw new ClassNotFoundException(name, e);
         }
     }
 
-    /**
-     * @param name
-     * @return
-     * @throws IOException
-     */
     public byte[] getClassBytes(String name) throws IOException
     {
         InputStream classStream = null;

common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java

@@ -63,6 +63,42 @@ public class RelaunchLibraryManager
 
         downloadMonitor.updateProgressString("All core mods are successfully located");
         // Now that we have the root plugins loaded - lets see what else might be around
+        String commandLineCoremods = System.getProperty("fml.coreMods.load","");
+        for (String s : commandLineCoremods.split(","))
+        {
+            if (s.isEmpty())
+            {
+                continue;
+            }
+            FMLRelaunchLog.info("Found a command line coremod : %s", s);
+            try
+            {
+                actualClassLoader.addTransformerExclusion(s);
+                Class<?> coreModClass = Class.forName(s, true, actualClassLoader);
+                TransformerExclusions trExclusions = coreModClass.getAnnotation(IFMLLoadingPlugin.TransformerExclusions.class);
+                if (trExclusions!=null)
+                {
+                    for (String st : trExclusions.value())
+                    {
+                        actualClassLoader.addTransformerExclusion(st);
+                    }
+                }
+                IFMLLoadingPlugin plugin = (IFMLLoadingPlugin) coreModClass.newInstance();
+                loadPlugins.add(plugin);
+                if (plugin.getLibraryRequestClass()!=null)
+                {
+                    for (String libName : plugin.getLibraryRequestClass())
+                    {
+                        libraries.add((ILibrarySet) Class.forName(libName, true, actualClassLoader).newInstance());
+                    }
+                }
+            }
+            catch (Throwable e)
+            {
+                FMLRelaunchLog.log(Level.SEVERE,e,"Exception occured trying to load coremod %s",s);
+                throw new RuntimeException(e);
+            }
+        }
         discoverCoreMods(mcDir, actualClassLoader, loadPlugins, libraries);
 
         List<Throwable> caughtErrors = new ArrayList<Throwable>();
@@ -85,13 +121,14 @@ public class RelaunchLibraryManager
                 {
                     boolean download = false;
                     String libName = lib.getLibraries()[i];
+                    String targFileName = libName.lastIndexOf('/')>=0 ? libName.substring(libName.lastIndexOf('/')) : libName;
                     String checksum = lib.getHashes()[i];
-                    File libFile = new File(libDir, libName);
+                    File libFile = new File(libDir, targFileName);
                     if (!libFile.exists())
                     {
                         try
                         {
-                            downloadFile(libFile, lib.getRootURL(), checksum);
+                            downloadFile(libFile, lib.getRootURL(), libName, checksum);
                             download = true;
                         }
                         catch (Throwable e)
@@ -154,7 +191,7 @@ public class RelaunchLibraryManager
         }
         finally
         {
-            if (downloadMonitor.stopIt)
+            if (downloadMonitor.shouldStopIt())
             {
                 return;
             }
@@ -414,11 +451,12 @@ public class RelaunchLibraryManager
         return coreModDir;
     }
 
-    private static void downloadFile(File libFile, String rootUrl, String hash)
+    private static void downloadFile(File libFile, String rootUrl,String realFilePath, String hash)
     {
         try
         {
-            URL libDownload = new URL(String.format(rootUrl,libFile.getName()));
+        	//rootUrl.replace("%s", libFile.getPath())
+            URL libDownload = new URL(String.format(rootUrl,realFilePath));
             String infoString = String.format("Downloading file %s", libDownload.toString());
             downloadMonitor.updateProgressString(infoString);
             FMLRelaunchLog.info(infoString);
@@ -433,7 +471,7 @@ public class RelaunchLibraryManager
         }
         catch (Exception e)
         {
-            if (downloadMonitor.stopIt)
+            if (downloadMonitor.shouldStopIt())
             {
                 FMLRelaunchLog.warning("You have stopped the downloading operation before it could complete");
                 return;
@@ -454,7 +492,7 @@ public class RelaunchLibraryManager
 
     private static final String HEXES = "0123456789abcdef";
     private static ByteBuffer downloadBuffer = ByteBuffer.allocateDirect(1 << 22);
-    static Downloader downloadMonitor;
+    static IDownloadDisplay downloadMonitor;
 
     private static void performDownload(InputStream is, int sizeGuess, String validationHash, File target)
     {
@@ -469,19 +507,19 @@ public class RelaunchLibraryManager
         downloadMonitor.resetProgress(sizeGuess);
         try
         {
-            downloadMonitor.pokeThread = Thread.currentThread();
+            downloadMonitor.setPokeThread(Thread.currentThread());
             byte[] smallBuffer = new byte[1024];
             while ((bytesRead = is.read(smallBuffer)) >= 0) {
                 downloadBuffer.put(smallBuffer, 0, bytesRead);
                 fullLength += bytesRead;
-                if (downloadMonitor.stopIt)
+                if (downloadMonitor.shouldStopIt())
                 {
                     break;
                 }
                 downloadMonitor.updateProgress(fullLength);
             }
             is.close();
-            downloadMonitor.pokeThread = null;
+            downloadMonitor.setPokeThread(null);
             downloadBuffer.limit(fullLength);
             downloadBuffer.position(0);
         }