Fixed an unroll from the MCL merge. Updated MCP mappings.

Fixed NPE on some JVM's
Merged in MCL branch
2026-11-14 01:04:24 +00:00 · 2012-01-13 19:21:01 +00:00 · 2012-01-12 07:43:55 +00:00 · 2012-01-12 07:38:23 +00:00 · 2012-01-11 19:40:04 +00:00 · 2012-01-11 18:39:42 +00:00
204 changed files with 30145 additions and 1191 deletions
@@ -0,0 +1,11 @@
+package net.minecraft.src;
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface MLProp {
+	String name() default "";
+	String info() default "";
+	double min() default Double.NEGATIVE_INFINITY;
+	double max() default Double.POSITIVE_INFINITY;
+}
@@ -0,0 +1 @@
+asdfsnb  -a -v "svn"+
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+cd ..
+
+rm -rf src bin src_forge
+
+cp -a src_work src_forge
+
+cp -a forge/forge_client/src/net/* src_forge/minecraft/net/
+cp -a forge/forge_common/net/* src_forge/minecraft/net/
+cp -a forge/forge_common/net/* src_forge/minecraft_server/net/
+
+cp -a src_forge src
+
+./recompile.sh
+
+
@@ -0,0 +1,228 @@
+net/minecraft/client/Minecraft.func_6257_q()V=org/lwjgl/LWJGLException
+net/minecraft/client/Minecraft.func_6271_a()V=org/lwjgl/LWJGLException
+net/minecraft/src/ChunkLoader.func_812_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/ChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
+net/minecraft/src/ChunkLoader.func_815_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_1138_a(Ljava/io/InputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_1139_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_1141_a(Ljava/io/DataInput;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_1143_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/OutputStream;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_35620_b(Lnet/minecraft/src/NBTTagCompound;Ljava/io/File;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_35621_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/File;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_35622_a(Ljava/io/File;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_40591_a(Lnet/minecraft/src/NBTTagCompound;)[B=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_40592_a([B)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/DataWatcher.func_21125_a(Ljava/util/List;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/DataWatcher.func_21127_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/DataWatcher.func_21128_a(Ljava/io/DataOutputStream;Lnet/minecraft/src/WatchableObject;)V=java/io/IOException
+net/minecraft/src/DataWatcher.func_21131_a(Ljava/io/DataInputStream;)Ljava/util/List;=java/io/IOException
+net/minecraft/src/GuiMultiplayer.func_35328_b(Lnet/minecraft/src/ServerNBTStorage;)V=java/io/IOException
+net/minecraft/src/GuiMultiplayer.func_35336_a(Lnet/minecraft/src/GuiMultiplayer;Lnet/minecraft/src/ServerNBTStorage;)V=java/io/IOException
+net/minecraft/src/IChunkLoader.func_812_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/IChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
+net/minecraft/src/IChunkLoader.func_815_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/J_CompactJsonFormatter.func_27328_a(Lnet/minecraft/src/J_JsonNode;Ljava/io/Writer;)V=java/io/IOException
+net/minecraft/src/J_CompactJsonFormatter.func_27329_a(Lnet/minecraft/src/J_JsonRootNode;Ljava/io/Writer;)V=java/io/IOException
+net/minecraft/src/J_JdomParser.func_27366_a(Ljava/io/Reader;)Lnet/minecraft/src/J_JsonRootNode;=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/J_JdomParser.func_27367_a(Ljava/lang/String;)Lnet/minecraft/src/J_JsonRootNode;=net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_PositionTrackingPushbackReader.func_27333_c()I=java/io/IOException
+net/minecraft/src/J_PositionTrackingPushbackReader.func_27334_a(C)V=java/io/IOException
+net/minecraft/src/J_PositionTrackingPushbackReader.func_27336_b([C)I=java/io/IOException
+net/minecraft/src/J_SajParser.func_27448_l(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)I=java/io/IOException
+net/minecraft/src/J_SajParser.func_27449_c(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/J_SajParser.func_27450_k(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)I=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27451_b(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27452_i(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/J_SajParser.func_27453_b(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/J_SajParser.func_27454_g(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27455_a(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/J_SajParser.func_27456_e(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException
+net/minecraft/src/J_SajParser.func_27457_j(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27458_d(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27459_a(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27460_c(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27461_h(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException
+net/minecraft/src/J_SajParser.func_27462_f(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27463_a(Ljava/io/Reader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/J_SajParser.func_27464_d(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/NBTBase.func_734_b(Ljava/io/DataInput;)Lnet/minecraft/src/NBTBase;=java/io/IOException
+net/minecraft/src/NBTBase.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTBase.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTBase.func_738_a(Lnet/minecraft/src/NBTBase;Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagByte.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagByte.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagByteArray.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagByteArray.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagCompound.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagCompound.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagDouble.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagDouble.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagEnd.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagEnd.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagFloat.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagFloat.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagInt.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagInt.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagList.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagList.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagLong.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagLong.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagShort.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagShort.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagString.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagString.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NetClientHandler.<init>(Lnet/minecraft/client/Minecraft;Ljava/lang/String;I)V=java/net/UnknownHostException,java/io/IOException
+net/minecraft/src/NetworkManager.<init>(Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;)V=java/io/IOException
+net/minecraft/src/Packet.func_27048_a(Ljava/io/DataInputStream;I)Ljava/lang/String;=java/io/IOException
+net/minecraft/src/Packet.func_27049_a(Ljava/lang/String;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_324_b(Ljava/io/DataInputStream;Z)Lnet/minecraft/src/Packet;=java/io/IOException
+net/minecraft/src/Packet.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_328_a(Lnet/minecraft/src/Packet;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_40186_c(Ljava/io/DataInputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/Packet.func_40187_b(Ljava/io/DataInputStream;)Lnet/minecraft/src/ItemStack;=java/io/IOException
+net/minecraft/src/Packet.func_40188_a(Lnet/minecraft/src/ItemStack;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_40189_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet0KeepAlive.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet0KeepAlive.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet100OpenWindow.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet100OpenWindow.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet101CloseWindow.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet101CloseWindow.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet102WindowClick.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet102WindowClick.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet103SetSlot.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet103SetSlot.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet104WindowItems.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet104WindowItems.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet105UpdateProgressbar.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet105UpdateProgressbar.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet106Transaction.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet106Transaction.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet107CreativeSetSlot.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet107CreativeSetSlot.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet108EnchantItem.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet108EnchantItem.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet10Flying.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet10Flying.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet11PlayerPosition.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet11PlayerPosition.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet12PlayerLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet12PlayerLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet130UpdateSign.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet130UpdateSign.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet131MapData.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet131MapData.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet13PlayerLookMove.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet13PlayerLookMove.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet14BlockDig.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet14BlockDig.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet15Place.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet15Place.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet16BlockItemSwitch.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet16BlockItemSwitch.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet17Sleep.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet17Sleep.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet18Animation.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet18Animation.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet19EntityAction.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet19EntityAction.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet1Login.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet1Login.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet200Statistic.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet200Statistic.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet201PlayerInfo.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet201PlayerInfo.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet20NamedEntitySpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet20NamedEntitySpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet21PickupSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet21PickupSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet22Collect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet22Collect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet23VehicleSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet23VehicleSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet24MobSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet24MobSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet254ServerPing.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet254ServerPing.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet255KickDisconnect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet255KickDisconnect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet25EntityPainting.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet25EntityPainting.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet26EntityExpOrb.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet26EntityExpOrb.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet27Position.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet27Position.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet28EntityVelocity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet28EntityVelocity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet29DestroyEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet29DestroyEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet2Handshake.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet2Handshake.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet30Entity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet30Entity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet31RelEntityMove.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet31RelEntityMove.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet32EntityLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet32EntityLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet33RelEntityMoveLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet33RelEntityMoveLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet34EntityTeleport.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet34EntityTeleport.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet38EntityStatus.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet38EntityStatus.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet39AttachEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet39AttachEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet3Chat.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet3Chat.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet40EntityMetadata.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet40EntityMetadata.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet41EntityEffect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet41EntityEffect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet42RemoveEntityEffect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet42RemoveEntityEffect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet43Experience.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet43Experience.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet4UpdateTime.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet4UpdateTime.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet50PreChunk.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet50PreChunk.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet51MapChunk.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet51MapChunk.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet52MultiBlockChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet52MultiBlockChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet53BlockChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet53BlockChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet54PlayNoteBlock.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet54PlayNoteBlock.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet5PlayerInventory.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet5PlayerInventory.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet60Explosion.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet60Explosion.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet61DoorChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet61DoorChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet6SpawnPosition.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet6SpawnPosition.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet70Bed.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet70Bed.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet71Weather.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet71Weather.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet7UseEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet7UseEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet8UpdateHealth.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet8UpdateHealth.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet9Respawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet9Respawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/RegionFile.func_22196_b()V=java/io/IOException
+net/minecraft/src/RegionFile.func_22198_a(III)V=java/io/IOException
+net/minecraft/src/RegionFile.func_22200_a(I[BI)V=java/io/IOException
+net/minecraft/src/RegionFile.func_22208_b(III)V=java/io/IOException
+net/minecraft/src/RenderEngine.func_6526_a(Ljava/io/InputStream;)Ljava/awt/image/BufferedImage;=java/io/IOException
+net/minecraft/src/StatsSyncher.func_27410_a(Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V=java/io/IOException
+net/minecraft/src/StatsSyncher.func_27412_a(Lnet/minecraft/src/StatsSyncher;Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V=java/io/IOException
+net/minecraft/src/TexturePackBase.func_6485_a(Lnet/minecraft/client/Minecraft;)V=java/io/IOException
+net/minecraft/src/TexturePackCustom.func_6485_a(Lnet/minecraft/client/Minecraft;)V=java/io/IOException
+net/minecraft/src/ThreadDownloadResources.func_1212_a(Ljava/net/URL;Ljava/io/File;J)V=java/io/IOException
+net/minecraft/src/ThreadedChunkLoader.func_40551_a(Lnet/minecraft/src/ThreadedChunkLoaderPending;)V=java/io/IOException
+net/minecraft/src/ThreadedChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
+net/minecraft/src/ThreadedFileIOBase.func_40566_a()V=java/lang/InterruptedException
@@ -0,0 +1,139 @@
+[DEFAULT]
+DirTemp    = temp
+DirSrc     = src
+DirLogs    = logs
+DirBin     = bin
+DirJars    = jars
+DirReobf   = reobf
+DirConf    = conf
+DirRuntime = runtime
+DirLib     = lib
+DirFFOut   = temp/ffout
+
+[CSV]
+Classes = %(DirConf)s/classes.csv
+Methods = %(DirConf)s/methods.csv
+Fields  = %(DirConf)s/fields.csv
+
+[SRGS]
+Client  = %(DirTemp)s/client_rg.srg
+Server  = %(DirTemp)s/server_rg.srg
+
+[JAR]
+DirNatives = %(DirJars)s/bin/natives
+Client     = %(DirJars)s/bin/minecraft.jar
+Server     = %(DirJars)s/minecraft_server.jar
+MD5Client  = 3820d222b95d0b8c520d9596a756a6e6
+MD5Server  = 934b6010999daa1f1b1ccdf4cb77e052
+
+[RETROGUARD]
+Location       = %(DirRuntime)s/bin/retroguard.jar
+RetroConf      = %(DirTemp)s/retroguard.cfg
+RetroReobConf  = %(DirTemp)s/retroguard_ro.cfg
+ClientConf     = %(DirTemp)s/client_rg.cfg
+ServerConf     = %(DirTemp)s/server_rg.cfg
+ClientReobConf = %(DirTemp)s/client_ro.cfg
+ServerReobConf = %(DirTemp)s/server_ro.cfg
+ClientOut      = %(DirTemp)s/minecraft_rg.jar
+ServerOut      = %(DirTemp)s/minecraft_server_rg.jar
+ClientLog      = %(DirLogs)s/client_rg.log
+ServerLog      = %(DirLogs)s/server_rg.log
+ClientDeobLog  = %(DirLogs)s/client_deob.log
+ServerDeobLog  = %(DirLogs)s/server_deob.log
+
+[EXCEPTOR]
+XClientCfg      = %(DirConf)s/client.exc
+XServerCfg      = %(DirConf)s/server.exc
+XClientOut      = %(DirTemp)s/minecraft_exc.jar
+XServerOut      = %(DirTemp)s/minecraft_server_exc.jar
+XClientLog      = %(DirLogs)s/client_exc.log
+XServerLog      = %(DirLogs)s/server_exc.log
+
+[DECOMPILE]
+FFClientConf  = -rbr=0 -dgs=1 -asc=1
+FFServerConf  = -rbr=0 -dgs=1 -asc=1
+FFClientOut   = %(DirFFOut)s/client
+FFServerOut   = %(DirFFOut)s/server
+FFClientSrc   = %(DirFFOut)s/minecraft_exc.jar
+FFServerSrc   = %(DirFFOut)s/minecraft_server_exc.jar
+FFSource      = net
+
+[OUTPUT]
+BinOut     = %(DirTemp)s/bin
+BinClient  = %(DirTemp)s/bin/minecraft
+BinServer  = %(DirTemp)s/bin/minecraft_server
+SrcClient  = %(DirSrc)s/minecraft
+SrcServer  = %(DirSrc)s/minecraft_server
+
+[PACKAGES]
+PkgClient  = net/minecraft/src,net/minecraft/client
+PkgServer  = net/minecraft/src,net/minecraft/server
+
+[PATCHES]
+PatchClient   = %(DirConf)s/patches/minecraft.patch
+PatchServer   = %(DirConf)s/patches/minecraft_server.patch
+PatchTemp     = %(DirTemp)s/temp.patch
+FFPatchClient = %(DirConf)s/patches/minecraft_ff.patch
+FFPatchServer = %(DirConf)s/patches/minecraft_server_ff.patch
+
+[RECOMPILE]
+BinClient       = %(DirBin)s/minecraft
+BinServer       = %(DirBin)s/minecraft_server
+ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
+ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
+ClientFixes     = %(DirConf)s/patches
+
+[REOBF]
+SAFFXClient       = %(DirTemp)s/minecraft.saffx
+SAFFXServer       = %(DirTemp)s/minecraft_server.saffx
+MD5Client         = %(DirTemp)s/client.md5
+MD5Server         = %(DirTemp)s/server.md5
+MD5PreReobfClient = %(DirTemp)s/client_reobf.md5
+MD5PreReobfServer = %(DirTemp)s/server_reobf.md5
+ObfSRGClient      = %(DirTemp)s/client_ro.srg
+ObfSRGServer      = %(DirTemp)s/server_ro.srg
+RecompJarClient   = %(DirTemp)s/client_recomp.jar
+RecompJarServer   = %(DirTemp)s/server_recomp.jar
+ObfJarClient      = %(DirTemp)s/client_reobf.jar
+ObfJarServer      = %(DirTemp)s/server_reobf.jar
+ReobfDirClient    = %(DirReobf)s/minecraft
+ReobfDirServer    = %(DirReobf)s/minecraft_server
+ReobfClientLog    = %(DirLogs)s/client_reob.log
+ReobfServerLog    = %(DirLogs)s/server_reob.log
+FixSound          = minecraft/me.class
+FixStart          = minecraft/Start.class
+NullPkg           = net/minecraft/src
+IgnorePkg         = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml
+
+[GETMODSOURCE]
+OutSRCClient	= modsrc/client
+OutSRCServer	= modsrc/server
+OutSRC			= modsrc
+
+[MCP]
+LogFile           = %(DirLogs)s/mcp.log
+LogFileErr        = %(DirLogs)s/mcperr.log
+
+[COMMANDS]
+Patcher       = %(DirRuntime)s/bin/applydiff.exe
+JadRetro      = %(DirRuntime)s/bin/jadretro.jar
+Fernflower    = %(DirRuntime)s/bin/fernflower.jar
+Jadwin        = %(DirRuntime)s/bin/jad.exe
+Jadlinux      = %(DirRuntime)s/bin/jad.exe
+Jadosx        = %(DirRuntime)s/bin/jad-osx
+Exceptor      = %(DirRuntime)s/bin/exceptor.jar
+CmdRG         = %s -cp {classpath} RetroGuard -searge {conffile}
+CmdRGReobf    = %s -cp {classpath} RetroGuard -notch  {conffile}
+CmdJadretro   = %s -jar {jarjr} {targetdir}
+CmdRecompClt  = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs} {fixes}/*.java
+CmdRecompSrv  = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
+CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start
+CmdJadwin     = .\{binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff {classes}
+CmdJadlinux   = wine {binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff "{classes}"
+CmdJadosx     = {binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff {classes}
+CmdPatchwin   = .\%(Patcher)s --binary -p1 -u -i ..\..\{patchfile} -d {srcdir}
+CmdPatchlinux = patch --binary -p1 -u -i ../../{patchfile} -d {srcdir}
+CmdPatchosx   = patch --binary -p1 -u -i ../../{patchfile} -d {srcdir}
+CmdFernflower = %s -jar {jarff} {conf} {jarin} {jarout}
+CmdExceptor   = %s -jar {jarexc} {input} {output} {conf} {log}
@@ -0,0 +1,27 @@
+import java.io.File;
+import java.lang.reflect.Field;
+
+import net.minecraft.client.Minecraft;
+
+public class Start
+{
+	public static void main(String[] args)
+	{
+		try
+		{
+			// set new minecraft data folder to prevent it from using the .minecraft folder
+			// this makes it a portable version
+			Field f = Minecraft.class.getDeclaredField("minecraftDir");
+			Field.setAccessible(new Field[] { f }, true);
+			f.set(null, new File("."));
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			return;
+		}
+
+		// start minecraft game application
+		Minecraft.main(args);
+	}
+}
@@ -0,0 +1,10 @@
+// this is needed for the sound engine to work with deobfuscated sourcecode without crashing
+
+public class me
+{
+    public static int c(double d)
+    {
+        int i = (int)d;
+        return d >= (double)i ? i : i - 1;
+    }
+}
@@ -0,0 +1,109 @@
+diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
+--- minecraft\net\minecraft\client\Minecraft.java	Tue Nov 22 23:21:44 2011
+++ minecraft_patched\net\minecraft\client\Minecraft.java	Wed Nov 23 00:09:14 2011
+@@ -1600,11 +1600,13 @@
+ 
+             this.field_6324_e.func_600_a(var6.field_22395_a + var10, 64, var6.field_22396_c + var8);
+             if(!this.field_6327_b.func_35643_e()) {
+/*
+                while(true) {
+                   if(this.field_6324_e.func_6465_g()) {
+                      continue;
+                   }
+                }
+*/
+             }
+          }
+       }
+diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
+--- minecraft\net\minecraft\src\CodecMus.java	Tue Nov 22 23:21:36 2011
+++ minecraft_patched\net\minecraft\src\CodecMus.java	Wed Nov 23 00:09:14 2011
+@@ -1,5 +1,6 @@
+ package net.minecraft.src;
+ 
+import java.io.IOException;
+ import java.io.InputStream;
+ import net.minecraft.src.MusInputStream;
+ import paulscode.sound.codecs.CodecJOrbis;
+@@ -7,6 +8,11 @@
+ public class CodecMus extends CodecJOrbis {
+ 
+    protected InputStream openInputStream() {
+-      return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
+      try {
+         return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
+      }
+      catch (IOException e) {
+         return null;
+      }
+    }
+ }
+diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
+--- minecraft\net\minecraft\src\ItemMap.java	Tue Nov 22 23:21:24 2011
+++ minecraft_patched\net\minecraft\src\ItemMap.java	Wed Nov 23 00:09:14 2011
+@@ -19,7 +19,6 @@
+    }
+ 
+    public static MapData func_28013_a(short var0, World var1) {
+-      "map_" + var0;
+       MapData var3 = (MapData)var1.func_28103_a(MapData.class, "map_" + var0);
+       if(var3 == null) {
+          int var4 = var1.func_28101_b("map");
+@@ -32,7 +31,6 @@
+    }
+ 
+    public MapData func_28012_a(ItemStack var1, World var2) {
+-      "map_" + var1.func_21181_i();
+       MapData var4 = (MapData)var2.func_28103_a(MapData.class, "map_" + var1.func_21181_i());
+       if(var4 == null) {
+          var1.func_28156_b(var2.func_28101_b("map"));
+diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\net\minecraft\src\MusInputStream.java
+--- minecraft\net\minecraft\src\MusInputStream.java	Tue Nov 22 23:21:24 2011
+++ minecraft_patched\net\minecraft\src\MusInputStream.java	Wed Nov 23 00:09:14 2011
+@@ -1,5 +1,6 @@
+ package net.minecraft.src;
+ 
+import java.io.IOException;
+ import java.io.InputStream;
+ import java.net.URL;
+ import net.minecraft.src.CodecMus;
+@@ -28,7 +29,12 @@
+    }
+ 
+    public int read(byte[] var1, int var2, int var3) {
+-      var3 = this.field_1515_d.read(var1, var2, var3);
+      try {
+         var3 = this.field_1515_d.read(var1, var2, var3);
+      }
+      catch (IOException e) {
+         return 0;
+      }
+ 
+       for(int var4 = 0; var4 < var3; ++var4) {
+          byte var5 = var1[var2 + var4] = (byte)(var1[var2 + var4] ^ this.field_1516_c >> 8);
+diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
+--- minecraft\net\minecraft\src\RenderGlobal.java	Tue Nov 22 23:21:20 2011
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Wed Nov 23 00:10:20 2011
+@@ -1466,7 +1466,7 @@
+          double var15 = this.field_1439_t.field_22009_h.field_611_ak - var2;
+          double var17 = this.field_1439_t.field_22009_h.field_610_al - var4;
+          double var19 = this.field_1439_t.field_22009_h.field_609_am - var6;
+-         Object var21 = null;
+         EntityFX var21 = null;
+          if(var1.equals("hugeexplosion")) {
+             this.field_1439_t.field_6321_h.func_1192_a(var21 = new EntityHugeExplodeFX(this.field_1448_k, var2, var4, var6, var8, var10, var12));
+          } else if(var1.equals("largeexplode")) {
+diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Tue Nov 22 23:21:30 2011
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Wed Nov 23 00:09:14 2011
+@@ -21,7 +21,9 @@
+    }
+ 
+    public void run() {
+-      this.func_40568_b();
+      while (true) {
+         this.func_40568_b();
+      }
+    }
+ 
+    private void func_40568_b() {
@@ -0,0 +1,26 @@
+diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_patched\net\minecraft\src\ItemMap.java
+--- minecraft_server\net\minecraft\src\ItemMap.java	Tue Nov 22 23:21:56 2011
+++ minecraft_server_patched\net\minecraft\src\ItemMap.java	Wed Nov 23 00:09:45 2011
+@@ -22,7 +22,6 @@
+    }
+ 
+    public MapData func_28023_a(ItemStack var1, World var2) {
+-      "map_" + var1.func_21125_h();
+       MapData var4 = (MapData)var2.func_28103_a(MapData.class, "map_" + var1.func_21125_h());
+       if(var4 == null) {
+          var1.func_28145_b(var2.func_28104_b("map"));
+diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java
+diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Tue Nov 22 23:22:10 2011
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Wed Nov 23 00:09:45 2011
+@@ -21,7 +21,9 @@
+    }
+ 
+    public void run() {
+-      this.func_40509_b();
+      while (true) {
+         this.func_40509_b();
+      }
+    }
+ 
+    private void func_40509_b() {
@@ -0,0 +1 @@
+Now it is YOURCRAFT!
@@ -0,0 +1,202 @@
+net/minecraft/server/MinecraftServer.func_6008_d()Z=java/net/UnknownHostException
+net/minecraft/src/ChunkLoader.func_4104_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/ChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
+net/minecraft/src/ChunkLoader.func_662_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_40515_a([B)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_40516_a(Lnet/minecraft/src/NBTTagCompound;)[B=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_769_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/OutputStream;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_770_a(Ljava/io/InputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_771_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_774_a(Ljava/io/DataInput;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/DataWatcher.func_21149_a(Ljava/io/DataInputStream;)Ljava/util/List;=java/io/IOException
+net/minecraft/src/DataWatcher.func_21151_a(Ljava/util/List;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/DataWatcher.func_21152_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/DataWatcher.func_21154_a(Ljava/io/DataOutputStream;Lnet/minecraft/src/WatchableObject;)V=java/io/IOException
+net/minecraft/src/IChunkLoader.func_4104_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/IChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
+net/minecraft/src/IChunkLoader.func_662_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/NBTBase.func_380_a(Lnet/minecraft/src/NBTBase;Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTBase.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTBase.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTBase.func_383_b(Ljava/io/DataInput;)Lnet/minecraft/src/NBTBase;=java/io/IOException
+net/minecraft/src/NBTTagByte.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagByte.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagByteArray.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagByteArray.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagCompound.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagCompound.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagDouble.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagDouble.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagEnd.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagEnd.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagFloat.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagFloat.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagInt.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagInt.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagList.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagList.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagLong.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagLong.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagShort.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagShort.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagString.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagString.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NetLoginHandler.<init>(Lnet/minecraft/server/MinecraftServer;Ljava/net/Socket;Ljava/lang/String;)V=java/io/IOException
+net/minecraft/src/NetworkListenThread.<init>(Lnet/minecraft/server/MinecraftServer;Ljava/net/InetAddress;I)V=java/io/IOException
+net/minecraft/src/NetworkManager.<init>(Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;)V=java/io/IOException
+net/minecraft/src/Packet.func_27037_a(Ljava/io/DataInputStream;I)Ljava/lang/String;=java/io/IOException
+net/minecraft/src/Packet.func_27038_a(Ljava/lang/String;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_40259_c(Ljava/io/DataInputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/Packet.func_40260_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_40261_a(Lnet/minecraft/src/ItemStack;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_40262_b(Ljava/io/DataInputStream;)Lnet/minecraft/src/ItemStack;=java/io/IOException
+net/minecraft/src/Packet.func_65_b(Ljava/io/DataInputStream;Z)Lnet/minecraft/src/Packet;=java/io/IOException
+net/minecraft/src/Packet.func_66_a(Lnet/minecraft/src/Packet;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet0KeepAlive.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet0KeepAlive.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet100OpenWindow.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet100OpenWindow.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet101CloseWindow.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet101CloseWindow.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet102WindowClick.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet102WindowClick.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet103SetSlot.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet103SetSlot.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet104WindowItems.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet104WindowItems.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet105UpdateProgressbar.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet105UpdateProgressbar.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet106Transaction.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet106Transaction.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet107CreativeSetSlot.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet107CreativeSetSlot.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet108EnchantItem.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet108EnchantItem.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet10Flying.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet10Flying.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet11PlayerPosition.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet11PlayerPosition.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet12PlayerLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet12PlayerLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet130UpdateSign.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet130UpdateSign.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet131MapData.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet131MapData.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet13PlayerLookMove.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet13PlayerLookMove.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet14BlockDig.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet14BlockDig.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet15Place.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet15Place.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet16BlockItemSwitch.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet16BlockItemSwitch.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet17Sleep.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet17Sleep.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet18Animation.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet18Animation.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet19EntityAction.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet19EntityAction.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet1Login.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet1Login.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet200Statistic.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet200Statistic.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet201PlayerInfo.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet201PlayerInfo.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet20NamedEntitySpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet20NamedEntitySpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet21PickupSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet21PickupSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet22Collect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet22Collect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet23VehicleSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet23VehicleSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet24MobSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet24MobSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet255KickDisconnect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet255KickDisconnect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet25EntityPainting.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet25EntityPainting.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet26EntityExpOrb.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet26EntityExpOrb.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet27Position.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet27Position.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet28EntityVelocity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet28EntityVelocity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet29DestroyEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet29DestroyEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet2Handshake.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet2Handshake.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet30Entity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet30Entity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet31RelEntityMove.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet31RelEntityMove.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet32EntityLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet32EntityLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet33RelEntityMoveLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet33RelEntityMoveLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet34EntityTeleport.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet34EntityTeleport.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet38EntityStatus.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet38EntityStatus.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet39AttachEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet39AttachEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet3Chat.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet3Chat.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet40EntityMetadata.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet40EntityMetadata.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet41EntityEffect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet41EntityEffect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet42RemoveEntityEffect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet42RemoveEntityEffect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet43Experience.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet43Experience.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet4UpdateTime.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet4UpdateTime.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet50PreChunk.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet50PreChunk.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet51MapChunk.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet51MapChunk.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet52MultiBlockChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet52MultiBlockChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet53BlockChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet53BlockChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet54PlayNoteBlock.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet54PlayNoteBlock.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet5PlayerInventory.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet5PlayerInventory.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet60Explosion.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet60Explosion.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet61DoorChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet61DoorChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet6SpawnPosition.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet6SpawnPosition.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet70Bed.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet70Bed.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet71Weather.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet71Weather.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet7UseEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet7UseEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet8UpdateHealth.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet8UpdateHealth.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet9Respawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet9Respawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/RConOutputStream.func_40393_a(I)V=java/io/IOException
+net/minecraft/src/RConOutputStream.func_40394_a(S)V=java/io/IOException
+net/minecraft/src/RConOutputStream.func_40396_a([B)V=java/io/IOException
+net/minecraft/src/RConOutputStream.func_40397_a(Ljava/lang/String;)V=java/io/IOException
+net/minecraft/src/RConThreadClient.func_40453_a(IILjava/lang/String;)V=java/io/IOException
+net/minecraft/src/RConThreadClient.func_40454_e()V=java/io/IOException
+net/minecraft/src/RConThreadClient.func_40455_a(ILjava/lang/String;)V=java/io/IOException
+net/minecraft/src/RConThreadQuery.func_40428_a([BLjava/net/DatagramPacket;)V=java/net/SocketException,java/io/IOException
+net/minecraft/src/RConThreadQuery.func_40430_a(Ljava/net/DatagramPacket;)Z=java/io/IOException
+net/minecraft/src/RConThreadQuery.func_40431_d(Ljava/net/DatagramPacket;)V=java/net/SocketException,java/io/IOException
+net/minecraft/src/RConThreadQuery.func_40434_b(Ljava/net/DatagramPacket;)[B=java/io/IOException
+net/minecraft/src/RegionFile.func_22126_b()V=java/io/IOException
+net/minecraft/src/RegionFile.func_22128_a(III)V=java/io/IOException
+net/minecraft/src/RegionFile.func_22130_a(I[BI)V=java/io/IOException
+net/minecraft/src/RegionFile.func_22138_b(III)V=java/io/IOException
+net/minecraft/src/ThreadedChunkLoader.func_40325_a(Lnet/minecraft/src/ThreadedChunkLoaderPending;)V=java/io/IOException
+net/minecraft/src/ThreadedChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
+net/minecraft/src/ThreadedFileIOBase.func_40508_a()V=java/lang/InterruptedException
@@ -0,0 +1,4 @@
+[VERSION]
+MCPVersion = 5.0
+ClientVersion = 1.0.0
+ServerVersion = 1.0.1
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-pushd ..
-
-rm -rf src
-cp -a src_work src
-rm -rf bin
-
-popd
-
-cp -a forge_client/src/net/* ../src/minecraft/net/
-cp -a forge_common/net/* ../src/minecraft/net/
-cp -a forge_common/net/* ../src/minecraft_server/net/
-
-pushd ..
-
-./recompile.sh
-
-
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<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"/>
-	<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>
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>forge_client</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>forge_common</name>
-			<type>2</type>
-			<locationURI>PARENT-1-PROJECT_LOC/forge_common</locationURI>
-		</link>
-		<link>
-			<name>minecraft</name>
-			<type>2</type>
-			<locationURI>PARENT-1-WORKSPACE_LOC/src_work/minecraft</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
@@ -1,52 +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.Block;
-import net.minecraft.src.ModLoader;
-import net.minecraft.src.RenderBlocks;
-import net.minecraft.src.Tessellator;
-import org.lwjgl.opengl.GL11;
-
-public class MinecraftForgeClient {
-    
-    public static void beforeBlockRender(Block block, RenderBlocks renderblocks) {
-        if (block instanceof ITextureProvider
-                && renderblocks.overrideBlockTexture == -1) {
-            Tessellator tessellator = Tessellator.instance;
-            tessellator.draw();
-            tessellator.startDrawingQuads();
-            tessellator.setNormal(0.0F, -1F, 0.0F);
-
-            GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
-                    .getMinecraftInstance().renderEngine
-                    .getTexture(((ITextureProvider) (block)).getTextureFile()));
-
-        }
-    }
-    
-    public static void afterBlockRender(Block block, RenderBlocks renderblocks) {
-        if (block instanceof ITextureProvider
-                && renderblocks.overrideBlockTexture == -1) {
-            Tessellator tessellator = Tessellator.instance;
-            tessellator.draw();
-            tessellator.startDrawingQuads();
-
-            GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
-                    .getMinecraftInstance().renderEngine
-                    .getTexture("/terrain.png"));
-        }
-    }
-    
-    public static void overrideTexture (Object o) {
-        if (o instanceof ITextureProvider) {
-            GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
-                    .getMinecraftInstance().renderEngine
-                    .getTexture(((ITextureProvider) (o))
-                            .getTextureFile()));
-        }
-    }
-}
@@ -1,23 +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.Block;
-import net.minecraft.src.ItemTool;
-
-public interface IHarvestHandler {
-    
-    /**
-     * Return true if the tool in parameter is known to be able to harvest
-     * 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
-     * 
-     * @see MinecraftForge#registerHarvestHandler(IHarvestHandler)
-     */
-    public boolean canHarvestBlock(ItemTool item, Block block);
-}
@@ -1,75 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public 
- * License v1.0.
- */
-
-package net.minecraft.src.forge;
-
-import java.util.LinkedList;
-
-import net.minecraft.src.BiomeGenBase;
-import net.minecraft.src.Block;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.ItemTool;
-import net.minecraft.src.World;
-
-public class MinecraftForge {
-
-    private static LinkedList<IBucketHandler> bucketHandlers = new LinkedList<IBucketHandler>();
-    private static LinkedList<IHarvestHandler> harvestHandlers = new LinkedList<IHarvestHandler>();
-
-    /**
-     * Registers a new custom bucket handler.
-     */
-    public static void registerCustomBucketHander(IBucketHandler handler) {
-        bucketHandlers.add(handler);
-    }
-    
-    /**
-     * Registers a new harvest handler.
-     */
-    public static void registerHarvestHandler(IHarvestHandler handler) {
-        harvestHandlers.add(handler);
-    }
-
-    /**
-     * This is not supposed to be called outside of Minecraft internals.
-     */
-    public static ItemStack fillCustomBucket(World w, int i, int j, int k) {
-        for (IBucketHandler handler : bucketHandlers) {
-            ItemStack stack = handler.fillCustomBucket(w, i, j, k);
-
-            if (stack != null) {
-                return stack;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * This is not supposed to be called outside of Minecraft internals.
-     */
-    public static boolean canHarvestBlock(ItemTool item, Block block) {
-        for (IHarvestHandler handler : harvestHandlers) {
-            if (handler.canHarvestBlock(item, block)) {
-                return true;
-            }
-        }
-        
-        return false;
-    }
-
-    /**
-     * Add a block to the list of blocks to which the pickaxe is know to be
-     * effective.
-     */
-    public static void addPickaxeBlockEffectiveAgainst (Block block) {
-        ((ItemTool) Item.pickaxeWood).addBlockEffectiveAgainst(block);
-        ((ItemTool) Item.pickaxeStone).addBlockEffectiveAgainst(block);
-        ((ItemTool) Item.pickaxeSteel).addBlockEffectiveAgainst(block);
-        ((ItemTool) Item.pickaxeGold).addBlockEffectiveAgainst(block);
-        ((ItemTool) Item.pickaxeDiamond).addBlockEffectiveAgainst(block);
-    }
-}
@@ -1,10 +0,0 @@
-*** HOW TO INSTALL ***
-
-The forge directory should have been uncompacted right under your MCP root 
-directory.
-
-You should a a fresh minecraft and minecraft_server.jar freshly decompiled 
-with ModLoader and ModLoaderMP.
-
-Just run the script install.bat. It will copy the Minecraft Forge source on your
-src directory, and modify the Minecraft source files.
@@ -1,8 +0,0 @@
-set HOME=%CD%
-set MCP=%HOME%\..
-xcopy  /Y /E src\* ..\src
-
-cd %MCP%\src
-%MCP%\runtime\bin\python\python_mcp %HOME%\lfcr.py %HOME%\minecraft.patch %HOME%\minecraft-win.patch
-%MCP%\runtime\bin\applydiff.exe -uf -p2 < %HOME%\minecraft-win.patch
-pause
@@ -1,924 +0,0 @@
-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-08-02 16:05:38.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java	2011-08-02 16:07:39.000000000 -0400
-@@ -3,6 +3,7 @@
- // Decompiler options: packimports(3) braces deadcode 
- 
- package net.minecraft.src;
-+import net.minecraft.src.forge.*;
- 
- import java.util.*;
- 
-@@ -451,6 +452,10 @@
-         {
-             return false;
-         }
-+        if (Block.blocksList[i1] instanceof IConnectRedstone) {
-+            IConnectRedstone icr = (IConnectRedstone) Block.blocksList[i1];
-+            return icr.canConnectRedstone(iblockaccess, i, j, k, l);
-+        }
-         if(Block.blocksList[i1].canProvidePower())
-         {
-             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-08-02 16:05:38.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/Chunk.java	2011-08-02 16:07:39.000000000 -0400
-@@ -3,6 +3,7 @@
- // Decompiler options: packimports(3) braces deadcode 
- 
- package net.minecraft.src;
-+import net.minecraft.src.forge.*;
- 
- import java.io.PrintStream;
- import java.util.*;
-@@ -249,6 +250,13 @@
-         }
-         int l1 = xPosition * 16 + i;
-         int i2 = zPosition * 16 + k;
-+
-+        if (Block.blocksList[k1] instanceof IOverrideReplace) {
-+            IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[k1];
-+            if (!iovr.canReplaceBlock(worldObj, l1, j, i2, l))
-+                return iovr.getReplacedSuccess();
-+        }
-+
-         blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff);
-         if(k1 != 0 && !worldObj.multiplayerWorld)
-         {
-@@ -292,6 +300,13 @@
-         }
-         int k1 = xPosition * 16 + i;
-         int l1 = zPosition * 16 + k;
-+
-+        if (Block.blocksList[j1] instanceof IOverrideReplace) {
-+            IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[j1];
-+            if (!iovr.canReplaceBlock(worldObj, k1, j, l1, l))
-+                return iovr.getReplacedSuccess();
-+        }
-+
-         blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff);
-         if(j1 != 0)
-         {
-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-08-02 16:05:39.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java	2011-08-02 16:07:40.000000000 -0400
-@@ -7,6 +7,9 @@
- import java.util.*;
- import org.lwjgl.opengl.GL11;
- 
-+import net.minecraft.src.forge.BlockTextureParticles;
-+import net.minecraft.src.forge.ITextureProvider;
-+
- // Referenced classes of package net.minecraft.src:
- //            EntityFX, Entity, MathHelper, RenderEngine, 
- //            Tessellator, Block, EntityDiggingFX, World
-@@ -16,6 +19,7 @@
- 
-     public EffectRenderer(World world, RenderEngine renderengine)
-     {
-+        effectList = new ArrayList();
-         fxLayers = new List[4];
-         rand = new Random();
-         if(world != null)
-@@ -55,6 +59,18 @@
-             }
- 
-         }
-+        for (int x = 0; x < effectList.size(); x++) {
-+            BlockTextureParticles entry = (BlockTextureParticles) effectList
-+                    .get(x);
-+            for (int y = 0; y < entry.effects.size(); y++) {
-+                EntityFX entityfx = (EntityFX) entry.effects.get(y);
-+                if (entityfx.isDead) {
-+                    entry.effects.remove(y--);
-+                }
-+            }
-+            if (effectList.size() == 0)
-+                effectList.remove(x--);
-+        }
- 
-     }
- 
-@@ -93,11 +109,26 @@
-             for(int k = 0; k < fxLayers[i].size(); k++)
-             {
-                 EntityFX entityfx = (EntityFX)fxLayers[i].get(k);
-+				if(entityfx instanceof EntityDiggingFX) continue;
-                 entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4);
-             }
- 
-             tessellator.draw();
-         }
-+        Tessellator tessellator = Tessellator.instance;
-+
-+        for (int x = 0; x < effectList.size(); x++) {
-+            BlockTextureParticles entry = (BlockTextureParticles) effectList
-+                    .get(x);
-+            GL11.glBindTexture(3553 /* GL_TEXTURE_2D */,
-+                    renderer.getTexture(entry.texture));
-+            tessellator.startDrawingQuads();
-+            for (int y = 0; y < entry.effects.size(); y++) {
-+                EntityFX entityfx = (EntityFX) entry.effects.get(y);
-+                entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4);
-+            }
-+            tessellator.draw();
-+        }
- 
-     }
- 
-@@ -124,6 +155,13 @@
-         {
-             fxLayers[i].clear();
-         }
-+		
-+        for (int x = 0; x < effectList.size(); x++) {
-+            BlockTextureParticles entry = (BlockTextureParticles) effectList
-+                    .get(x);
-+            entry.effects.clear();
-+        }
-+        effectList.clear();
- 
-     }
- 
-@@ -145,7 +183,12 @@
-                     double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1;
-                     double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1;
-                     int j2 = rand.nextInt(6);
-                    addEffect((new EntityDiggingFX(worldObj, d, d1, d2, d - (double)i - 0.5D, d1 - (double)j - 0.5D, d2 - (double)k - 0.5D, block, j2, i1)).func_4041_a(i, j, k));
-+                    EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj,
-+                            d, d1, d2, d - (double) i - 0.5D, d1 - (double) j
-+                                    - 0.5D, d2 - (double) k - 0.5D, block, j2,
-+                            i1);
-+                    dig_effect.func_4041_a(i, j, k);
-+                    addDigParticleEffect(dig_effect, block);
-                 }
- 
-             }
-@@ -190,16 +233,48 @@
-         {
-             d = (double)i + block.maxX + (double)f;
-         }
-        addEffect((new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k))).func_4041_a(i, j, k).func_407_b(0.2F).func_405_d(0.6F));
-+        EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2,
-+                0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k));
-+        dig_effect.func_4041_a(i, j, k);
-+        dig_effect.func_407_b(0.2F);
-+        dig_effect.func_405_d(0.6F);
-+        addDigParticleEffect(dig_effect, block);
-     }
- 
-     public String getStatistics()
-     {
-         return (new StringBuilder()).append("").append(fxLayers[0].size() + fxLayers[1].size() + fxLayers[2].size()).toString();
-     }
-+	
-+    public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) {
-+        boolean added = false;
-+        String comp;
-+
-+        if (block instanceof ITextureProvider) {
-+            comp = ((ITextureProvider) block).getTextureFile();
-+        } else {
-+            comp = "/terrain.png";
-+        }
-+        for (int x = 0; x < effectList.size(); x++) {
-+            BlockTextureParticles entry = (BlockTextureParticles) effectList
-+                    .get(x);
-+            if (entry.texture.equals(comp)) {
-+                entry.effects.add(dig_effect);
-+                added = true;
-+            }
-+        }
-+        if (!added) {
-+            BlockTextureParticles entry = new BlockTextureParticles();
-+            entry.texture = comp;
-+            entry.effects.add(dig_effect);
-+            effectList.add(entry);
-+        }
-+        addEffect(dig_effect);
-+    }
- 
-     protected World worldObj;
-     private List fxLayers[];
-+    private List effectList;
-     private RenderEngine renderer;
-     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-08-02 16:05:39.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java	2011-08-02 16:07:41.000000000 -0400
-@@ -6,6 +6,8 @@
- 
- import java.util.*;
- 
-+import net.minecraft.src.forge.ISpecialArmor;
-+
- // Referenced classes of package net.minecraft.src:
- //            EntityLiving, InventoryPlayer, ContainerPlayer, World, 
- //            ChunkCoordinates, DataWatcher, Container, StatList, 
-@@ -477,6 +479,21 @@
- 
-     protected void damageEntity(int i)
-     {
-+        boolean doRegularComputation = true;
-+        for (ItemStack stack : inventory.armorInventory) {
-+            if (stack != null && stack.getItem() instanceof ISpecialArmor) {
-+                ISpecialArmor armor = (ISpecialArmor) stack.getItem();
-+                
-+                i = armor.adjustArmorDamage(i);
-+                doRegularComputation = doRegularComputation
-+                        && armor.allowRegularComputation();
-+            }
-+        }
-+        
-+        if (!doRegularComputation) {
-+            super.damageEntity(i);
-+        }
-+        
-         int j = 25 - inventory.getTotalArmorValue();
-         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-08-02 16:05:38.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/Explosion.java	2011-08-02 16:07:42.000000000 -0400
-@@ -3,6 +3,7 @@
- // Decompiler options: packimports(3) braces deadcode 
- 
- package net.minecraft.src;
-+import net.minecraft.src.forge.ISpecialResistance;
- 
- import java.util.*;
- 
-@@ -65,7 +66,17 @@
-                         int i5 = worldObj.getBlockId(j4, k4, l4);
-                         if(i5 > 0)
-                         {
-                            f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2;
-+                            if (Block.blocksList[i5] instanceof ISpecialResistance) {
-+                                ISpecialResistance isr = (ISpecialResistance) Block.blocksList[i5];
-+                                f1 -= (isr.getSpecialExplosionResistance(
-+                                        worldObj, j4, k4, l4, explosionX,
-+                                        explosionY, explosionZ, exploder) + 0.3F)
-+                                        * f2;
-+                            } else {
-+                                f1 -= (Block.blocksList[i5]
-+                                        .getExplosionResistance(exploder) + 0.3F)
-+                                        * f2;
-+                            }
-                         }
-                         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-08-02 16:05:39.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java	2011-08-02 16:07:42.000000000 -0400
-@@ -6,6 +6,8 @@
- 
- import java.util.Random;
- 
-+import net.minecraft.src.forge.MinecraftForge;
-+
- // Referenced classes of package net.minecraft.src:
- //            Item, EntityPlayer, Vec3D, MathHelper, 
- //            World, MovingObjectPosition, EnumMovingObjectType, Material, 
-@@ -55,6 +57,13 @@
-             }
-             if(isFull == 0)
-             {
-+                ItemStack customBucket = MinecraftForge.fillCustomBucket(world,
-+                        i, j, k);
-+            	
-+                if (customBucket != null) {
-+                   return customBucket;
-+                }
-+
-                 if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0)
-                 {
-                     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-08-02 16:05:38.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java	2011-08-02 16:07:42.000000000 -0400
-@@ -4,6 +4,8 @@
- 
- package net.minecraft.src;
- 
-+import net.minecraft.src.forge.MinecraftForge;
-+
- 
- // Referenced classes of package net.minecraft.src:
- //            ItemTool, Block, EnumToolMaterial, Material
-@@ -42,6 +44,9 @@
-         {
-             return toolMaterial.getHarvestLevel() >= 2;
-         }
-+        if (MinecraftForge.canHarvestBlock(this, block)) {
-+            return true;
-+        }
-         if(block.blockMaterial == Material.rock)
-         {
-             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-08-02 16:05:38.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java	2011-08-02 16:07:42.000000000 -0400
-@@ -5,6 +5,8 @@
- package net.minecraft.src;
- 
- import net.minecraft.client.Minecraft;
-+import net.minecraft.src.forge.MinecraftForgeClient;
-+
- import org.lwjgl.opengl.GL11;
- 
- // Referenced classes of package net.minecraft.src:
-@@ -34,15 +36,18 @@
-         if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType()))
-         {
-             GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png"));
-+            MinecraftForgeClient.overrideTexture (Block.blocksList[itemstack.itemID]);
-             renderBlocksInstance.renderBlockOnInventory(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F));
-         } else
-         {
-             if(itemstack.itemID < 256)
-             {
-                 GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png"));
-+                MinecraftForgeClient.overrideTexture (Block.blocksList[itemstack.itemID]);
-             } else
-             {
-                 GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/gui/items.png"));
-+                MinecraftForgeClient.overrideTexture (Item.itemsList[itemstack.itemID]);
-             }
-             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-08-02 16:05:38.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java	2011-08-02 16:07:42.000000000 -0400
-@@ -4,6 +4,7 @@
- 
- package net.minecraft.src;
- 
-+import java.util.Arrays;
- 
- // Referenced classes of package net.minecraft.src:
- //            Item, EnumToolMaterial, ItemStack, Block, 
-@@ -63,4 +64,11 @@
-     private float efficiencyOnProperMaterial;
-     private int damageVsEntity;
-     protected EnumToolMaterial toolMaterial;
-+    
-+    public void addBlockEffectiveAgainst (Block block) {    
-+        blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst,
-+                blocksEffectiveAgainst.length + 1);
-+        
-+        blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = 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-08-02 16:05:39.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java	2011-08-02 16:07:42.000000000 -0400
-@@ -3,6 +3,7 @@
- // Decompiler options: packimports(3) braces deadcode 
- 
- package net.minecraft.src;
-+import net.minecraft.src.forge.*;
- 
- import net.minecraft.client.Minecraft;
- 
-@@ -98,6 +99,12 @@
- 
-     public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int 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))
-         {
-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-08-02 16:05:39.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java	2011-08-02 16:07:42.000000000 -0400
-@@ -5,6 +5,9 @@
- package net.minecraft.src;
- 
- import java.util.Random;
-+
-+import net.minecraft.src.forge.MinecraftForgeClient;
-+
- import org.lwjgl.opengl.GL11;
- 
- // Referenced classes of package net.minecraft.src:
-@@ -51,6 +54,7 @@
-         {
-             GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F);
-             loadTexture("/terrain.png");
-+            MinecraftForgeClient.overrideTexture(Block.blocksList[itemstack.itemID]);
-             float f4 = 0.25F;
-             if(!Block.blocksList[itemstack.itemID].renderAsNormalBlock() && itemstack.itemID != Block.stairSingle.blockID && Block.blocksList[itemstack.itemID].getRenderType() != 16)
-             {
-@@ -78,10 +82,12 @@
-             if(itemstack.itemID < 256)
-             {
-                 loadTexture("/terrain.png");
-+                MinecraftForgeClient.overrideTexture(Block.blocksList[itemstack.itemID]);
-             } else
-             {
-                 loadTexture("/gui/items.png");
-            }
-+                MinecraftForgeClient.overrideTexture(Item.itemsList[itemstack.itemID]);
-+            }            
-             Tessellator tessellator = Tessellator.instance;
-             float f6 = (float)((i % 16) * 16 + 0) / 256F;
-             float f8 = (float)((i % 16) * 16 + 16) / 256F;
-@@ -92,6 +98,7 @@
-             float f14 = 0.25F;
-             if(field_27004_a)
-             {
-+            	
-                 int k = Item.itemsList[itemstack.itemID].getColorFromDamage(itemstack.getItemDamage());
-                 float f15 = (float)(k >> 16 & 0xff) / 255F;
-                 float f17 = (float)(k >> 8 & 0xff) / 255F;
-@@ -131,6 +138,7 @@
-         {
-             int j1 = i;
-             renderengine.bindTexture(renderengine.getTexture("/terrain.png"));
-+            MinecraftForgeClient.overrideTexture (Block.blocksList[i]);
-             Block block = Block.blocksList[j1];
-             GL11.glPushMatrix();
-             GL11.glTranslatef(l - 2, i1 + 3, -3F);
-@@ -159,9 +167,11 @@
-             if(i < 256)
-             {
-                 renderengine.bindTexture(renderengine.getTexture("/terrain.png"));
-+                MinecraftForgeClient.overrideTexture (Block.blocksList[i]);
-             } else
-             {
-                 renderengine.bindTexture(renderengine.getTexture("/gui/items.png"));
-+                MinecraftForgeClient.overrideTexture(Item.itemsList[i]);
-             }
-             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/World.java ../src_work/minecraft/net/minecraft/src/World.java
--- ../src_base/minecraft/net/minecraft/src/World.java	2011-08-02 16:05:38.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/World.java	2011-08-03 01:10:53.000000000 -0400
-@@ -7,6 +7,8 @@
- import java.io.PrintStream;
- import java.util.*;
- 
-+import net.minecraft.src.forge.IBlockSecondaryProperties;
-+
- // Referenced classes of package net.minecraft.src:
- //            IBlockAccess, WorldProvider, WorldInfo, MapStorage, 
- //            ISaveHandler, ChunkProvider, EntityPlayer, ChunkProviderLoadOrGenerate, 
-@@ -313,7 +315,25 @@
- 
-     public boolean isAirBlock(int i, int j, int k)
-     {
-        return getBlockId(i, j, k) == 0;
-+    	int iBlockID = getBlockId( i, j, k );
-+
-+    	if ( iBlockID == 0 )
-+    	{
-+    		return true;
-+    	}
-+    	else
-+    	{
-+    		Block block = Block.blocksList[iBlockID];
-+    		
-+    		if ( block instanceof IBlockSecondaryProperties )
-+    		{
-+    			return ((IBlockSecondaryProperties)block).isAirBlock( this, i, j, k );
-+    		}
-+    		else
-+    		{
-+    			return false;
-+    		}
-+    	}
-     }
- 
-     public boolean blockExists(int i, int j, int k)
-@@ -1608,6 +1628,18 @@
-                         {
-                             return true;
-                         }
-+                        else
-+                        {
-+                        	Block block = Block.blocksList[j2];
-+                        	
-+                        	if ( block instanceof IBlockSecondaryProperties )
-+                        	{
-+                        		if ( ((IBlockSecondaryProperties)block).isBlockBurning( this, k1, i1, i2 ) )
-+                        		{
-+                        			return true;
-+                        		}
-+                        	}
-+                        }
-                     }
- 
-                 }
-@@ -1900,7 +1932,14 @@
-             return false;
-         } else
-         {
-            return block.blockMaterial.getIsTranslucent() && block.renderAsNormalBlock();
-+        	if ( block instanceof IBlockSecondaryProperties )
-+        	{
-+        		return ((IBlockSecondaryProperties)block).isBlockNormalCube( this, i, j, k );
-+        	}
-+        	else
-+        	{
-+		    return block.blockMaterial.getIsTranslucent() && block.renderAsNormalBlock();
-+		}
-         }
-     }
- 
-@@ -2425,6 +2464,16 @@
-         {
-             block = null;
-         }
-+        else
-+        {
-+        	if ( block instanceof IBlockSecondaryProperties )
-+        	{
-+        		if ( ((IBlockSecondaryProperties)block).isBlockReplaceable( this, j, k, l ) )
-+        		{
-+        			block = null;
-+        		}
-+        	}
-+        }
-         return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1);
-     }
- 
-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-08-02 16:05:39.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java	2011-08-02 16:07:42.000000000 -0400
-@@ -3,8 +3,12 @@
- // Decompiler options: packimports(3) braces deadcode 
- 
- package net.minecraft.src;
-+import net.minecraft.src.forge.*;
- 
- import java.util.*;
-+
-+import net.minecraft.src.forge.MinecraftForgeClient;
-+
- import org.lwjgl.opengl.GL11;
- 
- // Referenced classes of package net.minecraft.src:
-@@ -138,14 +142,27 @@
-                         }
-                         Block block = Block.blocksList[i3];
-                         int j3 = block.getRenderBlockPass();
-+
-+                        if (block instanceof IMultipassRender) {
-+                            if (j3 != i2) {
-+                                flag = true;
-+                            }
-+                            IMultipassRender impr = (IMultipassRender) block;
-+                            if (impr.canRenderInPass(i2)) {
-+                                j3 = i2;
-+                            }
-+                        }
-+
-                         if(j3 != i2)
-                         {
-                             flag = true;
-                             continue;
-                         }
-                         if(j3 == i2)
-                        {
-+                        {                        	                            
-+                            MinecraftForgeClient.beforeBlockRender(block, renderblocks);
-                             flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2);
-+                            MinecraftForgeClient.afterBlockRender(block, renderblocks);                           
-                         }
-                     }
- 
-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-08-02 16:05:40.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java	2011-08-02 16:07:43.000000000 -0400
-@@ -3,6 +3,7 @@
- // Decompiler options: packimports(3) braces deadcode 
- 
- package net.minecraft.src;
-+import net.minecraft.src.forge.*;
- 
- import java.util.*;
- 
-@@ -413,6 +414,10 @@
-         {
-             return false;
-         }
-+	if(Block.blocksList[i1] instanceof IConnectRedstone) {
-+		IConnectRedstone icr=(IConnectRedstone)Block.blocksList[i1];
-+		return icr.canConnectRedstone(iblockaccess,i,j,k,l);
-+	}
-         if(Block.blocksList[i1].canProvidePower())
-         {
-             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-08-02 16:05:39.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java	2011-08-02 16:07:43.000000000 -0400
-@@ -3,6 +3,7 @@
- // Decompiler options: packimports(3) braces deadcode 
- 
- package net.minecraft.src;
-+import net.minecraft.src.forge.*;
- 
- import java.io.PrintStream;
- import java.util.*;
-@@ -227,6 +228,13 @@
-         }
-         int l1 = xPosition * 16 + i;
-         int i2 = zPosition * 16 + k;
-+
-+	if(Block.blocksList[k1] instanceof IOverrideReplace) {
-+		IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[k1];
-+		if(!iovr.canReplaceBlock(worldObj,l1,j,i2,l))
-+			return iovr.getReplacedSuccess();
-+	}
-+
-         blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff);
-         if(k1 != 0 && !worldObj.singleplayerWorld)
-         {
-@@ -270,6 +278,13 @@
-         }
-         int k1 = xPosition * 16 + i;
-         int l1 = zPosition * 16 + k;
-+
-+	if(Block.blocksList[j1] instanceof IOverrideReplace) {
-+		IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[j1];
-+		if(!iovr.canReplaceBlock(worldObj,k1,j,l1,l))
-+			return iovr.getReplacedSuccess();
-+	}
-+
-         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/EntityPlayer.java ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java
--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java	2011-08-02 16:05:40.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java	2011-08-02 16:07:43.000000000 -0400
-@@ -6,6 +6,8 @@
- 
- import java.util.*;
- 
-+import net.minecraft.src.forge.ISpecialArmor;
-+
- // Referenced classes of package net.minecraft.src:
- //            EntityLiving, InventoryPlayer, ContainerPlayer, World, 
- //            ChunkCoordinates, DataWatcher, Container, StatList, 
-@@ -457,6 +459,21 @@
- 
-     protected void damageEntity(int i)
-     {
-+        boolean doRegularComputation = true;
-+        for (ItemStack stack : inventory.armorInventory) {
-+            if (stack != null && stack.getItem() instanceof ISpecialArmor) {
-+                ISpecialArmor armor = (ISpecialArmor) stack.getItem();
-+                
-+                i = armor.adjustArmorDamage(i);
-+                doRegularComputation = doRegularComputation
-+                        && armor.allowRegularComputation();
-+            }
-+        }
-+        
-+        if (!doRegularComputation) {
-+            super.damageEntity(i);
-+        }
-+        
-         int j = 25 - inventory.getTotalArmorValue();
-         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-08-02 16:05:39.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java	2011-08-02 16:07:43.000000000 -0400
-@@ -3,6 +3,7 @@
- // Decompiler options: packimports(3) braces deadcode 
- 
- package net.minecraft.src;
-+import net.minecraft.src.forge.ISpecialResistance;
- 
- import java.util.*;
- 
-@@ -65,7 +66,16 @@
-                         int i5 = worldObj.getBlockId(j4, k4, l4);
-                         if(i5 > 0)
-                         {
-                            f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2;
-+			    if(Block.blocksList[i5] instanceof ISpecialResistance) {
-+				    ISpecialResistance isr=(ISpecialResistance)
-+					   Block.blocksList[i5];
-+				    f1-=(isr.getSpecialExplosionResistance(
-+					worldObj,j4,k4,l4,
-+					explosionX,explosionY,explosionZ,
-+					exploder) + 0.3F) * f2;
-+			    } else {
-+				    f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2;
-+			    }
-                         }
-                         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-08-02 16:05:40.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java	2011-08-02 16:07:43.000000000 -0400
-@@ -6,6 +6,8 @@
- 
- import java.util.Random;
- 
-+import net.minecraft.src.forge.MinecraftForge;
-+
- // Referenced classes of package net.minecraft.src:
- //            Item, EntityPlayer, Vec3D, MathHelper, 
- //            World, MovingObjectPosition, EnumMovingObjectType, Material, 
-@@ -55,6 +57,13 @@
-             }
-             if(isFull == 0)
-             {
-+                ItemStack customBucket = MinecraftForge.fillCustomBucket(world,
-+                        i, j, k);
-+            	
-+            	if (customBucket != null) {
-+            		return customBucket;
-+            	}
-+
-                 if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0)
-                 {
-                     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-08-02 16:05:39.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java	2011-08-02 16:07:43.000000000 -0400
-@@ -3,6 +3,7 @@
- // Decompiler options: packimports(3) braces deadcode 
- 
- package net.minecraft.src;
-+import net.minecraft.src.forge.*;
- 
- 
- // Referenced classes of package net.minecraft.src:
-@@ -145,6 +146,11 @@
- 
-     public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int 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))
-         {
-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-08-02 16:05:39.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java	2011-08-02 16:07:43.000000000 -0400
-@@ -4,6 +4,8 @@
- 
- package net.minecraft.src;
- 
-+import net.minecraft.src.forge.MinecraftForge;
-+
- 
- // Referenced classes of package net.minecraft.src:
- //            ItemTool, Block, EnumToolMaterial, Material
-@@ -42,6 +44,9 @@
-         {
-             return toolMaterial.getHarvestLevel() >= 2;
-         }
-+        if (MinecraftForge.canHarvestBlock(this, block)) {
-+            return true;
-+        }
-         if(block.blockMaterial == Material.rock)
-         {
-             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-08-02 16:05:39.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java	2011-08-02 16:07:43.000000000 -0400
-@@ -4,6 +4,8 @@
- 
- package net.minecraft.src;
- 
-+import java.util.Arrays;
-+
- 
- // Referenced classes of package net.minecraft.src:
- //            Item, EnumToolMaterial, ItemStack, Block, 
-@@ -58,4 +60,11 @@
-     private float efficiencyOnProperMaterial;
-     private int damageVsEntity;
-     protected EnumToolMaterial toolMaterial;
-+    
-+    public void addBlockEffectiveAgainst (Block block) {    
-+        blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst,
-+                blocksEffectiveAgainst.length + 1);
-+        
-+        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-08-02 16:05:40.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java	2011-08-02 16:07:43.000000000 -0400
-@@ -169,12 +169,11 @@
-             sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver));
-             for(int k = 0; k < numBlocksToUpdate; k++)
-             {
-                int j1 = chunkX * 16 + (numBlocksToUpdate >> 12 & 0xf);
-                int i2 = numBlocksToUpdate & 0xff;
-                int k2 = chunkZ * 16 + (numBlocksToUpdate >> 8 & 0xf);
-+                int j1 = chunkX * 16 + (blocksToUpdate[k] >> 12 & 0xf);
-+                int i2 = blocksToUpdate[k] & 0xff;
-+                int k2 = chunkZ * 16 + (blocksToUpdate[k] >> 8 & 0xf);
-                 if(Block.isBlockContainer[worldserver.getBlockId(j1, i2, k2)])
-                 {
-                    System.out.println("Sending!");
-                     updateTileEntity(worldserver.getBlockTileEntity(j1, i2, k2));
-                 }
-             }
-diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/World.java ../src_work/minecraft_server/net/minecraft/src/World.java
--- ../src_base/minecraft_server/net/minecraft/src/World.java	2011-08-02 16:05:39.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/World.java	2011-08-03 01:10:51.000000000 -0400
-@@ -7,6 +7,8 @@
- import java.io.PrintStream;
- import java.util.*;
- 
-+import net.minecraft.src.forge.IBlockSecondaryProperties;
-+
- // Referenced classes of package net.minecraft.src:
- //            IBlockAccess, WorldProvider, MapStorage, ISaveHandler, 
- //            WorldInfo, ChunkProvider, IChunkProvider, IProgressUpdate, 
-@@ -166,7 +168,25 @@
- 
-     public boolean isAirBlock(int i, int j, int k)
-     {
-        return getBlockId(i, j, k) == 0;
-+    	int iBlockID = getBlockId( i, j, k );
-+
-+    	if ( iBlockID == 0 )
-+    	{
-+    		return true;
-+    	}
-+    	else
-+    	{
-+    		Block block = Block.blocksList[iBlockID];
-+    		
-+    		if ( block instanceof IBlockSecondaryProperties )
-+    		{
-+    			return ((IBlockSecondaryProperties)block).isAirBlock( this, i, j, k );
-+    		}
-+    		else
-+    		{
-+    			return false;
-+    		}
-+    	}
-     }
- 
-     public boolean blockExists(int i, int j, int k)
-@@ -1409,6 +1429,18 @@
-                         {
-                             return true;
-                         }
-+                        else
-+                        {
-+                        	Block block = Block.blocksList[j2];
-+                        	
-+                        	if ( block instanceof IBlockSecondaryProperties )
-+                        	{
-+                        		if ( ((IBlockSecondaryProperties)block).isBlockBurning( this, k1, i1, i2 ) )
-+                        		{
-+                        			return true;
-+                        		}
-+                        	}
-+                        }
-                     }
- 
-                 }
-@@ -1686,7 +1718,14 @@
-             return false;
-         } else
-         {
-            return block.blockMaterial.getIsOpaque() && block.isACube();
-+        	if ( block instanceof IBlockSecondaryProperties )
-+        	{
-+        		return ((IBlockSecondaryProperties)block).isBlockNormalCube( this, i, j, k );
-+        	}
-+        	else
-+        	{
-+		    return block.blockMaterial.getIsOpaque() && block.isACube();
-+		}
-         }
-     }
- 
-@@ -2178,6 +2217,16 @@
-         {
-             block = null;
-         }
-+        else
-+        {
-+        	if ( block instanceof IBlockSecondaryProperties )
-+        	{
-+        		if ( ((IBlockSecondaryProperties)block).isBlockReplaceable( this, j, k, l ) )
-+        		{
-+        			block = null;
-+        		}
-+        	}
-+        }
-         return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1);
-     }
- 
@@ -1,25 +0,0 @@
-cd ..
-
-rmdir /S /Q src
-
-IF EXIST src_base (
-move src_base src
-rmdir /S /Q src_work
-) ELSE (
-cmd /C decompile.bat
-cd src
-..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch
-..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP-win.patch
-cd ..
-cmd /C recompile.bat
-cmd /C updatemd5.bat
-)
-
-mkdir src_base
-mkdir src_work
-xcopy  /Y /E src\* src_base
-xcopy  /Y /E src\* src_work
-cd src_work
-..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\minecraft.patch ..\forge\minecraft-win.patch
-..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\minecraft-win.patch
-pause
@@ -1,5 +0,0 @@
-rm minecraft.patch
-touch minecraft.patch
-
-diff -u ../src_base ../src_work -r --strip-trailing-cr | tr -d '\r' \
-      >> minecraft.patch
@@ -0,0 +1,25 @@
+<?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/minecraft.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>forge_client</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>forge_common</name>
+			<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>
@@ -0,0 +1,99 @@
+package net.minecraft.src.forge;
+
+import net.minecraft.src.EnumJsonNodeType;
+import net.minecraft.src.EnumOS2;
+import net.minecraft.src.EnumOptions;
+import net.minecraft.src.EnumRarity;
+
+public class EnumHelperClient extends EnumHelper {
+
+	private static Class[][] ctrs = {
+			{EnumJsonNodeType.class},
+			{EnumOptions.class, String.class, boolean.class, boolean.class},
+			{EnumOS2.class},
+			{EnumRarity.class, int.class, String.class}			
+	};
+	
+	private static boolean[] decompiled = new boolean[ctrs.length];
+	private static boolean   isSetup    = false;
+	
+	public static EnumJsonNodeType addJsonNodeType(String name)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[0], EnumJsonNodeType.class, name, 
+			new Class[] {},
+			new Object[]{});	
+	}	
+	public static EnumOptions addOptions(String name, String langName, boolean isSlider, boolean isToggle)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[1], EnumOptions.class, name, 
+			new Class[] {String.class, boolean.class, boolean.class},
+			new Object[]{langName,     isSlider,      isToggle     });	
+	}
+	public static EnumOS2 addOS2(String name)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[2], EnumOS2.class, name, 
+			new Class[] {},
+			new Object[]{});	
+	}	
+	public static EnumRarity addRarity(String name, int color, String displayName)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[3], EnumRarity.class, name, 
+			new Class[] {int.class, String.class},
+			new Object[]{color,     displayName });	
+	}		
+	
+	private static void setup()
+	{
+		//System.out.println("Enum Helper Initalizing: ");
+		for(int x = 0; x < ctrs.length; x++)
+		{
+			try {
+				Class<?>[] enumHeaders = new Class[ctrs[x].length + 3];
+				enumHeaders[0] = String.class;
+				enumHeaders[1] = int.class;
+				enumHeaders[2] = String.class;
+				enumHeaders[3] = int.class;
+				
+				for (int y = 1; y < ctrs[x].length; y++)
+					enumHeaders[3 + y] = ctrs[x][y];
+				
+				ctrs[x][0].getDeclaredConstructor(enumHeaders);
+				decompiled[x] = true;				
+				
+			} catch(Exception e) {
+				//Nom Nom Nom
+			}
+			//System.out.format("\t%-25s %s\r\n", ctrs[x][0].getName().replace("net.minecraft.src.", ""), decompiled[x]);
+		}		
+		isSetup = true;		
+	}
+	
+	static 
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+	}
+
+}
@@ -0,0 +1,245 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.ModLoader;
+import net.minecraft.src.RenderBlocks;
+import net.minecraft.src.Tessellator;
+import net.minecraft.src.RenderGlobal;
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.MovingObjectPosition;
+import net.minecraft.src.ItemStack;
+import org.lwjgl.opengl.GL11;
+
+import java.util.*;
+
+public class ForgeHooksClient {
+
+	public static boolean onBlockHighlight(RenderGlobal renderglobal,
+		    EntityPlayer player, MovingObjectPosition mop, int i,
+		    ItemStack itemstack, float f) {
+		for (IHighlightHandler handler : highlightHandlers) {
+			if(handler.onBlockHighlight(renderglobal,player,mop,
+					i,itemstack,f))
+				return true;
+		}
+		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>();
+
+	public static boolean canRenderInPass(Block block, int pass) {
+		if(block instanceof IMultipassRender) {
+			IMultipassRender impr = (IMultipassRender) block;
+			return impr.canRenderInPass(pass);
+		}
+		if(pass==block.getRenderBlockPass()) return true;
+		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 boolean inWorld=false;
+	static TreeSet<TesKey> renderTextures=new TreeSet<TesKey>();
+	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);
+		Tessellator t;
+		t=tessellators.get(key);
+		if(t==null) {
+			t=new Tessellator();
+			tessellators.put(key,t);
+		}
+		if(inWorld && !renderTextures.contains(key)) {
+			renderTextures.add(key);
+			t.startDrawingQuads();
+			t.setTranslationD(defaultTessellator.xOffset,
+				defaultTessellator.yOffset,
+				defaultTessellator.zOffset);
+		}
+		Tessellator.instance=t;
+	}
+
+	static IRenderContextHandler unbindContext=null;
+	protected static void bindTexture(String name, int sub) {
+		Integer n;
+		n=textures.get(name);
+		if(n==null) {
+			n=ModLoader.getMinecraftInstance().renderEngine
+				.getTexture(name);
+			textures.put(name,n);
+		}
+		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);
+	}
+
+	protected static void unbindTexture() {
+		if(inWorld) {
+			Tessellator.instance=defaultTessellator;
+		} else {
+			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
+				.getMinecraftInstance().renderEngine
+				.getTexture("/terrain.png"));
+			return;
+		}
+	}
+
+	static int renderPass=-1;
+	public static void beforeRenderPass(int pass) {
+		renderPass=pass;
+		defaultTessellator=Tessellator.instance;
+		Tessellator.renderingWorldRenderer=true;
+		GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
+			.getMinecraftInstance().renderEngine
+			.getTexture("/terrain.png"));
+		renderTextures.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();
+			}
+		}
+		GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
+			.getMinecraftInstance().renderEngine
+			.getTexture("/terrain.png"));
+		Tessellator.renderingWorldRenderer=false;
+		Tessellator.instance=defaultTessellator;
+	}
+
+	public static void beforeBlockRender(Block block,
+			RenderBlocks renderblocks) {
+		if (block instanceof ITextureProvider
+				&& renderblocks.overrideBlockTexture == -1) {
+			ITextureProvider itp=(ITextureProvider)block;
+			bindTexture(itp.getTextureFile(),0);
+		}
+	}
+
+	public static void afterBlockRender(Block block,
+			RenderBlocks renderblocks) {
+		if (block instanceof ITextureProvider
+				&& renderblocks.overrideBlockTexture == -1) {
+			unbindTexture();
+		}
+	}
+
+	public static void overrideTexture (Object o) {
+		if (o instanceof ITextureProvider) {
+			GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
+				.getMinecraftInstance().renderEngine
+				.getTexture(((ITextureProvider) (o))
+					.getTextureFile()));
+		}
+	}
+	
+	public static String getTexture(String def, Object item) 
+	{
+		if (item instanceof ITextureProvider)
+		{
+			return ((ITextureProvider)item).getTextureFile();
+		}
+		else
+		{
+			return def;
+		}
+	}
+
+	public static void renderCustomItem(ICustomItemRenderer customRenderer, RenderBlocks renderBlocks,int itemID, int meta, float f) {
+		Tessellator tessellator = Tessellator.instance;
+		if (renderBlocks.useInventoryTint) {
+			int j = 0xffffff;//block.getRenderColor(i);
+			float f1 = (float) (j >> 16 & 0xff) / 255F;
+			float f3 = (float) (j >> 8 & 0xff) / 255F;
+			float f5 = (float) (j & 0xff) / 255F;
+			GL11.glColor4f(f1 * f, f3 * f, f5 * f, 1.0F);
+		}
+
+//		ModLoader.RenderInvBlock(this, block, i, k);
+		customRenderer.renderInventory(renderBlocks, itemID, meta);
+	}
+}
+
@@ -0,0 +1,25 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.ItemStack;
+
+/**
+ * This interface has to be implemented by an instance of ItemArmor.
+ * It allows for the application of a custom texture file to the player skin
+ * when the armor is worn.
+ */
+public interface IArmorTextureProvider {
+
+    /**
+     * This interface has to return the path to a file that is the same
+     * format as iron_1.png (or any of the other armor files). It will be
+     * applied to the player skin when the armor is worn.
+     */
+    public String getArmorTextureFile(ItemStack itemstack);
+
+}
+
@@ -0,0 +1,7 @@
+package net.minecraft.src.forge;
+
+import net.minecraft.src.RenderBlocks;
+
+public interface ICustomItemRenderer {
+	public void renderInventory (RenderBlocks renderblocks, int itemID, int meta);
+}
@@ -0,0 +1,23 @@
+/*
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+package net.minecraft.src.forge;
+
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.EnumStatus;
+import net.minecraft.src.RenderGlobal;
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.MovingObjectPosition;
+import net.minecraft.src.ItemStack;
+
+public interface IHighlightHandler {
+    /**
+     * Allow custom handling of highlights.  Return true if the hilight has
+     * been handled.
+     */
+    public boolean onBlockHighlight(RenderGlobal renderglobal,
+		    EntityPlayer player, MovingObjectPosition mop, int i,
+		    ItemStack itemstack, float f);
+}
+
@@ -0,0 +1,16 @@
+/*
+ * 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();
+}
+
@@ -0,0 +1,17 @@
+/*
+ * 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);
+}
+
@@ -0,0 +1,90 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.Item;
+import net.minecraft.src.ModLoader;
+import net.minecraft.src.RenderBlocks;
+
+public class MinecraftForgeClient {
+	/**
+	 * Registers a new block highlight handler.
+	 */
+	public static void registerHighlightHandler(IHighlightHandler handler) {
+		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.
+	 *
+	 * This variation is reserved for future expansion.
+	 */
+	public static void bindTexture(String name, int sub) {
+		ForgeHooksClient.bindTexture(name,sub);
+	}
+
+	/** Bind a texture.  This is used to bind a texture file when
+	 * performing your own rendering, rather than using ITextureProvider.
+	 */
+	public static void bindTexture(String name) {
+		ForgeHooksClient.bindTexture(name,0);
+	}
+
+	/** Unbind a texture.  This binds the default texture, when you are
+	 * finished performing custom rendering.
+	 */
+	public static void unbindTexture() {
+		ForgeHooksClient.unbindTexture();
+	}
+
+	/** Preload a texture.  Textures must be preloaded before the first
+	 * use, or they will cause visual anomalies.
+	 */
+	public static void preloadTexture(String texture) {
+		ModLoader.getMinecraftInstance().renderEngine
+			.getTexture(texture);
+	}
+
+	/** Render a block.  Render a block which may have a custom texture.
+	 */
+	public static void renderBlock(RenderBlocks rb, Block bl, int i, int
+			j, int k) {
+		ForgeHooksClient.beforeBlockRender(bl,rb);
+        	rb.renderBlockByRenderType(bl,i,j,k);
+		ForgeHooksClient.afterBlockRender(bl,rb);
+	}
+
+	/** Get the current render pass.
+	 */
+	public static int getRenderPass() {
+		return ForgeHooksClient.renderPass;
+	}
+	
+	private static ICustomItemRenderer [] customItemRenderers = new ICustomItemRenderer [Item.itemsList.length];
+	
+	public static void registerCustomItemRenderer (int itemID, ICustomItemRenderer renderer) {
+		customItemRenderers [itemID] = renderer;
+	}
+	
+	public static ICustomItemRenderer getCustomItemRenderer (int itemID) {
+		return customItemRenderers [itemID];
+	}
+}
@@ -0,0 +1,20 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+public class ArmorProperties {
+	public int damageRemove = 0;
+	public boolean allowRegularComputation = false;
+	
+	public ArmorProperties () {
+		
+	}
+	
+	public ArmorProperties (int damageRemove, boolean allowRegularCompuation) {
+		this.damageRemove = damageRemove;
+		this.allowRegularComputation = allowRegularCompuation;
+	}
+}
@@ -0,0 +1,51 @@
+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);
+	}
+}
@@ -0,0 +1,342 @@
+package net.minecraft.src.forge;
+
+import net.minecraft.src.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+public class EnumHelper {
+	private static Object reflectionFactory      = null;
+	private static Method newConstructorAccessor = null;
+	private static Method newInstance            = null;
+	private static Method newFieldAccessor       = null;
+	private static Method fieldAccessorSet       = null;
+	private static boolean isSetup               = false;
+	
+	//Some enums are decompiled with extra arguments, so lets check for that
+	private static Class[][] ctrs = {
+			{EnumAction.class},
+			{EnumArmorMaterial.class, int.class, int[].class, int.class},
+			{EnumArt.class, String.class, int.class, int.class, int.class, int.class},
+			{EnumCreatureAttribute.class},
+			{EnumCreatureType.class, Class.class, int.class, Material.class, boolean.class},
+			{EnumDoor.class},
+			{EnumEnchantmentType.class},
+			{EnumMobType.class},
+			{EnumMovingObjectType.class},
+			{EnumSkyBlock.class, int.class},
+			{EnumStatus.class},
+			{EnumToolMaterial.class, int.class, int.class, float.class, int.class, int.class}				
+	};
+	
+	private static boolean[] decompiled = new boolean[ctrs.length];
+	
+	public static EnumAction addAction(String name)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[0], EnumAction.class, name, 
+			new Class[] {},
+			new Object[]{});	
+	}	
+	public static EnumArmorMaterial addArmorMaterial(String name, int durability, int[] reductionAmounts, int enchantability)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[1], EnumArmorMaterial.class, name, 
+			new Class[] { int.class,  int[].class,      int.class      },
+			new Object[]{ durability, reductionAmounts, enchantability });	
+	}
+	public static EnumArt addArt(String name, String tile, int sizeX, int sizeY, int offsetX, int offsetY)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[2], EnumArt.class, name,
+			new Class[] {String.class, int.class, int.class, int.class, int.class},
+			new Object[]{tile,         sizeX,     sizeY,     offsetX,   offsetY});	
+	}
+	public static EnumCreatureAttribute addCreatureAttribute(String name)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[3], EnumCreatureAttribute.class, name, 
+			new Class[] {},
+			new Object[]{});	
+	}	
+	public static EnumCreatureType addCreatureType(String name, Class typeClass, int maxNumber, Material material, boolean peaceful)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[4], EnumCreatureType.class, name, 
+			new Class[] {Class.class, int.class, Material.class, boolean.class},
+			new Object[]{typeClass,   maxNumber, material,       peaceful});	
+	}
+	public static EnumDoor addDoor(String name)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[5], EnumDoor.class, name, 
+			new Class[] {},
+			new Object[]{});	
+	}	
+	public static EnumEnchantmentType addEnchantmentType(String name)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[6], EnumEnchantmentType.class, name, 
+			new Class[] {},
+			new Object[]{});	
+	}
+	public static EnumMobType addMobType(String name)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[7], EnumMobType.class, name, 
+			new Class[] {},
+			new Object[]{});	
+	}	
+	public static EnumMovingObjectType addMovingObjectType(String name)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[8], EnumMovingObjectType.class, name, 
+			new Class[] {},
+			new Object[]{});	
+	}
+	public static EnumSkyBlock addSkyBlock(String name, int lightValue)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[9], EnumSkyBlock.class, name, 
+			new Class[] {int.class },
+			new Object[]{lightValue});	
+	}
+	public static EnumStatus addStatus(String name)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[10], EnumStatus.class, name, 
+			new Class[] {},
+			new Object[]{});	
+	}	
+	public static EnumToolMaterial addToolMaterial(String name, int harvestLevel, int maxUses, float efficiency, int damage, int enchantability)
+	{
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		return addEnum(decompiled[11], EnumToolMaterial.class, name, 
+			new Class[] { int.class,    int.class, float.class,  int.class, int.class       },
+			new Object[]{ harvestLevel, maxUses,   efficiency,   damage,    enchantability  });	
+	}
+	
+	private static void setup()
+	{
+		if (isSetup)
+		{
+			return;
+		}
+		
+		//System.out.println("Enum Helper Initalizing: ");
+		for(int x = 0; x < ctrs.length; x++)
+		{
+			try {
+				Class<?>[] enumHeaders = new Class[ctrs[x].length + 3];
+				enumHeaders[0] = String.class;
+				enumHeaders[1] = int.class;
+				enumHeaders[2] = String.class;
+				enumHeaders[3] = int.class;
+				
+				for (int y = 1; y < ctrs[x].length; y++)
+					enumHeaders[3 + y] = ctrs[x][y];
+				
+				ctrs[x][0].getDeclaredConstructor(enumHeaders);
+				decompiled[x] = true;				
+				
+			} catch(Exception e) {
+				//Nom Nom Nom
+			}
+			//System.out.format("\t%-25s %s\r\n", ctrs[x][0].getName().replace("net.minecraft.src.", ""), decompiled[x]);
+		}
+
+		
+
+		try {
+			Method getReflectionFactory = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("getReflectionFactory");
+			reflectionFactory      = getReflectionFactory.invoke(null);
+			newConstructorAccessor = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("newConstructorAccessor", Constructor.class);
+			newInstance            = Class.forName("sun.reflect.ConstructorAccessor").getDeclaredMethod("newInstance", Object[].class);
+			newFieldAccessor       = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("newFieldAccessor", Field.class, boolean.class);
+			fieldAccessorSet       = Class.forName("sun.reflect.FieldAccessor").getDeclaredMethod("set", Object.class, Object.class);			
+		} catch (Exception e) {
+			e.printStackTrace();
+		} 
+		
+		isSetup = true;
+	}
+    
+    
+	/*
+	 * Everything below this is found at the site below, and updated to be able to compile in Eclipse/Java 1.6+
+     * Also modified for use in decompiled code.
+	 * Found at: http://niceideas.ch/roller2/badtrash/entry/java_create_enum_instances_dynamically
+	 */
+	
+	private static Object getConstructorAccessor(boolean decompiled, Class<?> enumClass, Class<?>[] additionalParameterTypes) throws Exception {
+		Class<?>[] parameterTypes = null;
+		if (decompiled) 
+		{
+			parameterTypes = new Class[additionalParameterTypes.length + 4];
+			parameterTypes[0] = String.class;
+			parameterTypes[1] = int.class;
+			parameterTypes[2] = String.class;
+			parameterTypes[3] = int.class;
+			System.arraycopy(additionalParameterTypes, 0, parameterTypes, 4, additionalParameterTypes.length);
+		}
+		else
+		{
+			parameterTypes = new Class[additionalParameterTypes.length + 2];
+			parameterTypes[0] = String.class;
+			parameterTypes[1] = int.class;
+			System.arraycopy(additionalParameterTypes, 0, parameterTypes, 2, additionalParameterTypes.length);
+		}
+		return newConstructorAccessor.invoke(reflectionFactory, enumClass.getDeclaredConstructor(parameterTypes));
+	}
+	
+	private static <T extends Enum<?>> T makeEnum(boolean decompiled, Class<T> enumClass, String value, int ordinal, Class<?>[] additionalTypes, Object[] additionalValues) throws Exception {
+		Object[] parms = null;
+		if (decompiled)
+		{
+			parms = new Object[additionalValues.length + 4];
+			parms[0] = value;
+			parms[1] = Integer.valueOf(ordinal);
+			parms[2] = value;
+			parms[3] = Integer.valueOf(ordinal);
+			System.arraycopy(additionalValues, 0, parms, 4, additionalValues.length);
+		}
+		else
+		{
+			parms = new Object[additionalValues.length + 2];
+			parms[0] = value;
+			parms[1] = Integer.valueOf(ordinal);
+			System.arraycopy(additionalValues, 0, parms, 2, additionalValues.length);	
+		}
+		return enumClass.cast(newInstance.invoke(getConstructorAccessor(decompiled, enumClass, additionalTypes), new Object[]{parms}));
+	}
+
+	private static void setFailsafeFieldValue(Field field, Object target, Object value) throws Exception {
+		field.setAccessible(true);
+		Field modifiersField = Field.class.getDeclaredField("modifiers");
+		modifiersField.setAccessible(true);
+		modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+		Object fieldAccessor = newFieldAccessor.invoke(reflectionFactory, field, false);
+		fieldAccessorSet.invoke(fieldAccessor, target, value);
+	}
+	
+	private static void blankField(Class<?> enumClass, String fieldName) throws Exception {
+		for (Field field : Class.class.getDeclaredFields()) {
+			if (field.getName().contains(fieldName)) {
+				field.setAccessible(true);
+				setFailsafeFieldValue(field, enumClass, null);
+				break;
+			}
+		}
+	}
+	
+	private static void cleanEnumCache(Class<?> enumClass) throws Exception {
+		blankField(enumClass, "enumConstantDirectory"); 
+		blankField(enumClass, "enumConstants"); 
+	}
+
+	public static <T extends Enum<?>> T addEnum(Class<T> enumType, String enumName, boolean decompiled) {
+		return addEnum(decompiled, enumType, enumName, new Class<?>[]{}, new Object[]{});
+	}
+	
+	@SuppressWarnings("unchecked")
+	public static <T extends Enum<?>> T addEnum(boolean decompiled, Class<T> enumType, String enumName, Class<?>[] paramTypes, Object[] paramValues) {
+		if (!isSetup)
+		{
+			setup();
+		}
+		
+		Field valuesField = null;
+		Field[] fields = enumType.getDeclaredFields();
+		int flags = Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL | 0x1000 /*SYNTHETIC*/; 
+		String valueType = String.format("[L%s;", enumType.getName().replace('.', '/'));
+		
+		for (Field field : fields) {
+			if (decompiled)
+			{
+				if (field.getName().contains("$VALUES")) 
+				{
+					valuesField = field;
+					break;
+				}
+			}
+			else
+			{
+				if ((field.getModifiers() & flags) == flags &&
+					field.getType().getName().replace('.', '/').equals(valueType)) //Apparently some JVMs return .'s and some don't..
+				{
+					valuesField = field;
+					break;
+				}
+			}
+		}
+		valuesField.setAccessible(true);
+
+		try {
+			T[] previousValues = (T[])valuesField.get(enumType);
+			List<T> values = new ArrayList<T>(Arrays.asList(previousValues));
+			T newValue = (T)makeEnum(decompiled, enumType, enumName, values.size(), paramTypes, paramValues);
+			values.add(newValue);
+			setFailsafeFieldValue(valuesField, null, values.toArray((T[]) Array.newInstance(enumType, 0)));
+			cleanEnumCache(enumType);
+			
+			return newValue;
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e.getMessage(), e);
+		}
+	}
+	
+	static {
+		if (!isSetup)
+		{
+			setup();
+		}
+	}
+}
@@ -0,0 +1,314 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.Entity;
+import net.minecraft.src.EntityMinecart;
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.IInventory;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.Item;
+import net.minecraft.src.EnumStatus;
+import net.minecraft.src.World;
+
+import java.util.*;
+
+public class ForgeHooks {
+	// TODO: move all app-side hooks from MinecraftForge
+
+
+	// List Handling Hooks
+	// ------------------------------------------------------------
+	public static void onTakenFromCrafting(EntityPlayer player, ItemStack ist,
+			IInventory craftMatrix) {
+		for (ICraftingHandler handler : craftingHandlers) {
+			handler.onTakenFromCrafting(player,ist,craftMatrix);
+		}
+	}
+
+	static LinkedList<ICraftingHandler> craftingHandlers = new LinkedList<ICraftingHandler>();
+
+	public static void onDestroyCurrentItem(EntityPlayer player, ItemStack orig) {
+		for (IDestroyToolHandler handler : destroyToolHandlers) {
+			handler.onDestroyCurrentItem(player,orig);
+		}
+	}
+
+	static LinkedList<IDestroyToolHandler> destroyToolHandlers = new LinkedList<IDestroyToolHandler>();
+
+	public static boolean onUseBonemeal(World world,
+			int bid, int i, int j, int k) {
+		for(IBonemealHandler handler : bonemealHandlers) {
+			if(handler.onUseBonemeal(world,bid,i,j,k))
+				return true;
+		}
+		return false;
+	}
+
+	static LinkedList<IBonemealHandler> bonemealHandlers = new LinkedList<IBonemealHandler>();
+
+	public static boolean onUseHoe(ItemStack hoe, EntityPlayer player,
+			World world, int i, int j, int k) {
+		for(IHoeHandler handler : hoeHandlers) {
+			if(handler.onUseHoe(hoe,player,world,i,j,k))
+				return true;
+		}
+		return false;
+	}
+
+	static LinkedList<IHoeHandler> hoeHandlers = new LinkedList<IHoeHandler>();
+
+	public static EnumStatus sleepInBedAt(EntityPlayer player, int i, int j, int k) {
+		for (ISleepHandler handler : sleepHandlers) {
+			EnumStatus status = handler.sleepInBedAt(player, i, j, k);
+			if (status != null)
+				return status;
+		}
+		return null;
+	}
+
+	static LinkedList<ISleepHandler> sleepHandlers = new LinkedList<ISleepHandler>();
+	
+
+	public static void onMinecartUpdate(EntityMinecart minecart, int x, int y, int z)
+	{
+		for (IMinecartHandler handler : minecartHandlers)
+		{
+			handler.onMinecartUpdate(minecart, x, y, z);
+		}
+	}
+	
+	public static void onMinecartEntityCollision(EntityMinecart minecart, Entity entity)
+	{
+		for (IMinecartHandler handler : minecartHandlers)
+		{
+			handler.onMinecartEntityCollision(minecart, entity);
+		}
+	}
+	
+	public static boolean onMinecartInteract(EntityMinecart minecart, EntityPlayer player)
+	{
+		boolean canceled = true;
+		for (IMinecartHandler handler : minecartHandlers)
+		{
+			boolean tmp = handler.onMinecartInteract(minecart, player, canceled);
+			canceled = canceled && tmp;
+		}
+		return canceled;
+	}
+	
+	static LinkedList<IMinecartHandler> minecartHandlers = new LinkedList<IMinecartHandler>();
+
+	// Plant Management
+	// ------------------------------------------------------------
+	static class ProbableItem {
+		public ProbableItem(int item, int md, int q, int st, int e) {
+			wstart=st; wend=e;
+			itemid=item; meta=md;
+			qty=q;
+		}
+		int wstart, wend;
+		int itemid, meta;
+		int qty;
+	}
+
+	static ProbableItem getRandomItem(List<ProbableItem> list, int prop) {
+		int n=Collections.binarySearch(list,prop,new Comparator(){
+			public int compare(Object o1, Object o2) {
+				ProbableItem pi=(ProbableItem)o1;
+				Integer i1=(Integer)o2;
+				if(i1<pi.wstart) return 1;
+				if(i1>=pi.wend) return -1;
+				return 0;
+			}
+		});
+		if(n<0) return null;
+		return list.get(n);
+	}
+
+	static List<ProbableItem> plantGrassList;
+	static int plantGrassWeight;
+
+	static List<ProbableItem> seedGrassList;
+	static int seedGrassWeight;
+
+	static {
+		plantGrassList=new ArrayList<ProbableItem>();
+		plantGrassList.add(new ProbableItem(
+			Block.plantYellow.blockID,0,1,0,20));
+		plantGrassList.add(new ProbableItem(
+			Block.plantRed.blockID,0,1,20,30));
+		plantGrassWeight=30;
+
+		seedGrassList=new ArrayList<ProbableItem>();
+		seedGrassList.add(new ProbableItem(
+			Item.seeds.shiftedIndex,0,1,0,10));
+		seedGrassWeight=10;
+	}
+
+	public static void plantGrassPlant(World world, int i, int j, int k) {
+		int n=world.rand.nextInt(plantGrassWeight);
+		ProbableItem pi=getRandomItem(plantGrassList,n);
+		if(pi==null) return;
+		world.setBlockAndMetadataWithNotify(i,j,k,pi.itemid,pi.meta);
+	}
+
+	public static void addPlantGrass(int item, int md, int prop) {
+		plantGrassList.add(new ProbableItem(
+			item,md,1,plantGrassWeight,plantGrassWeight+prop));
+		plantGrassWeight+=prop;
+	}
+
+	public static ItemStack getGrassSeed(World world) {
+		int n=world.rand.nextInt(seedGrassWeight);
+		ProbableItem pi=getRandomItem(seedGrassList,n);
+		if(pi==null) return null;
+		return new ItemStack(pi.itemid,pi.qty,pi.meta);
+	}
+
+	public static void addGrassSeed(int item, int md, int qty, int prop) {
+		seedGrassList.add(new ProbableItem(
+			item,md,qty,seedGrassWeight,seedGrassWeight+prop));
+		seedGrassWeight+=prop;
+	}
+
+	// Tool Path
+	// ------------------------------------------------------------
+	public static boolean canHarvestBlock(Block bl,
+			EntityPlayer player, int md) {
+		if(bl.blockMaterial.getIsHarvestable())
+			return true;
+		ItemStack itemstack = player.inventory.getCurrentItem();
+		if(itemstack == null) return false;
+
+		List tc=(List)toolClasses.get(itemstack.itemID);
+		if(tc==null) return itemstack.canHarvestBlock(bl);
+		Object[] ta=tc.toArray();
+		String cls=(String)ta[0]; int hvl=(Integer)ta[1];
+
+		Integer bhl=(Integer)toolHarvestLevels.get(Arrays.asList(
+			bl.blockID,md,cls));
+		if(bhl==null) return itemstack.canHarvestBlock(bl);
+		if(bhl>hvl) return false;
+		return true;
+	}
+
+	public static float blockStrength(Block bl,
+			EntityPlayer player, int md) {
+		float bh=bl.getHardness(md);
+		if(bh < 0.0F) return 0.0F;
+
+		if(!canHarvestBlock(bl,player,md)) {
+			return 1.0F / bh / 100F;
+		} else {
+			return player.getCurrentPlayerStrVsBlock(bl,md) /
+				bh / 30F;
+		}
+	}
+
+	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));
+	}
+
+	static void initTools() {
+		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.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.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");
+
+		Block[] pickeff = {
+			Block.cobblestone, Block.stairDouble,
+			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);
+		}
+
+	}
+
+	public static final int majorVersion=1;
+	public static final int minorVersion=2;
+	public static final int revisionVersion=4;
+	static {
+		System.out.printf("MinecraftForge V%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion);
+	}
+
+	static boolean toolInit=false;
+	static HashMap toolClasses=new HashMap();
+	static HashMap toolHarvestLevels=new HashMap();
+	static HashSet toolEffectiveness=new HashSet();
+}
+
@@ -5,12 +5,14 @@

 package net.minecraft.src.forge;

