Bumping the version number.

data.

.gitattributes

@@ -1,14 +0,0 @@
-* text eol=lf
-*.bat text eol=crlf
-*.patch text eol=lf
-*.java text eol=lf
-*.gradle text eol=crlf
-*.png binary
-*.exe binary
-*.dll binary
-*.jar binary
-*.lzma binary
-*.zip binary
-*.pyd binary
-*.cfg text eol=lf
-*.py text eol=lf

.gitignore

@@ -1,23 +0,0 @@
-#eclipse
-/bin
-/.settings
-/.classpath
-
-#idea
-/.idea
-*.iml
-
-#gradle
-/build
-/.gradle
-
-#occupational hazards
-/eclipse/
-/repo/
-/buildSrc
-
-#Patch rejects
-*.rej
-/patches-/
-# FML changelog
-changelog.txt

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "fml"]
-	path = fml
-	url = https://github.com/MinecraftForge/FML.git

MLProp.java

@@ -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;
+}

Paulscode IBXM Library License.txt

@@ -1,10 +0,0 @@
-IBXM is copyright (c) 2007, Martin Cameron, and is licensed under the BSD License.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of mumart nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

Paulscode SoundSystem CodecIBXM License.txt

@@ -1,40 +0,0 @@
-SoundSystem CodecIBXM Class License:
-
-You are free to use this class for any purpose, commercial or otherwise.
-You may modify this class or source code, and distribute it any way you
-like, provided the following conditions are met:
-
-1) You may not falsely claim to be the author of this class or any
-   unmodified portion of it.
-2) You may not copyright this class or a modified version of it and then
-   sue me for copyright infringement.
-3) If you modify the source code, you must clearly document the changes
-   made before redistributing the modified source code, so other users know
-   it is not the original code.
-4) You are not required to give me credit for this class in any derived
-   work, but if you do, you must also mention my website:
-   http://www.paulscode.com
-5) I the author will not be responsible for any damages (physical,
-   financial, or otherwise) caused by the use if this class or any
-   portion of it.
-6) I the author do not guarantee, warrant, or make any representations,
-   either expressed or implied, regarding the use of this class or any
-   portion of it.
-
-Author: Paul Lamb
-http://www.paulscode.com
-
-
-This software is based on or using the IBXM library available from
-http://www.geocities.com/sunet2000/
-
-
-IBXM is copyright (c) 2007, Martin Cameron, and is licensed under the BSD License.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of mumart nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.txt

@@ -1,31 +0,0 @@
-*** HOW TO INSTALL ***
-For Mod Users:
-
-Download the latest installer from http://files.minecraftforge.net and follow instructions given by the installer.
-
-
-For Mod Devs:
-
-Download the latest Forge source distribution from http://files.minecraftforge.net and unzip it to a folder.
-Open a command prompt, navigate to the directory where you unzipped the Forge sources, and run:
-If you have Gradle: gradle setupDevWorkspace
-If you DO NOT have Gradle installed:
-Windows: ./gradlew.bat setupDevWorkspace
-MacOS/Linux: ./gradlew setupDevWorkspace
-
-If you wish to use the Eclipse IDE, run gradle eclipse instead of gradle setupDevWorkspace, or install the Gradle plugin for Eclipse and import the Forge source folder as a Gradle project.
-
-
-For Contributors: (Note: This assumes you have Gradle installed. If you don't, use ./gradlew(.bat) instead of gradle.
-
-Clone this repository to a folder. 
-Open a command prompt and navigate to the folder where you cloned this repo.
-Run gradle setupForge to setup your development environment.
-
-To use Eclipse, point your Eclipse workspace at the eclipse folder inside the repo.
-
-
-Requirements (for both mod devs and contributors):
-  You must have a JDK installed and accessible.
-  If you do not wish to use the gradle wrapper, you can install Gradle from http://www.gradle.org/ .
- 

bin/grep.exe

@@ -0,0 +1 @@
+asdfsnb  -a -v "svn"+

build.bat

@@ -0,0 +1,11 @@
+cd ..
+
+rmdir /S /Q src
+mkdir src
+xcopy  /Y /E src_work\* src\
+
+xcopy /Y /E forge\forge_client\src\net\* src\minecraft\net
+xcopy /Y /E forge\forge_common\net\* src\minecraft\net
+xcopy /Y /E forge\forge_common\net\* src\minecraft_server\net
+
+cmd /C recompile.bat

build.gradle

@@ -1,122 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        mavenLocal()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-    }
-}
-
-configurations {
-    deployJars
-}
-
-import static net.minecraftforge.gradle.dev.ForgeDevPlugin.*
-
-apply plugin: 'maven'
-apply plugin: 'forgedev'
-
-repositories {
-    mavenLocal()
-    flatDir {
-        name "fileRepo"
-        dirs "repo"
-    }
-}
-
-minecraft {
-    version = '1.7.2'
-    mcpVersion = '9.03'
-    fmlDir = projectDir.getAbsolutePath() + "/fml";
-    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
-    tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
-    installerVersion = "1.4"
-}
-
-group = 'net.minecraftforge'
-version = getVersionFromJava(getProject(), 'src/main/java/net/minecraftforge/common/ForgeVersion.java')
-
-jenkins {
-    job = 'minecraftforge'
-}
-
-launch4j {
-    jreMinVersion = '1.6.0'
-}
-
-uploadArchives {
-    repositories {
-        add getProject().repositories.mavenLocal()
-    }
-    repositories.mavenDeployer {
-        configuration = configurations.deployJars
-
-        if (project.hasProperty("filesmaven")) {
-            logger.info('Publishing to files server')
-            repository(url: project.filesmaven.url) {
-                authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
-            }
-        } else {
-            logger.info('Publishing to repo folder')
-            repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
-        }
-
-        pom {
-            groupId = project.group
-            version = project.version
-            artifactId = project.archivesBaseName
-        }
-        pom.project {
-            name project.archivesBaseName
-            packaging 'jar'
-            description 'Minecraft Forge API'
-            url 'https://github.com/MinecraftForge/MinecraftForge'
-
-            scm {
-                url 'https://github.com/MinecraftForge/MinecraftForge'
-                connection 'scm:git:git://github.com/MinecraftForge/MinecraftForge.git'
-                developerConnection 'scm:git:[email protected]:MinecraftForge/MinecraftForge.git'
-            }
-
-            issueManagement {
-                system 'github'
-                url 'https://github.com/MinecraftForge/MinecraftForge/issues'
-            }
-
-            licenses {
-                license {
-                    name 'Forge Public License'
-                    url 'https://raw.github.com/MinecraftForge/MinecraftForge/master/MinecraftForge-License.txt'
-                    distribution 'repo'
-                }
-            }
-
-            developers {
-                developer {
-                    id 'cpw'
-                    name 'cpw'
-                    roles { role 'developer' }
-                }
-                developer {
-                    id 'LexManos'
-                    name 'Lex Manos'
-                    roles { role 'developer' }
-                }
-                developer {
-                    id 'AbrarSyed'
-                    name 'Abrar Syed'
-                    roles { role 'contributor' }
-                }
-            }
-        }
-    }
-}

build.sh

@@ -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
+
+

client

@@ -0,0 +1 @@
+forge_client/src/net/minecraft/src/forge/

common

@@ -0,0 +1 @@
+forge_common/net/minecraft/src/forge

conf/client.exc

@@ -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

conf/mcp.cfg

@@ -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}

conf/patches/Start.java

@@ -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);
+	}
+}

conf/patches/me.java

@@ -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;
+    }
+}

conf/patches/minecraft_ff.patch

@@ -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() {

conf/patches/minecraft_server_ff.patch

@@ -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() {

conf/patches/splashes.txt

@@ -0,0 +1 @@
+Now it is YOURCRAFT!

conf/server.exc

@@ -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

conf/version.cfg

@@ -0,0 +1,4 @@
+[VERSION]
+MCPVersion = 5.0
+ClientVersion = 1.0.0
+ServerVersion = 1.0.1

forge_client/.classpath

@@ -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>

forge_client/.project

@@ -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>

forge_client/src/net/minecraft/src/forge/BlockTextureParticles.java

@@ -0,0 +1,13 @@
+package net.minecraft.src.forge;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BlockTextureParticles {
+    public String texture;
+    public List effects;
+    
+    public BlockTextureParticles(){
+        effects = new ArrayList();
+    }
+}

forge_client/src/net/minecraft/src/forge/EnumHelperClient.java

@@ -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();
+		}
+	}
+
+}

forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java

@@ -0,0 +1,232 @@
+/**
+ * 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;
+	}
+
+	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(Tessellator.instance.isDrawing) {
+				int mode=Tessellator.instance.drawMode;
+				Tessellator.instance.draw();
+				Tessellator.instance.startDrawing(mode);
+			}
+			GL11.glBindTexture(3553 /* GL_TEXTURE_2D */,n);
+			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();
+				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);
+	}
+}
+

forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java

@@ -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);
+
+}
+

forge_client/src/net/minecraft/src/forge/ICustomItemRenderer.java

@@ -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);
+}

forge_client/src/net/minecraft/src/forge/IHighlightHandler.java

@@ -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);
+}
+

forge_client/src/net/minecraft/src/forge/IRenderContextHandler.java

@@ -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();
+}
+

forge_client/src/net/minecraft/src/forge/IRenderWorldLastHandler.java

@@ -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);
+}
+

forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java

@@ -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];
+	}
+}

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

@@ -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;
+	}
+}

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

