Killed a few hundred compile errors.

src/main/java/net/minecraftforge/classloading/FMLForgePlugin.java

@@ -22,7 +22,7 @@ public class FMLForgePlugin implements IFMLLoadingPlugin
     @Override
     public String getModContainerClass()
     {
-        return "net.minecraftforge.common.ForgeDummyContainer";
+        return "net.minecraftforge.common.ForgeModContainer";
     }
 
     @Override

src/main/java/net/minecraftforge/client/EnumHelperClient.java

@@ -4,7 +4,7 @@ import net.minecraft.util.Util.EnumOS;
 import net.minecraft.world.WorldSettings.GameType;
 import net.minecraft.client.settings.GameSettings.Options;
 import net.minecraft.item.EnumRarity;
-import net.minecraftforge.common.EnumHelper;
+import net.minecraftforge.common.util.EnumHelper;
 
 public class EnumHelperClient extends EnumHelper
 {

src/main/java/net/minecraftforge/client/ForgeHooksClient.java

@@ -45,7 +45,7 @@ import net.minecraftforge.client.IItemRenderer.ItemRenderType;
 import net.minecraftforge.client.event.DrawBlockHighlightEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.ForgeDummyContainer;
+import net.minecraftforge.common.ForgeModContainer;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.RenderBlockFluid;
@@ -219,7 +219,7 @@ public class ForgeHooksClient
         int x = MathHelper.floor_double(entity.posX);
         int y = MathHelper.floor_double(entity.posY);
         int z = MathHelper.floor_double(entity.posZ);
-        Block block = Block.blocksList[mc.theWorld.getBlockId(x, y, z)];
+        Block block = mc.theWorld.func_147439_a(x, y, z);
 
         if (block != null && block.isBed(mc.theWorld, x, y, z, entity))
         {
@@ -247,8 +247,8 @@ public class ForgeHooksClient
     {
         MinecraftForge.EVENT_BUS.post(new TextureStitchEvent.Post(map));
 
-        FluidRegistry.WATER.setIcons(BlockLiquid.func_149803_e("water_still"), BlockLiquid.func_149803_e("water_flow"));
+        //FluidRegistry.WATER.setIcons(BlockLiquid.func_149803_e("water_still"), BlockLiquid.func_149803_e("water_flow"));
-        FluidRegistry.LAVA.setIcons(BlockLiquid.func_149803_e("lava_still"), BlockLiquid.func_149803_e("lava_flow"));
+        //FluidRegistry.LAVA.setIcons(BlockLiquid.func_149803_e("lava_still"), BlockLiquid.func_149803_e("lava_flow"));
     }
 
     /**
@@ -351,7 +351,7 @@ public class ForgeHooksClient
         }
         skyInit = true;
         
-        int distance = Minecraft.getMinecraft().gameSettings.fancyGraphics ? ForgeDummyContainer.blendRanges[Minecraft.getMinecraft().gameSettings.renderDistance] : 0;
+        int distance = Minecraft.getMinecraft().gameSettings.fancyGraphics ? ForgeModContainer.blendRanges[Minecraft.getMinecraft().gameSettings.renderDistance] : 0;
         
         int r = 0;
         int g = 0;

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

@@ -61,7 +61,7 @@ public class BiomeDictionary
      */
     public static boolean registerBiomeType(BiomeGenBase biome, Type ... types)
     {   
-        if(BiomeGenBase.biomeList[biome.biomeID] != null)
+        if(BiomeGenBase.func_150565_n()[biome.biomeID] != null)
         {
             for(Type type : types)
             {
@@ -201,9 +201,9 @@ public class BiomeDictionary
      */
     public static void registerAllBiomesAndGenerateEvents()
     {
-        for(int i = 0; i < BiomeGenBase.biomeList.length; i++)
+        for(int i = 0; i < BiomeGenBase.func_150565_n().length; i++)
         {
-            BiomeGenBase biome = BiomeGenBase.biomeList[i];
+            BiomeGenBase biome = BiomeGenBase.func_150565_n()[i];
 
             if(biome == null)
             {

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

@@ -0,0 +1,26 @@
+package net.minecraftforge.common;
+
+import net.minecraft.block.Block;
+
+public class BlockExtension
+{
+    /**
+     * The Block that this extension object is associated with
+     */
+    public final Block owner;
+ 
+    /**
+     * Determines wither or not a enderman can pickup and move this block.
+     */
+    public boolean carriable = false;
+    
+    public BlockExtension(Block owner)
+    {
+        if (MinecraftForge.getBlockExtension(owner, false) != null)
+        {
+            throw new IllegalArgumentException(owner + " already has an extension object allocated");
+        }
+
+        this.owner = owner;
+    }
+}

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

@@ -44,7 +44,6 @@ import com.google.common.collect.TreeMultiset;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
-
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.ChunkCoordIntPair;
@@ -58,6 +57,9 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.ForgeChunkManager.Ticket;
+import net.minecraftforge.common.config.ConfigCategory;
+import net.minecraftforge.common.config.Configuration;
+import net.minecraftforge.common.config.Property;
 import net.minecraftforge.event.Event;
 
 /**
@@ -383,7 +385,7 @@ public class ForgeChunkManager
             try
             {
                 NBTTagCompound forcedChunkData = CompressedStreamTools.read(chunkLoaderData);
-                return forcedChunkData.getTagList("TicketList").tagCount() > 0;
+                return forcedChunkData.func_150295_c("TicketList", 9).tagCount() > 0;
             }
             catch (IOException e)
             {
@@ -423,10 +425,10 @@ public class ForgeChunkManager
                 FMLLog.log(Level.WARNING, e, "Unable to read forced chunk data at %s - it will be ignored", chunkLoaderData.getAbsolutePath());
                 return;
             }
-            NBTTagList ticketList = forcedChunkData.getTagList("TicketList");
+            NBTTagList ticketList = forcedChunkData.func_150295_c("TicketList", 9);
             for (int i = 0; i < ticketList.tagCount(); i++)
             {
-                NBTTagCompound ticketHolder = (NBTTagCompound) ticketList.tagAt(i);
+                NBTTagCompound ticketHolder = (NBTTagCompound)ticketList.func_150305_b(i);
                 String modId = ticketHolder.getString("Owner");
                 boolean isPlayer = "Forge".equals(modId);
 
@@ -442,10 +444,10 @@ public class ForgeChunkManager
                     continue;
                 }
 
-                NBTTagList tickets = ticketHolder.getTagList("Tickets");
+                NBTTagList tickets = ticketHolder.func_150295_c("Tickets", 9);
                 for (int j = 0; j < tickets.tagCount(); j++)
                 {
-                    NBTTagCompound ticket = (NBTTagCompound) tickets.tagAt(j);
+                    NBTTagCompound ticket = (NBTTagCompound) tickets.func_150305_b(j);
                     modId = ticket.hasKey("ModId") ? ticket.getString("ModId") : modId;
                     Type type = Type.values()[ticket.getByte("Type")];
                     byte ticketChunkDepth = ticket.getByte("ChunkListDepth");
@@ -850,7 +852,7 @@ public class ForgeChunkManager
                 }
                 if (tick.modData != null)
                 {
-                    ticket.setCompoundTag("ModData", tick.modData);
+                    ticket.setTag("ModData", tick.modData);
                 }
                 if (tick.ticketType == Type.ENTITY && tick.entity != null && tick.entity.writeToNBTOptional(new NBTTagCompound()))
                 {

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

@@ -5,7 +5,9 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
+import cpw.mods.fml.relauncher.ReflectionHelper;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.EntityLiving;
@@ -13,6 +15,8 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.inventory.Container;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemArmor;
@@ -21,19 +25,13 @@ import net.minecraft.item.ItemPickaxe;
 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;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.Packet53BlockChange;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.ChatMessageComponent;
 import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumMovingObjectType;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.WeightedRandom;
-import net.minecraft.util.WeightedRandomItem;
-import net.minecraft.world.EnumGameType;
 import net.minecraft.world.World;
 import net.minecraftforge.event.Event;
 import net.minecraftforge.event.ForgeEventFactory;
@@ -52,7 +50,7 @@ import net.minecraftforge.event.world.BlockEvent;
 
 public class ForgeHooks
 {
-    static class GrassEntry extends WeightedRandomItem
+    static class GrassEntry extends WeightedRandom.Item
     {
         public final Block block;
         public final int metadata;
@@ -64,7 +62,7 @@ public class ForgeHooks
         }
     }
 
-    static class SeedEntry extends WeightedRandomItem
+    static class SeedEntry extends WeightedRandom.Item
     {
         public final ItemStack seed;
         public SeedEntry(ItemStack seed, int weight)
@@ -83,7 +81,7 @@ public class ForgeHooks
         {
             return;
         }
-        world.setBlock(x, y, z, grass.block.blockID, grass.metadata, 3);
+        world.setBlock(x, y, z, grass.block, grass.metadata, 3);
     }
 
     public static ItemStack getGrassSeed(World world)
@@ -185,54 +183,58 @@ public class ForgeHooks
         }
         toolInit = true;
 
-        MinecraftForge.setToolClass(Item.pickaxeWood,    "pickaxe", 0);
+        MinecraftForge.setToolClass(Items.wooden_pickaxe,  "pickaxe", 0);
-        MinecraftForge.setToolClass(Item.pickaxeStone,   "pickaxe", 1);
+        MinecraftForge.setToolClass(Items.stone_pickaxe,   "pickaxe", 1);
-        MinecraftForge.setToolClass(Item.pickaxeIron,   "pickaxe", 2);
+        MinecraftForge.setToolClass(Items.iron_pickaxe,    "pickaxe", 2);
-        MinecraftForge.setToolClass(Item.pickaxeGold,    "pickaxe", 0);
+        MinecraftForge.setToolClass(Items.golden_pickaxe,  "pickaxe", 0);
-        MinecraftForge.setToolClass(Item.pickaxeDiamond, "pickaxe", 3);
+        MinecraftForge.setToolClass(Items.diamond_pickaxe, "pickaxe", 3);
 
-        MinecraftForge.setToolClass(Item.axeWood,    "axe", 0);
+        MinecraftForge.setToolClass(Items.wooden_axe,  "axe", 0);
-        MinecraftForge.setToolClass(Item.axeStone,   "axe", 1);
+        MinecraftForge.setToolClass(Items.stone_axe,   "axe", 1);
-        MinecraftForge.setToolClass(Item.axeIron,   "axe", 2);
+        MinecraftForge.setToolClass(Items.iron_axe,    "axe", 2);
-        MinecraftForge.setToolClass(Item.axeGold,    "axe", 0);
+        MinecraftForge.setToolClass(Items.golden_axe,  "axe", 0);
-        MinecraftForge.setToolClass(Item.axeDiamond, "axe", 3);
+        MinecraftForge.setToolClass(Items.diamond_axe, "axe", 3);
 
-        MinecraftForge.setToolClass(Item.shovelWood,    "shovel", 0);
+        MinecraftForge.setToolClass(Items.wooden_shovel,  "shovel", 0);
-        MinecraftForge.setToolClass(Item.shovelStone,   "shovel", 1);
+        MinecraftForge.setToolClass(Items.stone_shovel,   "shovel", 1);
-        MinecraftForge.setToolClass(Item.shovelIron,   "shovel", 2);
+        MinecraftForge.setToolClass(Items.iron_shovel,    "shovel", 2);
-        MinecraftForge.setToolClass(Item.shovelGold,    "shovel", 0);
+        MinecraftForge.setToolClass(Items.golden_shovel,  "shovel", 0);
-        MinecraftForge.setToolClass(Item.shovelDiamond, "shovel", 3);
+        MinecraftForge.setToolClass(Items.diamond_shovel, "shovel", 3);
 
-        for (Block block : ItemPickaxe.blocksEffectiveAgainst)
+        Set<Block> blocks = ReflectionHelper.getPrivateValue(ItemPickaxe.class, null, 0);
+        for (Block block : blocks)
         {
             MinecraftForge.setBlockHarvestLevel(block, "pickaxe", 0);
         }
 
-        for (Block block : ItemSpade.blocksEffectiveAgainst)
+        blocks = ReflectionHelper.getPrivateValue(ItemSpade.class, null, 0);
+        for (Block block : blocks)
         {
             MinecraftForge.setBlockHarvestLevel(block, "shovel", 0);
         }
 
-        for (Block block : ItemAxe.blocksEffectiveAgainst)
+        blocks = ReflectionHelper.getPrivateValue(ItemAxe.class, null, 0);
+        for (Block block : blocks)
         {
             MinecraftForge.setBlockHarvestLevel(block, "axe", 0);
         }
 
-        MinecraftForge.setBlockHarvestLevel(Block.obsidian,     "pickaxe", 3);
+        MinecraftForge.setBlockHarvestLevel(Blocks.obsidian,         "pickaxe", 3);
-        MinecraftForge.setBlockHarvestLevel(Block.oreEmerald,   "pickaxe", 2);
+        MinecraftForge.setBlockHarvestLevel(Blocks.emerald_ore,      "pickaxe", 2);
-        MinecraftForge.setBlockHarvestLevel(Block.oreDiamond,   "pickaxe", 2);
+        MinecraftForge.setBlockHarvestLevel(Blocks.emerald_block,    "pickaxe", 2);
-        MinecraftForge.setBlockHarvestLevel(Block.blockDiamond, "pickaxe", 2);
+        MinecraftForge.setBlockHarvestLevel(Blocks.diamond_ore,      "pickaxe", 2);
-        MinecraftForge.setBlockHarvestLevel(Block.oreGold,      "pickaxe", 2);
+        MinecraftForge.setBlockHarvestLevel(Blocks.diamond_block,    "pickaxe", 2);
-        MinecraftForge.setBlockHarvestLevel(Block.blockGold,    "pickaxe", 2);
+        MinecraftForge.setBlockHarvestLevel(Blocks.gold_ore,         "pickaxe", 2);
-        MinecraftForge.setBlockHarvestLevel(Block.oreIron,      "pickaxe", 1);
+        MinecraftForge.setBlockHarvestLevel(Blocks.gold_block,       "pickaxe", 2);
-        MinecraftForge.setBlockHarvestLevel(Block.blockIron,   "pickaxe", 1);
+        MinecraftForge.setBlockHarvestLevel(Blocks.iron_ore,         "pickaxe", 1);
-        MinecraftForge.setBlockHarvestLevel(Block.oreLapis,     "pickaxe", 1);
+        MinecraftForge.setBlockHarvestLevel(Blocks.iron_block,       "pickaxe", 1);
-        MinecraftForge.setBlockHarvestLevel(Block.blockLapis,   "pickaxe", 1);
+        MinecraftForge.setBlockHarvestLevel(Blocks.lapis_ore,        "pickaxe", 1);
-        MinecraftForge.setBlockHarvestLevel(Block.oreRedstone,  "pickaxe", 2);
+        MinecraftForge.setBlockHarvestLevel(Blocks.lapis_block,      "pickaxe", 1);
-        MinecraftForge.setBlockHarvestLevel(Block.oreRedstoneGlowing, "pickaxe", 2);
+        MinecraftForge.setBlockHarvestLevel(Blocks.redstone_ore,     "pickaxe", 2);
-        MinecraftForge.removeBlockEffectiveness(Block.oreRedstone, "pickaxe");
+        MinecraftForge.setBlockHarvestLevel(Blocks.lit_redstone_ore, "pickaxe", 2);
-        MinecraftForge.removeBlockEffectiveness(Block.obsidian,    "pickaxe");
+        MinecraftForge.removeBlockEffectiveness(Blocks.redstone_ore, "pickaxe");
-        MinecraftForge.removeBlockEffectiveness(Block.oreRedstoneGlowing, "pickaxe");
+        MinecraftForge.removeBlockEffectiveness(Blocks.obsidian,     "pickaxe");
+        MinecraftForge.removeBlockEffectiveness(Blocks.lit_redstone_ore, "pickaxe");
     }
 
     public static int getTotalArmorValue(EntityPlayer player)
@@ -255,9 +257,9 @@ public class ForgeHooks
 
     static
     {
-        grassList.add(new GrassEntry(Block.plantYellow, 0, 20));
+        grassList.add(new GrassEntry(Blocks.yellow_flower, 0, 20));
-        grassList.add(new GrassEntry(Block.plantRed,    0, 10));
+        grassList.add(new GrassEntry(Blocks.red_flower,    0, 10));
-        seedList.add(new SeedEntry(new ItemStack(Item.seeds), 10));
+        seedList.add(new SeedEntry(new ItemStack(Items.wheat_seeds), 10));
         initTools();
     }
 
@@ -274,7 +276,7 @@ public class ForgeHooks
             int x = target.blockX;
             int y = target.blockY;
             int z = target.blockZ;
-            Block var8 = Block.blocksList[world.getBlockId(x, y, z)];
+            Block var8 = world.func_147439_a(x, y, z);
 
             if (var8 == null)
             {
@@ -366,7 +368,7 @@ public class ForgeHooks
 
     public static boolean isLivingOnLadder(Block block, World world, int x, int y, int z, EntityLivingBase entity)
     {
-        if (!ForgeDummyContainer.fullBoundingBoxLadders)
+        if (!ForgeModContainer.fullBoundingBoxLadders)
         {
             return block != null && block.isLadder(world, x, y, z, entity);
         }
@@ -382,7 +384,7 @@ public class ForgeHooks
                 {
                     for (int z2 = mZ; z2 < bb.maxZ; z2++)
                     {
-                        block = Block.blocksList[world.getBlockId(x2, y2, z2)];                        
+                        block = world.func_147439_a(x2, y2, z2);                        
                         if (block != null && block.isLadder(world, x2, y2, z2, entity))
                         {
                             return true;
@@ -428,7 +430,7 @@ public class ForgeHooks
             return 0;
         }
 
-        Block block = Block.blocksList[world.getBlockId(x, y, z)];
+        Block block = world.func_147439_a(x, y, z);
         return (block == null ? 0 : block.getEnchantPowerBonus(world, x, y, z));
     }
 
@@ -472,7 +474,7 @@ public class ForgeHooks
         }
 
         // Post the block break event
-        Block block = Block.blocksList[world.getBlockId(x, y, z)];
+        Block block = world.func_147439_a(x, y, z);
         int blockMetadata = world.getBlockMetadata(x, y, z);
         BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(x, y, z, world, block, blockMetadata, entityPlayer);
         event.setCanceled(preCancelEvent);
@@ -488,7 +490,7 @@ public class ForgeHooks
             TileEntity tileentity = world.getBlockTileEntity(x, y, z);
             if (tileentity != null)
             {
-                Packet pkt = tileentity.getDescriptionPacket();
+                Packet pkt = tileentity.func_145844_m();
                 if (pkt != null)
                 {
                     entityPlayer.playerNetServerHandler.sendPacketToPlayer(pkt);

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

@@ -11,6 +11,8 @@ import net.minecraft.server.management.PlayerInstance;
 import net.minecraft.world.storage.SaveHandler;
 import net.minecraft.world.storage.WorldInfo;
 import net.minecraftforge.classloading.FMLForgePlugin;
+import net.minecraftforge.common.config.Configuration;
+import net.minecraftforge.common.config.Property;
 import net.minecraftforge.common.network.ForgeConnectionHandler;
 import net.minecraftforge.common.network.ForgeNetworkHandler;
 import net.minecraftforge.common.network.ForgePacketHandler;
@@ -37,7 +39,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.network.FMLNetworkHandler;
 import cpw.mods.fml.common.network.NetworkMod;
 import static net.minecraftforge.common.ForgeVersion.*;
-import static net.minecraftforge.common.Configuration.*;
+import static net.minecraftforge.common.config.Configuration.*;
 
 @NetworkMod(
         channels = "FORGE",
@@ -45,7 +47,7 @@ import static net.minecraftforge.common.Configuration.*;
         packetHandler     = ForgePacketHandler.class,
         tinyPacketHandler = ForgeTinyPacketHandler.class
     )
-public class ForgeDummyContainer extends DummyModContainer implements WorldAccessContainer
+public class ForgeModContainer extends DummyModContainer implements WorldAccessContainer
 {
     public static int clumpingThreshold = 64;
     public static boolean removeErroringEntities = false;
@@ -58,7 +60,7 @@ public class ForgeDummyContainer extends DummyModContainer implements WorldAcces
     public static float zombieBabyChance = 0.05f;
     public static boolean shouldSortRecipies = false;
 
-    public ForgeDummyContainer()
+    public ForgeModContainer()
     {
         super(new ModMetadata());
         ModMetadata meta = getMetadata();
@@ -221,7 +223,7 @@ public class ForgeDummyContainer extends DummyModContainer implements WorldAcces
     {
         NBTTagCompound forgeData = new NBTTagCompound();
         NBTTagCompound dimData = DimensionManager.saveDimensionDataMap();
-        forgeData.setCompoundTag("DimensionData", dimData);
+        forgeData.setTag("DimensionData", dimData);
         return forgeData;
     }
 

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

@@ -9,23 +9,22 @@ import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.entity.monster.EntityEnderman;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.ForgeHooks.GrassEntry;
 import net.minecraftforge.common.ForgeHooks.SeedEntry;
+import net.minecraftforge.common.util.IdentityMap;
 import net.minecraftforge.event.EventBus;
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.EntityEvent;
 import net.minecraftforge.oredict.OreDictionary;
 
 public class MinecraftForge
-{
+{   
     /**
      * The core Forge EventBusses, all events for Forge will be fired on these,
      * you should use this to register all your listeners.
@@ -39,6 +38,8 @@ public class MinecraftForge
     public static final EventBus ORE_GEN_BUS = new EventBus();
 
     private static final ForgeInternalHandler INTERNAL_HANDLER = new ForgeInternalHandler();
+    
+    private static final IdentityMap<Block, BlockExtension> EXTENSION_BLOCK = new IdentityMap<Block, BlockExtension>(4096, 1.0f);
 
 
     /** Register a new plant to be planted when bonemeal is used on grass.
@@ -177,6 +178,28 @@ public class MinecraftForge
        }
    }
 
+   /**
+    * Gets the associated Extension object for the specified block,
+    * if guarantee is true, and there is no extension associated, it will
+    * create a new one and register it.
+    * 
+    * May return null, unless guarantee is set to true
+    * 
+    * @param block The block instance
+    * @param guarantee Wither to create a new extension if one does not exist.
+    * @return The extension object or null if none is registered and guarantee is false
+    */
+   public static BlockExtension getBlockExtension(Block block, boolean guarantee)
+   {
+       BlockExtension ret = EXTENSION_BLOCK.get(block);
+       if (ret == null && guarantee)
+       {
+           ret = new BlockExtension(block);
+           EXTENSION_BLOCK.put(block, ret);
+       }
+       return ret;
+   }
+
    /**
     * Method invoked by FML before any other mods are loaded.
     */
@@ -185,29 +208,6 @@ public class MinecraftForge
        System.out.printf("MinecraftForge v%s Initialized\n", ForgeVersion.getVersion());
        FMLLog.info("MinecraftForge v%s Initialized", ForgeVersion.getVersion());
 
-       Block filler = new Block(0, Material.air)
-       {
-           @SideOnly(Side.CLIENT)
-           @Override
-           public void registerIcons(IconRegister register){}
-       };
-       Block.blocksList[0] = null;
-       Block.opaqueCubeLookup[0] = false;
-       Block.lightOpacity[0] = 0;
-       filler.setUnlocalizedName("ForgeFiller");
-
-       for (int x = 256; x < 4096; x++)
-       {
-           if (Item.itemsList[x] != null)
-           {
-               Block.blocksList[x] = filler;
-           }
-       }
-
-       boolean[] temp = new boolean[4096];
-       System.arraycopy(EntityEnderman.carriableBlocks, 0, temp, 0, EntityEnderman.carriableBlocks.length);
-       EntityEnderman.carriableBlocks = temp;
-
        EVENT_BUS.register(INTERNAL_HANDLER);
        OreDictionary.getOreName(0);
 

src/main/java/net/minecraftforge/common/config/ConfigCategory.java

@@ -1,7 +1,7 @@
-package net.minecraftforge.common;
+package net.minecraftforge.common.config;
 
-import static net.minecraftforge.common.Configuration.NEW_LINE;
+import static net.minecraftforge.common.config.Configuration.NEW_LINE;
-import static net.minecraftforge.common.Configuration.allowedProperties;
+import static net.minecraftforge.common.config.Configuration.allowedProperties;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -10,6 +10,7 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.base.Splitter;

src/main/java/net/minecraftforge/common/config/Configuration.java

@@ -3,12 +3,12 @@
  * License v1.0.
  */
 
-package net.minecraftforge.common;
+package net.minecraftforge.common.config;
 
-import static net.minecraftforge.common.Property.Type.BOOLEAN;
+import static net.minecraftforge.common.config.Property.Type.BOOLEAN;
-import static net.minecraftforge.common.Property.Type.DOUBLE;
+import static net.minecraftforge.common.config.Property.Type.DOUBLE;
-import static net.minecraftforge.common.Property.Type.INTEGER;
+import static net.minecraftforge.common.config.Property.Type.INTEGER;
-import static net.minecraftforge.common.Property.Type.STRING;
+import static net.minecraftforge.common.config.Property.Type.STRING;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

src/main/java/net/minecraftforge/common/config/Property.java

@@ -3,11 +3,11 @@
  * License v1.0.
  */
 
-package net.minecraftforge.common;
+package net.minecraftforge.common.config;
 
 import java.util.ArrayList;
 
-import net.minecraftforge.common.Property.Type;
+import net.minecraftforge.common.config.Property.Type;
 
 public class Property
 {

src/main/java/net/minecraftforge/common/network/ForgeNetworkHandler.java

@@ -1,12 +1,12 @@
 package net.minecraftforge.common.network;
 
-import net.minecraftforge.common.ForgeDummyContainer;
+import net.minecraftforge.common.ForgeModContainer;
 import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkModHandler;
 
 public class ForgeNetworkHandler extends NetworkModHandler
 {
-    public ForgeNetworkHandler(ForgeDummyContainer container)
+    public ForgeNetworkHandler(ForgeModContainer container)
     {
         super(container,container.getClass().getAnnotation(NetworkMod.class));
         configureNetworkMod(container);

src/main/java/net/minecraftforge/common/network/ForgePacket.java

@@ -5,9 +5,6 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.logging.Level;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.NetHandler;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraftforge.common.network.packet.DimensionRegisterPacket;
 import net.minecraftforge.fluids.FluidIdMapPacket;
 

src/main/java/net/minecraftforge/common/network/ForgeTinyPacketHandler.java

@@ -1,15 +0,0 @@
-package net.minecraftforge.common.network;
-
-import net.minecraft.network.packet.NetHandler;
-import net.minecraft.network.packet.Packet131MapData;
-import cpw.mods.fml.common.network.ITinyPacketHandler;
-
-public class ForgeTinyPacketHandler implements ITinyPacketHandler {
-
-    @Override
-    public void handle(NetHandler handler, Packet131MapData mapData)
-    {
-
-    }
-
-}

src/main/java/net/minecraftforge/common/util/EnumHelper.java

@@ -1,4 +1,4 @@
-package net.minecraftforge.common;
+package net.minecraftforge.common.util;
 
 import java.lang.reflect.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package net.minecraftforge.common;
+package net.minecraftforge.common.util;
 
 import com.mojang.authlib.GameProfile;
 

src/main/java/net/minecraftforge/common/util/FakePlayerFactory.java

@@ -1,4 +1,4 @@
-package net.minecraftforge.common;
+package net.minecraftforge.common.util;
 
 import java.util.Map;
 import java.util.UUID;

src/main/java/net/minecraftforge/common/util/ForgeDirection.java

@@ -1,4 +1,4 @@
-package net.minecraftforge.common;
+package net.minecraftforge.common.util;
 
 public enum ForgeDirection
 {

src/main/java/net/minecraftforge/common/util/IdentityMap.java

@@ -0,0 +1,134 @@
+package net.minecraftforge.common.util;
+
+import gnu.trove.iterator.TIntObjectIterator;
+import gnu.trove.map.hash.TIntIntHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
+
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+public class IdentityMap<K, V> implements Map<K, V>
+{
+    private TIntObjectHashMap<V> values;
+    private TIntObjectHashMap<K> keys;
+    private EntrySet entrySet;
+
+    public IdentityMap(int initialCapacity, float loadFactor)
+    {
+        keys = new TIntObjectHashMap<K>(initialCapacity, loadFactor, -1);
+        values = new TIntObjectHashMap<V>(initialCapacity, loadFactor, -1);
+    }
+    
+    @Override public int size(){ return values.size(); }
+    @Override public boolean isEmpty(){ return values.isEmpty(); }
+    @Override public boolean containsKey(Object key){ return values.containsKey(System.identityHashCode(key)); }
+    @Override public boolean containsValue(Object value){ return values.containsValue(value); }
+    @Override public V get(Object key){ return values.get(System.identityHashCode(key)); }
+    @Override
+    public V put(K key, V value)
+    {
+        int id = System.identityHashCode(key);
+        keys.put(id, key);
+        return values.put(id, value);
+    }
+
+    @Override public V remove(Object key)
+    {
+        /*
+        int id = System.identityHashCode(key);
+        keys.remove(id);
+        return values.remove(id);
+        */
+        throw new IllegalStateException();
+    }
+
+    @Override
+    public void putAll(Map<? extends K, ? extends V> m)
+    {
+        for (Entry<? extends K, ? extends V> entry : m.entrySet())
+        {
+            put(entry.getKey(), entry.getValue());
+        }
+    }
+
+    @Override
+    public void clear()
+    {
+        /*
+        keys.clear();
+        values.clear();
+        */
+        throw new IllegalStateException();
+    }
+
+    @Override
+    public Set<K> keySet()
+    {
+        return new TreeSet<K>(keys.valueCollection());
+    }
+
+    @Override
+    public Collection<V> values()
+    {
+        return values.valueCollection();
+    }
+
+    @Override
+    public Set<Entry<K, V>> entrySet()
+    {
+        if (entrySet == null) entrySet = new EntrySet();
+        return entrySet;
+    }
+
+    private class EntrySet extends AbstractSet<Entry<K,V>>
+    {
+        @Override
+        public Iterator<Entry<K, V>> iterator()
+        {
+            return new EntryIterator(keys.iterator());
+        }
+
+        @Override
+        public int size()
+        {
+            return keys.size();
+        }        
+    }
+
+    private class EntryIterator implements Iterator<Entry<K, V>>
+    {
+        private TIntObjectIterator<K> itr;
+        private int last = -1;
+        private EntryIterator(TIntObjectIterator<K> itr)
+        {
+            this.itr = itr;
+        }
+
+        @Override
+        public boolean hasNext()
+        {
+            return itr.hasNext();
+        }
+
+        @Override
+        public Entry<K, V> next()
+        {
+            itr.advance();
+            return new AbstractMap.SimpleEntry<K,V>(itr.value(), values.get(itr.key()));
+        }
+        @Override
+        public void remove()
+        {
+            /*
+            keys.remove(itr.key());
+            values.remove(itr.key());
+            */
+            throw new IllegalStateException();
+        }
+    }
+}

src/main/java/net/minecraftforge/common/util/RotationHelper.java

@@ -1,15 +1,14 @@
-package net.minecraftforge.common;
+package net.minecraftforge.common.util;
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockAnvil;
 import net.minecraft.block.BlockBed;
 import net.minecraft.block.BlockButton;
 import net.minecraft.block.BlockChest;
 import net.minecraft.block.BlockCocoa;
-import net.minecraft.block.BlockComparator;
-import net.minecraft.block.BlockDetectorRail;
 import net.minecraft.block.BlockDispenser;
 import net.minecraft.block.BlockDoor;
 import net.minecraft.block.BlockEndPortalFrame;
@@ -17,28 +16,31 @@ import net.minecraft.block.BlockEnderChest;
 import net.minecraft.block.BlockFenceGate;
 import net.minecraft.block.BlockFurnace;
 import net.minecraft.block.BlockHopper;
+import net.minecraft.block.BlockHugeMushroom;
 import net.minecraft.block.BlockLadder;
 import net.minecraft.block.BlockLever;
 import net.minecraft.block.BlockLog;
-import net.minecraft.block.BlockMushroomCap;
 import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.BlockPistonExtension;
 import net.minecraft.block.BlockPumpkin;
 import net.minecraft.block.BlockRail;
+import net.minecraft.block.BlockRailDetector;
 import net.minecraft.block.BlockRailPowered;
+import net.minecraft.block.BlockRedstoneComparator;
 import net.minecraft.block.BlockRedstoneRepeater;
 import net.minecraft.block.BlockSkull;
 import net.minecraft.block.BlockStairs;
 import net.minecraft.block.BlockTorch;
 import net.minecraft.block.BlockTrapDoor;
-import net.minecraft.block.BlockTripWireSource;
+import net.minecraft.block.BlockTripWireHook;
 import net.minecraft.block.BlockVine;
+import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static net.minecraftforge.common.ForgeDirection.*;
+import static net.minecraftforge.common.util.ForgeDirection.*;
 
 public class RotationHelper {
     /**
@@ -76,7 +78,31 @@ public class RotationHelper {
 
     public static ForgeDirection[] getValidVanillaBlockRotations(Block block)
     {
-        return (block instanceof BlockBed || block instanceof BlockPumpkin || block instanceof BlockFenceGate || block instanceof BlockEndPortalFrame || block instanceof BlockTripWireSource || block instanceof BlockCocoa || block instanceof BlockRailPowered || block instanceof BlockDetectorRail || block instanceof BlockStairs || block instanceof BlockChest || block instanceof BlockEnderChest || block instanceof BlockFurnace || block instanceof BlockLadder || block.blockID == Block.signWall.blockID || block.blockID == Block.signPost.blockID || block instanceof BlockDoor || block instanceof BlockRail || block instanceof BlockButton || block instanceof BlockRedstoneRepeater || block instanceof BlockComparator || block instanceof BlockTrapDoor || block instanceof BlockMushroomCap || block instanceof BlockVine || block instanceof BlockSkull || block instanceof BlockAnvil) ? UP_DOWN_AXES : VALID_DIRECTIONS;
+        return (block instanceof BlockBed || 
+                block instanceof BlockPumpkin ||
+                block instanceof BlockFenceGate || 
+                block instanceof BlockEndPortalFrame || 
+                block instanceof BlockTripWireHook || 
+                block instanceof BlockCocoa || 
+                block instanceof BlockRailPowered || 
+                block instanceof BlockRailDetector || 
+                block instanceof BlockStairs || 
+                block instanceof BlockChest || 
+                block instanceof BlockEnderChest || 
+                block instanceof BlockFurnace || 
+                block instanceof BlockLadder || 
+                block == Blocks.wall_sign || 
+                block == Blocks.standing_sign || 
+                block instanceof BlockDoor || 
+                block instanceof BlockRail ||
+                block instanceof BlockButton || 
+                block instanceof BlockRedstoneRepeater || 
+                block instanceof BlockRedstoneComparator || 
+                block instanceof BlockTrapDoor || 
+                block instanceof BlockHugeMushroom || 
+                block instanceof BlockVine || 
+                block instanceof BlockSkull || 
+                block instanceof BlockAnvil) ? UP_DOWN_AXES : VALID_DIRECTIONS;
     }
 
     public static boolean rotateVanillaBlock(Block block, World worldObj, int x, int y, int z, ForgeDirection axis)
@@ -88,7 +114,7 @@ public class RotationHelper {
 
         if (axis == UP || axis == DOWN)
         {
-            if (block instanceof BlockBed || block instanceof BlockPumpkin || block instanceof BlockFenceGate || block instanceof BlockEndPortalFrame || block instanceof BlockTripWireSource || block instanceof BlockCocoa)
+            if (block instanceof BlockBed || block instanceof BlockPumpkin || block instanceof BlockFenceGate || block instanceof BlockEndPortalFrame || block instanceof BlockTripWireHook || block instanceof BlockCocoa)
             {
                 return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.BED);
             }
@@ -96,7 +122,7 @@ public class RotationHelper {
             {
                 return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.RAIL);
             }
-            if (block instanceof BlockRailPowered || block instanceof BlockDetectorRail)
+            if (block instanceof BlockRailPowered || block instanceof BlockRailDetector)
             {
                 return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.RAIL_POWERED);
             }
@@ -104,11 +130,11 @@ public class RotationHelper {
             {
                 return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.STAIR);
             }
-            if (block instanceof BlockChest || block instanceof BlockEnderChest || block instanceof BlockFurnace || block instanceof BlockLadder || block.blockID == Block.signWall.blockID)
+            if (block instanceof BlockChest || block instanceof BlockEnderChest || block instanceof BlockFurnace || block instanceof BlockLadder || block == Blocks.wall_sign)
             {
                 return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.CHEST);
             }
-            if (block.blockID == Block.signPost.blockID)
+            if (block == Blocks.standing_sign)
             {
                 return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.SIGNPOST);
             }
@@ -120,7 +146,7 @@ public class RotationHelper {
             {
                 return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.BUTTON);
             }
-            if (block instanceof BlockRedstoneRepeater || block instanceof BlockComparator)
+            if (block instanceof BlockRedstoneRepeater || block instanceof BlockRedstoneComparator)
             {
                 return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.REDSTONE_REPEATER);
             }
@@ -128,7 +154,7 @@ public class RotationHelper {
             {
                 return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.TRAPDOOR);
             }
-            if (block instanceof BlockMushroomCap)
+            if (block instanceof BlockHugeMushroom)
             {
                 return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.MUSHROOM_CAP);
             }

src/main/java/net/minecraftforge/event/ServerChatEvent.java

@@ -14,7 +14,7 @@ public class ServerChatEvent extends Event
         super();
         this.message = message;
         this.player = player;
-        this.username = player.username;
+        this.username = player.func_146103_bH().getName();
         this.component = component;
     }
 }

src/main/java/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java

@@ -1,7 +1,7 @@
 package net.minecraftforge.event.entity.player;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EnumStatus;
+import net.minecraft.entity.player.EntityPlayer.EnumStatus;
 
 public class PlayerSleepInBedEvent extends PlayerEvent
 {

src/main/resources/forge_at.cfg

@@ -7,14 +7,9 @@
 #public bfq.x #FD:Tessellator/field_78417_x #zOffset
 #public bfq.z #FD:Tessellator/field_78415_z #isDrawing
 # ItemPickaxe
-#public yn.<init>(ILyd;)V #MD:ItemPickaxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
+public net.minecraft.item.ItemPickaxe <init>(Lnet.minecraft.item.Item$ToolMaterial;)
-#public+f yn.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst
+public net.minecraft.item.ItemAxe <init>(Lnet.minecraft.item.Item$ToolMaterial;)
-# ItemAxe
+public net.minecraft.item.ItemSpade <init>(Lnet.minecraft.item.Item$ToolMaterial;)
-#public ya.<init>(ILyd;)V #MD:ItemAxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
-#public+f ya.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst
-# ItemSpade
-#public yy.<init>(ILyd;)V #MD:ItemSpade/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
-#public+f yy.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst
 # ItemTool
 #public xj.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial
 #public xj.d #FD:ItemTool/field_77865_bY #damageVsEntity
@@ -70,17 +65,17 @@
 # EntityPlayerMP
 #public bdi.a(Lss;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
 # World Gen Chests Related
-public net.minecraft.util.WeightedRandomChestContent.*
+public net.minecraft.util.WeightedRandomChestContent *
-public net.minecraft.world.WorldServer.field_73069_S
+public net.minecraft.world.WorldServer field_73069_S
-public net.minecraft.world.gen.structure.StructureMineshaftPieces.field_78818_a
+public net.minecraft.world.gen.structure.StructureMineshaftPieces field_78818_a
-public net.minecraft.world.gen.structure.ComponentScatteredFeaturePieces$DesertPyramid.field_74941_i
+public net.minecraft.world.gen.structure.ComponentScatteredFeaturePieces$DesertPyramid field_74941_i
-public net.minecraft.world.gen.structure.ComponentScatteredFeaturePieces$JunglePyramid.field_74943_l
+public net.minecraft.world.gen.structure.ComponentScatteredFeaturePieces$JunglePyramid field_74943_l
-public net.minecraft.world.gen.structure.ComponentScatteredFeaturePieces$JunglePyramid.field_74944_m
+public net.minecraft.world.gen.structure.ComponentScatteredFeaturePieces$JunglePyramid field_74944_m
-public net.minecraft.world.gen.structure.StructureStrongholdPieces$ChestCorridor.field_75003_a
+public net.minecraft.world.gen.structure.StructureStrongholdPieces$ChestCorridor field_75003_a
-public net.minecraft.world.gen.structure.StructureStrongholdPieces$Library.field_75007_b
+public net.minecraft.world.gen.structure.StructureStrongholdPieces$Library field_75007_b
-public net.minecraft.world.gen.structure.StructureStrongholdPieces$RoomCrossing.field_75014_c
+public net.minecraft.world.gen.structure.StructureStrongholdPieces$RoomCrossing field_75014_c
-public net.minecraft.world.gen.structure.StructureVillagePieces$House2.field_74918_a
+public net.minecraft.world.gen.structure.StructureVillagePieces$House2 field_74918_a
-public net.minecraft.world.gen.feature.WorldGenDungeons.field_111189_a
+public net.minecraft.world.gen.feature.WorldGenDungeons field_111189_a
 # AnvilChunkLoader.chunkSaveLocation
 #public aee.d #FD:AnvilChunkLoader/field_75825_d
 # ChunkProviderServer.currentChunkLoader
@@ -99,15 +94,15 @@ public net.minecraft.world.gen.feature.WorldGenDungeons.field_111189_a
 #public avz.a(Ljava/lang/String;ILacq;Ljava/util/List;[Lagd;)V #MD:GuiFlatPresets/func_82294_a
 #public avz.a(Ljava/lang/String;ILacq;[Lagd;)V #MD:GuiFlatPresets/func_82297_a
 # BiomeGenBase
-#public acq.*() #MD:BiomeGenBase/* #Everything protected->public
+public net.minecraft.world.biome.BiomeGenBase *() #Everything protected->public
 # MapGenVillage
-#public-f aiw.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes
+public-f net.minecraft.world.gen.structure.MapGenVillage field_75055_e #villageSpawnBiomes
 # ShapedRecipes
-public+f net.minecraft.item.crafting.ShapedRecipes.field_77574_d #recipeItems
+public+f net.minecraft.item.crafting.ShapedRecipes field_77574_d #recipeItems
-public+f net.minecraft.item.crafting.ShapedRecipes.field_77576_b #recipeWidth
+public+f net.minecraft.item.crafting.ShapedRecipes field_77576_b #recipeWidth
-public+f net.minecraft.item.crafting.ShapedRecipes.field_77577_c #recipeHeight
+public+f net.minecraft.item.crafting.ShapedRecipes field_77577_c #recipeHeight
 # ShapelessRecipes
-public net.minecraft.item.crafting.ShapelessRecipes.field_77579_b #recipeItems
+public net.minecraft.item.crafting.ShapelessRecipes field_77579_b #recipeItems
 # GuiContainer
 #protected awy.a(Lwe;)V #MD:GuiContainer/func_74192_a #drawSlotInventory
 # ContainerPlayer
@@ -116,7 +111,7 @@ public net.minecraft.item.crafting.ShapelessRecipes.field_77579_b #recipeItems
 #protected anf.n(Labw;III)V #MD:BlockButton/func_82535_o #checkActivation
 #protected-f anf.a #FD:BlockButton/field_82537_a #sensible
 # BiomeDecorator
-public net.minecraft.world.biome.BiomeDecorator.*
+public net.minecraft.world.biome.BiomeDecorator *
 # CreativeTabs
 #public-f ww.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final
 # Packet
@@ -147,8 +142,8 @@ public net.minecraft.world.biome.BiomeDecorator.*
 # BlockFluid
 #protected apc.a #FD:BlockFluid/field_94425_a #theIcon
 # GuiIngame
-protected net.minecraft.client.gui.GuiIngame.*
+protected net.minecraft.client.gui.GuiIngame *
-protected net.minecraft.client.gui.GuiIngame.*()
+protected net.minecraft.client.gui.GuiIngame *()
 # ItemStack
 #default ye.f #FD:ItemStack/field_77991_e # make default access for itemDamage
 # GuiSlot
@@ -159,4 +154,4 @@ protected net.minecraft.client.gui.GuiIngame.*()
 #public air.b(Ljava/lang/Class;Ljava/lang/String;)V #MD:MapGenStructureIO/func_143034_b #registerStart
 #public air.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:MapGenStructureIO/func_143031_a #registerPiece
 # Stronghold
-public net.minecraft.world.gen.structure.StructureStrongholdPieces$Stronghold
+public net.minecraft.world.gen.structure.StructureStrongholdPieces$Stronghold # This doesn't work until I figure out how to apply ATs in MCInjector