-import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.World;

 /**
 * This interface provides access to a number of secondary block properties through providing  
 * overrides to methods within world.class.
+ *
+ * This interface is DEPRECATED.  The functions are now provided directly by
+ * Block.
 */

 public interface IBlockSecondaryProperties 
@@ -0,0 +1,18 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.World;
+
+public interface IBonemealHandler {
+	/** Called when bonemeal is used on a block.  This is also called for
+	 * multiplayer servers, which must still return true if appropriate but
+	 * shouldn't actually perform world manipulation.
+	 * @return true to use up the bonemeal and stop processing.
+	 */
+	public boolean onUseBonemeal(World world, int bid, int i, int j, int k);
+}
+
@@ -0,0 +1,20 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.IInventory;
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.ItemStack;
+
+public interface ICraftingHandler {
+
+    /**
+     * Called after an item is taken from crafting.
+     */
+    public void onTakenFromCrafting(EntityPlayer player, ItemStack ist,
+	    IInventory craftMatrix);
+
+}
@@ -0,0 +1,16 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.EntityPlayer;
+
+public interface IDestroyToolHandler {
+	/** Called when the user's currently equipped item is destroyed.
+	 */
+	public void onDestroyCurrentItem(EntityPlayer player, ItemStack orig);
+}
+
@@ -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.World;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.EntityPlayer;
+
+public interface IHoeHandler {
+	/** Called when a hoe is used on a block.  This is called on both sides
+	 * in SMP.
+	 * @return true to consume a use of the hoe and return.
+	 */
+	public boolean onUseHoe(ItemStack hoe, EntityPlayer player, World world,
+			int i, int j, int k);
+
+}
+
@@ -0,0 +1,50 @@
+package net.minecraft.src.forge;
+
+import net.minecraft.src.AxisAlignedBB;
+import net.minecraft.src.Entity;
+import net.minecraft.src.EntityMinecart;
+
+/**
+ * This class defines a replacement for the default minecart collision code.
+ * Only one handler can be registered at a time. It it registered with EntityMinecart.registerCollisionHandler().
+ * If you use this, make it a configuration option.
+ * @author CovertJaguar
+ */
+public interface IMinecartCollisionHandler
+{
+
+    /**
+     * This basically replaces the function of the same name in EnityMinecart.
+     * Code in IMinecartHooks.applyEntityCollisionHook is still run.
+     * @param cart The cart that called the collision.
+     * @param other The object it collided with.
+     */
+    public void onEntityCollision(EntityMinecart cart, Entity other);
+
+    /**
+     * This function replaced the function of the same name in EntityMinecart.
+     * It is used to define whether minecarts collide with specific entities,
+     * for example items.
+     * @param cart The cart for which the collision box was requested.
+     * @param other The entity requesting the collision box.
+     * @return The collision box or null.
+     */
+    public AxisAlignedBB getCollisionBox(EntityMinecart cart, Entity other);
+
+    /**
+     * This function is used to define the box used for detecting minecart collisions.
+     * It is generally bigger that the normal collision box.
+     * @param cart The cart for which the collision box was requested.
+     * @return The collision box, cannot be null.
+     */
+    public AxisAlignedBB getMinecartCollisionBox(EntityMinecart cart);
+
+    /**
+     * This function replaces the function of the same name in EntityMinecart.
+     * It defines whether minecarts are solid to the player.
+     * @param cart The cart for which the bounding box was requested.
+     * @return The bounding box or null.
+     */
+    public AxisAlignedBB getBoundingBox(EntityMinecart cart);
+}
+
@@ -0,0 +1,38 @@
+package net.minecraft.src.forge;
+
+import net.minecraft.src.Entity;
+import net.minecraft.src.EntityMinecart;
+import net.minecraft.src.EntityPlayer;
+
+public interface IMinecartHandler {
+
+    /**
+     * This functions is called at the end of every minecart's doUpdate loop.
+     * If you override EntityMinecart.doUpdate(), is recommended that you retain the code that calls this function.
+     * @param cart The cart that called the function.
+     * @param i X coordinate of the rail
+     * @param j Y coordinate of the rail
+     * @param k Z coordinate of the rail
+     */
+	public void onMinecartUpdate(EntityMinecart minecart, int x, int y, int z);
+
+    /**
+     * This function allows several mods to add code into the collision routine at the same time regardless of the collision handler registered.
+     * If you override EntityMinecart.applyEntityCollision(), is recommended that you retain the code that calls this function.
+     * @param cart The cart that called the function.
+     * @param other
+     */
+	public void onMinecartEntityCollision(EntityMinecart minecart, Entity entity);
+
+    /**
+     * This function is called whenever a player attempts to interact with a minecart. 
+     * The primary reason for this hook is to fix a few bugs and put restrictions on how a minecart can be used under certain circumstances.
+     * If you override EntityMinecart.interact(), is recommended that you retain the code that calls this function.
+     * @param cart The cart that called the function.
+     * @param player The player that tried to interact with the minecart.
+     * @param canceled Wither or not a pervious hook has canceled the interaction of a player.
+     * @return Whether the player can interact with the minecart.
+     */
+	public boolean onMinecartInteract(EntityMinecart minecart, EntityPlayer player, boolean canceled);
+	
+}
@@ -0,0 +1,27 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.ItemStack;
+
+/** The current list of known classes.
+ * oreTin, oreCopper, oreSilver, oreUranium
+ * ingotTin, ingotCopper, ingotSilver, ingotBrass, ingotBronze
+ * ingotUranium, ingotRefinedIron
+ * dyeBlue
+ * gemRuby, gemEmerald, gemSapphire
+ * itemDropUranium
+ * woodRubber
+ * itemRubber
+ */
+
+public interface IOreHandler {
+	/** Called when a new ore is registered with the ore dictionary.
+	 * @param oreClass The string class of the ore.
+	 * @param ore The ItemStack for the ore.
+	 */
+	public void registerOre(String oreClass, ItemStack ore);
+}
@@ -13,6 +13,7 @@ import net.minecraft.src.World;
 * to control how it can be replaced
 *
 * @see Block