@@ -0,0 +1,313 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.text.DateFormat;
+import java.util.Collection;
+import java.util.Date;
+import java.util.TreeMap;
+
+import net.minecraft.src.Block;
+
+/** 
+ * This class offers advanced configurations capabilities, allowing to provide
+ * various categories for configuration variables.
+ */
+public class Configuration {
+
+    private boolean configBlocks[] = null;
+
+    public static final int GENERAL_PROPERTY = 0;
+    public static final int BLOCK_PROPERTY = 1;
+    public static final int ITEM_PROPERTY = 2;
+    
+    File file;
+
+    public TreeMap<String, Property> blockProperties = new TreeMap<String, Property>();
+    public TreeMap<String, Property> itemProperties = new TreeMap<String, Property>();
+    public TreeMap<String, Property> generalProperties = new TreeMap<String, Property>();
+
+    /**
+     * Create a configuration file for the file given in parameter.
+     */
+    public Configuration(File file) {
+        this.file = file;
+    }
+
+    /**
+     * Gets or create a block id property. If the block id property key is
+     * already in the configuration, then it will be used. Otherwise, 
+     * defaultId will be used, except if already taken, in which case this
+     * will try to determine a free default id. 
+     */
+    public Property getOrCreateBlockIdProperty(String key, int defaultId) {
+        if (configBlocks == null) {
+            configBlocks = new boolean[Block.blocksList.length];
+
+            for (int i = 0; i < configBlocks.length; ++i) {
+                configBlocks[i] = false;
+            }
+        }
+
+        if (blockProperties.containsKey(key)) {
+			Property property = getOrCreateIntProperty(key,
+					Configuration.BLOCK_PROPERTY, defaultId);
+            configBlocks[Integer.parseInt(property.value)] = true;
+            return property;
+        } else {
+            Property property = new Property();
+
+            blockProperties.put(key, property);
+            property.name = key;
+
+            if (Block.blocksList[defaultId] == null
+                    && !configBlocks[defaultId]) {
+                property.value = Integer.toString(defaultId);
+                configBlocks[defaultId] = true;
+                return property;
+            } else {
+                for (int j = Block.blocksList.length - 1; j >= 0; --j) {
+                    if (Block.blocksList[j] == null && !configBlocks[j]) {
+                        property.value = Integer.toString(j);
+                        configBlocks[j] = true;
+                        return property;
+                    }
+                }
+
+                throw new RuntimeException("No more block ids available for "
+                        + key);
+            }
+        }
+    }
+
+    public Property getOrCreateIntProperty(String key, int kind,
+            int defaultValue) {
+        Property prop = getOrCreateProperty(key, kind,
+                Integer.toString(defaultValue));
+
+        try {
+            Integer.parseInt(prop.value);
+
+            return prop;
+        } catch (NumberFormatException e) {
+            prop.value = Integer.toString(defaultValue);
+            return prop;
+        }
+    }
+
+    public Property getOrCreateBooleanProperty(String key, int kind,
+            boolean defaultValue) {
+        Property prop = getOrCreateProperty(key, kind,
+                Boolean.toString(defaultValue));
+
+        if ("true".equals(prop.value.toLowerCase())
+                || "false".equals(prop.value.toLowerCase())) {
+            return prop;
+        } else {
+            prop.value = Boolean.toString(defaultValue);
+            return prop;
+        }
+    }
+
+    public Property getOrCreateProperty(String key, int kind,
+            String defaultValue) {
+        TreeMap<String, Property> source = null;
+
+        switch (kind) {
+        case GENERAL_PROPERTY:
+            source = generalProperties;
+            break;
+        case BLOCK_PROPERTY:
+            source = blockProperties;
+            break;
+        case ITEM_PROPERTY:
+            source = itemProperties;
+            break;
+        }
+
+        if (source.containsKey(key)) {
+            return source.get(key);
+        } else if (defaultValue != null) {
+            Property property = new Property();
+
+            source.put(key, property);
+            property.name = key;
+
+            property.value = defaultValue;
+            return property;
+        } else {
+            return null;
+        }
+    }
+
+    public void load() {
+        try {
+            if (file.getParentFile() != null) {
+                file.getParentFile().mkdirs();
+            }
+
+            if (!file.exists() && !file.createNewFile()) {
+                return;
+            }
+
+            if (file.canRead()) {
+                FileInputStream fileinputstream = new FileInputStream(file);
+
+                BufferedReader buffer = new BufferedReader(
+                        new InputStreamReader(fileinputstream, "8859_1"));
+
+                String line;
+                TreeMap<String, Property> currentMap = null;
+
+                while (true) {
+                    line = buffer.readLine();
+
+                    if (line == null) {
+                        break;
+                    }
+
+                    int nameStart = -1, nameEnd = -1;
+                    boolean skip = false;
+
+                    for (int i = 0; i < line.length() && !skip; ++i) {
+                        if (Character.isLetterOrDigit(line.charAt(i))
+                                || line.charAt(i) == '.') {
+                            if (nameStart == -1) {
+                                nameStart = i;
+                            }
+
+                            nameEnd = i;
+                        } else if (Character.isWhitespace(line.charAt(i))) {
+                            // ignore space charaters
+                        } else {
+                            switch (line.charAt(i)) {
+                            case '#':
+                                skip = true;
+                                continue;
+                            case '{':
+                                String scopeName = line.substring(nameStart,
+                                        nameEnd + 1);
+
+                                if (scopeName.equals("general")) {
+                                    currentMap = generalProperties;
+                                } else if (scopeName.equals("block")) {
+                                    currentMap = blockProperties;
+                                } else if (scopeName.equals("item")) {
+                                    currentMap = itemProperties;
+                                } else {
+                                    throw new RuntimeException(
+                                            "unknown section " + scopeName);
+                                }
+
+                                break;
+                            case '}':
+                                currentMap = null;
+                                break;
+                            case '=':
+                                String propertyName = line.substring(nameStart,
+                                        nameEnd + 1);
+
+                                if (currentMap == null) {
+                                    throw new RuntimeException("property "
+                                            + propertyName + " has no scope");
+                                }
+
+                                Property prop = new Property();
+                                prop.name = propertyName;
+                                prop.value = line.substring(i + 1);
+                                i = line.length();
+
+                                currentMap.put(propertyName, prop);
+
+                                break;
+                            default:
+                                throw new RuntimeException("unknown character "
+                                        + line.charAt(i));
+                            }
+                        }
+                    }
+                }
+
+            }
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void save() {
+        try {
+            if (file.getParentFile() != null) {
+                file.getParentFile().mkdirs();
+            }
+
+            if (!file.exists() && !file.createNewFile()) {
+                return;
+            }
+
+            if (file.canWrite()) {
+                FileOutputStream fileoutputstream = new FileOutputStream(file);
+
+                BufferedWriter buffer = new BufferedWriter(
+                        new OutputStreamWriter(fileoutputstream, "8859_1"));
+
+                buffer.write("# Configuration file\r\n");
+                buffer.write("# Generated on "
+                        + DateFormat.getInstance().format(new Date()) + "\r\n");
+                buffer.write("\r\n");
+                buffer.write("###########\r\n");
+                buffer.write("# General #\r\n");
+                buffer.write("###########\r\n\r\n");
+
+                buffer.write("general {\r\n");
+                writeProperties(buffer, generalProperties.values());
+                buffer.write("}\r\n\r\n");
+
+                buffer.write("#########\r\n");
+                buffer.write("# Block #\r\n");
+                buffer.write("#########\r\n\r\n");
+
+                buffer.write("block {\r\n");
+                writeProperties(buffer, blockProperties.values());
+                buffer.write("}\r\n\r\n");
+
+                buffer.write("########\r\n");
+                buffer.write("# Item #\r\n");
+                buffer.write("########\r\n\r\n");
+
+                buffer.write("item {\r\n");
+                writeProperties(buffer, itemProperties.values());
+                buffer.write("}\r\n\r\n");
+
+                buffer.close();
+                fileoutputstream.close();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void writeProperties(BufferedWriter buffer,
+            Collection<Property> props) throws IOException {
+        for (Property property : props) {
+            if (property.comment != null) {
+                buffer.write("   # " + property.comment + "\r\n");
+            }
+
+            buffer.write("   " + property.name + "=" + property.value);
+            buffer.write("\r\n");
+        }
+    }
+
+}

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

@@ -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);
+	}
+}

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

@@ -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().equals(valueType))
+				{
+					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();
+		}
+	}
+}

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

@@ -0,0 +1,282 @@
+/**
+ * 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.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>();
+
+	// 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=3;
+	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();
+}
+

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

@@ -0,0 +1,54 @@
+/**
+ * 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;
+
+/**
+ * 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 
+{
+	/**
+	 * Return true if this block should be treated as a normal cube by game logic 
+	 * (this is independant of rendering), false otherwise.  This allows for things like secondary
+	 * blocks (torches, rails, redstone dust, etc.) being attached to the surface of
+	 * the block regardless of whether it is opaque, or posesses other rendering properties that
+	 * would not normally make this possible.
+	 */
+	public boolean isBlockNormalCube( World world, int i, int j, int k );
+	
+	/**
+	 * Return true if this block can be replaced by another by the player, false otherwise.  This provides
+	 * a means of allowing blocks to not be considered when the player attempts to place another within
+	 * their bounds, in the same way that water, lava, fire, and some other blocks behave within the game.
+	 * Provides an override to the coresponding section in canBlockBePlacedAt() in world.class
+	 */
+	public boolean isBlockReplaceable( World world, int i, int j, int k );
+	
+	/**
+	 * Return true if this block should set fire and deal fire damage to entities coming into contact with
+	 * it, false otherwise.  Provides an override to the related test within isBoundingBoxBurning() within
+	 * world.class
+	 */
+	public boolean isBlockBurning( World world, int i, int j, int k );
+	
+	/**
+	 * 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.  
+	 * Provides an override to isAirBlock() within world.class
+	 */	
+	public boolean isAirBlock( World world, int i, int j, int k );
+	
+}
+
+

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

@@ -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);
+}
+

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

