Merge the last bits of the server code into the common directory, and annotate ModLoader/BaseMod for sided use

This means the FML-Server project is now defunct as all code is either common, client or bukkit.

fml/build.xml

@@ -51,18 +51,15 @@
     </condition>
     <property name="mcp.obfoutput" location="${mcp.home}/reobf" />
     <property name="client.mcp.obfoutput" location="${mcp.obfoutput}/minecraft" />
-    <property name="server.mcp.obfoutput" location="${mcp.obfoutput}/minecraft_server" />
     <property name="mcp.srcdir" location="${mcp.home}/src" />
     <property name="common.mcp.srcdir" location="${mcp.srcdir}/common" />
     <property name="client.mcp.srcdir" location="${mcp.srcdir}/minecraft" />
-    <property name="server.mcp.srcdir" location="${mcp.srcdir}/minecraft_server" />
     <property name="clean.mcp.srcdir" location="${mcp.home}/src-base" />
     <property name="patch.mcp.srcdir" location="${mcp.home}/src-work" />
     <property name="tmp.mcp.srcdir" location="${mcp.home}/src-tmp" />
     <property name="renamed.mcp.srcdir" location="${mcp.home}/src-renamed" />
     <property name="common.src.dir" location="${basedir}/common" />
     <property name="client.src.dir" location="${basedir}/client" />
-    <property name="server.src.dir" location="${basedir}/server" />
     <property name="patch.src.dir" location="${basedir}/patches" />
     <property name="fml.conf.dir" location="${basedir}/conf" />
     <condition property="version.build" value="${env.BUILD_NUMBER}" else="1">
@@ -122,10 +119,7 @@
   	<fail message="Compilation failed">
   		<condition>
   	        <not>
-  	        	<and>
-  	        	  <available file="${mcp.home}/bin/minecraft/net/minecraft/client/Minecraft.class"/>
-                  <available file="${mcp.home}/bin/minecraft_server/net/minecraft/server/MinecraftServer.class"/>
-  	        	</and>
+        	  <available file="${mcp.home}/bin/minecraft/net/minecraft/client/Minecraft.class"/>
   	        </not>
   		</condition>
   	</fail>
@@ -137,19 +131,13 @@
     </copy>
   </target>
 
-  <target name="merge-server" depends="buildenvsetup">
-    <copy todir="${server.mcp.srcdir}" overwrite="true" verbose="true">
-      <fileset dir="${server.src.dir}" includes="**/*.java" />
-    </copy>
-  </target>
-
   <target name="merge-common">
     <copy todir="${common.mcp.srcdir}" overwrite="true" verbose="true">
       <fileset dir="${common.src.dir}" includes="**/*.java" />
     </copy>
   </target>
 
-  <target name="merge-source" depends="buildenvsetup,merge-client,merge-server,merge-common" />
+  <target name="merge-source" depends="buildenvsetup,merge-client,merge-common" />
 
   <target name="build-client" depends="buildenvsetup,merge-client,merge-common,buildandreobfmcp,makeversion">
     <antcall target="extract-built-jar">
@@ -157,12 +145,6 @@
     </antcall>
   </target>
 
-  <target name="build-server" depends="buildenvsetup,merge-server,merge-common,buildandreobfmcp,makeversion">
-    <antcall target="extract-built-jar">
-      <param name="side" value="server" />
-    </antcall>
-  </target>
-
   <target name="extract-built-jar">
     <side prop="output" src="mcp.obfoutput" side="${side}" />
     <property name="jarname" value="${modname}-${side}-${version}" />
@@ -199,7 +181,6 @@
         <attribute name="Main-Class" value="net.minecraft.server.MinecraftServer"/>
       </manifest>
       <fileset dir="${client.mcp.obfoutput}" includes="**/*.class" />
-      <fileset dir="${server.mcp.obfoutput}" includes="**/*.class" />
       <zipfileset dir="${basedir}" includes="fmlversion.properties"/>
       <zipfileset dir="${basedir}" includes="LICENSE-fml.txt" />
       <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" fullpath="CREDITS-fml.txt"/>
@@ -228,7 +209,6 @@
       <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="${server.src.dir}" includes="**/*.java" prefix="fml/server" />
       <zipfileset dir="${basedir}" includes="fmlversion.properties" prefix="fml/common" />
       <zipfileset dir="${common.src.dir}" includes="*.cfg" prefix="fml/common" />
       <zipfileset dir="${patch.src.dir}" includes="**/*.patch" prefix="fml/patches" />
@@ -252,7 +232,7 @@
     </zip>
   </target>
 
-  <target name="build" depends="buildenvsetup,merge-server,merge-client,merge-common,build-server,build-client,build-universal,build-source-pack" />
+  <target name="build" depends="buildenvsetup,merge-client,merge-common,build-client,build-universal,build-source-pack" />
 
   <target name="jenkinsbuild" depends="buildenvsetup,jenkinsfmldecompile,patch,build"/>
 