+ * @deprecated.  This functionality will be removed soon.
 */
 public interface IOverrideReplace {
    
@@ -0,0 +1,33 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.IInventory;
+
+/** Inventory ranges mapped by side.  This class is implemented by TileEntities
+ * that provide different inventory slot ranges to different sides.
+ */
+public interface ISidedInventory extends IInventory {
+
+	/** 
+	 * Get the start of the side inventory.
+	 * @param side The global side to get the start of range.
+	 *      0: -Y (bottom side)
+	 *      1: +Y (top side)
+	 *      2: -Z
+	 *      3: +Z
+	 *      4: -X
+	 *      5: +x
+	 */
+	int getStartInventorySide(int side);
+
+	/**
+	 * Get the size of the side inventory.
+	 * @param side The global side.
+	 */
+	int getSizeInventorySide(int side);
+}
+
@@ -0,0 +1,22 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.EnumStatus;
+
+public interface ISleepHandler {
+    /**
+     * This is called before a player sleeps in a bed.  If it returns a
+     * non-null result, then the normal sleeping process will be skipped, and
+     * the value returned by this method will be returned to
+     * BlockBed.blockActivated.
+     *
+     * @see MinecraftForge#registerSleepHandler(ISleepHandler)
+     */
+    public EnumStatus sleepInBedAt(EntityPlayer player, int i, int j, int k);
+}
+
@@ -5,6 +5,7 @@

 package net.minecraft.src.forge;

+import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ItemArmor;

 /**
@@ -15,13 +16,10 @@ import net.minecraft.src.ItemArmor;
 * @see ItemArmor
 */
 public interface ISpecialArmor {
-    /**
-     * This interface will adjust the amount of damage received by the entity.
-     */
-    public int adjustArmorDamage (int damage);
    
    /**
-     * When this return true, the regular armor computation will be cancelled
+     * Return extra properties for the armor
     */
-    public boolean allowRegularComputation ();
+	public ArmorProperties getProperties(EntityPlayer player,
+			int intitialDamage, int currentDamage);
 }
@@ -14,6 +14,9 @@ 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 {
@@ -0,0 +1,49 @@
+package net.minecraft.src.forge;
+
+import net.minecraft.src.EntityMinecart;
+
+/**
+ * Used to create hashmap values for Minecart/type pairs
+ * Written by CovertJaguar
+ */
+public class MinecartKey {
+    public final Class<? extends EntityMinecart> minecart;
+    public final int type;
+
+    public MinecartKey(Class<? extends EntityMinecart> c, int t)
+    {
+        minecart = c;
+        type = t;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if(obj == null) 
+        {
+            return false;
+        }
+        
+        if(getClass() != obj.getClass()) 
+        {
+            return false;
+        }
+        
+        final MinecartKey other = (MinecartKey)obj;
+        if(this.minecart != other.minecart && (this.minecart == null || !this.minecart.equals(other.minecart))) 
+        {
+            return false;
+        }
+        
+        return (this.type == other.type);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        int hash = 7;
+        hash = 59 * hash + (this.minecart != null ? this.minecart.hashCode() : 0);
+        hash = 59 * hash + this.type;
+        return hash;
+    }
+}
@@ -0,0 +1,766 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.EntityMinecart;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.World;
+
+import java.util.*;
+
+public class MinecraftForge {
+
+    private static LinkedList<IBucketHandler> bucketHandlers = new LinkedList<IBucketHandler>();
+    /**
+     * Register a new custom bucket handler.
+     */
+    public static void registerCustomBucketHandler(IBucketHandler handler) {
+        bucketHandlers.add(handler);
+    }
+
+    /**
+     * Registers a new sleeping handler.
+     */
+    public static void registerSleepHandler(ISleepHandler handler) {
+	ForgeHooks.sleepHandlers.add(handler);
+    }
+
+    /**
+     * Registers a new bonemeal handler.
+     */
+    public static void registerBonemealHandler(IBonemealHandler handler) {
+	ForgeHooks.bonemealHandlers.add(handler);
+    }
+
+    /**
+     * Registers a new hoe handler.
+     */
+    public static void registerHoeHandler(IHoeHandler handler) {
+	ForgeHooks.hoeHandlers.add(handler);
+    }
+
+    /**
+     * Registers a new destroy tool handler.
+     */
+    public static void registerDestroyToolHandler(IDestroyToolHandler handler) {
+	ForgeHooks.destroyToolHandlers.add(handler);
+    }
+
+    /**
+     * Registers a new crafting handler.
+     */
+    public static void registerCraftingHandler(ICraftingHandler handler) {
+        ForgeHooks.craftingHandlers.add(handler);
+    }
+    
+    /**
+     * Registers a new minecart handler
+     * @param handler The Handler to be registered
+     */
+    public static void registerMinecartHandler(IMinecartHandler handler)
+    {
+    	ForgeHooks.minecartHandlers.add(handler);
+    }
+
+    /**
+     * This is not supposed to be called outside of Minecraft internals.
+     */
+    public static ItemStack fillCustomBucket(World w, int i, int j, int k) {
+        for (IBucketHandler handler : bucketHandlers) {
+            ItemStack stack = handler.fillCustomBucket(w, i, j, k);
+
+            if (stack != null) {
+                return stack;
+            }
+        }
+
+        return null;
+    }
+
+    // Ore Dictionary
+    // ------------------------------------------------------------
+    private static LinkedList<IOreHandler> oreHandlers = new LinkedList<IOreHandler>();
+    private static TreeMap<String,List<ItemStack>> oreDict=
+	    new TreeMap<String,List<ItemStack>>();
+
+    /** Register a new ore handler.  This will automatically call the handler
+     * with all current ores during registration, and every time a new ore is
+     * added later.
+     */
+    public static void registerOreHandler(IOreHandler handler) {
+	    oreHandlers.add(handler);
+
+	    for(String key : oreDict.keySet()) {
+		    List<ItemStack> val=oreDict.get(key);
+		    for(ItemStack ist : val) {
+			    handler.registerOre(key,ist);
+		    }
+	    }
+    }
+
+    /** Register a new item with the ore dictionary.
+     * @param oreClass The string class of the ore.
+     * @param ore The ItemStack for the ore.
+     */
+    public static void registerOre(String oreClass, ItemStack ore) {
+	    List<ItemStack> orelist=oreDict.get(oreClass);
+	    if(orelist==null) {
+		    orelist=new ArrayList<ItemStack>();
+		    oreDict.put(oreClass,orelist);
+	    }
+	    orelist.add(ore);
+	    for(IOreHandler ioh : oreHandlers) {
+		    ioh.registerOre(oreClass,ore);
+	    }
+    }
+
+    /** Get the list of ores in a given class.
+     */
+    public static List<ItemStack> getOreClass(String oreClass) {
+	    return oreDict.get(oreClass);
+    }
+
+    public static class OreQuery implements Iterable<Object[]> {
+	    Object[] proto;
+
+	    public class OreQueryIterator implements Iterator<Object[]> {
+		    LinkedList itering;
+		    LinkedList output;
+
+		    private OreQueryIterator() {
+			    itering=new LinkedList();
+			    output=new LinkedList();
+
+			    for(int i=0; i<proto.length; i++) {
+				    if(proto[i] instanceof Collection) {
+					    Iterator it=((Collection)proto[i])
+						    .iterator();
+					    if(!it.hasNext()) {
+						    output=null; break;
+					    }
+					    itering.addLast(it);
+					    output.addLast(it.next());
+				    } else {
+					    itering.addLast(proto[i]);
+					    output.addLast(proto[i]);
+				    }
+			    }
+		    }
+
+		    public boolean hasNext() {
+			    return output!=null;
+		    }
+
+		    public Object[] next() {
+			    Object[] tr=output.toArray();
+
+			    Object to;
+			    while(true) {
+				    if(itering.size()==0) {
+					    output=null;
+					    return tr;
+				    }
+				    to=itering.getLast();
+				    output.removeLast();
+				    if(to instanceof Iterator) {
+					    Iterator it=(Iterator)to;
+					    if(it.hasNext()) {
+						    output.addLast(it.next());
+						    break;
+					    }
+				    }
+				    itering.removeLast();
+			    }
+			    for(int i=itering.size(); i<proto.length; i++) {
+				    if(proto[i] instanceof Collection) {
+					    Iterator it=((Collection)proto[i])
+						    .iterator();
+					    if(!it.hasNext()) {
+						    output=null; break;
+					    }
+					    itering.addLast(it);
+					    output.addLast(it.next());
+				    } else {
+					    itering.addLast(proto[i]);
+					    output.addLast(proto[i]);
+				    }
+			    }
+			    return tr;
+		    }
+
+		    public void remove() {}
+	    }
+
+	    private OreQuery(Object[] pattern) {
+		    proto=pattern;
+	    }
+
+	    public Iterator<Object[]> iterator() {
+		    return new OreQueryIterator();
+	    }
+    }
+
+    /** Generate all valid legal recipe combinations.  Any Lists in pattern
+     * will be fully expanded to all valid combinations.
+     */
+    public static OreQuery generateRecipes(Object... pattern) {
+	    return new OreQuery(pattern);
+    }
+
+    // ------------------------------------------------------------
+
+    /** Register a new plant to be planted when bonemeal is used on grass.
+     * @param bid The block ID to plant.
+     * @param md The metadata to plant.
+     * @param prop The relative probability of the plant, where red flowers are
+     * 10 and yellow flowers are 20.
+     */
+    public static void addGrassPlant(int item, int md, int prop) {
+	    ForgeHooks.addPlantGrass(item,md,prop);
+    }
+
+    /** Register a new seed to be dropped when breaking tall grass.
+     * @param bid The item ID of the seeds.
+     * @param md The metadata of the seeds.
+     * @param qty The quantity of seeds to drop.
+     * @param prop The relative probability of the seeds, where wheat seeds are
+     * 10.
+     */
+    public static void addGrassSeed(int item, int md, int qty, int prop) {
+	    ForgeHooks.addGrassSeed(item,md,qty,prop);
+    }
+
+    /** Register a tool as a tool class with a given harvest level.
+     *
+     * @param tool The custom tool to register.
+     * @param tclass The tool class to register as.  The predefined tool
+     * clases are "pickaxe", "shovel", "axe".  You can add others for custom
+     * tools.
+     * @param hlevel The harvest level of the tool.
+     */
+    public static void setToolClass(Item tool, String tclass, int hlevel) {
+	    ForgeHooks.initTools();
+	    ForgeHooks.toolClasses.put(tool.shiftedIndex,
+		Arrays.asList(tclass,hlevel));
+    }
+
+    /** Register a block to be harvested by a tool class.  This is the metadata
+     * sensitive version, use it if your blocks are using metadata variants.
+     * By default, this sets the block class as effective against that type.
+     *
+     * @param bl The block to register.
+     * @param md The metadata for the block subtype.
+     * @param tclass The tool class to register as able to remove this block.
+     * You may register the same block multiple times with different tool
+     * classes, if multiple tool types can be used to harvest this block.
+     * @param hlevel The minimum tool harvest level required to successfully
+     * harvest the block.
+     * @see setToolClass for details on tool classes.
+     */
+    public static void setBlockHarvestLevel(Block bl, int md, String tclass, 
+		int hlevel) {
+	    ForgeHooks.initTools();
+	    List key=Arrays.asList(bl.blockID,md,tclass);
+	    ForgeHooks.toolHarvestLevels.put(key,hlevel);
+	    ForgeHooks.toolEffectiveness.add(key);
+    }
+
+    /** Remove a block effectiveness mapping.  Since setBlockHarvestLevel
+     * makes the tool class effective against the block by default, this can be
+     * used to remove that mapping.  This will force a block to be harvested at
+     * the same speed regardless of tool quality, while still requiring a given
+     * harvesting level.
+     * @param bl The block to remove effectiveness from.
+     * @param md The metadata for the block subtype.
+     * @param tclass The tool class to remove the effectiveness mapping from.
+     * @see setToolClass for details on tool classes.
+     */
+    public static void removeBlockEffectiveness(Block bl, int md,
+		    String tclass) {
+	    ForgeHooks.initTools();
+	    List key=Arrays.asList(bl.blockID,md,tclass);
+	    ForgeHooks.toolEffectiveness.remove(key);
+    }
+
+    /** Register a block to be harvested by a tool class.
+     * By default, this sets the block class as effective against that type.
+     *
+     * @param bl The block to register.
+     * @param tclass The tool class to register as able to remove this block.
+     * You may register the same block multiple times with different tool
+     * classes, if multiple tool types can be used to harvest this block.
+     * @param hlevel The minimum tool harvest level required to successfully
+     * harvest the block.
+     * @see setToolClass for details on tool classes.
+     */
+    public static void setBlockHarvestLevel(Block bl, String tclass, 
+		int hlevel) {
+	    ForgeHooks.initTools();
+	    for(int md=0; md<16; md++) {
+		    List key=Arrays.asList(bl.blockID,md,tclass);
+		    ForgeHooks.toolHarvestLevels.put(key,hlevel);
+		    ForgeHooks.toolEffectiveness.add(key);
+	    }
+    }
+
+    /** Remove a block effectiveness mapping.  Since setBlockHarvestLevel
+     * makes the tool class effective against the block by default, this can be
+     * used to remove that mapping.  This will force a block to be harvested at
+     * the same speed regardless of tool quality, while still requiring a given
+     * harvesting level.
+     * @param bl The block to remove effectiveness from.
+     * @param tclass The tool class to remove the effectiveness mapping from.
+     * @see setToolClass for details on tool classes.
+     */
+    public static void removeBlockEffectiveness(Block bl, String tclass) {
+	    ForgeHooks.initTools();
+	    for(int md=0; md<16; md++) {
+		    List key=Arrays.asList(bl.blockID,md,tclass);
+		    ForgeHooks.toolEffectiveness.remove(key);
+	    }
+    }
+
+    /**
+     * Kill minecraft with an error message.
+     */
+    public static void killMinecraft(String modname, String msg) {
+	    throw new RuntimeException(modname+": "+msg);
+    }
+
+    /**
+     * Version checking.  Ensures that a sufficiently recent version of Forge
+     * is installed.  Will result in a fatal error if the major versions
+     * mismatch or if the version is too old.  Will print a warning message if
+     * the minor versions don't match.
+     */
+    public static void versionDetect(String modname,
+		    int major, int minor, int revision) {
+	    if(major!=ForgeHooks.majorVersion) {
+		    killMinecraft(modname,"MinecraftForge Major Version Mismatch, expecting "+major+".x.x");
+	    } else if(minor!=ForgeHooks.minorVersion) {
+		    if(minor>ForgeHooks.minorVersion) {
+			    killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision);
+		    } else {
+			    System.out.println(modname + ": MinecraftForge minor version mismatch, expecting "+major+"."+minor+".x, may lead to unexpected behavior");
+		    }
+	    } else if(revision>ForgeHooks.revisionVersion) {
+		    killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision);
+	    }
+    }
+
+    /**
+     * Strict version checking.  Ensures that a sufficiently recent version of
+     * Forge is installed.  Will result in a fatal error if the major or minor 
+     * versions mismatch or if the version is too old.  Use this function for
+     * mods that use recent, new, or unstable APIs to prevent
+     * incompatibilities.
+     */
+    public static void versionDetectStrict(String modname,
+		    int major, int minor, int revision) {
+	    if(major!=ForgeHooks.majorVersion) {
+		    killMinecraft(modname,"MinecraftForge Major Version Mismatch, expecting "+major+".x.x");
+	    } else if(minor!=ForgeHooks.minorVersion) {
+		    if(minor>ForgeHooks.minorVersion) {
+			    killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision);
+		    } else {
+			    killMinecraft(modname,"MinecraftForge minor version mismatch, expecting "+major+"."+minor+".x");
+		    }
+	    } else if(revision>ForgeHooks.revisionVersion) {
+		    killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision);
+	    }
+    }
+
+	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;
+    }
+    
+
+    //Minecart Dictionary --------------------------------------
+    private static Map<MinecartKey, ItemStack> itemForMinecart = new HashMap<MinecartKey, ItemStack>();
+    private static Map<ItemStack, MinecartKey> minecartForItem = new HashMap<ItemStack, MinecartKey>();
+    /**
+     * Registers a custom minecart and its corresponding item.
+     * This should be the item used to place the minecart by the user,
+     * not the item dropped by the cart.
+     * @param cart The minecart.
+     * @param item The item used to place the cart.
+     */
+    public static void registerMinecart(Class<? extends EntityMinecart> cart, ItemStack item)
+    {
+        registerMinecart(cart, 0, item);
+    }
+
+    /**
+     * Registers a minecart and its corresponding item.
+     * This should be the item used to place the minecart by the user,
+     * not the item dropped by the cart.
+     * @param minecart The minecart.
+     * @param type The minecart type, used to differentiate carts that have the same class.
+     * @param item The item used to place the cart.
+     */
+    public static void registerMinecart(Class<? extends EntityMinecart> minecart, int type, ItemStack item)
+    {
+        MinecartKey k = new MinecartKey(minecart, type);
+        itemForMinecart.put(k, item);
+        minecartForItem.put(item, k);
+    }    
+    
+    /**
+     * Removes a previously registered Minecart. Useful for replacing the vanilla minecarts.
+     * @param minecart
+     * @param type 
+     */
+    public static void removeMinecart(Class<? extends EntityMinecart> minecart, int type)
+    {
+        MinecartKey k = new MinecartKey(minecart, type);
+        ItemStack item = itemForMinecart.remove(k);
+        if(item != null) 
+        {
+            minecartForItem.remove(item);
+        }
+    }    
+    
+    /**
+     * This function returns an ItemStack that represents this cart.
+     * The player should be able to use this item to place the minecart.
+     * This is the item that was registered with the cart via the registerMinecart function,
+     * but is not necessary the item the cart drops when destroyed.
+     * @param minecart The cart class
+     * @return An ItemStack that can be used to place the cart.
+     */
+    public static ItemStack getItemForCart(Class<? extends EntityMinecart> minecart)
+    {
+        return getItemForCart(minecart, 0);
+    }
+
+    /**
+     * This function returns an ItemStack that represents this cart.
+     * The player should be able to use this item to place the minecart.
+     * This is the item that was registered with the cart via the registerMinecart function,
+     * but is not necessary the item the cart drops when destroyed.
+     * @param minecart The cart class
+     * @param type The minecartType value
+     * @return An ItemStack that can be used to place the cart.
+     */
+    public static ItemStack getItemForCart(Class<? extends EntityMinecart> minecart, int type)
+    {
+        ItemStack item = itemForMinecart.get(new MinecartKey(minecart, type));
+        if (item == null)
+        {
+        	return null;
+        }
+        return item.copy();
+    }
+
+    /**
+     * This function returns an ItemStack that represents this cart.
+     * The player should be able to use this item to place the minecart.
+     * This is the item that was registered with the cart via the registerMinecart function,
+     * but is not necessary the item the cart drops when destroyed.
+     * @param cart The cart entity
+     * @return An ItemStack that can be used to place the cart.
+     */
+    public static ItemStack getItemForCart(EntityMinecart cart)
+    {
+        if(cart.getClass() == EntityMinecart.class) 
+        {
+            return getItemForCart(cart.getClass(), cart.getMinecartType());
+        }
+        return getItemForCart(cart.getClass(), 0);
+    }
+
+    /**
+     * The function will return the cart class for a given item.
+     * If the item was not registered via the registerMinecart function it will return null.
+     * @param item The item to test.
+     * @return Cart if mapping exists, null if not.
+     */
+    public static Class<? extends EntityMinecart> getCartClassForItem(ItemStack item)
+    {
+        MinecartKey k = minecartForItem.get(item);
+        if(k != null) 
+        {
+            return k.minecart;
+        }
+        return null;
+    }
+
+    /**
+     * The function will return the cart type for a given item.
+     * Will return -1 if the mapping doesn't exist.
+     * If the item was not registered via the registerMinecart function it will return null.
+     * @param item The item to test.
+     * @return the cart minecartType value.
+     */
+    public static int getCartTypeForItem(ItemStack item)
+    {
+        MinecartKey k = minecartForItem.get(item);
+        if(k != null) 
+        {
+            return k.type;
+        }
+        return -1;
+    }
+
+    /**
+     * Will return a set of all registered minecart items.
+     * @return a copy of the set of all minecart items
+     */
+    public static Set<ItemStack> getAllCartItems()
+    {
+    	Set<ItemStack> ret = new HashSet<ItemStack>();
+    	for(ItemStack item : minecartForItem.keySet())
+    	{
+    		ret.add(item.copy());
+    	}
+        return ret;
+    }
+  
+        
+    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      );
+    	
+        registerMinecart(EntityMinecart.class, 0, new ItemStack(Item.minecartEmpty));
+        registerMinecart(EntityMinecart.class, 1, new ItemStack(Item.minecartCrate));
+        registerMinecart(EntityMinecart.class, 2, new ItemStack(Item.minecartPowered));
+    }
+
+}
@@ -0,0 +1,40 @@
+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;
+	}
+}
@@ -0,0 +1,19 @@
+*** HOW TO INSTALL ***
+
+Extract the download archive directly into your MCP-directiory.
+It should create a folder "forge" within that directory, containing all 
+extracted files.
+
+You should use freshly downloaded jars, solely including ModLoader & 
+ModLoaderMP. Anything else can eventually cause conflicts.
+
+Now just start the install.cmd/.sh, MCForge will install itself into the proper
+locations and copy all needed files, as well as modifying the needed baseclasses.
+
+Forge also includes a snapshot of the MCP mapings, this may not be the current 
+version of the mapings. But you must use the provided mapings in order for the 
+patch files to work together.
+
+The install scripts should take care of everything for you, so you should not need
+to run ANY MCP script before installing forge.
+
@@ -0,0 +1,54 @@
+echo off
+
+echo MinecraftForge Windows Setup Program
+echo:
+
+pushd .. >nul
+
+xcopy /Y /E /I forge\conf\* conf
+
+if exist runtime\bin\fernflower.jar move runtime\bin\fernflower.jar runtime\bin\fernflower.jar-backup
+
+cmd /C cleanup.bat
+cmd /C decompile.bat
+
+if exist runtime\bin\fernflower.jar-backup move runtime\bin\fernflower.jar-backup runtime\bin\fernflower.jar
+
+pushd src >nul
+
+    if exist ..\jars\bin\minecraft.jar (
+        del minecraft\net\minecraft\src\MLProp.java
+        copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java
+        
+        for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches\minecraft') do (
+            pushd "%%a" 2>nul
+            if errorlevel 1 (
+                ..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a"
+                ..\runtime\bin\applydiff.exe -uf -p2 -i "%%a"
+            ) else popd
+        )
+    )
+    
+    if exist ..\jars\minecraft_server.jar (
+        del minecraft_server\net\minecraft\src\MLProp.java
+        copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java
+
+        ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch
+        ..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch
+        
+        for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches\minecraft_server') do (
+            pushd "%%a" 2>nul
+            if errorlevel 1 (
+                ..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a"
+                ..\runtime\bin\applydiff.exe -uf -p2 -i "%%a"
+            ) else popd
+        )
+    
+    )
+popd >nul
+
+xcopy /Y /E forge\src\* src
+
+cmd /C updatemcp.bat
+cmd /C updatenames.bat
+cmd /C updatemd5.bat
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+echo "MinecraftForge Linux Setup Program"
+echo 
+
+pushd .. > /dev/null
+
+rm -rf conf 
+mkdir conf
+cp -r forge/conf/* conf
+
+if [ -f runtime/bin/fernflower.jar ];
+then
+   mv runtime/bin/fernflower.jar runtime/bin/fernflower.jar-backup
+fi
+
+./cleanup.sh
+./decompile.sh
+
+if [ -f runtime/bin/fernflower.jar-backup ];
+then
+   mv runtime/bin/fernflower.jar-backup runtime/bin/fernflower.jar
+fi
+
+
+pushd src > /dev/null
+    find . -name *.java -exec sed -i 's/\r//g' \{\} \;
+    find ../forge/ -name *.patch -exec sed -i 's/\r//g' \{\} \;
+
+    if [ -f ../jars/bin/minecraft.jar ];
+    then
+        cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java
+    
+        for i in `find ../forge/patches/minecraft/ -type f`
+        do
+            patch -p2 -i $i
+        done
+    fi
+
+
+    if [ -f ../jars/minecraft_server.jar ];
+    then
+        cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java
+    
+        patch -p2 -i ../forge/modLoaderMP.patch
+    
+        for i in `find ../forge/patches/minecraft_server/ -type f`
+        do
+            patch -p2 -i $i
+        done
+    fi
+popd > /dev/null
+
+cp -r forge/src/* src
+
+
+./updatemcp.sh
+./updatenames.sh
+./updatemd5.sh
@@ -0,0 +1,20 @@
+* Eloraam *
+
+* FlowerChild *
+
+* Hawkye *
+
+* MALfunction84 *
+
+Submitted the sleep handler code for his mod (Somnia) and others to use.
+
+* Scokeev9 *
+
+Gave permission for ScotTools API to be integrated into MCF, and also supported the Forge by converting his mods to use it.
+
+ScotTools Background: ScotTools was an API that enabled modders to add blocks to harvesting levels (and many other ease-of-use features to create new tools), and the first tool API that used block material for block breaking efficiency which allowed blocks from mods that didn't use ScotTools API to break with the correct speed.
+
+* SpaceToad *
+
+* LexManos *
+
@@ -57,3 +57,14 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server
 
     private void doTick()
     {
+diff U3 ../src_base/minecraft_server/net/minecraft/src/MLProp.java ../src_work/minecraft_server/net/minecraft/src/MLProp.java
+--- ../src_base/minecraft_server/net/minecraft/src/MLProp.java	Wed Nov 30 22:27:22 2011
+++ ../src_work/minecraft_server/net/minecraft/src/MLProp.java	Sun Dec 04 14:31:04 2011
+@@ -8,4 +8,6 @@
+ 	String info() default "";
+ 	double min() default Double.NEGATIVE_INFINITY;
+ 	double max() default Double.POSITIVE_INFINITY;
+    
+    public int reobf() default 0;
+ }
+\ No newline at end of file
@@ -22,7 +22,10 @@ function remove_svn () {
 function package_all () {
   qual=$1

+   cp $build_dir/minecraftforge_credits.txt .
+
   zip -r $dir/minecraftforge$qual-$version.zip \
+      minecraftforge_credits.txt \
      *.class \
      forge
 }
@@ -51,18 +54,29 @@ cd forge
 mkdir src
 mkdir src/minecraft
 mkdir src/minecraft_server
+mkdir patches
+mkdir conf
 cp -r ../forge_client/src/* src/minecraft
 cp -r ../forge_server/src/* src/minecraft_server
 cp -r ../forge_common/* src/minecraft
 cp -r ../forge_common/* src/minecraft_server
-cp ../minecraft.patch .
+cp -r ../patches/* patches
+cp -r ../conf/* conf
 cp ../lfcr.py .
 cp ../install/install.cmd .
+cp ../install/install.sh .
+cp ../modLoaderMP.patch .
+cp ../MLProp.java .
 cp ../install/README.txt .
+cp ../minecraftforge_credits.txt .
 cp -r ../doc .

 cd src
 remove_svn .
+cd ../patches
+remove_svn .
+cd ../conf
+remove_svn .
 cd ..

 cd ..
@@ -0,0 +1,390 @@
+--- ../src_base/minecraft/net/minecraft/src/Block.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/Block.java	0000-00-00 00:00:00.000000000 -0000
+@@ -4,6 +4,7 @@
+ 
+ package net.minecraft.src;
+ 
+import net.minecraft.src.forge.ForgeHooks;
+ import java.util.ArrayList;
+ import java.util.Random;
+ 
+@@ -312,12 +313,14 @@
+ 
+     public float getBlockBrightness(IBlockAccess iblockaccess, int i, int j, int k)
+     {
+-        return iblockaccess.getBrightness(i, j, k, lightValue[blockID]);
+        return iblockaccess.getBrightness(i, j, k,
+        		getLightValue(iblockaccess,i,j,k));
+     }
+ 
+     public int getMixedBrightnessForBlock(IBlockAccess iblockaccess, int i, int j, int k)
+     {
+-        return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k, lightValue[blockID]);
+        return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k,
+        		getLightValue(iblockaccess,i,j,k));
+     }
+ 
+     public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)
+@@ -438,25 +441,70 @@
+     {
+         return 1;
+     }
+-
+    
+    /* FORGE: Metadata-sensitive version.
+     */
+    public int quantityDropped(int meta, int fortune, Random random)
+    {
+        return quantityDroppedWithBonus(fortune, random);
+    }
+    
+    /* FORGE: Metadata-sensitive version.
+     * 
+     * This is deprecated in MC 1.0+ versions because of the new Enchantment 
+     * system requiring a new argument. Will be removed unless a valid reason
+     * for it to remain is brought to light.
+     * 
+     * Implementing this in your mod will not do anything!
+     */
+    @Deprecated
+    public int quantityDropped(int meta, Random random)
+    {
+        return quantityDropped(meta, 0, random);
+    }
+    
+     public int idDropped(int i, Random random, int j)
+     {
+         return blockID;
+     }
+ 
+    /* FORGE: This function isnt called by Minecraft anymore.  Use
+     * blockStrength(EntityPlayer,int) instead.
+     */
+     public float blockStrength(EntityPlayer entityplayer)
+     {
+-        if(blockHardness < 0.0F)
+-        {
+-            return 0.0F;
+-        }
+-        if(!entityplayer.canHarvestBlock(this))
+-        {
+-            return 1.0F / blockHardness / 100F;
+-        } else
+-        {
+-            return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F;
+-        }
+        return blockStrength(entityplayer,0);
+    }
+
+    /* FORGE: This function returns the complete list of drops for a block.
+     */
+    public ArrayList<ItemStack> getBlockDropped(World world,
+        	    int i, int j, int k, int md, int fortune) {
+    	
+    	ArrayList<ItemStack> tr = new ArrayList<ItemStack>();
+
+    	int q = quantityDropped(md, fortune, world.rand);
+    	for (int n = 0; n < q; n++) {
+    		int id = idDropped(md, world.rand, 0);
+    		if(id > 0) {
+    			tr.add(new ItemStack(id, 1, damageDropped(md)));
+    		}
+    	}
+    	return tr;
+    }
+    
+    /* FORGE: This function returns the complete list of drops for a block.
+     * 
+     * This is deprecated in MC 1.0+ versions because of the new Enchantment 
+     * system requiring a new argument. Will be removed unless a valid reason
+     * for it to remain is brought to light.
+     * 
+     * Implementing this in your mod will not do anything!
+     */
+    @Deprecated
+    public ArrayList<ItemStack> getBlockDropped(World world,
+        	    int i, int j, int k, int md) {
+    	return getBlockDropped (world, i, j, k, md, 0);
+     }
+ 
+     public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1)
+@@ -470,18 +518,13 @@
+         {
+             return;
+         }
+-        int j1 = quantityDroppedWithBonus(i1, world.rand);
+-        for(int k1 = 0; k1 < j1; k1++)
+-        {
+	ArrayList<ItemStack> ar = getBlockDropped(world, i, j, k, l, i1);
+	for (ItemStack ist : ar) {
+             if(world.rand.nextFloat() > f)
+             {
+                 continue;
+             }
+-            int l1 = idDropped(l, world.rand, i1);
+-            if(l1 > 0)
+-            {
+-                dropBlockAsItem_do(world, i, j, k, new ItemStack(l1, 1, damageDropped(l)));
+-            }
+	    dropBlockAsItem_do(world, i, j, k, ist);
+         }
+ 
+     }
+@@ -726,7 +769,7 @@
+     {
+         entityplayer.addStat(StatList.mineBlockStatArray[blockID], 1);
+         entityplayer.addExhaustion(0.025F);
+-        if(renderAsNormalBlock() && !isBlockContainer[blockID] && EnchantmentHelper.getSilkTouchModifier(entityplayer.inventory))
+        if(renderAsNormalBlock() && !hasTileEntity(l) && EnchantmentHelper.getSilkTouchModifier(entityplayer.inventory))
+         {
+             ItemStack itemstack = createStackedBlock(l);
+             if(itemstack != null)
+@@ -805,6 +848,248 @@
+         return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F;
+     }
+ 
+    /* FORGE: Allow a block to set illumination on a coordinate basis.
+     */
+    public int getLightValue(IBlockAccess iba, int i, int j, int k) {
+	    return lightValue[blockID];
+    }
+
+    /* FORGE: Implement and return true if you wish this block to behave
+     * like a ladder when the player is inside.
+     *
+     * This is deprecated in favor of the more flexible version below.
+     */
+    @Deprecated
+    public boolean isLadder() {
+	return false;
+    }
+
+    /* FORGE: Implement and return true if you wish this block to behave
+     * like a ladder when the player is inside.
+     */
+    public boolean isLadder(World world, int i, int j, int k) {
+	return isLadder();
+    }
+
+    /* FORGE: Return true if the block is a normal, solid cube.  This
+     * determines indirect power state, entity ejection from blocks, and a few
+     * others.
+     */
+    public boolean isBlockNormalCube(World world, int i, int j, int k) {
+	    return blockMaterial.getIsOpaque() && renderAsNormalBlock();
+    }
+
+    /* FORGE: Return true if the block is solid on the given side.  This
+     * is used by placement logic. */
+    public boolean isBlockSolidOnSide( World world, int i, int j, int k,
+		    int side ) {
+	    return isBlockNormalCube(world,i,j,k);
+    }
+
+    /* FORGE: Return true if the player can place a new block in the block
+     * occupied by this one, like water, lava, fire, etc.
+     */
+    public boolean isBlockReplaceable( World world, int i, int j, int k ) {
+	    return false;
+    }
+
+    /* FORGE: Return true if this block should set fire and deal fire damage
+     * to entities coming into contact with it, false otherwise.
+     */
+    public boolean isBlockBurning( World world, int i, int j, int k ) {
+	    return false;
+    }
+
+    /* FORGE: Return true if this block should be treated as an air block
+     * by the rest of the code, false otherwise.  This method is primarily
+     * useful for creating pure logic-blocks that will be invisible 
+     * to the player and otherwise interact as air would.  
+     */	
+    public boolean isAirBlock( World world, int i, int j, int k ) {
+	    return false;
+    }
+
+    /* FORGE: Return the block hardness with metadata md.
+     */
+    public float getHardness(int md) {
+	    return blockHardness;
+    }
+
+    /* FORGE: Return the block strength of the block at i,j,k against the
+     * player.
+     */
+    public float blockStrength(World world, EntityPlayer player,
+		    int i, int j, int k) {
+	    int md=world.getBlockMetadata(i,j,k);
+	    return blockStrength(player,md);
+    }
+
+    /* FORGE: Return the block strength of a prototypical block with metadata
+     * md against the player.
+     */
+    public float blockStrength(EntityPlayer player, int md) {
+	    return ForgeHooks.blockStrength(this,player,md);
+    }
+
+    /* FORGE: Return true if the player can harvest a prototypical block with
+     * metadata md.
+     */
+    public boolean canHarvestBlock(EntityPlayer player, int md) {
+	    return ForgeHooks.canHarvestBlock(this,player,md);
+    }
+
+    /* FORGE: Called when a player removes a block.  This is responsible for
+     * actually destroying the block, and the block is intact at time of call.
+     * This is called regardless of whether the player can harvest the block or
+     * not.  Return true if the block is actually destroyed.
+     *
+     * Note: When used in multiplayer, this is called on both client and
+     * server sides!
+     */
+    public boolean removeBlockByPlayer(World world, EntityPlayer player,
+		    int i, int j, int k) {
+        return world.setBlockWithNotify(i, j, k, 0);
+    }
+    
+    /* FORGE: Called when a new CreativeContainer is opened, populate the list 
+     * with all of the items for this block you want a player in creative mode
+     * to have access to.
+     */
+    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;
+    }
+
+    /**
+     * Called throughout the code as a replacement for block instanceof BlockContainer
+     * Moving this to the Block base class allows for mods that wish to extend vinella 
+     * blocks, and also want to have a tile entity on that block, may.
+     * 
+     * Return true from this function to specify this block has a tile entity.
+     * 
+     * @param metadata Metadata of the current block
+     * @return True if block has a tile entity, false otherwise
+     */
+    public boolean hasTileEntity(int metadata)
+    {
+    	if (isBlockContainer[blockID])
+    	{
+     		return true;
+    	}
+    	else
+    	{
+    		return false;
+    	}
+    }
+    
+    /**
+     * Called throughout the code as a replacement for BlockContainer.getBlockEntity
+     * Return the same thing you would from that function.
+     * This will fall back to BlockContainer.getBlockEntity if this block is a BlockContainer.
+     * 
+     * @param metadata The Metadata of the current block
+     * @return A instance of a class extending TileEntity
+     */
+    public TileEntity getTileEntity(int metadata)
+    {
+    	if (this instanceof BlockContainer)
+    	{
+    		return ((BlockContainer)this).getBlockEntity(metadata);
+    	}
+    	return null;
+    }
+
+     static Class _mthclass$(String s)
+     {
+         try
@@ -0,0 +1,119 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockButton.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java	0000-00-00 00:00:00.000000000 -0000
+@@ -41,36 +41,36 @@
+ 
+     public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
+     {
+-        if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
+	if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
+         {
+             return true;
+         }
+-        if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
+	if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
+         {
+             return true;
+         }
+-        if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
+        if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
+         {
+             return true;
+         }
+-        return l == 5 && world.isBlockNormalCube(i - 1, j, k);
+        return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5);
+     }
+ 
+     public boolean canPlaceBlockAt(World world, int i, int j, int k)
+     {
+-        if(world.isBlockNormalCube(i - 1, j, k))
+        if(world.isBlockSolidOnSide(i - 1, j, k,5))
+         {
+             return true;
+         }
+-        if(world.isBlockNormalCube(i + 1, j, k))
+	if(world.isBlockSolidOnSide(i + 1, j, k,4))
+         {
+             return true;
+         }
+-        if(world.isBlockNormalCube(i, j, k - 1))
+        if(world.isBlockSolidOnSide(i, j, k - 1,3))
+         {
+             return true;
+         }
+-        return world.isBlockNormalCube(i, j, k + 1);
+        return world.isBlockSolidOnSide(i, j, k + 1,2);
+     }
+ 
+     public void onBlockPlaced(World world, int i, int j, int k, int l)
+@@ -78,19 +78,19 @@
+         int i1 = world.getBlockMetadata(i, j, k);
+         int j1 = i1 & 8;
+         i1 &= 7;
+-        if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
+        if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
+         {
+             i1 = 4;
+         } else
+-        if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
+        if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
+         {
+             i1 = 3;
+         } else
+-        if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
+        if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
+         {
+             i1 = 2;
+         } else
+-        if(l == 5 && world.isBlockNormalCube(i - 1, j, k))
+        if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
+         {
+             i1 = 1;
+         } else
+@@ -102,19 +102,19 @@
+ 
+     private int getOrientation(World world, int i, int j, int k)
+     {
+-        if(world.isBlockNormalCube(i - 1, j, k))
+        if(world.isBlockSolidOnSide(i - 1, j, k,5))
+         {
+             return 1;
+         }
+-        if(world.isBlockNormalCube(i + 1, j, k))
+        if(world.isBlockSolidOnSide(i + 1, j, k,4))
+         {
+             return 2;
+         }
+-        if(world.isBlockNormalCube(i, j, k - 1))
+        if(world.isBlockSolidOnSide(i, j, k - 1,3))
+         {
+             return 3;
+         }
+-        return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4;
+        return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4;
+     }
+ 
+     public void onNeighborBlockChange(World world, int i, int j, int k, int l)
+@@ -123,19 +123,19 @@
+         {
+             int i1 = world.getBlockMetadata(i, j, k) & 7;
+             boolean flag = false;
+-            if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1)
+            if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1)
+             {
+                 flag = true;
+             }
+-            if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2)
+            if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2)
+             {
+                 flag = true;
+             }
+-            if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3)
+            if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3)
+             {
+                 flag = true;
+             }
+-            if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4)
+            if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4)
+             {
+                 flag = true;
+             }
@@ -0,0 +1,31 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockChest.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java	0000-00-00 00:00:00.000000000 -0000
+@@ -429,23 +429,23 @@
+         {
+             return true;
+         }
+-        if(world.isBlockNormalCube(i, j + 1, k))
+        if(world.isBlockSolidOnSide(i, j + 1, k,0))
+         {
+             return true;
+         }
+-        if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k))
+        if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0))
+         {
+             return true;
+         }
+-        if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k))
+        if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0))
+         {
+             return true;
+         }
+-        if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1))
+        if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0))
+         {
+             return true;
+         }
+-        if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1))
+        if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0))
+         {
+             return true;
+         }
@@ -0,0 +1,24 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockContainer.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java	0000-00-00 00:00:00.000000000 -0000
+@@ -26,7 +26,7 @@
+     public void onBlockAdded(World world, int i, int j, int k)
+     {
+         super.onBlockAdded(world, i, j, k);
+-        world.setBlockTileEntity(i, j, k, getBlockEntity());
+        world.setBlockTileEntity(i, j, k, getBlockEntity(world.getBlockMetadata(i,j,k)));
+     }
+ 
+     public void onBlockRemoval(World world, int i, int j, int k)
+@@ -37,6 +37,12 @@
+ 
+     public abstract TileEntity getBlockEntity();
+ 
+    /* FORGE: Metadata-sensitive version, to fix 1.8.1 regression.
+     */
+    public TileEntity getBlockEntity(int md) {
+	    return getBlockEntity();
+    }
+ 
+     public void powerBlock(World world, int i, int j, int k, int l, int i1)
+     {
+         super.powerBlock(world, i, j, k, l, i1);
@@ -0,0 +1,49 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockCrops.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java	0000-00-00 00:00:00.000000000 -0000
+@@ -5,6 +5,7 @@
+ package net.minecraft.src;
+ 
+ import java.util.Random;
+import java.util.ArrayList;
+ 
+ // Referenced classes of package net.minecraft.src:
+ //            BlockFlower, Block, World, EntityItem, 
+@@ -108,28 +109,22 @@
+         return 6;
+     }
+ 
+-    public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1)
+-    {
+-        super.dropBlockAsItemWithChance(world, i, j, k, l, f, 0);
+-        if(world.multiplayerWorld)
+    @Override
+    public ArrayList<ItemStack> getBlockDropped(World world, int i, int j, int k, int md, int fortune) {
+        ArrayList<ItemStack> tr = new ArrayList<ItemStack>();
+        if (md == 7)
+         {
+-            return;
+        	tr.add(new ItemStack(Item.wheat));
+         }
+-        int j1 = 3 + i1;
+-        for(int k1 = 0; k1 < j1; k1++)
+            
+        for(int n = 0; n < 3+fortune; n++) 
+         {
+-            if(world.rand.nextInt(15) <= l)
+            if (world.rand.nextInt(15) <= md)
+             {
+-                float f1 = 0.7F;
+-                float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
+-                float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
+-                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);
+                tr.add(new ItemStack(Item.seeds));
+             }
+         }
+-
+        return tr;
+     }
+ 
+     public int idDropped(int i, Random random, int j)
@@ -0,0 +1,29 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java	0000-00-00 00:00:00.000000000 -0000
+@@ -111,7 +111,7 @@
+     {
+         if(blockMaterial == Material.iron)
+         {
+-            return true;
+            return false;
+         }
+         int l = world.getBlockMetadata(i, j, k);
+         if((l & 8) != 0)
+@@ -178,7 +178,7 @@
+                 world.setBlockWithNotify(i, j, k, 0);
+                 flag = true;
+             }
+-            if(!world.isBlockNormalCube(i, j - 1, k))
+            if(!world.isBlockSolidOnSide(i, j - 1, k,1))
+             {
+                 world.setBlockWithNotify(i, j, k, 0);
+                 flag = true;
+@@ -241,7 +241,7 @@
+             return false;
+         } else
+         {
+-            return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
+            return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
+         }
+     }
+ 
@@ -0,0 +1,286 @@
+--- ../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, 1);
+        tryToCatchBlockOnFire(world, i, j + 1, k, 250, random, l, 0);
+        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, 1))
+         {
+             return true;
+         }
+-        if(canBlockCatchFire(world, i, j + 1, k))
+        if(canBlockCatchFire(world, i, j + 1, k, 0))
+         {
+             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, 4);
+            l = getChanceToEncourageFire(world, i - 1, j, k, l, 5);
+            l = getChanceToEncourageFire(world, i, j - 1, k, l, 1);
+            l = getChanceToEncourageFire(world, i, j + 1, k, l, 0);
+            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, 1) || 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, 1) && !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, 1) || Block.fire.canBlockCatchFire(world, i, j - 1, k, 1))
+         {
+             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, 5))
+             {
+                 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, 4))
+             {
+                 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, 0))
+             {
+                 for(int i2 = 0; i2 < 2; i2++)
+                 {
@@ -0,0 +1,84 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java	0000-00-00 00:00:00.000000000 -0000
+@@ -63,6 +63,11 @@
+         return super.getSelectedBoundingBoxFromPool(world, i, j, k);
+     }
+ 
+    /* FORGE: Implemented base method, see Block.isLadder */
+    public boolean isLadder(World world, int i, int j, int k) {
+	return true;
+    }
+
+     public boolean isOpaqueCube()
+     {
+         return false;
+@@ -80,37 +85,37 @@
+ 
+     public boolean canPlaceBlockAt(World world, int i, int j, int k)
+     {
+-        if(world.isBlockNormalCube(i - 1, j, k))
+        if(world.isBlockSolidOnSide(i - 1, j, k,5))
+         {
+             return true;
+         }
+-        if(world.isBlockNormalCube(i + 1, j, k))
+        if(world.isBlockSolidOnSide(i + 1, j, k,4))
+         {
+             return true;
+         }
+-        if(world.isBlockNormalCube(i, j, k - 1))
+        if(world.isBlockSolidOnSide(i, j, k - 1,3))
+         {
+             return true;
+         }
+-        return world.isBlockNormalCube(i, j, k + 1);
+        return world.isBlockSolidOnSide(i, j, k + 1,2);
+     }
+ 
+     public void onBlockPlaced(World world, int i, int j, int k, int l)
+     {
+         int i1 = world.getBlockMetadata(i, j, k);
+-        if((i1 == 0 || l == 2) && world.isBlockNormalCube(i, j, k + 1))
+        if((i1 == 0 || l == 2) && world.isBlockSolidOnSide(i, j, k + 1,2))
+         {
+             i1 = 2;
+         }
+-        if((i1 == 0 || l == 3) && world.isBlockNormalCube(i, j, k - 1))
+        if((i1 == 0 || l == 3) && world.isBlockSolidOnSide(i, j, k - 1,3))
+         {
+             i1 = 3;
+         }
+-        if((i1 == 0 || l == 4) && world.isBlockNormalCube(i + 1, j, k))
+        if((i1 == 0 || l == 4) && world.isBlockSolidOnSide(i + 1, j, k,4))
+         {
+             i1 = 4;
+         }
+-        if((i1 == 0 || l == 5) && world.isBlockNormalCube(i - 1, j, k))
+        if((i1 == 0 || l == 5) && world.isBlockSolidOnSide(i - 1, j, k,5))
+         {
+             i1 = 5;
+         }
+@@ -121,19 +126,19 @@
+     {
+         int i1 = world.getBlockMetadata(i, j, k);
+         boolean flag = false;
+-        if(i1 == 2 && world.isBlockNormalCube(i, j, k + 1))
+        if(i1 == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
+         {
+             flag = true;
+         }
+-        if(i1 == 3 && world.isBlockNormalCube(i, j, k - 1))
+        if(i1 == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
+         {
+             flag = true;
+         }
+-        if(i1 == 4 && world.isBlockNormalCube(i + 1, j, k))
+        if(i1 == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
+         {
+             flag = true;
+         }
+-        if(i1 == 5 && world.isBlockNormalCube(i - 1, j, k))
+        if(i1 == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
+         {
+             flag = true;
+         }
@@ -0,0 +1,120 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockLever.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java	0000-00-00 00:00:00.000000000 -0000
+@@ -40,44 +40,44 @@
+ 
+     public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
+     {
+-        if(l == 1 && world.isBlockNormalCube(i, j - 1, k))
+        if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1))
+         {
+             return true;
+         }
+-        if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
+        if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
+         {
+             return true;
+         }
+-        if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
+        if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
+         {
+             return true;
+         }
+-        if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
+        if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
+         {
+             return true;
+         }
+-        return l == 5 && world.isBlockNormalCube(i - 1, j, k);
+        return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5);
+     }
+ 
+     public boolean canPlaceBlockAt(World world, int i, int j, int k)
+     {
+-        if(world.isBlockNormalCube(i - 1, j, k))
+        if(world.isBlockSolidOnSide(i - 1, j, k,5))
+         {
+             return true;
+         }
+-        if(world.isBlockNormalCube(i + 1, j, k))
+        if(world.isBlockSolidOnSide(i + 1, j, k,4))
+         {
+             return true;
+         }
+-        if(world.isBlockNormalCube(i, j, k - 1))
+        if(world.isBlockSolidOnSide(i, j, k - 1,3))
+         {
+             return true;
+         }
+-        if(world.isBlockNormalCube(i, j, k + 1))
+        if(world.isBlockSolidOnSide(i, j, k + 1,2))
+         {
+             return true;
+         }
+-        return world.isBlockNormalCube(i, j - 1, k);
+        return world.isBlockSolidOnSide(i, j - 1, k,1);
+     }
+ 
+     public void onBlockPlaced(World world, int i, int j, int k, int l)
+@@ -86,23 +86,23 @@
+         int j1 = i1 & 8;
+         i1 &= 7;
+         i1 = -1;
+-        if(l == 1 && world.isBlockNormalCube(i, j - 1, k))
+        if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1))
+         {
+             i1 = 5 + world.rand.nextInt(2);
+         }
+-        if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
+        if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
+         {
+             i1 = 4;
+         }
+-        if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
+        if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
+         {
+             i1 = 3;
+         }
+-        if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
+        if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
+         {
+             i1 = 2;
+         }
+-        if(l == 5 && world.isBlockNormalCube(i - 1, j, k))
+        if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
+         {
+             i1 = 1;
+         }
+@@ -124,27 +124,27 @@
+         {
+             int i1 = world.getBlockMetadata(i, j, k) & 7;
+             boolean flag = false;
+-            if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1)
+            if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1)
+             {
+                 flag = true;
+             }
+-            if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2)
+            if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2)
+             {
+                 flag = true;
+             }
+-            if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3)
+            if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3)
+             {
+                 flag = true;
+             }
+-            if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4)
+            if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4)
+             {
+                 flag = true;
+             }
+-            if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 5)
+            if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 5)
+             {
+                 flag = true;
+             }
+-            if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 6)
+            if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 6)
+             {
+                 flag = true;
+             }
@@ -0,0 +1,56 @@
+--- ../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)
@@ -0,0 +1,11 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockPistonBase.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/BlockPistonBase.java	0000-00-00 00:00:00.000000000 -0000
+@@ -361,7 +361,7 @@
+                 return false;
+             }
+         }
+-        return !(Block.blocksList[i] instanceof BlockContainer);
+        return !(Block.blocksList[i] != null &&  Block.blocksList[i].hasTileEntity(world.getBlockMetadata(j, k, l)));
+     }
+ 
+     private static boolean canExtend(World world, int i, int j, int k, int l)
@@ -0,0 +1,22 @@
+--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java	0000-00-00 00:00:00.000000000 -0000
+@@ -48,7 +48,8 @@
+ 
+     public boolean canPlaceBlockAt(World world, int i, int j, int k)
+     {
+-        return world.isBlockNormalCube(i, j - 1, k) || world.getBlockId(i, j - 1, k) == Block.fence.blockID;
+        return world.isBlockSolidOnSide(i, j - 1, k,1)
+		|| world.getBlockId(i, j - 1, k) == Block.fence.blockID;
+     }
+ 
+     public void onBlockAdded(World world, int i, int j, int k)
+@@ -58,7 +59,8 @@
+     public void onNeighborBlockChange(World world, int i, int j, int k, int l)
+     {
+         boolean flag = false;
+-        if(!world.isBlockNormalCube(i, j - 1, k) && world.getBlockId(i, j - 1, k) != Block.fence.blockID)
+        if(!world.isBlockSolidOnSide(i, j - 1, k,1)
+			&& world.getBlockId(i, j - 1, k) != Block.fence.blockID)
+         {
+             flag = true;
+         }
Author	SHA1	Message	Date
Eloraam	8b1d213f20	Fixed an unroll from the MCL merge. Updated MCP mappings.	2012-01-13 19:21:01 +00:00
LexManos	92cbccae60	Fixed NPE on some JVM's	2012-01-12 07:43:55 +00:00
LexManos	fdd0e61e17	Merged in MCL branch	2012-01-12 07:38:23 +00:00
Eloraam	95481e1cd2	Improved the ladder hook. Added a new hook for sustained-use items.	2012-01-11 19:40:04 +00:00
Eloraam	2631c01109	Fixed MCP mappings again. Fixed the Entity NBT code. Added a new hook to support custom enchantments.	2012-01-11 18:39:42 +00:00
Eloraam	d33dfb0602	Updated MCP Mappings.	2012-01-11 18:13:35 +00:00
LexManos	34ca805acf	Fixed faces for BlockFire	2012-01-01 09:30:42 +00:00
LexManos	0da57286ef	Refactored a bit of the TileEntity code so that ANY block may now have a tile entity. This is to allow modders the ability to extend blocks other then BlockContainer, and still be able to have a TileEntity. Also added a NBTTagCompound to the base EntityClass, this allows any entity to be given arbitrary data that will persist across world saves. This data is NOT sent over the wire in a MP situation, to have data sent over the wire automatically use the built in data watcher.	2012-01-01 07:42:21 +00:00
Space Toad	fe1fbfda61	bumbed version number	2011-12-28 21:22:07 +00:00
LexManos	10f924a92d	Changed Block.setBurnRate to public and Block.setBurnProperties Re-added bounce functions to BlockFire for non-forge mods. Should fix Optifine compatibility.	2011-12-24 05:07:55 +00:00
LexManos	57fdcdd641	Fixed a re-name that somehow missed the commit. Serverside chanceToEncourageFire -> getFireSpreadSpeed	2011-12-24 00:35:41 +00:00
Eloraam	69f2b96f1d	Fixed some rendering issues.	2011-12-23 00:23:01 +00:00
Eloraam	ab1d251724	Another mapping update.	2011-12-22 20:11:38 +00:00
LexManos	4da7be2e7d	Updated mapping for last commit	2011-12-22 02:17:40 +00:00
Eloraam	5a5c9dbb8e	Mapping updates.	2011-12-21 23:09:18 +00:00
LexManos	336e28c6fe	Re-added BlockFire's properties, apparently some people access this by reflection.	2011-12-21 14:10:05 +00:00
Eloraam	82c0731888	Bumping the version number.	2011-12-21 10:22:37 +00:00
Eloraam	a0b0faf693	Fixed some strange behavior in snow blocks. Fixed a missing patch checkin.	2011-12-21 10:15:38 +00:00
Eloraam	ed3fe86454	A minimalistic hook for rendering world effect overlays or other 3D overlay data.	2011-12-21 09:57:10 +00:00
Eloraam	5bf8a30ab8	Major rework of the rendering core. Added support for custom render context handling.	2011-12-21 09:01:45 +00:00
LexManos	663ed58610	Added Item.onDroppedByPlayer hook	2011-12-21 07:44:01 +00:00
Eloraam	d1909d30ac	Deprecated IUseItemFirst, and made onUseItemFirst work in Creative.	2011-12-21 06:34:57 +00:00
LexManos	5013991fa4	Added server side prototypes for addCreativeItems()s They are unused, but declared for compiling compatibility.	2011-12-21 04:38:59 +00:00
LexManos	1ed1d233c7	Added hooks to BlockFire for setting block flame interaction properties.	2011-12-21 04:30:53 +00:00
LexManos	3fb9b988d9	Replaced dropBlockAsItemWithChance in BlockNetherStalk with getBlockDropped.	2011-12-21 00:44:53 +00:00
Eloraam	10f8c2c426	Fixed a minor crop fortune bug.	2011-12-20 21:39:53 +00:00
LexManos	8d43d859c7	Commit of a hook for adding items into world dungeon generation. Uses a weighted random selection scheme. Also a hook for adding custom mobs to the dungeon generation list.	2011-12-20 07:00:43 +00:00
LexManos	106b9dc4c9	Updated mappings	2011-12-20 06:58:29 +00:00
LexManos	8735d92ecd	Implemented ISidedInventory for Brewing Stands. Top is input, 1 slot All other sides are output, 3 slots.	2011-12-19 06:33:20 +00:00
LexManos	87ea7289cb	Added missing native library path to forge_client project. Added harvest levels/effectiveness for Axes and Shovels.	2011-12-16 10:06:57 +00:00
LexManos	8a08602dc3	Fixed a zLevel bug with custom item renderers.	2011-12-14 10:45:37 +00:00
Space Toad	2995f1c072	bumped version numbers	2011-12-13 19:33:37 +00:00
LexManos	812be37f5f	Fixed seeds/wheat not dropping from Crops/TallGrass. All future Forge code should use proper annotations when Overriding.	2011-12-11 21:55:35 +00:00
LexManos	4928e3b059	Small fix to decrease the number of glBindTexture calls that are immediately overridden.	2011-12-11 11:50:55 +00:00
LexManos	3262b656a3	The install scripts will now only patch the client/server if they are there. This allows for people to only worry about getting one side setup correctly if they don't care about the other.	2011-12-11 07:37:54 +00:00
LexManos	5fc1ee844d	Fixed a infinite recursion loop in spacetoad's commit to Block.java.patch Added @Deprecated annotations to the 'backwards compatible' functions spacetoad re-added. Made changes to the install scripts: -Will overwrite the current MCP mappings and use the ones that ship with forge, this should eliminate all the issues of people not being able to install it because they updated there mcp.cfg -Will now move fernflower.jar if it is found, so that MCP will not decompile using it. Should fix the issues of people trying to use forge with fernflower installed. -Will call updatemcp/updatenames so that users get the latest mappings for unmapped items. -Also calls updatemd5s so that the forge API is skipped when spitting out reobfusicated files. Update the readme to be more accurate. Added my name to the credits :P Updated the update_patches/package scripts to account for grabbing the conf folder. Added GnuWin32's grep	2011-12-11 07:04:21 +00:00
Space Toad	1be3e18a9d	bumped version number	2011-12-10 11:07:51 +00:00
Space Toad	e511ba7db8	further backward compatibility fixes	2011-12-10 11:05:49 +00:00
LexManos	e08cec3bc0	Added my EnumHelper classes, this allows for dynamic creation of Enum values at runtime. See My post for a example: http://www.minecraftforum.net/topic/514000-api-minecraft-forge/page__view__findpost__p__10948540	2011-12-09 07:58:32 +00:00
LexManos	d6a5cf2828	Missed some mappings	2011-12-09 06:51:31 +00:00
LexManos	03c5d8aeb4	For for updated mappings.	2011-12-09 04:40:32 +00:00
Space Toad	3c3654b576	added server side of the previous commit	2011-12-08 07:51:17 +00:00
Space Toad	fb30b67adb	fixed backwards compatibility	2011-12-07 21:30:48 +00:00
LexManos	d08641aae5	Fixed fortune enchant. This breaks forge's quantityDropped signature, be careful when updating mods.	2011-12-06 07:41:59 +00:00
LexManos	99542f5ef5	Cleaned up a few things related to MLProp Deleted unmaintained fernflower patch.	2011-12-05 08:30:07 +00:00
Eloraam	5decee87d6	Added a hoe handler for advanced farming.	2011-12-02 04:32:10 +00:00
Eloraam	590072e636	Added new tool harvest intercept hook. Removed mlprop.patch.	2011-12-02 04:08:15 +00:00
LexManos	fb1cd9be88	Moved dye creative adds to the ItemDye class.	2011-12-02 03:57:11 +00:00
LexManos	576ff2fadb	Creative Container population hook.	2011-12-02 03:37:48 +00:00
Eloraam	9e28c51d23	Fixed missing CraftingManager patches for the repair disable hook. Fixed smp mlprop.	2011-12-02 02:26:15 +00:00
LexManos	6d5dffa458	Added MLprop.java that ST forgot when he merged. Fixed EntityPlayer.getPlayerStrVsBlock metadata function for 1.0.0 changes in Enchantments/Potions.	2011-12-01 07:29:06 +00:00
Space Toad	30b1f4c2ed	bumped version number	2011-11-30 19:02:10 +00:00
Space Toad	0e221f098c	merged with pre-1.9p5 branch, for 1.0.0 release	2011-11-30 19:00:43 +00:00
Space Toad	e835fd2a46	fixed mapping	2011-11-15 18:46:42 +00:00
Eloraam	55f599e2b3	New block destruction hook. Deprecated IOverrideReplace.	2011-10-31 20:07:31 +00:00
Eloraam	68c3a5675f	Updated MCP mapping, backed out a useless patch.	2011-10-31 19:24:45 +00:00
Eloraam	a31f983e6a	Added some IC2 items.	2011-10-27 02:05:43 +00:00
Eloraam	a2fac655b4	Changed a field permission for MFR.	2011-10-26 04:42:37 +00:00
Eloraam	670180a0b6	Small TileEntity fix.	2011-10-25 19:28:47 +00:00
Eloraam	54da114945	Added a few more known ingots.	2011-10-25 17:15:12 +00:00
Eloraam	ebd92e094d	Bugfix for numeric range of mob and window IDs.	2011-10-22 11:53:00 +00:00
Eloraam	7f67f1f13a	Fixed TileEntity caching.	2011-10-21 21:00:44 +00:00
Eloraam	b719f6142c	Patch for a small activation glitch in doors.	2011-10-19 02:45:51 +00:00
Eloraam	18795572fe	MCP update. Fixed a problem with TileEntity sending.	2011-10-19 02:00:50 +00:00
Eloraam	fba7f7d1ab	Rolled in a critical MLMP fix, because MLMP is virtually unmaintained.	2011-10-18 19:11:57 +00:00
Eloraam	1c253966c8	Added ore dictionary.	2011-10-18 18:56:10 +00:00
Eloraam	effbaa0c74	Fix for new MCP mappings. Fixed the distribution of flowers with bonemeal. Fixed accidentally making obsidian easy to mine.	2011-10-13 07:10:43 +00:00
LexManos	321c8196e7	Fixed line endings in install.sh	2011-10-11 22:38:39 +00:00
LexManos	024ebad54a	Updated the package.sh script to include the patches, the new install.sh, and modLoaderMP/mlprop.patch	2011-10-11 22:23:39 +00:00
LexManos	d58587a016	Changed the windows setup to use del instead of remove. Both update patches scripts no longer remove svn entries. Added the forge_client\bin and forge_server\bin folders to the svn ignore.	2011-10-10 23:47:30 +00:00
Space Toad	249d607397	bumbed forge minor version	2011-10-10 19:21:41 +00:00
Space Toad	5a3585adaa	reactivated special armor code	2011-10-10 19:16:11 +00:00
LexManos	8fb9ad4687	Made the windows setup script a bit more robust, also made both scripts filter out non-patch files. {Issue with svn files}	2011-10-10 00:09:48 +00:00
LexManos	6715ccd14a	Fixed a bug in forge_client project that had a hard link to E:/MCP/jars/bin/paul.jar now points to MCP/jars/bin/minecraft.jar {has the same paulsound libraries} Major refactoring of the patches, now each modified file gets its own patch file. Rewrote all the scripts to use new multi-patch system. Added linux install.sh using new system. Added some required libraries from GNUWin32 for the windows side of the new setup.bat/update_patches.bat http://gnuwin32.sourceforge.net/	2011-10-09 04:21:29 +00:00
Eloraam	cf456f9f3d	Changed a field permission.	2011-10-05 22:54:20 +00:00
Eloraam	a19394d48a	Fixed another TileEntity bug.	2011-10-04 21:46:00 +00:00
Space Toad	e233005138	ISidedInventory is now explicitely an inventory	2011-10-02 19:14:20 +00:00
Eloraam	f579b2db69	Fixed the MCP mappings.	2011-10-02 18:42:15 +00:00
Eloraam	fe62372429	- Added an ItemStack parameter to IArmorTextureProvider - Added ISidedInventory - Added IBonemealHandler - Added hooks in grow-on-grass and in break tall grass. - Fixed furnace output of multiple items. - Added getBlockDropped(). - Bumped version number to 1.1.1.	2011-10-02 08:55:31 +00:00
Eloraam	12853df285	Hopefully fixed the major TileEntity bugs.	2011-09-30 12:32:27 +00:00
Eloraam	9034062c8c	Fixed TileEntities, bumped version number.	2011-09-28 23:35:31 +00:00
Eloraam	2a950f3e80	Fixed digging particles.	2011-09-26 19:37:28 +00:00
Eloraam	fb0ccd3618	Added a fix for onItemUse regression.	2011-09-22 10:12:05 +00:00
Eloraam	a6214f2d45	More MCP mapping fixes.	2011-09-22 03:01:10 +00:00
Eloraam	3135a0650a	Undid that. Whoops.	2011-09-22 02:49:33 +00:00
Eloraam	d2c6244ca8	Code to remove a single block effectiveness.	2011-09-22 02:45:47 +00:00
Eloraam	74e7431ab6	Metadata-sensitive quantity dropped.	2011-09-21 08:08:58 +00:00
Eloraam	086b155e6b	Fixed up a few bugs in the tool path.	2011-09-21 07:14:53 +00:00
Eloraam	f82ee17e48	Fixed another bug in the furnace patch. Works now.	2011-09-21 01:05:44 +00:00
Eloraam	ae02a73c67	Small bugfix for furnace patch.	2011-09-21 00:59:37 +00:00
Eloraam	561e3c773f	Metadata-sensitive smelting patch.	2011-09-21 00:55:09 +00:00
Eloraam	4127a60d3f	Fixes for MCP updates.	2011-09-19 20:40:07 +00:00
Eloraam	e7c2b0506f	Fixed the 1.8.1 version for MLMP support.	2011-09-19 20:30:34 +00:00
Eloraam	65e1544168	A bunch of little patches to make it actually build for 1.8.1.	2011-09-19 01:44:40 +00:00
Eloraam	e9ae3a0a82	First attempt at a 1.8.1 version. May not work.	2011-09-19 01:30:41 +00:00
Eloraam	b4fa5f58db	Unrolled a mistaken fix.	2011-09-11 04:46:16 +00:00
Eloraam	eda99a16fb	Another try for osx.	2011-09-11 04:05:39 +00:00
Eloraam	721b3015db	A small fix to hopefully make the script work on a mac.	2011-09-11 03:49:01 +00:00
Eloraam	297b35a136	Redesigned TileEntity handling.	2011-09-08 21:33:03 +00:00
Space Toad	29a712e0f9	fixed SMP bug related to BuildCraft issue #226	2011-09-07 19:57:53 +00:00
Eloraam	81802108ca	A few small patches to fix obscure piston rendering bugs.	2011-09-07 15:14:01 +00:00
Eloraam	0908fdfe5c	Optifine compatibility patch.	2011-09-07 14:58:08 +00:00
Space Toad	fb070104a2	updated to latest MCP, and added custom item rendering facilities	2011-09-03 11:46:59 +00:00
Eloraam	e85d4af5da	Improved trapdoor hook.	2011-09-01 08:01:47 +00:00
Eloraam	54bb9a6efb	New lighting hook.	2011-08-30 10:32:14 +00:00
Eloraam	ca979fe391	Fixed new MCP mappings.	2011-08-30 06:18:32 +00:00
Space Toad	f59a0f61aa	bumped forge version # to 1.0.6	2011-08-28 12:54:47 +00:00
Space Toad	2a1342dc75	added ArmorProperties constructors, remove deprecated subprograms (supposedly not used by anyone)	2011-08-28 12:33:16 +00:00
Space Toad	f264295d12	fixed headers, implemented new armor computation for IC2	2011-08-27 11:42:48 +00:00
Eloraam	fb4bbaa85b	Fixed the permissions on a couple fields in ItemTool.	2011-08-27 05:49:09 +00:00
Space Toad	c25a08e946	temporary reverted to r61	2011-08-27 01:12:20 +00:00
Space Toad	a6a1bcf402	updated credits	2011-08-25 19:47:34 +00:00
Eloraam	0ae9be4710	Patched the installer again.	2011-08-25 17:15:02 +00:00
Eloraam	4f7c0b73f8	Fixed a typo.	2011-08-25 07:19:49 +00:00
Eloraam	87a9cc96cb	Small RedPower-specific patch.	2011-08-25 07:17:10 +00:00
Eloraam	07dd048d50	Added armor texture hook.	2011-08-25 00:23:31 +00:00
Eloraam	47bf6357c3	New install script for Windows.	2011-08-24 04:18:57 +00:00
Eloraam	705fc5b26c	Fixed the version number.	2011-08-21 07:50:09 +00:00
Eloraam	7b35ba5be4	Changed some field permissions.	2011-08-20 22:23:29 +00:00
Eloraam	1a04139657	Handler for custom block highlight.	2011-08-20 10:35:14 +00:00
Eloraam	6cfbc34940	Version control logic, improved the destroy handling hook.	2011-08-20 08:59:05 +00:00
Eloraam	8fcc2a1f9f	Improved BTW compatibility. Finished the placement hook changes. Added a sleep handler. Added a current item destroyed handler.	2011-08-18 00:14:09 +00:00
Eloraam	d3323f547c	Checking in the new crafting hook.	2011-08-17 16:05:38 +00:00
Eloraam	ad3d08f0ee	Added a little support for two-pass rendering.	2011-08-17 10:23:10 +00:00
Eloraam	f7a3157174	Forgot the forge hooks.	2011-08-13 18:26:31 +00:00
Eloraam	7de8218e4a	Updates: - Added warning message for non-preloaded textures. - Documentation - Ladder fix for SMP. - Obsoleted IBlockSecondaryProperties - Added hooks for place-by-side. - Fixed texture 3 and piston texture bug. - Added new tool system.	2011-08-12 23:53:30 +00:00
FlowerChild	0aeb6f1eab	Added patches for decompiled by fernflower source. Client only, and not tested enough. Using is currently not recommended.	2011-08-12 13:52:53 +00:00
Eloraam	08beffb945	Uploaded new install file.	2011-08-12 04:17:33 +00:00
Eloraam	ff6a314cf8	Fixed for the new version of MCP.	2011-08-11 21:10:52 +00:00
Eloraam	5a9c5b4b67	Uploaded install fix.	2011-08-08 19:50:09 +00:00
Eloraam	0d6fbf063b	The ladder hook.	2011-08-08 16:55:50 +00:00
Eloraam	b9a56c48b1	Fixed a typo in isBoundingBoxBurning.	2011-08-07 21:37:05 +00:00
Space Toad	b9d42053b2	updated list of contributers	2011-08-06 21:54:56 +00:00
Space Toad	00cd110fae	updated release and package script to take into account credit file	2011-08-06 21:23:38 +00:00
Space Toad	36ed659b17	renamed file	2011-08-06 21:18:31 +00:00
Space Toad	be3b4cc3bc	initial revision of the credit file, to be completed	2011-08-06 21:16:53 +00:00
Eloraam	da26ee2422	Added a comment.	2011-08-06 18:29:58 +00:00
Eloraam	92d0d6f4e1	Added a small patch to MovingObjectPosition.	2011-08-06 18:22:24 +00:00
Eloraam	44992f9b69	Not really a change.	2011-08-05 14:58:18 +00:00
Eloraam	c9bcb73636	Added a texture preloader to avoid render glitches on the first render.	2011-08-05 11:58:14 +00:00
Eloraam	cd865a256b	New multiple-tessellator texture renderer.	2011-08-05 11:07:03 +00:00
Eloraam	01c34eb0be	New install script for Linux users.	2011-08-05 00:32:56 +00:00
Space Toad	c9c2bbef1d	improved installation and setup scripts	2011-08-04 06:10:38 +00:00
Eloraam	606e0d8e80	Added secondary block properties patch.	2011-08-03 05:15:31 +00:00
Eloraam	bedcc2fc64	Fixed a little path bug.	2011-08-02 05:18:52 +00:00
Eloraam	c7db47d528	Improved the setup scripts.	2011-08-02 03:54:59 +00:00
Eloraam	f50d35ce3f	Fixed bugs in the pickaxe code.	2011-08-01 02:06:00 +00:00
Eloraam	112adbef8f	Improved some documentation.	2011-07-31 18:52:19 +00:00
Space Toad	0d917cfdcc	removed inner classes, remove redundant biome control	2011-07-31 12:01:23 +00:00
Space Toad	8f03e6cd24	fixed files for release	2011-07-30 21:25:39 +00:00
Space Toad	e507f90276	additional comments	2011-07-30 21:10:42 +00:00
Space Toad	dae71d0b7a	added comments	2011-07-30 21:01:03 +00:00
Space Toad	5b2be7903c	fixed exceptions in minecraft code	2011-07-30 19:05:28 +00:00
Space Toad	6389b16609	fixed previous checkin	2011-07-30 16:13:31 +00:00
Space Toad	902f8918a3	added sources packaging	2011-07-30 16:13:14 +00:00
Space Toad	73d19ef0a3	add custom armor, for #13	2011-07-30 07:13:10 +00:00
Space Toad	80ab9a98bb	first batch of documentation + minor reformatings	2011-07-30 06:42:15 +00:00
Eloraam	7837e4d3a1	Added explosion resistance hook.	2011-07-29 22:00:08 +00:00
Space Toad	423490e1c8	fixed addPixaxeBlockEffectiveAgainst	2011-07-29 21:25:22 +00:00
Eloraam	deae2de0eb	Added the four new hooks from RedPower, and the TileEntity bugfix.	2011-07-29 21:15:21 +00:00
Space Toad	821cc3ec54	added missing copyright header	2011-07-29 20:59:01 +00:00
Space Toad	9cb5f47805	added missing file	2011-07-29 20:58:31 +00:00
Space Toad	c51848db5b	added mineable block configuration, for #6	2011-07-29 17:55:34 +00:00
Space Toad	20c30d541c	added missing graphical features, added configuration management, for #5	2011-07-20 19:58:59 +00:00
Space Toad	d9e4d13d69	improved previous patch, extracted internal class	2011-07-19 18:41:51 +00:00
Space Toad	1822dfd896	fixed compilation errors	2011-07-19 18:19:45 +00:00
Space Toad	8df7df145b	fixed setup file	2011-07-19 17:58:23 +00:00
FlowerChild	f89a1210df	Removed MCForgeEffectRenderer, patched MC EffectRenderer	2011-07-19 11:24:36 +00:00
Space Toad	50c30fce23	removed OBE file	2011-07-18 06:18:14 +00:00
Space Toad	ad56d1c879	fixed setup script for windows and patch	2011-07-17 12:16:26 +00:00
Space Toad	65aa6d6b43	fixed packaging script	2011-07-16 22:39:55 +00:00
Space Toad	6aa32def11	fixed patch script and added release scripts	2011-07-16 22:32:57 +00:00
FlowerChild	7be20d9c4d	Added OnGameStart hook, added custom effect render to fulfill infinite sprite support. Render needs to be changed a little to cover items also, though.	2011-07-16 16:37:37 +00:00
Space Toad	3cf1792bec	added headers	2011-07-15 23:13:09 +00:00
Space Toad	d1a79c2a66	added support for infinite sprites, for #4	2011-07-15 23:04:10 +00:00
Space Toad	5b06661835	implement infinite terrain sprites, for #3	2011-07-15 22:40:53 +00:00
Space Toad	a7e950e7c2	fixed style, added biome population support, for #2	2011-07-15 21:17:33 +00:00
Space Toad	341cfc0cf7	initial revision of the license	2011-07-15 18:26:33 +00:00
Space Toad	ba6aa3368d	fixed previous checkin	2011-07-14 11:19:22 +00:00
Space Toad	81e5a85a36	added basic build script for windows	2011-07-14 11:18:25 +00:00
Space Toad	050d0ac294	added missing patch step	2011-07-14 11:15:07 +00:00
Space Toad	c0c4830ed4	made initial setup, implemented custom bucket, for #1	2011-07-14 11:10:21 +00:00
Space Toad	9eed4e19f2	added main project directories	2011-07-12 21:03:55 +00:00
Space Toad	e8c2895042	added main source directory	2011-07-12 21:02:53 +00:00