tagged 1.2.2

2026-11-14 09:05:17 +00:00 · 2011-12-13 19:45:31 +00:00
48 changed files with 703 additions and 2466 deletions
@@ -1,25 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry including="*.java" kind="src" path="start"/>
 	<classpathentry kind="src" path="forge_common"/>
 	<classpathentry kind="src" path="minecraft"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="../../jars/bin/jinput.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="forge_client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="../../jars/bin/lwjgl.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="forge_client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="../../jars/bin/lwjgl_util.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="forge_client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="lib" path="../../jars/bin/jinput.jar"/>
+	<classpathentry kind="lib" path="../../jars/bin/lwjgl.jar"/>
+	<classpathentry kind="lib" path="../../jars/bin/lwjgl_util.jar"/>
 	<classpathentry kind="lib" path="../../jars/bin/minecraft.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -20,64 +20,10 @@
 			<type>2</type>
 			<locationURI>PARENT-1-PROJECT_LOC/forge_common</locationURI>
 		</link>
-		<link>
-			<name>jars</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/jars</locationURI>
-		</link>
 		<link>
 			<name>minecraft</name>
 			<type>2</type>
 			<locationURI>PARENT-1-WORKSPACE_LOC/src_work/minecraft</locationURI>
 		</link>
-		<link>
-			<name>start</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/conf/patches</locationURI>
-		</link>
 	</linkedResources>
-	<filteredResources>
-		<filter>
-			<id>1324024223159</id>
-			<name>jars</name>
-			<type>9</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-bin</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1324024223163</id>
-			<name>jars</name>
-			<type>6</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1324022795404</id>
-			<name>start</name>
-			<type>5</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*.java</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1324024144075</id>
-			<name>jars/bin</name>
-			<type>5</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*.jar</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-	<variableList>
-		<variable>
-			<name>MCP_LOC</name>
-			<value>$%7BPARENT-1-WORKSPACE_LOC%7D</value>
-		</variable>
-	</variableList>
 </projectDescription>
@@ -30,16 +30,7 @@ public class ForgeHooksClient {
 		return false;
 	}