@@ -378,7 +358,7 @@
     </exec>
   </target>
 
-  <target name="makerenamedsource" depends="buildenvsetup,repatch,merge-client,merge-server,buildandreobfmcp">
+  <target name="makerenamedsource" depends="buildenvsetup,repatch,merge-client,merge-common,buildandreobfmcp">
     <copy todir="${tmp.mcp.srcdir}">
       <fileset dir="${mcp.srcdir}"/>
     </copy>

fml/client/net/minecraft/src/BaseMod.java

@@ -16,6 +16,7 @@ import java.util.Map;
 import java.util.Random;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.server.MinecraftServer;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.IConsoleHandler;
 import cpw.mods.fml.common.ICraftingHandler;
@@ -24,7 +25,10 @@ import cpw.mods.fml.common.INetworkHandler;
 import cpw.mods.fml.common.IPickupNotifier;
 import cpw.mods.fml.common.IPlayerTracker;
 import cpw.mods.fml.common.IWorldGenerator;
+import cpw.mods.fml.common.Side;
+import static cpw.mods.fml.common.Side.*;
 import cpw.mods.fml.common.TickType;
+import cpw.mods.fml.common.asm.SideOnly;
 
 public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModProxy
 {
@@ -177,6 +181,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
         return 0;
     }
 
+    @SideOnly(CLIENT)
     public void addRenderer(Map<Class<? extends Entity>, Render> renderers)
     {
 
@@ -250,6 +255,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
      */
     public abstract String getVersion();
 
+    @SideOnly(CLIENT)
     public void keyboardEvent(KeyBinding event)
     {
 
@@ -284,11 +290,18 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
      * @param minecraftInstance the client
      * @return true to continue receiving ticks
      */
+    @SideOnly(CLIENT)
     public boolean onTickInGame(float time, Minecraft minecraftInstance)
     {
         return false;
     }
 
+    public boolean onTickInGame(MinecraftServer minecraftServer)
+    {
+        return false;
+    }
+
+    @SideOnly(CLIENT)
     public boolean onTickInGUI(float tick, Minecraft game, GuiScreen gui)
     {
         return false;
@@ -318,16 +331,19 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
         // TODO
     }
 
+    @SideOnly(CLIENT)
     public void registerAnimation(Minecraft game)
     {
 
     }
 
+    @SideOnly(CLIENT)
     public void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID)
     {
 
     }
 
+    @SideOnly(CLIENT)
     public boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID)
     {
         return false;
@@ -400,7 +416,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
      * @param command
      * @return true if you want to consume the message so it is not available for further processing
      */
-    public boolean onServerCommand(String command, String sender, Object listener)
+    public boolean onServerCommand(String command, String sender, ICommandManager listener)
     {
         return false;
     }

fml/client/net/minecraft/src/ModLoader.java

@@ -34,6 +34,9 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.Side;
+import static cpw.mods.fml.common.Side.*;
+import cpw.mods.fml.common.asm.SideOnly;
 import cpw.mods.fml.common.modloader.ModLoaderHelper;
 import cpw.mods.fml.common.modloader.ModLoaderModContainer;
 import cpw.mods.fml.common.network.NetworkRegistry;
@@ -80,21 +83,23 @@ public class ModLoader
     }
 
     @Deprecated
+    @SideOnly(CLIENT)
     public static void addAllRenderers(Map<Class<? extends Entity>, Render> renderers)
     {
     }
 
+    @SideOnly(CLIENT)
     public static void addAnimation(TextureFX anim)
     {
         TextureFXManager.instance().addAnimation(anim);
     }
 
     /**
-     * This method is unimplemented in server versions to date.
      *
      * @param armor
      * @return
      */
