Tidy up a lot of code- ModLoader and BaseMod are now almost identical client and server side

server/net/minecraft/src/BaseMod.java

@@ -12,6 +12,7 @@
  */
 package net.minecraft.src;
 
+import java.util.Map;
 import java.util.Random;
 
 import net.minecraft.server.MinecraftServer;
@@ -26,11 +27,21 @@ import cpw.mods.fml.common.IWorldGenerator;
 public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDispenseHandler, ICraftingHandler, INetworkHandler, IConsoleHandler, IPlayerTracker
 {
     // CALLBACK MECHANISMS
-    public boolean doTickInGame(Object minecraftInstance, Object ... data)
+
+    /**
+     * @param minecraftInstance
+     * @return
+     */
+    public final boolean doTickInGame(Object minecraftInstance, Object... data)
     {
         return onTickInGame((MinecraftServer)minecraftInstance);
     }
 
+    public final boolean doTickInGui(Object minecraftInstance, Object... data)
+    {
+        return true;
+    }
+
     @Override
     public final void onCrafting(Object... craftingParameters)
     {
@@ -42,6 +53,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
     {
         takenFromFurnace((EntityPlayer)smeltingParameters[0], (ItemStack)smeltingParameters[1]);
     }
+
     @Override
     public final boolean dispense(double x, double y, double z, byte xVelocity, byte zVelocity, Object... data)
     {
@@ -53,6 +65,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
     {
         return onChatMessageReceived((EntityPlayer)data[1], (Packet3Chat)data[0]);
     }
+
     @Override
     public final void onPlayerLogin(Object player)
     {
@@ -60,13 +73,13 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
     }
 
     @Override
-    public void onPlayerLogout(Object player)
+    public final void onPlayerLogout(Object player)
     {
         onClientLogout((EntityPlayer)player);
     }
-    
+
     @Override
-    public void onPlayerChangedDimension(Object player)
+    public final void onPlayerChangedDimension(Object player)
     {
         onClientDimensionChanged((EntityPlayer)player);
     }
@@ -101,14 +114,43 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
         }
     }
 
+    /**
+     * NO-OP on client side
+     */
     @Override
     public final boolean handleCommand(String command, Object... data)
     {
         return onServerCommand(command, (String)data[0], (ICommandListener)data[1]);
     }
+
+    /**
+     * @param renderer
+     * @param block
+     * @param metadata
+     * @param modelID
+     */
+    public final void onRenderInventoryBlock(Object renderer, Block block, int metadata, int modelID)
+    {
+        // NOOP
+    }
+
+    /**
+     * @param world
+     * @param x
+     * @param y
+     * @param z
+     * @param block
+     * @param modelID
+     * @param renderer
+     */
+    public final boolean onRenderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, Object renderer)
+    {
+        return false;
+    }
     // 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
@@ -118,8 +160,14 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
         return 0;
     }
 
+    public void addRenderer(Map<Class<? extends Entity>, Object> renderers)
+    {
+
+    }
+
     /**
      * Override if you wish to perform some action other than just dispensing the item from the dispenser
+     * 
      * @param world
      * @param x
      * @param y
@@ -136,6 +184,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
 
     /**
      * Override if you wish to generate Nether (Hell biome) blocks
+     * 
      * @param world
      * @param random
      * @param chunkX
@@ -147,6 +196,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
 
     /**
      * Override if you wish to generate Overworld (not hell or the end) blocks
+     * 
      * @param world
      * @param random
      * @param chunkX
@@ -158,6 +208,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
 
     /**
      * Return the name of your mod. Defaults to the class name
+     * 
      * @return
      */
     public String getName()
@@ -167,19 +218,26 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
 
     /**
      * Get your mod priorities
+     * 
      * @return
      */
     public String getPriorities()
     {
-        return null;
+        return "";
     }
 
     /**
      * Return the version of your mod
+     * 
      * @return
      */
     public abstract String getVersion();
 
+    public void keyboardEvent(Object event)
+    {
+
+    }
+
     /**
      * Load your mod
      */
@@ -194,6 +252,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
 
     /**
      * Handle item pickup
+     * 
      * @param player
      * @param item
      */
@@ -203,6 +262,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
 
     /**
      * Ticked every game tick if you have subscribed to tick events through {@link ModLoader#setInGameHook(BaseMod, boolean, boolean)}
+     * 
      * @param minecraftServer the server
      * @return true to continue receiving ticks
      */
@@ -211,28 +271,52 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
         return false;
     }
 
-    /**
-     * Not implemented because on the server you don't know who it's from
-     * {@link #onChatMessageReceived(EntityPlayer, Packet3Chat)}
-     * @param text
-     */
-    @Deprecated
-    public void receiveChatPacket(String text)
+    public boolean onTickInGUI(float tick, Object game, Object gui)
     {
+        return false;
     }
 
     /**
-     * Not implemented because on the server you don't know who it's from
+     * Only implemented on the client side
+     * {@link #onChatMessageReceived(EntityPlayer, Packet3Chat)}
+     * 
+     * @param text
+     */
+    public void receiveChatPacket(String text)
+    {
+        
+    }
+
+    /**
+     * Only called on the client side
      * {@link #onPacket250Received(EntityPlayer, Packet250CustomPayload)}
+     * 
      * @param packet
      */
-    @Deprecated
     public void receiveCustomPacket(Packet250CustomPayload packet)
     {
+        
+    }
+
+    public void registerAnimation(Object game)
+    {
+
+    }
+
+    public void renderInvBlock(Object renderer, Block block, int metadata, int modelID)
+    {
+
+    }
+
+    public boolean renderWorldBlock(Object renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID)
+    {
+        return false;
+
     }
 
     /**
      * Called when someone crafts an item from a crafting table
+     * 
      * @param player
      * @param item
      * @param matrix
@@ -272,6 +356,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
 
     /**
      * 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
@@ -293,7 +378,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
     /**
      * Called when a new client logs in.
      * 
-     * @param player 
+     * @param player
      */
     public void onClientLogin(EntityPlayer player)
     {
@@ -306,7 +391,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
      */
     public void onClientLogout(EntityPlayer player)
     {
-        
+
     }
 
     /**
@@ -317,7 +402,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
      */
     public void onClientDimensionChanged(EntityPlayer player)
     {
-        
+
     }
 
     // Spare client junk