-	public static void onRenderWorldLast(RenderGlobal rg, float f) {
-		for (IRenderWorldLastHandler handler : renderWorldLastHandlers) {
-			handler.onRenderWorldLast(rg,f);
-		}
-	}
-
-	static LinkedList<IHighlightHandler> highlightHandlers =
-		new LinkedList<IHighlightHandler>();
-	static LinkedList<IRenderWorldLastHandler> renderWorldLastHandlers =
-		new LinkedList<IRenderWorldLastHandler>();
+	static LinkedList<IHighlightHandler> highlightHandlers = new LinkedList<IHighlightHandler>();

 	public static boolean canRenderInPass(Block block, int pass) {
 		if(block instanceof IMultipassRender) {
@@ -50,54 +41,25 @@ public class ForgeHooksClient {
 		return false;
 	}

-	private static class TesKey implements Comparable<TesKey> {
-		public TesKey(int t, int s) { tex=t; sub=s; }
-		public int compareTo(TesKey key) {
-			if(sub==key.sub) return tex-key.tex;
-			return sub-key.sub;
-		}
-		public boolean equals(Object obj) {
-			return compareTo((TesKey)obj)==0;
-		}
-		public int hashCode() {
-			int c1=Integer.valueOf(tex).hashCode();
-			int c2=Integer.valueOf(sub).hashCode();
-			return c1+31*c2;
-		}
-		public int tex, sub;
-	}
-
-	static HashMap<TesKey,Tessellator> tessellators=
-		new HashMap<TesKey,Tessellator>();
-	static HashMap<String,Integer> textures=new HashMap<String,Integer>();
+	static HashMap tessellators=new HashMap();
+	static HashMap textures=new HashMap();
 	static boolean inWorld=false;
-	static TreeSet<TesKey> renderTextures=new TreeSet<TesKey>();
+	static HashSet renderTextureTest=new HashSet();
+	static ArrayList<List> renderTextureList=new ArrayList();
 	static Tessellator defaultTessellator=null;
-	static HashMap<TesKey,IRenderContextHandler> renderHandlers=new
-		HashMap<TesKey,IRenderContextHandler>();
-
-	protected static void registerRenderContextHandler(String tex, int sub,
-			IRenderContextHandler handler) {
-		Integer n;
-		n=textures.get(tex);
-		if(n==null) {
-			n=ModLoader.getMinecraftInstance().renderEngine
-				.getTexture(tex);
-			textures.put(tex,n);
-		}
-		renderHandlers.put(new TesKey(n,sub),handler);
-	}

 	protected static void bindTessellator(int tex, int sub) {
-		TesKey key=new TesKey(tex,sub);
+		List key=Arrays.asList(tex,sub);
 		Tessellator t;
-		t=tessellators.get(key);
-		if(t==null) {
+		if(!tessellators.containsKey(key)) {
 			t=new Tessellator();
 			tessellators.put(key,t);
+		} else {
+			t=(Tessellator)tessellators.get(key);
 		}
-		if(inWorld && !renderTextures.contains(key)) {
-			renderTextures.add(key);
+		if(inWorld && !renderTextureTest.contains(key)) {
+			renderTextureTest.add(key);
+			renderTextureList.add(key);
 			t.startDrawingQuads();
 			t.setTranslationD(defaultTessellator.xOffset,
 				defaultTessellator.yOffset,
@@ -106,30 +68,22 @@ public class ForgeHooksClient {
 		Tessellator.instance=t;
 	}

-	static IRenderContextHandler unbindContext=null;
 	protected static void bindTexture(String name, int sub) {
-		Integer n;
-		n=textures.get(name);
-		if(n==null) {
+		int n;
+		if(!textures.containsKey(name)) {
 			n=ModLoader.getMinecraftInstance().renderEngine
 				.getTexture(name);
 			textures.put(name,n);
+		} else {
+			n=(Integer)textures.get(name);
 		}
 		if(!inWorld) {
-			if(unbindContext!=null) {
-				unbindContext.afterRenderContext();
-				unbindContext=null;
-			}
 			if(Tessellator.instance.isDrawing) {
 				int mode=Tessellator.instance.drawMode;
 				Tessellator.instance.draw();
 				Tessellator.instance.startDrawing(mode);
 			}
 			GL11.glBindTexture(3553 /* GL_TEXTURE_2D */,n);
-			unbindContext=renderHandlers.get(new TesKey(n,sub));
-			if(unbindContext!=null) {
-				unbindContext.beforeRenderContext();
-			}
 			return;
 		}
 		bindTessellator(n,sub);
@@ -142,10 +96,6 @@ public class ForgeHooksClient {
 			if(Tessellator.instance.isDrawing) {
 				int mode=Tessellator.instance.drawMode;
 				Tessellator.instance.draw();
-				if(unbindContext!=null) {
-					unbindContext.afterRenderContext();
-					unbindContext=null;
-				}
 				Tessellator.instance.startDrawing(mode);
 			}
 			GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
@@ -163,31 +113,25 @@ public class ForgeHooksClient {
 		GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
 			.getMinecraftInstance().renderEngine
 			.getTexture("/terrain.png"));
-		renderTextures.clear();
+		renderTextureTest.clear();
+		renderTextureList.clear();
 		inWorld=true;
 	}

 	public static void afterRenderPass(int pass) {
 		renderPass=-1;
 		inWorld=false;
-		for(TesKey tk : renderTextures) {
-			IRenderContextHandler irch=renderHandlers.get(tk);
-			GL11.glBindTexture(GL11.GL_TEXTURE_2D,tk.tex);
-			Tessellator t=tessellators.get(tk);
-			if(irch==null) {
-				t.draw();
-			} else {
-				Tessellator.instance=t;
-				irch.beforeRenderContext();
-				t.draw();
-				irch.afterRenderContext();
-			}
+		for(List l : renderTextureList) {
+			// TODO: call appropriate client hooks
+			Integer[] tn=(Integer[])l.toArray();
+			GL11.glBindTexture(GL11.GL_TEXTURE_2D,tn[0]);
+			Tessellator t=(Tessellator)tessellators.get(l);
+			t.draw();
 		}
 		GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
 			.getMinecraftInstance().renderEngine
 			.getTexture("/terrain.png"));
 		Tessellator.renderingWorldRenderer=false;
-		Tessellator.instance=defaultTessellator;
 	}

 	public static void beforeBlockRender(Block block,
@@ -227,7 +171,7 @@ public class ForgeHooksClient {
 			return def;
 		}
 	}
-
+	
 	public static void renderCustomItem(ICustomItemRenderer customRenderer, RenderBlocks renderBlocks,int itemID, int meta, float f) {
 		Tessellator tessellator = Tessellator.instance;
 		if (renderBlocks.useInventoryTint) {
@@ -1,16 +0,0 @@
-/*
- * This software is provided under the terms of the Minecraft Forge Public 
- * License v1.0.
- */
-package net.minecraft.src.forge;
-
-public interface IRenderContextHandler {
-	/** Run before the specified rendering context.
-	 */
-	public void beforeRenderContext();
-
-	/** Run after the specified rendering context.
-	 */
-	public void afterRenderContext();
-}
-
@@ -1,17 +0,0 @@
-/*
- * This software is provided under the terms of the Minecraft Forge Public 
- * License v1.0.
- */
-package net.minecraft.src.forge;
-
-import net.minecraft.src.RenderGlobal;
-
-public interface IRenderWorldLastHandler {
-	/** Called after rendering all the 3D data of the world.  This is
-	 * called before the user's tool is rendered, but otherwise after all
-	 * 3D content.  It is called twice in anaglyph mode.  This is intended
-	 * for rendering visual effect overlays into the world.
-	 */
-	void onRenderWorldLast(RenderGlobal rg, float f);
-}
-
@@ -18,20 +18,6 @@ public class MinecraftForgeClient {
 		ForgeHooksClient.highlightHandlers.add(handler);
 	}

-	/** Register a new render context handler.  A render context is a block
-	 * of rendering performed with similar OpenGL modes, for example,
-	 * texture name.
-	 * @param tex The name of the texture for this render context.
-	 * @param sub The subid of this render context.  0 is the default pass
-	 * for normal rendering, higher subids render later.  All subids of 0
-	 * will render before all subids of 1, etc.
-	 * @param handler The handler to register.
-	 */
-	public static void registerRenderContextHandler(String tex, int sub,
-			IRenderContextHandler handler) {
-		ForgeHooksClient.registerRenderContextHandler(tex,sub,handler);
-	}
-
 	/** Bind a texture.  This is used to bind a texture file when
 	 * performing your own rendering, rather than using ITextureProvider.
 	 *
@@ -1,51 +0,0 @@
-package net.minecraft.src.forge;
-
-import java.util.Random;
-import net.minecraft.src.ItemStack;
-
-/**
- * 
- * Used to hold a list of all items that can be spawned in a world dungeon
- *
- */
-public class DungeonLoot
-{
-	private ItemStack item;
-	private int minCount = 1;
-	private int maxCount = 1;
-	
-	/**
-	 * @param item A item stack
-	 * @param min Minimum stack size when randomly generating
-	 * @param max Maximum stack size when randomly generating
-	 */
-	public DungeonLoot(ItemStack item, int min, int max)
-	{
-		this.item = item;
-		minCount = min;
-		maxCount = max;
-	}
-	
-	/**
-	 * Grabs a ItemStack ready to be added to the dungeon chest,
-	 * the stack size will be between minCount and maxCount
-	 * @param rand World gen random number generator
-	 * @return The ItemStack to be added to the chest
-	 */
-	public ItemStack generateStack(Random rand)
-	{
-		ItemStack ret = this.item.copy();
-		ret.stackSize = minCount + (rand.nextInt(maxCount - minCount + 1));
-		return ret;    		
-	}
-
-	public boolean equals(ItemStack item, int min, int max)
-	{
-		return (min == minCount && max == maxCount && item.isItemEqual(this.item));
-	}
-	
-	public boolean equals(ItemStack item)
-	{
-		return item.isItemEqual(this.item);
-	}
-}
@@ -179,99 +179,72 @@ public class ForgeHooks {
 	}

 	public static boolean isToolEffective(ItemStack ist, Block bl, int md) {
-		List tc = (List)toolClasses.get(ist.itemID);
-		if (tc == null) 
-		{
-			return false;
-		}
-		Object[] ta = tc.toArray();
-		String cls = (String)ta[0];
-		return toolEffectiveness.contains(Arrays.asList(bl.blockID, md, cls));
+		List tc=(List)toolClasses.get(ist.itemID);
+		if(tc==null) return false;
+		Object[] ta=tc.toArray();
+		String cls=(String)ta[0];
+
+		return toolEffectiveness.contains(Arrays.asList(
+			bl.blockID,md,cls));
 	}

 	static void initTools() {
-		if(toolInit) 
-		{
-			return;
-		}
-		toolInit = true;
+		if(toolInit) return;
+		toolInit=true;

-		MinecraftForge.setToolClass(Item.pickaxeWood,    "pickaxe", 0);
-		MinecraftForge.setToolClass(Item.pickaxeStone,   "pickaxe", 1);
-		MinecraftForge.setToolClass(Item.pickaxeSteel,   "pickaxe", 2);
-		MinecraftForge.setToolClass(Item.pickaxeGold,    "pickaxe", 0);
-		MinecraftForge.setToolClass(Item.pickaxeDiamond, "pickaxe", 3);
+		MinecraftForge.setToolClass(Item.pickaxeWood,"pickaxe",0);
+		MinecraftForge.setToolClass(Item.pickaxeStone,"pickaxe",1);
+		MinecraftForge.setToolClass(Item.pickaxeSteel,"pickaxe",2);
+		MinecraftForge.setToolClass(Item.pickaxeGold,"pickaxe",0);
+		MinecraftForge.setToolClass(Item.pickaxeDiamond,"pickaxe",3);

-		MinecraftForge.setToolClass(Item.axeWood,    "axe", 0);
-		MinecraftForge.setToolClass(Item.axeStone,   "axe", 1);
-		MinecraftForge.setToolClass(Item.axeSteel,   "axe", 2);
-		MinecraftForge.setToolClass(Item.axeGold,    "axe", 0);
-		MinecraftForge.setToolClass(Item.axeDiamond, "axe", 3);
+		MinecraftForge.setToolClass(Item.axeWood,"axe",0);
+		MinecraftForge.setToolClass(Item.axeStone,"axe",1);
+		MinecraftForge.setToolClass(Item.axeSteel,"axe",2);
+		MinecraftForge.setToolClass(Item.axeGold,"axe",0);
+		MinecraftForge.setToolClass(Item.axeDiamond,"axe",3);

-		MinecraftForge.setToolClass(Item.shovelWood,    "shovel", 0);
-		MinecraftForge.setToolClass(Item.shovelStone,   "shovel", 1);
-		MinecraftForge.setToolClass(Item.shovelSteel,   "shovel", 2);
-		MinecraftForge.setToolClass(Item.shovelGold,    "shovel", 0);
-		MinecraftForge.setToolClass(Item.shovelDiamond, "shovel", 3);
+		MinecraftForge.setToolClass(Item.shovelWood,"shovel",0);
+		MinecraftForge.setToolClass(Item.shovelStone,"shovel",1);
+		MinecraftForge.setToolClass(Item.shovelSteel,"shovel",2);
+		MinecraftForge.setToolClass(Item.shovelGold,"shovel",0);
+		MinecraftForge.setToolClass(Item.shovelDiamond,"shovel",3);

-		MinecraftForge.setBlockHarvestLevel(Block.obsidian,     "pickaxe", 3);
-		MinecraftForge.setBlockHarvestLevel(Block.oreDiamond,   "pickaxe", 2);
-		MinecraftForge.setBlockHarvestLevel(Block.blockDiamond, "pickaxe", 2);
-		MinecraftForge.setBlockHarvestLevel(Block.oreGold,      "pickaxe", 2);
-		MinecraftForge.setBlockHarvestLevel(Block.blockGold,    "pickaxe", 2);
-		MinecraftForge.setBlockHarvestLevel(Block.oreIron,      "pickaxe", 1);
-		MinecraftForge.setBlockHarvestLevel(Block.blockSteel,   "pickaxe", 1);
-		MinecraftForge.setBlockHarvestLevel(Block.oreLapis,     "pickaxe", 1);
-		MinecraftForge.setBlockHarvestLevel(Block.blockLapis,   "pickaxe", 1);
-		MinecraftForge.setBlockHarvestLevel(Block.oreRedstone,  "pickaxe", 2);
-		MinecraftForge.setBlockHarvestLevel(Block.oreRedstoneGlowing, "pickaxe", 2);
-		MinecraftForge.removeBlockEffectiveness(Block.oreRedstone, "pickaxe");
-		MinecraftForge.removeBlockEffectiveness(Block.obsidian,    "pickaxe");
-		MinecraftForge.removeBlockEffectiveness(Block.oreRedstoneGlowing, "pickaxe");
+		MinecraftForge.setBlockHarvestLevel(Block.obsidian,"pickaxe",3);
+		MinecraftForge.setBlockHarvestLevel(Block.oreDiamond,"pickaxe",2);
+		MinecraftForge.setBlockHarvestLevel(Block.blockDiamond,"pickaxe",2);
+		MinecraftForge.setBlockHarvestLevel(Block.oreGold,"pickaxe",2);
+		MinecraftForge.setBlockHarvestLevel(Block.blockGold,"pickaxe",2);
+		MinecraftForge.setBlockHarvestLevel(Block.oreIron,"pickaxe",1);
+		MinecraftForge.setBlockHarvestLevel(Block.blockSteel,"pickaxe",1);
+		MinecraftForge.setBlockHarvestLevel(Block.oreLapis,"pickaxe",1);
+		MinecraftForge.setBlockHarvestLevel(Block.blockLapis,"pickaxe",1);
+		MinecraftForge.setBlockHarvestLevel(Block.oreRedstone,"pickaxe",2);
+		MinecraftForge.setBlockHarvestLevel(Block.oreRedstoneGlowing,"pickaxe",2);
+		MinecraftForge.removeBlockEffectiveness(Block.oreRedstone,"pickaxe");
+		MinecraftForge.removeBlockEffectiveness(Block.oreRedstoneGlowing,"pickaxe");
+		MinecraftForge.removeBlockEffectiveness(Block.obsidian,"pickaxe");

-		Block[] pickeff = {
+		Block[] pickeff ={
 			Block.cobblestone, Block.stairDouble,
-			Block.stairSingle, Block.stone, 
-			Block.sandStone,   Block.cobblestoneMossy,
-			Block.oreCoal,     Block.ice, 
-			Block.netherrack,  Block.oreLapis,
+			Block.stairSingle, Block.stone, Block.sandStone,
+			Block.cobblestoneMossy,
+			Block.oreCoal,
+			Block.ice, Block.netherrack, Block.oreLapis,
 			Block.blockLapis
-		};
-		for (Block bl : pickeff) 
-		{
-			MinecraftForge.setBlockHarvestLevel(bl, "pickaxe", 0);
-		}
-		
-		Block[] spadeEff = {
-			Block.grass,     Block.dirt, 
-			Block.sand,      Block.gravel, 
-			Block.snow,      Block.blockSnow, 
-			Block.blockClay, Block.tilledField, 
-			Block.slowSand,  Block.mycelium
-		};
-		for (Block bl : spadeEff) 
-		{
-			MinecraftForge.setBlockHarvestLevel(bl, "shovel", 0);
-		}
-		
-		Block[] axeEff = {
-			Block.planks,      Block.bookShelf, 
-			Block.wood,        Block.chest, 
-			Block.stairDouble, Block.stairSingle, 
-			Block.pumpkin,     Block.pumpkinLantern
-		};
-		for (Block bl : axeEff) 
-		{
-			MinecraftForge.setBlockHarvestLevel(bl, "axe", 0);
+				};
+		for(Block bl : pickeff) {
+			MinecraftForge.setBlockHarvestLevel(bl,"pickaxe",0);
 		}

+		// TODO: add other tool tables.
 	}

 	public static final int majorVersion=1;
 	public static final int minorVersion=2;
-	public static final int revisionVersion=4;
+	public static final int revisionVersion=2;
 	static {
-		System.out.printf("MinecraftForge V%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion);
+		System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion);
 	}

 	static boolean toolInit=false;
@@ -14,9 +14,6 @@ import net.minecraft.src.World;
 * This interface is to be implemented by item classes. It will allow an item
 * to perform a use before the block is activated.
 *
- * @deprecated This interface is no longer used, the function has been moved to
- * Item.  The functionality remains, it simply does not require this interface
- * any further.
 * @see Item
 */
 public interface IUseItemFirst {
@@ -365,246 +365,4 @@ public class MinecraftForge {
 	    }
    }

-	private static int dungeonLootAttempts = 8;
-	private static ArrayList<ObjectPair<Float, String>> dungeonMobs = new ArrayList<ObjectPair<Float, String>>();
-	private static ArrayList<ObjectPair<Float, DungeonLoot>> dungeonLoot = new ArrayList<ObjectPair<Float, DungeonLoot>>();
-    /**
-     * Set the number of item stacks that will be attempted to be added to each Dungeon chest.
-     * Note: Due to random number generation, you will not always get this amount per chest.
-     * @param number The maximum number of item stacks to add to a chest.
-     */
-    public static void setDungeonLootTries(int number)
-    {
-    	dungeonLootAttempts = number;
-    }
-    
-    /**
-     * @return The max number of item stacks found in each dungeon chest.
-     */
-    public static int getDungeonLootTries()
-    {
-    	return dungeonLootAttempts;
-    }
-    
-    /**
-     * Adds a mob to the possible list of creatures the spawner will create.
-     * If the mob is already in the spawn list, the rarity will be added to the existing one,
-     * causing the mob to be more common.
-     *  
-     * @param name The name of the monster, use the same name used when registering the entity.
-     * @param rarity The rarity of selecting this mob over others. Must be greater then 0.
-     *        Vanilla Minecraft has the following mobs:
-     *        Spider   1
-     *        Skeleton 1
-     *        Zombie   2
-     *        Meaning, Zombies are twice as common as spiders or skeletons.
-     * @return The new rarity of the monster,         
-     */
-    public static float addDungeonMob(String name, float rarity)
-    {
-    	if (rarity <= 0)
-    	{
-    		throw new IllegalArgumentException("Rarity must be greater then zero");
-    	}
-    	
-    	for(ObjectPair<Float, String> mob : dungeonMobs)
-    	{
-    		if (name.equals(mob.getValue2()))
-    		{
-    			mob.setValue1(mob.getValue1() + rarity);
-    			return mob.getValue1();
-    		}
-    	}
-
-    	dungeonMobs.add(new ObjectPair<Float, String>(rarity, name));
-    	return rarity;
-    }
-    
-    /**
-     * Will completely remove a Mob from the dungeon spawn list.
-     * 
-     * @param name The name of the mob to remove
-     * @return The rarity of the removed mob, prior to being removed.
-     */
-    public static float removeDungeonMob(String name)
-    {
-    	for (ObjectPair<Float, String> mob : dungeonMobs)
-    	{
-    		if (name.equals(name))
-    		{
-    			dungeonMobs.remove(mob);
-    			return mob.getValue1();
-    		}
-    	}
-    	return 0;
-    }
-    
-    /**
-     * Gets a random mob name from the list.
-     * @param rand World generation random number generator
-     * @return The mob name
-     */
-    public static String getRandomDungeonMob(Random rand)
-    {
-    	float maxRarity = 0f;
-    	for (ObjectPair<Float, String> mob : dungeonMobs)
-    	{
-    		maxRarity += mob.getValue1();
-    	}
-    	
-    	float targetRarity = rand.nextFloat() * maxRarity;
-    	for (ObjectPair<Float, String> mob : dungeonMobs)
-    	{
-    		if (targetRarity < mob.getValue1()) 
-    		{
-    			return mob.getValue2();
-    		}
-    		targetRarity -= mob.getValue1();
-    	}
-    	
-    	return "";
-    }
-    
-    /**
-     * Adds a item stack to the dungeon loot list with a stack size
-     * of 1.
-     * 
-     * @param item The ItemStack to be added to the loot list
-     * @param rarity The relative chance that this item will spawn, Vanilla has 
-     * 			most of its items set to 1. Like the saddle, bread, silk, wheat, etc..
-     * 			Rarer items are set to lower values, EXA: Golden Apple 0.01
-     */
-    public static void addDungeonLoot(ItemStack item, float rarity)
-    {
-    	addDungeonLoot(item, rarity, 1, 1);
-    }
-    
-    /**
-     * Adds a item stack, with a range of sizes, to the dungeon loot list.
-     * If a stack matching the same item, and size range, is already in the list
-     * the rarities will be added together making the item more common.
-     * 
-     * @param item The ItemStack to be added to the loot list
-     * @param rarity The relative chance that this item will spawn, Vanilla has 
-     * 			most of its items set to 1. Like the saddle, bread, silk, wheat, etc..
-     * 			Rarer items are set to lower values, EXA: Golden Apple 0.01
-     * @param minCount When this item does generate, the minimum number that is in the stack
-     * @param maxCount When this item does generate, the maximum number that can bein the stack
-     * @return The new rarity of the loot. 
-     */
-    public static float addDungeonLoot(ItemStack item, float rarity, int minCount, int maxCount)
-    {
-    	for (ObjectPair<Float, DungeonLoot> loot : dungeonLoot)
-    	{
-    		if (loot.getValue2().equals(item, minCount, maxCount))
-    		{
-    			loot.setValue1(loot.getValue1() + rarity);
-    			return loot.getValue1();
-    		}
-    	}
-    	
-    	dungeonLoot.add(new ObjectPair<Float, DungeonLoot>(rarity, new DungeonLoot(item, minCount, maxCount)));
-    	return rarity;    	
-    }
-    /**
-     * Removes a item stack from the dungeon loot list, this will remove all items
-     * as long as the item stack matches, it will not care about matching the stack
-     * size ranges perfectly.
-     * 
-     * @param item The item stack to remove
-     * @return The total rarity of all items removed
-     */
-    public static float removeDungeonLoot(ItemStack item)
-    {
-    	return removeDungeonLoot(item, -1, 0);
-    }
-    
-    /**
-     * Removes a item stack from the dungeon loot list. If 'minCount' parameter 
-     * is greater then 0, it will only remove loot items that have the same exact 
-     * stack size range as passed in by parameters.
-     * 
-     * @param item The item stack to remove
-     * @param minCount The minimum count for the match check, if less then 0, 
-     * 			the size check is skipped
-     * @param maxCount The max count used in match check when 'minCount' is >= 0
-     * @return The total rarity of all items removed
-     */
-    public static float removeDungeonLoot(ItemStack item, int minCount, int maxCount)
-    {
-    	float rarity = 0;
-    	ArrayList<ObjectPair<Float, DungeonLoot>> lootTmp = (ArrayList<ObjectPair<Float, DungeonLoot>>)dungeonLoot.clone();
-    	if (minCount < 0)
-    	{
-	    	for (ObjectPair<Float, DungeonLoot> loot : lootTmp)
-	    	{
-	    		if (loot.getValue2().equals(item))
-	    		{
-	    			dungeonLoot.remove(loot);
-	    			rarity += loot.getValue1();
-	    		}
-	    	}
-    	}
-    	else
-    	{
-	    	for (ObjectPair<Float, DungeonLoot> loot : lootTmp)
-	    	{
-	    		if (loot.getValue2().equals(item, minCount, maxCount))
-	    		{
-	    			dungeonLoot.remove(loot);
-	    			rarity += loot.getValue1();
-	    		}
-	    	}
-    	}
-    	
-    	return rarity;  
-    }
-    
-
-    /**
-     * Gets a random item stack to place in a dungeon chest during world generation
-     * @param rand World generation random number generator
-     * @return The item stack
-     */
-    public static ItemStack getRandomDungeonLoot(Random rand)
-    {
-    	float maxRarity = 0f;
-    	for (ObjectPair<Float, DungeonLoot> loot : dungeonLoot)
-    	{
-    		maxRarity += loot.getValue1();
-    	}
-    	
-    	float targetRarity = rand.nextFloat() * maxRarity;
-    	for (ObjectPair<Float, DungeonLoot> loot : dungeonLoot)
-    	{
-    		if (targetRarity < loot.getValue1()) 
-    		{
-    			return loot.getValue2().generateStack(rand);
-    		}
-    		targetRarity -= loot.getValue1();
-    	}
-    	
-    	return null;
-    }
-        
-    static 
-    {
-    	addDungeonMob("Skeleton", 1.0f);
-    	addDungeonMob("Zombie",   2.0f);
-    	addDungeonMob("Spider",   1.0f);
-    	
-    	addDungeonLoot(new ItemStack(Item.saddle),          1.00f      );
-    	addDungeonLoot(new ItemStack(Item.ingotIron),       1.00f, 1, 4);
-    	addDungeonLoot(new ItemStack(Item.bread),           1.00f      );
-    	addDungeonLoot(new ItemStack(Item.wheat),           1.00f, 1, 4);
-    	addDungeonLoot(new ItemStack(Item.gunpowder),       1.00f, 1, 4);
-    	addDungeonLoot(new ItemStack(Item.silk),            1.00f, 1, 4);
-    	addDungeonLoot(new ItemStack(Item.bucketEmpty),     1.00f      );
-    	addDungeonLoot(new ItemStack(Item.appleGold),       0.01f      );
-    	addDungeonLoot(new ItemStack(Item.redstone),        0.50f, 1, 4);
-    	addDungeonLoot(new ItemStack(Item.record13),        0.05f      );
-    	addDungeonLoot(new ItemStack(Item.recordCat),       0.05f      );
-    	addDungeonLoot(new ItemStack(Item.dyePowder, 1, 3), 1.00f      );
-    }
-
 }
@@ -1,40 +0,0 @@
-package net.minecraft.src.forge;
-
-/**
- * A class that holds two generic values, can be used as a Key/Value pair, 
- * but is used in forge as a frequency/object pair.
- *
- * @param <T1> The type of the first value
- * @param <T2> The Type of the second value
- */
-public class ObjectPair<T1, T2> 
-{
-	private T1 object1;
-	private T2 object2;
-	
-	public ObjectPair(T1 obj1, T2 obj2)
-	{
-		this.object1 = obj1;
-		this.object2 = obj2;
-	}
-	
-	public T1 getValue1()
-	{
-		return this.object1;
-	}
-	
-	public T2 getValue2()
-	{
-		return this.object2;
-	}
-	
-	public void setValue1(T1 value)
-	{
-		object1 = value;
-	}
-	
-	public void setValue2(T2 value)
-	{
-		object2 = value;
-	}
-}
@@ -130,7 +130,7 @@
         }
 
     }
-@@ -805,6 +848,200 @@
+@@ -805,6 +848,107 @@
         return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F;
     }
 
@@ -234,99 +234,6 @@
 +    public void addCreativeItems(ArrayList itemList)
 +    {    	
 +    }
-+    
-+    protected static int blockFireSpreadSpeed[] = new int[256];
-+    protected static int blockFlammability[] = new int[256];
-+    
-+    /**
-+     * Chance that fire will spread and consume this block.
-+     * 300 being a 100% chance, 0, being a 0% chance.
-+     * 
-+     * @param world The current world
-+     * @param x The blocks X position
-+     * @param y The blocks Y position
-+     * @param z The blocks Z position
-+     * @param metadata The blocks current metadata
-+     * @param face The face that the fire is coming from
-+     * @return A number ranging from 0 to 300 relating used to determine if the block will be consumed by fire
-+     */
-+    public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, int face)
-+    {
-+    	return blockFlammability[blockID];
-+    }
-+    
-+    /**
-+     * Called when fire is updating, checks if a block face can catch fire.
-+     * 
-+     * 
-+     * @param world The current world
-+     * @param x The blocks X position
-+     * @param y The blocks Y position
-+     * @param z The blocks Z position
-+     * @param metadata The blocks current metadata
-+     * @param face The face that the fire is coming from
-+     * @return True if the face can be on fire, false otherwise.
-+     */
-+    public boolean isFlammable(IBlockAccess world, int x, int y, int z, int metadata, int face)
-+    {
-+    	return getFlammability(world, x, y, z, metadata, face) > 0;
-+    }
-+    
-+    /**
-+     * Called when fire is updating on a neighbor block.
-+     * The higher the number returned, the faster fire will spread around this block.
-+     * 
-+     * @param world The current world
-+     * @param x The blocks X position
-+     * @param y The blocks Y position
-+     * @param z The blocks Z position
-+     * @param metadata The blocks current metadata
-+     * @param face The face that the fire is coming from
-+     * @return A number that is used to determine the speed of fire growth around the block
-+     */
-+    public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, int face)
-+    {
-+    	return blockFireSpreadSpeed[blockID];
-+    }
-+    
-+    /**
-+     * Currently only called by fire when it is on top of this block.
-+     * Returning true will prevent the fire from naturally dying during updating.
-+     * Also prevents firing from dying from rain.
-+     * 
-+     * @param world The current world
-+     * @param x The blocks X position
-+     * @param y The blocks Y position
-+     * @param z The blocks Z position
-+     * @param metadata The blocks current metadata
-+     * @param face The face that the fire is coming from
-+     * @return 
-+     */
-+    public boolean isFireSource(World world, int x, int y, int z, int metadata, int face)
-+    {
-+    	if (blockID == Block.netherrack.blockID && face == 0)
-+    	{
-+    		return true;
-+    	}
-+    	if ((world.worldProvider instanceof WorldProviderEnd) && blockID == Block.bedrock.blockID && face == 0)
-+    	{
-+    		return true;
-+    	}
-+    	return false;
-+    }
-+
-+    /**
-+     * Called by BlockFire to setup the burn values of vanilla blocks.
-+     * @param id The block id
-+     * @param encouragement How much the block encourages fire to spread
-+     * @param flammability how easy a block is to catch fire
-+     */
-+    public static void setBurnProperties(int id, int encouragement, int flammability)
-+    {
-+    	blockFireSpreadSpeed[id] = encouragement;
-+    	blockFlammability[id] = flammability;
-+    }
-+
 +
     static Class _mthclass$(String s)
     {
@@ -27,7 +27,7 @@
 -        int j1 = 3 + i1;
 -        for(int k1 = 0; k1 < j1; k1++)
 +            
-+        for(int n = 0; n < 3+fortune; n++) 
+        for(int n = 0; n < 3; n++) 
         {
 -            if(world.rand.nextInt(15) <= l)
 +            if (world.rand.nextInt(15) <= md)
@@ -38,7 +38,7 @@
 -                float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
 -                EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
 -                entityitem.delayBeforeCanPickup = 10;
-                world.spawnEntityInWorld(entityitem);
+-                world.entityJoinedWorld(entityitem);
 +                tr.add(new ItemStack(Item.seeds));
             }
         }
@@ -1,286 +0,0 @@
--- ../src_base/minecraft/net/minecraft/src/BlockFire.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockFire.java	0000-00-00 00:00:00.000000000 -0000
-@@ -14,14 +14,14 @@
- public class BlockFire extends Block
- {
- 
-    private int chanceToEncourageFire[];
-    private int abilityToCatchFire[];
-
-+	private int chanceToEncourageFire[]; 
-+	private int abilityToCatchFire[];
-+	
-     protected BlockFire(int i, int j)
-     {
-         super(i, j, Material.fire);
-        chanceToEncourageFire = new int[256];
-        abilityToCatchFire = new int[256];
-+        chanceToEncourageFire = Block.blockFireSpreadSpeed;
-+        abilityToCatchFire = Block.blockFlammability;
-         setTickOnLoad(true);
-     }
- 
-@@ -38,11 +38,10 @@
-         setBurnRate(Block.cloth.blockID, 30, 60);
-         setBurnRate(Block.vine.blockID, 15, 100);
-     }
-
-+    
-     private void setBurnRate(int i, int j, int k)
-     {
-        chanceToEncourageFire[i] = j;
-        abilityToCatchFire[i] = k;
-+    	Block.setBurnProperties(i, j, k);
-     }
- 
-     public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int i, int j, int k)
-@@ -77,11 +76,9 @@
- 
-     public void updateTick(World world, int i, int j, int k, Random random)
-     {
-        boolean flag = world.getBlockId(i, j - 1, k) == Block.netherrack.blockID;
-        if((world.worldProvider instanceof WorldProviderEnd) && world.getBlockId(i, j - 1, k) == Block.bedrock.blockID)
-        {
-            flag = true;
-        }
-+        Block base = Block.blocksList[world.getBlockId(i,  j - 1, k)];
-+        boolean flag = (base != null && base.isFireSource(world, i, j - 1, k, world.getBlockMetadata(i, j - 1, k), 0));
-+        
-         if(!canPlaceBlockAt(world, i, j, k))
-         {
-             world.setBlockWithNotify(i, j, k, 0);
-@@ -99,23 +96,23 @@
-         world.scheduleBlockUpdate(i, j, k, blockID, tickRate());
-         if(!flag && !func_263_h(world, i, j, k))
-         {
-            if(!world.isBlockNormalCube(i, j - 1, k) || l > 3)
-+            if(!world.isBlockSolidOnSide(i, j - 1, k, 0) || l > 3)
-             {
-                 world.setBlockWithNotify(i, j, k, 0);
-             }
-             return;
-         }
-        if(!flag && !canBlockCatchFire(world, i, j - 1, k) && l == 15 && random.nextInt(4) == 0)
-+        if(!flag && !canBlockCatchFire(world, i, j - 1, k, 0) && l == 15 && random.nextInt(4) == 0)
-         {
-             world.setBlockWithNotify(i, j, k, 0);
-             return;
-         }
-        tryToCatchBlockOnFire(world, i + 1, j, k, 300, random, l);
-        tryToCatchBlockOnFire(world, i - 1, j, k, 300, random, l);
-        tryToCatchBlockOnFire(world, i, j - 1, k, 250, random, l);
-        tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l);
-        tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l);
-        tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l);
-+        tryToCatchBlockOnFire(world, i + 1, j, k, 300, random, l, 4);
-+        tryToCatchBlockOnFire(world, i - 1, j, k, 300, random, l, 5);
-+        tryToCatchBlockOnFire(world, i, j - 1, k, 250, random, l, 0);
-+        tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l, 1);
-+        tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l, 3);
-+        tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l, 2);
-         for(int i1 = i - 1; i1 <= i + 1; i1++)
-         {
-             for(int j1 = k - 1; j1 <= k + 1; j1++)
-@@ -155,9 +152,23 @@
- 
-     }
- 
-+    /*
-+     * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
-+     */
-+    @Deprecated
-     private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1)
-     {
-        int j1 = abilityToCatchFire[world.getBlockId(i, j, k)];
-+    	tryToCatchBlockOnFire(world, i, j, k, l, random, i1, 0);
-+    }
-+    
-+    private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1, int face)
-+    {
-+        Block block = Block.blocksList[world.getBlockId(i, j, k)];
-+        int j1 = 0;
-+        if (block != null) 
-+        {
-+        	j1 = block.getFlammability(world, i, j, k, world.getBlockMetadata(i, j, k), face);
-+        }
-         if(random.nextInt(l) < j1)
-         {
-             boolean flag = world.getBlockId(i, j, k) == Block.tnt.blockID;
-@@ -182,27 +193,27 @@
- 
-     private boolean func_263_h(World world, int i, int j, int k)
-     {
-        if(canBlockCatchFire(world, i + 1, j, k))
-+        if(canBlockCatchFire(world, i + 1, j, k, 4))
-         {
-             return true;
-         }
-        if(canBlockCatchFire(world, i - 1, j, k))
-+        if(canBlockCatchFire(world, i - 1, j, k, 5))
-         {
-             return true;
-         }
-        if(canBlockCatchFire(world, i, j - 1, k))
-+        if(canBlockCatchFire(world, i, j - 1, k, 0))
-         {
-             return true;
-         }
-        if(canBlockCatchFire(world, i, j + 1, k))
-+        if(canBlockCatchFire(world, i, j + 1, k, 1))
-         {
-             return true;
-         }
-        if(canBlockCatchFire(world, i, j, k - 1))
-+        if(canBlockCatchFire(world, i, j, k - 1, 3))
-         {
-             return true;
-         }
-        return canBlockCatchFire(world, i, j, k + 1);
-+        return canBlockCatchFire(world, i, j, k + 1, 2);
-     }
- 
-     private int getChanceOfNeighborsEncouragingFire(World world, int i, int j, int k)
-@@ -213,12 +224,12 @@
-             return 0;
-         } else
-         {
-            l = getChanceToEncourageFire(world, i + 1, j, k, l);
-            l = getChanceToEncourageFire(world, i - 1, j, k, l);
-            l = getChanceToEncourageFire(world, i, j - 1, k, l);
-            l = getChanceToEncourageFire(world, i, j + 1, k, l);
-            l = getChanceToEncourageFire(world, i, j, k - 1, l);
-            l = getChanceToEncourageFire(world, i, j, k + 1, l);
-+            l = getChanceToEncourageFire(world, i + 1, j, k, l, 5);
-+            l = getChanceToEncourageFire(world, i - 1, j, k, l, 4);
-+            l = getChanceToEncourageFire(world, i, j - 1, k, l, 0);
-+            l = getChanceToEncourageFire(world, i, j + 1, k, l, 1);
-+            l = getChanceToEncourageFire(world, i, j, k - 1, l, 3);
-+            l = getChanceToEncourageFire(world, i, j, k + 1, l, 2);
-             return l;
-         }
-     }
-@@ -227,15 +238,43 @@
-     {
-         return false;
-     }
-
-+    
-+    /*
-+     * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
-+     */
-+    @Deprecated
-     public boolean canBlockCatchFire(IBlockAccess iblockaccess, int i, int j, int k)
-     {
-        return chanceToEncourageFire[iblockaccess.getBlockId(i, j, k)] > 0;
-+    	return canBlockCatchFire(iblockaccess, i, j, k, 0);
-     }
- 
-+    public boolean canBlockCatchFire(IBlockAccess world, int i, int j, int k, int face)
-+    {
-+    	Block block = Block.blocksList[world.getBlockId(i, j, k)];
-+    	if (block != null)
-+    	{
-+    		return block.isFlammable(world, i, j, k, world.getBlockMetadata(i, j, k), face);
-+    	}
-+    	return false;
-+    }
-+
-+    /*
-+     * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
-+     */
-+    @Deprecated
-     public int getChanceToEncourageFire(World world, int i, int j, int k, int l)
-     {
-        int i1 = chanceToEncourageFire[world.getBlockId(i, j, k)];
-+    	return getChanceToEncourageFire(world, i, j, k, l, 0);
-+    }
-+    
-+    public int getChanceToEncourageFire(World world, int i, int j, int k, int l, int face)
-+    {
-+    	int i1 = 0;
-+    	Block block = Block.blocksList[world.getBlockId(i, j, k)];
-+    	if (block != null)
-+    	{
-+    		i1 = block.getFireSpreadSpeed(world, i, j, k, world.getBlockMetadata(i, j, k), face);
-+    	}
-         if(i1 > l)
-         {
-             return i1;
-@@ -247,12 +286,12 @@
- 
-     public boolean canPlaceBlockAt(World world, int i, int j, int k)
-     {
-        return world.isBlockNormalCube(i, j - 1, k) || func_263_h(world, i, j, k);
-+        return world.isBlockSolidOnSide(i, j - 1, k, 0) || func_263_h(world, i, j, k);
-     }
- 
-     public void onNeighborBlockChange(World world, int i, int j, int k, int l)
-     {
-        if(!world.isBlockNormalCube(i, j - 1, k) && !func_263_h(world, i, j, k))
-+        if(!world.isBlockSolidOnSide(i, j - 1, k, 0) && !func_263_h(world, i, j, k))
-         {
-             world.setBlockWithNotify(i, j, k, 0);
-             return;
-@@ -268,7 +307,7 @@
-         {
-             return;
-         }
-        if(!world.isBlockNormalCube(i, j - 1, k) && !func_263_h(world, i, j, k))
-+        if(!world.isBlockSolidOnSide(i, j - 1, k, 0) && !func_263_h(world, i, j, k))
-         {
-             world.setBlockWithNotify(i, j, k, 0);
-             return;
-@@ -285,7 +324,7 @@
-         {
-             world.playSoundEffect((float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, "fire.fire", 1.0F + random.nextFloat(), random.nextFloat() * 0.7F + 0.3F);
-         }
-        if(world.isBlockNormalCube(i, j - 1, k) || Block.fire.canBlockCatchFire(world, i, j - 1, k))
-+        if(world.isBlockSolidOnSide(i, j - 1, k, 0) || Block.fire.canBlockCatchFire(world, i, j - 1, k, 0))
-         {
-             for(int l = 0; l < 3; l++)
-             {
-@@ -297,7 +336,7 @@
- 
-         } else
-         {
-            if(Block.fire.canBlockCatchFire(world, i - 1, j, k))
-+            if(Block.fire.canBlockCatchFire(world, i - 1, j, k, 4))
-             {
-                 for(int i1 = 0; i1 < 2; i1++)
-                 {
-@@ -308,7 +347,7 @@
-                 }
- 
-             }
-            if(Block.fire.canBlockCatchFire(world, i + 1, j, k))
-+            if(Block.fire.canBlockCatchFire(world, i + 1, j, k, 5))
-             {
-                 for(int j1 = 0; j1 < 2; j1++)
-                 {
-@@ -319,7 +358,7 @@
-                 }
- 
-             }
-            if(Block.fire.canBlockCatchFire(world, i, j, k - 1))
-+            if(Block.fire.canBlockCatchFire(world, i, j, k - 1, 3))
-             {
-                 for(int k1 = 0; k1 < 2; k1++)
-                 {
-@@ -330,7 +369,7 @@
-                 }
- 
-             }
-            if(Block.fire.canBlockCatchFire(world, i, j, k + 1))
-+            if(Block.fire.canBlockCatchFire(world, i, j, k + 1, 2))
-             {
-                 for(int l1 = 0; l1 < 2; l1++)
-                 {
-@@ -341,7 +380,7 @@
-                 }
- 
-             }
-            if(Block.fire.canBlockCatchFire(world, i, j + 1, k))
-+            if(Block.fire.canBlockCatchFire(world, i, j + 1, k, 1))
-             {
-                 for(int i2 = 0; i2 < 2; i2++)
-                 {
@@ -1,56 +0,0 @@
--- ../src_base/minecraft/net/minecraft/src/BlockNetherStalk.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockNetherStalk.java	0000-00-00 00:00:00.000000000 -0000
-@@ -4,6 +4,7 @@
- 
- package net.minecraft.src;
- 
-+import java.util.ArrayList;
- import java.util.Random;
- 
- // Referenced classes of package net.minecraft.src:
-@@ -65,26 +66,26 @@
-         return 6;
-     }
- 
-    public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1)
-+    @Override
-+    public ArrayList<ItemStack> getBlockDropped(World world, int i, int j, int k, int md, int fortune) 
-     {
-        if(world.multiplayerWorld)
-        {
-            return;
-        }
-        int j1 = 1;
-        if(l >= 3)
-        {
-            j1 = 2 + world.rand.nextInt(3);
-            if(i1 > 0)
-            {
-                j1 += world.rand.nextInt(i1 + 1);
-            }
-        }
-        for(int k1 = 0; k1 < j1; k1++)
-        {
-            dropBlockAsItem_do(world, i, j, k, new ItemStack(Item.netherStalkSeeds));
-        }
-
-+    	ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-+    	
-+    	int count = 1;
-+    	if (md >= 3)
-+    	{
-+    		count = 2 + world.rand.nextInt(3);
-+    		if (fortune > 0)
-+    		{
-+    			count += world.rand.nextInt(fortune + 1);
-+    		}
-+    	}
-+    	for (int n = 0; n < count; n++)
-+    	{
-+    		ret.add(new ItemStack(Item.netherStalkSeeds));
-+    	}
-+    	return ret;
-+    	
-     }
- 
-     public int idDropped(int i, Random random, int j)
@@ -1,29 +0,0 @@
--- ../src_base/minecraft/net/minecraft/src/BlockSnow.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockSnow.java	0000-00-00 00:00:00.000000000 -0000
-@@ -82,15 +82,8 @@
- 
-     public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l)
-     {
-        int i1 = Item.snowball.shiftedIndex;
-        float f = 0.7F;
-        double d = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
-        double d1 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
-        double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
-        EntityItem entityitem = new EntityItem(world, (double)i + d, (double)j + d1, (double)k + d2, new ItemStack(i1, 1, 0));
-        entityitem.delayBeforeCanPickup = 10;
-        world.spawnEntityInWorld(entityitem);
-        world.setBlockWithNotify(i, j, k, 0);
-+
-+	dropBlockAsItem(world,i,j,k,l,0);
-         entityplayer.addStat(StatList.mineBlockStatArray[blockID], 1);
-     }
- 
-@@ -101,7 +94,7 @@
- 
-     public int quantityDropped(Random random)
-     {
-        return 0;
-+        return 1;
-     }
- 
-     public void updateTick(World world, int i, int j, int k, Random random)
@@ -2,7 +2,7 @@
 +++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java	0000-00-00 00:00:00.000000000 -0000
@@ -41,7 +41,7 @@
 
-     private boolean canPlaceTorchOn(World world, int i, int j, int k)
+     private boolean func_31032_h(World world, int i, int j, int k)
     {
 -        if(world.func_41082_b(i, j, k, true))
 +        if(world.isBlockSolidOnSide(i, j, k, 1))
@@ -17,8 +17,8 @@
                     worldObj.setBlockTileEntity(i, j, k, tileentity);
                 }
                 if(tileentity != null)
-@@ -398,15 +399,7 @@
-                     tileentity.updateContainingBlockInfo();
+@@ -398,14 +399,6 @@
+                     tileentity.func_35144_b();
                 }
             }
 -        } else
@@ -27,13 +27,11 @@
 -            TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k);
 -            if(tileentity1 != null)
 -            {
-                tileentity1.updateContainingBlockInfo();
+-                tileentity1.func_35144_b();
 -            }
-        }
-+        } 
+         }
         isModified = true;
         return true;