@@ -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.ItemStack;
+import net.minecraft.src.World;
+
+public interface IBucketHandler {
+
+    /**
+     * This is called before Minecraft tries to fill a bucket with water or
+     * lava. If it returns a non-null result, then the filling process will
+     * be stopped and the empty bucket will be changed to the result of this
+     * subprogram.
+     * 
+     * @see MinecraftForge#registerCustomBucketHander(IBucketHandler)
+     */
+    public ItemStack fillCustomBucket(World w, int i, int j, int k);
+
+}

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

@@ -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.Block;
+import net.minecraft.src.IBlockAccess;
+
+/**
+ * This interface is to be implemented by Block classes. It will override
+ * standard algorithms controlling connection between two blocks by redstone
+ * 
+ * @see Block
+ */
+public interface IConnectRedstone {
+    
+    /**
+     * When this returns false, the block at location i, j, k cannot make
+     * a redstone connection in the direction given in parameter, otherwise
+     * it can.  Use to control which sides are inputs and outputs for redstone
+     * wires.
+     */
+    public boolean canConnectRedstone(IBlockAccess iba, int i, int j, int k,
+            int dir);
+}

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

@@ -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);
+
+}

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

@@ -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);
+}
+

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

@@ -0,0 +1,21 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.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);
+
+}
+

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

@@ -0,0 +1,17 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+/** This interface is to be implemented by a Block class.  Allows a block
+ * type to perform rendering in both render passes, in case some parts of the
+ * block are solid and others are transparent.
+ */
+public interface IMultipassRender {
+	/** Returns true when the block has things to render in this render
+	 * pass.
+	 */
+	public boolean canRenderInPass(int n);
+}

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

@@ -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);
+}

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

@@ -0,0 +1,31 @@
+/**
+ * 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.World;
+
+/**
+ * This interface is to be implemented by block classes. It will allow a block
+ * to control how it can be replaced
+ *
+ * @see Block
+ * @deprecated.  This functionality will be removed soon.
+ */
+public interface IOverrideReplace {
+    
+    /**
+     * Return true if this block has to take control over replacement, for
+     * the intended replacement given by the parameter bid. If false, then
+     * the block replacement will be prevented.
+     */
+	public boolean canReplaceBlock(World world, int i, int j, int k, int bid);
+	
+	/**
+	 * Return the status of the actual replacement. 
+	 */
+	public boolean getReplacedSuccess();
+}

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

@@ -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);
+}
+

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

@@ -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);
+}
+

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

@@ -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.EntityPlayer;
+import net.minecraft.src.ItemArmor;
+
+/**
+ * This interface is to be implemented by ItemArmor classes. It will allow to
+ * modify computation of damage and health loss. Computation will be called
+ * before the actual armor computation, which can then be cancelled.
+ *
+ * @see ItemArmor
+ */
+public interface ISpecialArmor {
+    
+    /**
+     * Return extra properties for the armor
+     */
+	public ArmorProperties getProperties(EntityPlayer player,
+			int intitialDamage, int currentDamage);
+}

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

@@ -0,0 +1,26 @@
+/**
+ * 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.World;
+
+/**
+ * This interface is to be implemented by block classes. It will allow a block
+ * to control how it resists to explosion
+ *
+ * @see Block
+ */
+public interface ISpecialResistance {
+    
+    /**
+     * Return the explosion resistance of the block located at position i, j, 
+     * k, from an exploder explosing on src_x, src_y, src_z.
+     */
+	public float getSpecialExplosionResistance(World world, int i, int j, int k,
+		double src_x, double src_y, double src_z, Entity exploder);
+}

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

