Removed leftover debug messages

Fixes issue #1552 Where the flowIntoBlock method was not setting the Block to the fluid and causing crashes

.gitattributes

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

.gitignore

@@ -1,9 +1,27 @@
-*.DS_Store
-/logs/
-/*.pyc
-/forge-*/
-/patches-old/
-/mcp/
+#eclipse
+/bin
+/.settings
+/.classpath
+
+#idea
+/.idea
+*.iml
+
+#gradle
+/build
+/.gradle
+
+#occupational hazards
 /eclipse/
-/target/
-/temp/
+/repo/
+/buildSrc
+
+#Patch rejects
+*.rej
+/patches-/
+# FML changelog
+changelog.txt
+/patches_old/
+/patches_old_bak/
+*.py
+*.7z

CONTRIBUTING.md

@@ -0,0 +1,10 @@
+Contributing to Forge
+=====================
+
+1) Keep patches to Minecraft classes minimal. If you need a lot of things done, you may either add to relevant forge classes or make a new class.
+
+2) An example mod must be provided for all PRs adding events/hooks to Forge. Whether it's a full mod using your proposed hooks, or just a pastebin containing a simple example, an example mod is required. Please also explain in detail what your new hook does.
+
+3) Follow Forge coding guidelines (braces on newlines, spaces instead of tabs, etc)
+
+For more information, refer to [the wiki](https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge)

MinecraftForge-License.txt

@@ -24,9 +24,9 @@ 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
+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
 --------------

README.txt

@@ -0,0 +1,36 @@
+*** 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.
+
+To get the decompiled classes:
+If you have Gradle: gradle setupDecompWorkspace
+If you DO NOT have Gradle installed:
+Windows: ./gradlew.bat setupDecompWorkspace
+MacOS/Linux: ./gradlew setupDecompWorkspace
+
+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/ .
+ 

apply_patches.py

@@ -1,95 +0,0 @@
-import os
-import sys
-import fnmatch
-import shlex
-import difflib
-import time, subprocess
-from optparse import OptionParser
-
-def cmdsplit(args):
-    if os.sep == '\\':
-        args = args.replace('\\', '\\\\')
-    return shlex.split(args)
-    
-def main():
-    print("Applying patches")
-    
-    parser = OptionParser()
-    parser.add_option('-m', '--mcp-dir', action='store', dest='mcp_dir', help='Path to MCP', default=None)
-    parser.add_option('-p', '--patch-dir', action='store', dest='patch_dir', help='Patches Directory', default=None)
-    parser.add_option('-t', '--target-dir', action='store', dest='target_dir', help='Target Directory', default=None)
-    options, _ = parser.parse_args()
-        
-    if options.mcp_dir is None:
-        print 'Must supply MCP directory with --mcp-dir'
-        return
-    elif options.patch_dir is None:
-        print 'Must supply patches directory with --patch-dir'
-        return
-    elif options.target_dir is None:
-        print 'Must supplt target directory with --target-dir'
-        return
-        
-    print "Applying patches from '%s' to '%s'" % (options.patch_dir, options.target_dir)
-    apply_patches(options.mcp_dir, options.patch_dir, options.target_dir)
-        
-def apply_patches(mcp_dir, patch_dir, target_dir, find=None, rep=None):
-    # Attempts to apply a directory full of patch files onto a target directory.
-    sys.path.append(mcp_dir)
-    
-    temp = os.path.abspath('temp.patch')
-    cmd = cmdsplit('patch -p2 -i "%s" ' % temp)
-    
-    if os.name == 'nt':
-        applydiff = os.path.abspath(os.path.join(mcp_dir, 'runtime', 'bin', 'applydiff.exe'))
-        cmd = cmdsplit('"%s" -uf -p2 -i "%s"' % (applydiff, temp))
-    
-    for path, _, filelist in os.walk(patch_dir, followlinks=True):
-        for cur_file in fnmatch.filter(filelist, '*.patch'):
-            patch_file = os.path.normpath(os.path.join(patch_dir, path[len(patch_dir)+1:], cur_file))
-            target_file = os.path.join(target_dir, fix_patch(patch_file, temp, find, rep))
-            process = subprocess.Popen(cmd, cwd=target_dir, bufsize=-1)
-            process.communicate()
-
-    if os.path.isfile(temp):
-        os.remove(temp)  
-
-def fix_patch(in_file, out_file, find=None, rep=None):
-    #Fixes the following issues in the patch file if they exist:
-    #  Normalizes the path seperators for the current OS
-    #  Normalizes the line endings
-    # Returns the path that the file wants to apply to
-    
-    in_file = os.path.normpath(in_file)
-    if out_file is None:
-        tmp_file = in_file + '.tmp'
-    else:
-        out_file = os.path.normpath(out_file)
-        tmp_file = out_file
-        dir_name = os.path.dirname(out_file)
-        if dir_name:
-            if not os.path.exists(dir_name):
-                os.makedirs(dir_name)
-                
-    file = 'not found'
-    with open(in_file, 'rb') as inpatch:
-        with open(tmp_file, 'wb') as outpatch:
-            for line in inpatch:
-                line = line.rstrip('\r\n')
-                if line[:3] in ['+++', '---', 'Onl', 'dif']:
-                    if not find == None and not rep == None:
-                        line = line.replace('\\', '/').replace(find, rep).replace('/', os.sep)
-                    else:
-                        line = line.replace('\\', '/').replace('/', os.sep)
-                    outpatch.write(line + os.linesep)
-                else:
-                    outpatch.write(line + os.linesep)
-                if line[:3] == '---':
-                    file = line[line.find(os.sep, line.find(os.sep)+1)+1:]
-                    
-    if out_file is None:
-        shutil.move(tmp_file, in_file)
-    return file
-    
-if __name__ == '__main__':
-    main()

build.gradle

@@ -0,0 +1,128 @@
+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.8'
+    mcpVersion = '9.10'
+    mappings = 'snapshot_nodoc_20141130'
+    fmlDir = projectDir.getAbsolutePath() + "/fml";
+    mainClass = 'net.minecraftforge.fml.relauncher.ServerLaunchWrapper'
+    tweakClass = 'net.minecraftforge.fml.common.launcher.FMLTweaker'
+    installerVersion = "1.4"
+}
+
+group = 'net.minecraftforge'
+version = getVersionFromJava(getProject(), 'src/main/java/net/minecraftforge/common/ForgeVersion.java')
+
+jenkins {
+    job = 'minecraftforge'
+}
+
+// crowdin stuff
+if (project.hasProperty("crowdinKey"))
+    tasks.getLocalizations.apiKey = project.crowdinKey
+
+
+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.py

@@ -1,34 +0,0 @@
-import os, os.path, sys
-from optparse import OptionParser
-
-forge_dir = os.path.dirname(os.path.abspath(__file__))
-mcp_dir = os.path.abspath('..')
-
-from forge import build_forge_dev
-
-def main():
-    
-    parser = OptionParser()
-    parser.add_option('-m', '--mcp-dir', action='store', dest='mcp_dir', help='MCP Path', default=None)
-    parser.add_option('-b', '--build', action='store', dest='build', help='Build number', default=None)
-    options, _ = parser.parse_args()
-    
-    build_num = 0
-    if not options.build is None:
-        try:
-            build_num = int(options.build)
-        except:
-            pass
-    
-    fml_dir = os.path.join(forge_dir, 'fml')
-    mcp_dir = os.path.join(forge_dir, 'mcp')
-
-    if not options.mcp_dir is None:
-        mcp_dir = os.path.abspath(options.mcp_dir)
-    elif os.path.isfile(os.path.join('..', 'runtime', 'commands.py')):
-        mcp_dir = os.path.abspath('..')
-        
-    sys.exit(build_forge_dev(mcp_dir, forge_dir, fml_dir, build_num))
-    
-if __name__ == '__main__':
-    main()

changelog.py

@@ -1,113 +0,0 @@
-import os, os.path, sys, re
-import json, urllib2
-from pprint import pprint
-from urlparse import urlparse
-import base64
-import optparse, ast
-
-class PreemptiveBasicAuthHandler(urllib2.BaseHandler):
-	def __init__(self, password_mgr=None):
-		if password_mgr is None:
-			password_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
-		self.passwd = password_mgr
-		self.add_password = self.passwd.add_password
-
-	def http_request(self,req):
-		uri = req.get_full_url()
-		user, pw = self.passwd.find_user_password(None,uri)
-		if pw is None: return req
-		raw = "%s:%s" % (user, pw)
-		auth = 'Basic %s' % base64.b64encode(raw).strip()
-		req.add_unredirected_header('Authorization', auth)
-		return req
-
-	def https_request(self,req):
-		return self.http_request(req)
-
-def read_url(url):
-	handler = PreemptiveBasicAuthHandler()
-	handler.add_password(None, 'ci.jenkins.minecraftforge.net', 'console_script', 'dc6d48ca20a474beeac280a9a16a926e')
-	file = urllib2.build_opener(handler).open(url)
-	data = file.read()
-	file.close()
-	return data
-
-def getBuildInfo(url, current_version=None):
-	data = read_url(url)
-	data = ast.literal_eval(data)['allBuilds']
-	data = sorted(data, key=lambda key: key['number'], reverse=False)
-	
-	items = []
-	output = []
-	
-	for build in data:
-		build['actions'] = filter(lambda act: act is not None, build['actions'])
-		build['actions'] = filter(lambda act: 'text' in act, build['actions'])
-		build['actions'] = filter(lambda act: not ' ' in act['text'], build['actions'])
-		if len(build['actions']) == 0:
-			build['version'] = current_version
-			current_version = None
-		else:
-			build['version'] = build['actions'][0]['text']
-		build['items'] = build['changeSet']['items']
-		for item in build['items']:
-			item['author'] = item['author']['fullName']
-		if build['result'] != 'SUCCESS':
-			items += build['items']
-		else:
-			build['items'] = items + build['items']
-			items = []
-			output += [build]
-		build.pop('changeSet')
-		build.pop('actions')
-	return sorted(output, key=lambda key: key['number'], reverse=True)
-    
-def add_latest_build(url, builds, current_version=None):
-    data = read_url(url)
-    data = ast.literal_eval(data)
-    number = data['number']
-    
-    if builds[0]['number'] == data['number']:
-        return builds
-    
-    for item in data['changeSet']['items']:
-        item['author'] = item['author']['fullName']
-    
-    build = {
-        'number' : data['number'],
-        'result' : 'SUCCESS', #Currently build should always be success... Else things derp after words
-        'version' : current_version,
-        'items' : data['changeSet']['items']
-    }
-    return [build] + builds    
-	
-def make_changelog(job_path, target_build, change_file, current_version=None):
-	builds = getBuildInfo('%s/api/python?tree=allBuilds[result,number,actions[text],changeSet[items[author[fullName],comment]]]&pretty=true' % job_path, current_version)
-	builds = add_latest_build('%s/lastBuild/api/python?pretty=true&tree=number,changeSet[items[author[fullName],comment]]' % job_path, builds, current_version)
-	
-	log = [ "Changelog:" ]
-	
-	for build in builds:
-		if int(build['number']) > target_build: continue
-		if len(build['items']) == 0: continue
-		log.append('')
-		if build['version'] is None:
-			log.append('Build %s' % build['number'])
-		else:
-			log.append('Build %s' % build['version'])
-		for change in build['items']:
-			comments = filter(lambda cmt: len(cmt) > 0, change['comment'].split('\n'))
-			if len(comments) > 1:
-				log.append('\t' + change['author'])
-				for comment in comments:
-					log.append('\t\t' + comment)
-			elif len(comments) == 1:
-				log.append('\t%s: %s' % (change['author'], comments[0]))
-				
-	file = open(change_file, 'wb')
-	for line in log:
-		file.write('%s\n' % line)
-	file.close()
-	
-if __name__ == '__main__':
-	make_changelog("http://ci.jenkins.minecraftforge.net/job/minecraftforge/", 70000, 'changelog.txt', 'pinecone')

client/net/minecraftforge/client/EnumHelperClient.java

@@ -1,44 +0,0 @@
-package net.minecraftforge.client;
-
-import net.minecraft.world.EnumGameType;
-import net.minecraft.util.EnumOS;
-import net.minecraft.client.settings.EnumOptions;
-import net.minecraft.item.EnumRarity;
-import net.minecraftforge.common.EnumHelper;
-
-public class EnumHelperClient extends EnumHelper
-{
-
-    private static Class[][] clentTypes =
-    {
-        {EnumGameType.class, int.class, String.class},
-        {EnumOptions.class, String.class, boolean.class, boolean.class},
-        {EnumOS.class},
-        {EnumRarity.class, int.class, String.class}
-    };
-    
-    public static EnumGameType addGameType(String name, int id, String displayName)
-    {
-        return addEnum(EnumGameType.class, name, id, displayName);
-    }
-    
-    public static EnumOptions addOptions(String name, String langName, boolean isSlider, boolean isToggle)
-    {
-        return addEnum(EnumOptions.class, name, langName, isSlider, isToggle);
-    }
-    
-    public static EnumOS addOS2(String name)
-    {
-        return addEnum(EnumOS.class, name);
-    }
-    
-    public static EnumRarity addRarity(String name, int color, String displayName)
-    {
-        return addEnum(EnumRarity.class, name, color, displayName);
-    }
-
-    public static <T extends Enum<? >> T addEnum(Class<T> enumType, String enumName, Object... paramValues)
-    {
-        return addEnum(clentTypes, enumType, enumName, paramValues);
-    }
-}

client/net/minecraftforge/client/ForgeHooksClient.java

@@ -1,393 +0,0 @@
-package net.minecraftforge.client;
-
-import java.util.HashMap;
-import java.util.Random;
-import java.util.TreeSet;
-
-import javax.imageio.ImageIO;
-
-import net.minecraftforge.client.event.MouseEvent;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraftforge.client.event.FOVUpdateEvent;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.opengl.Display;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-import org.lwjgl.opengl.PixelFormat;
-
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockFluid;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.client.model.ModelBiped;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.RenderGlobal;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.entity.RenderItem;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraftforge.client.IItemRenderer.ItemRenderType;
-import net.minecraftforge.client.event.DrawBlockHighlightEvent;
-import net.minecraftforge.client.event.RenderWorldLastEvent;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.ForgeDummyContainer;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.RenderBlockFluid;
-import static net.minecraftforge.client.IItemRenderer.ItemRenderType.*;
-import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.*;
-
-public class ForgeHooksClient
-{
-    private static final ResourceLocation ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png");
-    
-    static TextureManager engine()
-    {
-        return FMLClientHandler.instance().getClient().renderEngine;
-    }
-
-    @Deprecated
-    public static String getArmorTexture(Entity entity, ItemStack armor, String _default, int slot, int layer, String type)
-    {
-        return getArmorTexture(entity, armor, _default, slot, type);
-    }
-
-    public static String getArmorTexture(Entity entity, ItemStack armor, String _default, int slot, String type)
-    {
-        String result = armor.getItem().getArmorTexture(armor, entity, slot, type);
-        return result != null ? result : _default;
-    }
-
-    public static boolean renderEntityItem(EntityItem entity, ItemStack item, float bobing, float rotation, Random random, TextureManager engine, RenderBlocks renderBlocks)
-    {
-        IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(item, ENTITY);
-        if (customRenderer == null)
-        {
-            return false;
-        }
-
-        if (customRenderer.shouldUseRenderHelper(ENTITY, item, ENTITY_ROTATION))
-        {
-            GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F);
-        }
-        if (!customRenderer.shouldUseRenderHelper(ENTITY, item, ENTITY_BOBBING))
-        {
-            GL11.glTranslatef(0.0F, -bobing, 0.0F);
-        }
-        boolean is3D = customRenderer.shouldUseRenderHelper(ENTITY, item, BLOCK_3D);
-
-        engine.bindTexture(item.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
-        Block block = (item.itemID < Block.blocksList.length ? Block.blocksList[item.itemID] : null);
-        if (is3D || (block != null && RenderBlocks.renderItemIn3d(block.getRenderType())))
-        {
-            int renderType = (block != null ? block.getRenderType() : 1);
-            float scale = (renderType == 1 || renderType == 19 || renderType == 12 || renderType == 2 ? 0.5F : 0.25F);
-
-            if (RenderItem.renderInFrame)
-            {
-                GL11.glScalef(1.25F, 1.25F, 1.25F);
-                GL11.glTranslatef(0.0F, 0.05F, 0.0F);
-                GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
-            }
-
-            GL11.glScalef(scale, scale, scale);
-
-            int size = item.stackSize;
-            int count = (size > 40 ? 5 : (size > 20 ? 4 : (size > 5 ? 3 : (size > 1 ? 2 : 1))));
-
-            for(int j = 0; j < count; j++)
-            {
-                GL11.glPushMatrix();
-                if (j > 0)
-                {
-                    GL11.glTranslatef(
-                        ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / scale,
-                        ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / scale,
-                        ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / scale);
-                }
-                customRenderer.renderItem(ENTITY, item, renderBlocks, entity);
-                GL11.glPopMatrix();
-            }
-        }
-        else
-        {
-            GL11.glScalef(0.5F, 0.5F, 0.5F);
-            customRenderer.renderItem(ENTITY, item, renderBlocks, entity);
-        }
-        return true;
-    }
-
-    public static boolean renderInventoryItem(RenderBlocks renderBlocks, TextureManager engine, ItemStack item, boolean inColor, float zLevel, float x, float y)
-    {
-        IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(item, INVENTORY);
-        if (customRenderer == null)
-        {
-            return false;
-        }
-
-        engine.bindTexture(item.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
-        if (customRenderer.shouldUseRenderHelper(INVENTORY, item, INVENTORY_BLOCK))
-        {
-            GL11.glPushMatrix();
-            GL11.glTranslatef(x - 2, y + 3, -3.0F + zLevel);
-            GL11.glScalef(10F, 10F, 10F);
-            GL11.glTranslatef(1.0F, 0.5F, 1.0F);
-            GL11.glScalef(1.0F, 1.0F, -1F);
-            GL11.glRotatef(210F, 1.0F, 0.0F, 0.0F);
-            GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F);
-
-            if(inColor)
-            {
-                int color = Item.itemsList[item.itemID].getColorFromItemStack(item, 0);
-                float r = (float)(color >> 16 & 0xff) / 255F;
-                float g = (float)(color >> 8 & 0xff) / 255F;
-                float b = (float)(color & 0xff) / 255F;
-                GL11.glColor4f(r, g, b, 1.0F);
-            }
-
-            GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F);
-            renderBlocks.useInventoryTint = inColor;
-            customRenderer.renderItem(INVENTORY, item, renderBlocks);
-            renderBlocks.useInventoryTint = true;
-            GL11.glPopMatrix();
-        }
-        else
-        {
-            GL11.glDisable(GL11.GL_LIGHTING);
-            GL11.glPushMatrix();
-            GL11.glTranslatef(x, y, -3.0F + zLevel);
-
-            if (inColor)
-            {
-                int color = Item.itemsList[item.itemID].getColorFromItemStack(item, 0);
-                float r = (float)(color >> 16 & 255) / 255.0F;
-                float g = (float)(color >> 8 & 255) / 255.0F;
-                float b = (float)(color & 255) / 255.0F;
-                GL11.glColor4f(r, g, b, 1.0F);
-            }
-
-            customRenderer.renderItem(INVENTORY, item, renderBlocks);
-            GL11.glPopMatrix();
-            GL11.glEnable(GL11.GL_LIGHTING);
-        }
-
-        return true;
-    }
-
-    public static void renderEffectOverlay(TextureManager manager, RenderItem render)
-    {
-    }
-
-    public static void renderEquippedItem(ItemRenderType type, IItemRenderer customRenderer, RenderBlocks renderBlocks, EntityLivingBase entity, ItemStack item)
-    {
-        if (customRenderer.shouldUseRenderHelper(type, item, EQUIPPED_BLOCK))
-        {
-            GL11.glPushMatrix();
-            GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
-            customRenderer.renderItem(type, item, renderBlocks, entity);
-            GL11.glPopMatrix();
-        }
-        else
-        {
-            GL11.glPushMatrix();
-            GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-            GL11.glTranslatef(0.0F, -0.3F, 0.0F);
-            GL11.glScalef(1.5F, 1.5F, 1.5F);
-            GL11.glRotatef(50.0F, 0.0F, 1.0F, 0.0F);
-            GL11.glRotatef(335.0F, 0.0F, 0.0F, 1.0F);
-            GL11.glTranslatef(-0.9375F, -0.0625F, 0.0F);
-            customRenderer.renderItem(type, item, renderBlocks, entity);
-            GL11.glDisable(GL12.GL_RESCALE_NORMAL);
-            GL11.glPopMatrix();
-        }
-    }
-
-    //Optifine Helper Functions u.u, these are here specifically for Optifine
-    //Note: When using Optfine, these methods are invoked using reflection, which
-    //incurs a major performance penalty.
-    public static void orientBedCamera(Minecraft mc, EntityLivingBase entity)
-    {
-        int x = MathHelper.floor_double(entity.posX);
-        int y = MathHelper.floor_double(entity.posY);
-        int z = MathHelper.floor_double(entity.posZ);
-        Block block = Block.blocksList[mc.theWorld.getBlockId(x, y, z)];
-
-        if (block != null && block.isBed(mc.theWorld, x, y, z, entity))
-        {
-            int var12 = block.getBedDirection(mc.theWorld, x, y, z);
-            GL11.glRotatef((float)(var12 * 90), 0.0F, 1.0F, 0.0F);
-        }
-    }
-
-    public static boolean onDrawBlockHighlight(RenderGlobal context, EntityPlayer player, MovingObjectPosition target, int subID, ItemStack currentItem, float partialTicks)
-    {
-        return MinecraftForge.EVENT_BUS.post(new DrawBlockHighlightEvent(context, player, target, subID, currentItem, partialTicks));
-    }
-
-    public static void dispatchRenderLast(RenderGlobal context, float partialTicks)
-    {
-        MinecraftForge.EVENT_BUS.post(new RenderWorldLastEvent(context, partialTicks));
-    }
-
-    public static void onTextureStitchedPre(TextureMap map)
-    {
-        MinecraftForge.EVENT_BUS.post(new TextureStitchEvent.Pre(map));
-    }
-
-    public static void onTextureStitchedPost(TextureMap map)
-    {
-        MinecraftForge.EVENT_BUS.post(new TextureStitchEvent.Post(map));
-
-        FluidRegistry.WATER.setIcons(BlockFluid.getFluidIcon("water_still"), BlockFluid.getFluidIcon("water_flow"));
-        FluidRegistry.LAVA.setIcons(BlockFluid.getFluidIcon("lava_still"), BlockFluid.getFluidIcon("lava_flow"));
-    }
-
-    /**
-     * This is added for Optifine's convenience. And to explode if a ModMaker is developing.
-     * @param texture
-     */
-    public static void onTextureLoadPre(String texture)
-    {
-        if (Tessellator.renderingWorldRenderer)
-        {
-            String msg = String.format("Warning: Texture %s not preloaded, will cause render glitches!", texture);
-            System.out.println(msg);
-            if (Tessellator.class.getPackage() != null)
-            {
-                if (Tessellator.class.getPackage().getName().startsWith("net.minecraft."))
-                {
-                    Minecraft mc = FMLClientHandler.instance().getClient();
-                    if (mc.ingameGUI != null)
-                    {
-                        mc.ingameGUI.getChatGUI().printChatMessage(msg);
-                    }
-                }
-            }
-        }
-    }
-
-    static int renderPass = -1;
-    public static void setRenderPass(int pass)
-    {
-        renderPass = pass;
-    }
-
-    public static ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int slotID, ModelBiped _default)
-    {
-        ModelBiped modelbiped = itemStack.getItem().getArmorModel(entityLiving, itemStack, slotID);
-        return modelbiped == null ? _default : modelbiped;
-    }
-
-    static int stencilBits = 0;
-    public static void createDisplay() throws LWJGLException
-    {
-        ImageIO.setUseCache(false); //Disable on-disc stream cache should speed up texture pack reloading.
-        PixelFormat format = new PixelFormat().withDepthBits(24);
-        try
-        {
-            //TODO: Figure out how to determine the max bits.
-            Display.create(format.withStencilBits(8));
-            stencilBits = 8;
-        }
-        catch(LWJGLException e)
-        {
-            Display.create(format);
-            stencilBits = 0;
-        }
-    }
-
-    //This properly moves the domain, if provided, to the front of the string before concatenating
-    public static String fixDomain(String base, String complex)
-    {
-        int idx = complex.indexOf(':');
-        if (idx == -1)
-        {
-            return base + complex;
-        }
-
-        String name = complex.substring(idx + 1, complex.length());
-        if (idx > 1)
-        {
-            String domain = complex.substring(0, idx);
-            return domain + ':' + base + name;
-        }
-        else
-        {
-            return base + name;
-        }
-    }
-
-    public static boolean postMouseEvent()
-    {
-        return MinecraftForge.EVENT_BUS.post(new MouseEvent());
-    }
-
-    public static float getOffsetFOV(EntityPlayerSP entity, float fov)
-    {
-        FOVUpdateEvent fovUpdateEvent = new FOVUpdateEvent(entity, fov);
-        MinecraftForge.EVENT_BUS.post(fovUpdateEvent);
-        return fovUpdateEvent.newfov;
-    }
-
-    private static int skyX, skyZ;
-
-    private static boolean skyInit;
-    private static int skyRGBMultiplier;
-    
-    public static int getSkyBlendColour(World world, int playerX, int playerZ)
-    {
-        if (playerX == skyX && playerZ == skyZ && skyInit)
-        {
-            return skyRGBMultiplier;
-        }
-        skyInit = true;
-        
-        int distance = Minecraft.getMinecraft().gameSettings.fancyGraphics ? ForgeDummyContainer.blendRanges[Minecraft.getMinecraft().gameSettings.renderDistance] : 0;
-        
-        int r = 0;
-        int g = 0;
-        int b = 0;
-
-        int divider = 0;
-        for (int x = -distance; x <= distance; ++x)
-        {
-            for (int z = -distance; z <= distance; ++z)
-            {
-                BiomeGenBase biome = world.getBiomeGenForCoords(playerX + x, playerZ + z);
-                int colour = biome.getSkyColorByTemp(biome.getFloatTemperature());
-                r += (colour & 0xFF0000) >> 16;
-                g += (colour & 0x00FF00) >> 8;
-                b += colour & 0x0000FF;
-                divider++;
-            }
-        }
-
-        int multiplier = (r / divider & 255) << 16 | (g / divider & 255) << 8 | b / divider & 255;
-
-        skyX = playerX;
-        skyZ = playerZ;
-        skyRGBMultiplier = multiplier;
-        return skyRGBMultiplier;
-    }
-    /**
-     * Initialization of Forge Renderers.
-     */
-    static
-    {
-        FluidRegistry.renderIdFluid = RenderingRegistry.getNextAvailableRenderId();
-        RenderingRegistry.registerBlockHandler(RenderBlockFluid.instance);
-    }
-}

client/net/minecraftforge/client/GuiControlsScrollPanel.java

@@ -1,128 +0,0 @@
-package net.minecraftforge.client;
-
-import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.GL11;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.settings.GameSettings;
-import net.minecraft.client.gui.GuiControls;
-import net.minecraft.client.gui.GuiSlot;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.ResourceLocation;
-
-public class GuiControlsScrollPanel extends GuiSlot
-{
-    protected static final ResourceLocation WIDGITS = new ResourceLocation("textures/gui/widgets.png");
-    private GuiControls controls;
-    private GameSettings options;
-    private Minecraft mc;
-    private String[] message;
-    private int _mouseX;
-    private int _mouseY;
-    private int selected = -1;
-
-    public GuiControlsScrollPanel(GuiControls controls, GameSettings options, Minecraft mc)
-    {
-        super(mc, controls.width, controls.height, 16, (controls.height - 32) + 4, 25);
-        this.controls = controls;
-        this.options = options;
-        this.mc = mc;
-    }
-
-    @Override
-    protected int getSize()
-    {
-        return options.keyBindings.length;
-    }
-
-    @Override
-    protected void elementClicked(int i, boolean flag)
-    {
-        if (!flag)
-        {
-            if (selected == -1)
-            {
-                selected = i;
-            }
-            else
-            {
-                options.setKeyBinding(selected, -100);
-                selected = -1;
-                KeyBinding.resetKeyBindingArrayAndHash();
-            }
-        }
-    }
-
-    @Override
-    protected boolean isSelected(int i)
-    {
-        return false;
-    }
-
-    @Override
-    protected void drawBackground() {}
-
-    @Override
-    public void drawScreen(int mX, int mY, float f)
-    {
-        _mouseX = mX;
-        _mouseY = mY;
-
-        if (selected != -1 && !Mouse.isButtonDown(0) && Mouse.getDWheel() == 0)
-        {
-            if (Mouse.next() && Mouse.getEventButtonState())
-            {
-                options.setKeyBinding(selected, -100 + Mouse.getEventButton());
-                selected = -1;
-                KeyBinding.resetKeyBindingArrayAndHash();
-            }
-        }
-
-        super.drawScreen(mX, mY, f);
-    }
-
-    @Override
-    protected void drawSlot(int index, int xPosition, int yPosition, int l, Tessellator tessellator)
-    {
-        int width = 70;
-        int height = 20;
-        xPosition -= 20;
-        boolean flag = _mouseX >= xPosition && _mouseY >= yPosition && _mouseX < xPosition + width && _mouseY < yPosition + height;
-        int k = (flag ? 2 : 1);
-
-        mc.renderEngine.bindTexture(WIDGITS);
-        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        controls.drawTexturedModalRect(xPosition, yPosition, 0, 46 + k * 20, width / 2, height);
-        controls.drawTexturedModalRect(xPosition + width / 2, yPosition, 200 - width / 2, 46 + k * 20, width / 2, height);
-        controls.drawString(mc.fontRenderer, options.getKeyBindingDescription(index), xPosition + width + 4, yPosition + 6, 0xFFFFFFFF);
-
-        boolean conflict = false;
-        for (int x = 0; x < options.keyBindings.length; x++)
-        {
-            if (x != index && options.keyBindings[x].keyCode == options.keyBindings[index].keyCode)
-            {
-                conflict = true;
-                break;
-            }
-        }
-
-        String str = (conflict ? EnumChatFormatting.RED : "") + options.getOptionDisplayString(index);
-        str = (index == selected ? EnumChatFormatting.WHITE + "> " + EnumChatFormatting.YELLOW + "??? " + EnumChatFormatting.WHITE + "<" : str);
-        controls.drawCenteredString(mc.fontRenderer, str, xPosition + (width / 2), yPosition + (height - 8) / 2, 0xFFFFFFFF);
-    }
-
-    public boolean keyTyped(char c, int i)
-    {
-        if (selected != -1)
-        {
-            options.setKeyBinding(selected, i);
-            selected = -1;
-            KeyBinding.resetKeyBindingArrayAndHash();
-            return false;
-        }
-        return true;
-    }
-}

client/net/minecraftforge/client/event/ClientChatReceivedEvent.java

@@ -1,14 +0,0 @@
-package net.minecraftforge.client.event;
-
-import net.minecraftforge.event.Cancelable;
-import net.minecraftforge.event.Event;
-
-@Cancelable
-public class ClientChatReceivedEvent extends Event
-{
-    public String message;
-    public ClientChatReceivedEvent(String message)
-    {
-        this.message = message;
-    }
-}

client/net/minecraftforge/client/event/sound/PlaySoundEvent.java