-     }
@@ -430,7 +423,11 @@
         blocks[i << worldObj.xShift | k << worldObj.heightShift | j] = (byte)(byte0 & 0xff);
         if(k1 != 0)
@@ -57,7 +55,7 @@
                 }
                 if(tileentity != null)
@@ -466,14 +463,6 @@
-                     tileentity.updateContainingBlockInfo();
+                     tileentity.func_35144_b();
                 }
             }
 -        } else
@@ -66,7 +64,7 @@
 -            TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k);
 -            if(tileentity1 != null)
 -            {
-                tileentity1.updateContainingBlockInfo();
+-                tileentity1.func_35144_b();
 -            }
         }
         isModified = true;
@@ -140,7 +138,7 @@
 +    	Iterator iterator = chunkTileEntityMap.values().iterator();
 +    	while (iterator.hasNext()){
 +    		te = (TileEntity)iterator.next();
-+    		te.updateContainingBlockInfo();
+    		te.func_35144_b();
 +    		te.getBlockMetadata();
 +    		te.getBlockType();
 +    	}
@@ -148,18 +146,17 @@
         for(int l1 = i; l1 < l; l1++)
         {
             for(int l2 = k; l2 < j1; l2++)
-@@ -859,12 +869,29 @@
+@@ -859,12 +869,25 @@
 
         }
 
 -        TileEntity tileentity;