@@ -0,0 +1,21 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+/**
+ * This interface has to be implemented either by an instance of Block or Item.
+ * It allow to use texture files different from terrain.png or items.png.
+ */
+public interface ITextureProvider {
+
+    /**
+     * This interface has to return the path to a file that is the same size as
+     * terrain.png, but not named terrain.png. It will be used instead of the
+     * regular terrain file to render blocks and items.
+     */
+    public String getTextureFile();
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * 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.Item;
+import net.minecraft.src.ItemStack;
+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 {
+    
+    /**
+     * This is called when the item is used, before the block is activated.
+     * Stop the computation when return true.
+     */
+	public boolean onItemUseFirst(ItemStack ist,
+			EntityPlayer player, World world,
+			int i, int j, int k, int l);
+}

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

@@ -0,0 +1,610 @@
+/**
+ * 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.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);
+    }
+
+    /**
+     * 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;
+    }
+        
+    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      );
+    }
+
+}

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

@@ -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;
+	}
+}

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

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

forge_server/.classpath

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="forge_common"/>
+	<classpathentry kind="src" path="minecraft_server"/>
+	<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/minecraft_server.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

forge_server/.project

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>forge_server</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_server</name>
+			<type>2</type>
+			<locationURI>PARENT-1-WORKSPACE_LOC/src_work/minecraft_server</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>

gradlew

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/fml/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\fml\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

install/README.txt

@@ -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.
+

install/install.cmd

@@ -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

install/install.sh

@@ -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

lfcr.py

@@ -0,0 +1,8 @@
+#! /usr/bin/env python
+
+import sys, re, os
+data = open(sys.argv[1], "rb").read()
+newdata = re.sub("\r?\n", "\r\n", data)
+f = open(sys.argv[2], "wb")
+f.write(newdata)
+f.close()

licence.txt

@@ -1,70 +1,65 @@
-Minecraft Forge Public Licence
-==============================
-
-Version 1.0
-
-0. Definitions
---------------
-
-Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB
-
-User: Anybody that interract with the software in one of the following ways:
-   - play
-   - decompile
-   - recompile or compile
-   - modify
-
-Minecraft Forge: The Minecraft Forge code, in source form, class file form, as
-obtained in a standalone fashion or as part of a wider distribution.
-
-Dependency: Code required to have Minecraft Forge working properly. That can
-include dependencies required to compile the code as well as modifications in 
-the Minecraft sources that are required to have Minecraft Forge working.
-
-1. Scope
---------
-
-The present license is granted to any user of Minecraft Forge, for all files included 
-unless stated otherwise in the file itself. As a prerequisite, a user of Minecraft 
-Forge must own a legally aquired copy of Minecraft.
-
-2. Play rights
---------------
-
-The user of Minecraft Forge is allowed to install the software on a client or
-a server and to play it without restriction.
-
-3. Modification rights
-----------------------
-
-The user has the right to decompile the source code, look at either the 
-decompiled version or the original source code, and to modify it.
-
-4. Derivation rights
---------------------
-
-The user has the rights to derive code from Minecraft Forge, that is to say to
-write code that either extends Minecraft Forge class and interfaces, 
-instantiate the objects declared or calls the functions. This code is known as
-"derived" code, and can be licensed with conditions different from Minecraft
-Forge.
-
-
-5. Distribution rights
-----------------------
-
-The user of Minecraft Forge is allowed to redistribute Minecraft Forge in 
-partially, in totallity, or included in a distribution. When distributing 
-binaries or class files, the user must provide means to obtain the sources of
-the distributed version of Minecraft Forge at no costs. This includes the
-files as well as any dependency that the code may rely on, including patches to
-minecraft original sources.
-
-Modification of Minecraft Forge as well as dependencies, including patches to
-minecraft original sources, has to remain under the terms of the present
-license.
-
-The right to distribute Minecraft Forge does not extend to the right to distribute
-MCP data files included within Minecraft Forge. These are the property of the MCP
-project and should be removed from any customized distribution of Minecraft Forge
-or permission sought separately from the MCP team.
+Minecraft Forge Public Licence
+==============================
+
+Version 1.0
+
+0. Definitions
+--------------
+
+Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB
+
+User: Anybody that interract with the software in one of the following ways:
+   - play
+   - decompile
+   - recompile or compile
+   - modify
+
+Minecraft Forge: The Minecraft Forge code, in source form, class file form, as
+obtained in a standalone fashion or as part of a wider distribution.
+
+Dependency: Code required to have Minecraft Forge working properly. That can
+include dependencies required to compile the code as well as modifications in 
+the Minecraft sources that are required to have Minecraft Forge working.
+
+1. Scope
+--------
+
+The present license is granted to any user of Minecraft Forge. As a 
+prerequisite, a user of Minecraft Forge must own a legally aquired copy of
+Minecraft
+
+2. Play rights
+--------------
+
+The user of Minecraft Forge is allowed to install the software on a client or
+a server and to play it without restriction.
+
+3. Modification rights
+----------------------
+
+The user has the right to decompile the source code, look at either the 
+decompiled version or the original source code, and to modify it.
+
+4. Derivation rights
+--------------------
+
+The user has the rights to derive code from Minecraft Forge, that is to say to
+write code that either extends Minecraft Forge class and interfaces, 
+instantiate the objects declared or calls the functions. This code is known as
+"derived" code, and can be licensed with conditions different from Minecraft
+Forge.
+
+
+5. Distribution rights
+----------------------
+
+The user of Minecraft Forge is allowed to redistribute Minecraft Forge in 
+partially, in totallity, or included in a distribution. When distributing 
+binaries or class files, the user must provide means to obtain the sources of
+the distributed version of Minecraft Forge at no costs. This includes the
+files as well as any dependency that the code may rely on, including patches to
+minecraft original sources.
+
+Modification of Minecraft Forge as well as dependencies, including patches to
+minecraft original sources, has to remain under the terms of the present
+license.

minecraftforge_credits.txt

@@ -18,9 +18,3 @@ ScotTools Background: ScotTools was an API that enabled modders to add blocks to
 
 * LexManos *
 
-* cpw *
-
-* Minecraft Coder Pack (MCP) *
-Forge Mod Loader and Minecraft Forge have permission to distribute and automatically download components of MCP and distribute MCP data files.
-This permission is not transitive and others wishing to redistribute the Minecraft Forge source independently should seek permission of MCP or
-remove the MCP data files and request their users to download MCP separately.

modLoaderMP.patch

@@ -0,0 +1,70 @@
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java
+--- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java	2011-07-17 00:28:07.755771900 +0200
++++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java	2011-07-17 00:28:09.485870900 +0200
+@@ -333,41 +333,22 @@
+             }
+             finally
+             {
+-                System.exit(0);
++                    try
++                    {
++                            stopServer();
++                            serverStopped = true;
++                    }
++                    catch(Throwable throwable2)
++                    {
++                            throwable2.printStackTrace();
++                    }
++                    finally
++                    {
++                            System.exit(0);
++                    }
+             }
+-            break MISSING_BLOCK_LABEL_350;
+-        }
+-        try
+-        {
+-            stopServer();
+-            serverStopped = true;
+-        }
+-        catch(Throwable throwable)
+-        {
+-            throwable.printStackTrace();
+-        }
+-        finally
+-        {
+-            System.exit(0);
+-        }
+-        break MISSING_BLOCK_LABEL_350;
+-        Exception exception2;
+-        exception2;
+-        try
+-        {
+-            stopServer();
+-            serverStopped = true;
+-        }
+-        catch(Throwable throwable3)
+-        {
+-            throwable3.printStackTrace();
+-        }
+-        finally
+-        {
+-            System.exit(0);
+-        }
+-        throw exception2;
+     }
++}
+ 
+     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

package.sh

@@ -0,0 +1,85 @@
+version=$1
+build_dir=`pwd`
+dir=`pwd`/../forge-$version
+
+function remove_svn () {
+  (
+  cd $1
+
+  if [ -d .svn ]; then
+     rm -rf .svn
+  fi
+
+  for j in `ls`
+  do
+     if [ -d $j ]; then
+        remove_svn $j
+     fi
+  done
+  )
+}
+
+function package_all () {
+   qual=$1
+
+   cp $build_dir/minecraftforge_credits.txt .
+
+   zip -r $dir/minecraftforge$qual-$version.zip \
+      minecraftforge_credits.txt \
+      *.class \
+      forge
+}
+
+cd ../reobf
+
+remove_svn .
+
+rm -rf $dir
+mkdir $dir
+
+cd minecraft
+package_all "-client"
+
+cd ../minecraft_server
+package_all "-server"
+
+cd ../..
+
+rm -rf reobf
+
+cd $build_dir
+
+mkdir forge
+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 -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 ..
+
+zip -r $dir/minecraftforge-src-$version.zip forge
+rm -rf forge

patches/minecraft/net/minecraft/block/BlockBush.java.patch

@@ -1,73 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockBush.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockBush.java
-@@ -6,8 +6,13 @@
- import net.minecraft.init.Blocks;
- import net.minecraft.util.AxisAlignedBB;
- import net.minecraft.world.World;
-+import net.minecraft.world.IBlockAccess;
-+import net.minecraftforge.common.EnumPlantType;
-+import net.minecraftforge.common.util.ForgeDirection;
-+import net.minecraftforge.common.IPlantable;
-+import static net.minecraftforge.common.EnumPlantType.*;
- 
--public class BlockBush extends Block
-+public class BlockBush extends Block implements IPlantable
- {
-     private static final String __OBFID = "CL_00000208";
- 
-@@ -27,7 +32,7 @@
- 
-     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
-     {
--        return super.func_149742_c(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && this.func_149854_a(p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_ - 1, p_149742_4_));
-+        return super.func_149742_c(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && this.func_149718_j(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_);
-     }
- 
-     protected boolean func_149854_a(Block p_149854_1_)
-@@ -57,7 +62,7 @@
- 
-     public boolean func_149718_j(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_)
-     {
--        return this.func_149854_a(p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ - 1, p_149718_4_));
-+        return  p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ - 1, p_149718_4_).canSustainPlant(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_, ForgeDirection.UP, this);
-     }
- 
-     public AxisAlignedBB func_149668_a(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_)
-@@ -79,4 +84,37 @@
-     {
-         return 1;
-     }
-+
-+    @Override
-+    public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z)
-+    {
-+        if (this == Blocks.field_150464_aj)          return Crop;
-+        if (this == Blocks.field_150459_bM)        return Crop;
-+        if (this == Blocks.field_150469_bN)       return Crop;
-+        if (this == Blocks.field_150394_bc)     return Crop;
-+        if (this == Blocks.field_150393_bb)   return Crop;
-+        if (this == Blocks.field_150330_I)       return Desert;
-+        if (this == Blocks.field_150392_bi)      return Water;
-+        if (this == Blocks.field_150337_Q)   return Cave;
-+        if (this == Blocks.field_150338_P) return Cave;
-+        if (this == Blocks.field_150388_bm)    return Nether;
-+        if (this == Blocks.field_150345_g)        return Plains;
-+        if (this == Blocks.field_150329_H)      return Plains;
-+        if (this == Blocks.field_150398_cm)   return Plains;
-+        if (this == Blocks.field_150328_O)     return Plains;
-+        if (this == Blocks.field_150327_N)  return Plains;        
-+        return Plains;
-+    }
-+
-+    @Override
-+    public Block getPlant(IBlockAccess world, int x, int y, int z)
-+    {
-+        return this;
-+    }
-+
-+    @Override
-+    public int getPlantMetadata(IBlockAccess world, int x, int y, int z)
-+    {
-+        return world.func_72805_g(x, y, z);
-+    }
- }

patches/minecraft/net/minecraft/block/BlockButton.java.patch

@@ -1,100 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockButton.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockButton.java
-@@ -14,6 +14,9 @@
- import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
- 
-+import net.minecraftforge.common.util.ForgeDirection;
-+import static net.minecraftforge.common.util.ForgeDirection.*;
-+
- public abstract class BlockButton extends Block
- {
-     private final boolean field_150047_a;
-@@ -49,12 +52,19 @@
- 
-     public boolean func_149707_d(World p_149707_1_, int p_149707_2_, int p_149707_3_, int p_149707_4_, int p_149707_5_)
-     {
--        return p_149707_5_ == 2 && p_149707_1_.func_147439_a(p_149707_2_, p_149707_3_, p_149707_4_ + 1).func_149721_r() ? true : (p_149707_5_ == 3 && p_149707_1_.func_147439_a(p_149707_2_, p_149707_3_, p_149707_4_ - 1).func_149721_r() ? true : (p_149707_5_ == 4 && p_149707_1_.func_147439_a(p_149707_2_ + 1, p_149707_3_, p_149707_4_).func_149721_r() ? true : p_149707_5_ == 5 && p_149707_1_.func_147439_a(p_149707_2_ - 1, p_149707_3_, p_149707_4_).func_149721_r()));
-+        ForgeDirection dir = ForgeDirection.getOrientation(p_149707_5_);
-+        return (dir == NORTH && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_ + 1, NORTH)) ||
-+               (dir == SOUTH && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_ - 1, SOUTH)) ||
-+               (dir == WEST  && p_149707_1_.isSideSolid(p_149707_2_ + 1, p_149707_3_, p_149707_4_, WEST)) ||
-+               (dir == EAST  && p_149707_1_.isSideSolid(p_149707_2_ - 1, p_149707_3_, p_149707_4_, EAST));
-     }
- 
-     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
-     {
--        return p_149742_1_.func_147439_a(p_149742_2_ - 1, p_149742_3_, p_149742_4_).func_149721_r() ? true : (p_149742_1_.func_147439_a(p_149742_2_ + 1, p_149742_3_, p_149742_4_).func_149721_r() ? true : (p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_, p_149742_4_ - 1).func_149721_r() ? true : p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_, p_149742_4_ + 1).func_149721_r()));
-+        return (p_149742_1_.isSideSolid(p_149742_2_ - 1, p_149742_3_, p_149742_4_, EAST)) ||
-+               (p_149742_1_.isSideSolid(p_149742_2_ + 1, p_149742_3_, p_149742_4_, WEST)) ||
-+               (p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_, p_149742_4_ - 1, SOUTH)) ||
-+               (p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_, p_149742_4_ + 1, NORTH));
-     }
- 
-     public int func_149660_a(World p_149660_1_, int p_149660_2_, int p_149660_3_, int p_149660_4_, int p_149660_5_, float p_149660_6_, float p_149660_7_, float p_149660_8_, int p_149660_9_)
-@@ -63,19 +73,21 @@
-         int k1 = j1 & 8;
-         j1 &= 7;
- 
--        if (p_149660_5_ == 2 && p_149660_1_.func_147439_a(p_149660_2_, p_149660_3_, p_149660_4_ + 1).func_149721_r())
-+        ForgeDirection dir = ForgeDirection.getOrientation(p_149660_5_);
-+
-+        if (dir == NORTH && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ + 1, NORTH))
-         {
-             j1 = 4;
-         }
--        else if (p_149660_5_ == 3 && p_149660_1_.func_147439_a(p_149660_2_, p_149660_3_, p_149660_4_ - 1).func_149721_r())
-+        else if (dir == SOUTH && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ - 1, SOUTH))
-         {
-             j1 = 3;
-         }
--        else if (p_149660_5_ == 4 && p_149660_1_.func_147439_a(p_149660_2_ + 1, p_149660_3_, p_149660_4_).func_149721_r())
-+        else if (dir == WEST && p_149660_1_.isSideSolid(p_149660_2_ + 1, p_149660_3_, p_149660_4_, WEST))
-         {
-             j1 = 2;
-         }
--        else if (p_149660_5_ == 5 && p_149660_1_.func_147439_a(p_149660_2_ - 1, p_149660_3_, p_149660_4_).func_149721_r())
-+        else if (dir == EAST && p_149660_1_.isSideSolid(p_149660_2_ - 1, p_149660_3_, p_149660_4_, EAST))
-         {
-             j1 = 1;
-         }
-@@ -89,7 +101,11 @@
- 
-     private int func_150045_e(World p_150045_1_, int p_150045_2_, int p_150045_3_, int p_150045_4_)
-     {
--        return p_150045_1_.func_147439_a(p_150045_2_ - 1, p_150045_3_, p_150045_4_).func_149721_r() ? 1 : (p_150045_1_.func_147439_a(p_150045_2_ + 1, p_150045_3_, p_150045_4_).func_149721_r() ? 2 : (p_150045_1_.func_147439_a(p_150045_2_, p_150045_3_, p_150045_4_ - 1).func_149721_r() ? 3 : (p_150045_1_.func_147439_a(p_150045_2_, p_150045_3_, p_150045_4_ + 1).func_149721_r() ? 4 : 1)));
-+        if (p_150045_1_.isSideSolid(p_150045_2_ - 1, p_150045_3_, p_150045_4_, EAST)) return 1;
-+        if (p_150045_1_.isSideSolid(p_150045_2_ + 1, p_150045_3_, p_150045_4_, WEST)) return 2;
-+        if (p_150045_1_.isSideSolid(p_150045_2_, p_150045_3_, p_150045_4_ - 1, SOUTH)) return 3;
-+        if (p_150045_1_.isSideSolid(p_150045_2_, p_150045_3_, p_150045_4_ + 1, NORTH)) return 4;
-+        return 1;
-     }
- 
-     public void func_149695_a(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
-@@ -99,22 +115,22 @@
-             int l = p_149695_1_.func_72805_g(p_149695_2_, p_149695_3_, p_149695_4_) & 7;
-             boolean flag = false;
- 
--            if (!p_149695_1_.func_147439_a(p_149695_2_ - 1, p_149695_3_, p_149695_4_).func_149721_r() && l == 1)
-+            if (!p_149695_1_.isSideSolid(p_149695_2_ - 1, p_149695_3_, p_149695_4_, EAST) && l == 1)
-             {
-                 flag = true;
-             }
- 
--            if (!p_149695_1_.func_147439_a(p_149695_2_ + 1, p_149695_3_, p_149695_4_).func_149721_r() && l == 2)
-+            if (!p_149695_1_.isSideSolid(p_149695_2_ + 1, p_149695_3_, p_149695_4_, WEST) && l == 2)
-             {
-                 flag = true;
-             }
- 
--            if (!p_149695_1_.func_147439_a(p_149695_2_, p_149695_3_, p_149695_4_ - 1).func_149721_r() && l == 3)
-+            if (!p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_, p_149695_4_ - 1, SOUTH) && l == 3)
-             {
-                 flag = true;
-             }
- 
--            if (!p_149695_1_.func_147439_a(p_149695_2_, p_149695_3_, p_149695_4_ + 1).func_149721_r() && l == 4)
-+            if (!p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_, p_149695_4_ + 1, NORTH) && l == 4)
-             {
-                 flag = true;
-             }

patches/minecraft/net/minecraft/block/BlockCactus.java.patch

@@ -1,49 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockCactus.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockCactus.java
-@@ -11,9 +11,13 @@
- import net.minecraft.util.AxisAlignedBB;
- import net.minecraft.util.DamageSource;
- import net.minecraft.util.IIcon;
-+import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
-+import net.minecraftforge.common.EnumPlantType;
-+import net.minecraftforge.common.util.ForgeDirection;
-+import net.minecraftforge.common.IPlantable;
- 
--public class BlockCactus extends Block
-+public class BlockCactus extends Block implements IPlantable
- {
-     @SideOnly(Side.CLIENT)
-     private IIcon field_150041_a;
-@@ -125,7 +129,7 @@
-         else
-         {
-             Block block = p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ - 1, p_149718_4_);
--            return block == Blocks.field_150434_aF || block == Blocks.field_150354_m;
-+            return block.canSustainPlant(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_, ForgeDirection.UP, this);
-         }
-     }
- 
-@@ -141,4 +145,22 @@
-         this.field_150041_a = p_149651_1_.func_94245_a(this.func_149641_N() + "_top");
-         this.field_150040_b = p_149651_1_.func_94245_a(this.func_149641_N() + "_bottom");
-     }
-+
-+    @Override
-+    public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z)
-+    {
-+        return EnumPlantType.Desert;
-+    }
-+
-+    @Override
-+    public Block getPlant(IBlockAccess world, int x, int y, int z)
-+    {
-+        return this;
-+    }
-+
-+    @Override
-+    public int getPlantMetadata(IBlockAccess world, int x, int y, int z)
-+    {
-+        return -1;
-+    }
- }

patches/minecraft/net/minecraft/block/BlockChest.java.patch

@@ -1,44 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockChest.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockChest.java
-@@ -23,6 +23,8 @@
- import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
- 
-+import static net.minecraftforge.common.util.ForgeDirection.*;
-+
- public class BlockChest extends BlockContainer
- {
-     private final Random field_149955_b = new Random();
-@@ -407,7 +409,7 @@
-         {
-             return null;
-         }
--        else if (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_ + 1, p_149951_4_).func_149721_r())
-+        else if (p_149951_1_.isSideSolid(p_149951_2_, p_149951_3_ + 1, p_149951_4_, DOWN))
-         {
-             return null;
-         }
-@@ -415,19 +417,19 @@
-         {
-             return null;
-         }
--        else if (p_149951_1_.func_147439_a(p_149951_2_ - 1, p_149951_3_, p_149951_4_) == this && (p_149951_1_.func_147439_a(p_149951_2_ - 1, p_149951_3_ + 1, p_149951_4_).func_149721_r() || func_149953_o(p_149951_1_, p_149951_2_ - 1, p_149951_3_, p_149951_4_)))
-+        else if (p_149951_1_.func_147439_a(p_149951_2_ - 1, p_149951_3_, p_149951_4_) == this && (p_149951_1_.isSideSolid(p_149951_2_ - 1, p_149951_3_ + 1, p_149951_4_, DOWN) || func_149953_o(p_149951_1_, p_149951_2_ - 1, p_149951_3_, p_149951_4_)))
-         {
-             return null;
-         }
--        else if (p_149951_1_.func_147439_a(p_149951_2_ + 1, p_149951_3_, p_149951_4_) == this && (p_149951_1_.func_147439_a(p_149951_2_ + 1, p_149951_3_ + 1, p_149951_4_).func_149721_r() || func_149953_o(p_149951_1_, p_149951_2_ + 1, p_149951_3_, p_149951_4_)))
-+        else if (p_149951_1_.func_147439_a(p_149951_2_ + 1, p_149951_3_, p_149951_4_) == this && (p_149951_1_.isSideSolid(p_149951_2_ + 1, p_149951_3_ + 1, p_149951_4_, DOWN) || func_149953_o(p_149951_1_, p_149951_2_ + 1, p_149951_3_, p_149951_4_)))
-         {
-             return null;
-         }
--        else if (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_, p_149951_4_ - 1) == this && (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_ + 1, p_149951_4_ - 1).func_149721_r() || func_149953_o(p_149951_1_, p_149951_2_, p_149951_3_, p_149951_4_ - 1)))
-+        else if (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_, p_149951_4_ - 1) == this && (p_149951_1_.isSideSolid(p_149951_2_, p_149951_3_ + 1, p_149951_4_ - 1, DOWN) || func_149953_o(p_149951_1_, p_149951_2_, p_149951_3_, p_149951_4_ - 1)))
-         {
-             return null;
-         }
--        else if (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_, p_149951_4_ + 1) == this && (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_ + 1, p_149951_4_ + 1).func_149721_r() || func_149953_o(p_149951_1_, p_149951_2_, p_149951_3_, p_149951_4_ + 1)))
-+        else if (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_, p_149951_4_ + 1) == this && (p_149951_1_.isSideSolid(p_149951_2_, p_149951_3_ + 1, p_149951_4_ + 1, DOWN) || func_149953_o(p_149951_1_, p_149951_2_, p_149951_3_, p_149951_4_ + 1)))
-         {
-             return null;
-         }

patches/minecraft/net/minecraft/block/BlockCocoa.java.patch

@@ -1,46 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockCocoa.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockCocoa.java
-@@ -2,6 +2,7 @@
- 
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
-+import java.util.ArrayList;
- import java.util.Random;
- import net.minecraft.block.material.Material;
- import net.minecraft.client.renderer.texture.IIconRegister;
-@@ -160,6 +161,13 @@
- 
-     public void func_149690_a(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_)
-     {
-+        super.func_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, p_149690_7_);
-+    }
-+
-+    @Override
-+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int p_149690_5_, int fortune)
-+    {
-+        ArrayList<ItemStack> dropped = super.getDrops(world, x, y, z, p_149690_5_, fortune);
-         int j1 = func_149987_c(p_149690_5_);
-         byte b0 = 1;
- 
-@@ -170,8 +178,9 @@
- 
-         for (int k1 = 0; k1 < b0; ++k1)
-         {
--            this.func_149642_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, new ItemStack(Items.field_151100_aR, 1, 3));
-+            dropped.add(new ItemStack(Items.field_151100_aR, 1, 3));
-         }
-+        return dropped;
-     }
- 
-     @SideOnly(Side.CLIENT)
-@@ -216,4 +225,10 @@
-         ++j1;
-         p_149853_1_.func_72921_c(p_149853_3_, p_149853_4_, p_149853_5_, j1 << 2 | i1, 2);
-     }
-+
-+    @Override
-+    public Item func_149650_a(int par1, Random par2Random, int par3)
-+    {
-+        return null;
-+    }
- }

patches/minecraft/net/minecraft/block/BlockCrops.java.patch

@@ -1,79 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockCrops.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockCrops.java
-@@ -2,6 +2,7 @@
- 
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
-+import java.util.ArrayList;
- import java.util.Random;
- import net.minecraft.client.renderer.texture.IIconRegister;
- import net.minecraft.creativetab.CreativeTabs;
-@@ -12,6 +13,7 @@
- import net.minecraft.util.IIcon;
- import net.minecraft.util.MathHelper;
- import net.minecraft.world.World;
-+import net.minecraftforge.common.util.ForgeDirection;
- 
- public class BlockCrops extends BlockBush implements IGrowable
- {
-@@ -89,11 +91,11 @@
-             {
-                 float f1 = 0.0F;
- 
--                if (p_149864_1_.func_147439_a(l, p_149864_3_ - 1, i1) == Blocks.field_150458_ak)
-+                if (p_149864_1_.func_147439_a(l, p_149864_3_ - 1, i1).canSustainPlant(p_149864_1_, l, p_149864_3_ - 1, i1, ForgeDirection.UP, this))
-                 {
-                     f1 = 1.0F;
- 
--                    if (p_149864_1_.func_72805_g(l, p_149864_3_ - 1, i1) > 0)
-+                    if (p_149864_1_.func_147439_a(l, p_149864_3_ - 1, i1).isFertile(p_149864_1_, l, p_149864_3_ - 1, i1))
-                     {
-                         f1 = 3.0F;
-                     }
-@@ -145,22 +147,6 @@
-     public void func_149690_a(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_)
-     {
-         super.func_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, 0);
--
--        if (!p_149690_1_.field_72995_K)
--        {
--            if (p_149690_5_ >= 7)
--            {
--                int j1 = 3 + p_149690_7_;
--
--                for (int k1 = 0; k1 < j1; ++k1)
--                {
--                    if (p_149690_1_.field_73012_v.nextInt(15) <= p_149690_5_)
--                    {
--                        this.func_149642_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, new ItemStack(this.func_149866_i(), 1, 0));
--                    }
--                }
--            }
--        }
-     }
- 
-     public Item func_149650_a(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
-@@ -204,4 +190,23 @@
-     {
-         this.func_149863_m(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_);
-     }
-+
-+    @Override
-+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
-+    {
-+        ArrayList<ItemStack> ret = super.getDrops(world, x, y, z, metadata, fortune);
-+
-+        if (metadata >= 7)
-+        {
-+            for (int i = 0; i < 3 + fortune; ++i)
-+            {
-+                if (world.field_73012_v.nextInt(15) <= metadata)
-+                {
-+                    ret.add(new ItemStack(this.func_149866_i(), 1, 0));
-+                }
-+            }
-+        }
-+
-+        return ret;
-+    }
- }

patches/minecraft/net/minecraft/block/BlockDeadBush.java.patch

@@ -1,45 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDeadBush.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDeadBush.java
-@@ -1,5 +1,7 @@
- package net.minecraft.block;
- 
-+import java.util.ArrayList;
-+import java.util.Arrays;
- import java.util.Random;
- import net.minecraft.block.material.Material;
- import net.minecraft.entity.player.EntityPlayer;
-@@ -8,9 +10,11 @@
- import net.minecraft.item.Item;
- import net.minecraft.item.ItemStack;
- import net.minecraft.stats.StatList;
-+import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
-+import net.minecraftforge.common.IShearable;
- 
--public class BlockDeadBush extends BlockBush
-+public class BlockDeadBush extends BlockBush implements IShearable
- {
-     private static final String __OBFID = "CL_00000224";
- 
-@@ -33,14 +37,15 @@
- 
-     public void func_149636_a(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_)
-     {
--        if (!p_149636_1_.field_72995_K && p_149636_2_.func_71045_bC() != null && p_149636_2_.func_71045_bC().func_77973_b() == Items.field_151097_aZ)
-         {
--            p_149636_2_.func_71064_a(StatList.field_75934_C[Block.func_149682_b(this)], 1);
--            this.func_149642_a(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, new ItemStack(Blocks.field_150330_I, 1, p_149636_6_));
--        }
--        else
--        {
-             super.func_149636_a(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_);
-         }
-     }
-+
-+    @Override public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z) { return true; }
-+    @Override
-+    public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune)
-+    {
-+        return new ArrayList<ItemStack>(Arrays.asList(new ItemStack(Blocks.field_150330_I, 1, world.func_72805_g(x, y, z))));
-+    }
- }

patches/minecraft/net/minecraft/block/BlockDoor.java.patch

@@ -1,20 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDoor.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDoor.java
-@@ -249,7 +249,7 @@
-     {
-         if (this.field_149764_J == Material.field_151573_f)
-         {
--            return true;
-+            return false; //Allow items to interact with the door
-         }
-         else
-         {
-@@ -367,7 +367,7 @@
- 
-     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
-     {
--        return p_149742_3_ >= 255 ? false : World.func_147466_a(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_) && super.func_149742_c(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && super.func_149742_c(p_149742_1_, p_149742_2_, p_149742_3_ + 1, p_149742_4_);
-+        return p_149742_3_ >= p_149742_1_.func_72800_K() - 1 ? false : World.func_147466_a(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_) && super.func_149742_c(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && super.func_149742_c(p_149742_1_, p_149742_2_, p_149742_3_ + 1, p_149742_4_);
-     }
- 
-     public int func_149656_h()

patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch

@@ -1,52 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDoublePlant.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDoublePlant.java
-@@ -2,6 +2,7 @@
- 
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
-+import java.util.ArrayList;
- import java.util.List;
- import java.util.Random;
- import net.minecraft.block.material.Material;
-@@ -18,8 +19,9 @@
- import net.minecraft.util.MathHelper;
- import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
-+import net.minecraftforge.common.IShearable;
- 
--public class BlockDoublePlant extends BlockBush implements IGrowable
-+public class BlockDoublePlant extends BlockBush implements IGrowable, IShearable
- {
-     public static final String[] field_149892_a = new String[] {"sunflower", "syringa", "grass", "fern", "rose", "paeonia"};
-     @SideOnly(Side.CLIENT)
-@@ -81,6 +83,7 @@
- 
-     public boolean func_149718_j(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_)
-     {
-+        if (p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_, p_149718_4_) != this) return super.func_149718_j(p_149718_1_, p_149718_2_, p_149718_3_, p_149718_4_); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
-         int l = p_149718_1_.func_72805_g(p_149718_2_, p_149718_3_, p_149718_4_);
-         return func_149887_c(l) ? p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ - 1, p_149718_4_) == this : p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ + 1, p_149718_4_) == this && super.func_149718_j(p_149718_1_, p_149718_2_, p_149718_3_, p_149718_4_);
-     }
-@@ -262,4 +265,22 @@
-         int l = this.func_149885_e(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_);
-         this.func_149642_a(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_, new ItemStack(this, 1, l));
-     }
-+
-+    @Override
-+    public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z)
-+    {
-+        int metadata = world.func_72805_g(x, y, z);
-+        int type = func_149890_d(metadata);
-+        return func_149887_c(metadata) && (type == 3 || type == 4);
-+    }
-+
-+    @Override
-+    public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune)
-+    {
-+        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-+        int type = func_149890_d(world.func_72805_g(x, y, z));
-+        if (type == 3 || type == 2)
-+            ret.add(new ItemStack(Blocks.field_150329_H, 2, type == 3 ? 2 : 1));
-+        return ret;
-+    }
- }

patches/minecraft/net/minecraft/block/BlockFalling.java.patch

@@ -1,19 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFalling.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFalling.java
-@@ -84,7 +84,7 @@
-     {
-         Block block = p_149831_0_.func_147439_a(p_149831_1_, p_149831_2_, p_149831_3_);
- 
--        if (block.field_149764_J == Material.field_151579_a)
-+        if (block.isAir(p_149831_0_, p_149831_1_, p_149831_2_, p_149831_3_))
-         {
-             return true;
-         }
-@@ -94,6 +94,7 @@
-         }
-         else
-         {
-+            //TODO: King, take a look here when doing liquids!
-             Material material = block.field_149764_J;
-             return material == Material.field_151586_h ? true : material == Material.field_151587_i;
-         }

patches/minecraft/net/minecraft/block/BlockFarmland.java.patch

@@ -1,20 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java
-@@ -12,6 +12,8 @@
- import net.minecraft.util.AxisAlignedBB;
- import net.minecraft.util.IIcon;
- import net.minecraft.world.World;
-+import net.minecraftforge.common.IPlantable;
-+import net.minecraftforge.common.util.ForgeDirection;
- 
- public class BlockFarmland extends Block
- {
-@@ -94,7 +96,7 @@
-             {
-                 Block block = p_149822_1_.func_147439_a(l, p_149822_3_ + 1, i1);
- 
--                if (block == Blocks.field_150464_aj || block == Blocks.field_150394_bc || block == Blocks.field_150393_bb || block == Blocks.field_150469_bN || block == Blocks.field_150459_bM)
-+                if (block instanceof IPlantable && canSustainPlant(p_149822_1_, p_149822_2_, p_149822_3_, p_149822_4_, ForgeDirection.UP, (IPlantable)block))
-                 {
-                     return true;
-                 }

patches/minecraft/net/minecraft/block/BlockFire.java.patch

@@ -1,309 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFire.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFire.java
-@@ -2,7 +2,10 @@
- 
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
-+import java.util.IdentityHashMap;
-+import java.util.Map.Entry;
- import java.util.Random;
-+import com.google.common.collect.Maps;
- import net.minecraft.block.material.MapColor;
- import net.minecraft.block.material.Material;
- import net.minecraft.client.renderer.texture.IIconRegister;
-@@ -12,11 +15,15 @@
- import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
- import net.minecraft.world.WorldProviderEnd;
-+import net.minecraftforge.common.util.ForgeDirection;
-+import static net.minecraftforge.common.util.ForgeDirection.*;
- 
- public class BlockFire extends Block
- {
--    private int[] field_149849_a = new int[256];
--    private int[] field_149848_b = new int[256];
-+    @Deprecated
-+    private int[] field_149849_a = new int[4096];
-+    @Deprecated
-+    private int[] field_149848_b = new int[4096];
-     @SideOnly(Side.CLIENT)
-     private IIcon[] field_149850_M;
-     private static final String __OBFID = "CL_00000245";
-@@ -54,10 +61,10 @@
-         Blocks.field_150480_ab.func_149842_a(func_149682_b(Blocks.field_150404_cg), 60, 20);
-     }
- 
-+    @Deprecated // Use setFireInfo
-     public void func_149842_a(int p_149842_1_, int p_149842_2_, int p_149842_3_)
-     {
--        this.field_149849_a[p_149842_1_] = p_149842_2_;
--        this.field_149848_b[p_149842_1_] = p_149842_3_;
-+        this.setFireInfo((Block)Block.field_149771_c.func_148754_a(p_149842_1_), p_149842_2_, p_149842_3_);
-     }
- 
-     public AxisAlignedBB func_149668_a(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_)
-@@ -94,13 +101,8 @@
-     {
-         if (p_149674_1_.func_82736_K().func_82766_b("doFireTick"))
-         {
--            boolean flag = p_149674_1_.func_147439_a(p_149674_2_, p_149674_3_ - 1, p_149674_4_) == Blocks.field_150424_aL;
-+            boolean flag = p_149674_1_.func_147439_a(p_149674_2_, p_149674_3_ - 1, p_149674_4_).isFireSource(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_, UP);
- 
--            if (p_149674_1_.field_73011_w instanceof WorldProviderEnd && p_149674_1_.func_147439_a(p_149674_2_, p_149674_3_ - 1, p_149674_4_) == Blocks.field_150357_h)
--            {
--                flag = true;
--            }
--
-             if (!this.func_149742_c(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_))
-             {
-                 p_149674_1_.func_147468_f(p_149674_2_, p_149674_3_, p_149674_4_);
-@@ -128,7 +130,7 @@
-                         p_149674_1_.func_147468_f(p_149674_2_, p_149674_3_, p_149674_4_);
-                     }
-                 }
--                else if (!flag && !this.func_149844_e(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_) && l == 15 && p_149674_5_.nextInt(4) == 0)
-+                else if (!flag && !this.canCatchFire(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_, UP) && l == 15 && p_149674_5_.nextInt(4) == 0)
-                 {
-                     p_149674_1_.func_147468_f(p_149674_2_, p_149674_3_, p_149674_4_);
-                 }
-@@ -142,12 +144,12 @@
-                         b0 = -50;
-                     }
- 
--                    this.func_149841_a(p_149674_1_, p_149674_2_ + 1, p_149674_3_, p_149674_4_, 300 + b0, p_149674_5_, l);
--                    this.func_149841_a(p_149674_1_, p_149674_2_ - 1, p_149674_3_, p_149674_4_, 300 + b0, p_149674_5_, l);
--                    this.func_149841_a(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_, 250 + b0, p_149674_5_, l);
--                    this.func_149841_a(p_149674_1_, p_149674_2_, p_149674_3_ + 1, p_149674_4_, 250 + b0, p_149674_5_, l);
--                    this.func_149841_a(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_ - 1, 300 + b0, p_149674_5_, l);
--                    this.func_149841_a(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_ + 1, 300 + b0, p_149674_5_, l);
-+                    this.tryCatchFire(p_149674_1_, p_149674_2_ + 1, p_149674_3_, p_149674_4_, 300 + b0, p_149674_5_, l, WEST );
-+                    this.tryCatchFire(p_149674_1_, p_149674_2_ - 1, p_149674_3_, p_149674_4_, 300 + b0, p_149674_5_, l, EAST );
-+                    this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_, 250 + b0, p_149674_5_, l, UP   );
-+                    this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_ + 1, p_149674_4_, 250 + b0, p_149674_5_, l, DOWN );
-+                    this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_ - 1, 300 + b0, p_149674_5_, l, SOUTH);
-+                    this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_ + 1, 300 + b0, p_149674_5_, l, NORTH);
- 
-                     for (int i1 = p_149674_2_ - 1; i1 <= p_149674_2_ + 1; ++i1)
-                     {
-@@ -201,10 +203,16 @@
-         return false;
-     }
- 
-+    @Deprecated
-     private void func_149841_a(World p_149841_1_, int p_149841_2_, int p_149841_3_, int p_149841_4_, int p_149841_5_, Random p_149841_6_, int p_149841_7_)
-     {
--        int j1 = this.field_149848_b[Block.func_149682_b(p_149841_1_.func_147439_a(p_149841_2_, p_149841_3_, p_149841_4_))];
-+        this.tryCatchFire(p_149841_1_, p_149841_2_, p_149841_3_, p_149841_4_, p_149841_5_, p_149841_6_, p_149841_7_, UP);
-+    }
- 
-+    private void tryCatchFire(World p_149841_1_, int p_149841_2_, int p_149841_3_, int p_149841_4_, int p_149841_5_, Random p_149841_6_, int p_149841_7_, ForgeDirection face)
-+    {
-+        int j1 = p_149841_1_.func_147439_a(p_149841_2_, p_149841_3_, p_149841_4_).getFlammability(p_149841_1_, p_149841_2_, p_149841_3_, p_149841_4_, face);
-+
-         if (p_149841_6_.nextInt(p_149841_5_) < j1)
-         {
-             boolean flag = p_149841_1_.func_147439_a(p_149841_2_, p_149841_3_, p_149841_4_) == Blocks.field_150335_W;
-@@ -234,7 +242,12 @@
- 
-     private boolean func_149847_e(World p_149847_1_, int p_149847_2_, int p_149847_3_, int p_149847_4_)
-     {
--        return this.func_149844_e(p_149847_1_, p_149847_2_ + 1, p_149847_3_, p_149847_4_) ? true : (this.func_149844_e(p_149847_1_, p_149847_2_ - 1, p_149847_3_, p_149847_4_) ? true : (this.func_149844_e(p_149847_1_, p_149847_2_, p_149847_3_ - 1, p_149847_4_) ? true : (this.func_149844_e(p_149847_1_, p_149847_2_, p_149847_3_ + 1, p_149847_4_) ? true : (this.func_149844_e(p_149847_1_, p_149847_2_, p_149847_3_, p_149847_4_ - 1) ? true : this.func_149844_e(p_149847_1_, p_149847_2_, p_149847_3_, p_149847_4_ + 1)))));
-+        return this.canCatchFire(p_149847_1_, p_149847_2_ + 1, p_149847_3_, p_149847_4_, WEST ) ||
-+               this.canCatchFire(p_149847_1_, p_149847_2_ - 1, p_149847_3_, p_149847_4_, EAST ) ||
-+               this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_ - 1, p_149847_4_, UP   ) ||
-+               this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_ + 1, p_149847_4_, DOWN ) ||
-+               this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_, p_149847_4_ - 1, SOUTH) ||
-+               this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_, p_149847_4_ + 1, NORTH);
-     }
- 
-     private int func_149845_m(World p_149845_1_, int p_149845_2_, int p_149845_3_, int p_149845_4_)
-@@ -247,12 +260,13 @@
-         }
-         else
-         {
--            int l = this.func_149846_a(p_149845_1_, p_149845_2_ + 1, p_149845_3_, p_149845_4_, b0);
--            l = this.func_149846_a(p_149845_1_, p_149845_2_ - 1, p_149845_3_, p_149845_4_, l);
--            l = this.func_149846_a(p_149845_1_, p_149845_2_, p_149845_3_ - 1, p_149845_4_, l);
--            l = this.func_149846_a(p_149845_1_, p_149845_2_, p_149845_3_ + 1, p_149845_4_, l);
--            l = this.func_149846_a(p_149845_1_, p_149845_2_, p_149845_3_, p_149845_4_ - 1, l);
--            l = this.func_149846_a(p_149845_1_, p_149845_2_, p_149845_3_, p_149845_4_ + 1, l);
-+            int l = b0;
-+            l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_ + 1, p_149845_3_, p_149845_4_, l, WEST );
-+            l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_ - 1, p_149845_3_, p_149845_4_, l, EAST );
-+            l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_ - 1, p_149845_4_, l, UP   );
-+            l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_ + 1, p_149845_4_, l, DOWN );
-+            l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_, p_149845_4_ - 1, l, SOUTH);
-+            l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_, p_149845_4_ + 1, l, NORTH);
-             return l;
-         }
-     }
-@@ -262,15 +276,16 @@
-         return false;
-     }
- 
-+    @Deprecated
-     public boolean func_149844_e(IBlockAccess p_149844_1_, int p_149844_2_, int p_149844_3_, int p_149844_4_)
-     {
--        return this.field_149849_a[Block.func_149682_b(p_149844_1_.func_147439_a(p_149844_2_, p_149844_3_, p_149844_4_))] > 0;
-+        return canCatchFire(p_149844_1_, p_149844_2_, p_149844_3_, p_149844_4_, UP);
-     }
- 
-+    @Deprecated
-     public int func_149846_a(World p_149846_1_, int p_149846_2_, int p_149846_3_, int p_149846_4_, int p_149846_5_)
-     {
--        int i1 = this.field_149849_a[Block.func_149682_b(p_149846_1_.func_147439_a(p_149846_2_, p_149846_3_, p_149846_4_))];
--        return i1 > p_149846_5_ ? i1 : p_149846_5_;
-+        return getChanceToEncourageFire(p_149846_1_, p_149846_2_, p_149846_3_, p_149846_4_, p_149846_5_, UP);
-     }
- 
-     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
-@@ -314,9 +329,9 @@
-         float f1;
-         float f2;
- 
--        if (!World.func_147466_a(p_149734_1_, p_149734_2_, p_149734_3_ - 1, p_149734_4_) && !Blocks.field_150480_ab.func_149844_e(p_149734_1_, p_149734_2_, p_149734_3_ - 1, p_149734_4_))
-+        if (!World.func_147466_a(p_149734_1_, p_149734_2_, p_149734_3_ - 1, p_149734_4_) && !Blocks.field_150480_ab.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_ - 1, p_149734_4_, UP))
-         {
--            if (Blocks.field_150480_ab.func_149844_e(p_149734_1_, p_149734_2_ - 1, p_149734_3_, p_149734_4_))
-+            if (Blocks.field_150480_ab.canCatchFire(p_149734_1_, p_149734_2_ - 1, p_149734_3_, p_149734_4_, EAST))
-             {
-                 for (l = 0; l < 2; ++l)
-                 {
-@@ -327,7 +342,7 @@
-                 }
-             }
- 
--            if (Blocks.field_150480_ab.func_149844_e(p_149734_1_, p_149734_2_ + 1, p_149734_3_, p_149734_4_))
-+            if (Blocks.field_150480_ab.canCatchFire(p_149734_1_, p_149734_2_ + 1, p_149734_3_, p_149734_4_, WEST))
-             {
-                 for (l = 0; l < 2; ++l)
-                 {
-@@ -338,7 +353,7 @@
-                 }
-             }
- 
--            if (Blocks.field_150480_ab.func_149844_e(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_ - 1))
-+            if (Blocks.field_150480_ab.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_ - 1, SOUTH))
-             {
-                 for (l = 0; l < 2; ++l)
-                 {
-@@ -349,7 +364,7 @@
-                 }
-             }
- 
--            if (Blocks.field_150480_ab.func_149844_e(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_ + 1))
-+            if (Blocks.field_150480_ab.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_ + 1, NORTH))
-             {
-                 for (l = 0; l < 2; ++l)
-                 {
-@@ -360,7 +375,7 @@
-                 }
-             }
- 
--            if (Blocks.field_150480_ab.func_149844_e(p_149734_1_, p_149734_2_, p_149734_3_ + 1, p_149734_4_))
-+            if (Blocks.field_150480_ab.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_ + 1, p_149734_4_, DOWN))
-             {
-                 for (l = 0; l < 2; ++l)
-                 {
-@@ -405,4 +420,101 @@
-     {
-         return MapColor.field_151656_f;
-     }
-+
-+    /*================================= Forge Start ======================================*/
-+    private static class FireInfo
-+    {
-+        private int encouragement = 0;
-+        private int flammibility = 0;
-+    }
-+    private IdentityHashMap<Block, FireInfo> blockInfo = Maps.newIdentityHashMap();
-+
-+    public void setFireInfo(Block block, int encouragement, int flammibility)
-+    {
-+        if (block == Blocks.field_150350_a) throw new IllegalArgumentException("Tried to set air on fire... This is bad.");
-+        int id = Block.func_149682_b(block);
-+        this.field_149849_a[id] = encouragement;
-+        this.field_149848_b[id] = flammibility;
-+
-+        FireInfo info = getInfo(block, true);
-+        info.encouragement = encouragement;
-+        info.flammibility = flammibility;
-+    }
-+
-+    private FireInfo getInfo(Block block, boolean garentee)
-+    {
-+        FireInfo ret = blockInfo.get(block);
-+        if (ret == null && garentee)
-+        {
-+            ret = new FireInfo();
-+            blockInfo.put(block, ret);
-+        }
-+        return ret;
-+    }
-+
-+    public void rebuildFireInfo()
-+    {
-+        for (int x = 0; x < 4096; x++)
-+        {
-+            //If we care.. we could detect changes in here and make sure we keep them, however 
-+            //it's my thinking that anyone who hacks into the private variables should DIAF and we don't care about them.
-+            field_149849_a[x] = 0;
-+            field_149848_b[x] = 0;
-+        }
-+
-+        for (Entry<Block, FireInfo> e : blockInfo.entrySet())
-+        {
-+            int id = Block.func_149682_b(e.getKey());
-+            if (id >= 0 && id < 4096)
-+            {
-+                field_149849_a[id] = e.getValue().encouragement;
-+                field_149848_b[id] = e.getValue().flammibility;
-+            }
-+        }
-+    }
-+
-+    public int getFlammability(Block block)
-+    {
-+        int id = Block.func_149682_b(block);
-+        return id >= 0 && id < 4096 ? field_149848_b[id] : 0;
-+    }
-+
-+    public int getEncouragement(Block block)
-+    {
-+        int id = Block.func_149682_b(block);
-+        return id >= 0 && id < 4096 ? field_149849_a[id] : 0;
-+    }
-+
-+    /**
-+     * Side sensitive version that calls the block function.
-+     * 
-+     * @param world The current world
-+     * @param x X Position
-+     * @param y Y Position
-+     * @param z Z Position
-+     * @param face The side the fire is coming from
-+     * @return True if the face can catch fire.
-+     */
-+    public boolean canCatchFire(IBlockAccess world, int x, int y, int z, ForgeDirection face)
-+    {
-+        return world.func_147439_a(x, y, z).isFlammable(world, x, y, z, face);
-+    }
-+
-+    /**
-+     * Side sensitive version that calls the block function.
-+     * 
-+     * @param world The current world
-+     * @param x X Position
-+     * @param y Y Position
-+     * @param z Z Position
-+     * @param oldChance The previous maximum chance.
-+     * @param face The side the fire is coming from
-+     * @return The chance of the block catching fire, or oldChance if it is higher
-+     */
-+    public int getChanceToEncourageFire(IBlockAccess world, int x, int y, int z, int oldChance, ForgeDirection face)
-+    {
-+        int newChance = world.func_147439_a(x, y, z).getFireSpreadSpeed(world, x, y, z, face);
-+        return (newChance > oldChance ? newChance : oldChance);
-+    }
-+    /*================================= Forge Start ======================================*/
- }

