Update forge

src/main/java/net/minecraftforge/common/FakePlayer.java

@@ -1,11 +1,15 @@
 package net.minecraftforge.common;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemInWorldManager;
+import net.minecraft.network.packet.Packet204ClientInfo;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.stats.StatBase;
 import net.minecraft.util.ChatMessageComponent;
 import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 
 //Preliminary, simple Fake Player class 
@@ -25,4 +29,20 @@ public class FakePlayer extends EntityPlayerMP
 
     @Override
     public void sendChatToPlayer(ChatMessageComponent chatmessagecomponent){}
+    @Override
+    public void addStat(StatBase par1StatBase, int par2){}
+    @Override
+    public void openGui(Object mod, int modGuiId, World world, int x, int y, int z){}
+    @Override 
+    public boolean isEntityInvulnerable(){ return true; }
+    @Override
+    public boolean canAttackPlayer(EntityPlayer player){ return false; }
+    @Override
+    public void onDeath(DamageSource source){ return; }
+    @Override
+    public void onUpdate(){ return; }
+    @Override
+    public void travelToDimension(int dim){ return; }
+    @Override
+    public void updateClientInfo(Packet204ClientInfo pkt){ return; }
 }

src/main/java/net/minecraftforge/common/ForgeHooks.java

@@ -22,6 +22,7 @@ import net.minecraft.item.ItemSpade;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemSword;
 import net.minecraft.network.NetServerHandler;
+import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.Packet53BlockChange;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
@@ -487,7 +488,11 @@ public class ForgeHooks
             TileEntity tileentity = world.getBlockTileEntity(x, y, z);
             if (tileentity != null)
             {
-                entityPlayer.playerNetServerHandler.sendPacketToPlayer(tileentity.getDescriptionPacket());
+                Packet pkt = tileentity.getDescriptionPacket();
+                if (pkt != null)
+                {
+                    entityPlayer.playerNetServerHandler.sendPacketToPlayer(pkt);
+                }
             }
         }
         return event;

src/main/java/net/minecraftforge/fluids/FluidRegistry.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import net.minecraft.block.Block;
+import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.Event;
 
@@ -25,8 +26,19 @@ public abstract class FluidRegistry
     static BiMap<String, Integer> fluidIDs = HashBiMap.create();
     static BiMap<Block, Fluid> fluidBlocks;
     
-    public static final Fluid WATER = new Fluid("water").setBlockID(Block.waterStill.blockID).setUnlocalizedName(Block.waterStill.getUnlocalizedName());
-    public static final Fluid LAVA = new Fluid("lava").setBlockID(Block.lavaStill.blockID).setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300).setUnlocalizedName(Block.lavaStill.getUnlocalizedName());
+    public static final Fluid WATER = new Fluid("water") {
+        @Override
+        public String getLocalizedName() {
+            return StatCollector.translateToLocal("tile.water.name");
+        }
+    }.setBlockID(Block.waterStill.blockID).setUnlocalizedName(Block.waterStill.getUnlocalizedName());
+    
+    public static final Fluid LAVA = new Fluid("lava") {
+        @Override
+        public String getLocalizedName() {
+            return StatCollector.translateToLocal("tile.lava.name");
+        }
+    }.setBlockID(Block.lavaStill.blockID).setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300).setUnlocalizedName(Block.lavaStill.getUnlocalizedName());
 
     public static int renderIdFluid = -1;