-        for(Iterator iterator = chunkTileEntityMap.values().iterator(); iterator.hasNext(); tileentity.updateContainingBlockInfo())
+-        for(Iterator iterator = chunkTileEntityMap.values().iterator(); iterator.hasNext(); tileentity.func_35144_b())
 -        {
 -            tileentity = (TileEntity)iterator.next();
 +        List<TileEntity> invalidList=new ArrayList();
 +        iterator = chunkTileEntityMap.values().iterator(); 
-+        while(iterator.hasNext()) 
-+        {
+        while(iterator.hasNext()) {
 +            te = (TileEntity)iterator.next();
 +            if ((te.xCoord & 15) >= i && (te.xCoord & 15) <= l &&
 +		        (te.yCoord >= j) && (te.yCoord <= i1) &&
@@ -174,11 +171,9 @@
 +			    invalidList.add(te);
 +            }
         }
- 
+-
 +        for(TileEntity te2 : invalidList)
-+        {
 +        	te2.invalidate();
-+        }
         return k1;
     }
 
@@ -11,26 +11,8 @@
 import java.util.*;
 
 // Referenced classes of package net.minecraft.src:
-@@ -502,7 +506,16 @@
- 
-     public void dropCurrentItem()
-     {
-        dropPlayerItemWithRandomChoice(inventory.decrStackSize(inventory.currentItem, 1), false);
-+    	ItemStack stack = inventory.getCurrentItem();
-+    	if (stack == null)
-+    	{
-+    		return;
-+    	}    	
-+    	
-+    	if (stack.getItem().onDroppedByPlayer(stack, this))
-+    	{
-+            dropPlayerItemWithRandomChoice(inventory.decrStackSize(inventory.currentItem, 1), false);
-+    	}
-     }
- 
-     public void dropPlayerItem(ItemStack itemstack)
-@@ -548,6 +561,8 @@
-         worldObj.spawnEntityInWorld(entityitem);
+@@ -548,6 +552,8 @@
+         worldObj.entityJoinedWorld(entityitem);
     }
 
 +    /* FORGE: This isnt called anymore
@@ -38,7 +20,7 @@
     public float getCurrentPlayerStrVsBlock(Block block)
     {
         float f = inventory.getStrVsBlock(block);
-@@ -576,6 +591,45 @@
+@@ -576,6 +582,45 @@
         return f1;
     }
 
@@ -84,7 +66,7 @@
     public boolean canHarvestBlock(Block block)
     {
         return inventory.canHarvestBlock(block);
-@@ -774,6 +828,25 @@
+@@ -774,6 +819,25 @@
 
     protected void damageEntity(DamageSource damagesource, int i)
     {
@@ -107,10 +89,10 @@
 +            return;
 +        }
 +    	
-         if(!damagesource.isUnblockable() && func_35162_ad())
+         if(!damagesource.unblockable() && func_35162_ad())
         {
             i = 1 + i >> 1;
-@@ -825,7 +898,9 @@
+@@ -825,7 +889,9 @@
 
     public void destroyCurrentEquippedItem()
     {
@@ -120,7 +102,7 @@
     }
 
     public double getYOffset()
-@@ -957,6 +1032,10 @@
+@@ -957,6 +1023,10 @@
 
     public EnumStatus sleepInBedAt(int i, int j, int k)
     {
@@ -34,12 +34,3 @@
                 GL11.glEnable(3008 /*GL_ALPHA_TEST*/);
             }
             Profiler.endStartSection("weather");