patches/minecraft/net/minecraft/block/BlockFlowerPot.java.patch

@@ -1,38 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFlowerPot.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFlowerPot.java
-@@ -2,6 +2,7 @@
- 
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
-+import java.util.ArrayList;
- import java.util.Random;
- import net.minecraft.block.material.Material;
- import net.minecraft.entity.player.EntityPlayer;
-@@ -139,12 +140,6 @@
-     public void func_149690_a(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_)
-     {
-         super.func_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, p_149690_7_);
--        TileEntityFlowerPot tileentityflowerpot = this.func_149929_e(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_);
--
--        if (tileentityflowerpot != null && tileentityflowerpot.func_145965_a() != null)
--        {
--            this.func_149642_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, new ItemStack(tileentityflowerpot.func_145965_a(), 1, tileentityflowerpot.func_145966_b()));
--        }
-     }
- 
-     public void func_149749_a(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_)
-@@ -242,4 +237,14 @@
- 
-         return new TileEntityFlowerPot(Item.func_150898_a((Block)object), b0);
-     }
-+
-+    @Override
-+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
-+    {
-+        ArrayList<ItemStack> ret = super.getDrops(world, x, y, z, metadata, fortune);
-+        TileEntityFlowerPot te = this.func_149929_e(world, x, y, z);
-+        if (te != null && te.func_145965_a() != null)
-+            ret.add(new ItemStack(te.func_145965_a(), 1, te.func_145966_b()));
-+        return ret;
-+    }
- }