+    @SideOnly(CLIENT)
     public static int addArmor(String armor)
     {
         return RenderingRegistry.addNewArmourRendererPrefix(armor);
@@ -163,6 +168,7 @@ public class ModLoader
      * @param fileToAdd
      * @return
      */
+    @SideOnly(CLIENT)
     public static int addOverride(String fileToOverride, String fileToAdd)
     {
         return RenderingRegistry.addTextureOverride(fileToOverride, fileToAdd);
@@ -175,6 +181,7 @@ public class ModLoader
      * @param overlayPath
      * @param index
      */
+    @SideOnly(CLIENT)
     public static void addOverride(String path, String overlayPath, int index)
     {
         RenderingRegistry.addTextureOverride(path, overlayPath, index);
@@ -273,7 +280,6 @@ public class ModLoader
 
     /**
      * This method is a call in hook from modified external code. Implemented elsewhere.
-     * {@link FMLClientHandler#tryDispensingEntity(World, double, double, double, byte, byte, ItemStack)}
      *
      * @param world
      * @param x
@@ -369,14 +375,13 @@ public class ModLoader
         return FMLLog.getLogger();
     }
 
+    @SideOnly(CLIENT)
     public static Minecraft getMinecraftInstance()
     {
         return FMLClientHandler.instance().getClient();
     }
 
     /**
-     * This is not the server
-     * {@link FMLClientHandler#getServer()}
      *
      * @return
      */
@@ -417,6 +422,7 @@ public class ModLoader
      * Stubbed method on the server to return a unique model id
      *
      */
+    @SideOnly(CLIENT)
     public static int getUniqueBlockModelID(BaseMod mod, boolean inventoryRenderer)
     {
         return ModLoaderClientHelper.obtainBlockModelIdFor(mod, inventoryRenderer);
@@ -433,6 +439,7 @@ public class ModLoader
         return EntityRegistry.findGlobalUniqueEntityId();
     }
 
+    @SideOnly(CLIENT)
     public static int getUniqueSpriteIndex(String path)
     {
         return SpriteHelper.getUniqueSpriteIndex(path);
@@ -451,6 +458,7 @@ public class ModLoader
         return NetworkRegistry.instance().isChannelActive(channel, (Player)player);
     }
 
+    @SideOnly(CLIENT)
     public static boolean isGUIOpen(Class<? extends GuiScreen> gui)
     {
         return FMLClientHandler.instance().getClient().field_71462_r != null && FMLClientHandler.instance().getClient().field_71462_r.equals(gui);
@@ -476,6 +484,7 @@ public class ModLoader
     {
     }
 
+    @SideOnly(CLIENT)
     public static BufferedImage loadImage(RenderEngine renderEngine, String path) throws Exception
     {
         return TextureFXManager.instance().loadImageFromTexturePack(renderEngine, path);
@@ -494,10 +503,12 @@ public class ModLoader
      * Call in from elsewhere. Unimplemented here.
      */
     @Deprecated
+    @SideOnly(CLIENT)
     public static void onTick(float tick, Minecraft game)
     {
     }
 
+    @SideOnly(CLIENT)
     public static void openGUI(EntityPlayer player, GuiScreen gui)
     {
         FMLClientHandler.instance().displayGuiScreen(player, gui);
@@ -520,12 +531,14 @@ public class ModLoader
     }
 
     @Deprecated
+    @SideOnly(CLIENT)
     public static KeyBinding[] registerAllKeys(KeyBinding[] keys)
     {
         return keys;
     }
 
     @Deprecated
+    @SideOnly(CLIENT)
     public static void registerAllTextureOverrides(RenderEngine cache)
     {
     }
@@ -577,6 +590,7 @@ public class ModLoader
         EntityRegistry.registerGlobalEntityID(entityClass, entityName, id, background, foreground);
     }
 
+    @SideOnly(CLIENT)
     public static void registerKey(BaseMod mod, KeyBinding keyHandler, boolean allowRepeat)
     {
         ModLoaderModContainer mlmc=ModLoaderHelper.registerKeyHelper(mod);
@@ -606,6 +620,7 @@ public class ModLoader
         GameRegistry.registerTileEntity(tileEntityClass, id);
     }
 
+    @SideOnly(CLIENT)
     public static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id, TileEntitySpecialRenderer renderer)
     {
         ClientRegistry.registerTileEntity(tileEntityClass, id, renderer);
@@ -668,18 +683,21 @@ public class ModLoader
     }
 
     @Deprecated
+    @SideOnly(CLIENT)
     public static boolean renderBlockIsItemFull3D(int modelID)
     {
         return RenderingRegistry.instance().renderItemAsFull3DBlock(modelID);
     }
 
     @Deprecated
+    @SideOnly(CLIENT)
     public static void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID)
     {
         RenderingRegistry.instance().renderInventoryBlock(renderer, block, metadata, modelID);
     }
 
     @Deprecated
+    @SideOnly(CLIENT)
     public static boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID)
     {
         return RenderingRegistry.instance().renderWorldBlock(renderer, world, x, y, z, block, modelID);
@@ -715,6 +733,7 @@ public class ModLoader
     }
 
     @Deprecated
+    @SideOnly(CLIENT)
     public static void serverLogin(NetClientHandler handler, Packet1Login loginPacket)
     {
         //TODO
@@ -768,7 +787,6 @@ public class ModLoader
 
     /**
      * This method is a call in hook from modified external code. Implemented elsewhere.
-     * {@link FMLClientHandler#onItemCrafted(EntityPlayer, ItemStack, IInventory)}
      *
      * @param player
      * @param item
@@ -781,7 +799,6 @@ public class ModLoader
 
     /**
      * This method is a call in hook from modified external code. Implemented elsewhere.
-     * {@link FMLClientHandler#onItemSmelted(EntityPlayer, ItemStack)}
      *
      * @param player
      * @param item
@@ -793,7 +810,6 @@ public class ModLoader
 
     /**
      * Throw the offered exception. Likely will stop the game.
-     * {@link FMLClientHandler#raiseException(Throwable, String, boolean)}
      *
      * @param message
      * @param e