-@@ -988,6 +993,8 @@
-                 setupFog(1, f);
-                 GL11.glPopMatrix();
-             }
-+	    Profiler.endStartSection("fhooks");
-+	    ForgeHooksClient.onRenderWorldLast(renderglobal,f);
-             Profiler.endStartSection("hand");
-             if(cameraZoom == 1.0D)
-             {
@@ -9,7 +9,7 @@
 import java.util.Random;
 
@@ -177,6 +178,9 @@
-     private String potionModifier;
+     private String field_39010_c;
     private String itemName;
 
 +    // FORGE: To disable repair recipes.
@@ -18,22 +18,7 @@
     protected Item(int i)
     {
         maxStackSize = 64;
-@@ -221,6 +225,14 @@
-         return getIconFromDamage(itemstack.getItemDamage());
-     }
- 
-+    /* FORGE: This is called when the item is used, before the block is
-+     * activated.  Return true to prevent any further processing.
-+     */
-+    public boolean onItemUseFirst(ItemStack ist, EntityPlayer player,
-+		    World world, int i, int j, int k, int l) {
-+	    return false;
-+    }
-+
-     public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
-     {
-         return false;
-@@ -231,6 +243,13 @@
+@@ -231,6 +235,13 @@
         return 1.0F;
     }
 
@@ -47,7 +32,7 @@
     public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
     {
         return itemstack;
-@@ -278,6 +297,29 @@
+@@ -278,6 +289,29 @@
         return maxDamage > 0 && !hasSubtypes;
     }
 
@@ -77,7 +62,7 @@
     public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1)
     {
         return false;
-@@ -473,6 +515,32 @@
+@@ -473,6 +507,18 @@
     {
         return 0;
     }
@@ -92,20 +77,6 @@
 +    	{
 +			itemList.add(new ItemStack(this, 1));
 +    	}
-+    }
-+    
-+    /**
-+     * Called when a player drops the item into the world,
-+     * returning false from this will prevent the item from
-+     * being removed from the players inventory and spawning
-+     * in the world
-+     * 
-+     * @param player The player that dropped the item
-+     * @param item The item stack, before the item is removed.
-+     */
-+    public boolean onDroppedByPlayer(ItemStack item, EntityPlayer player)
-+    {
-+    	return true;
 +    }
 
     static 
@@ -10,32 +10,27 @@
 import java.util.Random;
 
 // Referenced classes of package net.minecraft.src:
-@@ -45,13 +47,23 @@
+@@ -45,13 +47,18 @@
 
     public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
     {
-        if(!entityplayer.canPlayerEdit(i, j, k))
-+        if(entityplayer != null && !entityplayer.canPlayerEdit(i, j, k))
+-        if(!entityplayer.func_35190_e(i, j, k))
+        if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k))
         {
             return false;
         }
         if(itemstack.getItemDamage() == 15)
         {
             int i1 = world.getBlockId(i, j, k);
-+            
-+            if (ForgeHooks.onUseBonemeal(world, i1, i, j, k))
-+            {
-+            	if (!world.multiplayerWorld)
-+            	{
-+            		itemstack.stackSize--;
-+            	}
-+            	return true;
-+            }
-+            
+	    if(ForgeHooks.onUseBonemeal(world,i1,i,j,k)) {
+		    if(!world.multiplayerWorld)
+			    itemstack.stackSize--;
+		    return true;
+	    }
             if(i1 == Block.sapling.blockID)
             {
                 if(!world.multiplayerWorld)
-@@ -118,13 +130,7 @@
+@@ -118,13 +125,7 @@
                             world.setBlockAndMetadataWithNotify(k1, l1, i2, Block.tallGrass.blockID, 1);
                             continue;
                         }
@@ -50,7 +45,7 @@
                     }
 
                 }
-@@ -147,5 +153,17 @@
+@@ -147,5 +148,17 @@
             }
         }
     }
@@ -1,15 +0,0 @@
--- ../src_base/minecraft/net/minecraft/src/PlayerControllerCreative.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerCreative.java	0000-00-00 00:00:00.000000000 -0000
-@@ -58,6 +58,12 @@
- 
-     public boolean onPlayerRightClick(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l)
-     {
-+        if (itemstack != null) {
-+		Item it=itemstack.getItem();
-+		if (it.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) {
-+			return true;
-+		}
-+        }
-         int i1 = world.getBlockId(i, j, k);
-         if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer))
-         {
@@ -1,68 +1,66 @@
 --- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java	0000-00-00 00:00:00.000000000 -0000
-@@ -4,6 +4,8 @@
+@@ -4,6 +4,9 @@
 
 package net.minecraft.src;
 
+import net.minecraft.src.forge.IUseItemFirst;
 +import net.minecraft.src.forge.ForgeHooks;
 +
 import net.minecraft.client.Minecraft;
 
 // Referenced classes of package net.minecraft.src:
-@@ -68,13 +70,19 @@
+@@ -68,13 +71,16 @@
 
-     public boolean onPlayerDestroyBlock(int i, int j, int k, int l)
+     public boolean sendBlockRemoved(int i, int j, int k, int l)
     {
-+    	ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem();
-+    	if (itemstack != null && itemstack.getItem().onBlockStartBreak(itemstack, i, j, k, mc.thePlayer))
-+    	{
-+    		return false;
-+    	}
-+    	
+        ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem();
+	if(itemstack!=null && itemstack.getItem().onBlockStartBreak(itemstack,
+			i,j,k,mc.thePlayer))
+		return false;
         if(creativeMode)
         {
-             return super.onPlayerDestroyBlock(i, j, k, l);
+             return super.sendBlockRemoved(i, j, k, l);
         }
         int i1 = mc.theWorld.getBlockId(i, j, k);
-         boolean flag = super.onPlayerDestroyBlock(i, j, k, l);
+         boolean flag = super.sendBlockRemoved(i, j, k, l);
 -        ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem();
-+
         if(itemstack != null)
         {
             itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer);
-@@ -103,7 +111,7 @@
+@@ -103,7 +109,7 @@
             {
                 Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer);
             }
 -            if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F)
 +            if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F)
             {
-                 onPlayerDestroyBlock(i, j, k, l);
+                 sendBlockRemoved(i, j, k, l);
             } else
-@@ -149,7 +157,7 @@
+@@ -149,7 +155,7 @@
                 return;
             }
             Block block = Block.blocksList[i1];
 -            curBlockDamageMP += block.blockStrength(mc.thePlayer);
-+            curBlockDamageMP += block.blockStrength(mc.theWorld, mc.thePlayer, i, j, k);
+	    curBlockDamageMP += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k);
             if(stepSoundTickCounter % 4F == 0.0F && block != null)
             {
                 mc.sndManager.playSound(block.stepSound.stepSoundDir2(), (float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, (block.stepSound.getVolume() + 1.0F) / 8F, block.stepSound.getPitch() * 0.5F);
-@@ -216,6 +224,13 @@
+@@ -216,6 +222,13 @@
     {
         syncCurrentPlayItem();
         netClientHandler.addToSendQueue(new Packet15Place(i, j, k, l, entityplayer.inventory.getCurrentItem()));
 +
-+        if (itemstack != null) {
-+		Item it=itemstack.getItem();
-+		if (it.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) {
-+			return true;
-+		}
+        if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) {
+            IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem();
+            if (iuif.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) {
+                return true;
+            }
 +        }
         int i1 = world.getBlockId(i, j, k);
         if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer))
         {
-@@ -235,7 +250,11 @@
+@@ -235,7 +248,11 @@
             return flag;
         } else
         {
@@ -1,65 +1,63 @@
 --- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java	0000-00-00 00:00:00.000000000 -0000
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,8 @@
 // Decompiler options: packimports(3) braces deadcode fieldsfirst 
 
 package net.minecraft.src;
+import net.minecraft.src.forge.IUseItemFirst;
 +import net.minecraft.src.forge.ForgeHooks;
 
 import net.minecraft.client.Minecraft;
 
-@@ -46,11 +47,17 @@
+@@ -46,11 +48,14 @@
 
-     public boolean onPlayerDestroyBlock(int i, int j, int k, int l)
+     public boolean sendBlockRemoved(int i, int j, int k, int l)
     {
-+    	ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem();
-+    	if (itemstack != null && itemstack.getItem().onBlockStartBreak(itemstack, i, j, k, mc.thePlayer))
-+    	{
-+    		return false;
-+    	}
-+    	
+        ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem();
+	if(itemstack!=null && itemstack.getItem().onBlockStartBreak(itemstack,
+			i,j,k,mc.thePlayer))
+		return false;
         int i1 = mc.theWorld.getBlockId(i, j, k);
         int j1 = mc.theWorld.getBlockMetadata(i, j, k);
-         boolean flag = super.onPlayerDestroyBlock(i, j, k, l);
+         boolean flag = super.sendBlockRemoved(i, j, k, l);
 -        ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem();
 -        boolean flag1 = mc.thePlayer.canHarvestBlock(Block.blocksList[i1]);
-+
-+        boolean flag1 = Block.blocksList[i1].canHarvestBlock(mc.thePlayer, j1);
+        boolean flag1 = Block.blocksList[i1].canHarvestBlock(mc.thePlayer,j1);
         if(itemstack != null)
         {
             itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer);
-@@ -79,7 +86,7 @@
+@@ -79,7 +84,7 @@
         {
             Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer);
         }
 -        if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.thePlayer) >= 1.0F)
 +        if(i1 > 0 && Block.blocksList[i1].blockStrength(mc.theWorld,mc.thePlayer,i,j,k) >= 1.0F)
         {
-             onPlayerDestroyBlock(i, j, k, l);
+             sendBlockRemoved(i, j, k, l);
         }
-@@ -110,7 +117,7 @@
+@@ -110,7 +115,7 @@
                 return;
             }
             Block block = Block.blocksList[i1];
 -            curBlockDamage += block.blockStrength(mc.thePlayer);
