tagged 1.0.0

forge/forge_common/net/minecraft/src/forge/Configuration.java

@@ -28,12 +28,18 @@ public class Configuration {
 
     private boolean configBlocks[] = null;
 
-    public static final int GENERAL_PROPERTY = 0;
-    public static final int BLOCK_PROPERTY = 1;
-    public static final int ITEM_PROPERTY = 2;
-    
+    public enum PropertyKind {
+        General, Block, Item
+    }
+
     File file;
 
+    public static class Property {
+        public String name;
+        public String value;
+        public String comment;
+    }
+
     public TreeMap<String, Property> blockProperties = new TreeMap<String, Property>();
     public TreeMap<String, Property> itemProperties = new TreeMap<String, Property>();
     public TreeMap<String, Property> generalProperties = new TreeMap<String, Property>();
@@ -61,8 +67,8 @@ public class Configuration {
         }
 
         if (blockProperties.containsKey(key)) {
-			Property property = getOrCreateIntProperty(key,
-					Configuration.BLOCK_PROPERTY, defaultId);
+            Property property = getOrCreateIntProperty(key, PropertyKind.Block,
+                    defaultId);
             configBlocks[Integer.parseInt(property.value)] = true;
             return property;
         } else {
@@ -91,7 +97,7 @@ public class Configuration {
         }
     }
 
-    public Property getOrCreateIntProperty(String key, int kind,
+    public Property getOrCreateIntProperty(String key, PropertyKind kind,
             int defaultValue) {
         Property prop = getOrCreateProperty(key, kind,
                 Integer.toString(defaultValue));
@@ -106,7 +112,7 @@ public class Configuration {
         }
     }
 
-    public Property getOrCreateBooleanProperty(String key, int kind,
+    public Property getOrCreateBooleanProperty(String key, PropertyKind kind,
             boolean defaultValue) {
         Property prop = getOrCreateProperty(key, kind,
                 Boolean.toString(defaultValue));
@@ -120,18 +126,18 @@ public class Configuration {
         }
     }
 
-    public Property getOrCreateProperty(String key, int kind,
+    public Property getOrCreateProperty(String key, PropertyKind kind,
             String defaultValue) {
         TreeMap<String, Property> source = null;
 
         switch (kind) {
-        case GENERAL_PROPERTY:
+        case General:
             source = generalProperties;
             break;
-        case BLOCK_PROPERTY:
+        case Block:
             source = blockProperties;
             break;
-        case ITEM_PROPERTY:
+        case Item:
             source = itemProperties;
             break;
         }

forge/forge_common/net/minecraft/src/forge/IBiomePopulator.java

@@ -0,0 +1,21 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.BiomeGenBase;
+import net.minecraft.src.World;
+
+public interface IBiomePopulator {
+
+    /** 
+     * This is called for each chunk, after the rest of the generation, and
+     * allow contributers to add additional blocks in the world.
+     * 
+     * @see MinecraftForge#registerBiomePopulate(IBiomePopulator)
+     */
+    public void populate(World world, BiomeGenBase biomegenbase, int x, int z);
+
+}

forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java

@@ -17,10 +17,8 @@ import net.minecraft.src.IBlockAccess;
 public interface IConnectRedstone {
     
     /**
-     * When this returns false, the block at location i, j, k cannot make
-     * a redstone connection in the direction given in parameter, otherwise
-     * it can.  Use to control which sides are inputs and outputs for redstone
-     * wires.
+     * When this returns false, the block at location i, j, k cannot provide
+     * redstone power to the direction given in parameter, otherwise it can.
      */
     public boolean canConnectRedstone(IBlockAccess iba, int i, int j, int k,
             int dir);

forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java

@@ -15,7 +15,7 @@ public interface IHarvestHandler {
      * the given block, false if this handler does not know of any particular
      * harvesting. Other rules may activate the harvesting outside of this
      * handler. This is typically used to add e.g. blocks only extracted by 
-     * diamond pickaxe
+     * diamond pixaxe
      * 
      * @see MinecraftForge#registerHarvestHandler(IHarvestHandler)
      */

forge/forge_common/net/minecraft/src/forge/IMultipassRender.java

@@ -5,13 +5,6 @@
 
 package net.minecraft.src.forge;
 
-/** This interface is to be implemented by a Block class.  Allows a block
- * type to perform rendering in both render passes, in case some parts of the
- * block are solid and others are transparent.
- */
 public interface IMultipassRender {
-	/** Returns true when the block has things to render in this render
-	 * pass.
-	 */
 	public boolean canRenderInPass(int n);
 }

forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java

@@ -18,8 +18,8 @@ public interface IOverrideReplace {
     
     /**
      * Return true if this block has to take control over replacement, for
-     * the intended replacement given by the parameter bid. If false, then
-     * the block replacement will be prevented.
+     * the intended replacement given by the parameter bid. If true, then
+     * the actual replacement is supposed to have occured in the block.
      */
 	public boolean canReplaceBlock(World world, int i, int j, int k, int bid);
 	

forge/forge_common/net/minecraft/src/forge/MinecraftForge.java

@@ -17,6 +17,7 @@ import net.minecraft.src.World;
 public class MinecraftForge {
 
     private static LinkedList<IBucketHandler> bucketHandlers = new LinkedList<IBucketHandler>();
+    private static LinkedList<IBiomePopulator> biomePopulators = new LinkedList<IBiomePopulator>();
     private static LinkedList<IHarvestHandler> harvestHandlers = new LinkedList<IHarvestHandler>();
 
     /**
@@ -25,6 +26,13 @@ public class MinecraftForge {
     public static void registerCustomBucketHander(IBucketHandler handler) {
         bucketHandlers.add(handler);
     }
+
+    /**
+     * Registers a new biome contributer.
+     */
+    public static void registerBiomePopulate(IBiomePopulator populator) {
+        biomePopulators.add(populator);
+    }
     
     /**
      * Registers a new harvest handler.
@@ -48,6 +56,16 @@ public class MinecraftForge {
         return null;
     }
 
+    /**
+     * This is not supposed to be called outside of Minecraft internals.
+     */
+    public static void populateBiome(World world, BiomeGenBase biomegenbase,
+            int x, int z) {
+        for (IBiomePopulator populator : biomePopulators) {
+            populator.populate(world, biomegenbase, x, z);
+        }
+    }
+
     /**
      * This is not supposed to be called outside of Minecraft internals.
      */
@@ -62,10 +80,10 @@ public class MinecraftForge {
     }
 
     /**
-     * Add a block to the list of blocks to which the pickaxe is know to be
+     * Add a block to the list of blocks to which the pixaxe is know to be
      * effective.
      */
-    public static void addPickaxeBlockEffectiveAgainst (Block block) {
+    public static void addPixaxeBlockEffectiveAgainst (Block block) {
         ((ItemTool) Item.pickaxeWood).addBlockEffectiveAgainst(block);
         ((ItemTool) Item.pickaxeStone).addBlockEffectiveAgainst(block);
         ((ItemTool) Item.pickaxeSteel).addBlockEffectiveAgainst(block);

forge/forge_common/net/minecraft/src/forge/Property.java

@@ -1,12 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public 
- * License v1.0.
- */
-
-package net.minecraft.src.forge;
-
-public class Property {
-    public String name;
-    public String value;
-    public String comment;
-}

forge/minecraft.patch

@@ -1,6 +1,6 @@
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java
---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java	2011-07-29 16:35:27.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java	2011-07-29 23:21:33.781992000 +0200
++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java	2011-07-30 08:23:20.966701700 +0200
 @@ -3,6 +3,7 @@
  // Decompiler options: packimports(3) braces deadcode 
  
@@ -21,8 +21,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds
          {
              return true;
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.java ../src_work/minecraft/net/minecraft/src/Chunk.java
---- ../src_base/minecraft/net/minecraft/src/Chunk.java	2011-07-29 16:35:26.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/Chunk.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/Chunk.java	2011-07-29 23:21:33.862997000 +0200
++++ ../src_work/minecraft/net/minecraft/src/Chunk.java	2011-07-30 08:28:53.466719600 +0200
 @@ -3,6 +3,7 @@
  // Decompiler options: packimports(3) braces deadcode 
  
@@ -59,9 +59,30 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav
          blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff);
          if(j1 != 0)
          {
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java
+--- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java	2011-07-29 23:21:33.906999000 +0200
++++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java	2011-07-30 08:15:01.684144300 +0200
+@@ -6,6 +6,8 @@
+ 
+ import java.util.Random;
+ 
++import net.minecraft.src.forge.MinecraftForge;
++
+ // Referenced classes of package net.minecraft.src:
+ //            IChunkProvider, MapGenCaves, NoiseGeneratorOctaves, Block, 
+ //            BiomeGenBase, Chunk, World, WorldChunkManager, 
+@@ -632,6 +634,8 @@
+             int i25 = l + rand.nextInt(16) + 8;
+             (new WorldGenLiquids(Block.lavaMoving.blockID)).generate(worldObj, rand, i22, l23, i25);
+         }
++        
++        MinecraftForge.populateBiome(worldObj, biomegenbase, k, l);
+ 
+         generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16);
+         for(int j19 = k + 8; j19 < k + 8 + 16; j19++)
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRenderer.java ../src_work/minecraft/net/minecraft/src/EffectRenderer.java
---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java	2011-07-29 16:35:27.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java	2011-07-29 23:21:33.988004400 +0200
++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java	2011-07-30 08:15:01.696145000 +0200
 @@ -7,6 +7,9 @@
  import java.util.*;
  import org.lwjgl.opengl.GL11;
@@ -205,8 +226,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen
      private Random rand;
  }
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPlayer.java ../src_work/minecraft/net/minecraft/src/EntityPlayer.java
---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java	2011-07-29 16:35:27.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java	2011-07-29 23:21:34.219017000 +0200
++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java	2011-07-30 21:03:33.693757400 +0200
 @@ -6,6 +6,8 @@
  
  import java.util.*;
@@ -239,8 +260,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla
          int k = i * j + damageRemainder;
          inventory.damageArmor(i);
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion.java ../src_work/minecraft/net/minecraft/src/Explosion.java
---- ../src_base/minecraft/net/minecraft/src/Explosion.java	2011-07-29 16:35:27.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/Explosion.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/Explosion.java	2011-07-29 23:21:34.371026000 +0200
++++ ../src_work/minecraft/net/minecraft/src/Explosion.java	2011-07-30 08:35:55.747872700 +0200
 @@ -3,6 +3,7 @@
  // Decompiler options: packimports(3) braces deadcode 
  
@@ -269,8 +290,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion
                          if(f1 > 0.0F)
                          {
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucket.java ../src_work/minecraft/net/minecraft/src/ItemBucket.java
---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java	2011-07-29 16:35:27.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java	2011-07-29 23:21:34.649042000 +0200
++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java	2011-07-30 08:15:01.709145800 +0200
 @@ -6,6 +6,8 @@
  
  import java.util.Random;
@@ -295,8 +316,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke
                  {
                      world.setBlockWithNotify(i, j, k, 0);
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java
---- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java	2011-07-29 16:35:26.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java	2011-07-29 23:21:34.696044000 +0200
++++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java	2011-07-30 08:15:01.718146300 +0200
 @@ -4,6 +4,8 @@
  
  package net.minecraft.src;
@@ -317,8 +338,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPicka
          {
              return true;
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRenderer.java ../src_work/minecraft/net/minecraft/src/ItemRenderer.java
---- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java	2011-07-29 16:35:27.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java	2011-07-29 23:21:34.720046300 +0200
++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java	2011-07-30 08:15:01.733147100 +0200
 @@ -5,6 +5,8 @@
  package net.minecraft.src;
  
@@ -348,8 +369,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende
              Tessellator tessellator = Tessellator.instance;
              int i = entityliving.getItemIcon(itemstack);
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.java ../src_work/minecraft/net/minecraft/src/ItemTool.java
---- ../src_base/minecraft/net/minecraft/src/ItemTool.java	2011-07-29 16:35:27.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java	2011-07-31 21:49:24.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/ItemTool.java	2011-07-29 23:21:34.752048000 +0200
++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java	2011-07-30 09:12:08.010119000 +0200
 @@ -4,6 +4,7 @@
  
  package net.minecraft.src;
@@ -367,12 +388,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.
 +        blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst,
 +                blocksEffectiveAgainst.length + 1);
 +        
-+        blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = block;
++        blocksEffectiveAgainst [blocksEffectiveAgainst.length] = block;
 +    }
  }
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerController.java ../src_work/minecraft/net/minecraft/src/PlayerController.java
---- ../src_base/minecraft/net/minecraft/src/PlayerController.java	2011-07-29 16:35:27.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/PlayerController.java	2011-07-29 23:21:35.368083000 +0200
++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java	2011-07-30 08:41:23.244604400 +0200
 @@ -3,6 +3,7 @@
  // Decompiler options: packimports(3) braces deadcode 
  
@@ -395,8 +416,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
          if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer))
          {
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderItem.java ../src_work/minecraft/net/minecraft/src/RenderItem.java
---- ../src_base/minecraft/net/minecraft/src/RenderItem.java	2011-07-29 16:35:27.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/RenderItem.java	2011-07-29 23:21:35.881112700 +0200
++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java	2011-07-30 08:15:01.745147800 +0200
 @@ -5,6 +5,9 @@
  package net.minecraft.src;
  
@@ -458,8 +479,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte
              int k1 = Item.itemsList[i].getColorFromDamage(j);
              float f = (float)(k1 >> 16 & 0xff) / 255F;
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRenderer.java ../src_work/minecraft/net/minecraft/src/WorldRenderer.java
---- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java	2011-07-29 16:35:27.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java	2011-07-29 23:21:36.427143900 +0200
++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java	2011-07-30 08:28:15.329538300 +0200
 @@ -3,8 +3,12 @@
  // Decompiler options: packimports(3) braces deadcode 
  
@@ -503,8 +524,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend
                      }
  
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java
---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java	2011-07-29 16:35:28.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java	2011-07-29 23:21:49.985919000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java	2011-07-30 08:15:01.754148300 +0200
 @@ -3,6 +3,7 @@
  // Decompiler options: packimports(3) braces deadcode 
  
@@ -525,8 +546,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
          {
              return true;
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Chunk.java ../src_work/minecraft_server/net/minecraft/src/Chunk.java
---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java	2011-07-29 16:35:28.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java	2011-07-29 23:21:50.050923000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java	2011-07-30 08:15:01.770149300 +0200
 @@ -3,6 +3,7 @@
  // Decompiler options: packimports(3) braces deadcode 
  
@@ -563,9 +584,30 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch
          blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff);
          if(j1 != 0)
          {
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java
+--- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java	2011-07-29 23:21:50.088925000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java	2011-07-30 08:15:01.786150200 +0200
+@@ -6,6 +6,8 @@
+ 
+ import java.util.Random;
+ 
++import net.minecraft.src.forge.MinecraftForge;
++
+ // Referenced classes of package net.minecraft.src:
+ //            IChunkProvider, MapGenCaves, NoiseGeneratorOctaves, Block, 
+ //            BiomeGenBase, Chunk, World, WorldChunkManager, 
+@@ -632,6 +634,8 @@
+             int i25 = l + rand.nextInt(16) + 8;
+             (new WorldGenLiquids(Block.lavaMoving.blockID)).generate(worldObj, rand, i22, l23, i25);
+         }
++        
++        MinecraftForge.populateBiome(worldObj, biomegenbase, k, l);
+ 
+         generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16);
+         for(int j19 = k + 8; j19 < k + 8 + 16; j19++)
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java
---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java	2011-07-29 16:35:28.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java	2011-07-29 23:21:50.320938000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java	2011-07-30 21:04:21.430487800 +0200
 @@ -6,6 +6,8 @@
  
  import java.util.*;
@@ -598,8 +640,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En
          int k = i * j + damageRemainder;
          inventory.damageArmor(i);
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Explosion.java ../src_work/minecraft_server/net/minecraft/src/Explosion.java
---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java	2011-07-29 16:35:28.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java	2011-07-29 23:21:50.402943000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java	2011-07-30 08:15:01.806151300 +0200
 @@ -3,6 +3,7 @@
  // Decompiler options: packimports(3) braces deadcode 
  
@@ -627,8 +669,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex
                          if(f1 > 0.0F)
                          {
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java
---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java	2011-07-29 16:35:28.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java	2011-07-29 23:21:50.491948000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java	2011-07-30 08:15:01.811151600 +0200
 @@ -6,6 +6,8 @@
  
  import java.util.Random;
@@ -653,8 +695,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
                  {
                      world.setBlockWithNotify(i, j, k, 0);
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java
---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java	2011-07-29 16:35:28.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java	2011-07-29 23:21:50.519949000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java	2011-07-30 08:15:01.830152700 +0200
 @@ -3,6 +3,7 @@
  // Decompiler options: packimports(3) braces deadcode 
  
@@ -676,8 +718,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
          if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer))
          {
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java
---- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java	2011-07-29 16:35:28.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java	2011-07-29 23:21:50.541951000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java	2011-07-30 08:15:01.834152900 +0200
 @@ -4,6 +4,8 @@
  
  package net.minecraft.src;
@@ -698,8 +740,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
          {
              return true;
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemTool.java ../src_work/minecraft_server/net/minecraft/src/ItemTool.java
---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java	2011-07-29 16:35:28.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java	2011-07-31 21:49:37.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java	2011-07-29 23:21:50.581953000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java	2011-07-30 08:15:01.838153200 +0200
 @@ -4,6 +4,8 @@
  
  package net.minecraft.src;
@@ -718,12 +760,12 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
 +        blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst,
 +                blocksEffectiveAgainst.length + 1);
 +        
-+        blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = block;
++        blocksEffectiveAgainst [blocksEffectiveAgainst.length + 1] = block;
 +    }
  }
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java
---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java	2011-07-29 16:35:28.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java	2011-07-31 21:44:50.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java	2011-07-29 23:21:51.077981000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java	2011-07-30 08:15:01.842153400 +0200
 @@ -169,12 +169,11 @@
              sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver));
              for(int k = 0; k < numBlocksToUpdate; k++)