patches/minecraft/net/minecraft/block/BlockGrass.java.patch

@@ -1,37 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockGrass.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockGrass.java
-@@ -43,7 +43,7 @@
-     {
-         if (!p_149674_1_.field_72995_K)
-         {
--            if (p_149674_1_.func_72957_l(p_149674_2_, p_149674_3_ + 1, p_149674_4_) < 4 && p_149674_1_.func_147439_a(p_149674_2_, p_149674_3_ + 1, p_149674_4_).func_149717_k() > 2)
-+            if (p_149674_1_.func_72957_l(p_149674_2_, p_149674_3_ + 1, p_149674_4_) < 4 && p_149674_1_.getBlockLightOpacity(p_149674_2_, p_149674_3_ + 1, p_149674_4_) > 2)
-             {
-                 p_149674_1_.func_147449_b(p_149674_2_, p_149674_3_, p_149674_4_, Blocks.field_150346_d);
-             }
-@@ -56,7 +56,7 @@
-                     int k1 = p_149674_4_ + p_149674_5_.nextInt(3) - 1;
-                     Block block = p_149674_1_.func_147439_a(i1, j1 + 1, k1);
- 
--                    if (p_149674_1_.func_147439_a(i1, j1, k1) == Blocks.field_150346_d && p_149674_1_.func_72805_g(i1, j1, k1) == 0 && p_149674_1_.func_72957_l(i1, j1 + 1, k1) >= 4 && block.func_149717_k() <= 2)
-+                    if (p_149674_1_.func_147439_a(i1, j1, k1) == Blocks.field_150346_d && p_149674_1_.func_72805_g(i1, j1, k1) == 0 && p_149674_1_.func_72957_l(i1, j1 + 1, k1) >= 4 && p_149674_1_.getBlockLightOpacity(i1, j1 + 1, k1) <= 2)
-                     {
-                         p_149674_1_.func_147449_b(i1, j1, k1, Blocks.field_150349_c);
-                     }
-@@ -184,15 +184,7 @@
-                     }
-                     else
-                     {
--                        String s = p_149853_1_.func_72807_a(i1, k1).func_150572_a(p_149853_2_, i1, j1, k1);
--                        field_149992_a.debug("Flower in " + p_149853_1_.func_72807_a(i1, k1).field_76791_y + ": " + s);
--                        BlockFlower blockflower = BlockFlower.func_149857_e(s);
--
--                        if (blockflower != null && blockflower.func_149718_j(p_149853_1_, i1, j1, k1))
--                        {
--                            int i2 = BlockFlower.func_149856_f(s);
--                            p_149853_1_.func_147465_d(i1, j1, k1, blockflower, i2, 3);
--                        }
-+                        p_149853_1_.func_72807_a(i1, k1).plantFlower(p_149853_1_, p_149853_2_, i1, j1, k1);
-                     }
-                 }
-