-+            curBlockDamage += block.blockStrength(mc.theWorld, mc.thePlayer, i, j, k);
-             if(blockDestroySoundCounter % 4F == 0.0F && block != null)
+            curBlockDamage += block.blockStrength(mc.theWorld,mc.thePlayer,i,j,k);
+             if(field_1069_h % 4F == 0.0F && block != null)
             {
                 mc.sndManager.playSound(block.stepSound.stepSoundDir2(), (float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, (block.stepSound.getVolume() + 1.0F) / 8F, block.stepSound.getPitch() * 0.5F);
-@@ -173,6 +180,12 @@
+@@ -173,6 +178,12 @@
 
-     public boolean onPlayerRightClick(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l)
+     public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l)
     {
-+        if (itemstack != null) {
-+		Item it=itemstack.getItem();
-+		if (it.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) {
-+			return true;
-+		}
+        if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) {
+            IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem();
+            if (iuif.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) {
+                return true;
+            }
 +        }
         int i1 = world.getBlockId(i, j, k);
         if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer))
         {
-@@ -183,7 +196,11 @@
+@@ -183,7 +194,11 @@
             return false;
         } else
         {
@@ -1,59 +1,5 @@
 --- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java	0000-00-00 00:00:00.000000000 -0000
-@@ -1332,7 +1332,7 @@
-         double d2 = (float)j1 / 256F;
-         double d3 = ((float)j1 + 15.99F) / 256F;
-         float f = 1.4F;
-        if(!blockAccess.isBlockNormalCube(i, j - 1, k) && !Block.fire.canBlockCatchFire(blockAccess, i, j - 1, k))
-+        if(!blockAccess.isBlockNormalCube(i, j - 1, k) && !Block.fire.canBlockCatchFire(blockAccess, i, j - 1, k, 0))
-         {
-             float f1 = 0.2F;
-             float f2 = 0.0625F;
-@@ -1349,7 +1349,7 @@
-                 d1 = d;
-                 d = d4;
-             }
-            if(Block.fire.canBlockCatchFire(blockAccess, i - 1, j, k))
-+            if(Block.fire.canBlockCatchFire(blockAccess, i - 1, j, k, 4))
-             {
-                 tessellator.addVertexWithUV((float)i + f1, (float)j + f + f2, k + 1, d1, d2);
-                 tessellator.addVertexWithUV(i + 0, (float)(j + 0) + f2, k + 1, d1, d3);
-@@ -1360,7 +1360,7 @@
-                 tessellator.addVertexWithUV(i + 0, (float)(j + 0) + f2, k + 1, d1, d3);
-                 tessellator.addVertexWithUV((float)i + f1, (float)j + f + f2, k + 1, d1, d2);
-             }
-            if(Block.fire.canBlockCatchFire(blockAccess, i + 1, j, k))
-+            if(Block.fire.canBlockCatchFire(blockAccess, i + 1, j, k, 5))
-             {
-                 tessellator.addVertexWithUV((float)(i + 1) - f1, (float)j + f + f2, k + 0, d, d2);
-                 tessellator.addVertexWithUV((i + 1) - 0, (float)(j + 0) + f2, k + 0, d, d3);
-@@ -1371,7 +1371,7 @@
-                 tessellator.addVertexWithUV((i + 1) - 0, (float)(j + 0) + f2, k + 0, d, d3);
-                 tessellator.addVertexWithUV((float)(i + 1) - f1, (float)j + f + f2, k + 0, d, d2);
-             }
-            if(Block.fire.canBlockCatchFire(blockAccess, i, j, k - 1))
-+            if(Block.fire.canBlockCatchFire(blockAccess, i, j, k - 1, 3))
-             {
-                 tessellator.addVertexWithUV(i + 0, (float)j + f + f2, (float)k + f1, d1, d2);
-                 tessellator.addVertexWithUV(i + 0, (float)(j + 0) + f2, k + 0, d1, d3);
-@@ -1382,7 +1382,7 @@
-                 tessellator.addVertexWithUV(i + 0, (float)(j + 0) + f2, k + 0, d1, d3);
-                 tessellator.addVertexWithUV(i + 0, (float)j + f + f2, (float)k + f1, d1, d2);
-             }
-            if(Block.fire.canBlockCatchFire(blockAccess, i, j, k + 1))
-+            if(Block.fire.canBlockCatchFire(blockAccess, i, j, k + 1, 2))
-             {
-                 tessellator.addVertexWithUV(i + 1, (float)j + f + f2, (float)(k + 1) - f1, d, d2);
-                 tessellator.addVertexWithUV(i + 1, (float)(j + 0) + f2, (k + 1) - 0, d, d3);
-@@ -1393,7 +1393,7 @@
-                 tessellator.addVertexWithUV(i + 1, (float)(j + 0) + f2, (k + 1) - 0, d, d3);
-                 tessellator.addVertexWithUV(i + 1, (float)j + f + f2, (float)(k + 1) - f1, d, d2);
-             }
-            if(Block.fire.canBlockCatchFire(blockAccess, i, j + 1, k))
-+            if(Block.fire.canBlockCatchFire(blockAccess, i, j + 1, k, 1))
-             {
-                 double d5 = (double)i + 0.5D + 0.5D;
-                 double d7 = ((double)i + 0.5D) - 0.5D;
@@ -3301,7 +3301,7 @@
             colorBlueTopRight *= f27;
             int k2 = block.getBlockTexture(blockAccess, i, j, k, 2);
@@ -73,7 +73,7 @@
 +              renderengine.bindTexture(renderengine.getTexture(tex));
 +              Item item = Item.itemsList[i];
 +              GL11.glPushMatrix();
-+              GL11.glTranslatef(l - 2, i1 + 3, -3F + zLevel);
+              GL11.glTranslatef(l - 2, i1 + 3, -3F);
 +              GL11.glScalef(10F, 10F, 10F);
 +              GL11.glTranslatef(1.0F, 0.5F, 1.0F);
 +              GL11.glScalef(1.0F, 1.0F, -1F);
@@ -1,35 +0,0 @@
--- ../src_base/minecraft/net/minecraft/src/TileEntityBrewingStand.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/TileEntityBrewingStand.java	0000-00-00 00:00:00.000000000 -0000
-@@ -4,6 +4,8 @@
- 
- package net.minecraft.src;
- 
-+import net.minecraft.src.forge.ISidedInventory;
-+
- 
- // Referenced classes of package net.minecraft.src:
- //            TileEntity, IInventory, ItemStack, World, 
-@@ -11,7 +13,7 @@
- //            NBTTagList, EntityPlayer
- 
- public class TileEntityBrewingStand extends TileEntity
-    implements IInventory
-+    implements IInventory, ISidedInventory
- {
- 
-     private ItemStack brewingItemStacks[];
-@@ -280,4 +282,14 @@
- 
-         return i;
-     }
-+
-+	@Override
-+	public int getStartInventorySide(int side) {
-+		return (side == 1 ? 3 : 0);
-+	}
-+
-+	@Override
-+	public int getSizeInventorySide(int side) {
-+		return (side == 1 ? 1 : 3);
-+	}
- }
@@ -145,7 +145,7 @@
 +    	}
     }
 
-     public void markEntityForDespawn(TileEntity tileentity)
+     public void func_35455_a(TileEntity tileentity)
@@ -2106,13 +2092,18 @@
     public boolean isBlockNormalCube(int i, int j, int k)
     {
@@ -1,34 +0,0 @@
--- ../src_base/minecraft/net/minecraft/src/WorldGenDungeons.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/WorldGenDungeons.java	0000-00-00 00:00:00.000000000 -0000
-@@ -7,6 +7,8 @@
- import java.io.PrintStream;
- import java.util.Random;
- 
-+import net.minecraft.src.forge.MinecraftForge;
-+
- // Referenced classes of package net.minecraft.src:
- //            WorldGenerator, World, Material, Block, 
- //            TileEntityChest, TileEntityMobSpawner, ItemStack, Item
-@@ -129,11 +131,11 @@
-                 int k4 = 0;
-                 do
-                 {
-                    if(k4 >= 8)
-+                    if(k4 >= MinecraftForge.getDungeonLootTries())
-                     {
-                         break label0;
-                     }
-                    ItemStack itemstack = pickCheckLootItem(random);
-+                    ItemStack itemstack = MinecraftForge.getRandomDungeonLoot(random);
-                     if(itemstack != null)
-                     {
-                         tileentitychest.setInventorySlotContents(random.nextInt(tileentitychest.getSizeInventory()), itemstack);
-@@ -148,7 +150,7 @@
-         TileEntityMobSpawner tileentitymobspawner = (TileEntityMobSpawner)world.getBlockTileEntity(i, j, k);
-         if(tileentitymobspawner != null)
-         {
-            tileentitymobspawner.setMobID(pickMobSpawner(random));
-+            tileentitymobspawner.setMobID(MinecraftForge.getRandomDungeonMob(random));
-         } else
-         {
-             System.err.println((new StringBuilder()).append("Failed to fetch mob spawner entity at (").append(i).append(", ").append(j).append(", ").append(k).append(")").toString());
@@ -115,7 +115,7 @@
         }
 
     }
-@@ -725,6 +767,197 @@
+@@ -725,6 +767,99 @@
         return blockMaterial.getMaterialMobility();
     }
 
@@ -137,7 +137,7 @@
 +     * others.
 +     */
 +    public boolean isBlockNormalCube(World world, int i, int j, int k) {
-+	    return blockMaterial.getIsOpaque() && renderAsNormalBlock();
+	    return blockMaterial.getIsOpaque() && isACube();
 +    }
 +
 +    /* FORGE: Return true if the block is solid on the given side.  This
@@ -211,104 +211,6 @@
 +		    int i, int j, int k) {
 +        return world.setBlockWithNotify(i, j, k, 0);
 +    }
-+    
-+    /* FORGE: This is not called by the server, but declared here for compatibility
-+     */
-+    public void addCreativeItems(ArrayList itemList)
-+    {    	
-+    }
-+
-+    protected static int blockFireSpreadSpeed[] = new int[256];
-+    protected static int blockFlammability[] = new int[256];
-+    
-+    /**
-+     * Chance that fire will spread and consume this block.
-+     * 300 being a 100% chance, 0, being a 0% chance.
-+     * 
-+     * @param world The current world
-+     * @param x The blocks X position
-+     * @param y The blocks Y position
-+     * @param z The blocks Z position
-+     * @param metadata The blocks current metadata
-+     * @param face The face that the fire is coming from
-+     * @return A number ranging from 0 to 300 relating used to determine if the block will be consumed by fire
-+     */
-+    public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, int face)
-+    {
-+    	return blockFlammability[blockID];
-+    }
-+    
-+    /**
-+     * Called when fire is updating, checks if a block face can catch fire.
-+     * 
-+     * 
-+     * @param world The current world
-+     * @param x The blocks X position
-+     * @param y The blocks Y position
-+     * @param z The blocks Z position
-+     * @param metadata The blocks current metadata
-+     * @param face The face that the fire is coming from
-+     * @return True if the face can be on fire, false otherwise.
-+     */
-+    public boolean isFlammable(IBlockAccess world, int x, int y, int z, int metadata, int face)
-+    {
-+    	return getFlammability(world, x, y, z, metadata, face) > 0;
-+    }
-+    
-+    /**
-+     * Called when fire is updating on a neighbor block.
-+     * The higher the number returned, the faster fire will spread around this block.
-+     * 
-+     * @param world The current world
-+     * @param x The blocks X position
-+     * @param y The blocks Y position
-+     * @param z The blocks Z position
-+     * @param metadata The blocks current metadata
-+     * @param face The face that the fire is coming from
-+     * @return A number that is used to determine the speed of fire growth around the block
-+     */
-+    public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, int face)
-+    {
-+    	return blockFireSpreadSpeed[blockID];
-+    }
-+    
-+    /**
-+     * Currently only called by fire when it is on top of this block.
-+     * Returning true will prevent the fire from naturally dieing during updating.
-+     * Also prevents firing from dieing from rain.
-+     * 
-+     * @param world The current world
-+     * @param x The blocks X position
-+     * @param y The blocks Y position
-+     * @param z The blocks Z position
-+     * @param metadata The blocks current metadata
-+     * @param face The face that the fire is coming from
-+     * @return 
-+     */
-+    public boolean isFireSource(World world, int x, int y, int z, int metadata, int face)
-+    {
-+    	if (blockID == Block.netherrack.blockID && face == 0)
-+    	{
-+    		return true;
-+    	}
-+    	if ((world.worldProvider instanceof WorldProviderEnd) && blockID == Block.bedrock.blockID && face == 0)
-+    	{
-+    		return true;
-+    	}
-+    	return false;
-+    }
-+
-+    /**
-+     * Called by BlockFire to setup the burn values of vanilla blocks.
-+     * @param id The block id
-+     * @param encouragement How much the block encourages fire to spread
-+     * @param flammability how easy a block is to catch fire
-+     */
-+    public static void setBurnProperties(int id, int encouragement, int flammability)
-+    {
-+    	blockFireSpreadSpeed[id] = encouragement;
-+    	blockFlammability[id] = flammability;
-+    }
 +
     static Class _mthclass$(String s)
     {
@@ -9,27 +9,16 @@
     }
 
     public void onBlockRemoval(World world, int i, int j, int k)
-@@ -36,7 +36,7 @@
-     }
+@@ -37,6 +37,12 @@
 
     public abstract TileEntity getBlockEntity();
-
-+    
-     public void powerBlock(World world, int i, int j, int k, int l, int i1)
-     {
-         super.powerBlock(world, i, j, k, l, i1);
-@@ -46,4 +46,14 @@
-             tileentity.onTileEntityPowered(l, i1);
-         }
-     }
-+    
-+    /**
-+     * Metatdata sensitive version of getBlockEntity
-+     * @param metadata The Metatdata for the current block
-+     * @return A instance of the TileEntity class associated with this block
+ 
+    /* FORGE: Metadata-sensitive version, to fix 1.8.1 regression.
 +     */
-+    public TileEntity getBlockEntity(int metadata)
-+    {
-+    	return getBlockEntity();
+    public TileEntity getBlockEntity(int md) {
+	    return getBlockEntity();
 +    }
- }
+
+     public void playBlock(World world, int i, int j, int k, int l, int i1)
+     {
+         super.playBlock(world, i, j, k, l, i1);
@@ -24,7 +24,7 @@
 +        	tr.add(new ItemStack(Item.wheat));
 +    	}
 +            
-+        for(int n = 0; n < 3+fortune; n++) 
+        for(int n = 0; n < 3; n++) 
         {
 -            return;
 -        }
@@ -40,7 +40,7 @@
 -                float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
 -                EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
 -                entityitem.delayBeforeCanPickup = 10;
-                world.spawnEntityInWorld(entityitem);
+-                world.entityJoinedWorld(entityitem);
 +                tr.add(new ItemStack(Item.seeds));
             }
         }