@@ -1,25 +0,0 @@
-package net.minecraftforge.client.event.sound;
-
-import net.minecraft.client.audio.SoundManager;
-import net.minecraft.client.audio.SoundPoolEntry;
-
-/***
- * Raised when the SoundManager tries to play a normal sound,
- * dogs barking, footsteps, etc. THe majority of all sounds during normal game play.
- * 
- * If you return null from this function it will prevent the sound from being played,
- * you can return a different entry if you want to change the sound being played.
- */
-public class PlaySoundEvent extends SoundResultEvent
-{
-    public final float x;
-    public final float y;
-    public final float z;
-    public PlaySoundEvent(SoundManager manager, SoundPoolEntry source, String name, float x, float y, float z, float volume, float pitch)
-    { 
-        super(manager, source, name, volume, pitch);
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-}

client/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java

@@ -1,20 +0,0 @@
-package net.minecraftforge.client.event.sound;
-
-import net.minecraft.client.audio.SoundManager;
-
-public class PlaySoundSourceEvent extends SoundEvent
-{
-    public final SoundManager manager;
-    public final String name;
-    public final float x;
-    public final float y;
-    public final float z;
-    public PlaySoundSourceEvent(SoundManager manager, String name, float x, float y, float z)
-    {
-        this.manager = manager;
-        this.name = name;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-}

client/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java

@@ -1,20 +0,0 @@
-package net.minecraftforge.client.event.sound;
-
-import net.minecraft.client.audio.SoundManager;
-
-public class PlayStreamingSourceEvent extends SoundEvent
-{
-    public final SoundManager manager;
-    public final String name;
-    public final float x;
-    public final float y;
-    public final float z;
-    public PlayStreamingSourceEvent(SoundManager manager, String name, float x, float y, float z)
-    {
-        this.manager = manager;
-        this.name = name;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-}

client/net/minecraftforge/client/event/sound/SoundEvent.java

@@ -1,19 +0,0 @@
-package net.minecraftforge.client.event.sound;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.client.audio.SoundManager;
-import net.minecraft.client.audio.SoundPoolEntry;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.Cancelable;
-import net.minecraftforge.event.Event;
-
-public class SoundEvent extends Event
-{
-    public SoundEvent(){}
-    
-    public static SoundPoolEntry getResult(SoundResultEvent event)
-    {
-        MinecraftForge.EVENT_BUS.post(event);
-        return event.result;
-    }
-}

client/net/minecraftforge/client/model/AdvancedModelLoader.java

@@ -1,84 +0,0 @@
-package net.minecraftforge.client.model;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Map;
-
-import net.minecraftforge.client.model.obj.ObjModelLoader;
-import net.minecraftforge.client.model.techne.TechneModelLoader;
-
-import com.google.common.collect.Maps;
-
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-/**
- * Common interface for advanced model loading from files, based on file suffix
- * Model support can be queried through the {@link #getSupportedSuffixes()} method.
- * Instances can be created by calling {@link #loadModel(String)} with a class-loadable-path
- *
- * @author cpw
- *
- */
-@SideOnly(Side.CLIENT)
-public class AdvancedModelLoader {
-    private static Map<String, IModelCustomLoader> instances = Maps.newHashMap();
-
-    /**
-     * Register a new model handler
-     * @param modelHandler The model handler to register
-     */
-    public static void registerModelHandler(IModelCustomLoader modelHandler)
-    {
-        for (String suffix : modelHandler.getSuffixes())
-        {
-            instances.put(suffix, modelHandler);
-        }
-    }
-
-    /**
-     * Load the model from the supplied classpath resolvable resource name
-     * @param resourceName The resource name
-     * @return A model
-     * @throws IllegalArgumentException if the resource name cannot be understood
-     * @throws ModelFormatException if the underlying model handler cannot parse the model format
-     */
-    public static IModelCustom loadModel(String resourceName) throws IllegalArgumentException, ModelFormatException
-    {
-        int i = resourceName.lastIndexOf('.');
-        if (i == -1)
-        {
-            FMLLog.severe("The resource name %s is not valid", resourceName);
-            throw new IllegalArgumentException("The resource name is not valid");
-        }
-        String suffix = resourceName.substring(i+1);
-        IModelCustomLoader loader = instances.get(suffix);
-        if (loader == null)
-        {
-            FMLLog.severe("The resource name %s is not supported", resourceName);
-            throw new IllegalArgumentException("The resource name is not supported");
-        }
-
-        URL resource = AdvancedModelLoader.class.getResource(resourceName);
-        if (resource == null)
-        {
-            FMLLog.severe("The resource name %s could not be found", resourceName);
-            throw new IllegalArgumentException("The resource name could not be found");
-        }
-        return loader.loadInstance(resourceName, resource);
-    }
-
-    public static Collection<String> getSupportedSuffixes()
-    {
-        return instances.keySet();
-    }
-
-
-    static
-    {
-        registerModelHandler(new ObjModelLoader());
-        registerModelHandler(new TechneModelLoader());
-    }
-}

client/net/minecraftforge/client/model/IModelCustom.java

@@ -1,11 +0,0 @@
-package net.minecraftforge.client.model;
-
-
-
-public interface IModelCustom {
-    String getType();
-    void renderAll();
-    void renderOnly(String... groupNames);
-    void renderPart(String partName);
-    void renderAllExcept(String... excludedGroupNames);
-}

client/net/minecraftforge/client/model/IModelCustomLoader.java

@@ -1,31 +0,0 @@
-package net.minecraftforge.client.model;
-
-import java.io.InputStream;
-import java.net.URL;
-
-/**
- * Instances of this class act as factories for their model type
- *
- * @author cpw
- *
- */
-public interface IModelCustomLoader {
-    /**
-     * Get the main type name for this loader
-     * @return the type name
-     */
-    String getType();
-    /**
-     * Get resource suffixes this model loader recognizes
-     * @return a list of suffixes
-     */
-    String[] getSuffixes();
-    /**
-     * Load a model instance from the supplied path
-     * @param resourceName The resource name to load
-     * @param resource The URL associated with the classloader resource
-     * @return A model instance
-     * @throws ModelFormatException if the model format is not correct
-     */
-    IModelCustom loadInstance(String resourceName, URL resource) throws ModelFormatException;
-}

client/net/minecraftforge/client/model/ModelFormatException.java

@@ -1,31 +0,0 @@
-package net.minecraftforge.client.model;
-
-/**
- * Thrown if there is a problem parsing the model
- *
- * @author cpw
- *
- */
-public class ModelFormatException extends RuntimeException {
-
-    public ModelFormatException()
-    {
-        super();
-    }
-
-    public ModelFormatException(String message, Throwable cause)
-    {
-        super(message, cause);
-    }
-
-    public ModelFormatException(String message)
-    {
-        super(message);
-    }
-
-    public ModelFormatException(Throwable cause)
-    {
-        super(cause);
-    }
-
-}

client/net/minecraftforge/client/model/obj/Face.java

@@ -1,84 +0,0 @@
-package net.minecraftforge.client.model.obj;
-
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.Vec3;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class Face
-{
-
-    public Vertex[] vertices;
-    public Vertex[] vertexNormals;
-    public Vertex faceNormal;
-    public TextureCoordinate[] textureCoordinates;
-
-    public void addFaceForRender(Tessellator tessellator)
-    {
-        addFaceForRender(tessellator, 0.0005F);
-    }
-
-    public void addFaceForRender(Tessellator tessellator, float textureOffset)
-    {
-        if (faceNormal == null)
-        {
-            faceNormal = this.calculateFaceNormal();
-        }
-
-        tessellator.setNormal(faceNormal.x, faceNormal.y, faceNormal.z);
-
-        float averageU = 0F;
-        float averageV = 0F;
-
-        if ((textureCoordinates != null) && (textureCoordinates.length > 0))
-        {
-            for (int i = 0; i < textureCoordinates.length; ++i)
-            {
-                averageU += textureCoordinates[i].u;
-                averageV += textureCoordinates[i].v;
-            }
-
-            averageU = averageU / textureCoordinates.length;
-            averageV = averageV / textureCoordinates.length;
-        }
-
-        float offsetU, offsetV;
-
-        for (int i = 0; i < vertices.length; ++i)
-        {
-
-            if ((textureCoordinates != null) && (textureCoordinates.length > 0))
-            {
-                offsetU = textureOffset;
-                offsetV = textureOffset;
-
-                if (textureCoordinates[i].u > averageU)
-                {
-                    offsetU = -offsetU;
-                }
-                if (textureCoordinates[i].v > averageV)
-                {
-                    offsetV = -offsetV;
-                }
-
-                tessellator.addVertexWithUV(vertices[i].x, vertices[i].y, vertices[i].z, textureCoordinates[i].u + offsetU, textureCoordinates[i].v + offsetV);
-            }
-            else
-            {
-                tessellator.addVertex(vertices[i].x, vertices[i].y, vertices[i].z);
-            }
-        }
-    }
-
-    public Vertex calculateFaceNormal()
-    {
-        Vec3 v1 = Vec3.createVectorHelper(vertices[1].x - vertices[0].x, vertices[1].y - vertices[0].y, vertices[1].z - vertices[0].z);
-        Vec3 v2 = Vec3.createVectorHelper(vertices[2].x - vertices[0].x, vertices[2].y - vertices[0].y, vertices[2].z - vertices[0].z);
-        Vec3 normalVector = null;
-
-        normalVector = v1.crossProduct(v2).normalize();
-
-        return new Vertex((float) normalVector.xCoord, (float) normalVector.yCoord, (float) normalVector.zCoord);
-    }
-}

client/net/minecraftforge/client/model/obj/GroupObject.java

@@ -1,54 +0,0 @@
-package net.minecraftforge.client.model.obj;
-
-import java.util.ArrayList;
-
-import net.minecraft.client.renderer.Tessellator;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class GroupObject
-{
-
-    public String name;
-    public ArrayList<Face> faces = new ArrayList<Face>();
-    public int glDrawingMode;
-
-    public GroupObject()
-    {
-        this("");
-    }
-
-    public GroupObject(String name)
-    {
-        this(name, -1);
-    }
-
-    public GroupObject(String name, int glDrawingMode)
-    {
-        this.name = name;
-        this.glDrawingMode = glDrawingMode;
-    }
-
-    public void render()
-    {
-        if (faces.size() > 0)
-        {
-            Tessellator tessellator = Tessellator.instance;
-            tessellator.startDrawing(glDrawingMode);
-            render(tessellator);
-            tessellator.draw();
-        }
-    }
-
-    public void render(Tessellator tessellator)
-    {
-        if (faces.size() > 0)
-        {
-            for (Face face : faces)
-            {
-                face.addFaceForRender(tessellator);
-            }
-        }
-    }
-}

client/net/minecraftforge/client/model/obj/ObjModelLoader.java

@@ -1,31 +0,0 @@
-package net.minecraftforge.client.model.obj;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import net.minecraftforge.client.model.IModelCustom;
-import net.minecraftforge.client.model.IModelCustomLoader;
-import net.minecraftforge.client.model.ModelFormatException;
-
-public class ObjModelLoader implements IModelCustomLoader {
-
-    @Override
-    public String getType()
-    {
-        return "OBJ model";
-    }
-
-    private static final String[] types = { "obj" };
-    @Override
-    public String[] getSuffixes()
-    {
-        return types;
-    }
-
-    @Override
-    public IModelCustom loadInstance(String resourceName, URL resource) throws ModelFormatException
-    {
-        return new WavefrontObject(resourceName, resource);
-    }
-
-}

client/net/minecraftforge/client/model/obj/TextureCoordinate.java

@@ -1,23 +0,0 @@
-package net.minecraftforge.client.model.obj;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class TextureCoordinate
-{
-
-    public float u, v, w;
-
-    public TextureCoordinate(float u, float v)
-    {
-        this(u, v, 0F);
-    }
-
-    public TextureCoordinate(float u, float v, float w)
-    {
-        this.u = u;
-        this.v = v;
-        this.w = w;
-    }
-}

client/net/minecraftforge/client/model/obj/Vertex.java

@@ -1,23 +0,0 @@
-package net.minecraftforge.client.model.obj;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class Vertex
-{
-
-    public float x, y, z;
-
-    public Vertex(float x, float y)
-    {
-        this(x, y, 0F);
-    }
-
-    public Vertex(float x, float y, float z)
-    {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-}

client/net/minecraftforge/client/model/obj/WavefrontObject.java

@@ -1,650 +0,0 @@
-package net.minecraftforge.client.model.obj;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraftforge.client.model.IModelCustom;
-import net.minecraftforge.client.model.ModelFormatException;
-
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-/**
- *  Wavefront Object importer
- *  Based heavily off of the specifications found at http://en.wikipedia.org/wiki/Wavefront_.obj_file
- */
-@SideOnly(Side.CLIENT)
-public class WavefrontObject implements IModelCustom
-{
-
-    private static Pattern vertexPattern = Pattern.compile("(v( (\\-){0,1}\\d+\\.\\d+){3,4} *\\n)|(v( (\\-){0,1}\\d+\\.\\d+){3,4} *$)");
-    private static Pattern vertexNormalPattern = Pattern.compile("(vn( (\\-){0,1}\\d+\\.\\d+){3,4} *\\n)|(vn( (\\-){0,1}\\d+\\.\\d+){3,4} *$)");
-    private static Pattern textureCoordinatePattern = Pattern.compile("(vt( (\\-){0,1}\\d+\\.\\d+){2,3} *\\n)|(vt( (\\-){0,1}\\d+\\.\\d+){2,3} *$)");
-    private static Pattern face_V_VT_VN_Pattern = Pattern.compile("(f( \\d+/\\d+/\\d+){3,4} *\\n)|(f( \\d+/\\d+/\\d+){3,4} *$)");
-    private static Pattern face_V_VT_Pattern = Pattern.compile("(f( \\d+/\\d+){3,4} *\\n)|(f( \\d+/\\d+){3,4} *$)");
-    private static Pattern face_V_VN_Pattern = Pattern.compile("(f( \\d+//\\d+){3,4} *\\n)|(f( \\d+//\\d+){3,4} *$)");
-    private static Pattern face_V_Pattern = Pattern.compile("(f( \\d+){3,4} *\\n)|(f( \\d+){3,4} *$)");
-    private static Pattern groupObjectPattern = Pattern.compile("([go]( [\\w\\d]+) *\\n)|([go]( [\\w\\d]+) *$)");
-
-    private static Matcher vertexMatcher, vertexNormalMatcher, textureCoordinateMatcher;
-    private static Matcher face_V_VT_VN_Matcher, face_V_VT_Matcher, face_V_VN_Matcher, face_V_Matcher;
-    private static Matcher groupObjectMatcher;
-
-    public ArrayList<Vertex> vertices = new ArrayList<Vertex>();
-    public ArrayList<Vertex> vertexNormals = new ArrayList<Vertex>();
-    public ArrayList<TextureCoordinate> textureCoordinates = new ArrayList<TextureCoordinate>();
-    public ArrayList<GroupObject> groupObjects = new ArrayList<GroupObject>();
-    private GroupObject currentGroupObject;
-    private String fileName;
-
-    public WavefrontObject(String fileName, URL resource) throws ModelFormatException
-    {
-        this.fileName = fileName;
-        
-        try
-        {
-            loadObjModel(resource.openStream());
-        }
-        catch (IOException e)
-        {
-            throw new ModelFormatException("IO Exception reading model format", e);
-        }
-    }
-    
-    public WavefrontObject(String filename, InputStream inputStream) throws ModelFormatException
-    {
-        this.fileName = filename;
-        loadObjModel(inputStream);
-    }
-
-    private void loadObjModel(InputStream inputStream) throws ModelFormatException
-    {
-        BufferedReader reader = null;
-
-        String currentLine = null;
-        int lineCount = 0;
-
-        try
-        {
-            reader = new BufferedReader(new InputStreamReader(inputStream));
-
-            while ((currentLine = reader.readLine()) != null)
-            {
-                lineCount++;
-                currentLine = currentLine.replaceAll("\\s+", " ").trim();
-
-                if (currentLine.startsWith("#") || currentLine.length() == 0)
-                {
-                    continue;
-                }
-                else if (currentLine.startsWith("v "))
-                {
-                    Vertex vertex = parseVertex(currentLine, lineCount);
-                    if (vertex != null)
-                    {
-                        vertices.add(vertex);
-                    }
-                }
-                else if (currentLine.startsWith("vn "))
-                {
-                    Vertex vertex = parseVertexNormal(currentLine, lineCount);
-                    if (vertex != null)
-                    {
-                        vertexNormals.add(vertex);
-                    }
-                }
-                else if (currentLine.startsWith("vt "))
-                {
-                    TextureCoordinate textureCoordinate = parseTextureCoordinate(currentLine, lineCount);
-                    if (textureCoordinate != null)
-                    {
-                        textureCoordinates.add(textureCoordinate);
-                    }
-                }
-                else if (currentLine.startsWith("f "))
-                {
-
-                    if (currentGroupObject == null)
-                    {
-                        currentGroupObject = new GroupObject("Default");
-                    }
-
-                    Face face = parseFace(currentLine, lineCount);
-
-                    if (face != null)
-                    {
-                        currentGroupObject.faces.add(face);
-                    }
-                }
-                else if (currentLine.startsWith("g ") | currentLine.startsWith("o "))
-                {
-                    GroupObject group = parseGroupObject(currentLine, lineCount);
-
-                    if (group != null)
-                    {
-                        if (currentGroupObject != null)
-                        {
-                            groupObjects.add(currentGroupObject);
-                        }
-                    }
-
-                    currentGroupObject = group;
-                }
-            }
-
-            groupObjects.add(currentGroupObject);
-        }
-        catch (IOException e)
-        {
-            throw new ModelFormatException("IO Exception reading model format", e);
-        }
-        finally
-        {
-            try
-            {
-                reader.close();
-            }
-            catch (IOException e)
-            {
-                // hush
-            }
-
-            try
-            {
-                inputStream.close();
-            }
-            catch (IOException e)
-            {
-                // hush
-            }
-        }
-    }
-
-    @Override
-    public void renderAll()
-    {
-        Tessellator tessellator = Tessellator.instance;
-
-        if (currentGroupObject != null)
-        {
-            tessellator.startDrawing(currentGroupObject.glDrawingMode);
-        }
-        else
-        {
-            tessellator.startDrawing(GL11.GL_TRIANGLES);
-        }
-        tessellateAll(tessellator);
-
-        tessellator.draw();
-    }
-
-    public void tessellateAll(Tessellator tessellator)
-    {
-        for (GroupObject groupObject : groupObjects)
-        {
-            groupObject.render(tessellator);
-        }
-    }
-
-    @Override
-    public void renderOnly(String... groupNames)
-    {
-        for (GroupObject groupObject : groupObjects)
-        {
-            for (String groupName : groupNames)
-            {
-                if (groupName.equalsIgnoreCase(groupObject.name))
-                {
-                    groupObject.render();
-                }
-            }
-        }
-    }
-
-    public void tessellateOnly(Tessellator tessellator, String... groupNames) {
-        for (GroupObject groupObject : groupObjects)
-        {
-            for (String groupName : groupNames)
-            {
-                if (groupName.equalsIgnoreCase(groupObject.name))
-                {
-                    groupObject.render(tessellator);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void renderPart(String partName)
-    {
-        for (GroupObject groupObject : groupObjects)
-        {
-            if (partName.equalsIgnoreCase(groupObject.name))
-            {
-                groupObject.render();
-            }
-        }
-    }
-
-    public void tessellatePart(Tessellator tessellator, String partName) {
-        for (GroupObject groupObject : groupObjects)
-        {
-            if (partName.equalsIgnoreCase(groupObject.name))
-            {
-                groupObject.render(tessellator);
-            }
-        }
-    }
-
-    public void renderAllExcept(String... excludedGroupNames)
-    {
-        for (GroupObject groupObject : groupObjects)
-        {
-            boolean skipPart=false;
-            for (String excludedGroupName : excludedGroupNames)
-            {
-                if (excludedGroupName.equalsIgnoreCase(groupObject.name))
-                {
-                    skipPart=true;
-                }
-            }
-            if(!skipPart)
-            {
-                groupObject.render();
-            }
-        }
-    }
-
-    public void tessellateAllExcept(Tessellator tessellator, String... excludedGroupNames)
-    {
-        boolean exclude;
-        for (GroupObject groupObject : groupObjects)
-        {
-            exclude=false;
-            for (String excludedGroupName : excludedGroupNames)
-            {
-                if (excludedGroupName.equalsIgnoreCase(groupObject.name))
-                {
-                    exclude=true;
-                }
-            }
-            if(!exclude)
-            {
-                groupObject.render(tessellator);
-            }
-        }
-    }
-
-    private Vertex parseVertex(String line, int lineCount) throws ModelFormatException
-    {
-        Vertex vertex = null;
-
-        if (isValidVertexLine(line))
-        {
-            line = line.substring(line.indexOf(" ") + 1);
-            String[] tokens = line.split(" ");
-
-            try
-            {
-                if (tokens.length == 2)
-                {
-                    return new Vertex(Float.parseFloat(tokens[0]), Float.parseFloat(tokens[1]));
-                }
-                else if (tokens.length == 3)
-                {
-                    return new Vertex(Float.parseFloat(tokens[0]), Float.parseFloat(tokens[1]), Float.parseFloat(tokens[2]));
-                }
-            }
-            catch (NumberFormatException e)
-            {
-                throw new ModelFormatException(String.format("Number formatting error at line %d",lineCount), e);
-            }
-        }
-        else
-        {
-            throw new ModelFormatException("Error parsing entry ('" + line + "'" + ", line " + lineCount + ") in file '" + fileName + "' - Incorrect format");
-        }
-
-        return vertex;
-    }
-
-    private Vertex parseVertexNormal(String line, int lineCount) throws ModelFormatException
-    {
-        Vertex vertexNormal = null;
-
-        if (isValidVertexNormalLine(line))
-        {
-            line = line.substring(line.indexOf(" ") + 1);
-            String[] tokens = line.split(" ");
-
-            try
-            {
-                if (tokens.length == 3)
-                    return new Vertex(Float.parseFloat(tokens[0]), Float.parseFloat(tokens[1]), Float.parseFloat(tokens[2]));
-            }
-            catch (NumberFormatException e)
-            {
-                throw new ModelFormatException(String.format("Number formatting error at line %d",lineCount), e);
-            }
-        }
-        else
-        {
-            throw new ModelFormatException("Error parsing entry ('" + line + "'" + ", line " + lineCount + ") in file '" + fileName + "' - Incorrect format");
-        }
-
-        return vertexNormal;
-    }
-
-    private TextureCoordinate parseTextureCoordinate(String line, int lineCount) throws ModelFormatException
-    {
-        TextureCoordinate textureCoordinate = null;
-
-        if (isValidTextureCoordinateLine(line))
-        {
-            line = line.substring(line.indexOf(" ") + 1);
-            String[] tokens = line.split(" ");
-
-            try
-            {
-                if (tokens.length == 2)
-                    return new TextureCoordinate(Float.parseFloat(tokens[0]), 1 - Float.parseFloat(tokens[1]));
-                else if (tokens.length == 3)
-                    return new TextureCoordinate(Float.parseFloat(tokens[0]), 1 - Float.parseFloat(tokens[1]), Float.parseFloat(tokens[2]));
-            }
-            catch (NumberFormatException e)
-            {
-                throw new ModelFormatException(String.format("Number formatting error at line %d",lineCount), e);
-            }
-        }
-        else
-        {
-            throw new ModelFormatException("Error parsing entry ('" + line + "'" + ", line " + lineCount + ") in file '" + fileName + "' - Incorrect format");
-        }
-
-        return textureCoordinate;
-    }
-
-    private Face parseFace(String line, int lineCount) throws ModelFormatException
-    {
-        Face face = null;
-
-        if (isValidFaceLine(line))
-        {
-            face = new Face();
-
-            String trimmedLine = line.substring(line.indexOf(" ") + 1);
-            String[] tokens = trimmedLine.split(" ");
-            String[] subTokens = null;
-
-            if (tokens.length == 3)
-            {
-                if (currentGroupObject.glDrawingMode == -1)
-                {
-                    currentGroupObject.glDrawingMode = GL11.GL_TRIANGLES;
-                }
-                else if (currentGroupObject.glDrawingMode != GL11.GL_TRIANGLES)
-                {
-                    throw new ModelFormatException("Error parsing entry ('" + line + "'" + ", line " + lineCount + ") in file '" + fileName + "' - Invalid number of points for face (expected 4, found " + tokens.length + ")");
-                }
-            }
-            else if (tokens.length == 4)
-            {
-                if (currentGroupObject.glDrawingMode == -1)
-                {
-                    currentGroupObject.glDrawingMode = GL11.GL_QUADS;
-                }
-                else if (currentGroupObject.glDrawingMode != GL11.GL_QUADS)
-                {
-                    throw new ModelFormatException("Error parsing entry ('" + line + "'" + ", line " + lineCount + ") in file '" + fileName + "' - Invalid number of points for face (expected 3, found " + tokens.length + ")");
-                }
-            }
-
-            // f v1/vt1/vn1 v2/vt2/vn2 v3/vt3/vn3 ...
-            if (isValidFace_V_VT_VN_Line(line))
-            {
-                face.vertices = new Vertex[tokens.length];
-                face.textureCoordinates = new TextureCoordinate[tokens.length];
-                face.vertexNormals = new Vertex[tokens.length];
-
-                for (int i = 0; i < tokens.length; ++i)
-                {
-                    subTokens = tokens[i].split("/");
-
-                    face.vertices[i] = vertices.get(Integer.parseInt(subTokens[0]) - 1);
-                    face.textureCoordinates[i] = textureCoordinates.get(Integer.parseInt(subTokens[1]) - 1);
-                    face.vertexNormals[i] = vertexNormals.get(Integer.parseInt(subTokens[2]) - 1);
-                }
-
-                face.faceNormal = face.calculateFaceNormal();
-            }
-            // f v1/vt1 v2/vt2 v3/vt3 ...
-            else if (isValidFace_V_VT_Line(line))
-            {
-                face.vertices = new Vertex[tokens.length];
-                face.textureCoordinates = new TextureCoordinate[tokens.length];
-
-                for (int i = 0; i < tokens.length; ++i)
-                {
-                    subTokens = tokens[i].split("/");
-
-                    face.vertices[i] = vertices.get(Integer.parseInt(subTokens[0]) - 1);
-                    face.textureCoordinates[i] = textureCoordinates.get(Integer.parseInt(subTokens[1]) - 1);
-                }
-
-                face.faceNormal = face.calculateFaceNormal();
-            }
-            // f v1//vn1 v2//vn2 v3//vn3 ...
-            else if (isValidFace_V_VN_Line(line))
-            {
-                face.vertices = new Vertex[tokens.length];
-                face.vertexNormals = new Vertex[tokens.length];
-
-                for (int i = 0; i < tokens.length; ++i)
-                {
-                    subTokens = tokens[i].split("//");
-
-                    face.vertices[i] = vertices.get(Integer.parseInt(subTokens[0]) - 1);
-                    face.vertexNormals[i] = vertexNormals.get(Integer.parseInt(subTokens[1]) - 1);
-                }
-
-                face.faceNormal = face.calculateFaceNormal();
-            }
-            // f v1 v2 v3 ...
-            else if (isValidFace_V_Line(line))
-            {
-                face.vertices = new Vertex[tokens.length];
-
-                for (int i = 0; i < tokens.length; ++i)
-                {
-                    face.vertices[i] = vertices.get(Integer.parseInt(tokens[i]) - 1);
-                }
-
-                face.faceNormal = face.calculateFaceNormal();
-            }
-            else
-            {
-                throw new ModelFormatException("Error parsing entry ('" + line + "'" + ", line " + lineCount + ") in file '" + fileName + "' - Incorrect format");
-            }
-        }
-        else
-        {
-            throw new ModelFormatException("Error parsing entry ('" + line + "'" + ", line " + lineCount + ") in file '" + fileName + "' - Incorrect format");
-        }
-
-        return face;
-    }
-
-    private GroupObject parseGroupObject(String line, int lineCount) throws ModelFormatException
-    {
-        GroupObject group = null;
-
-        if (isValidGroupObjectLine(line))
-        {
-            String trimmedLine = line.substring(line.indexOf(" ") + 1);
-
-            if (trimmedLine.length() > 0)
-            {
-                group = new GroupObject(trimmedLine);
-            }
-        }
-        else
-        {
-            throw new ModelFormatException("Error parsing entry ('" + line + "'" + ", line " + lineCount + ") in file '" + fileName + "' - Incorrect format");
-        }
-
-        return group;
-    }
-
-    /***
-     * Verifies that the given line from the model file is a valid vertex
-     * @param line the line being validated
-     * @return true if the line is a valid vertex, false otherwise
-     */
-    private static boolean isValidVertexLine(String line)
-    {
-        if (vertexMatcher != null)
-        {
-            vertexMatcher.reset();
-        }
-
-        vertexMatcher = vertexPattern.matcher(line);
-        return vertexMatcher.matches();
-    }
-
-    /***
-     * Verifies that the given line from the model file is a valid vertex normal
-     * @param line the line being validated
-     * @return true if the line is a valid vertex normal, false otherwise
-     */
-    private static boolean isValidVertexNormalLine(String line)
-    {
-        if (vertexNormalMatcher != null)
-        {
-            vertexNormalMatcher.reset();
-        }
-
-        vertexNormalMatcher = vertexNormalPattern.matcher(line);
-        return vertexNormalMatcher.matches();
-    }
-
-    /***
-     * Verifies that the given line from the model file is a valid texture coordinate
-     * @param line the line being validated
-     * @return true if the line is a valid texture coordinate, false otherwise
-     */
-    private static boolean isValidTextureCoordinateLine(String line)
-    {
-        if (textureCoordinateMatcher != null)
-        {
-            textureCoordinateMatcher.reset();
-        }
-
-        textureCoordinateMatcher = textureCoordinatePattern.matcher(line);
-        return textureCoordinateMatcher.matches();
-    }
-
-    /***
-     * Verifies that the given line from the model file is a valid face that is described by vertices, texture coordinates, and vertex normals
-     * @param line the line being validated
-     * @return true if the line is a valid face that matches the format "f v1/vt1/vn1 ..." (with a minimum of 3 points in the face, and a maximum of 4), false otherwise
-     */
-    private static boolean isValidFace_V_VT_VN_Line(String line)
-    {
-        if (face_V_VT_VN_Matcher != null)
-        {
-            face_V_VT_VN_Matcher.reset();
-        }
-
-        face_V_VT_VN_Matcher = face_V_VT_VN_Pattern.matcher(line);
-        return face_V_VT_VN_Matcher.matches();
-    }
-
-    /***
-     * Verifies that the given line from the model file is a valid face that is described by vertices and texture coordinates
-     * @param line the line being validated
-     * @return true if the line is a valid face that matches the format "f v1/vt1 ..." (with a minimum of 3 points in the face, and a maximum of 4), false otherwise
-     */
-    private static boolean isValidFace_V_VT_Line(String line)
-    {
-        if (face_V_VT_Matcher != null)
-        {
-            face_V_VT_Matcher.reset();
-        }
-
-        face_V_VT_Matcher = face_V_VT_Pattern.matcher(line);
-        return face_V_VT_Matcher.matches();
-    }
-
-    /***
-     * Verifies that the given line from the model file is a valid face that is described by vertices and vertex normals
-     * @param line the line being validated
-     * @return true if the line is a valid face that matches the format "f v1//vn1 ..." (with a minimum of 3 points in the face, and a maximum of 4), false otherwise
-     */
-    private static boolean isValidFace_V_VN_Line(String line)
-    {
-        if (face_V_VN_Matcher != null)
-        {
-            face_V_VN_Matcher.reset();
-        }
-
-        face_V_VN_Matcher = face_V_VN_Pattern.matcher(line);
-        return face_V_VN_Matcher.matches();
-    }
-
-    /***
-     * Verifies that the given line from the model file is a valid face that is described by only vertices
-     * @param line the line being validated
-     * @return true if the line is a valid face that matches the format "f v1 ..." (with a minimum of 3 points in the face, and a maximum of 4), false otherwise
-     */
-    private static boolean isValidFace_V_Line(String line)
-    {
-        if (face_V_Matcher != null)
-        {
-            face_V_Matcher.reset();
-        }
-
-        face_V_Matcher = face_V_Pattern.matcher(line);
-        return face_V_Matcher.matches();
-    }
-
-    /***
-     * Verifies that the given line from the model file is a valid face of any of the possible face formats
-     * @param line the line being validated
-     * @return true if the line is a valid face that matches any of the valid face formats, false otherwise
-     */
-    private static boolean isValidFaceLine(String line)
-    {
-        return isValidFace_V_VT_VN_Line(line) || isValidFace_V_VT_Line(line) || isValidFace_V_VN_Line(line) || isValidFace_V_Line(line);
-    }
-
-    /***
-     * Verifies that the given line from the model file is a valid group (or object)
-     * @param line the line being validated
-     * @return true if the line is a valid group (or object), false otherwise
-     */
-    private static boolean isValidGroupObjectLine(String line)
-    {
-        if (groupObjectMatcher != null)
-        {
-            groupObjectMatcher.reset();
-        }
-
-        groupObjectMatcher = groupObjectPattern.matcher(line);
-        return groupObjectMatcher.matches();
-    }
-
-    @Override
-    public String getType()
-    {
-        return "obj";
-    }
-}

client/net/minecraftforge/client/model/techne/TechneModel.java

@@ -1,338 +0,0 @@
-package net.minecraftforge.client.model.techne;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
-
-import javax.imageio.ImageIO;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.lwjgl.opengl.GL11;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraftforge.client.model.IModelCustom;
-import net.minecraftforge.client.model.ModelFormatException;
-import net.minecraftforge.client.model.obj.GroupObject;
-
-/**
- * Techne model importer, based on iChun's Hats importer
- */
-@SideOnly(Side.CLIENT)
-public class TechneModel extends ModelBase implements IModelCustom {
-    public static final List<String> cubeTypes = Arrays.asList(
-            "d9e621f7-957f-4b77-b1ae-20dcd0da7751",
-            "de81aa14-bd60-4228-8d8d-5238bcd3caaa"
-            );
-    
-    private String fileName;
-    private Map<String, byte[]> zipContents = new HashMap<String, byte[]>();
-    
-    private Map<String, ModelRenderer> parts = new LinkedHashMap<String, ModelRenderer>();
-    private String texture = null;
-    private int textureName;
-    private boolean textureNameSet = false;
-
-    public TechneModel(String fileName, URL resource) throws ModelFormatException
-    {
-        this.fileName = fileName;
-        loadTechneModel(resource);
-    }
-    
-    private void loadTechneModel(URL fileURL) throws ModelFormatException
-    {
-        try
-        {
-            ZipInputStream zipInput = new ZipInputStream(fileURL.openStream());
-            
-            ZipEntry entry;
-            while ((entry = zipInput.getNextEntry()) != null)
-            {
-                byte[] data = new byte[(int) entry.getSize()];
-                // For some reason, using read(byte[]) makes reading stall upon reaching a 0x1E byte
-                int i = 0;
-                while (zipInput.available() > 0 && i < data.length)
-                {
-                    data[i++] = (byte)zipInput.read();
-                }
-                zipContents.put(entry.getName(), data);
-            }
-            
-            byte[] modelXml = zipContents.get("model.xml");
-            if (modelXml == null)
-            {
-                throw new ModelFormatException("Model " + fileName + " contains no model.xml file");
-            }
-            
-            DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
-            Document document = documentBuilder.parse(new ByteArrayInputStream(modelXml));
-            
-            NodeList nodeListTechne = document.getElementsByTagName("Techne");
-            if (nodeListTechne.getLength() < 1)
-            {
-                throw new ModelFormatException("Model " + fileName + " contains no Techne tag");
-            }
-            
-            NodeList nodeListModel = document.getElementsByTagName("Model");
-            if (nodeListModel.getLength() < 1)
-            {
-                throw new ModelFormatException("Model " + fileName + " contains no Model tag");
-            }
-            
-            NamedNodeMap modelAttributes = nodeListModel.item(0).getAttributes();
-            if (modelAttributes == null)
-            {
-                throw new ModelFormatException("Model " + fileName + " contains a Model tag with no attributes");
-            }
-            
-            Node modelTexture = modelAttributes.getNamedItem("texture");
-            if (modelTexture != null)
-            {
-                texture = modelTexture.getTextContent();
-            }
-            
-            NodeList shapes = document.getElementsByTagName("Shape");
-            for (int i = 0; i < shapes.getLength(); i++)
-            {
-                Node shape = shapes.item(i);
-                NamedNodeMap shapeAttributes = shape.getAttributes();
-                if (shapeAttributes == null)
-                {
-                    throw new ModelFormatException("Shape #" + (i + 1) + " in " + fileName + " has no attributes");
-                }
-                
-                Node name = shapeAttributes.getNamedItem("name");
-                String shapeName = null;
-                if (name != null)
-                {
-                    shapeName = name.getNodeValue();
-                }
-                if (shapeName == null)
-                {
-                    shapeName = "Shape #" + (i + 1);
-                }
-                
-                String shapeType = null;
-                Node type = shapeAttributes.getNamedItem("type");
-                if (type != null)
-                {
-                    shapeType = type.getNodeValue();
-                }
-                if (shapeType != null && !cubeTypes.contains(shapeType))
-                {
-                    FMLLog.warning("Model shape [" + shapeName + "] in " + fileName + " is not a cube, ignoring");
-                    continue;
-                }
-                
-                try
-                {
-                    boolean mirrored = false;
-                    String[] offset = new String[3];
-                    String[] position = new String[3];
-                    String[] rotation = new String[3];
-                    String[] size = new String[3];
-                    String[] textureOffset = new String[2];
-                    
-                    NodeList shapeChildren = shape.getChildNodes();
-                    for (int j = 0; j < shapeChildren.getLength(); j++)
-                    {
-                        Node shapeChild = shapeChildren.item(j);
-                        
-                        String shapeChildName = shapeChild.getNodeName();
-                        String shapeChildValue = shapeChild.getTextContent();
-                        if (shapeChildValue != null)
-                        {
-                            shapeChildValue = shapeChildValue.trim();
-                            
-                            if (shapeChildName.equals("IsMirrored"))
-                            {
-                                mirrored = !shapeChildValue.equals("False");
-                            }
-                            else if (shapeChildName.equals("Offset"))
-                            {
-                                offset = shapeChildValue.split(",");
-                            }
-                            else if (shapeChildName.equals("Position"))
-                            {
-                                position = shapeChildValue.split(",");
-                            }
-                            else if (shapeChildName.equals("Rotation"))
-                            {
-                                rotation = shapeChildValue.split(",");
-                            }
-                            else if (shapeChildName.equals("Size"))
-                            {
-                                size = shapeChildValue.split(",");
-                            }
-                            else if (shapeChildName.equals("TextureOffset"))
-                            {
-                                textureOffset = shapeChildValue.split(",");
-                            }
-                        }
-                    }
-                    
-                    // That's what the ModelBase subclassing is needed for
-                    ModelRenderer cube = new ModelRenderer(this, Integer.parseInt(textureOffset[0]), Integer.parseInt(textureOffset[1]));
-                    cube.mirror = mirrored;
-                    cube.addBox(Float.parseFloat(offset[0]), Float.parseFloat(offset[1]), Float.parseFloat(offset[2]), Integer.parseInt(size[0]), Integer.parseInt(size[1]), Integer.parseInt(size[2]));
-                    cube.setRotationPoint(Float.parseFloat(position[0]), Float.parseFloat(position[1]) - 23.4F, Float.parseFloat(position[2]));
-
-                    cube.rotateAngleX = (float)Math.toRadians(Float.parseFloat(rotation[0]));
-                    cube.rotateAngleY = (float)Math.toRadians(Float.parseFloat(rotation[1]));
-                    cube.rotateAngleZ = (float)Math.toRadians(Float.parseFloat(rotation[2]));
-
-                    parts.put(shapeName, cube);
-                }
-                catch (NumberFormatException e)
-                {
-                    FMLLog.warning("Model shape [" + shapeName + "] in " + fileName + " contains malformed integers within its data, ignoring");
-                    e.printStackTrace();
-                }
-            }
-        }
-        catch (ZipException e)
-        {
-            throw new ModelFormatException("Model " + fileName + " is not a valid zip file");
-        }
-        catch (IOException e)
-        {
-            throw new ModelFormatException("Model " + fileName + " could not be read", e);
-        }
-        catch (ParserConfigurationException e)
-        {
-            // hush
-        }
-        catch (SAXException e)
-        {
-            throw new ModelFormatException("Model " + fileName + " contains invalid XML", e);
-        }
-    }
-    
-    private void bindTexture()
-    {
-        /* TODO: Update to 1.6
-        if (texture != null)
-        {
-            if (!textureNameSet)
-            {
-                try
-                {
-                    byte[] textureEntry = zipContents.get(texture);
-                    if (textureEntry == null)
-                    {
-                        throw new ModelFormatException("Model " + fileName + " has no such texture " + texture);
-                    }
-                    
-                    BufferedImage image = ImageIO.read(new ByteArrayInputStream(textureEntry));
-                    textureName = Minecraft.getMinecraft().renderEngine.allocateAndSetupTexture(image);
-                    textureNameSet = true;
-                }
-                catch (ZipException e)
-                {
-                    throw new ModelFormatException("Model " + fileName + " is not a valid zip file");
-                }
-                catch (IOException e)
-                {
-                    throw new ModelFormatException("Texture for model " + fileName + " could not be read", e);
-                }
-            }
-            
-            if (textureNameSet)
-            {
-                GL11.glBindTexture(GL11.GL_TEXTURE_2D, textureName);
-                Minecraft.getMinecraft().renderEngine.resetBoundTexture();
-            }
-        }
-        */
-    }
-    
-    @Override
-    public String getType()
-    {
-        return "tcn";
-    }
-
-    @Override
-    public void renderAll()
-    {
-        bindTexture();
-        
-        for (ModelRenderer part : parts.values())
-        {
-            part.renderWithRotation(1.0F);
-        }
-    }
-
-    @Override
-    public void renderPart(String partName)
-    {        
-        ModelRenderer part = parts.get(partName);
-        if (part != null)
-        {
-            bindTexture();
-            
-            part.renderWithRotation(1.0F);
-        }
-    }
-
-    @Override
-    public void renderOnly(String... groupNames)
-    {
-        bindTexture();
-        for (ModelRenderer part : parts.values())
-        {
-            for (String groupName : groupNames)
-            {
-                if (groupName.equalsIgnoreCase(part.boxName))
-                {
-                    part.render(1.0f);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void renderAllExcept(String... excludedGroupNames)
-    {
-        for (ModelRenderer part : parts.values())
-        {
-            boolean skipPart=false;
-            for (String excludedGroupName : excludedGroupNames)
-            {
-                if (excludedGroupName.equalsIgnoreCase(part.boxName))
-                {
-                    skipPart=true;
-                }
-            }
-            if(!skipPart)
-            {
-                part.render(1.0f);
-            }
-        }
-    }
-}

client/net/minecraftforge/client/model/techne/TechneModelLoader.java

@@ -1,33 +0,0 @@
-package net.minecraftforge.client.model.techne;
-
-import java.net.URL;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraftforge.client.model.IModelCustom;
-import net.minecraftforge.client.model.IModelCustomLoader;
-import net.minecraftforge.client.model.ModelFormatException;
-
-public class TechneModelLoader implements IModelCustomLoader {
-    
-    @Override
-    public String getType()
-    {
-        return "Techne model";
-    }
-
-    private static final String[] types = { "tcn" };
-    @Override
-    public String[] getSuffixes()
-    {
-        return types;
-    }
-
-    @Override
-    public IModelCustom loadInstance(String resourceName, URL resource) throws ModelFormatException
-    {
-        return new TechneModel(resourceName, resource);
-    }
-
-}

common/assets/forge/lang/en_US.lang

@@ -1,5 +0,0 @@
-commands.forge.usage=Use /forge <subcommand>. Subcommands are tps, track
-commands.forge.usage.tracking=Use /forge track <type> <duration>. Valid types are te (Tile Entities). Duration is < 60. 
-commands.forge.tps.summary=%s : Mean tick time: %d ms. Mean TPS: %d
-
-commands.forge.tracking.te.enabled=Tile Entity tracking enabled for %d seconds.

common/forge_at.cfg

@@ -1,160 +0,0 @@
-#Main Forge Access Transformer configuration file
-# Tessellator
-public-f bfq.a #FD:Tessellator/field_78398_a #instance
-public bfq.u #FD:Tessellator/field_78409_u #drawMode
-public bfq.v #FD:Tessellator/field_78408_v #xOffset
-public bfq.w #FD:Tessellator/field_78407_w #yOffset
-public bfq.x #FD:Tessellator/field_78417_x #zOffset
-public bfq.z #FD:Tessellator/field_78415_z #isDrawing
-# ItemPickaxe
-public yn.<init>(ILyd;)V #MD:ItemPickaxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
-public+f yn.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst
-# ItemAxe
-public ya.<init>(ILyd;)V #MD:ItemAxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
-public+f ya.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst
-# ItemSpade
-public yy.<init>(ILyd;)V #MD:ItemSpade/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
-public+f yy.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst
-# ItemTool
-public xj.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial
-public xj.d #FD:ItemTool/field_77865_bY #damageVsEntity
-# EntityEnderman
-public tg.br #FD:EntityEnderman/field_70827_d #carriableBlocks
-# RenderGlobal
-public bfl.k #FD:RenderGlobal/field_72769_h #theWorld
-public bfl.l #FD:RenderGlobal/field_72770_i #renderEngine
-public bfl.t #FD:RenderGlobal/field_72777_q #mc
-public bfl.u #FD:RenderGlobal/field_72776_r #globalRenderBlocks
-public bfl.H #FD:RenderGlobal/field_72738_E #damagedBlocks
-# SoundManager
-public bln.b #FD:SoundManager/field_77381_a #sndSystem
-public bln.d #FD:SoundManager/field_77379_b #soundPoolSounds
-public bln.e #FD:SoundManager/field_77380_c #soundPoolStreaming
-public bln.f #FD:SoundManager/field_77377_d #soundPoolMusic
-# EntityMinecart
-protected st.* #FD:EntityMinecart/* # All private -> protected
-# Block
-public aqz.<init>(ILakc;)V #MD:Block/<init>(ILnet/minecraft/src/Material;) #Constructor
-public aqz.<init>(IILakc;)V #MD:Block/<init>(IILnet/minecraft/src/Material;) #Constructor
-public aqz.cH #FD:Block/field_72029_cc #blockResistance
-public aqz.cG #FD:Block/field_71989_cb #blockHardness
-public aqz.d(Ljava/lang/String;)Laqz; #MD:Block/func_111022_d #setIconName
-public aqz.a(Lard;)Laqz; #MD:Block/func_71884_a #setStepSound
-public aqz.b(F)Laqz; #MD:Block/func_71894_b #setResistance
-public aqz.c(F)Laqz; #MD:Block/func_71848_c #setHardness
-public aqz.k(I)Laqz; #MD:Block/func_71868_h #setLightOpacity
-public aqz.a(F)Laqz; #MD:Block/func_71900_a #setLightValue
-public aqz.r()Laqz; #MD:Block/func_71875_q  #setBlockUnbreakable
-public aqz.b(Z)Laqz; #MD:Block/func_71907_b #setTickRandomly
-public aqz.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds
-public aqz.j(Labw;IIII)V #MD:Block/func_71923_g #dropXpOnBlockBreak
-# NetServerHandler
-public ka.f #FD:NetServerHandler/field_72572_g #playerInAirTime
-# TileEntity
-public asp.k #FD:TileEntity/field_70331_k #worldObj
-# BlockLeavesBase
-public arh.d #FD:BlockLeavesBase/field_72131_c #graphicsLevel
-# Item
-public yc.<init>(I)V #MD:Item/<init>(I) #Constructor
-public yc.e(I)Lyc; #MD:Item/func_77656_e #setMaxDamage
-public-f yc.h(Lye;)Lms; #MD:Item/func_77650_f #getIconIndex
-public yc.c(Ljava/lang/String;)Lyc; #MD:Item/func_77631_c #setPotionEffect
-public yc.d(Ljava/lang/String;)Lyc; #MD:Item/func_111206_d #setIconName
-# RailLogic
-public amz #CL:BlockBaseRailLogic
-public amz.a()I #MD:BlockBaseRailLogic/func_94505_a #getNAdjacentTiles
-# EntityPlayer
-public uf.a(Lss;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld
-public uf.i()V #MD:EntityPlayer/func_71053_j #closeScreen
-public uf.b #FD:EntityPlayer/field_71076_b #sleepTimer
-# EntityPlayerMP
-public bdi.a(Lss;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
-# World Gen Chests Related
-public mk.* #FD:WeightedRandomChestContent/* #all
-public js.T #FD:WorldServer/field_73069_S #bonusChestContent
-public agh.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents
-public ahl.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple
-public ahm.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents
-public ahm.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents
-public ahw.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents
-public aia.a #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents
-public aif.b #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents
-public aji.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents
-public afp.a #FD:WorldGenDungeons/field_111189_a #chestContents
-# AnvilChunkLoader.chunkSaveLocation
-public aee.d #FD:AnvilChunkLoader/field_75825_d
-# ChunkProviderServer.currentChunkLoader
-public jr.e #FD:ChunkProviderServer/field_73247_e
-# PlayerManager
-public jp.a(IIZ)Ljq; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher
-# PlayerInstance
-public jq #CL:PlayerInstance
-# World
-public-f abw.A #FD:World/field_72982_D #villageCollectionObj
-public abw.G #FD:World/field_72993_I #activeChunkSet
-# EntityLiving
-public og.b #FD:EntityLiving/field_70728_aV #experienceValue
-public og.d #FD:EntityLiving/field_70715_bh #targetTasks
-# GuiFlatPresets
-public avz.a(Ljava/lang/String;ILacq;Ljava/util/List;[Lagd;)V #MD:GuiFlatPresets/func_82294_a
-public avz.a(Ljava/lang/String;ILacq;[Lagd;)V #MD:GuiFlatPresets/func_82297_a
-# BiomeGenBase
-public acq.*() #MD:BiomeGenBase/* #Everything protected->public
-# MapGenVillage
-public-f aiw.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes
-# ShapedRecipes
-public+f aai.d #FD:ShapedRecipes/field_77574_d #recipeItems
-public+f aai.b #FD:ShapedRecipes/field_77576_b #recipeWidth
-public+f aai.c #FD:ShapedRecipes/field_77577_c #recipeHeight
-# ShapelessRecipes
-public aaj.b #FD:ShapelessRecipes/field_77579_b #recipeItems
-# GuiContainer
-protected awy.a(Lwe;)V #MD:GuiContainer/func_74192_a #drawSlotInventory
-# ContainerPlayer
-protected vv.h #FD:ContainerPlayer/field_82862_h #player
-# BlockButton
-protected anf.n(Labw;III)V #MD:BlockButton/func_82535_o #checkActivation
-protected-f anf.a #FD:BlockButton/field_82537_a #sensible
-# BiomeDecorator
-public acu.* #FD:BiomeDecorator/* # All private -> protected
-# CreativeTabs
-public-f ww.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final
-# Packet
-public ey.a(IZZLjava/lang/Class;)V #MD:Packet/func_73285_a  #addIdClassMapping
-# SaveHandler
-public alq.b()Ljava/io/File; #MD:SaveHandler/func_75765_b
-# World stuff
-public abw.b(Lnn;)V #MD:World/func_72847_b #releaseEntitySkin
-public abw.m #FD:World/field_73003_n #prevRainingStrength
-public abw.n #FD:World/field_73004_o #rainingStrength
-public abw.p #FD:World/field_73017_q #thunderingStrength
-public abw.o #FD:World/field_73018_p #prevThunderingStrength
-#WorldClient
-public bdd.b(Lnn;)V #MD:WorldClient/func_72847_b #releaseEntitySkin
-#WorldServer
-public js.b(Lnn;)V #MD:WorldServer/func_72847_b #releaseEntitySkin
-public js.N #FD:WorldServer/field_73068_P #allPlayersSleeping
-#TextureMap
-public bik.g #FD:TextureMap/field_94255_a
-public bik.h #FD:TextureMap/field_94254_c
-#Potion
-public ni.b(II)Lni; #MD:Potion/func_76399_b #setIconIndex
-#PotionHelper
-public zp.m #FD:PotionHelper/field_77927_l #potionRequirements
-public zp.n #FD:PotionHelper/field_77928_m #potionAmplifiers
-#PotionEffect
-public nj.b #FD:PotionEffect/field_76460_b #duration
-#BlockFluid
-protected apc.a #FD:BlockFluid/field_94425_a #theIcon
-#GuiIngame
-protected avj.* #FD:GuiIngame/* # All private -> protected
-protected avj.*() #MD:GuiIngame/* # All private -> protected
-#ItemStack
-default ye.f #FD:ItemStack/field_77991_e # make default access for itemDamage
-#GuiSlot
-protected awg.b(IIII)V #MD:GuiSlot/func_77206_b #overlayBackground
-#EntityPlayer
-public uf.bu #FD:EntityPlayer/field_71092_bJ #username
-#MapGenStructureIO
-public air.b(Ljava/lang/Class;Ljava/lang/String;)V #MD:MapGenStructureIO/func_143034_b #registerStart
-public air.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:MapGenStructureIO/func_143031_a #registerPiece

common/net/minecraftforge/common/BiomeDictionary.java

@@ -1,319 +0,0 @@
-package net.minecraftforge.common;
-
-import java.util.*;
-
-import cpw.mods.fml.common.FMLLog;
-import net.minecraft.world.biome.*;
-import net.minecraftforge.event.terraingen.DeferredBiomeDecorator;
-import static net.minecraft.world.biome.BiomeGenBase.*;
-import static net.minecraftforge.common.BiomeDictionary.Type.*;
-
-public class BiomeDictionary
-{
-    public enum Type
-    {
-        FOREST,
-        PLAINS,
-        MOUNTAIN,
-        HILLS,
-        SWAMP,
-        WATER,
-        DESERT,
-        FROZEN,
-        JUNGLE,
-        WASTELAND,
-        BEACH,
-        NETHER,
-        END,
-        MUSHROOM,
-        MAGICAL;
-    }
-
-    private static final int BIOME_LIST_SIZE = 256;
-    private static BiomeInfo[] biomeList = new BiomeInfo[BIOME_LIST_SIZE];
-    private static ArrayList<BiomeGenBase>[] typeInfoList = new ArrayList[Type.values().length];
-
-    private static class BiomeInfo
-    {
-        public EnumSet<Type> typeList;
-
-        public BiomeInfo(Type[] types)
-        {
-            typeList = EnumSet.noneOf(Type.class);
-            for(Type t : types)
-            {
-                typeList.add(t);
-            }
-        }
-    }
-
-    static
-    {
-        registerVanillaBiomes();
-    }
-
-    /**
-     * Registers a biome with a specific biome type
-     * 
-     * @param biome the biome to be registered
-     * @param type the type to register the biome as
-     * @return returns true if the biome was registered successfully
-     */
-    public static boolean registerBiomeType(BiomeGenBase biome, Type ... types)
-    {   
-        if(BiomeGenBase.biomeList[biome.biomeID] != null)
-        {
-            for(Type type : types)
-            {
-                if(typeInfoList[type.ordinal()] == null)
-                {
-                    typeInfoList[type.ordinal()] = new ArrayList<BiomeGenBase>();
-                }
-
-                typeInfoList[type.ordinal()].add(biome);
-            }
-
-            if(biomeList[biome.biomeID] == null)
-            {
-                biomeList[biome.biomeID] = new BiomeInfo(types);
-            }
-            else
-            {
-                for(Type type : types)
-                {
-                    biomeList[biome.biomeID].typeList.add(type);
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns a list of biomes registered with a specific type
-     * 
-     * @param type the Type to look for
-     * @return a list of biomes of the specified type, null if there are none
-     */
-    public static BiomeGenBase[] getBiomesForType(Type type)
-    {
-        if(typeInfoList[type.ordinal()] != null)
-        {
-            return (BiomeGenBase[])typeInfoList[type.ordinal()].toArray(new BiomeGenBase[0]);
-        }
-
-        return new BiomeGenBase[0];
-    }
-
-    /**
-     * Gets a list of Types that a specific biome is registered with
-     * 
-     * @param biome the biome to check
-     * @return the list of types, null if there are none
-     */
-    public static Type[] getTypesForBiome(BiomeGenBase biome)
-    {
-        checkRegistration(biome);
-
-        if(biomeList[biome.biomeID] != null)
-        {
-            return (Type[])biomeList[biome.biomeID].typeList.toArray(new Type[0]);
-        }
-
-        return new Type[0];
-    }
-
-    /**
-     * Checks to see if two biomes are registered as having the same type
-     * 
-     * @param biomeA
-     * @param biomeB
-     * @return returns true if a common type is found, false otherwise
-     */
-    public static boolean areBiomesEquivalent(BiomeGenBase biomeA, BiomeGenBase biomeB)
-    {
-        int a = biomeA.biomeID;
-        int b = biomeB.biomeID;
-
-        checkRegistration(biomeA);
-        checkRegistration(biomeB);
-
-        if(biomeList[a] != null && biomeList[b] != null)
-        {
-            for(Type type : biomeList[a].typeList)
-            {
-                if(containsType(biomeList[b], type))
-                {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks to see if the given biome is registered as being a specific type
-     * 
-     * @param biome the biome to be considered
-     * @param type the type to check for
-     * @return returns true if the biome is registered as being of type type, false otherwise
-     */
-    public static boolean isBiomeOfType(BiomeGenBase biome, Type type)
-    {
-        checkRegistration(biome);
-
-        if(biomeList[biome.biomeID] != null)
-        {
-            return containsType(biomeList[biome.biomeID], type);
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks to see if the given biome has been registered as being of any type
-     * @param biome the biome to consider
-     * @return returns true if the biome has been registered, false otherwise
-     */
-    public static boolean isBiomeRegistered(BiomeGenBase biome)
-    {    
-        return biomeList[biome.biomeID] != null;
-    }
-
-    public static boolean isBiomeRegistered(int biomeID)
-    {
-        return biomeList[biomeID] != null;
-    }
-
-    public static void registerAllBiomes()
-    {
-        FMLLog.warning("Redundant call to BiomeDictionary.registerAllBiomes ignored");
-    }
-    /**
-     * Loops through the biome list and automatically adds tags to any biome that does not have any
-     * This is called by Forge at postinit time. It will additionally dispatch any deferred decorator
-     * creation events.
-     * 
-     * DO NOT call this during world generation
-     */
-    public static void registerAllBiomesAndGenerateEvents()
-    {
-        for(int i = 0; i < BiomeGenBase.biomeList.length; i++)
-        {
-            BiomeGenBase biome = BiomeGenBase.biomeList[i];
-
-            if(biome == null)
-            {
-                continue;
-            }
-
-            if (biome.theBiomeDecorator instanceof DeferredBiomeDecorator)
-            {
-                DeferredBiomeDecorator decorator = (DeferredBiomeDecorator) biome.theBiomeDecorator;
-                decorator.fireCreateEventAndReplace();
-            }
-
-            checkRegistration(biome);
-        }
-    }
-
-    /**
-     * Automatically looks for and registers a given biome with appropriate tags
-     * This method is called automatically if a biome has not been registered with any tags,
-     * And another method requests information about it
-     * 
-     * NOTE: You can opt out of having your biome registered by registering it as type NULL
-     * 
-     * @param biome the biome to be considered
-     */
-    public static void makeBestGuess(BiomeGenBase biome)
-    {    
-        if(biome.theBiomeDecorator.treesPerChunk >= 3)
-        {
-            if(biome.isHighHumidity() && biome.temperature >= 1.0F)
-            {
-                BiomeDictionary.registerBiomeType(biome, JUNGLE);
-            }
-            else if(!biome.isHighHumidity())
-            {
-                BiomeDictionary.registerBiomeType(biome, FOREST);
-            }
-        }
-        else if(biome.maxHeight <= 0.3F && biome.maxHeight >= 0.0F)
-        {
-            if(!biome.isHighHumidity() || biome.minHeight >= 0.0F)
-            {
-                BiomeDictionary.registerBiomeType(biome, PLAINS);
-            }
-        }
-
-        if(biome.isHighHumidity() && biome.minHeight < 0.0F && (biome.maxHeight <= 0.3F && biome.maxHeight >= 0.0F))
-        {
-            BiomeDictionary.registerBiomeType(biome, SWAMP);
-        }
-
-        if(biome.minHeight <= -0.5F)
-        {
-            BiomeDictionary.registerBiomeType(biome, WATER);
-        }
-
-        if(biome.maxHeight >= 1.5F)
-        {
-            BiomeDictionary.registerBiomeType(biome, MOUNTAIN);
-        }
-        
-        if(biome.getEnableSnow() || biome.temperature < 0.2F)
-        {
-            BiomeDictionary.registerBiomeType(biome, FROZEN);
-        }
-        
-        if(!biome.isHighHumidity() && biome.temperature >= 1.0F)
-        {
-            BiomeDictionary.registerBiomeType(biome, DESERT);
-        }
-    }
-
-    //Internal implementation    
-    private static void checkRegistration(BiomeGenBase biome)
-    {
-        if(!isBiomeRegistered(biome))
-        {
-            makeBestGuess(biome);
-        }
-    }
-
-    private static boolean containsType(BiomeInfo info, Type type)
-    {
-        return info.typeList.contains(type);
-    }
-
-    private static void registerVanillaBiomes()
-    {
-        registerBiomeType(ocean,               WATER          );
-        registerBiomeType(plains,              PLAINS         );
-        registerBiomeType(desert,              DESERT         );
-        registerBiomeType(extremeHills,        MOUNTAIN       );
-        registerBiomeType(forest,              FOREST         );
-        registerBiomeType(taiga,               FOREST,  FROZEN);
-        registerBiomeType(taigaHills,          FOREST,  FROZEN);
-        registerBiomeType(swampland,           SWAMP          );
-        registerBiomeType(river,               WATER          );
-        registerBiomeType(frozenOcean,         WATER,   FROZEN);
-        registerBiomeType(frozenRiver,         WATER,   FROZEN);
-        registerBiomeType(icePlains,           FROZEN         );
-        registerBiomeType(iceMountains,        FROZEN         );
-        registerBiomeType(beach,               BEACH          );
-        registerBiomeType(desertHills,         DESERT         );
-        registerBiomeType(jungle,              JUNGLE         );
-        registerBiomeType(jungleHills,         JUNGLE         );
-        registerBiomeType(forestHills,         FOREST         );
-        registerBiomeType(sky,                 END            );
-        registerBiomeType(hell,                NETHER         );
-        registerBiomeType(mushroomIsland,      MUSHROOM       );
-        registerBiomeType(extremeHillsEdge,    MOUNTAIN       );
-        registerBiomeType(mushroomIslandShore, MUSHROOM, BEACH);
-    }
-}

common/net/minecraftforge/common/BiomeManager.java

@@ -1,70 +0,0 @@
-package net.minecraftforge.common;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.ChunkProviderGenerate;
-import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.structure.MapGenStronghold;
-import net.minecraft.world.gen.structure.MapGenVillage;
-import net.minecraft.world.biome.WorldChunkManager;
-
-import com.google.common.collect.Lists;
-
-public class BiomeManager
-{
-    public static void addVillageBiome(BiomeGenBase biome, boolean canSpawn)
-    {
-        if (!MapGenVillage.villageSpawnBiomes.contains(biome))
-        {
-            ArrayList<BiomeGenBase> biomes = new ArrayList<BiomeGenBase>(MapGenVillage.villageSpawnBiomes);
-            biomes.add(biome);
-            MapGenVillage.villageSpawnBiomes = biomes;
-        }
-    }
-
-    public static void removeVillageBiome(BiomeGenBase biome)
-    {
-        if (MapGenVillage.villageSpawnBiomes.contains(biome))
-        {
-            ArrayList<BiomeGenBase> biomes = new ArrayList<BiomeGenBase>(MapGenVillage.villageSpawnBiomes);
-            biomes.remove(biome);
-            MapGenVillage.villageSpawnBiomes = biomes;
-        }
-    }
-
-    public static void addStrongholdBiome(BiomeGenBase biome)
-    {
-        if (!MapGenStronghold.allowedBiomes.contains(biome))
-        {
-            MapGenStronghold.allowedBiomes.add(biome);
-        }
-    }
-
-    public static void removeStrongholdBiome(BiomeGenBase biome)
-    {
-        if (MapGenStronghold.allowedBiomes.contains(biome))
-        {
-            MapGenStronghold.allowedBiomes.remove(biome);
-        }
-    }
-
-    public static void addSpawnBiome(BiomeGenBase biome)
-    {
-        if (!WorldChunkManager.allowedBiomes.contains(biome))
-        {
-            WorldChunkManager.allowedBiomes.add(biome);
-        }
-    }
-
-    public static void removeSpawnBiome(BiomeGenBase biome)
-    {
-        if (WorldChunkManager.allowedBiomes.contains(biome))
-        {
-            WorldChunkManager.allowedBiomes.remove(biome);
-        }
-    }
-}

common/net/minecraftforge/common/Configuration.java

@@ -1,927 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public
- * License v1.0.
- */
-
-package net.minecraftforge.common;
-
-import static net.minecraftforge.common.Property.Type.BOOLEAN;
-import static net.minecraftforge.common.Property.Type.DOUBLE;
-import static net.minecraftforge.common.Property.Type.INTEGER;
-import static net.minecraftforge.common.Property.Type.STRING;
-
-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.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PushbackInputStream;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-
-import com.google.common.base.CharMatcher;
-import com.google.common.collect.ImmutableSet;
-
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.relauncher.FMLInjectionData;
-
-/**
- * This class offers advanced configurations capabilities, allowing to provide
- * various categories for configuration variables.
- */
-public class Configuration
-{
-    private static boolean[] configMarkers = new boolean[Item.itemsList.length];
-    private static final int ITEM_SHIFT = 256;
-    private static final int MAX_BLOCKS = 4096;
-
-    public static final String CATEGORY_GENERAL = "general";
-    public static final String CATEGORY_BLOCK   = "block";
-    public static final String CATEGORY_ITEM    = "item";
-    public static final String ALLOWED_CHARS = "._-";
-    public static final String DEFAULT_ENCODING = "UTF-8";
-    public static final String CATEGORY_SPLITTER = ".";
-    public static final String NEW_LINE;
-    private static final Pattern CONFIG_START = Pattern.compile("START: \"([^\\\"]+)\"");
-    private static final Pattern CONFIG_END = Pattern.compile("END: \"([^\\\"]+)\"");
-    public static final CharMatcher allowedProperties = CharMatcher.JAVA_LETTER_OR_DIGIT.or(CharMatcher.anyOf(ALLOWED_CHARS));
-    private static Configuration PARENT = null;
-
-    File file;
-
-    private Map<String, ConfigCategory> categories = new TreeMap<String, ConfigCategory>();
-    private Map<String, Configuration> children = new TreeMap<String, Configuration>();
-
-    private boolean caseSensitiveCustomCategories;
-    public String defaultEncoding = DEFAULT_ENCODING;
-    private String fileName = null;
-    public boolean isChild = false;
-    private boolean changed = false;
-
-    static
-    {
-        Arrays.fill(configMarkers, false);
-        NEW_LINE = System.getProperty("line.separator");
-    }
-
-    public Configuration(){}
-
-    /**
-     * Create a configuration file for the file given in parameter.
-     */
-    public Configuration(File file)
-    {
-        this.file = file;
-        String basePath = ((File)(FMLInjectionData.data()[6])).getAbsolutePath().replace(File.separatorChar, '/').replace("/.", "");
-        String path = file.getAbsolutePath().replace(File.separatorChar, '/').replace("/./", "/").replace(basePath, "");
-        if (PARENT != null)
-        {
-            PARENT.setChild(path, this);
-            isChild = true;
-        }
-        else
-        {
-            fileName = path;
-            load();
-        }
-    }
-
-    public Configuration(File file, boolean caseSensitiveCustomCategories)
-    {
-        this(file);
-        this.caseSensitiveCustomCategories = caseSensitiveCustomCategories;
-    }
-
-    /**
-     * 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 getBlock(String key, int defaultID) { return getBlock(CATEGORY_BLOCK, key, defaultID, null); }
-    public Property getBlock(String key, int defaultID, String comment) { return getBlock(CATEGORY_BLOCK, key, defaultID, comment); }
-    public Property getBlock(String category, String key, int defaultID) { return getBlockInternal(category, key, defaultID, null, 256, Block.blocksList.length); }
-    public Property getBlock(String category, String key, int defaultID, String comment) { return getBlockInternal(category, key, defaultID, comment, 256, Block.blocksList.length); }
-
-    /**
-     * Special version of getBlock to be used when you want to garentee the ID you get is below 256
-     * This should ONLY be used by mods who do low level terrain generation, or ones that add new
-     * biomes.
-     * EXA: ExtraBiomesXL
-     * 
-     * Specifically, if your block is used BEFORE the Chunk is created, and placed in the terrain byte array directly.
-     * If you add a new biome and you set the top/filler block, they need to be <256, nothing else.
-     * 
-     * If you're adding a new ore, DON'T call this function.
-     * 
-     * Normal mods such as '50 new ores' do not need to be below 256 so should use the normal getBlock
-     */
-    public Property getTerrainBlock(String category, String key, int defaultID, String comment)
-    {
-        return getBlockInternal(category, key, defaultID, comment, 0, 256); 
-    }
-
-    private Property getBlockInternal(String category, String key, int defaultID, String comment, int lower, int upper)
-    {
-        Property prop = get(category, key, -1, comment);
-
-        if (prop.getInt() != -1)
-        {
-            configMarkers[prop.getInt()] = true;
-            return prop;
-        }
-        else
-        {
-            if (defaultID < lower)
-            {
-                FMLLog.warning(
-                    "Mod attempted to get a block ID with a default in the Terrain Generation section, " +
-                    "mod authors should make sure there defaults are above 256 unless explicitly needed " +
-                    "for terrain generation. Most ores do not need to be below 256.");
-                FMLLog.warning("Config \"%s\" Category: \"%s\" Key: \"%s\" Default: %d", fileName, category, key, defaultID);
-                defaultID = upper - 1;
-            }
-
-            if (Block.blocksList[defaultID] == null && !configMarkers[defaultID])
-            {
-                prop.set(defaultID);
-                configMarkers[defaultID] = true;
-                return prop;
-            }
-            else
-            {
-                for (int j = upper - 1; j > 0; j--)
-                {
-                    if (Block.blocksList[j] == null && !configMarkers[j])
-                    {
-                        prop.set(j);
-                        configMarkers[j] = true;
-                        return prop;
-                    }
-                }
-
-                throw new RuntimeException("No more block ids available for " + key);
-            }
-        }
-    }
-
-    public Property getItem(String key, int defaultID) { return getItem(CATEGORY_ITEM, key, defaultID, null); }
-    public Property getItem(String key, int defaultID, String comment) { return getItem(CATEGORY_ITEM, key, defaultID, comment); }
-    public Property getItem(String category, String key, int defaultID) { return getItem(category, key, defaultID, null); }
-
-    public Property getItem(String category, String key, int defaultID, String comment)
-    {
-        Property prop = get(category, key, -1, comment);
-        int defaultShift = defaultID + ITEM_SHIFT;
-
-        if (prop.getInt() != -1)
-        {
-            configMarkers[prop.getInt() + ITEM_SHIFT] = true;
-            return prop;
-        }
-        else
-        {
-            if (defaultID < MAX_BLOCKS - ITEM_SHIFT)
-            {
-                FMLLog.warning(
-                    "Mod attempted to get a item ID with a default value in the block ID section, " +
-                    "mod authors should make sure there defaults are above %d unless explicitly needed " +
-                    "so that all block ids are free to store blocks.", MAX_BLOCKS - ITEM_SHIFT);
-                FMLLog.warning("Config \"%s\" Category: \"%s\" Key: \"%s\" Default: %d", fileName, category, key, defaultID);
-            }
-
-            if (Item.itemsList[defaultShift] == null && !configMarkers[defaultShift] && defaultShift >= Block.blocksList.length)
-            {
-                prop.set(defaultID);
-                configMarkers[defaultShift] = true;
-                return prop;
-            }
-            else
-            {
-                for (int x = Item.itemsList.length - 1; x >= ITEM_SHIFT; x--)
-                {
-                    if (Item.itemsList[x] == null && !configMarkers[x])
-                    {
-                        prop.set(x - ITEM_SHIFT);
-                        configMarkers[x] = true;
-                        return prop;
-                    }
-                }
-
-                throw new RuntimeException("No more item ids available for " + key);
-            }
-        }
-    }
-
-    public Property get(String category, String key, int defaultValue)
-    {
-        return get(category, key, defaultValue, null);
-    }
-
-    public Property get(String category, String key, int defaultValue, String comment)
-    {
-        Property prop = get(category, key, Integer.toString(defaultValue), comment, INTEGER);
-        if (!prop.isIntValue())
-        {
-            prop.set(defaultValue);
-        }
-        return prop;
-    }
-
-    public Property get(String category, String key, boolean defaultValue)
-    {
-        return get(category, key, defaultValue, null);
-    }
-
-    public Property get(String category, String key, boolean defaultValue, String comment)
-    {
-        Property prop = get(category, key, Boolean.toString(defaultValue), comment, BOOLEAN);
-        if (!prop.isBooleanValue())
-        {
-            prop.set(defaultValue);
-        }
-        return prop;
-    }
-
-    public Property get(String category, String key, double defaultValue)
-    {
-        return get(category, key, defaultValue, null);
-    }
-
-    public Property get(String category, String key, double defaultValue, String comment)
-    {
-        Property prop = get(category, key, Double.toString(defaultValue), comment, DOUBLE);
-        if (!prop.isDoubleValue())
-        {
-            prop.set(defaultValue);
-        }
-        return prop;
-    }
-
-    public Property get(String category, String key, String defaultValue)
-    {
-        return get(category, key, defaultValue, null);
-    }
-
-    public Property get(String category, String key, String defaultValue, String comment)
-    {
-        return get(category, key, defaultValue, comment, STRING);
-    }
-
-    public Property get(String category, String key, String[] defaultValue)
-    {
-        return get(category, key, defaultValue, null);
-    }
-
-    public Property get(String category, String key, String[] defaultValue, String comment)
-    {
-        return get(category, key, defaultValue, comment, STRING);
-    }
-
-    public Property get(String category, String key, int[] defaultValue)
-    {
-        return get(category, key, defaultValue, null);
-    }
-
-    public Property get(String category, String key, int[] defaultValue, String comment)
-    {
-        String[] values = new String[defaultValue.length];
-        for (int i = 0; i < defaultValue.length; i++)
-        {
-            values[i] = Integer.toString(defaultValue[i]);
-        }
-
-        Property prop =  get(category, key, values, comment, INTEGER);
-        if (!prop.isIntList())
-        {
-            prop.set(values);
-        }
-
-        return prop;
-    }
-
-    public Property get(String category, String key, double[] defaultValue)
-    {
-        return get(category, key, defaultValue, null);
-    }
-
-    public Property get(String category, String key, double[] defaultValue, String comment)
-    {
-        String[] values = new String[defaultValue.length];
-        for (int i = 0; i < defaultValue.length; i++)
-        {
-            values[i] = Double.toString(defaultValue[i]);
-        }
-
-        Property prop =  get(category, key, values, comment, DOUBLE);
-        
-        if (!prop.isDoubleList())
-        {
-            prop.set(values);
-        }
-
-        return prop;
-    }
-
-    public Property get(String category, String key, boolean[] defaultValue)
-    {
-        return get(category, key, defaultValue, null);
-    }
-
-    public Property get(String category, String key, boolean[] defaultValue, String comment)
-    {
-        String[] values = new String[defaultValue.length];
-        for (int i = 0; i < defaultValue.length; i++)
-        {
-            values[i] = Boolean.toString(defaultValue[i]);
-        }
-
-        Property prop =  get(category, key, values, comment, BOOLEAN);
-        
-        if (!prop.isBooleanList())
-        {
-            prop.set(values);
-        }
-
-        return prop;
-    }
-
-    public Property get(String category, String key, String defaultValue, String comment, Property.Type type)
-    {
-        if (!caseSensitiveCustomCategories)
-        {
-            category = category.toLowerCase(Locale.ENGLISH);
-        }
-
-        ConfigCategory cat = getCategory(category);
-
-        if (cat.containsKey(key))
-        {
-            Property prop = cat.get(key);
-
-            if (prop.getType() == null)
-            {
-                prop = new Property(prop.getName(), prop.getString(), type);
-                cat.put(key, prop);
-            }
-
-            prop.comment = comment;
-            return prop;
-        }
-        else if (defaultValue != null)
-        {
-            Property prop = new Property(key, defaultValue, type);
-            prop.set(defaultValue); //Set and mark as dirty to signify it should save 
-            cat.put(key, prop);
-            prop.comment = comment;
-            return prop;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    public Property get(String category, String key, String[] defaultValue, String comment, Property.Type type)
-    {
-        if (!caseSensitiveCustomCategories)
-        {
-            category = category.toLowerCase(Locale.ENGLISH);
-        }
-
-        ConfigCategory cat = getCategory(category);
-
-        if (cat.containsKey(key))
-        {
-            Property prop = cat.get(key);
-
-            if (prop.getType() == null)
-            {
-                prop = new Property(prop.getName(), prop.getString(), type);
-                cat.put(key, prop);
-            }
-
-            prop.comment = comment;
-
-            return prop;
-        }
-        else if (defaultValue != null)
-        {
-            Property prop = new Property(key, defaultValue, type);
-            prop.comment = comment;
-            cat.put(key, prop);
-            return prop;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    public boolean hasCategory(String category)
-    {
-        return categories.get(category) != null;
-    }
-
-    public boolean hasKey(String category, String key)
-    {
-        ConfigCategory cat = categories.get(category);
-        return cat != null && cat.containsKey(key);
-    }
-
-    public void load()
-    {
-        if (PARENT != null && PARENT != this)
-        {
-            return;
-        }
-
-        BufferedReader buffer = null;
-        UnicodeInputStreamReader input = null;
-        try
-        {
-            if (file.getParentFile() != null)
-            {
-                file.getParentFile().mkdirs();
-            }
-
-            if (!file.exists() && !file.createNewFile())
-            {
-                return;
-            }
-
-            if (file.canRead())
-            {
-                input = new UnicodeInputStreamReader(new FileInputStream(file), defaultEncoding);
-                defaultEncoding = input.getEncoding();
-                buffer = new BufferedReader(input);
-
-                String line;
-                ConfigCategory currentCat = null;
-                Property.Type type = null;
-                ArrayList<String> tmpList = null;
-                int lineNum = 0;
-                String name = null;
-
-                while (true)
-                {
-                    lineNum++;
-                    line = buffer.readLine();
-
-                    if (line == null)
-                    {
-                        break;
-                    }
-
-                    Matcher start = CONFIG_START.matcher(line);
-                    Matcher end = CONFIG_END.matcher(line);
-
-                    if (start.matches())
-                    {
-                        fileName = start.group(1);
-                        categories = new TreeMap<String, ConfigCategory>();
-                        continue;
-                    }
-                    else if (end.matches())
-                    {
-                        fileName = end.group(1);
-                        Configuration child = new Configuration();
-                        child.categories = categories;
-                        this.children.put(fileName, child);
-                        continue;
-                    }
-
-                    int nameStart = -1, nameEnd = -1;
-                    boolean skip = false;
-                    boolean quoted = false;
-
-                    for (int i = 0; i < line.length() && !skip; ++i)
-                    {
-                        if (Character.isLetterOrDigit(line.charAt(i)) || ALLOWED_CHARS.indexOf(line.charAt(i)) != -1 || (quoted && 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 '"':
-                                    if (quoted)
-                                    {
-                                        quoted = false;
-                                    }
-                                    if (!quoted && nameStart == -1)
-                                    {
-                                        quoted = true;
-                                    }
-                                    break;
-
-                                case '{':
-                                    name = line.substring(nameStart, nameEnd + 1);
-                                    String qualifiedName = ConfigCategory.getQualifiedName(name, currentCat);
-
-                                    ConfigCategory cat = categories.get(qualifiedName);
-                                    if (cat == null)
-                                    {
-                                        currentCat = new ConfigCategory(name, currentCat);
-                                        categories.put(qualifiedName, currentCat);
-                                    }
-                                    else
-                                    {
-                                        currentCat = cat;
-                                    }
-                                    name = null;
-
-                                    break;
-
-                                case '}':
-                                    if (currentCat == null)
-                                    {
-                                        throw new RuntimeException(String.format("Config file corrupt, attepted to close to many categories '%s:%d'", fileName, lineNum));
-                                    }
-                                    currentCat = currentCat.parent;
-                                    break;
-
-                                case '=':
-                                    name = line.substring(nameStart, nameEnd + 1);
-
-                                    if (currentCat == null)
-                                    {
-                                        throw new RuntimeException(String.format("'%s' has no scope in '%s:%d'", name, fileName, lineNum));
-                                    }
-
-                                    Property prop = new Property(name, line.substring(i + 1), type, true);
-                                    i = line.length();
-
-                                    currentCat.put(name, prop);
-
-                                    break;
-
-                                case ':':
-                                    type = Property.Type.tryParse(line.substring(nameStart, nameEnd + 1).charAt(0));
-                                    nameStart = nameEnd = -1;
-                                    break;
-
-                                case '<':
-                                    if (tmpList != null)
-                                    {
-                                        throw new RuntimeException(String.format("Malformed list property \"%s:%d\"", fileName, lineNum));
-                                    }
-
-                                    name = line.substring(nameStart, nameEnd + 1);
-
-                                    if (currentCat == null)
-                                    {
-                                        throw new RuntimeException(String.format("'%s' has no scope in '%s:%d'", name, fileName, lineNum));
-                                    }
-
-                                    tmpList = new ArrayList<String>();
-                                    
-                                    skip = true;
-                                    
-                                    break;
-
-                                case '>':
-                                    if (tmpList == null)
-                                    {
-                                        throw new RuntimeException(String.format("Malformed list property \"%s:%d\"", fileName, lineNum));
-                                    }
-
-                                    currentCat.put(name, new Property(name, tmpList.toArray(new String[tmpList.size()]), type));
-                                    name = null;
-                                    tmpList = null;
-                                    type = null;
-                                    break;
-
-                                default:
-                                    throw new RuntimeException(String.format("Unknown character '%s' in '%s:%d'", line.charAt(i), fileName, lineNum));
-                            }
-                        }
-                    }
-
-                    if (quoted)
-                    {
-                        throw new RuntimeException(String.format("Unmatched quote in '%s:%d'", fileName, lineNum));
-                    }
-                    else if (tmpList != null && !skip)
-                    {
-                        tmpList.add(line.trim());
-                    }
-                }
-            }
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-        }
-        finally
-        {
-            if (buffer != null)
-            {
-                try
-                {
-                    buffer.close();
-                } catch (IOException e){}
-            }
-            if (input != null)
-            {
-                try
-                {
-                    input.close();
-                } catch (IOException e){}
-            }
-        }
-
-        resetChangedState();
-    }
-
-    public void save()
-    {
-        if (PARENT != null && PARENT != this)
-        {
-            PARENT.save();
-            return;
-        }
-
-        try
-        {
-            if (file.getParentFile() != null)
-            {
-                file.getParentFile().mkdirs();
-            }
-
-            if (!file.exists() && !file.createNewFile())
-            {
-                return;
-            }
-
-            if (file.canWrite())
-            {
-                FileOutputStream fos = new FileOutputStream(file);
-                BufferedWriter buffer = new BufferedWriter(new OutputStreamWriter(fos, defaultEncoding));
-
-                buffer.write("# Configuration file" + NEW_LINE + NEW_LINE);
-
-                if (children.isEmpty())
-                {
-                    save(buffer);
-                }
-                else
-                {
-                    for (Map.Entry<String, Configuration> entry : children.entrySet())
-                    {
-                        buffer.write("START: \"" + entry.getKey() + "\"" + NEW_LINE);
-                        entry.getValue().save(buffer);
-                        buffer.write("END: \"" + entry.getKey() + "\"" + NEW_LINE + NEW_LINE);
-                    }
-                }
-
-                buffer.close();
-                fos.close();
-            }
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    private void save(BufferedWriter out) throws IOException
-    {        
-        for (ConfigCategory cat : categories.values())
-        {
-            if (!cat.isChild())
-            {
-                cat.write(out, 0);
-                out.newLine();
-            }
-        }
-    }
-
-    public ConfigCategory getCategory(String category)
-    {
-        ConfigCategory ret = categories.get(category);
-
-        if (ret == null)
-        {
-            if (category.contains(CATEGORY_SPLITTER))
-            {
-                String[] hierarchy = category.split("\\"+CATEGORY_SPLITTER);
-                ConfigCategory parent = categories.get(hierarchy[0]);
-
-                if (parent == null)
-                {
-                    parent = new ConfigCategory(hierarchy[0]);
-                    categories.put(parent.getQualifiedName(), parent);
-                    changed = true;
-                }
-
-                for (int i = 1; i < hierarchy.length; i++)
-                {
-                    String name = ConfigCategory.getQualifiedName(hierarchy[i], parent);
-                    ConfigCategory child = categories.get(name);
-
-                    if (child == null)
-                    {
-                        child = new ConfigCategory(hierarchy[i], parent);
-                        categories.put(name, child);
-                        changed = true;
-                    }
-
-                    ret = child;
-                    parent = child;
-                }
-            }
-            else
-            {
-                ret = new ConfigCategory(category);
-                categories.put(category, ret);
-                changed = true;
-            }
-        }
-
-        return ret;
-    }
-
-    public void removeCategory(ConfigCategory category)
-    {
-        for (ConfigCategory child : category.getChildren())
-        {
-            removeCategory(child);
-        }
-
-        if (categories.containsKey(category.getQualifiedName()))
-        {
-            categories.remove(category.getQualifiedName());
-            if (category.parent != null)
-            {
-                category.parent.removeChild(category);
-            }
-            changed = true;
-        }
-    }
-
-    public void addCustomCategoryComment(String category, String comment)
-    {
-        if (!caseSensitiveCustomCategories)
-            category = category.toLowerCase(Locale.ENGLISH);
-        getCategory(category).setComment(comment);
-    }
-
-    private void setChild(String name, Configuration child)
-    {
-        if (!children.containsKey(name))
-        {
-            children.put(name, child);
-            changed = true;
-        }
-        else
-        {
-            Configuration old = children.get(name);
-            child.categories = old.categories;
-            child.fileName = old.fileName;
-            old.changed = true;
-        }
-    }
-
-    public static void enableGlobalConfig()
-    {
-        PARENT = new Configuration(new File(Loader.instance().getConfigDir(), "global.cfg"));
-        PARENT.load();
-    }
-
-    public static class UnicodeInputStreamReader extends Reader
-    {
-        private final InputStreamReader input;
-        private final String defaultEnc;
-
-        public UnicodeInputStreamReader(InputStream source, String encoding) throws IOException
-        {
-            defaultEnc = encoding;
-            String enc = encoding;
-            byte[] data = new byte[4];
-
-            PushbackInputStream pbStream = new PushbackInputStream(source, data.length);
-            int read = pbStream.read(data, 0, data.length);
-            int size = 0;
-
-            int bom16 = (data[0] & 0xFF) << 8 | (data[1] & 0xFF);
-            int bom24 = bom16 << 8 | (data[2] & 0xFF);
-            int bom32 = bom24 << 8 | (data[3] & 0xFF);
-
-            if (bom24 == 0xEFBBBF)
-            {
-                enc = "UTF-8";
-                size = 3;
-            }
-            else if (bom16 == 0xFEFF)
-            {
-                enc = "UTF-16BE";
-                size = 2;
-            }
-            else if (bom16 == 0xFFFE)
-            {
-                enc = "UTF-16LE";
-                size = 2;
-            }
-            else if (bom32 == 0x0000FEFF)
-            {
-                enc = "UTF-32BE";
-                size = 4;
-            }
-            else if (bom32 == 0xFFFE0000) //This will never happen as it'll be caught by UTF-16LE,
-            {                             //but if anyone ever runs across a 32LE file, i'd like to disect it.
-                enc = "UTF-32LE";
-                size = 4;
-            }
-
-            if (size < read)
-            {
-                pbStream.unread(data, size, read - size);
-            }
-
-            this.input = new InputStreamReader(pbStream, enc);
-        }
-
-        public String getEncoding()
-        {
-            return input.getEncoding();
-        }
-
-        @Override
-        public int read(char[] cbuf, int off, int len) throws IOException
-        {
-            return input.read(cbuf, off, len);
-        }
-
-        @Override
-        public void close() throws IOException
-        {
-            input.close();
-        }
-    }
-
-    public boolean hasChanged()
-    {
-        if (changed) return true;
-        
-        for (ConfigCategory cat : categories.values())
-        {
-            if (cat.hasChanged()) return true;
-        }
-
-        for (Configuration child : children.values())
-        {
-            if (child.hasChanged()) return true;
-        }
-
-        return false;
-    }
-
-    private void resetChangedState()
-    {
-        changed = false;
-        for (ConfigCategory cat : categories.values())
-        {
-            cat.resetChangedState();
-        }
-
-        for (Configuration child : children.values())
-        {
-            child.resetChangedState();
-        }
-    }
-
-    public Set<String> getCategoryNames()
-    {
-        return ImmutableSet.copyOf(categories.keySet());
-    }
-}

common/net/minecraftforge/common/FakePlayer.java

@@ -1,48 +0,0 @@
-package net.minecraftforge.common;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemInWorldManager;
-import net.minecraft.network.packet.Packet204ClientInfo;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.stats.StatBase;
-import net.minecraft.util.ChatMessageComponent;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.util.DamageSource;
-import net.minecraft.world.World;
-
-//Preliminary, simple Fake Player class 
-public class FakePlayer extends EntityPlayerMP
-{
-    public FakePlayer(World world, String name)
-    {
-        super(FMLCommonHandler.instance().getMinecraftServerInstance(), world, name, new ItemInWorldManager(world));
-    }
-
-    public void sendChatToPlayer(String s){}
-    public boolean canCommandSenderUseCommand(int i, String s){ return false; }
-    public ChunkCoordinates getPlayerCoordinates()
-    {
-        return new ChunkCoordinates(0,0,0);
-    }
-
-    @Override
-    public void sendChatToPlayer(ChatMessageComponent chatmessagecomponent){}
-    @Override
-    public void addStat(StatBase par1StatBase, int par2){}
-    @Override
-    public void openGui(Object mod, int modGuiId, World world, int x, int y, int z){}
-    @Override 
-    public boolean isEntityInvulnerable(){ return true; }
-    @Override
-    public boolean canAttackPlayer(EntityPlayer player){ return false; }
-    @Override
-    public void onDeath(DamageSource source){ return; }
-    @Override
-    public void onUpdate(){ return; }
-    @Override
-    public void travelToDimension(int dim){ return; }
-    @Override
-    public void updateClientInfo(Packet204ClientInfo pkt){ return; }
-}

common/net/minecraftforge/common/FakePlayerFactory.java

@@ -1,34 +0,0 @@
-package net.minecraftforge.common;
-
-import net.minecraft.world.World;
-
-//To be expanded for generic Mod fake players?
-public class FakePlayerFactory
-{
-    // Map of all active fake player usernames to their entities
-    private static java.util.Map<String, FakePlayer> fakePlayers = new java.util.HashMap<String, FakePlayer>();
-    private static FakePlayer MINECRAFT_PLAYER = null;
-    
-    public static FakePlayer getMinecraft(World world)
-    {
-        if (MINECRAFT_PLAYER == null)
-        {
-            MINECRAFT_PLAYER = FakePlayerFactory.get(world,  "[Minecraft]");
-        }
-        return MINECRAFT_PLAYER;
-    }
-    
-    /**
-     * Get a fake player with a given username
-     */
-    public static FakePlayer get(World world, String username)
-    {
-        if (!fakePlayers.containsKey(username))
-        {
-            FakePlayer fakePlayer = new FakePlayer(world, username);
-            fakePlayers.put(username, fakePlayer);
-        }
-
-        return fakePlayers.get(username);
-    }
-}

common/net/minecraftforge/common/ForgeDirection.java

@@ -1,71 +0,0 @@
-package net.minecraftforge.common;
-
-public enum ForgeDirection
-{
-    /** -Y */
-    DOWN(0, -1, 0),
-
-    /** +Y */
-    UP(0, 1, 0),
-
-    /** -Z */
-    NORTH(0, 0, -1),
-
-    /** +Z */
-    SOUTH(0, 0, 1),
-
-    /** -X */
-    WEST(-1, 0, 0),
-
-    /** +X */
-    EAST(1, 0, 0),
-
-    /**
-     * Used only by getOrientation, for invalid inputs
-     */
-    UNKNOWN(0, 0, 0);
-
-    public final int offsetX;
-    public final int offsetY;
-    public final int offsetZ;
-    public final int flag;
-    public static final ForgeDirection[] VALID_DIRECTIONS = {DOWN, UP, NORTH, SOUTH, WEST, EAST};
-    public static final int[] OPPOSITES = {1, 0, 3, 2, 5, 4, 6};
-    // Left hand rule rotation matrix for all possible axes of rotation
-    public static final int[][] ROTATION_MATRIX = {
-        {0, 1, 4, 5, 3, 2, 6},
-        {0, 1, 5, 4, 2, 3, 6},
-    	{5, 4, 2, 3, 0, 1, 6},
-    	{4, 5, 2, 3, 1, 0, 6},
-    	{2, 3, 1, 0, 4, 5, 6},
-    	{3, 2, 0, 1, 4, 5, 6},
-    	{0, 1, 2, 3, 4, 5, 6},
-    };
-
-    private ForgeDirection(int x, int y, int z)
-    {
-        offsetX = x;
-        offsetY = y;
-        offsetZ = z;
-        flag = 1 << ordinal();
-    }
-
-    public static ForgeDirection getOrientation(int id)
-    {
-        if (id >= 0 && id < VALID_DIRECTIONS.length)
-        {
-            return VALID_DIRECTIONS[id];
-        }
-        return UNKNOWN;
-    }
-
-    public ForgeDirection getOpposite()
-    {
-        return getOrientation(OPPOSITES[ordinal()]);
-    }
-
-    public ForgeDirection getRotation(ForgeDirection axis)
-    {
-    	return getOrientation(ROTATION_MATRIX[axis.ordinal()][ordinal()]);
-    }
-}

common/net/minecraftforge/common/ForgeDummyContainer.java

@@ -1,254 +0,0 @@
-package net.minecraftforge.common;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.logging.Level;
-
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.management.PlayerInstance;
-import net.minecraft.world.storage.SaveHandler;
-import net.minecraft.world.storage.WorldInfo;
-import net.minecraftforge.classloading.FMLForgePlugin;
-import net.minecraftforge.common.network.ForgeConnectionHandler;
-import net.minecraftforge.common.network.ForgeNetworkHandler;
-import net.minecraftforge.common.network.ForgePacketHandler;
-import net.minecraftforge.common.network.ForgeTinyPacketHandler;
-import net.minecraftforge.oredict.RecipeSorter;
-import net.minecraftforge.server.command.ForgeCommand;
-
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
-import cpw.mods.fml.client.FMLFileResourcePack;
-import cpw.mods.fml.client.FMLFolderResourcePack;
-import cpw.mods.fml.common.DummyModContainer;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.LoadController;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ModMetadata;
-import cpw.mods.fml.common.WorldAccessContainer;
-import cpw.mods.fml.common.event.FMLConstructionEvent;
-import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.network.FMLNetworkHandler;
-import cpw.mods.fml.common.network.NetworkMod;
-import static net.minecraftforge.common.ForgeVersion.*;
-import static net.minecraftforge.common.Configuration.*;
-
-@NetworkMod(
-        channels = "FORGE",
-        connectionHandler = ForgeConnectionHandler.class,
-        packetHandler     = ForgePacketHandler.class,
-        tinyPacketHandler = ForgeTinyPacketHandler.class
-    )
-public class ForgeDummyContainer extends DummyModContainer implements WorldAccessContainer
-{
-    public static int clumpingThreshold = 64;
-    public static boolean removeErroringEntities = false;
-    public static boolean removeErroringTileEntities = false;
-    public static boolean disableStitchedFileSaving = false;
-    public static boolean forceDuplicateFluidBlockCrash = true;
-    public static boolean fullBoundingBoxLadders = false;
-    public static double zombieSummonBaseChance = 0.1;
-    public static int[] blendRanges = { 20, 15, 10, 5 };
-    public static float zombieBabyChance = 0.05f;
-    public static boolean shouldSortRecipies = false;
-
-    public ForgeDummyContainer()
-    {
-        super(new ModMetadata());
-        ModMetadata meta = getMetadata();
-        meta.modId       = "Forge";
-        meta.name        = "Minecraft Forge";
-        meta.version     = String.format("%d.%d.%d.%d", majorVersion, minorVersion, revisionVersion, buildVersion);
-        meta.credits     = "Made possible with help from many people";
-        meta.authorList  = Arrays.asList("LexManos", "Eloraam", "Spacetoad");
-        meta.description = "Minecraft Forge is a common open source API allowing a broad range of mods " +
-                           "to work cooperatively together. It allows many mods to be created without " +
-                           "them editing the main Minecraft code.";
-        meta.url         = "http://MinecraftForge.net";
-        meta.updateUrl   = "http://MinecraftForge.net/forum/index.php/topic,5.0.html";
-        meta.screenshots = new String[0];
-        meta.logoFile    = "/forge_logo.png";
-
-        Configuration config = null;
-        File cfgFile = new File(Loader.instance().getConfigDir(), "forge.cfg");
-        try
-        {
-            config = new Configuration(cfgFile);
-        }
-        catch (Exception e)
-        {
-            System.out.println("Error loading forge.cfg, deleting file and resetting: ");
-            e.printStackTrace();
-
-            if (cfgFile.exists())
-                cfgFile.delete();
-
-            config = new Configuration(cfgFile);
-        }
-        if (!config.isChild)
-        {
-            config.load();
-            Property enableGlobalCfg = config.get(Configuration.CATEGORY_GENERAL, "enableGlobalConfig", false);
-            if (enableGlobalCfg.getBoolean(false))
-            {
-                Configuration.enableGlobalConfig();
-            }
-        }
-        Property prop;
-        prop = config.get(Configuration.CATEGORY_GENERAL, "clumpingThreshold", 64);
-        prop.comment = "Controls the number threshold at which Packet51 is preferred over Packet52, default and minimum 64, maximum 1024";
-        clumpingThreshold = prop.getInt(64);
-        if (clumpingThreshold > 1024 || clumpingThreshold < 64)
-        {
-            clumpingThreshold = 64;
-            prop.set(64);
-        }
-
-        prop = config.get(Configuration.CATEGORY_GENERAL, "removeErroringEntities", false);
-        prop.comment = "Set this to just remove any TileEntity that throws a error in there update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES.";
-        removeErroringEntities = prop.getBoolean(false);
-
-        if (removeErroringEntities)
-        {
-            FMLLog.warning("Enabling removal of erroring Entities - USE AT YOUR OWN RISK");
-        }
-
-        prop = config.get(Configuration.CATEGORY_GENERAL, "removeErroringTileEntities", false);
-        prop.comment = "Set this to just remove any TileEntity that throws a error in there update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES.";
-        removeErroringTileEntities = prop.getBoolean(false);
-
-        if (removeErroringTileEntities)
-        {
-            FMLLog.warning("Enabling removal of erroring Tile Entities - USE AT YOUR OWN RISK");
-        }
-
-        //prop = config.get(Configuration.CATEGORY_GENERAL, "disableStitchedFileSaving", true);
-        //prop.comment = "Set this to just disable the texture stitcher from writing the 'debug.stitched_{name}.png file to disc. Just a small performance tweak. Default: true";
-        //disableStitchedFileSaving = prop.getBoolean(true);
-
-        prop = config.get(Configuration.CATEGORY_GENERAL, "fullBoundingBoxLadders", false);
-        prop.comment = "Set this to check the entire entity's collision bounding box for ladders instead of just the block they are in. Causes noticable differences in mechanics so default is vanilla behavior. Default: false";
-        fullBoundingBoxLadders = prop.getBoolean(false);
-
-        prop = config.get(Configuration.CATEGORY_GENERAL, "forceDuplicateFluidBlockCrash", true);
-        prop.comment = "Set this to force a crash if more than one block attempts to link back to the same Fluid. Enabled by default.";
-        forceDuplicateFluidBlockCrash = prop.getBoolean(true);
-
-        if (!forceDuplicateFluidBlockCrash)
-        {
-            FMLLog.warning("Disabling forced crashes on duplicate Fluid Blocks - USE AT YOUR OWN RISK");
-        }
-
-        prop = config.get(Configuration.CATEGORY_GENERAL, "biomeSkyBlendRange", new int[] { 20, 15, 10, 5 });
-        prop.comment = "Control the range of sky blending for colored skies in biomes.";
-        blendRanges = prop.getIntList();
-        
-        prop = config.get(Configuration.CATEGORY_GENERAL, "zombieBaseSummonChance", 0.1);
-        prop.comment = "Base zombie summoning spawn chance. Allows changing the bonus zombie summoning mechanic.";
-        zombieSummonBaseChance = prop.getDouble(0.1);
-        
-        prop = config.get(Configuration.CATEGORY_GENERAL, "zombieBabyChance", 0.05);
-        prop.comment = "Chance that a zombie (or subclass) is a baby. Allows changing the zombie spawning mechanic.";
-        zombieBabyChance = (float) prop.getDouble(0.05);
-
-        prop = config.get(CATEGORY_GENERAL, "sortRecipies", shouldSortRecipies);
-        prop.comment = "Set to true to enable the post initlization sorting of crafting recipes using Froge's sorter. May cause desyncing on conflicting recipies. ToDo: Set to true by default in 1.7";
-        shouldSortRecipies = prop.getBoolean(shouldSortRecipies);
-
-        if (config.hasChanged())
-        {
-            config.save();
-        }
-    }
-
-    @Override
-    public boolean registerBus(EventBus bus, LoadController controller)
-    {
-        bus.register(this);
-        return true;
-    }
-
-    @Subscribe
-    public void modConstruction(FMLConstructionEvent evt)
-    {
-        FMLLog.info("Registering Forge Packet Handler");
-        try
-        {
-            FMLNetworkHandler.instance().registerNetworkMod(new ForgeNetworkHandler(this));
-            FMLLog.info("Succeeded registering Forge Packet Handler");
-        }
-        catch (Exception e)
-        {
-            FMLLog.log(Level.SEVERE, e, "Failed to register packet handler for Forge");
-        }
-    }
-
-    @Subscribe
-    public void preInit(FMLPreInitializationEvent evt)
-    {
-        ForgeChunkManager.captureConfig(evt.getModConfigurationDirectory());
-    }
-
-    @Subscribe
-    public void postInit(FMLPostInitializationEvent evt)
-    {
-        BiomeDictionary.registerAllBiomesAndGenerateEvents();
-        ForgeChunkManager.loadConfiguration();
-    }
-
-    @Subscribe
-    public void onAvalible(FMLLoadCompleteEvent evt)
-    {
-        if (shouldSortRecipies)
-        {
-            RecipeSorter.sortCraftManager();
-        }
-    }
-
-    @Subscribe
-    public void serverStarting(FMLServerStartingEvent evt)
-    {
-        evt.registerServerCommand(new ForgeCommand(evt.getServer()));
-    }
-    @Override
-    public NBTTagCompound getDataForWriting(SaveHandler handler, WorldInfo info)
-    {
-        NBTTagCompound forgeData = new NBTTagCompound();
-        NBTTagCompound dimData = DimensionManager.saveDimensionDataMap();
-        forgeData.setCompoundTag("DimensionData", dimData);
-        return forgeData;
-    }
-
-    @Override
-    public void readData(SaveHandler handler, WorldInfo info, Map<String, NBTBase> propertyMap, NBTTagCompound tag)
-    {
-        if (tag.hasKey("DimensionData"))
-        {
-            DimensionManager.loadDimensionDataMap(tag.hasKey("DimensionData") ? tag.getCompoundTag("DimensionData") : null);
-        }
-    }
-
-    @Override
-    public File getSource()
-    {
-        return FMLForgePlugin.forgeLocation;
-    }
-    @Override
-    public Class<?> getCustomResourcePackClass()
-    {
-        if (getSource().isDirectory())
-        {
-            return FMLFolderResourcePack.class;
-        }
-        else
-        {
-            return FMLFileResourcePack.class;
-        }
-    }
-}

common/net/minecraftforge/common/ForgeHooks.java

@@ -1,500 +0,0 @@
-package net.minecraftforge.common;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.inventory.Container;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemArmor;
-import net.minecraft.item.ItemAxe;
-import net.minecraft.item.ItemPickaxe;
-import net.minecraft.item.ItemSpade;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemSword;
-import net.minecraft.network.NetServerHandler;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.Packet53BlockChange;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.ChatMessageComponent;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumMovingObjectType;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.WeightedRandom;
-import net.minecraft.util.WeightedRandomItem;
-import net.minecraft.world.EnumGameType;
-import net.minecraft.world.World;
-import net.minecraftforge.event.Event;
-import net.minecraftforge.event.ForgeEventFactory;
-import net.minecraftforge.event.ServerChatEvent;
-import net.minecraftforge.event.entity.item.ItemTossEvent;
-import net.minecraftforge.event.entity.living.LivingAttackEvent;
-import net.minecraftforge.event.entity.living.LivingDeathEvent;
-import net.minecraftforge.event.entity.living.LivingDropsEvent;
-import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent;
-import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
-import net.minecraftforge.event.entity.living.LivingFallEvent;
-import net.minecraftforge.event.entity.living.LivingHurtEvent;
-import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent;
-import net.minecraftforge.event.entity.player.PlayerOpenContainerEvent;
-import net.minecraftforge.event.world.BlockEvent;
-
-public class ForgeHooks
-{
-    static class GrassEntry extends WeightedRandomItem
-    {
-        public final Block block;
-        public final int metadata;
-        public GrassEntry(Block block, int meta, int weight)
-        {
-            super(weight);
-            this.block = block;
-            this.metadata = meta;
-        }
-    }
-
-    static class SeedEntry extends WeightedRandomItem
-    {
-        public final ItemStack seed;
-        public SeedEntry(ItemStack seed, int weight)
-        {
-            super(weight);
-            this.seed = seed;
-        }
-    }
-    static final List<GrassEntry> grassList = new ArrayList<GrassEntry>();
-    static final List<SeedEntry> seedList = new ArrayList<SeedEntry>();
-
-    public static void plantGrass(World world, int x, int y, int z)
-    {
-        GrassEntry grass = (GrassEntry)WeightedRandom.getRandomItem(world.rand, grassList);
-        if (grass == null || grass.block == null || !grass.block.canBlockStay(world, x, y, z))
-        {
-            return;
-        }
-        world.setBlock(x, y, z, grass.block.blockID, grass.metadata, 3);
-    }
-
-    public static ItemStack getGrassSeed(World world)
-    {
-        SeedEntry entry = (SeedEntry)WeightedRandom.getRandomItem(world.rand, seedList);
-        if (entry == null || entry.seed == null)
-        {
-            return null;
-        }
-        return entry.seed.copy();
-    }
-
-    private static boolean toolInit = false;
-    static HashMap<Item, List> toolClasses = new HashMap<Item, List>();
-    static HashMap<List, Integer> toolHarvestLevels = new HashMap<List, Integer>();
-    static HashSet<List> toolEffectiveness = new HashSet<List>();
-
-    public static boolean canHarvestBlock(Block block, EntityPlayer player, int metadata)
-    {
-        if (block.blockMaterial.isToolNotRequired())
-        {
-            return true;
-        }
-
-        ItemStack stack = player.inventory.getCurrentItem();
-        if (stack == null)
-        {
-            return player.canHarvestBlock(block);
-        }
-
-        List info = toolClasses.get(stack.getItem());
-        if (info == null)
-        {
-            return player.canHarvestBlock(block);
-        }
-
-        Object[] tmp = info.toArray();
-        String toolClass = (String)tmp[0];
-        int harvestLevel = (Integer)tmp[1];
-
-        Integer blockHarvestLevel = toolHarvestLevels.get(Arrays.asList(block, metadata, toolClass));
-        if (blockHarvestLevel == null)
-        {
-            return player.canHarvestBlock(block);
-        }
-
-        if (blockHarvestLevel > harvestLevel)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    public static boolean canToolHarvestBlock(Block block, int metadata, ItemStack stack)
-    {
-        if (stack == null) return false;
-        List info = toolClasses.get(stack.getItem());
-        if (info == null) return false;
-
-        Object[] tmp = info.toArray();
-        String toolClass = (String)tmp[0];
-        int harvestLevel = (Integer)tmp[1];
-
-        Integer blockHarvestLevel = toolHarvestLevels.get(Arrays.asList(block, metadata, toolClass));
-        return !(blockHarvestLevel == null || blockHarvestLevel > harvestLevel);
-    }
-
-    public static float blockStrength(Block block, EntityPlayer player, World world, int x, int y, int z)
-    {
-        int metadata = world.getBlockMetadata(x, y, z);
-        float hardness = block.getBlockHardness(world, x, y, z);
-        if (hardness < 0.0F)
-        {
-            return 0.0F;
-        }
-
-        if (!canHarvestBlock(block, player, metadata))
-        {
-            float speed = ForgeEventFactory.getBreakSpeed(player, block, metadata, 1.0f);
-            return (speed < 0 ? 0 : speed) / hardness / 100F;
-        }
-        else
-        {
-             return player.getCurrentPlayerStrVsBlock(block, false, metadata) / hardness / 30F;
-        }
-    }
-
-    public static boolean isToolEffective(ItemStack stack, Block block, int metadata)
-    {
-        List toolClass = toolClasses.get(stack.getItem());
-        return toolClass != null && toolEffectiveness.contains(Arrays.asList(block, metadata, toolClass.get(0)));
-    }
-
-    static void initTools()
-    {
-        if (toolInit)
-        {
-            return;
-        }
-        toolInit = true;
-
-        MinecraftForge.setToolClass(Item.pickaxeWood,    "pickaxe", 0);
-        MinecraftForge.setToolClass(Item.pickaxeStone,   "pickaxe", 1);
-        MinecraftForge.setToolClass(Item.pickaxeIron,   "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.axeIron,   "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.shovelIron,   "shovel", 2);
-        MinecraftForge.setToolClass(Item.shovelGold,    "shovel", 0);
-        MinecraftForge.setToolClass(Item.shovelDiamond, "shovel", 3);
-
-        for (Block block : ItemPickaxe.blocksEffectiveAgainst)
-        {
-            MinecraftForge.setBlockHarvestLevel(block, "pickaxe", 0);
-        }
-
-        for (Block block : ItemSpade.blocksEffectiveAgainst)
-        {
-            MinecraftForge.setBlockHarvestLevel(block, "shovel", 0);
-        }
-
-        for (Block block : ItemAxe.blocksEffectiveAgainst)
-        {
-            MinecraftForge.setBlockHarvestLevel(block, "axe", 0);
-        }
-
-        MinecraftForge.setBlockHarvestLevel(Block.obsidian,     "pickaxe", 3);
-        MinecraftForge.setBlockHarvestLevel(Block.oreEmerald,   "pickaxe", 2);
-        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.blockIron,   "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");
-    }
-
-    public static int getTotalArmorValue(EntityPlayer player)
-    {
-        int ret = 0;
-        for (int x = 0; x < player.inventory.armorInventory.length; x++)
-        {
-            ItemStack stack = player.inventory.armorInventory[x];
-            if (stack != null && stack.getItem() instanceof ISpecialArmor)
-            {
-                ret += ((ISpecialArmor)stack.getItem()).getArmorDisplay(player, stack, x);
-            }
-            else if (stack != null && stack.getItem() instanceof ItemArmor)
-            {
-                ret += ((ItemArmor)stack.getItem()).damageReduceAmount;
-            }
-        }
-        return ret;
-    }
-
-    static
-    {
-        grassList.add(new GrassEntry(Block.plantYellow, 0, 20));
-        grassList.add(new GrassEntry(Block.plantRed,    0, 10));
-        seedList.add(new SeedEntry(new ItemStack(Item.seeds), 10));
-        initTools();
-    }
-
-    /**
-     * Called when a player uses 'pick block', calls new Entity and Block hooks.
-     */
-    public static boolean onPickBlock(MovingObjectPosition target, EntityPlayer player, World world)
-    {
-        ItemStack result = null;
-        boolean isCreative = player.capabilities.isCreativeMode;
-
-        if (target.typeOfHit == EnumMovingObjectType.TILE)
-        {
-            int x = target.blockX;
-            int y = target.blockY;
-            int z = target.blockZ;
-            Block var8 = Block.blocksList[world.getBlockId(x, y, z)];
-
-            if (var8 == null)
-            {
-                return false;
-            }
-
-            result = var8.getPickBlock(target, world, x, y, z);
-        }
-        else
-        {
-            if (target.typeOfHit != EnumMovingObjectType.ENTITY || target.entityHit == null || !isCreative)
-            {
-                return false;
-            }
-
-            result = target.entityHit.getPickedResult(target);
-        }
-
-        if (result == null)
-        {
-            return false;
-        }
-
-        for (int x = 0; x < 9; x++)
-        {
-            ItemStack stack = player.inventory.getStackInSlot(x);
-            if (stack != null && stack.isItemEqual(result) && ItemStack.areItemStackTagsEqual(stack, result))
-            {
-                player.inventory.currentItem = x;
-                return true;
-            }
-        }
-
-        if (!isCreative)
-        {
-            return false;
-        }
-
-        int slot = player.inventory.getFirstEmptyStack();
-        if (slot < 0 || slot >= 9)
-        {
-            slot = player.inventory.currentItem;
-        }
-
-        player.inventory.setInventorySlotContents(slot, result);
-        player.inventory.currentItem = slot;
-        return true;
-    }
-
-    //Optifine Helper Functions u.u, these are here specifically for Optifine
-    //Note: When using Optfine, these methods are invoked using reflection, which
-    //incurs a major performance penalty.
-    public static void onLivingSetAttackTarget(EntityLivingBase entity, EntityLivingBase target)
-    {
-        MinecraftForge.EVENT_BUS.post(new LivingSetAttackTargetEvent(entity, target));
-    }
-
-    public static boolean onLivingUpdate(EntityLivingBase entity)
-    {
-        return MinecraftForge.EVENT_BUS.post(new LivingUpdateEvent(entity));
-    }
-
-    public static boolean onLivingAttack(EntityLivingBase entity, DamageSource src, float amount)
-    {
-        return MinecraftForge.EVENT_BUS.post(new LivingAttackEvent(entity, src, amount));
-    }
-
-    public static float onLivingHurt(EntityLivingBase entity, DamageSource src, float amount)
-    {
-        LivingHurtEvent event = new LivingHurtEvent(entity, src, amount);
-        return (MinecraftForge.EVENT_BUS.post(event) ? 0 : event.ammount);
-    }
-
-    public static boolean onLivingDeath(EntityLivingBase entity, DamageSource src)
-    {
-        return MinecraftForge.EVENT_BUS.post(new LivingDeathEvent(entity, src));
-    }
-
-    public static boolean onLivingDrops(EntityLivingBase entity, DamageSource source, ArrayList<EntityItem> drops, int lootingLevel, boolean recentlyHit, int specialDropValue)
-    {
-        return MinecraftForge.EVENT_BUS.post(new LivingDropsEvent(entity, source, drops, lootingLevel, recentlyHit, specialDropValue));
-    }
-
-    public static float onLivingFall(EntityLivingBase entity, float distance)
-    {
-        LivingFallEvent event = new LivingFallEvent(entity, distance);
-        return (MinecraftForge.EVENT_BUS.post(event) ? 0.0f : event.distance);
-    }
-
-    public static boolean isLivingOnLadder(Block block, World world, int x, int y, int z, EntityLivingBase entity)
-    {
-        if (!ForgeDummyContainer.fullBoundingBoxLadders)
-        {
-            return block != null && block.isLadder(world, x, y, z, entity);
-        }
-        else
-        {
-            AxisAlignedBB bb = entity.boundingBox;
-            int mX = MathHelper.floor_double(bb.minX);
-            int mY = MathHelper.floor_double(bb.minY);
-            int mZ = MathHelper.floor_double(bb.minZ);
-            for (int y2 = mY; y2 < bb.maxY; y2++)
-            {
-                for (int x2 = mX; x2 < bb.maxX; x2++)
-                {
-                    for (int z2 = mZ; z2 < bb.maxZ; z2++)
-                    {
-                        block = Block.blocksList[world.getBlockId(x2, y2, z2)];                        
-                        if (block != null && block.isLadder(world, x2, y2, z2, entity))
-                        {
-                            return true;
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-    }
-
-    public static void onLivingJump(EntityLivingBase entity)
-    {
-        MinecraftForge.EVENT_BUS.post(new LivingJumpEvent(entity));
-    }
-
-    public static EntityItem onPlayerTossEvent(EntityPlayer player, ItemStack item)
-    {
-        player.captureDrops = true;
-        EntityItem ret = player.dropPlayerItemWithRandomChoice(item, false);
-        player.capturedDrops.clear();
-        player.captureDrops = false;
-
-        if (ret == null)
-        {
-            return null;
-        }
-
-        ItemTossEvent event = new ItemTossEvent(ret, player);
-        if (MinecraftForge.EVENT_BUS.post(event))
-        {
-            return null;
-        }
-
-        player.joinEntityItemWithWorld(event.entityItem);
-        return event.entityItem;
-    }
-
-    public static float getEnchantPower(World world, int x, int y, int z)
-    {
-        if (world.isAirBlock(x, y, z))
-        {
-            return 0;
-        }
-
-        Block block = Block.blocksList[world.getBlockId(x, y, z)];
-        return (block == null ? 0 : block.getEnchantPowerBonus(world, x, y, z));
-    }
-
-    public static ChatMessageComponent onServerChatEvent(NetServerHandler net, String raw, ChatMessageComponent comp)
-    {
-        ServerChatEvent event = new ServerChatEvent(net.playerEntity, raw, comp);
-        if (MinecraftForge.EVENT_BUS.post(event))
-        {
-            return null;
-        }
-        return event.component;
-    }
-    
-    public static boolean canInteractWith(EntityPlayer player, Container openContainer)
-    {
-        PlayerOpenContainerEvent event = new PlayerOpenContainerEvent(player, openContainer);
-        MinecraftForge.EVENT_BUS.post(event);
-        return event.getResult() == Event.Result.DEFAULT ? event.canInteractWith : event.getResult() == Event.Result.ALLOW ? true : false;
-    }
-    
-    public static BlockEvent.BreakEvent onBlockBreakEvent(World world, EnumGameType gameType, EntityPlayerMP entityPlayer, int x, int y, int z)
-    {
-        // Logic from tryHarvestBlock for pre-canceling the event
-        boolean preCancelEvent = false;
-        if (gameType.isAdventure() && !entityPlayer.isCurrentToolAdventureModeExempt(x, y, z))
-        {
-            preCancelEvent = true;
-        }
-        else if (gameType.isCreative() && entityPlayer.getHeldItem() != null && entityPlayer.getHeldItem().getItem() instanceof ItemSword)
-        {
-            preCancelEvent = true;
-        }
-
-        // Tell client the block is gone immediately then process events
-        if (world.getBlockTileEntity(x, y, z) == null)
-        {
-            Packet53BlockChange packet = new Packet53BlockChange(x, y, z, world);
-            packet.type = 0;
-            packet.metadata = 0;
-            entityPlayer.playerNetServerHandler.sendPacketToPlayer(packet);
-        }
-
-        // Post the block break event
-        Block block = Block.blocksList[world.getBlockId(x, y, z)];
-        int blockMetadata = world.getBlockMetadata(x, y, z);
-        BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(x, y, z, world, block, blockMetadata, entityPlayer);
-        event.setCanceled(preCancelEvent);
-        MinecraftForge.EVENT_BUS.post(event);
-
-        // Handle if the event is canceled
-        if (event.isCanceled())
-        {
-            // Let the client know the block still exists
-            entityPlayer.playerNetServerHandler.sendPacketToPlayer(new Packet53BlockChange(x, y, z, world));
-            
-            // Update any tile entity data for this block
-            TileEntity tileentity = world.getBlockTileEntity(x, y, z);
-            if (tileentity != null)
-            {
-                Packet pkt = tileentity.getDescriptionPacket();
-                if (pkt != null)
-                {
-                    entityPlayer.playerNetServerHandler.sendPacketToPlayer(pkt);
-                }
-            }
-        }
-        return event;
-    }
-}

common/net/minecraftforge/common/ForgeVersion.java

@@ -1,44 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public
- * License v1.0.
- */
-
-package net.minecraftforge.common;
-
-public class ForgeVersion
-{
-    //This number is incremented every time we remove deprecated code/major API changes, never reset
-    public static final int majorVersion    = 9;
-    //This number is incremented every minecraft release, never reset
-    public static final int minorVersion    = 11;
-    //This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version
-    public static final int revisionVersion = 1;
-    //This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code.
-    public static final int buildVersion    = 0;
-
-    public static int getMajorVersion()
-    {
-        return majorVersion;
-    }
-
-    public static int getMinorVersion()
-    {
-        return minorVersion;
-    }
-
-    public static int getRevisionVersion()
-    {
-        return revisionVersion;
-    }
-
-    public static int getBuildVersion()
-    {
-        return buildVersion;
-    }
-
-    public static String getVersion()
-    {
-        return String.format("%d.%d.%d.%d", majorVersion, minorVersion, revisionVersion, buildVersion);
-    }
-}
-

common/net/minecraftforge/common/IPlantable.java

@@ -1,10 +0,0 @@
-package net.minecraftforge.common;
-
-import net.minecraft.world.World;
-
-public interface IPlantable
-{
-    public EnumPlantType getPlantType(World world, int x, int y, int z);
-    public int getPlantID(World world, int x, int y, int z);
-    public int getPlantMetadata(World world, int x, int y, int z);
-}

common/net/minecraftforge/common/MinecraftForge.java

@@ -1,222 +0,0 @@
-package net.minecraftforge.common;
-
-import java.lang.reflect.Constructor;
-import java.util.*;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IconRegister;
-import net.minecraft.crash.CrashReport;
-import net.minecraft.entity.monster.EntityEnderman;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.ForgeHooks.GrassEntry;
-import net.minecraftforge.common.ForgeHooks.SeedEntry;
-import net.minecraftforge.event.EventBus;
-import net.minecraftforge.event.ForgeSubscribe;
-import net.minecraftforge.event.entity.EntityEvent;
-import net.minecraftforge.oredict.OreDictionary;
-
-public class MinecraftForge
-{
-    /**
-     * The core Forge EventBusses, all events for Forge will be fired on these,
-     * you should use this to register all your listeners.
-     * This replaces every register*Handler() function in the old version of Forge.
-     * TERRAIN_GEN_BUS for terrain gen events
-     * ORE_GEN_BUS for ore gen events
-     * EVENT_BUS for everything else
-     */
-    public static final EventBus EVENT_BUS = new EventBus();
-    public static final EventBus TERRAIN_GEN_BUS = new EventBus();
-    public static final EventBus ORE_GEN_BUS = new EventBus();
-
-    private static final ForgeInternalHandler INTERNAL_HANDLER = new ForgeInternalHandler();
-
-
-    /** Register a new plant to be planted when bonemeal is used on grass.
-     * @param block The block to place.
-     * @param metadata The metadata to set for the block when being placed.
-     * @param weight The weight of the plant, where red flowers are
-     *               10 and yellow flowers are 20.
-     */
-    public static void addGrassPlant(Block block, int metadata, int weight)
-    {
-        ForgeHooks.grassList.add(new GrassEntry(block, metadata, weight));
-    }
-
-    /**
-     * Register a new seed to be dropped when breaking tall grass.
-     *
-     * @param seed The item to drop as a seed.
-     * @param weight The relative probability of the seeds,
-     *               where wheat seeds are 10.
-     */
-    public static void addGrassSeed(ItemStack seed, int weight)
-    {
-        ForgeHooks.seedList.add(new SeedEntry(seed, weight));
-    }
-
-    /**
-     *
-     * Register a tool as a tool class with a given harvest level.
-     *
-     * @param tool The custom tool to register.
-     * @param toolClass The tool class to register as.  The predefined tool
-     *                  clases are "pickaxe", "shovel", "axe".  You can add
-     *                  others for custom tools.
-     * @param harvestLevel The harvest level of the tool.
-     */
-   public static void setToolClass(Item tool, String toolClass, int harvestLevel)
-   {
-       ForgeHooks.toolClasses.put(tool, Arrays.asList(toolClass, harvestLevel));
-   }
-
-   /**
-    * 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 block The block to register.
-    * @param metadata The metadata for the block subtype.
-    * @param toolClass 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 harvestLevel The minimum tool harvest level required to successfully
-    * harvest the block.
-    * @see MinecraftForge#setToolClass for details on tool classes.
-    */
-   public static void setBlockHarvestLevel(Block block, int metadata, String toolClass, int harvestLevel)
-   {
-       List key = Arrays.asList(block, metadata, toolClass);
-       ForgeHooks.toolHarvestLevels.put(key, harvestLevel);
-       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 block The block to remove effectiveness from.
-    * @param metadata The metadata for the block subtype.
-    * @param toolClass The tool class to remove the effectiveness mapping from.
-    * @see MinecraftForge#setToolClass for details on tool classes.
-    */
-   public static void removeBlockEffectiveness(Block block, int metadata, String toolClass)
-   {
-       List key = Arrays.asList(block, metadata, toolClass);
-       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 block The block to register.
-    * @param toolClass 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 harvestLevel The minimum tool harvest level required to successfully
-    *                     harvest the block.
-    * @see MinecraftForge#setToolClass for details on tool classes.
-    */
-   public static void setBlockHarvestLevel(Block block, String toolClass, int harvestLevel)
-   {
-       for (int metadata = 0; metadata < 16; metadata++)
-       {
-           List key = Arrays.asList(block, metadata, toolClass);
-           ForgeHooks.toolHarvestLevels.put(key, harvestLevel);
-           ForgeHooks.toolEffectiveness.add(key);
-       }
-   }
-
-   /**
-    * Returns the block harvest level for a particular tool class.
-    *
-    * @param block The block to check.
-    * @param metadata The metadata for the block subtype.
-    * @param toolClass The tool class to check as able to remove this block.
-    * @see MinecraftForge#setToolClass for details on tool classes.
-    * @return The harvest level or -1 if no mapping exists.
-    */
-   public static int getBlockHarvestLevel(Block block, int metadata, String toolClass)
-   {
-       ForgeHooks.initTools();
-       List key = Arrays.asList(block, metadata, toolClass);
-       Integer harvestLevel = ForgeHooks.toolHarvestLevels.get(key);
-       return (harvestLevel == null ? -1 : harvestLevel);
-   }
-
-   /**
-    * 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 block The block to remove effectiveness from.
-    * @param toolClass The tool class to remove the effectiveness mapping from.
-    * @see MinecraftForge#setToolClass for details on tool classes.
-    */
-   public static void removeBlockEffectiveness(Block block, String toolClass)
-   {
-       for (int metadata = 0; metadata < 16; metadata++)
-       {
-           List key = Arrays.asList(block, metadata, toolClass);
-           ForgeHooks.toolEffectiveness.remove(key);
-       }
-   }
-
-   /**
-    * Method invoked by FML before any other mods are loaded.
-    */
-   public static void initialize()
-   {
-       System.out.printf("MinecraftForge v%s Initialized\n", ForgeVersion.getVersion());
-       FMLLog.info("MinecraftForge v%s Initialized", ForgeVersion.getVersion());
-
-       Block filler = new Block(0, Material.air)
-       {
-           @SideOnly(Side.CLIENT)
-           @Override
-           public void registerIcons(IconRegister register){}
-       };
-       Block.blocksList[0] = null;
-       Block.opaqueCubeLookup[0] = false;
-       Block.lightOpacity[0] = 0;
-       filler.setUnlocalizedName("ForgeFiller");
-
-       for (int x = 256; x < 4096; x++)
-       {
-           if (Item.itemsList[x] != null)
-           {
-               Block.blocksList[x] = filler;
-           }
-       }
-
-       boolean[] temp = new boolean[4096];
-       System.arraycopy(EntityEnderman.carriableBlocks, 0, temp, 0, EntityEnderman.carriableBlocks.length);
-       EntityEnderman.carriableBlocks = temp;
-
-       EVENT_BUS.register(INTERNAL_HANDLER);
-       OreDictionary.getOreName(0);
-
-       //Force these classes to be defined, Should prevent derp error hiding.
-       new CrashReport("ThisIsFake", new Exception("Not real"));
-   }
-
-   public static String getBrandingVersion()
-   {
-       return "Minecraft Forge "+ ForgeVersion.getVersion();
-   }
-}

common/net/minecraftforge/common/Property.java

@@ -1,409 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public
- * License v1.0.
- */
-
-package net.minecraftforge.common;
-
-import java.util.ArrayList;
-
-import net.minecraftforge.common.Property.Type;
-
-public class Property
-{
-    public enum Type
-    {
-        STRING,
-        INTEGER,
-        BOOLEAN,
-        DOUBLE;
-
-        private static Type[] values = {STRING, INTEGER, BOOLEAN, DOUBLE};
-
-        public static Type tryParse(char id)
-        {
-            for (int x = 0; x < values.length; x++)
-            {
-                if (values[x].getID() == id)
-                {
-                    return values[x];
-                }
-            }
-
-            return STRING;
-        }
-
-        public char getID()
-        {
-            return name().charAt(0);
-        }
-    }
-
-    private String name;
-    private String value;
-    public String comment;
-    private String[] values;
-
-    private final boolean wasRead;
-    private final boolean isList;
-    private final Type type;
-    private boolean changed = false;
-
-    public Property()
-    {
-        wasRead = false;
-        type    = null;
-        isList  = false;
-    }
-
-    public Property(String name, String value, Type type)
-    {
-        this(name, value, type, false);
-    }
-
-    Property(String name, String value, Type type, boolean read)
-    {
-        setName(name);
-        this.value = value;
-        this.type  = type;
-        wasRead    = read;
-        isList     = false;
-    }
-
-    public Property(String name, String[] values, Type type)
-    {
-        this(name, values, type, false);
-    }
-
-    Property(String name, String[] values, Type type, boolean read)
-    {
-        setName(name);
-        this.type   = type;
-        this.values = values;
-        wasRead     = read;
-        isList      = true;
-    }
-
-    /**
-     * Returns the value in this property as it's raw string.
-     * 
-     * @return current value
-     */
-    public String getString()
-    {
-        return value;
-    }
-
-    /**
-     * Returns the value in this property as an integer,
-     * if the value is not a valid integer, it will return -1.
-     * 
-     * @return The value
-     */
-    public int getInt()
-    {
-        return getInt(-1);
-    }
-
-    /**
-     * Returns the value in this property as an integer,
-     * if the value is not a valid integer, it will return the
-     * provided default.
-     * 
-     * @param _default The default to provide if the current value is not a valid integer
-     * @return The value
-     */
-    public int getInt(int _default)
-    {
-        try
-        {
-            return Integer.parseInt(value);
-        }
-        catch (NumberFormatException e)
-        {
-            return _default;
-        }
-    }
-    
-    /**
-     * Checks if the current value stored in this property can be converted to an integer.
-     * @return True if the type of the Property is an Integer
-     */
-    public boolean isIntValue()
-    {
-        try
-        {
-            Integer.parseInt(value);
-            return true;
-        }
-        catch (NumberFormatException e)
-        {
-            return false;
-        }
-    }
-
-    /**
-     * Returns the value in this property as a boolean,
-     * if the value is not a valid boolean, it will return the
-     * provided default.
-     * 
-     * @param _default The default to provide
-     * @return The value as a boolean, or the default
-     */
-    public boolean getBoolean(boolean _default)
-    {
-        if (isBooleanValue())
-        {
-            return Boolean.parseBoolean(value);
-        }
-        else
-        {
-            return _default;
-        }
-    }
-
-    /**
-     * Checks if the current value held by this property is a valid boolean value.
-     * @return True if it is a boolean value
-     */
-    public boolean isBooleanValue()
-    {
-        return ("true".equals(value.toLowerCase()) || "false".equals(value.toLowerCase()));
-    }
-
-    /**
-     * Checks if the current value held by this property is a valid double value.
-     * @return True if the value can be converted to an double
-     */
-    public boolean isDoubleValue()
-    {
-        try
-        {
-            Double.parseDouble(value);
-            return true;
-        }
-        catch (NumberFormatException e)
-        {
-            return false;
-        }
-    }
-
-    /**
-     * Returns the value in this property as a double,
-     * if the value is not a valid double, it will return the
-     * provided default.
-     * 
-     * @param _default The default to provide if the current value is not a valid double
-     * @return The value
-     */
-    public double getDouble(double _default)
-    {
-        try
-        {
-            return Double.parseDouble(value);
-        }
-        catch (NumberFormatException e)
-        {
-            return _default;
-        }
-    }
-
-    public String[] getStringList()
-    {
-        return values;
-    }
-
-    /**
-     * Returns the integer value of all values that can
-     * be parsed in the list.
-     * 
-     * @return Array of length 0 if none of the values could be parsed.
-     */
-    public int[] getIntList()
-    {
-        ArrayList<Integer> nums = new ArrayList<Integer>();
-        
-        for (String value : values)
-        {
-            try
-            {
-                nums.add(Integer.parseInt(value));
-            }
-            catch (NumberFormatException e){}
-        }
-
-        int[] primitives = new int[nums.size()];
-
-        for (int i = 0; i < nums.size(); i++)
-        {
-            primitives[i] = nums.get(i);
-        }
-
-        return primitives;
-    }
-
-    /**
-     * Checks if all of the current values stored in this property can be converted to an integer.
-     * @return True if the type of the Property is an Integer List
-     */
-    public boolean isIntList()
-    {
-        for (String value : values)
-        {
-            try
-            {
-                Integer.parseInt(value);
-            }
-            catch (NumberFormatException e)
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Returns the boolean value of all values that can
-     * be parsed in the list.
-     * 
-     * @return Array of length 0 if none of the values could be parsed.
-     */
-    public boolean[] getBooleanList()
-    {
-        ArrayList<Boolean> tmp = new ArrayList<Boolean>();
-        for (String value : values)
-        {
-            try
-            {
-                tmp.add(Boolean.parseBoolean(value));
-            }
-            catch (NumberFormatException e){}
-        }
-
-        boolean[] primitives = new boolean[tmp.size()];
-
-        for (int i = 0; i < tmp.size(); i++)
-        {
-            primitives[i] = tmp.get(i);
-        }
-
-        return primitives;
-    }
-
-    /**
-     * Checks if all of current values stored in this property can be converted to a boolean.
-     * @return True if it is a boolean value
-     */
-    public boolean isBooleanList()
-    {
-        for (String value : values)
-        {
-            if (!"true".equalsIgnoreCase(value) && !"false".equalsIgnoreCase(value))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the double value of all values that can
-     * be parsed in the list.
-     * 
-     * @return Array of length 0 if none of the values could be parsed.
-     */
-    public double[] getDoubleList()
-    {
-        ArrayList<Double> tmp = new ArrayList<Double>();
-        for (String value : values)
-        {
-            try
-            {
-                tmp.add(Double.parseDouble(value));
-            }
-            catch (NumberFormatException e) {}
-        }
-
-        double[] primitives = new double[tmp.size()];
-
-        for (int i = 0; i < tmp.size(); i++)
-        {
-            primitives[i] = tmp.get(i);
-        }
-
-        return primitives;
-    }
-
-    /**
-     * Checks if all of the current values stored in this property can be converted to a double.
-     * @return True if the type of the Property is a double List
-     */
-    public boolean isDoubleList()
-    {
-        for (String value : values)
-        {
-            try
-            {
-                Double.parseDouble(value);
-            }
-            catch (NumberFormatException e)
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    /**
-     * Determines if this config value was just created, or if it was read from the config file.
-     * This is useful for mods who auto-assign there blocks to determine if the ID returned is 
-     * a configured one, or a automatically generated one.
-     * 
-     * @return True if this property was loaded from the config file with a value
-     */
-    public boolean wasRead()
-    {
-        return wasRead;
-    }
-
-    public Type getType()
-    {
-        return type;
-    }
-
-    public boolean isList()
-    {
-        return isList;
-    }
-
-    public boolean hasChanged(){ return changed; }
-    void resetChangedState(){ changed = false; }
-
-    public void set(String value)
-    {
-        this.value = value;
-        changed = true;
-    }
-
-    public void set(String[] values)
-    {
-        this.values = values;
-        changed = true;
-    }
-
-    public void set(int     value){ set(Integer.toString(value)); }
-    public void set(boolean value){ set(Boolean.toString(value)); }
-    public void set(double  value){ set(Double.toString(value));  }
-}

common/net/minecraftforge/common/RotationHelper.java

@@ -1,408 +0,0 @@
-package net.minecraftforge.common;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockAnvil;
-import net.minecraft.block.BlockBed;
-import net.minecraft.block.BlockButton;
-import net.minecraft.block.BlockChest;
-import net.minecraft.block.BlockCocoa;
-import net.minecraft.block.BlockComparator;
-import net.minecraft.block.BlockDetectorRail;
-import net.minecraft.block.BlockDispenser;
-import net.minecraft.block.BlockDoor;
-import net.minecraft.block.BlockEndPortalFrame;
-import net.minecraft.block.BlockEnderChest;
-import net.minecraft.block.BlockFenceGate;
-import net.minecraft.block.BlockFurnace;
-import net.minecraft.block.BlockHopper;
-import net.minecraft.block.BlockLadder;
-import net.minecraft.block.BlockLever;
-import net.minecraft.block.BlockLog;
-import net.minecraft.block.BlockMushroomCap;
-import net.minecraft.block.BlockPistonBase;
-import net.minecraft.block.BlockPistonExtension;
-import net.minecraft.block.BlockPumpkin;
-import net.minecraft.block.BlockRail;
-import net.minecraft.block.BlockRailPowered;
-import net.minecraft.block.BlockRedstoneRepeater;
-import net.minecraft.block.BlockSkull;
-import net.minecraft.block.BlockStairs;
-import net.minecraft.block.BlockTorch;
-import net.minecraft.block.BlockTrapDoor;
-import net.minecraft.block.BlockTripWireSource;
-import net.minecraft.block.BlockVine;
-import net.minecraft.world.World;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static net.minecraftforge.common.ForgeDirection.*;
-
-public class RotationHelper {
-    /**
-     * Some blocks have the same rotation.
-     * The first of these blocks (sorted by itemID) should be listed as a type.
-     * Some of the types aren't actual blocks (helper types).
-     */
-    private static enum BlockType {
-        LOG,
-        DISPENSER,
-        BED,
-        RAIL,
-        RAIL_POWERED,
-        RAIL_ASCENDING,
-        RAIL_CORNER,
-        TORCH,
-        STAIR,
-        CHEST,
-        SIGNPOST,
-        DOOR,
-        LEVER,
-        BUTTON,
-        REDSTONE_REPEATER,
-        TRAPDOOR,
-        MUSHROOM_CAP,
-        MUSHROOM_CAP_CORNER,
-        MUSHROOM_CAP_SIDE,
-        VINE,
-        SKULL,
-        ANVIL
-    }
-
-    private static final ForgeDirection[] UP_DOWN_AXES = new ForgeDirection[] { UP, DOWN };
-    private static final Map<BlockType, BiMap<Integer, ForgeDirection>> MAPPINGS = new HashMap<BlockType, BiMap<Integer, ForgeDirection>>();
-
-    public static ForgeDirection[] getValidVanillaBlockRotations(Block block)
-    {
-        return (block instanceof BlockBed || block instanceof BlockPumpkin || block instanceof BlockFenceGate || block instanceof BlockEndPortalFrame || block instanceof BlockTripWireSource || block instanceof BlockCocoa || block instanceof BlockRailPowered || block instanceof BlockDetectorRail || block instanceof BlockStairs || block instanceof BlockChest || block instanceof BlockEnderChest || block instanceof BlockFurnace || block instanceof BlockLadder || block.blockID == Block.signWall.blockID || block.blockID == Block.signPost.blockID || block instanceof BlockDoor || block instanceof BlockRail || block instanceof BlockButton || block instanceof BlockRedstoneRepeater || block instanceof BlockComparator || block instanceof BlockTrapDoor || block instanceof BlockMushroomCap || block instanceof BlockVine || block instanceof BlockSkull || block instanceof BlockAnvil) ? UP_DOWN_AXES : VALID_DIRECTIONS;
-    }
-
-    public static boolean rotateVanillaBlock(Block block, World worldObj, int x, int y, int z, ForgeDirection axis)
-    {
-        if (worldObj.isRemote)
-        {
-            return false;
-        }
-
-        if (axis == UP || axis == DOWN)
-        {
-            if (block instanceof BlockBed || block instanceof BlockPumpkin || block instanceof BlockFenceGate || block instanceof BlockEndPortalFrame || block instanceof BlockTripWireSource || block instanceof BlockCocoa)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.BED);
-            }
-            if (block instanceof BlockRail)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.RAIL);
-            }
-            if (block instanceof BlockRailPowered || block instanceof BlockDetectorRail)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.RAIL_POWERED);
-            }
-            if (block instanceof BlockStairs)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.STAIR);
-            }
-            if (block instanceof BlockChest || block instanceof BlockEnderChest || block instanceof BlockFurnace || block instanceof BlockLadder || block.blockID == Block.signWall.blockID)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.CHEST);
-            }
-            if (block.blockID == Block.signPost.blockID)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.SIGNPOST);
-            }
-            if (block instanceof BlockDoor)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.DOOR);
-            }
-            if (block instanceof BlockButton)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.BUTTON);
-            }
-            if (block instanceof BlockRedstoneRepeater || block instanceof BlockComparator)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.REDSTONE_REPEATER);
-            }
-            if (block instanceof BlockTrapDoor)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0x3, BlockType.TRAPDOOR);
-            }
-            if (block instanceof BlockMushroomCap)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.MUSHROOM_CAP);
-            }
-            if (block instanceof BlockVine)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.VINE);
-            }
-            if (block instanceof BlockSkull)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.SKULL);
-            }
-            if (block instanceof BlockAnvil)
-            {
-                return rotateBlock(worldObj, x, y, z, axis, 0x1, BlockType.ANVIL);
-            }
-        }
-
-        if (block instanceof BlockLog)
-        {
-            return rotateBlock(worldObj, x, y, z, axis, 0xC, BlockType.LOG);
-        }
-        if (block instanceof BlockDispenser || block instanceof BlockPistonBase || block instanceof BlockPistonExtension || block instanceof BlockHopper)
-        {
-            return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.DISPENSER);
-        }
-        if (block instanceof BlockTorch)
-        {
-            return rotateBlock(worldObj, x, y, z, axis, 0xF, BlockType.TORCH);
-        }
-        if (block instanceof BlockLever)
-        {
-            return rotateBlock(worldObj, x, y, z, axis, 0x7, BlockType.LEVER);
-        }
-
-        return false;
-    }
-
-    private static boolean rotateBlock(World worldObj, int x, int y, int z, ForgeDirection axis, int mask, BlockType blockType)
-    {
-        int rotMeta = worldObj.getBlockMetadata(x, y, z);
-        if (blockType == BlockType.DOOR && (rotMeta & 0x8) == 0x8)
-        {
-            return false;
-        }
-        int masked = rotMeta & ~mask;
-        int meta = rotateMetadata(axis, blockType, rotMeta & mask);
-        if (meta == -1)
-        {
-            return false;
-        }
-        worldObj.setBlockMetadataWithNotify(x, y, z, meta & mask | masked, 3);
-        return true;
-    }
-
-    private static int rotateMetadata(ForgeDirection axis, BlockType blockType, int meta)
-    {
-        if (blockType == BlockType.RAIL || blockType == BlockType.RAIL_POWERED)
-        {
-            if (meta == 0x0 || meta == 0x1)
-            {
-                return ~meta & 0x1;
-            }
-            if (meta >= 0x2 && meta <= 0x5)
-            {
-                blockType = BlockType.RAIL_ASCENDING;
-            }
-            if (meta >= 0x6 && meta <= 0x9 && blockType == BlockType.RAIL)
-            {
-                blockType = BlockType.RAIL_CORNER;
-            }
-        }
-        if (blockType == BlockType.SIGNPOST)
-        {
-            return (axis == UP) ? (meta + 0x4) % 0x10 : (meta + 0xC) % 0x10;
-        }
-        if (blockType == BlockType.LEVER && (axis == UP || axis == DOWN))
-        {
-            switch (meta)
-            {
-            case 0x5:
-                return 0x6;
-            case 0x6:
-                return 0x5;
-            case 0x7:
-                return 0x0;
-            case 0x0:
-                return 0x7;
-            }
-        }
-        if (blockType == BlockType.MUSHROOM_CAP)
-        {
-            if (meta % 0x2 == 0)
-            {
-                blockType = BlockType.MUSHROOM_CAP_SIDE;
-            }
-            else
-            {
-                blockType = BlockType.MUSHROOM_CAP_CORNER;
-            }
-        }
-        if (blockType == BlockType.VINE)
-        {
-            return ((meta << 1) | ((meta & 0x8) >> 3));
-        }
-
-        ForgeDirection orientation = metadataToDirection(blockType, meta);
-        ForgeDirection rotated = orientation.getRotation(axis);
-        return directionToMetadata(blockType, rotated);
-    }
-
-    private static ForgeDirection metadataToDirection(BlockType blockType, int meta)
-    {
-        if (blockType == BlockType.LEVER)
-        {
-            if (meta == 0x6)
-            {
-                meta = 0x5;
-            }
-            else if (meta == 0x0)
-            {
-                meta = 0x7;
-            }
-        }
-
-        if (MAPPINGS.containsKey(blockType))
-        {
-            BiMap<Integer, ForgeDirection> biMap = MAPPINGS.get(blockType);
-            if (biMap.containsKey(meta))
-            {
-                return biMap.get(meta);
-            }
-        }
-
-        if (blockType == BlockType.TORCH)
-        {
-            return ForgeDirection.getOrientation(6 - meta);
-        }
-        if (blockType == BlockType.STAIR)
-        {
-            return ForgeDirection.getOrientation(5 - meta);
-        }
-        if (blockType == BlockType.CHEST || blockType == BlockType.DISPENSER || blockType == BlockType.SKULL)
-        {
-            return ForgeDirection.getOrientation(meta);
-        }
-        if (blockType == BlockType.BUTTON)
-        {
-            return ForgeDirection.getOrientation(6 - meta);
-        }
-        if (blockType == BlockType.TRAPDOOR)
-        {
-            return ForgeDirection.getOrientation(meta + 2).getOpposite();
-        }
-
-        return ForgeDirection.UNKNOWN;
-    }
-
-    private static int directionToMetadata(BlockType blockType, ForgeDirection direction)
-    {
-        if ((blockType == BlockType.LOG || blockType == BlockType.ANVIL) && (direction.offsetX + direction.offsetY + direction.offsetZ) < 0)
-        {
-            direction = direction.getOpposite();
-        }
-
-        if (MAPPINGS.containsKey(blockType))
-        {
-            BiMap<ForgeDirection, Integer> biMap = MAPPINGS.get(blockType).inverse();
-            if (biMap.containsKey(direction))
-            {
-                return biMap.get(direction);
-            }
-        }
-
-        if (blockType == BlockType.TORCH)
-        {
-            if (direction.ordinal() >= 1)
-            {
-                return 6 - direction.ordinal();
-            }
-        }
-        if (blockType == BlockType.STAIR)
-        {
-            return 5 - direction.ordinal();
-        }
-        if (blockType == BlockType.CHEST || blockType == BlockType.DISPENSER || blockType == BlockType.SKULL)
-        {
-            return direction.ordinal();
-        }
-        if (blockType == BlockType.BUTTON)
-        {
-            if (direction.ordinal() >= 2)
-            {
-                return 6 - direction.ordinal();
-            }
-        }
-        if (blockType == BlockType.TRAPDOOR)
-        {
-            return direction.getOpposite().ordinal() - 2;
-        }
-
-        return -1;
-    }
-
-    static
-    {
-        BiMap<Integer, ForgeDirection> biMap;
-
-        biMap = HashBiMap.create(3);
-        biMap.put(0x0, UP);
-        biMap.put(0x4, EAST);
-        biMap.put(0x8, SOUTH);
-        MAPPINGS.put(BlockType.LOG, biMap);
-
-        biMap = HashBiMap.create(4);
-        biMap.put(0x0, SOUTH);
-        biMap.put(0x1, WEST);
-        biMap.put(0x2, NORTH);
-        biMap.put(0x3, EAST);
-        MAPPINGS.put(BlockType.BED, biMap);
-
-        biMap = HashBiMap.create(4);
-        biMap.put(0x2, EAST);
-        biMap.put(0x3, WEST);
-        biMap.put(0x4, NORTH);
-        biMap.put(0x5, SOUTH);
-        MAPPINGS.put(BlockType.RAIL_ASCENDING, biMap);
-
-        biMap = HashBiMap.create(4);
-        biMap.put(0x6, WEST);
-        biMap.put(0x7, NORTH);
-        biMap.put(0x8, EAST);
-        biMap.put(0x9, SOUTH);
-        MAPPINGS.put(BlockType.RAIL_CORNER, biMap);
-
-        biMap = HashBiMap.create(6);
-        biMap.put(0x1, EAST);
-        biMap.put(0x2, WEST);
-        biMap.put(0x3, SOUTH);
-        biMap.put(0x4, NORTH);
-        biMap.put(0x5, UP);
-        biMap.put(0x7, DOWN);
-        MAPPINGS.put(BlockType.LEVER, biMap);
-
-        biMap = HashBiMap.create(4);
-        biMap.put(0x0, WEST);
-        biMap.put(0x1, NORTH);
-        biMap.put(0x2, EAST);
-        biMap.put(0x3, SOUTH);
-        MAPPINGS.put(BlockType.DOOR, biMap);
-
-        biMap = HashBiMap.create(4);
-        biMap.put(0x0, NORTH);
-        biMap.put(0x1, EAST);
-        biMap.put(0x2, SOUTH);
-        biMap.put(0x3, WEST);
-        MAPPINGS.put(BlockType.REDSTONE_REPEATER, biMap);
-
-        biMap = HashBiMap.create(4);
-        biMap.put(0x1, EAST);
-        biMap.put(0x3, SOUTH);
-        biMap.put(0x7, NORTH);
-        biMap.put(0x9, WEST);
-        MAPPINGS.put(BlockType.MUSHROOM_CAP_CORNER, biMap);
-
-        biMap = HashBiMap.create(4);
-        biMap.put(0x2, NORTH);
-        biMap.put(0x4, WEST);
-        biMap.put(0x6, EAST);
-        biMap.put(0x8, SOUTH);
-        MAPPINGS.put(BlockType.MUSHROOM_CAP_SIDE, biMap);
-
-        biMap = HashBiMap.create(2);
-        biMap.put(0x0, SOUTH);
-        biMap.put(0x1, EAST);
-        MAPPINGS.put(BlockType.ANVIL, biMap);
-    }
-}

common/net/minecraftforge/common/network/ForgeConnectionHandler.java

@@ -1,55 +0,0 @@
-package net.minecraftforge.common.network;
-
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.NetLoginHandler;
-import net.minecraft.network.packet.NetHandler;
-import net.minecraft.network.packet.Packet1Login;
-import net.minecraft.network.packet.Packet250CustomPayload;
-import net.minecraft.server.MinecraftServer;
-import net.minecraftforge.fluids.FluidIdMapPacket;
-import cpw.mods.fml.common.network.IConnectionHandler;
-import cpw.mods.fml.common.network.PacketDispatcher;
-import cpw.mods.fml.common.network.Player;
-
-public class ForgeConnectionHandler implements IConnectionHandler {
-
-    @Override
-    public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager)
-    {
-        Packet250CustomPayload[] fluidPackets = ForgePacket.makePacketSet(new FluidIdMapPacket());
-        for (int i = 0; i < fluidPackets.length; i++) {
-            PacketDispatcher.sendPacketToPlayer(fluidPackets[i], player);
-        }
-    }
-
-    @Override
-    public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager)
-    {
-        return null;
-    }
-
-    @Override
-    public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager)
-    {
-
-    }
-
-    @Override
-    public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager)
-    {
-
-    }
-
-    @Override
-    public void connectionClosed(INetworkManager manager)
-    {
-
-    }
-
-    @Override
-    public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login)
-    {
-
-    }
-
-}

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

@@ -1,20 +0,0 @@
-package net.minecraftforge.common.network;
-
-import net.minecraftforge.common.ForgeDummyContainer;
-import cpw.mods.fml.common.network.NetworkMod;
-import cpw.mods.fml.common.network.NetworkModHandler;
-
-public class ForgeNetworkHandler extends NetworkModHandler
-{
-    public ForgeNetworkHandler(ForgeDummyContainer container)
-    {
-        super(container,container.getClass().getAnnotation(NetworkMod.class));
-        configureNetworkMod(container);
-    }
-
-    @Override
-    public boolean acceptVersion(String version)
-    {
-        return true;
-    }
-}

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

@@ -1,192 +0,0 @@
-package net.minecraftforge.common.network;
-
-import java.util.Arrays;
-import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.NetHandler;
-import net.minecraft.network.packet.Packet250CustomPayload;
-import net.minecraftforge.common.network.packet.DimensionRegisterPacket;
-import net.minecraftforge.fluids.FluidIdMapPacket;
-
-import com.google.common.base.Throwables;
-import com.google.common.collect.MapMaker;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteStreams;
-import com.google.common.primitives.Bytes;
-import com.google.common.primitives.Ints;
-import com.google.common.primitives.UnsignedBytes;
-
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.network.FMLNetworkException;
-
-public abstract class ForgePacket
-{
-    public static final String CHANNEL_ID = "FORGE";
-    enum Type
-    {
-        /**
-         * Registers a dimension for a provider on client
-         */
-        REGISTERDIMENSION(DimensionRegisterPacket.class),
-        /**
-         * The Fluid ID map to send to the client
-         */
-        FLUID_IDMAP(FluidIdMapPacket.class);
-
-        private Class<? extends ForgePacket> packetType;
-        private ConcurrentMap<INetworkManager, ForgePacket> partTracker;
-
-        private Type(Class<? extends ForgePacket> clazz)
-        {
-            this.packetType = clazz;
-        }
-
-        ForgePacket make()
-        {
-            try
-            {
-                return this.packetType.newInstance();
-            }
-            catch (Exception e)
-            {
-                Throwables.propagateIfPossible(e);
-                FMLLog.log(Level.SEVERE, e, "A bizarre critical error occured during packet encoding");
-                throw new FMLNetworkException(e);
-            }
-        }
-
-        private ForgePacket consumePart(INetworkManager network, byte[] data)
-        {
-            if (partTracker == null)
-            {
-                partTracker = new MapMaker().weakKeys().weakValues().makeMap();
-            }
-            if (!partTracker.containsKey(network))
-            {
-                partTracker.put(network, make());
-            }
-
-            ForgePacket pkt = partTracker.get(network);
-
-            ByteArrayDataInput bdi = ByteStreams.newDataInput(data);
-            int chunkIdx = UnsignedBytes.toInt(bdi.readByte());
-            int chunkTotal = UnsignedBytes.toInt(bdi.readByte());
-            int chunkLength = bdi.readInt();
-
-            if (pkt.partials == null)
-            {
-                pkt.partials = new byte[chunkTotal][];
-            }
-
-            pkt.partials[chunkIdx] = new byte[chunkLength];
-            bdi.readFully(pkt.partials[chunkIdx]);
-            for (int i = 0; i < pkt.partials.length; i++)
-            {
-                if (pkt.partials[i] == null)
-                {
-                    return null;
-                }
-            }
-
-            return pkt;
-        }
-    }
-
-    private Type type;
-    private byte[][] partials;
-
-    public static Packet250CustomPayload[] makePacketSet(ForgePacket packet)
-    {
-        byte[] packetData = packet.generatePacket();
-
-        if (packetData.length < 32000)
-        {
-            return new Packet250CustomPayload[]
-            {
-                new Packet250CustomPayload(CHANNEL_ID, 
-                    Bytes.concat(new byte[]
-                    {
-                        UnsignedBytes.checkedCast(0), //IsMultipart: False
-                        UnsignedBytes.checkedCast(packet.getID())
-                    },
-                    packetData))
-            };
-        }
-        else
-        {
-            byte[][] chunks = new byte[packetData.length / 32000 + 1][];
-            for (int i = 0; i < packetData.length / 32000 + 1; i++)
-            {
-                int len = Math.min(32000, packetData.length - i* 32000);
-                chunks[i] = Bytes.concat(new byte[]
-                    {
-                        UnsignedBytes.checkedCast(1),              //IsMultipart: True
-                        UnsignedBytes.checkedCast(packet.getID()), //Packet ID
-                        UnsignedBytes.checkedCast(i),              //Part Number
-                        UnsignedBytes.checkedCast(chunks.length),  //Total Parts
-                    },
-                    Ints.toByteArray(len),                         //Length
-                    Arrays.copyOfRange(packetData, i * 32000, len + i * 32000));
-            }
-
-            Packet250CustomPayload[] ret = new Packet250CustomPayload[chunks.length];
-            for (int i = 0; i < chunks.length; i++)
-            {
-                ret[i] = new Packet250CustomPayload(CHANNEL_ID, chunks[i]);
-            }
-            return ret;
-        }
-    }
-
-    public static ForgePacket readPacket(INetworkManager network, byte[] payload)
-    {
-        boolean multipart = UnsignedBytes.toInt(payload[0]) == 1;
-        int type = UnsignedBytes.toInt(payload[1]);
-        Type eType = Type.values()[type];
-        byte[] data = Arrays.copyOfRange(payload, 2, payload.length);
-
-        if (multipart)
-        {
-            ForgePacket pkt = eType.consumePart(network, data);
-            if (pkt != null)
-            {
-                return pkt.consumePacket(Bytes.concat(pkt.partials));
-            }
-            return null;
-        }
-        else
-        {
-            return eType.make().consumePacket(data);
-        }
-    }
-
-    public ForgePacket()
-    {
-        for (Type t : Type.values())
-        {
-            if (t.packetType == getClass())
-            {
-                type = t;
-                continue;
-            }
-        }
-        if (type == null)
-        {
-            throw new RuntimeException("ForgePacket constructor called on ungregistered type.");
-        }
-    }
-
-    public byte getID()
-    {
-        return UnsignedBytes.checkedCast(type.ordinal());
-    }
-
-    public abstract byte[] generatePacket();
-
-    public abstract ForgePacket consumePacket(byte[] data);
-
-    public abstract void execute(INetworkManager network, EntityPlayer player);
-}

common/net/minecraftforge/common/network/ForgePacketHandler.java

@@ -1,26 +0,0 @@
-package net.minecraftforge.common.network;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.NetLoginHandler;
-import net.minecraft.network.packet.Packet250CustomPayload;
-import cpw.mods.fml.common.network.FMLPacket;
-import cpw.mods.fml.common.network.IPacketHandler;
-import cpw.mods.fml.common.network.Player;
-
-public class ForgePacketHandler implements IPacketHandler {
-
-    @Override
-    public void onPacketData(INetworkManager network, Packet250CustomPayload packet, Player player)
-    {
-        ForgePacket pkt = ForgePacket.readPacket(network, packet.data);
-        // Part of an incomplete multipart packet
-        if (pkt == null)
-        {
-            return;
-        }
-
-        pkt.execute(network, (EntityPlayer)player);
-    }
-
-}

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

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

common/net/minecraftforge/common/network/packet/DimensionRegisterPacket.java

@@ -1,69 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public
- * License v1.0.
- */
-
-package net.minecraftforge.common.network.packet;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.NetHandler;
-import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.common.network.ForgePacket;
-
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-/**
- * This class offers the ability for servers to register dimensions on client.
- */
-public class DimensionRegisterPacket extends ForgePacket
-{
-
-    /** The dimension ID to register on client */
-    public int dimensionId;
-    /** The provider ID to register with dimension on client */
-    public int providerId;
-
-    // nullary constructor required by ForgePacket.make()
-    public DimensionRegisterPacket() {}
-
-    public DimensionRegisterPacket(int dimensionId, int providerId)
-    {
-        this.dimensionId = dimensionId;
-        this.providerId = providerId;
-    }
-
-    @Override
-    public byte[] generatePacket()
-    {
-        ByteArrayDataOutput dat = ByteStreams.newDataOutput();
-        dat.writeInt(this.dimensionId);
-        dat.writeInt(this.providerId);
-        return dat.toByteArray();
-    }
-
-    @Override
-    public ForgePacket consumePacket(byte[] data)
-    {
-        ByteArrayDataInput dat = ByteStreams.newDataInput(data);
-        dimensionId = dat.readInt();
-        providerId = dat.readInt();
-        return this;
-    }
-
-    @Override
-    public void execute(INetworkManager network, EntityPlayer player)
-    {
-        if (!(player instanceof EntityPlayerMP))
-        {
-            if (!DimensionManager.isDimensionRegistered(dimensionId))
-            {
-                DimensionManager.registerDimension(dimensionId, providerId);
-            }
-        }
-    }
-
-}

common/net/minecraftforge/event/ASMEventHandler.java

@@ -1,130 +0,0 @@
-package net.minecraftforge.event;
-
-import static org.objectweb.asm.Opcodes.*;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-
-
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Type;
-
-import com.google.common.collect.Maps;
-
-
-public class ASMEventHandler implements IEventListener
-{
-    private static int IDs = 0;
-    private static final String HANDLER_DESC = Type.getInternalName(IEventListener.class);
-    private static final String HANDLER_FUNC_DESC = Type.getMethodDescriptor(IEventListener.class.getDeclaredMethods()[0]);    
-    private static final ASMClassLoader LOADER = new ASMClassLoader();
-    private static final HashMap<Method, Class<?>> cache = Maps.newHashMap();
-    
-    private final IEventListener handler;
-    private final ForgeSubscribe subInfo;
-    public ASMEventHandler(Object target, Method method) throws Exception
-    {
-        handler = (IEventListener)createWrapper(method).getConstructor(Object.class).newInstance(target);
-        subInfo = method.getAnnotation(ForgeSubscribe.class);
-    }
-
-    @Override
-    public void invoke(Event event)
-    {
-        if (handler != null)
-        {
-            if (!event.isCancelable() || !event.isCanceled() || subInfo.receiveCanceled())
-            {
-                handler.invoke(event);
-            }
-        }
-    }
-    
-    public EventPriority getPriority()
-    {
-        return subInfo.priority();
-    }
-    
-    public Class<?> createWrapper(Method callback)
-    {
-        if (cache.containsKey(callback))
-        {
-            return cache.get(callback);
-        }
-
-        ClassWriter cw = new ClassWriter(0);
-        MethodVisitor mv;
-        
-        String name = getUniqueName(callback);
-        String desc = name.replace('.',  '/');
-        String instType = Type.getInternalName(callback.getDeclaringClass());
-        String eventType = Type.getInternalName(callback.getParameterTypes()[0]);
-        
-        /*
-        System.out.println("Name:     " + name);
-        System.out.println("Desc:     " + desc);
-        System.out.println("InstType: " + instType);
-        System.out.println("Callback: " + callback.getName() + Type.getMethodDescriptor(callback));
-        System.out.println("Event:    " + eventType);
-        */
-        
-        cw.visit(V1_6, ACC_PUBLIC | ACC_SUPER, desc, null, "java/lang/Object", new String[]{ HANDLER_DESC });
-
-        cw.visitSource(".dynamic", null);
-        {
-            cw.visitField(ACC_PUBLIC, "instance", "Ljava/lang/Object;", null, null).visitEnd();
-        }
-        {
-            mv = cw.visitMethod(ACC_PUBLIC, "<init>", "(Ljava/lang/Object;)V", null, null);
-            mv.visitCode();
-            mv.visitVarInsn(ALOAD, 0);
-            mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
-            mv.visitVarInsn(ALOAD, 0);
-            mv.visitVarInsn(ALOAD, 1);
-            mv.visitFieldInsn(PUTFIELD, desc, "instance", "Ljava/lang/Object;");
-            mv.visitInsn(RETURN);
-            mv.visitMaxs(2, 2);
-            mv.visitEnd();
-        }
-        {
-            mv = cw.visitMethod(ACC_PUBLIC, "invoke", HANDLER_FUNC_DESC, null, null);
-            mv.visitCode();
-            mv.visitVarInsn(ALOAD, 0);
-            mv.visitFieldInsn(GETFIELD, desc, "instance", "Ljava/lang/Object;");
-            mv.visitTypeInsn(CHECKCAST, instType);
-            mv.visitVarInsn(ALOAD, 1);
-            mv.visitTypeInsn(CHECKCAST, eventType);
-            mv.visitMethodInsn(INVOKEVIRTUAL, instType, callback.getName(), Type.getMethodDescriptor(callback));
-            mv.visitInsn(RETURN);
-            mv.visitMaxs(2, 2);
-            mv.visitEnd();
-        }
-        cw.visitEnd();
-        Class<?> ret = LOADER.define(name, cw.toByteArray());
-        cache.put(callback, ret);
-        return ret;
-    }
-    
-    private String getUniqueName(Method callback)
-    {
-        return String.format("%s_%d_%s_%s_%s", getClass().getName(), IDs++, 
-                callback.getDeclaringClass().getSimpleName(), 
-                callback.getName(), 
-                callback.getParameterTypes()[0].getSimpleName());
-    }
-    
-    private static class ASMClassLoader extends ClassLoader
-    {
-        private ASMClassLoader()
-        {
-            super(ASMClassLoader.class.getClassLoader());
-        }
-        
-        public Class<?> define(String name, byte[] data)
-        {
-            return defineClass(name, data, 0, data.length);
-        }
-    }
-
-}

common/net/minecraftforge/event/Cancelable.java

@@ -1,11 +0,0 @@
-package net.minecraftforge.event;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Retention(value = RUNTIME)
-@Target(value = TYPE)
-public @interface Cancelable{}

common/net/minecraftforge/event/CommandEvent.java

@@ -1,21 +0,0 @@
-package net.minecraftforge.event;
-
-import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandSender;
-
-@Cancelable
-public class CommandEvent extends Event
-{
-
-    public final ICommand command;
-    public final ICommandSender sender;
-    public String[] parameters;
-    public Throwable exception;
-
-    public CommandEvent(ICommand command, ICommandSender sender, String[] parameters)
-    {
-        this.command = command;
-        this.sender = sender;
-        this.parameters = parameters;
-    }
-}

common/net/minecraftforge/event/Event.java

@@ -1,155 +0,0 @@
-package net.minecraftforge.event;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-
-/**
- * Base Event class that all other events are derived from
- */
-public class Event
-{
-    @Retention(value = RUNTIME)
-    @Target(value = TYPE)
-    public @interface HasResult{}
-
-    public enum Result
-    {
-        DENY,
-        DEFAULT,
-        ALLOW
-    }
-
-    private boolean isCanceled = false;
-    private final boolean isCancelable;
-    private Result result = Result.DEFAULT;
-    private final boolean hasResult;
-    private static ListenerList listeners = new ListenerList();
-
-    private static final Map<Class, Map<Class, Boolean>> annotationMap = new ConcurrentHashMap<Class, Map<Class, Boolean>>();
-    
-    public Event()
-    {
-        setup();
-        isCancelable = hasAnnotation(Cancelable.class);
-        hasResult = hasAnnotation(HasResult.class);
-    }
-
-    private boolean hasAnnotation(Class annotation)
-    {
-        Class me = this.getClass();
-        Map<Class, Boolean> list = annotationMap.get(me);
-        if (list == null)
-        {
-            list = new ConcurrentHashMap<Class, Boolean>();
-            annotationMap.put(me, list);
-        }
-
-        Boolean cached = list.get(annotation);
-        if (cached != null)
-        {
-            return cached;
-        }
-
-        Class cls = me;
-        while (cls != Event.class)
-        {
-            if (cls.isAnnotationPresent(annotation))
-            {
-                list.put(annotation, true);
-                return true;
-            }
-            cls = cls.getSuperclass();
-        }
-
-        list.put(annotation, false);
-        return false;
-    }
-
-    /**
-     * Determine if this function is cancelable at all. 
-     * @return If access to setCanceled should be allowed
-     */
-    public boolean isCancelable()
-    {
-        return isCancelable;
-    }
-
-    /**
-     * Determine if this event is canceled and should stop executing.
-     * @return The current canceled state
-     */
-    public boolean isCanceled()
-    {
-        return isCanceled;
-    }
-
-    /**
-     * Sets the state of this event, not all events are cancelable, and any attempt to
-     * cancel a event that can't be will result in a IllegalArgumentException.
-     * 
-     * The functionality of setting the canceled state is defined on a per-event bases.
-     * 
-     * @param cancel The new canceled value
-     */
-    public void setCanceled(boolean cancel)
-    {
-        if (!isCancelable())
-        {
-            throw new IllegalArgumentException("Attempted to cancel a uncancelable event");
-        }
-        isCanceled = cancel;
-    }
-
-    /**
-     * Determines if this event expects a significant result value.
-     */
-    public boolean hasResult()
-    {
-        return hasResult;
-    }
-
-    /**
-     * Returns the value set as the result of this event
-     */
-    public Result getResult()
-    {
-        return result;
-    }
-
-    /**
-     * Sets the result value for this event, not all events can have a result set, and any attempt to
-     * set a result for a event that isn't expecting it will result in a IllegalArgumentException.
-     * 
-     * The functionality of setting the result is defined on a per-event bases.
-     * 
-     * @param value The new result
-     */
-    public void setResult(Result value)
-    {
-        result = value;
-    }
-    /**
-     * Called by the base constructor, this is used by ASM generated 
-     * event classes to setup various functionality such as the listener's list.
-     */
-    protected void setup()
-    {
-    }
-    
-    /**
-     * Returns a ListenerList object that contains all listeners
-     * that are registered to this event.
-     * 
-     * @return Listener List
-     */
-    public ListenerList getListenerList()
-    {
-        return listeners;
-    }
-}

common/net/minecraftforge/event/EventBus.java

@@ -1,112 +0,0 @@
-package net.minecraftforge.event;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-
-
-import com.google.common.reflect.TypeToken;
-
-public class EventBus
-{
-    private static int maxID = 0;
-    
-    private ConcurrentHashMap<Object, ArrayList<IEventListener>> listeners = new ConcurrentHashMap<Object, ArrayList<IEventListener>>();
-    private final int busID = maxID++;
-
-    public EventBus()
-    {
-        ListenerList.resize(busID + 1);
-    }
-    
-    public void register(Object target)
-    {
-        if (listeners.containsKey(target))
-        {
-            return;
-        }
-
-        Set<? extends Class<?>> supers = TypeToken.of(target.getClass()).getTypes().rawTypes();
-        for (Method method : target.getClass().getMethods())
-        {
-            for (Class<?> cls : supers)
-            {
-                try
-                {
-                    Method real = cls.getDeclaredMethod(method.getName(), method.getParameterTypes());
-                    if (real.isAnnotationPresent(ForgeSubscribe.class))
-                    {
-                        Class<?>[] parameterTypes = method.getParameterTypes();
-                        if (parameterTypes.length != 1)
-                        {
-                            throw new IllegalArgumentException(
-                                "Method " + method + " has @ForgeSubscribe annotation, but requires " + parameterTypes.length +
-                                " arguments.  Event handler methods must require a single argument."
-                            );
-                        }
-                        
-                        Class<?> eventType = parameterTypes[0];
-                        
-                        if (!Event.class.isAssignableFrom(eventType))
-                        {
-                            throw new IllegalArgumentException("Method " + method + " has @ForgeSubscribe annotation, but takes a argument that is not a Event " + eventType); 
-                        }
-                                                
-                        register(eventType, target, method);
-                        break;
-                    }
-                }
-                catch (NoSuchMethodException e)
-                {
-                    ;
-                }
-            }
-        }
-    }
-
-    private void register(Class<?> eventType, Object target, Method method)
-    {
-        try
-        {
-            Constructor<?> ctr = eventType.getConstructor();
-            ctr.setAccessible(true);
-            Event event = (Event)ctr.newInstance();
-            ASMEventHandler listener = new ASMEventHandler(target, method);
-            event.getListenerList().register(busID, listener.getPriority(), listener);
-
-            ArrayList<IEventListener> others = listeners.get(target); 
-            if (others == null)
-            {
-                others = new ArrayList<IEventListener>();
-                listeners.put(target, others);
-            }
-            others.add(listener);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    public void unregister(Object object)
-    {
-        ArrayList<IEventListener> list = listeners.remove(object);
-        for (IEventListener listener : list)
-        {
-            ListenerList.unregiterAll(busID, listener);
-        }
-    }
-    
-    public boolean post(Event event)
-    {
-        IEventListener[] listeners = event.getListenerList().getListeners(busID);
-        for (IEventListener listener : listeners)
-        {
-            listener.invoke(event);
-        }
-        return (event.isCancelable() ? event.isCanceled() : false);
-    }
-}

common/net/minecraftforge/event/EventPriority.java

@@ -1,16 +0,0 @@
-package net.minecraftforge.event;
-
-public enum EventPriority
-{
-    /*Priority of event listeners, listeners will be sorted with respect to this priority level.
-     * 
-     * Note:
-     *   Due to using a ArrayList in the ListenerList,
-     *   these need to stay in a contiguous index starting at 0. {Default ordinal} 
-     */
-    HIGHEST, //First to execute
-    HIGH,
-    NORMAL,
-    LOW,
-    LOWEST //Last to execute
-}

common/net/minecraftforge/event/ForgeEventFactory.java

@@ -1,120 +0,0 @@
-package net.minecraftforge.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.entity.monster.EntityZombie;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.Event.Result;
-import net.minecraftforge.event.entity.living.LivingPackSizeEvent;
-import net.minecraftforge.event.entity.living.LivingSpawnEvent;
-import net.minecraftforge.event.entity.living.LivingSpawnEvent.AllowDespawn;
-import net.minecraftforge.event.entity.living.ZombieEvent.SummonAidEvent;
-import net.minecraftforge.event.entity.player.ItemTooltipEvent;
-import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
-import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
-import net.minecraftforge.event.world.BlockEvent;
-import net.minecraftforge.event.world.WorldEvent;
-
-@SuppressWarnings("deprecation")
-public class ForgeEventFactory
-{
-    public static boolean doPlayerHarvestCheck(EntityPlayer player, Block block, boolean success)
-    {
-        PlayerEvent.HarvestCheck event = new PlayerEvent.HarvestCheck(player, block, success);
-        MinecraftForge.EVENT_BUS.post(event);
-        return event.success;
-    }
-
-    public static float getBreakSpeed(EntityPlayer player, Block block, int metadata, float original)
-    {
-        PlayerEvent.BreakSpeed event = new PlayerEvent.BreakSpeed(player, block, metadata, original);
-        return (MinecraftForge.EVENT_BUS.post(event) ? -1 : event.newSpeed);
-    }
-
-    public static PlayerInteractEvent onPlayerInteract(EntityPlayer player, Action action, int x, int y, int z, int face)
-    {
-        PlayerInteractEvent event = new PlayerInteractEvent(player, action, x, y, z, face);
-        MinecraftForge.EVENT_BUS.post(event);
-        return event;
-    }
-
-    public static void onPlayerDestroyItem(EntityPlayer player, ItemStack stack)
-    {
-        MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(player, stack));
-    }
-
-    public static Result canEntitySpawn(EntityLiving entity, World world, float x, float y, float z)
-    {
-        LivingSpawnEvent.CheckSpawn event = new LivingSpawnEvent.CheckSpawn(entity, world, x, y, z);
-        MinecraftForge.EVENT_BUS.post(event);
-        return event.getResult();
-    }
-
-    public static boolean doSpecialSpawn(EntityLiving entity, World world, float x, float y, float z)
-    {
-        return MinecraftForge.EVENT_BUS.post(new LivingSpawnEvent.SpecialSpawn(entity, world, x, y, z));
-    }
-
-    public static Result canEntityDespawn(EntityLiving entity)
-    {
-        AllowDespawn event = new AllowDespawn(entity);
-        MinecraftForge.EVENT_BUS.post(event);
-        return event.getResult();
-    }
-    
-    public static List getPotentialSpawns(WorldServer world, EnumCreatureType type, int x, int y, int z, List oldList)
-    {
-        WorldEvent.PotentialSpawns event = new WorldEvent.PotentialSpawns(world, type, x, y, z, oldList);
-        if (MinecraftForge.EVENT_BUS.post(event))
-        {
-            return null;
-        }
-        return event.list;
-    }
-    
-    public static int getMaxSpawnPackSize(EntityLiving entity)
-    {
-        LivingPackSizeEvent maxCanSpawnEvent = new LivingPackSizeEvent(entity);
-        MinecraftForge.EVENT_BUS.post(maxCanSpawnEvent);
-        return maxCanSpawnEvent.getResult() == Result.ALLOW ? maxCanSpawnEvent.maxPackSize : entity.getMaxSpawnedInChunk();
-    }
-
-    public static String getPlayerDisplayName(EntityPlayer player, String username)
-    {
-        PlayerEvent.NameFormat event = new PlayerEvent.NameFormat(player, username);
-        MinecraftForge.EVENT_BUS.post(event);
-        return event.displayname;
-    }
-
-    public static float fireBlockHarvesting(ArrayList<ItemStack> drops, World world, Block block, int x, int y, int z, int meta, int fortune, float dropChance, boolean silkTouch, EntityPlayer player)
-    {
-        BlockEvent.HarvestDropsEvent event = new BlockEvent.HarvestDropsEvent(x, y, z, world, block, meta, fortune, dropChance, drops, player, silkTouch);
-        MinecraftForge.EVENT_BUS.post(event);
-        return event.dropChance;
-    }
-    
-    public static ItemTooltipEvent onItemTooltip(ItemStack itemStack, EntityPlayer entityPlayer, List<String> toolTip, boolean showAdvancedItemTooltips)
-    {
-        ItemTooltipEvent event = new ItemTooltipEvent(itemStack, entityPlayer, toolTip, showAdvancedItemTooltips);
-        MinecraftForge.EVENT_BUS.post(event);
-        return event;
-    }
-
-    public static SummonAidEvent fireZombieSummonAid(EntityZombie zombie, World world, int x, int y, int z, EntityLivingBase attacker, double summonChance)
-    {
-        SummonAidEvent summonEvent = new SummonAidEvent(zombie, world, x, y, z, attacker, summonChance);
-        MinecraftForge.EVENT_BUS.post(summonEvent);
-        return summonEvent;
-    }
-}

common/net/minecraftforge/event/ForgeSubscribe.java

@@ -1,15 +0,0 @@
-package net.minecraftforge.event;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.RetentionPolicy.*;
-import static java.lang.annotation.ElementType.*;
-
-@Retention(value = RUNTIME)
-@Target(value = METHOD)
-public @interface ForgeSubscribe
-{
-    public EventPriority priority() default EventPriority.NORMAL;
-    public boolean receiveCanceled() default false;
-}

common/net/minecraftforge/event/IEventListener.java

@@ -1,8 +0,0 @@
-package net.minecraftforge.event;
-
-
-
-public interface IEventListener
-{
-    public void invoke(Event event);
-}

common/net/minecraftforge/event/ListenerList.java

@@ -1,219 +0,0 @@
-package net.minecraftforge.event;
-
-import java.util.*;
-
-
-public class ListenerList
-{
-    private static ArrayList<ListenerList> allLists = new ArrayList<ListenerList>();
-    private static int maxSize = 0;
-    
-    private ListenerList parent;
-    private ListenerListInst[] lists = new ListenerListInst[0];
-    
-    public ListenerList()
-    {
-        allLists.add(this);
-        resizeLists(maxSize);
-    }
-    
-    public ListenerList(ListenerList parent)
-    {
-        allLists.add(this);
-        this.parent = parent;
-        resizeLists(maxSize);
-    }
-    
-    public static void resize(int max)
-    {
-        if (max <= maxSize)
-        {
-            return;
-        }
-        for (ListenerList list : allLists)
-        {
-            list.resizeLists(max);
-        }
-        maxSize = max;
-    }
-    
-    public void resizeLists(int max)
-    {
-        if (parent != null)
-        {
-            parent.resizeLists(max);
-        }
-        
-        if (lists.length >= max)
-        {
-            return;
-        }
-        
-        ListenerListInst[] newList = new ListenerListInst[max];
-        int x = 0;
-        for (; x < lists.length; x++)
-        {
-            newList[x] = lists[x];
-        }
-        for(; x < max; x++)
-        {
-            if (parent != null)
-            {
-                newList[x] = new ListenerListInst(parent.getInstance(x));
-            }
-            else
-            {
-                newList[x] = new ListenerListInst();
-            }
-        }
-        lists = newList;
-    }
-    
-    public static void clearBusID(int id)
-    {
-        for (ListenerList list : allLists)
-        {
-            list.lists[id].dispose();
-        }
-    }
-    
-    protected ListenerListInst getInstance(int id)
-    {
-        return lists[id];
-    }
-
-    public IEventListener[] getListeners(int id)
-    {
-        return lists[id].getListeners();
-    }
-    
-    public void register(int id, EventPriority priority, IEventListener listener)
-    {
-        lists[id].register(priority, listener);
-    }
-    
-    public void unregister(int id, IEventListener listener)
-    {
-        lists[id].unregister(listener);
-    }
-    
-    public static void unregiterAll(int id, IEventListener listener)
-    {
-        for (ListenerList list : allLists)
-        {
-            list.unregister(id, listener);
-        }
-    }
-    
-    private class ListenerListInst
-    {
-        private boolean rebuild = true;
-        private IEventListener[] listeners;
-        private ArrayList<ArrayList<IEventListener>> priorities;
-        private ListenerListInst parent;
-        
-        private ListenerListInst()
-        {
-            int count = EventPriority.values().length;
-            priorities = new ArrayList<ArrayList<IEventListener>>(count);
-            
-            for (int x = 0; x < count; x++)
-            {
-                priorities.add(new ArrayList<IEventListener>());
-            }
-        }
-        
-        public void dispose()
-        {
-            for (ArrayList<IEventListener> listeners : priorities)
-            {
-                listeners.clear();
-            }
-            priorities.clear();
-            parent = null;
-            listeners = null;
-        }
-
-        private ListenerListInst(ListenerListInst parent)
-        {
-            this();
-            this.parent = parent;
-        }
-        
-        /**
-         * Returns a ArrayList containing all listeners for this event, 
-         * and all parent events for the specified priority.
-         * 
-         * The list is returned with the listeners for the children events first.
-         * 
-         * @param priority The Priority to get
-         * @return ArrayList containing listeners
-         */
-        public ArrayList<IEventListener> getListeners(EventPriority priority)
-        {
-            ArrayList<IEventListener> ret = new ArrayList<IEventListener>(priorities.get(priority.ordinal()));
-            if (parent != null)
-            {
-                ret.addAll(parent.getListeners(priority));
-            }
-            return ret;
-        }
-        
-        /**
-         * Returns a full list of all listeners for all priority levels.
-         * Including all parent listeners.
-         * 
-         * List is returned in proper priority order.
-         * 
-         * Automatically rebuilds the internal Array cache if its information is out of date.
-         * 
-         * @return Array containing listeners
-         */
-        public IEventListener[] getListeners()
-        {
-            if (shouldRebuild()) buildCache();
-            return listeners;
-        }
-        
-        protected boolean shouldRebuild()
-        {
-            return rebuild || (parent != null && parent.shouldRebuild());
-        }
-        
-        /**
-         * Rebuild the local Array of listeners, returns early if there is no work to do.
-         */
-        private void buildCache()
-        {        
-            if(parent != null && parent.shouldRebuild())
-            {
-                parent.buildCache();
-            }
-            
-            ArrayList<IEventListener> ret = new ArrayList<IEventListener>();
-            for (EventPriority value : EventPriority.values())
-            {
-                ret.addAll(getListeners(value));
-            }
-            listeners = ret.toArray(new IEventListener[ret.size()]);
-            rebuild = false;
-        }
-        
-        public void register(EventPriority priority, IEventListener listener)
-        {
-            priorities.get(priority.ordinal()).add(listener);
-            rebuild = true;
-        }
-        
-        public void unregister(IEventListener listener)
-        {
-            for(ArrayList<IEventListener> list : priorities)
-            {
-                if (list.remove(listener))
-                {
-                    rebuild = true;
-                }
-            }
-        }
-    }
-}

common/net/minecraftforge/event/ServerChatEvent.java

@@ -1,20 +0,0 @@
-package net.minecraftforge.event;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.util.ChatMessageComponent;
-
-@Cancelable
-public class ServerChatEvent extends Event
-{
-    public final String message, username;
-    public final EntityPlayerMP player;
-    public ChatMessageComponent component;
-    public ServerChatEvent(EntityPlayerMP player, String message, ChatMessageComponent component)
-    {
-        super();
-        this.message = message;
-        this.player = player;
-        this.username = player.username;
-        this.component = component;
-    }
-}

common/net/minecraftforge/event/brewing/PotionBrewedEvent.java

@@ -1,16 +0,0 @@
-package net.minecraftforge.event.brewing;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.event.Event;
-
-public class PotionBrewedEvent extends Event
-{
-    /**
-     * The brewing stacks in the brewing stand.  Each index has the possibility to be null, so make sure you check.
-     */
-    public ItemStack[] brewingStacks;
-    public PotionBrewedEvent(ItemStack[] brewingStacks)
-    {
-        this.brewingStacks = brewingStacks;
-    }
-}

common/net/minecraftforge/event/entity/EntityEvent.java

@@ -1,49 +0,0 @@
-package net.minecraftforge.event.entity;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.world.World;
-import net.minecraftforge.event.Event;
-
-public class EntityEvent extends Event
-{
-    public final Entity entity;
-
-    public EntityEvent(Entity entity)
-    {
-        this.entity = entity;
-    }
-
-    public static class EntityConstructing extends EntityEvent
-    {
-        public EntityConstructing(Entity entity)
-        {
-            super(entity);
-        }
-    }
-
-    public static class CanUpdate extends EntityEvent
-    {
-        public boolean canUpdate = false;
-        public CanUpdate(Entity entity)
-        {
-            super(entity);
-        }
-    }
-
-    public static class EnteringChunk extends EntityEvent
-    {
-        public int newChunkX;
-        public int newChunkZ;
-        public int oldChunkX;
-        public int oldChunkZ;
-
-        public EnteringChunk(Entity entity, int newChunkX, int newChunkZ, int oldChunkX, int oldChunkZ)
-        {
-            super(entity);
-            this.newChunkX = newChunkX;
-            this.newChunkZ = newChunkZ;
-            this.oldChunkX = oldChunkX;
-            this.oldChunkZ = oldChunkZ;
-        }
-    }
-}

common/net/minecraftforge/event/entity/EntityJoinWorldEvent.java

@@ -1,18 +0,0 @@
-package net.minecraftforge.event.entity;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.world.World;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class EntityJoinWorldEvent extends EntityEvent
-{
-
-    public final World world;
-
-    public EntityJoinWorldEvent(Entity entity, World world)
-    {
-        super(entity);
-        this.world = world;
-    }
-}

common/net/minecraftforge/event/entity/EntityStruckByLightningEvent.java

@@ -1,17 +0,0 @@
-package net.minecraftforge.event.entity;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.effect.EntityLightningBolt;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class EntityStruckByLightningEvent extends EntityEvent
-{
-    public final EntityLightningBolt lightning;
-
-    public EntityStruckByLightningEvent(Entity entity, EntityLightningBolt lightning)
-    {
-        super(entity);
-        this.lightning = lightning;
-    }
-}

common/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java

@@ -1,20 +0,0 @@
-package net.minecraftforge.event.entity;
-
-import net.minecraft.entity.Entity;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class PlaySoundAtEntityEvent extends EntityEvent
-{ 
-    public String name;
-    public final float volume;
-    public final float pitch;
-    
-    public PlaySoundAtEntityEvent(Entity entity, String name, float volume, float pitch)
-    {
-        super(entity);
-        this.name = name;
-        this.volume = volume;
-        this.pitch = pitch;
-    }
-}

common/net/minecraftforge/event/entity/living/LivingAttackEvent.java

@@ -1,18 +0,0 @@
-package net.minecraftforge.event.entity.living;
-
-import net.minecraft.util.DamageSource;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class LivingAttackEvent extends LivingEvent
-{
-    public final DamageSource source;
-    public final float ammount;
-    public LivingAttackEvent(EntityLivingBase entity, DamageSource source, float ammount)
-    {
-        super(entity);
-        this.source = source;
-        this.ammount = ammount;
-    }
-}

common/net/minecraftforge/event/entity/living/LivingDeathEvent.java

@@ -1,17 +0,0 @@
-package net.minecraftforge.event.entity.living;
-
-import net.minecraft.util.DamageSource;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class LivingDeathEvent extends LivingEvent
-{
-    public final DamageSource source;
-    public LivingDeathEvent(EntityLivingBase entity, DamageSource source)
-    {
-        super(entity);
-        this.source = source;
-    }
-
-}

common/net/minecraftforge/event/entity/living/LivingDropsEvent.java

@@ -1,28 +0,0 @@
-package net.minecraftforge.event.entity.living;
-
-import java.util.ArrayList;
-
-import net.minecraft.util.DamageSource;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class LivingDropsEvent extends LivingEvent
-{
-    public final DamageSource source;
-    public final ArrayList<EntityItem> drops;
-    public final int lootingLevel;
-    public final boolean recentlyHit;
-    public final int specialDropValue;
-    
-    public LivingDropsEvent(EntityLivingBase entity, DamageSource source, ArrayList<EntityItem> drops, int lootingLevel, boolean recentlyHit, int specialDropValue)
-    {
-        super(entity);
-        this.source = source;
-        this.drops = drops;
-        this.lootingLevel = lootingLevel;
-        this.recentlyHit = recentlyHit;
-        this.specialDropValue = specialDropValue;
-    }
-}

common/net/minecraftforge/event/entity/living/LivingEvent.java

@@ -1,26 +0,0 @@
-package net.minecraftforge.event.entity.living;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraftforge.event.Cancelable;
-import net.minecraftforge.event.entity.EntityEvent;
-
-public class LivingEvent extends EntityEvent
-{
-    public final EntityLivingBase entityLiving;
-    public LivingEvent(EntityLivingBase entity)
-    {
-        super(entity);
-        entityLiving = entity;
-    }
-    
-    @Cancelable
-    public static class LivingUpdateEvent extends LivingEvent
-    {
-        public LivingUpdateEvent(EntityLivingBase e){ super(e); }
-    }
-
-    public static class LivingJumpEvent extends LivingEvent
-    {
-        public LivingJumpEvent(EntityLivingBase e){ super(e); }
-    }
-}

common/net/minecraftforge/event/entity/living/LivingFallEvent.java

@@ -1,15 +0,0 @@
-package net.minecraftforge.event.entity.living;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class LivingFallEvent extends LivingEvent
-{
-    public float distance;
-    public LivingFallEvent(EntityLivingBase entity, float distance)
-    {
-        super(entity);
-        this.distance = distance;
-    }
-}

common/net/minecraftforge/event/entity/living/LivingHurtEvent.java

@@ -1,19 +0,0 @@
-package net.minecraftforge.event.entity.living;
-
-import net.minecraft.util.DamageSource;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class LivingHurtEvent extends LivingEvent
-{
-    public final DamageSource source;
-    public float ammount;
-    public LivingHurtEvent(EntityLivingBase entity, DamageSource source, float ammount)
-    {
-        super(entity);
-        this.source = source;
-        this.ammount = ammount;
-    }
-
-}

common/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java

@@ -1,15 +0,0 @@
-package net.minecraftforge.event.entity.living;
-
-import net.minecraft.entity.EntityLivingBase;
-
-public class LivingSetAttackTargetEvent extends LivingEvent
-{
-
-    public final EntityLivingBase target;
-    public LivingSetAttackTargetEvent(EntityLivingBase entity, EntityLivingBase target)
-    {
-        super(entity);
-        this.target = target;
-    }
-
-}

common/net/minecraftforge/event/entity/living/ZombieEvent.java

@@ -1,48 +0,0 @@
-package net.minecraftforge.event.entity.living;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.monster.EntityZombie;
-import net.minecraft.world.World;
-import net.minecraftforge.event.Cancelable;
-import net.minecraftforge.event.entity.EntityEvent;
-
-public class ZombieEvent extends EntityEvent {
-
-    public ZombieEvent(EntityZombie entity)
-    {
-        super(entity);
-    }
-
-    public EntityZombie getSummoner()
-    {
-        return (EntityZombie) entity;
-    }
-
-    @HasResult
-    public static class SummonAidEvent extends ZombieEvent {
-        /**
-         * Populate this field to have a custom zombie instead of a normal zombie summoned
-         */
-        public EntityZombie customSummonedAid;
-        
-        public final World world;
-        public final int x;
-        public final int y;
-        public final int z;
-        public final EntityLivingBase attacker;
-        public final double summonChance;
-        
-        public SummonAidEvent(EntityZombie entity, World world, int x, int y, int z, EntityLivingBase attacker, double summonChance)
-        {
-            super(entity);
-            this.world = world;
-            this.x = x;
-            this.y = y;
-            this.z = z;
-            this.attacker = attacker;
-            this.summonChance = summonChance;
-        }
-        
-    }
-}

common/net/minecraftforge/event/entity/minecart/MinecartCollisionEvent.java

@@ -1,15 +0,0 @@
-package net.minecraftforge.event.entity.minecart;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityMinecart;
-
-public class MinecartCollisionEvent extends MinecartEvent
-{
-    public final Entity collider;
-
-    public MinecartCollisionEvent(EntityMinecart minecart, Entity collider)
-    {
-        super(minecart);
-        this.collider = collider;
-    }
-}

common/net/minecraftforge/event/entity/minecart/MinecartEvent.java

@@ -1,16 +0,0 @@
-package net.minecraftforge.event.entity.minecart;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityMinecart;
-import net.minecraftforge.event.entity.EntityEvent;
-
-public class MinecartEvent extends EntityEvent
-{
-    public final EntityMinecart minecart;
-
-    public MinecartEvent(EntityMinecart minecart)
-    {
-        super(minecart);
-        this.minecart = minecart;
-    }
-}

common/net/minecraftforge/event/entity/minecart/MinecartInteractEvent.java

@@ -1,17 +0,0 @@
-package net.minecraftforge.event.entity.minecart;
-
-import net.minecraft.entity.item.EntityMinecart;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class MinecartInteractEvent extends MinecartEvent
-{
-    public final EntityPlayer player;
-
-    public MinecartInteractEvent(EntityMinecart minecart, EntityPlayer player)
-    {
-        super(minecart);
-        this.player = player;
-    }
-}

common/net/minecraftforge/event/entity/minecart/MinecartUpdateEvent.java

@@ -1,18 +0,0 @@
-package net.minecraftforge.event.entity.minecart;
-
-import net.minecraft.entity.item.EntityMinecart;
-
-public class MinecartUpdateEvent extends MinecartEvent
-{
-    public final float x;
-    public final float y;
-    public final float z;
-
-    public MinecartUpdateEvent(EntityMinecart minecart, float x, float y, float z)
-    {
-        super(minecart);
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-}

common/net/minecraftforge/event/entity/player/ArrowLooseEvent.java

@@ -1,19 +0,0 @@
-package net.minecraftforge.event.entity.player;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class ArrowLooseEvent extends PlayerEvent
-{
-    public final ItemStack bow;
-    public int charge;
-    
-    public ArrowLooseEvent(EntityPlayer player, ItemStack bow, int charge)
-    {
-        super(player);
-        this.bow = bow;
-        this.charge = charge;
-    }
-}

common/net/minecraftforge/event/entity/player/ArrowNockEvent.java

@@ -1,17 +0,0 @@
-package net.minecraftforge.event.entity.player;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class ArrowNockEvent extends PlayerEvent
-{
-    public ItemStack result;
-    
-    public ArrowNockEvent(EntityPlayer player, ItemStack result)
-    {
-        super(player);
-        this.result = result;
-    }
-}

common/net/minecraftforge/event/entity/player/AttackEntityEvent.java

@@ -1,16 +0,0 @@
-package net.minecraftforge.event.entity.player;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class AttackEntityEvent extends PlayerEvent
-{
-    public final Entity target;
-    public AttackEntityEvent(EntityPlayer player, Entity target)
-    {
-        super(player);
-        this.target = target;
-    }
-}

common/net/minecraftforge/event/entity/player/EntityInteractEvent.java

@@ -1,16 +0,0 @@
-package net.minecraftforge.event.entity.player;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.event.Cancelable;
-
-@Cancelable
-public class EntityInteractEvent extends PlayerEvent
-{
-    public final Entity target;
-    public EntityInteractEvent(EntityPlayer player, Entity target)
-    {
-        super(player);
-        this.target = target;
-    }
-}

common/net/minecraftforge/event/entity/player/PlayerDestroyItemEvent.java

@@ -1,15 +0,0 @@
-package net.minecraftforge.event.entity.player;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-public class PlayerDestroyItemEvent extends PlayerEvent
-{
-    public final ItemStack original;
-    public PlayerDestroyItemEvent(EntityPlayer player, ItemStack original)
-    {
-        super(player);
-        this.original = original;
-    }
-
-}

common/net/minecraftforge/event/entity/player/PlayerEvent.java

@@ -1,60 +0,0 @@
-package net.minecraftforge.event.entity.player;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.event.Cancelable;
-import net.minecraftforge.event.entity.living.LivingEvent;
-
-public class PlayerEvent extends LivingEvent
-{
-    public final EntityPlayer entityPlayer;
-    public PlayerEvent(EntityPlayer player)
-    {
-        super(player);
-        entityPlayer = player;
-    }
-    
-    public static class HarvestCheck extends PlayerEvent
-    {
-        public final Block block;
-        public boolean success;
-
-        public HarvestCheck(EntityPlayer player, Block block, boolean success)
-        {
-            super(player);
-            this.block = block;
-            this.success = success;
-        }
-    }
-
-    @Cancelable
-    public static class BreakSpeed extends PlayerEvent
-    {
-        public final Block block;
-        public final int metadata;
-        public final float originalSpeed;
-        public float newSpeed = 0.0f;
-
-        public BreakSpeed(EntityPlayer player, Block block, int metadata, float original)
-        {
-            super(player);
-            this.block = block;
-            this.metadata = metadata;
-            this.originalSpeed = original;
-            this.newSpeed = original;
-        }
-    }
-
-    public static class NameFormat extends PlayerEvent
-    {
-        public final String username;
-        public String displayname;
-
-        public NameFormat(EntityPlayer player, String username) {
-            super(player);
-            this.username = username;
-            this.displayname = username;
-        }
-    }
-}

common/net/minecraftforge/event/entity/player/PlayerInteractEvent.java

@@ -1,47 +0,0 @@
-package net.minecraftforge.event.entity.player;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-import net.minecraftforge.event.Cancelable;
-import net.minecraftforge.event.Event;
-import static net.minecraftforge.event.Event.Result;
-import static net.minecraftforge.event.Event.Result.*;
-
-@Cancelable
-public class PlayerInteractEvent extends PlayerEvent
-{
-    public static enum Action
-    {
-        RIGHT_CLICK_AIR,
-        RIGHT_CLICK_BLOCK,
-        LEFT_CLICK_BLOCK
-    }
-    
-    public final Action action;
-    public final int x;
-    public final int y;
-    public final int z;
-    public final int face;
-    
-    public Result useBlock = DEFAULT;
-    public Result useItem = DEFAULT;
-    
-    public PlayerInteractEvent(EntityPlayer player, Action action, int x, int y, int z, int face)
-    {
-        super(player);
-        this.action = action;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.face = face;
-        if (face == -1) useBlock = DENY;
-    }
-    
-    @Override
-    public void setCanceled(boolean cancel)
-    {
-        super.setCanceled(cancel);
-        useBlock = (cancel ? DENY : useBlock == DENY ? DEFAULT : useBlock);
-        useItem = (cancel ? DENY : useItem == DENY ? DEFAULT : useItem);
-    }
-}

common/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java

@@ -1,21 +0,0 @@
-package net.minecraftforge.event.entity.player;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EnumStatus;
-
-public class PlayerSleepInBedEvent extends PlayerEvent
-{
-    public EnumStatus result = null;
-    public final int x;
-    public final int y;
-    public final int z;
-
-    public PlayerSleepInBedEvent(EntityPlayer player, int x, int y, int z)
-    {
-        super(player);
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-}

common/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java

@@ -1,59 +0,0 @@
-package net.minecraftforge.event.terraingen;
-
-import java.util.Random;
-
-import net.minecraft.world.World;
-import net.minecraftforge.event.*;
-
-public class DecorateBiomeEvent extends Event
-{
-    public final World world;
-    public final Random rand;
-    public final int chunkX;
-    public final int chunkZ;
-    
-    public DecorateBiomeEvent(World world, Random rand, int worldX, int worldZ)
-    {
-        this.world = world;
-        this.rand = rand;
-        this.chunkX = worldX;
-        this.chunkZ = worldZ;
-    }
-    
-    public static class Pre extends DecorateBiomeEvent
-    {
-        public Pre(World world, Random rand, int worldX, int worldZ)
-        {
-            super(world, rand, worldX, worldZ);
-        }
-    }
-    
-    public static class Post extends DecorateBiomeEvent
-    {
-        public Post(World world, Random rand, int worldX, int worldZ)
-        {
-            super(world, rand, worldX, worldZ);
-        }
-    }
-
-    /**
-     * This event is fired when a chunk is decorated with a biome feature.
-     * 
-     * You can set the result to DENY to prevent the default biome decoration.
-     */
-    @HasResult
-    public static class Decorate extends DecorateBiomeEvent
-    {
-        /** Use CUSTOM to filter custom event types
-         */
-        public static enum EventType { BIG_SHROOM, CACTUS, CLAY, DEAD_BUSH, LILYPAD, FLOWERS, GRASS, LAKE, PUMPKIN, REED, SAND, SAND_PASS2, SHROOM, TREE, CUSTOM }
-        
-        public final EventType type;
-        
-        public Decorate(World world, Random rand, int worldX, int worldZ, EventType type)
-        {
-            super(world, rand, worldX, worldZ);
-            this.type = type;
-        }
-    }
-}

common/net/minecraftforge/event/terraingen/OreGenEvent.java

@@ -1,60 +0,0 @@
-package net.minecraftforge.event.terraingen;
-
-import java.util.Random;
-
-import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
-import net.minecraftforge.event.*;
-
-public class OreGenEvent extends Event
-{
-    public final World world;
-    public final Random rand;
-    public final int worldX;
-    public final int worldZ;
-    
-    public OreGenEvent(World world, Random rand, int worldX, int worldZ)
-    {
-        this.world = world;
-        this.rand = rand;
-        this.worldX = worldX;
-        this.worldZ = worldZ;
-    }
-    
-    public static class Pre extends OreGenEvent
-    {
-        public Pre(World world, Random rand, int worldX, int worldZ)
-        {
-            super(world, rand, worldX, worldZ);
-        }
-    }
-    
-    public static class Post extends OreGenEvent
-    {
-        public Post(World world, Random rand, int worldX, int worldZ)
-        {
-            super(world, rand, worldX, worldZ);
-        }
-    }
-    
-    /**
-     * This event is fired when an ore is generated in a chunk.
-     * 
-     * You can set the result to DENY to prevent the default ore generation.
-     */
-    @HasResult
-    public static class GenerateMinable extends OreGenEvent
-    {
-        public static enum EventType { COAL, DIAMOND, DIRT, GOLD, GRAVEL, IRON, LAPIS, REDSTONE, CUSTOM }
-        
-        public final EventType type;
-        public final WorldGenerator generator;
-        
-        public GenerateMinable(World world, Random rand, WorldGenerator generator, int worldX, int worldZ, EventType type)
-        {
-            super(world, rand, worldX, worldZ);
-            this.generator = generator;
-            this.type = type;
-        }
-    }
-}

common/net/minecraftforge/event/terraingen/PopulateChunkEvent.java

@@ -1,64 +0,0 @@
-package net.minecraftforge.event.terraingen;
-
-import java.util.Random;
-
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraftforge.event.world.*;
-
-public class PopulateChunkEvent extends ChunkProviderEvent
-{
-    public final World world;
-    public final Random rand;
-    public final int chunkX;
-    public final int chunkZ;
-    public final boolean hasVillageGenerated;
-    
-    public PopulateChunkEvent(IChunkProvider chunkProvider, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated)
-    {
-        super(chunkProvider);
-        this.world = world;
-        this.rand = rand;
-        this.chunkX = chunkX;
-        this.chunkZ = chunkZ;
-        this.hasVillageGenerated = hasVillageGenerated;
-    }
-    
-    public static class Pre extends PopulateChunkEvent
-    {
-        public Pre(IChunkProvider chunkProvider, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated)
-        {
-            super(chunkProvider, world, rand, chunkX, chunkZ, hasVillageGenerated);
-        }
-    }
-    
-    public static class Post extends PopulateChunkEvent
-    {
-        public Post(IChunkProvider chunkProvider, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated)
-        {
-            super(chunkProvider, world, rand, chunkX, chunkZ, hasVillageGenerated);
-        }
-    }
-    
-    /**
-     * This event is fired when a chunk is populated with a terrain feature.
-     * 
-     * You can set the result to DENY to prevent the default generation
-     * of a terrain feature.
-     */
-    @HasResult
-    public static class Populate extends PopulateChunkEvent
-    {
-        /** Use CUSTOM to filter custom event types
-         */
-        public static enum EventType { DUNGEON, FIRE, GLOWSTONE, ICE, LAKE, LAVA, NETHER_LAVA, CUSTOM }
-        
-        public final EventType type;
-
-        public Populate(IChunkProvider chunkProvider, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated, EventType type)
-        {
-            super(chunkProvider, world, rand, chunkX, chunkZ, hasVillageGenerated);
-            this.type = type;
-        }
-    }
-}

common/net/minecraftforge/event/terraingen/SaplingGrowTreeEvent.java

@@ -1,30 +0,0 @@
-package net.minecraftforge.event.terraingen;
-
-import java.util.Random;
-
-import net.minecraft.world.World;
-import net.minecraftforge.event.Event.HasResult;
-import net.minecraftforge.event.world.WorldEvent;
-
-/**
- * This event is fired when a sapling grows a tree.
- * 
- * You can set the result to DENY to prevent the default tree growth.
- */
-@HasResult
-public class SaplingGrowTreeEvent extends WorldEvent
-{
-    public final int x;
-    public final int y;
-    public final int z;
-    public final Random rand;
-    
-    public SaplingGrowTreeEvent(World world, Random rand, int x, int y, int z)
-    {
-        super(world);
-        this.rand = rand;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-}

common/net/minecraftforge/event/terraingen/WorldTypeEvent.java

@@ -1,43 +0,0 @@
-package net.minecraftforge.event.terraingen;
-
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.WorldType;
-import net.minecraftforge.event.Event;
-
-public class WorldTypeEvent extends Event
-{
-    public final WorldType worldType;
-
-    public WorldTypeEvent(WorldType worldType)
-    {
-        this.worldType = worldType;
-    }
-
-    public static class BiomeSize extends WorldTypeEvent
-    {
-        public final byte originalSize;
-        public byte newSize;
-        
-        public BiomeSize(WorldType worldType, byte original)
-        {
-            super(worldType);
-            originalSize = original;
-            newSize = original;
-        }
-    }
-
-    public static class InitBiomeGens extends WorldTypeEvent
-    {
-        public final long seed;
-        public final GenLayer[] originalBiomeGens;
-        public GenLayer[] newBiomeGens;
-        
-        public InitBiomeGens(WorldType worldType, long seed, GenLayer[] original)
-        {
-            super(worldType);
-            this.seed = seed;
-            originalBiomeGens = original;
-            newBiomeGens = original.clone();
-        }
-    }
-}

common/net/minecraftforge/event/world/BlockEvent.java

@@ -1,113 +0,0 @@
-package net.minecraftforge.event.world;
-
-import java.util.ArrayList;
-
-import net.minecraft.block.Block;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraftforge.event.Cancelable;
-import net.minecraftforge.event.Event;
-
-public class BlockEvent extends Event {
-    public final int x;
-    public final int y;
-    public final int z;
-    public final World world;
-    public final Block block;
-    public final int blockMetadata;
-    public BlockEvent(int x, int y, int z, World world, Block block, int blockMetadata)
-    {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.world = world;
-        this.block = block;
-        this.blockMetadata = blockMetadata;
-    }
-    
-    /**
-     * Fired when a block is about to drop it's harvested items. The {@link #drops} array can be amended, as can the {@link #dropChance}.
-     * <strong>Note well:</strong> the {@link #harvester} player field is null in a variety of scenarios. Code expecting null.
-     * 
-     * The {@link #dropChance} is used to determine which items in this array will actually drop, compared to a random number. If you wish, you 
-     * can pre-filter yourself, and set {@link #dropChance} to 1.0f to always drop the contents of the {@link #drops} array.
-     * 
-     * {@link #isSilkTouching} is set if this is considered a silk touch harvesting operation, vs a normal harvesting operation. Act accordingly.
-     * 
-     * @author cpw
-     */
-    public static class HarvestDropsEvent extends BlockEvent {
-        public final int fortuneLevel;
-        public final ArrayList<ItemStack> drops;
-        public final boolean isSilkTouching;
-        public float dropChance; // Change to e.g. 1.0f, if you manipulate the list and want to guarantee it always drops
-        public final EntityPlayer harvester; // May be null for non-player harvesting such as explosions or machines
-
-        public HarvestDropsEvent(int x, int y, int z, World world, Block block, int blockMetadata, int fortuneLevel, float dropChance, ArrayList<ItemStack> drops, EntityPlayer harvester, boolean isSilkTouching)
-        {
-            super(x, y, z, world, block, blockMetadata);
-            this.fortuneLevel = fortuneLevel;
-            this.dropChance = dropChance;
-            this.drops = drops;
-            this.isSilkTouching = isSilkTouching;
-            this.harvester = harvester;
-        }
-    }
-    
-    /**
-     * Event that is fired when an Block is about to be broken by a player
-     * Canceling this event will prevent the Block from being broken.
-     */
-    @Cancelable
-    public static class BreakEvent extends BlockEvent 
-    {
-        /** Reference to the Player who broke the block. If no player is available, use a EntityFakePlayer */
-        private final EntityPlayer player;
-        private int exp;
-
-        public BreakEvent(int x, int y, int z, World world, Block block, int blockMetadata, EntityPlayer player)
-        {
-            super(x, y, z, world, block, blockMetadata);
-            this.player = player;
-
-            if (block == null || !player.canHarvestBlock(block) || // Handle empty block or player unable to break block scenario
-                block.canSilkHarvest(world, player, x, y, z, blockMetadata) && EnchantmentHelper.getSilkTouchModifier(player)) // If the block is being silk harvested, the exp dropped is 0
-            {
-                this.exp = 0;
-            }
-            else
-            {
-                int meta = block.getDamageValue(world, x, y, z);
-                int bonusLevel = EnchantmentHelper.getFortuneModifier(player);
-                this.exp = block.getExpDrop(world, meta, bonusLevel);
-            }
-        }
-
-        public EntityPlayer getPlayer()
-        {
-            return player;
-        }
-        
-        /**
-         * Get the experience dropped by the block after the event has processed
-         *
-         * @return The experience to drop or 0 if the event was canceled
-         */
-        public int getExpToDrop()
-        {
-            return this.isCanceled() ? 0 : exp;
-        }
-
-        /**
-         * Set the amount of experience dropped by the block after the event has processed
-         *
-         * @param exp 1 or higher to drop experience, else nothing will drop
-         */
-        public void setExpToDrop(int exp)
-        {
-            this.exp = exp;
-        }
-    }
-}

common/net/minecraftforge/event/world/ChunkDataEvent.java

@@ -1,36 +0,0 @@
-package net.minecraftforge.event.world;
-
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.nbt.NBTTagCompound;
-
-public class ChunkDataEvent extends ChunkEvent
-{
-    private final NBTTagCompound data;
-
-    public ChunkDataEvent(Chunk chunk, NBTTagCompound data)
-    {
-        super(chunk);
-        this.data = data;
-    }
-    
-    public NBTTagCompound getData()
-    {
-        return data;
-    }
-    
-    public static class Load extends ChunkDataEvent
-    {
-        public Load(Chunk chunk, NBTTagCompound data)
-        {
-            super(chunk, data);
-        }
-    }
-
-    public static class Save extends ChunkDataEvent
-    {
-        public Save(Chunk chunk, NBTTagCompound data)
-        {
-            super(chunk, data);
-        }
-    }
-}

common/net/minecraftforge/event/world/ChunkEvent.java

@@ -1,37 +0,0 @@
-package net.minecraftforge.event.world;
-
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-
-public class ChunkEvent extends WorldEvent
-{
-    private final Chunk chunk;
-    
-    public ChunkEvent(Chunk chunk)
-    {
-        super(chunk.worldObj);
-        this.chunk = chunk;
-    }
-    
-    public Chunk getChunk()
-    {
-        return chunk;
-    }
-    
-    public static class Load extends ChunkEvent
-    {
-        public Load(Chunk chunk)
-        {
-            super(chunk);
-        }
-    }
-
-    public static class Unload extends ChunkEvent
-    {
-        public Unload(Chunk chunk)
-        {
-            super(chunk);
-        }
-    }
-}

common/net/minecraftforge/event/world/ChunkWatchEvent.java

@@ -1,29 +0,0 @@
-package net.minecraftforge.event.world;
-
-import net.minecraft.world.ChunkCoordIntPair;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.server.management.PlayerInstance;
-import net.minecraft.world.WorldServer;
-import net.minecraftforge.event.Event;
-
-public class ChunkWatchEvent extends Event
-{
-    public final ChunkCoordIntPair chunk;
-    public final EntityPlayerMP player;
-    
-    public ChunkWatchEvent(ChunkCoordIntPair chunk, EntityPlayerMP player)
-    {
-        this.chunk = chunk;
-        this.player = player;
-    }
-    
-    public static class Watch extends ChunkWatchEvent
-    {
-        public Watch(ChunkCoordIntPair chunk, EntityPlayerMP player) { super(chunk, player); }        
-    }
-    
-    public static class UnWatch extends ChunkWatchEvent
-    {
-        public UnWatch(ChunkCoordIntPair chunkLocation, EntityPlayerMP player) { super(chunkLocation, player); }        
-    }
-}

common/net/minecraftforge/event/world/WorldEvent.java

@@ -1,66 +0,0 @@
-package net.minecraftforge.event.world;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.SpawnListEntry;
-import net.minecraftforge.event.Cancelable;
-import net.minecraftforge.event.Event;
-
-public class WorldEvent extends Event
-{
-    public final World world;
-
-    public WorldEvent(World world)
-    {
-        this.world = world;
-    }
-
-    public static class Load extends WorldEvent
-    {
-        public Load(World world) { super(world); }
-    }
-
-    public static class Unload extends WorldEvent
-    {
-        public Unload(World world) { super(world); }
-    }
-
-    public static class Save extends WorldEvent
-    {
-        public Save(World world) { super(world); }
-    }
-
-    /**
-     * Called by WorldServer to gather a list of all possible entities that can spawn at the specified location.
-     * Canceling the event will result in a empty list, meaning no entity will be spawned.
-     */
-    @Cancelable
-    public static class PotentialSpawns extends WorldEvent
-    {
-        public final EnumCreatureType type;
-        public final int x;
-        public final int y;
-        public final int z;
-        public final List<SpawnListEntry> list;
-
-        public PotentialSpawns(World world, EnumCreatureType type, int x, int y, int z, List oldList)
-        {
-            super(world);
-            this.x = x;
-            this.y = y;
-            this.z = z;
-            this.type = type;
-            if (oldList != null)
-            {
-                this.list = (List<SpawnListEntry>)oldList;
-            }
-            else
-            {
-                this.list = new ArrayList<SpawnListEntry>();
-            }
-        }
-    }
-}

common/net/minecraftforge/fluids/BlockFluidBase.java

@@ -1,464 +0,0 @@
-package net.minecraftforge.fluids;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.Vec3;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-/**
- * This is a base implementation for Fluid blocks.
- *
- * It is highly recommended that you extend this class or one of the Forge-provided child classes.
- *
- * @author King Lemming, OvermindDL1
- *
- */
-public abstract class BlockFluidBase extends Block implements IFluidBlock
-{
-    protected final static Map<Integer, Boolean> defaultDisplacementIds = new HashMap<Integer, Boolean>();
-
-    static
-    {
-        defaultDisplacementIds.put(Block.doorWood.blockID, false);
-        defaultDisplacementIds.put(Block.doorIron.blockID, false);
-        defaultDisplacementIds.put(Block.signPost.blockID, false);
-        defaultDisplacementIds.put(Block.signWall.blockID, false);
-        defaultDisplacementIds.put(Block.reed.blockID,     false);
-    }
-    protected Map<Integer, Boolean> displacementIds = new HashMap<Integer, Boolean>();
-
-    protected int quantaPerBlock = 8;
-    protected float quantaPerBlockFloat = 8F;
-    protected int density = 1;
-    protected int densityDir = -1;
-	protected int temperature = 295;
-
-    protected int tickRate = 20;
-    protected int renderPass = 1;
-    protected int maxScaledLight = 0;
-
-    protected final String fluidName;
-
-    public BlockFluidBase(int id, Fluid fluid, Material material)
-    {
-        super(id, material);
-        this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
-        this.setTickRandomly(true);
-        this.disableStats();
-
-        this.fluidName = fluid.getName();
-        this.density = fluid.density;
-        this.temperature = fluid.temperature;
-        this.maxScaledLight = fluid.luminosity;
-        this.tickRate = fluid.viscosity / 200;
-        this.densityDir = fluid.density > 0 ? -1 : 1;
-        fluid.setBlockID(id);
-
-        displacementIds.putAll(defaultDisplacementIds);
-    }
-
-    public BlockFluidBase setQuantaPerBlock(int quantaPerBlock)
-    {
-        if (quantaPerBlock > 16 || quantaPerBlock < 1) quantaPerBlock = 8;
-        this.quantaPerBlock = quantaPerBlock;
-        this.quantaPerBlockFloat = quantaPerBlock;
-        return this;
-    }
-
-    public BlockFluidBase setDensity(int density)
-    {
-        if (density == 0) density = 1;
-        this.density = density;
-        this.densityDir = density > 0 ? -1 : 1;
-        return this;
-    }
-
-    public BlockFluidBase setTemperature(int temperature)
-    {
-        this.temperature = temperature;
-        return this;
-    }
-
-    public BlockFluidBase setTickRate(int tickRate)
-    {
-        if (tickRate <= 0) tickRate = 20;
-        this.tickRate = tickRate;
-        return this;
-    }
-
-    public BlockFluidBase setRenderPass(int renderPass)
-    {
-        this.renderPass = renderPass;
-        return this;
-    }
-
-    public BlockFluidBase setMaxScaledLight(int maxScaledLight)
-    {
-        this.maxScaledLight = maxScaledLight;
-        return this;
-    }
-
-    /**
-     * Returns true if the block at (x, y, z) is displaceable. Does not displace the block.
-     */
-    public boolean canDisplace(IBlockAccess world, int x, int y, int z)
-    {
-        if (world.isAirBlock(x, y, z)) return true;
-
-        int bId = world.getBlockId(x, y, z);
-
-        if (bId == blockID)
-        {
-            return false;
-        }
-
-        if (displacementIds.containsKey(bId))
-        {
-            return displacementIds.get(bId);
-        }
-
-        Material material = Block.blocksList[bId].blockMaterial;
-        if (material.blocksMovement() || material == Material.portal)
-        {
-            return false;
-        }
-
-        int density = getDensity(world, x, y, z);
-        if (density == Integer.MAX_VALUE) 
-        {
-        	 return true;
-        }
-        
-        if (this.density > density)
-        {
-        	return true;
-        }
-        else
-        {
-        	return false;
-        }
-    }
-
-    /**
-     * Attempt to displace the block at (x, y, z), return true if it was displaced.
-     */
-    public boolean displaceIfPossible(World world, int x, int y, int z)
-    {
-        if (world.isAirBlock(x, y, z))
-        {
-            return true;
-        }
-
-        int bId = world.getBlockId(x, y, z);
-        if (bId == blockID)
-        {
-            return false;
-        }
-
-        if (displacementIds.containsKey(bId))
-        {
-            if (displacementIds.get(bId))
-            {
-                Block.blocksList[bId].dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
-                return true;
-            }
-            return false;
-        }
-
-        Material material = Block.blocksList[bId].blockMaterial;
-        if (material.blocksMovement() || material == Material.portal)
-        {
-            return false;
-        }
-
-        int density = getDensity(world, x, y, z);
-        if (density == Integer.MAX_VALUE) 
-        {
-        	 Block.blocksList[bId].dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
-        	 return true;
-        }
-        
-        if (this.density > density)
-        {
-        	return true;
-        }
-        else
-        {
-        	return false;
-        }
-    }
-
-    public abstract int getQuantaValue(IBlockAccess world, int x, int y, int z);
-
-    @Override
-    public abstract boolean canCollideCheck(int meta, boolean fullHit);
-
-    public abstract int getMaxRenderHeightMeta();
-
-    /* BLOCK FUNCTIONS */
-    @Override
-    public void onBlockAdded(World world, int x, int y, int z)
-    {
-        world.scheduleBlockUpdate(x, y, z, blockID, tickRate);
-    }
-
-    @Override
-    public void onNeighborBlockChange(World world, int x, int y, int z, int blockId)
-    {
-        world.scheduleBlockUpdate(x, y, z, blockID, tickRate);
-    }
-
-    // Used to prevent updates on chunk generation
-    @Override
-    public boolean func_82506_l()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean getBlocksMovement(IBlockAccess world, int x, int y, int z)
-    {
-        return true;
-    }
-
-    @Override
-    public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z)
-    {
-        return null;
-    }
-
-    @Override
-    public int idDropped(int par1, Random par2Random, int par3)
-    {
-        return 0;
-    }
-
-    @Override
-    public int quantityDropped(Random par1Random)
-    {
-        return 0;
-    }
-
-    @Override
-    public int tickRate(World world)
-    {
-        return tickRate;
-    }
-
-    @Override
-    public void velocityToAddToEntity(World world, int x, int y, int z, Entity entity, Vec3 vec)
-    {
-        if (densityDir > 0) return;
-        Vec3 vec_flow = this.getFlowVector(world, x, y, z);
-        vec.xCoord += vec_flow.xCoord * (quantaPerBlock * 4);
-        vec.yCoord += vec_flow.yCoord * (quantaPerBlock * 4);
-        vec.zCoord += vec_flow.zCoord * (quantaPerBlock * 4);
-    }
-
-    @Override
-    public int getLightValue(IBlockAccess world, int x, int y, int z)
-    {
-        if (maxScaledLight == 0)
-        {
-            return super.getLightValue(world, x, y, z);
-        }
-        int data = world.getBlockMetadata(x, y, z);
-        return (int) (data / quantaPerBlockFloat * maxScaledLight);
-    }
-
-    @Override
-    public int getRenderType()
-    {
-        return FluidRegistry.renderIdFluid;
-    }
-
-    @Override
-    public boolean isOpaqueCube()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean renderAsNormalBlock()
-    {
-        return false;
-    }
-
-    @Override
-    public float getBlockBrightness(IBlockAccess world, int x, int y, int z)
-    {
-        float lightThis = world.getLightBrightness(x, y, z);
-        float lightUp = world.getLightBrightness(x, y + 1, z);
-        return lightThis > lightUp ? lightThis : lightUp;
-    }
-
-    @Override
-    public int getMixedBrightnessForBlock(IBlockAccess world, int x, int y, int z)
-    {
-        int lightThis     = world.getLightBrightnessForSkyBlocks(x, y, z, 0);
-        int lightUp       = world.getLightBrightnessForSkyBlocks(x, y + 1, z, 0);
-        int lightThisBase = lightThis & 255;
-        int lightUpBase   = lightUp & 255;
-        int lightThisExt  = lightThis >> 16 & 255;
-        int lightUpExt    = lightUp >> 16 & 255;
-        return (lightThisBase > lightUpBase ? lightThisBase : lightUpBase) |
-               ((lightThisExt > lightUpExt ? lightThisExt : lightUpExt) << 16);
-    }
-
-    @Override
-    public int getRenderBlockPass()
-    {
-        return renderPass;
-    }
-
-    @Override
-    public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side)
-    {
-        if (world.getBlockId(x, y, z) != blockID)
-        {
-            return !world.isBlockOpaqueCube(x, y, z);
-        }
-        Material mat = world.getBlockMaterial(x, y, z);
-        return mat == this.blockMaterial ? false : super.shouldSideBeRendered(world, x, y, z, side);
-    }
-
-    /* FLUID FUNCTIONS */
-    public static final int getDensity(IBlockAccess world, int x, int y, int z)
-    {
-        Block block = Block.blocksList[world.getBlockId(x, y, z)];
-        if (!(block instanceof BlockFluidBase))
-        {
-            return Integer.MAX_VALUE;
-        }
-        return ((BlockFluidBase)block).density;
-    }
-	
-    public static final int getTemperature(IBlockAccess world, int x, int y, int z)
-    {
-        Block block = Block.blocksList[world.getBlockId(x, y, z)];
-        if (!(block instanceof BlockFluidBase))
-        {
-            return Integer.MAX_VALUE;
-        }
-        return ((BlockFluidBase)block).temperature;
-    }
-
-    public static double getFlowDirection(IBlockAccess world, int x, int y, int z)
-    {
-        Block block = Block.blocksList[world.getBlockId(x, y, z)];
-        if (!world.getBlockMaterial(x, y, z).isLiquid())
-        {
-            return -1000.0;
-        }
-        Vec3 vec = ((BlockFluidBase) block).getFlowVector(world, x, y, z);
-        return vec.xCoord == 0.0D && vec.zCoord == 0.0D ? -1000.0D : Math.atan2(vec.zCoord, vec.xCoord) - Math.PI / 2D;
-    }
-
-    public final int getQuantaValueBelow(IBlockAccess world, int x, int y, int z, int belowThis)
-    {
-        int quantaRemaining = getQuantaValue(world, x, y, z);
-        if (quantaRemaining >= belowThis)
-        {
-            return -1;
-        }
-        return quantaRemaining;
-    }
-
-    public final int getQuantaValueAbove(IBlockAccess world, int x, int y, int z, int aboveThis)
-    {
-        int quantaRemaining = getQuantaValue(world, x, y, z);
-        if (quantaRemaining <= aboveThis)
-        {
-            return -1;
-        }
-        return quantaRemaining;
-    }
-
-    public final float getQuantaPercentage(IBlockAccess world, int x, int y, int z)
-    {
-        int quantaRemaining = getQuantaValue(world, x, y, z);
-        return quantaRemaining / quantaPerBlockFloat;
-    }
-
-    public Vec3 getFlowVector(IBlockAccess world, int x, int y, int z)
-    {
-        Vec3 vec = world.getWorldVec3Pool().getVecFromPool(0.0D, 0.0D, 0.0D);
-        int decay = quantaPerBlock - getQuantaValue(world, x, y, z);
-
-        for (int side = 0; side < 4; ++side)
-        {
-            int x2 = x;
-            int z2 = z;
-
-            switch (side)
-            {
-                case 0: --x2; break;
-                case 1: --z2; break;
-                case 2: ++x2; break;
-                case 3: ++z2; break;
-            }
-
-            int otherDecay = quantaPerBlock - getQuantaValue(world, x2, y, z2);
-            if (otherDecay >= quantaPerBlock)
-            {
-                if (!world.getBlockMaterial(x2, y, z2).blocksMovement())
-                {
-                    otherDecay = quantaPerBlock - getQuantaValue(world, x2, y - 1, z2);
-                    if (otherDecay >= 0)
-                    {
-                        int power = otherDecay - (decay - quantaPerBlock);
-                        vec = vec.addVector((x2 - x) * power, (y - y) * power, (z2 - z) * power);
-                    }
-                }
-            }
-            else if (otherDecay >= 0)
-            {
-                int power = otherDecay - decay;
-                vec = vec.addVector((x2 - x) * power, (y - y) * power, (z2 - z) * power);
-            }
-        }
-
-        if (world.getBlockId(x, y + 1, z) == blockID)
-        {
-            boolean flag =
-                isBlockSolid(world, x,     y,     z - 1, 2) ||
-                isBlockSolid(world, x,     y,     z + 1, 3) ||
-                isBlockSolid(world, x - 1, y,     z,     4) ||
-                isBlockSolid(world, x + 1, y,     z,     5) ||
-                isBlockSolid(world, x,     y + 1, z - 1, 2) ||
-                isBlockSolid(world, x,     y + 1, z + 1, 3) ||
-                isBlockSolid(world, x - 1, y + 1, z,     4) ||
-                isBlockSolid(world, x + 1, y + 1, z,     5);
-
-            if (flag)
-            {
-                vec = vec.normalize().addVector(0.0D, -6.0D, 0.0D);
-            }
-        }
-        vec = vec.normalize();
-        return vec;
-    }
-
-    /* IFluidBlock */
-    @Override
-    public Fluid getFluid()
-    {
-        return FluidRegistry.getFluid(fluidName);
-    }
-
-    @Override
-    public float getFilledPercentage(World world, int x, int y, int z)
-    {
-        int quantaRemaining = getQuantaValue(world, x, y, z) + 1;
-        float remaining = quantaRemaining / quantaPerBlockFloat;
-        if (remaining > 1) remaining = 1.0f;
-        return remaining * (density > 0 ? 1 : -1);
-    }
-}