@@ -1,234 +0,0 @@
--- ../src_base/minecraft_server/net/minecraft/src/BlockFire.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockFire.java	0000-00-00 00:00:00.000000000 -0000
-@@ -14,14 +14,14 @@
- public class BlockFire extends Block
- {
- 
-    private int chanceToEncourageFire[];
-    private int abilityToCatchFire[];
-
-+	private int chanceToEncourageFire[]; 
-+	private int abilityToCatchFire[];
-+	
-     protected BlockFire(int i, int j)
-     {
-         super(i, j, Material.fire);
-        chanceToEncourageFire = new int[256];
-        abilityToCatchFire = new int[256];
-+        chanceToEncourageFire = Block.blockFireSpreadSpeed;
-+        abilityToCatchFire = Block.blockFlammability;
-         setTickOnLoad(true);
-     }
- 
-@@ -38,11 +38,10 @@
-         setBurnRate(Block.cloth.blockID, 30, 60);
-         setBurnRate(Block.vine.blockID, 15, 100);
-     }
-
-+    
-     private void setBurnRate(int i, int j, int k)
-     {
-        chanceToEncourageFire[i] = j;
-        abilityToCatchFire[i] = k;
-+    	Block.setBurnProperties(i, j, k);
-     }
- 
-     public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int i, int j, int k)
-@@ -77,11 +76,9 @@
- 
-     public void updateTick(World world, int i, int j, int k, Random random)
-     {
-        boolean flag = world.getBlockId(i, j - 1, k) == Block.netherrack.blockID;
-        if((world.worldProvider instanceof WorldProviderEnd) && world.getBlockId(i, j - 1, k) == Block.bedrock.blockID)
-        {
-            flag = true;
-        }
-+        Block base = Block.blocksList[world.getBlockId(i,  j - 1, k)];
-+        boolean flag = (base != null && base.isFireSource(world, i, j - 1, k, world.getBlockMetadata(i, j - 1, k), 0));
-+
-         if(!canPlaceBlockAt(world, i, j, k))
-         {
-             world.setBlockWithNotify(i, j, k, 0);
-@@ -99,23 +96,23 @@
-         world.scheduleBlockUpdate(i, j, k, blockID, tickRate());
-         if(!flag && !func_268_g(world, i, j, k))
-         {
-            if(!world.isBlockNormalCube(i, j - 1, k) || l > 3)
-+            if(!world.isBlockSolidOnSide(i, j - 1, k, 0) || l > 3)
-             {
-                 world.setBlockWithNotify(i, j, k, 0);
-             }
-             return;
-         }
-        if(!flag && !canBlockCatchFire(world, i, j - 1, k) && l == 15 && random.nextInt(4) == 0)
-+        if(!flag && !canBlockCatchFire(world, i, j - 1, k, 0) && l == 15 && random.nextInt(4) == 0)
-         {
-             world.setBlockWithNotify(i, j, k, 0);
-             return;
-         }
-        tryToCatchBlockOnFire(world, i + 1, j, k, 300, random, l);
-        tryToCatchBlockOnFire(world, i - 1, j, k, 300, random, l);
-        tryToCatchBlockOnFire(world, i, j - 1, k, 250, random, l);
-        tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l);
-        tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l);
-        tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l);
-+        tryToCatchBlockOnFire(world, i + 1, j, k, 300, random, l, 4);
-+        tryToCatchBlockOnFire(world, i - 1, j, k, 300, random, l, 5);
-+        tryToCatchBlockOnFire(world, i, j - 1, k, 250, random, l, 0);
-+        tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l, 1);
-+        tryToCatchBlockOnFire(world, i, j, k - 1, 300, random, l, 3);
-+        tryToCatchBlockOnFire(world, i, j, k + 1, 300, random, l, 2);
-         for(int i1 = i - 1; i1 <= i + 1; i1++)
-         {
-             for(int j1 = k - 1; j1 <= k + 1; j1++)
-@@ -154,10 +151,24 @@
-         }
- 
-     }
-
-+    
-+    /*
-+     * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
-+     */
-+    @Deprecated
-     private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1)
-     {
-        int j1 = abilityToCatchFire[world.getBlockId(i, j, k)];
-+    	tryToCatchBlockOnFire(world, i, j, k, l, random, i1, 0);
-+    }
-+
-+    private void tryToCatchBlockOnFire(World world, int i, int j, int k, int l, Random random, int i1, int face)
-+    {
-+        Block block = Block.blocksList[world.getBlockId(i, j, k)];
-+        int j1 = 0;
-+        if (block != null) 
-+        {
-+        	j1 = block.getFlammability(world, i, j, k, world.getBlockMetadata(i, j, k), face);
-+        }
-         if(random.nextInt(l) < j1)
-         {
-             boolean flag = world.getBlockId(i, j, k) == Block.tnt.blockID;
-@@ -182,27 +193,27 @@
- 
-     private boolean func_268_g(World world, int i, int j, int k)
-     {
-        if(canBlockCatchFire(world, i + 1, j, k))
-+        if(canBlockCatchFire(world, i + 1, j, k, 4))
-         {
-             return true;
-         }
-        if(canBlockCatchFire(world, i - 1, j, k))
-+        if(canBlockCatchFire(world, i - 1, j, k, 5))
-         {
-             return true;
-         }
-        if(canBlockCatchFire(world, i, j - 1, k))
-+        if(canBlockCatchFire(world, i, j - 1, k, 0))
-         {
-             return true;
-         }
-        if(canBlockCatchFire(world, i, j + 1, k))
-+        if(canBlockCatchFire(world, i, j + 1, k, 1))
-         {
-             return true;
-         }
-        if(canBlockCatchFire(world, i, j, k - 1))
-+        if(canBlockCatchFire(world, i, j, k - 1, 3))
-         {
-             return true;
-         }
-        return canBlockCatchFire(world, i, j, k + 1);
-+        return canBlockCatchFire(world, i, j, k + 1, 2);
-     }
- 
-     private int getChanceOfNeighborsEncouragingFire(World world, int i, int j, int k)
-@@ -213,12 +224,12 @@
-             return 0;
-         } else
-         {
-            l = getChanceToEncourageFire(world, i + 1, j, k, l);
-            l = getChanceToEncourageFire(world, i - 1, j, k, l);
-            l = getChanceToEncourageFire(world, i, j - 1, k, l);
-            l = getChanceToEncourageFire(world, i, j + 1, k, l);
-            l = getChanceToEncourageFire(world, i, j, k - 1, l);
-            l = getChanceToEncourageFire(world, i, j, k + 1, l);
-+            l = getChanceToEncourageFire(world, i + 1, j, k, l, 5);
-+            l = getChanceToEncourageFire(world, i - 1, j, k, l, 4);
-+            l = getChanceToEncourageFire(world, i, j - 1, k, l, 0);
-+            l = getChanceToEncourageFire(world, i, j + 1, k, l, 1);
-+            l = getChanceToEncourageFire(world, i, j, k - 1, l, 3);
-+            l = getChanceToEncourageFire(world, i, j, k + 1, l, 2);
-             return l;
-         }
-     }
-@@ -227,15 +238,43 @@
-     {
-         return false;
-     }
-
-+    
-+    /*
-+     * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
-+     */
-+    @Deprecated
-     public boolean canBlockCatchFire(IBlockAccess iblockaccess, int i, int j, int k)
-     {
-        return chanceToEncourageFire[iblockaccess.getBlockId(i, j, k)] > 0;
-+    	return canBlockCatchFire(iblockaccess, i, j, k, 0);
-     }
- 
-+    public boolean canBlockCatchFire(IBlockAccess world, int i, int j, int k, int face)
-+    {
-+    	Block block = Block.blocksList[world.getBlockId(i, j, k)];
-+    	if (block != null)
-+    	{
-+    		return block.isFlammable(world, i, j, k, world.getBlockMetadata(i, j, k), face);
-+    	}
-+    	return false;
-+    }
-+
-+    /*
-+     * Added for backwards compatibility, should not be called by anyone who is making a mod for forge
-+     */
-+    @Deprecated
-     public int getChanceToEncourageFire(World world, int i, int j, int k, int l)
-     {
-        int i1 = chanceToEncourageFire[world.getBlockId(i, j, k)];
-+    	return getChanceToEncourageFire(world, i, j, k, l, 0);
-+    }
-+
-+    public int getChanceToEncourageFire(World world, int i, int j, int k, int l, int face)
-+    {
-+    	int i1 = 0;
-+    	Block block = Block.blocksList[world.getBlockId(i, j, k)];
-+    	if (block != null)
-+    	{
-+    		i1 = block.getFireSpreadSpeed(world, i, j, k, world.getBlockMetadata(i, j, k), face);
-+    	}
-         if(i1 > l)
-         {
-             return i1;
-@@ -247,12 +286,12 @@
- 
-     public boolean canPlaceBlockAt(World world, int i, int j, int k)
-     {
-        return world.isBlockNormalCube(i, j - 1, k) || func_268_g(world, i, j, k);
-+        return world.isBlockSolidOnSide(i, j - 1, k, 0) || func_268_g(world, i, j, k);
-     }
- 
-     public void onNeighborBlockChange(World world, int i, int j, int k, int l)
-     {
-        if(!world.isBlockNormalCube(i, j - 1, k) && !func_268_g(world, i, j, k))
-+        if(!world.isBlockSolidOnSide(i, j - 1, k, 0) && !func_268_g(world, i, j, k))
-         {
-             world.setBlockWithNotify(i, j, k, 0);
-             return;
-@@ -268,7 +307,7 @@
-         {
-             return;
-         }
-        if(!world.isBlockNormalCube(i, j - 1, k) && !func_268_g(world, i, j, k))
-+        if(!world.isBlockSolidOnSide(i, j - 1, k, 0) && !func_268_g(world, i, j, k))
-         {
-             world.setBlockWithNotify(i, j, k, 0);
-             return;
@@ -1,59 +0,0 @@
--- ../src_base/minecraft_server/net/minecraft/src/BlockNetherStalk.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockNetherStalk.java	0000-00-00 00:00:00.000000000 -0000
-@@ -4,6 +4,7 @@
- 
- package net.minecraft.src;
- 
-+import java.util.ArrayList;
- import java.util.Random;
- 
- // Referenced classes of package net.minecraft.src:
-@@ -64,27 +65,27 @@
-     {
-         return 6;
-     }
-
-    public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1)
-    {
-        if(world.singleplayerWorld)
-        {
-            return;
-        }
-        int j1 = 1;
-        if(l >= 3)
-        {
-            j1 = 2 + world.rand.nextInt(3);
-            if(i1 > 0)
-            {
-                j1 += world.rand.nextInt(i1 + 1);
-            }
-        }
-        for(int k1 = 0; k1 < j1; k1++)
-        {
-            dropBlockAsItem_do(world, i, j, k, new ItemStack(Item.netherStalkSeeds));
-        }
-
-+    
-+    @Override
-+    public ArrayList<ItemStack> getBlockDropped(World world, int i, int j, int k, int md, int fortune) 
-+    {
-+    	ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-+    	
-+    	int count = 1;
-+    	if (md >= 3)
-+    	{
-+    		count = 2 + world.rand.nextInt(3);
-+    		if (fortune > 0)
-+    		{
-+    			count += world.rand.nextInt(fortune + 1);
-+    		}
-+    	}
-+    	for (int n = 0; n < count; n++)
-+    	{
-+    		ret.add(new ItemStack(Item.netherStalkSeeds));
-+    	}
-+    	return ret;
-+    	
-     }
- 
-     public int idDropped(int i, Random random, int j)
@@ -1,28 +0,0 @@
--- ../src_base/minecraft_server/net/minecraft/src/BlockSnow.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockSnow.java	0000-00-00 00:00:00.000000000 -0000
-@@ -82,15 +82,7 @@
- 
-     public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l)
-     {
-        int i1 = Item.snowball.shiftedIndex;
-        float f = 0.7F;
-        double d = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
-        double d1 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
-        double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
-        EntityItem entityitem = new EntityItem(world, (double)i + d, (double)j + d1, (double)k + d2, new ItemStack(i1, 1, 0));
-        entityitem.delayBeforeCanPickup = 10;
-        world.spawnEntityInWorld(entityitem);
-        world.setBlockWithNotify(i, j, k, 0);
-+	dropBlockAsItem(world,i,j,k,l,0);
-         entityplayer.addStat(StatList.mineBlockStatArray[blockID], 1);
-     }
- 
-@@ -101,7 +93,7 @@
- 
-     public int quantityDropped(Random random)
-     {
-        return 0;
-+        return 1;
-     }
- 
-     public void updateTick(World world, int i, int j, int k, Random random)
@@ -8,7 +8,15 @@
 
 import java.io.PrintStream;
 import java.util.*;
-@@ -367,7 +368,7 @@
+@@ -325,6 +326,7 @@
+         }
+         int i2 = xPosition * 16 + i;
+         int j2 = zPosition * 16 + k;
+        
+         blocks[i << worldObj.field_35250_b | k << worldObj.worldYBits | j] = (byte)(byte0 & 0xff);
+         if(l1 != 0)
+         {
+@@ -367,7 +369,7 @@
                 TileEntity tileentity = getChunkBlockTileEntity(i, j, k);
                 if(tileentity == null)
                 {
@@ -17,7 +25,7 @@
                     worldObj.setBlockTileEntity(i, j, k, tileentity);
                 }
                 if(tileentity != null)
-@@ -375,14 +376,6 @@
+@@ -375,14 +377,6 @@
                     tileentity.func_35164_g();
                 }
             }
@@ -32,19 +40,22 @@
         }
         isModified = true;
         return true;
-@@ -408,6 +401,11 @@
+@@ -404,10 +398,13 @@
+         }
+         int l1 = xPosition * 16 + i;
+         int i2 = zPosition * 16 + k;
+        
+         blocks[i << worldObj.field_35250_b | k << worldObj.worldYBits | j] = (byte)(byte0 & 0xff);
         if(k1 != 0)
         {
-             Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2);
-+            if (!worldObj.singleplayerWorld) 
-+            {
-+            	Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2);
-+            }
-+            worldObj.removeBlockTileEntity(l1,  j, i2);
+-            Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2);
+        	if (!worldObj.singleplayerWorld)
+        		Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2);
+            worldObj.removeBlockTileEntity(l1, j, i2);
         }
         data.setNibble(i, j, k, 0);
         if(Block.lightOpacity[byte0 & 0xff] != 0)
-@@ -435,7 +433,7 @@
+@@ -435,7 +432,7 @@
                 TileEntity tileentity = getChunkBlockTileEntity(i, j, k);
                 if(tileentity == null)
                 {
@@ -53,7 +64,7 @@
                     worldObj.setBlockTileEntity(i, j, k, tileentity);
                 }
                 if(tileentity != null)
-@@ -443,14 +441,6 @@
+@@ -443,14 +440,6 @@
                     tileentity.func_35164_g();
                 }
             }
@@ -68,7 +79,7 @@
         }
         isModified = true;
         return true;
-@@ -586,6 +576,11 @@
+@@ -586,6 +575,11 @@
     {
         ChunkPosition chunkposition = new ChunkPosition(i, j, k);
         TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition);
@@ -80,7 +91,7 @@
         if(tileentity == null)
         {
             int l = getBlockID(i, j, k);
-@@ -595,18 +590,23 @@
+@@ -595,18 +589,23 @@
             }
             if(tileentity == null)
             {
@@ -111,7 +122,7 @@
         }
     }
 
-@@ -618,7 +618,7 @@
+@@ -618,7 +617,7 @@
         setChunkBlockTileEntity(i, j, k, tileentity);
         if(isChunkLoaded)
         {
@@ -120,7 +131,7 @@
         }
     }
 
-@@ -634,6 +634,8 @@
+@@ -634,6 +633,8 @@
             return;
         } else
         {
@@ -11,26 +11,8 @@
 // Referenced classes of package net.minecraft.src:
 //            EntityLiving, InventoryPlayer, FoodStats, PlayerCapabilities, 
 //            ContainerPlayer, World, ChunkCoordinates, DataWatcher, 
-@@ -447,7 +451,16 @@
- 
-     public void dropCurrentItem()
-     {
-        dropPlayerItemWithRandomChoice(inventory.decrStackSize(inventory.currentItem, 1), false);
-+    	ItemStack stack = inventory.getCurrentItem();
-+    	if (stack == null)
-+    	{
-+    		return;
-+    	}    	
-+    	
-+    	if (stack.getItem().onDroppedByPlayer(stack, this))
-+    	{
-+            dropPlayerItemWithRandomChoice(inventory.decrStackSize(inventory.currentItem, 1), false);
-+    	}
-     }
- 
-     public void dropPlayerItem(ItemStack itemstack)
-@@ -493,6 +506,8 @@
-         worldObj.spawnEntityInWorld(entityitem);
+@@ -493,6 +497,8 @@
+         worldObj.entityJoinedWorld(entityitem);
     }
 
 +    /* FORGE: This isnt called anymore
@@ -38,7 +20,7 @@
     public float getCurrentPlayerStrVsBlock(Block block)
     {
         float f = inventory.getStrVsBlock(block);
-@@ -521,6 +536,45 @@
+@@ -521,6 +527,45 @@
         return f1;
     }
 
@@ -59,12 +41,12 @@
 +        	f += i * i + 1;
 +        }
 +        
-+        if(isPotionActive(Potion.digSpeed))
+        if(func_35184_a(Potion.digSpeed))
 +        {
 +            f *= 1.0F + (float)(getActivePotionEffect(Potion.digSpeed).getAmplifier() + 1) * 0.2F;
 +        }
 +        
-+        if(isPotionActive(Potion.digSlowdown))
+        if(func_35184_a(Potion.digSlowdown))
 +        {
 +            f *= 1.0F - (float)(getActivePotionEffect(Potion.digSlowdown).getAmplifier() + 1) * 0.2F;
 +        }
@@ -84,7 +66,7 @@
     public boolean canHarvestBlock(Block block)
     {
         return inventory.canHarvestBlock(block);
-@@ -718,7 +772,26 @@
+@@ -718,7 +763,26 @@
     }
 
     protected void damageEntity(DamageSource damagesource, int i)
@@ -109,10 +91,10 @@
 +            return;
 +        }
 +        
-         if(!damagesource.isUnblockable() && func_35180_G())
+         if(!damagesource.unblockable() && func_35180_G())
         {
             i = 1 + i >> 1;
-@@ -770,7 +843,9 @@
+@@ -770,7 +834,9 @@
 
     public void destroyCurrentEquippedItem()
     {
@@ -122,7 +104,7 @@
     }
 
     public double getYOffset()
-@@ -896,6 +971,10 @@
+@@ -896,6 +962,10 @@
 
     public EnumStatus sleepInBedAt(int i, int j, int k)
     {
@@ -1,14 +1,6 @@
 --- ../src_base/minecraft_server/net/minecraft/src/Item.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft_server/net/minecraft/src/Item.java	0000-00-00 00:00:00.000000000 -0000
-@@ -5,6 +5,7 @@
- package net.minecraft.src;
- 
- import java.io.PrintStream;
-+import java.util.ArrayList;
- import java.util.Random;
- 
- // Referenced classes of package net.minecraft.src:
-@@ -175,6 +176,9 @@
+@@ -175,6 +175,9 @@
     private String potionInfo;
     private String itemName;
 
@@ -18,22 +10,7 @@
     protected Item(int i)
     {
         maxStackSize = 64;
-@@ -209,6 +213,14 @@
-         return this;
-     }
- 
-+    /* FORGE: This is called when the item is used, before the block is
-+     * activated.  Return true to prevent any further processing.
-+     */
-+    public boolean onItemUseFirst(ItemStack ist, EntityPlayer player,
-+		    World world, int i, int j, int k, int l) {
-+	    return false;
-+    }
-+
-     public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
-     {
-         return false;
-@@ -219,6 +231,13 @@
+@@ -219,6 +222,13 @@
         return 1.0F;
     }
 
@@ -47,7 +24,7 @@
     public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
     {
         return itemstack;
-@@ -266,6 +285,29 @@
+@@ -266,6 +276,29 @@
         return maxDamage > 0 && !hasSubtypes;
     }
 
@@ -77,30 +54,3 @@
     public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1)
     {
         return false;
-@@ -414,6 +456,26 @@
-         return 0;
-     }
- 
-+    /* FORGE: This is not called by the server, but declared here for compatibility
-+     */
-+    public void addCreativeItems(ArrayList itemList)
-+    {    	
-+    }
-+    
-+    /**
-+     * Called when a player drops the item into the world,
-+     * returning false from this will prevent the item from
-+     * being removed from the players inventory and spawning
-+     * in the world
-+     * 
-+     * @param player The player that dropped the item
-+     * @param item The item stack, before the item is removed.
-+     */
-+    public boolean onDroppedByPlayer(ItemStack item, EntityPlayer player)
-+    {
-+    	return true;
-+    }
-+
-     static 
-     {
-         shovelSteel = (new ItemSpade(0, EnumToolMaterial.IRON)).setIconCoord(2, 5).setItemName("shovelIron");
@@ -19,6 +19,6 @@
 +            		return customBucket;
 +            	}
 +
-                 if(!entityplayer.canPlayerEdit(i, j, k))
+                 if(!entityplayer.func_35200_c(i, j, k))
                 {
                     return itemstack;
@@ -12,8 +12,8 @@
 
     public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
     {
-        if(!entityplayer.canPlayerEdit(i, j, k))
-+        if(entityplayer!=null && !entityplayer.canPlayerEdit(i, j, k))
+-        if(!entityplayer.func_35200_c(i, j, k))
+        if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k))
         {
             return false;
         }
@@ -1,15 +1,16 @@
 --- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java	0000-00-00 00:00:00.000000000 -0000
-@@ -3,7 +3,7 @@
+@@ -3,7 +3,8 @@
 // Decompiler options: packimports(3) braces deadcode fieldsfirst 
 
 package net.minecraft.src;
 -
 +import net.minecraft.src.forge.ForgeHooks;
+import net.minecraft.src.forge.IUseItemFirst;
 
 // Referenced classes of package net.minecraft.src:
 //            EntityPlayer, PlayerCapabilities, World, Block, 
-@@ -81,7 +81,8 @@
+@@ -81,7 +82,8 @@
             if(j != 0)
             {
                 Block block = Block.blocksList[j];
@@ -19,7 +20,7 @@
                 if(f >= 1.0F)
                 {
                     field_22050_k = false;
-@@ -108,7 +109,7 @@
+@@ -108,7 +110,7 @@
         {
             Block.blocksList[i1].onBlockClicked(thisWorld, i, j, k, thisPlayer);
         }
@@ -28,7 +29,7 @@
         {
             blockHarvessted(i, j, k);
         } else
-@@ -128,7 +129,7 @@
+@@ -128,7 +130,7 @@
             if(i1 != 0)
             {
                 Block block = Block.blocksList[i1];
@@ -37,7 +38,7 @@
                 if(f >= 0.7F)
                 {
                     blockHarvessted(i, j, k);
-@@ -150,16 +151,19 @@
+@@ -150,16 +152,19 @@
     {
         Block block = Block.blocksList[thisWorld.getBlockId(i, j, k)];
         int l = thisWorld.getBlockMetadata(i, j, k);
@@ -62,7 +63,7 @@
         int l = thisWorld.getBlockId(i, j, k);
         int i1 = thisWorld.getBlockMetadata(i, j, k);
         thisWorld.playAuxSFXAtEntity(thisPlayer, 2001, i, j, k, l + thisWorld.getBlockMetadata(i, j, k) * 256);
-@@ -169,8 +173,7 @@
+@@ -169,8 +174,7 @@
             ((EntityPlayerMP)thisPlayer).playerNetServerHandler.sendPacket(new Packet53BlockChange(i, j, k, thisWorld));
         } else
         {
@@ -72,7 +73,7 @@
             if(itemstack != null)
             {
                 itemstack.onDestroyBlock(l, i, j, k, thisPlayer);
-@@ -204,6 +207,7 @@
+@@ -204,6 +208,7 @@
             if(itemstack1.stackSize == 0)
             {
                 entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null;
@@ -80,16 +81,15 @@
             }
             return true;
         } else
-@@ -214,6 +218,12 @@
+@@ -214,6 +219,11 @@
 
     public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l)
     {
-+        if (itemstack != null) {
-+		Item it=itemstack.getItem();
-+		if (it.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) {
+	if(itemstack!=null && itemstack.getItem() instanceof IUseItemFirst) {
+		IUseItemFirst iuif=(IUseItemFirst)itemstack.getItem();
+		if(iuif.onItemUseFirst(itemstack,entityplayer,world,i,j,k,l))
 +			return true;
-+		}
-+        }
+	}
         int i1 = world.getBlockId(i, j, k);
         if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer))
         {
@@ -1,37 +0,0 @@
--- ../src_base/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java	0000-00-00 00:00:00.000000000 -0000
-@@ -4,6 +4,8 @@
- 
- package net.minecraft.src;
- 
-+import net.minecraft.src.forge.ISidedInventory;
-+
- 
- // Referenced classes of package net.minecraft.src:
- //            TileEntity, IInventory, ItemStack, World, 
-@@ -11,7 +13,7 @@
- //            NBTTagList, EntityPlayer
- 
- public class TileEntityBrewingStand extends TileEntity
-    implements IInventory
-+    implements IInventory, ISidedInventory
- {
- 
-     private ItemStack brewingItemStacks[];
-@@ -274,5 +276,15 @@
-         }
- 
-         return i;
-    }
-+    }	
-+    
-+    @Override
-+	public int getStartInventorySide(int side) {
-+		return (side == 1 ? 3 : 0);
-+	}
-+
-+	@Override
-+	public int getSizeInventorySide(int side) {
-+		return (side == 1 ? 1 : 3);
-+	}
- }
@@ -144,7 +144,7 @@
 +    	}
     }
 
-     public void markEntityForDespawn(TileEntity tileentity)
+     public void func_35239_a(TileEntity tileentity)
@@ -1762,13 +1751,18 @@
     public boolean isBlockNormalCube(int i, int j, int k)
     {
@@ -154,7 +154,7 @@
 -            return false;
 -        } else
 -        {
-            return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock();
+-            return block.blockMaterial.getIsOpaque() && block.isACube();
 -        }
 +        if(block == null) return false;
 +	return block.isBlockNormalCube(this,i,j,k);
@@ -173,7 +173,7 @@
     public boolean func_41047_b(int i, int j, int k, boolean flag)
@@ -2179,7 +2173,7 @@
 
-     private int computeBlockLightValue(int i, int j, int k, int l, int i1, int j1)
+     private int func_35241_e(int i, int j, int k, int l, int i1, int j1)
     {
 -        int k1 = Block.lightValue[i1];
 +	int k1 = (i1==0)?0:Block.blocksList[i1].getLightValue(this,j,k,l);
@@ -1,34 +0,0 @@
--- ../src_base/minecraft_server/net/minecraft/src/WorldGenDungeons.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft_server/net/minecraft/src/WorldGenDungeons.java	0000-00-00 00:00:00.000000000 -0000
-@@ -7,6 +7,8 @@
- import java.io.PrintStream;
- import java.util.Random;
- 
-+import net.minecraft.src.forge.MinecraftForge;
-+
- // Referenced classes of package net.minecraft.src:
- //            WorldGenerator, World, Material, Block, 
- //            TileEntityChest, TileEntityMobSpawner, ItemStack, Item
-@@ -129,11 +131,11 @@
-                 int k4 = 0;
-                 do
-                 {
-                    if(k4 >= 8)
-+                    if(k4 >= MinecraftForge.getDungeonLootTries())
-                     {
-                         break label0;
-                     }
-                    ItemStack itemstack = pickCheckLootItem(random);
-+                    ItemStack itemstack = MinecraftForge.getRandomDungeonLoot(random);
-                     if(itemstack != null)
-                     {
-                         tileentitychest.setInventorySlotContents(random.nextInt(tileentitychest.getSizeInventory()), itemstack);
-@@ -148,7 +150,7 @@
-         TileEntityMobSpawner tileentitymobspawner = (TileEntityMobSpawner)world.getBlockTileEntity(i, j, k);
-         if(tileentitymobspawner != null)
-         {
-            tileentitymobspawner.setMobID(pickMobSpawner(random));
-+            tileentitymobspawner.setMobID(MinecraftForge.getRandomDungeonMob(random));
-         } else
-         {
-             System.err.println((new StringBuilder()).append("Failed to fetch mob spawner entity at (").append(i).append(", ").append(j).append(", ").append(k).append(")").toString());
@@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH%

 cd forge

-sh package.sh 1.2.4
+sh package.sh 1.2.2

 pause