Fix log4j configuration

Fuel Handling Fix

.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,7 +1,23 @@
-*.DS_Store
-/logs/
-/*.pyc
-/forge-*/
-/patches-old/
-/mcp/
+#eclipse
+/bin
+/.settings
+/.classpath
+
+#idea
+/.idea
+*.iml
+
+#gradle
+/build
+/.gradle
+
+#occupational hazards
 /eclipse/
+/repo/
+/buildSrc
+
+#Patch rejects
+*.rej
+/patches-/
+# FML changelog
+changelog.txt

.gitmodules

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

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)

MANIFEST.MF

@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.8.2
-Created-By: 1.7.0_09-b30 (Oracle Corporation)
-Main-Class: net.minecraft.server.MinecraftServer
-Class-Path: minecraft_server.jar
-

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

build.gradle

@@ -0,0 +1,127 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+    }
+}
+
+configurations {
+    deployJars
+}
+
+import static net.minecraftforge.gradle.dev.ForgeDevPlugin.*
+
+apply plugin: 'maven'
+apply plugin: 'forgedev'
+
+repositories {
+    mavenLocal()
+    flatDir {
+        name "fileRepo"
+        dirs "repo"
+    }
+}
+
+minecraft {
+    version = '1.7.10'
+    mcpVersion = '9.05'
+    fmlDir = projectDir.getAbsolutePath() + "/fml";
+    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
+    tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
+    installerVersion = "1.4"
+}
+
+group = 'net.minecraftforge'
+version = getVersionFromJava(getProject(), 'src/main/java/net/minecraftforge/common/ForgeVersion.java')
+
+jenkins {
+    job = 'minecraftforge'
+}
+
+// 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,89 +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 getBuildInfo(url, current_version=None):
-	handler = PreemptiveBasicAuthHandler()
-	handler.add_password(None, 'jenkins.minecraftforge.net:81', 'console_script', 'fd584bffa72fcac12181f37f80001200')
-	file = urllib2.build_opener(handler).open(url)
-	data = file.read()
-	file.close()
-	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 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)
-	
-	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://jenkins.minecraftforge.net:81/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/GuiControlsScrollPanel.java

@@ -1,127 +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;
-
-public class GuiControlsScrollPanel extends GuiSlot
-{
-    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 func_130003_c() {}
-
-    @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())
-            {
-                System.out.println(Mouse.getEventButton());
-                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.func_110577_a(TextureMap.field_110576_c);
-        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/RenderLivingEvent.java

@@ -1,33 +0,0 @@
-package net.minecraftforge.client.event;
-
-import net.minecraft.client.renderer.entity.RendererLivingEntity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraftforge.event.Cancelable;
-import net.minecraftforge.event.Event;
-
-public abstract class RenderLivingEvent extends Event
-{
-    public final EntityLivingBase entity;
-    public final RendererLivingEntity renderer;
-
-    public RenderLivingEvent(EntityLivingBase entity, RendererLivingEntity renderer)
-    {
-        this.entity = entity;
-        this.renderer = renderer;
-    }
-
-    public abstract static class Specials extends RenderLivingEvent
-    {
-        public Specials(EntityLivingBase entity, RendererLivingEntity renderer){ super(entity, renderer); }
-
-        @Cancelable
-        public static class Pre extends Specials
-        {
-            public Pre(EntityLivingBase entity, RendererLivingEntity renderer){ super(entity, renderer); }
-        }
-        public static class Post extends Specials
-        {
-            public Post(EntityLivingBase entity, RendererLivingEntity renderer){ super(entity, renderer); }
-        }
-    }
-}

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/IModelCustom.java

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

common/forge_at.cfg

@@ -1,162 +0,0 @@
-#Main Forge Access Transformer configuration file
-# Tessellator
-public-f bff.a #FD:Tessellator/field_78398_a #instance
-public bff.u #FD:Tessellator/field_78409_u #drawMode
-public bff.v #FD:Tessellator/field_78408_v #xOffset
-public bff.w #FD:Tessellator/field_78407_w #yOffset
-public bff.x #FD:Tessellator/field_78417_x #zOffset
-public bff.z #FD:Tessellator/field_78415_z #isDrawing
-# ItemPickaxe
-public yi.<init>(ILxy;)V #MD:ItemPickaxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
-public+f yi.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst
-# ItemAxe
-public xv.<init>(ILxy;)V #MD:ItemAxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
-public+f xv.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst
-# ItemSpade
-public yt.<init>(ILxy;)V #MD:ItemSpade/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
-public+f yt.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst
-# ItemTool
-public xe.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial
-public xe.d #FD:ItemTool/field_77865_bY #damageVsEntity
-# EntityEnderman
-public td.br #FD:EntityEnderman/field_70827_d #carriableBlocks
-# RenderEngine
-# -- MISSING MAPPING public bge.f(Ljava/lang/String;)I #MD:RenderEngine/func_78341_b #getTexture
-# -- MISSING MAPPING public bge.i #FD:RenderEngine/field_94154_l #terrainTextureMap
-# -- MISSING MAPPING public bge.j #FD:RenderEngine/field_94155_m #itemTextureMap
-# RenderGlobal
-public bfa.k #FD:RenderGlobal/field_72769_h #theWorld
-public bfa.l #FD:RenderGlobal/field_72770_i #renderEngine
-public bfa.t #FD:RenderGlobal/field_72777_q #mc
-public bfa.u #FD:RenderGlobal/field_72776_r #globalRenderBlocks
-public bfa.H #FD:RenderGlobal/field_72738_E #damagedBlocks
-# SoundManager
-public blc.b #FD:SoundManager/field_77381_a #sndSystem
-public blc.d #FD:SoundManager/field_77379_b #soundPoolSounds
-public blc.e #FD:SoundManager/field_77380_c #soundPoolStreaming
-public blc.f #FD:SoundManager/field_77377_d #soundPoolMusic
-# EntityMinecart
-protected sq.* #FD:EntityMinecart/* # All private -> protected
-# -- MISSING MAPPING public py.h()Z #MD:EntityMinecart/func_70490_h #isMinecartPowered
-# Block
-public aqs.<init>(ILajv;)V #MD:Block/<init>(ILnet/minecraft/src/Material;) #Constructor
-public aqs.<init>(IILajv;)V #MD:Block/<init>(IILnet/minecraft/src/Material;) #Constructor
-public aqs.cH #FD:Block/field_72029_cc #blockResistance
-public aqs.cG #FD:Block/field_71989_cb #blockHardness
-# -- MISSING MAPPING public amq.r()Lamq; #MD:Block/func_71912_p  #setRequiresSelfNotify
-public aqs.a(Laqw;)Laqs; #MD:Block/func_71884_a #setStepSound
-public aqs.b(F)Laqs; #MD:Block/func_71894_b #setResistance
-public aqs.c(F)Laqs; #MD:Block/func_71848_c #setHardness
-public aqs.k(I)Laqs; #MD:Block/func_71868_h #setLightOpacity
-public aqs.a(F)Laqs; #MD:Block/func_71900_a #setLightValue
-public aqs.r()Laqs; #MD:Block/func_71875_q  #setBlockUnbreakable
-public aqs.b(Z)Laqs; #MD:Block/func_71907_b #setTickRandomly
-public aqs.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds
-# NetServerHandler
-public jx.f #FD:NetServerHandler/field_72572_g #playerInAirTime
-# TileEntity
-public asi.k #FD:TileEntity/field_70331_k #worldObj
-# BlockLeavesBase
-public ara.d #FD:BlockLeavesBase/field_72131_c #graphicsLevel
-# Item
-public xx.<init>(I)V #MD:Item/<init>(I) #Constructor
-public xx.e(I)Lxx; #MD:Item/func_77656_e #setMaxDamage
-public-f xx.h(Lxz;)Lmp; #MD:Item/func_77650_f #getIconIndex
-public xx.c(Ljava/lang/String;)Lxx; #MD:Item/func_77631_c #setPotionEffect
-# RailLogic
-public ams #CL:BlockBaseRailLogic
-public ams.a()I #MD:BlockBaseRailLogic/func_94505_a #getNAdjacentTiles
-# EntityPlayer
-public ua.a(Lsp;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld
-public ua.i()V #MD:EntityPlayer/func_71053_j #closeScreen
-public ua.b #FD:EntityPlayer/field_71076_b #sleepTimer
-# EntityPlayerMP
-public bcx.a(Lsp;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
-# World Gen Chests Related
-public mh.* #FD:WeightedRandomChestContent/* #all
-public jp.T #FD:WorldServer/field_73069_S #bonusChestContent
-public agc.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents
-public ahg.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple
-public ahh.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents
-public ahh.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents
-public ahr.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents
-public ahv.b #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents
-public aia.c #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents
-public ajb.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents
-# AnvilChunkLoader.chunkSaveLocation
-public adz.d #FD:AnvilChunkLoader/field_75825_d
-# ChunkProviderServer.currentChunkLoader
-public jo.e #FD:ChunkProviderServer/field_73247_e
-# PlayerManager
-public jm.a(IIZ)Ljn; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher
-# PlayerInstance
-public jn #CL:PlayerInstance
-# World
-public-f abr.A #FD:World/field_72982_D #villageCollectionObj
-public abr.G #FD:World/field_72993_I #activeChunkSet
-# EntityLiving
-public od.b #FD:EntityLiving/field_70728_aV #experienceValue
-# -- MISSING MAPPING public ng.bt #FD:EntityLiving/field_94063_bt #combatTracker
-public od.d #FD:EntityLiving/field_70715_bh #targetTasks
-# GuiFlatPresets
-public avq.a(Ljava/lang/String;ILacl;Ljava/util/List;[Lafy;)V #MD:GuiFlatPresets/func_82294_a
-public avq.a(Ljava/lang/String;ILacl;[Lafy;)V #MD:GuiFlatPresets/func_82297_a
-# BiomeGenBase
-public acl.*() #MD:BiomeGenBase/* #Everything protected->public
-# MapGenVillage
-public-f aip.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes
-# ShapedRecipes
-public+f aad.d #FD:ShapedRecipes/field_77574_d #recipeItems
-public+f aad.b #FD:ShapedRecipes/field_77576_b #recipeWidth
-public+f aad.c #FD:ShapedRecipes/field_77577_c #recipeHeight
-# ShapelessRecipes
-public aae.b #FD:ShapelessRecipes/field_77579_b #recipeItems
-# GuiContainer
-protected awp.a(Lvz;)V #MD:GuiContainer/func_74192_a #drawSlotInventory
-# ContainerPlayer
-protected vq.h #FD:ContainerPlayer/field_82862_h #player
-# BlockButton
-protected amy.n(Labr;III)V #MD:BlockButton/func_82535_o #checkActivation
-protected-f amy.a #FD:BlockButton/field_82537_a #sensible
-# BiomeDecorator
-public acp.* #FD:BiomeDecorator/* # All private -> protected
-# CreativeTabs
-public-f wr.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final
-# Packet
-public ex.a(IZZLjava/lang/Class;)V #MD:Packet/func_73285_a  #addIdClassMapping
-# SaveHandler
-public alj.b()Ljava/io/File; #MD:SaveHandler/func_75765_b
-# World stuff
-public abr.b(Lnk;)V #MD:World/func_72847_b #releaseEntitySkin
-public abr.m #FD:World/field_73003_n #prevRainingStrength
-public abr.n #FD:World/field_73004_o #rainingStrength
-public abr.p #FD:World/field_73017_q #thunderingStrength
-public abr.o #FD:World/field_73018_p #prevThunderingStrength
-#WorldClient
-public bcu.b(Lnk;)V #MD:WorldClient/func_72847_b #releaseEntitySkin
-#WorldServer
-public jp.b(Lnk;)V #MD:WorldServer/func_72847_b #releaseEntitySkin
-public jp.N #FD:WorldServer/field_73068_P #allPlayersSleeping
-#TextureMap
-public bhz.g #FD:TextureMap/field_94255_a
-# -- MISSING MAPPING public bir.b #FD:TextureMap/field_94253_b
-public bhz.h #FD:TextureMap/field_94254_c
-# -- MISSING MAPPING public bir.d #FD:TextureMap/field_94251_d
-#Potion
-public nf.b(II)Lnf; #MD:Potion/func_76399_b #setIconIndex
-#PotionHelper
-public zk.m #FD:PotionHelper/field_77927_l #potionRequirements
-public zk.n #FD:PotionHelper/field_77928_m #potionAmplifiers
-#PotionEffect
-public ng.b #FD:PotionEffect/field_76460_b #duration
-#BlockFluid
-protected aov.a #FD:BlockFluid/field_94425_a #theIcon
-#GuiIngame
-protected ava.* #FD:GuiIngame/* # All private -> protected
-protected ava.*() #MD:GuiIngame/* # All private -> protected
-#ItemStack
-default xz.f #FD:ItemStack/field_77991_e # make default access for itemDamage
-#GuiSlot
-protected avx.b(IIII)V #MD:GuiSlot/func_77206_b #overlayBackground
-#EntityPlayer
-public ua.bu #FD:EntityPlayer/field_71092_bJ #username

common/net/minecraftforge/common/BiomeDictionary.java

@@ -1,301 +0,0 @@
-package net.minecraftforge.common;
-
-import java.util.*;
-import net.minecraft.world.biome.*;
-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;
-    }
-
-    /**
-     * Loops through the biome list and automatically adds tags to any biome that does not have any
-     * This should be called in postInit to make sure all biomes have been registered
-     * 
-     * DO NOT call this during world generation
-     */
-    public static void registerAllBiomes()
-    {
-        for(int i = 0; i < BIOME_LIST_SIZE; i++)
-        {
-            if(BiomeGenBase.biomeList[i] != null)
-            {
-                checkRegistration(BiomeGenBase.biomeList[i]);
-            }
-        }
-    }
-
-    /**
-     * 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,25 +0,0 @@
-package net.minecraftforge.common;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.ChatMessageComponent;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.World;
-
-//Preliminary, simple Fake Player class 
-public class FakePlayer extends EntityPlayer
-{
-    public FakePlayer(World world, String name)
-    {
-        super(world, name);
-    }
-
-    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 func_110122_a(ChatMessageComponent chatmessagecomponent){}
-}

common/net/minecraftforge/common/FakePlayerFactory.java

@@ -1,18 +0,0 @@
-package net.minecraftforge.common;
-
-import net.minecraft.world.World;
-
-//To be expanded for generic Mod fake players?
-public class FakePlayerFactory
-{
-    private static FakePlayer MINECRAFT_PLAYER = null;
-    
-    public static FakePlayer getMinecraft(World world)
-    {
-        if (MINECRAFT_PLAYER == null)
-        {
-            MINECRAFT_PLAYER = new FakePlayer(world, "[Minecraft]");
-        }
-        return MINECRAFT_PLAYER;
-    }
-}

common/net/minecraftforge/common/ForgeDummyContainer.java

@@ -1,184 +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.common.network.ForgeConnectionHandler;
-import net.minecraftforge.common.network.ForgeNetworkHandler;
-import net.minecraftforge.common.network.ForgePacketHandler;
-import net.minecraftforge.common.network.ForgeTinyPacketHandler;
-
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
-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.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.network.FMLNetworkHandler;
-import cpw.mods.fml.common.network.NetworkMod;
-
-import static net.minecraftforge.common.ForgeVersion.*;
-
-@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 legacyFurnaceSides = false;
-    public static boolean removeErroringEntities = false;
-    public static boolean removeErroringTileEntities = false;
-    public static boolean disableStitchedFileSaving = 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, "legacyFurnaceOutput", false);
-        prop.comment = "Controls the sides of vanilla furnaces for Forge's ISidedInventroy, Vanilla defines the output as the bottom, but mods/Forge define it as the sides. Settings this to true will restore the old side relations.";
-        legacyFurnaceSides = prop.getBoolean(false);
-
-        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("Enableing 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("Enableing 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);
-
-        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)
-    {
-    	ForgeChunkManager.loadConfiguration();
-    }
-
-    @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);
-        }
-    }
-}

common/net/minecraftforge/common/ForgeHooks.java

@@ -1,401 +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.entity.EntityLiving;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-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.network.NetServerHandler;
-import net.minecraft.util.ChatMessageComponent;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumMovingObjectType;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.WeightedRandom;
-import net.minecraft.util.WeightedRandomItem;
-import net.minecraft.world.World;
-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;
-
-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)
-    {
-        return block != null && block.isLadder(world, x, y, z, entity);
-    }
-
-    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;
-
-        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;
-    }
-}

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    = 8;
-    //This number is incremented every minecraft release, never reset
-    public static final int minorVersion    = 9;
-    //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 = 0;
-    //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/ISidedInventory.java

@@ -1,31 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public
- * License v1.0.
- */
-
-package net.minecraftforge.common;
-
-import net.minecraft.inventory.IInventory;
-
-/** Inventory ranges mapped by side.  This class is implemented by TileEntities
- * that provide different inventory slot ranges to different sides.
- */
-@Deprecated //A equivalent Interface is now in Minecraft Vanilla will be removed next major MC version
-public interface ISidedInventory extends IInventory
-{
-
-    /**
-     * Get the start of the side inventory.
-     * @param side The global side to get the start of range.
-     */
-    @Deprecated
-    int getStartInventorySide(ForgeDirection side);
-
-    /**
-     * Get the size of the side inventory.
-     * @param side The global side.
-     */
-    @Deprecated
-    int getSizeInventorySide(ForgeDirection side);
-}
-

common/net/minecraftforge/common/MinecraftForge.java

@@ -1,220 +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) public void func_94332_a(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,47 +0,0 @@
-package net.minecraftforge.common;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockChest;
-import net.minecraft.block.BlockDispenser;
-import net.minecraft.block.BlockDropper;
-import net.minecraft.block.BlockPistonBase;
-import net.minecraft.world.World;
-import static net.minecraftforge.common.ForgeDirection.*;
-
-public class RotationHelper {
-
-    private static final ForgeDirection[] UP_DOWN_AXES = new ForgeDirection[] { UP, DOWN };
-    public static ForgeDirection[] getValidVanillaBlockRotations(Block block)
-    {
-        return block instanceof BlockChest ? 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 (block instanceof BlockChest && (axis == UP || axis == DOWN))
-        {
-            return rotateBlock(worldObj, x, y, z, axis, 0x7);
-        }
-        if (block instanceof BlockPistonBase || block instanceof BlockDropper || block instanceof BlockDispenser)
-        {
-            return rotateBlock(worldObj, x, y, z, axis, 0x7);
-        }
-        return false;
-    }
-
-    private static boolean rotateBlock(World worldObj, int x, int y, int z, ForgeDirection axis, int mask)
-    {
-        int rotMeta = worldObj.getBlockMetadata(x, y, z);
-        int masked = rotMeta & ~mask;
-        ForgeDirection orientation = ForgeDirection.getOrientation(rotMeta & mask);
-        ForgeDirection rotated = orientation.getRotation(axis);
-        worldObj.setBlockMetadataWithNotify(x,y,z,rotated.ordinal() & mask | masked,3);
-        return true;
-    }
-
-}

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

@@ -1,49 +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.server.MinecraftServer;
-import cpw.mods.fml.common.network.IConnectionHandler;
-import cpw.mods.fml.common.network.Player;
-
-public class ForgeConnectionHandler implements IConnectionHandler {
-
-    @Override
-    public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager)
-    {
-
-    }
-
-    @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,187 +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 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);
-
-        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/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/ForgeEventFactory.java

@@ -1,78 +0,0 @@
-package net.minecraftforge.event;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.EnumCreatureType;
-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.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.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 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();
-    }
-}

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/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/LivingSpawnEvent.java

@@ -1,50 +0,0 @@
-package net.minecraftforge.event.entity.living;
-
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.world.World;
-import net.minecraftforge.event.Cancelable;
-import net.minecraftforge.event.Event.HasResult;
-
-public class LivingSpawnEvent extends LivingEvent
-{
-    public final World world;
-    public final float x;
-    public final float y;
-    public final float z;
-    
-    public LivingSpawnEvent(EntityLiving entity, World world, float x, float y, float z)
-    {
-        super(entity);
-        this.world = world;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    /**
-     * Fires before mob spawn events.
-     * 
-     * Result is significant:
-     *    DEFAULT: use vanilla spawn rules
-     *    ALLOW:   allow the spawn
-     *    DENY:    deny the spawn
-     *
-     */
-    @HasResult
-    public static class CheckSpawn extends LivingSpawnEvent
-    {
-        public CheckSpawn(EntityLiving entity, World world, float x, float y, float z)
-        {
-            super(entity, world, x, y, z);
-        }
-    }
-
-    @Cancelable
-    public static class SpecialSpawn extends LivingSpawnEvent
-    {
-        public SpecialSpawn(EntityLiving entity, World world, float x, float y, float z)
-        {
-            super(entity, world, x, y, z);
-        }
-    }
-}

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,48 +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;
-        }
-    }
-}

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/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/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/liquids/IBlockLiquid.java

@@ -1,58 +0,0 @@
-package net.minecraftforge.liquids;
-
-import net.minecraft.nbt.NBTTagCompound;
-
-/**
- * Implementors of this interface are a liquid which may receive a block implementation and can be placed in the world.
- *
- * @author cpw
- *
- */
-public interface IBlockLiquid extends ILiquid {
-    /**
-     * Controls the type of block that is generated by this IBlockLiquid
-     *
-     */
-    public enum BlockType {
-        /**
-         * No block. Completeness really.
-         */
-        NONE,
-        /**
-         * Vanilla style block, up to 8 flowing states. May be able to generate new sources.
-         */
-        VANILLA,
-        /**
-         * Finite liquid style, uses cellular automata to model flowing behaviour.
-         */
-        FINITE;
-    }
-
-    /**
-     * Can this liquid, when placed in a specific configuration, generate new source blocks of the liquid.
-     * @return if this liquid will generate new sources
-     */
-    public boolean willGenerateSources();
-
-    /**
-     * @return the distance this liquid will flow if placed in the world. Maximum of 7 levels for vanilla types.
-     */
-    public int getFlowDistance();
-
-    /**
-     * @return the RGB rendering for this liquid
-     */
-    public byte[] getLiquidRGB();
-
-    /**
-     * Get the texture file for rendering the liquid
-     * @return the texture file for this liquid
-     */
-    public String getLiquidBlockTextureFile();
-    /**
-     * Custom properties of the liquid.
-     * @return a compound tag of custom liquid properties
-     */
-    public NBTTagCompound getLiquidProperties();
-
-}

common/net/minecraftforge/liquids/ILiquid.java

@@ -1,35 +0,0 @@
-/**
- * Copyright (c) SpaceToad, 2011
- * http://www.mod-buildcraft.com
- *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
- */
-
-package net.minecraftforge.liquids;
-
-/**
- * Liquids implement this interface
- *
- */
-public interface ILiquid {
-
-    /**
-     * The itemId of the liquid item
-     * @return the itemId
-     */
-    public int stillLiquidId();
-
-    /**
-     * Is this liquid a metadata based liquid
-     * @return if this is a metadata liquid
-     */
-    public boolean isMetaSensitive();
-
-    /**
-     * The item metadata of the liquid
-     * @return the metadata of the liquid
-     */
-    public int stillLiquidMeta();
-}

common/net/minecraftforge/liquids/ILiquidTank.java

@@ -1,44 +0,0 @@
-package net.minecraftforge.liquids;
-
-/**
- * A tank is the unit of interaction with liquid inventories.
- *
- * @author cpw
- */
-public interface ILiquidTank {
-
-    /**
-     * @return LiquidStack representing the liquid contained in the tank, null if empty.
-     */
-    LiquidStack getLiquid();
-
-    /**
-     * @return capacity of this tank
-     */
-    int getCapacity();
-
-    /**
-     *
-     * @param resource
-     * @param doFill
-     * @return Amount of liquid used for filling.
-     */
-    int fill(LiquidStack resource, boolean doFill);
-    /**
-     *
-     * @param maxDrain
-     * @param doDrain
-     * @return Null if nothing was drained, otherwise a LiquidStack containing the drained.
-     */
-    LiquidStack drain(int maxDrain, boolean doDrain);
-
-    /**
-     * Positive values indicate a positive liquid pressure (liquid wants to leave this tank)
-     * Negative values indicate a negative liquid pressure (liquid wants to fill this tank)
-     * Zero indicates no pressure
-     *
-     * @return a number indicating tank pressure
-     */
-    public int getTankPressure();
-
-}

common/net/minecraftforge/liquids/ITankContainer.java

@@ -1,56 +0,0 @@
-package net.minecraftforge.liquids;
-
-import net.minecraftforge.common.ForgeDirection;
-
-public interface ITankContainer {
-
-    /**
-     * Fills liquid into internal tanks, distribution is left to the ITankContainer.
-     * @param from Orientation the liquid is pumped in from.
-     * @param resource LiquidStack representing the maximum amount of liquid filled into the ITankContainer
-     * @param doFill If false filling will only be simulated.
-     * @return Amount of resource that was filled into internal tanks.
-     */
-    int fill(ForgeDirection from, LiquidStack resource, boolean doFill);
-    /**
-     * Fills liquid into the specified internal tank.
-     * @param tankIndex the index of the tank to fill
-     * @param resource LiquidStack representing the maximum amount of liquid filled into the ITankContainer
-     * @param doFill If false filling will only be simulated.
-     * @return Amount of resource that was filled into internal tanks.
-     */
-    int fill(int tankIndex, LiquidStack resource, boolean doFill);
-
-    /**
-     * Drains liquid out of internal tanks, distribution is left to the ITankContainer.
-     * @param from Orientation the liquid is drained to.
-     * @param maxDrain Maximum amount of liquid to drain.
-     * @param doDrain If false draining will only be simulated.
-     * @return LiquidStack representing the liquid and amount actually drained from the ITankContainer
-     */
-    LiquidStack drain(ForgeDirection from, int maxDrain, boolean doDrain);
-    /**
-     * Drains liquid out of the specified internal tank.
-     * @param tankIndex the index of the tank to drain
-     * @param maxDrain Maximum amount of liquid to drain.
-     * @param doDrain If false draining will only be simulated.
-     * @return LiquidStack representing the liquid and amount actually drained from the ITankContainer
-     */
-    LiquidStack drain(int tankIndex, int maxDrain, boolean doDrain);
-
-    /**
-     * @param direction tank side: UNKNOWN for default tank set
-     * @return Array of {@link LiquidTank}s contained in this ITankContainer for this direction
-     */
-    ILiquidTank[] getTanks(ForgeDirection direction);
-
-    /**
-     * Return the tank that this tank container desired to be used for the specified liquid type from the specified direction
-     *
-     * @param direction the direction
-     * @param type the liquid type, null is always an acceptable value
-     * @return a tank or null for no such tank
-     */
-    ILiquidTank getTank(ForgeDirection direction, LiquidStack type);
-
-}

common/net/minecraftforge/liquids/LiquidContainerData.java

@@ -1,31 +0,0 @@
-/**
- * Copyright (c) SpaceToad, 2011
- * http://www.mod-buildcraft.com
- *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
- */
-
-package net.minecraftforge.liquids;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-public class LiquidContainerData {
-
-    public final LiquidStack stillLiquid;
-    public final ItemStack filled;
-    public final ItemStack container;
-
-
-    public LiquidContainerData(LiquidStack stillLiquid, ItemStack filled, ItemStack container) {
-        this.stillLiquid = stillLiquid;
-        this.filled = filled;
-        this.container = container;
-
-        if(stillLiquid == null || filled == null || container == null)
-            throw new RuntimeException("stillLiquid, filled, or container is null, this is an error");
-    }
-
-}

common/net/minecraftforge/liquids/LiquidContainerRegistry.java

@@ -1,131 +0,0 @@
-
-package net.minecraftforge.liquids;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-public class LiquidContainerRegistry
-{
-    public static final int BUCKET_VOLUME = 1000;
-    public static final ItemStack EMPTY_BUCKET = new ItemStack(Item.bucketEmpty);
-
-    private static Map<List, LiquidContainerData> mapFilledItemFromLiquid = new HashMap();
-    private static Map<List, LiquidContainerData> mapLiquidFromFilledItem = new HashMap();
-    private static Set<List> setContainerValidation = new HashSet();
-    private static Set<List> setLiquidValidation = new HashSet();
-    private static ArrayList<LiquidContainerData> liquids = new ArrayList();
-
-    /**
-     * Default registrations
-     */
-    static
-    {
-        registerLiquid(new LiquidContainerData(new LiquidStack(Block.waterStill, LiquidContainerRegistry.BUCKET_VOLUME), new ItemStack(Item.bucketWater), new ItemStack(Item.bucketEmpty)));
-        registerLiquid(new LiquidContainerData(new LiquidStack(Block.lavaStill, LiquidContainerRegistry.BUCKET_VOLUME),  new ItemStack(Item.bucketLava), new ItemStack(Item.bucketEmpty)));
-        registerLiquid(new LiquidContainerData(new LiquidStack(Block.waterStill, LiquidContainerRegistry.BUCKET_VOLUME), new ItemStack(Item.potion), new ItemStack(Item.glassBottle)));
-        // registerLiquid(new LiquidContainerData(new LiquidStack(Item.bucketMilk, LiquidContainerRegistry.BUCKET_VOLUME), new ItemStack(Item.bucketMilk), new ItemStack(Item.bucketEmpty)));
-    }
-
-    /**
-     * To register a container with a non-bucket size, the LiquidContainerData entry simply needs to use a size other than LiquidManager.BUCKET_VOLUME
-     */
-    public static void registerLiquid(LiquidContainerData data)
-    {
-        mapFilledItemFromLiquid.put(Arrays.asList(data.container.itemID, data.container.getItemDamage(), data.stillLiquid.itemID, data.stillLiquid.itemMeta), data);
-        mapLiquidFromFilledItem.put(Arrays.asList(data.filled.itemID, data.filled.getItemDamage()), data);
-        setContainerValidation.add(Arrays.asList(data.container.itemID, data.container.getItemDamage()));
-        setLiquidValidation.add(Arrays.asList(data.stillLiquid.itemID, data.stillLiquid.itemMeta));
-
-        liquids.add(data);
-    }
-
-    public static LiquidStack getLiquidForFilledItem(ItemStack filledContainer)
-    {
-        if (filledContainer == null)
-        {
-            return null;
-        }
-
-        LiquidContainerData ret = mapLiquidFromFilledItem.get(Arrays.asList(filledContainer.itemID, filledContainer.getItemDamage()));
-        return ret == null ? null : ret.stillLiquid.copy();
-    }
-
-    public static ItemStack fillLiquidContainer(LiquidStack liquid, ItemStack emptyContainer)
-    {
-        if (emptyContainer == null || liquid == null)
-        {
-            return null;
-        }
-
-        LiquidContainerData ret = mapFilledItemFromLiquid.get(Arrays.asList(emptyContainer.itemID, emptyContainer.getItemDamage(), liquid.itemID, liquid.itemMeta));
-
-        if (ret != null && liquid.amount >= ret.stillLiquid.amount)
-        {
-            return ret.filled.copy();
-        }
-
-        return null;
-    }
-
-    public static boolean containsLiquid(ItemStack filledContainer, LiquidStack liquid)
-    {
-        if (filledContainer == null || liquid == null)
-        {
-            return false;
-        }
-
-        LiquidContainerData ret = mapLiquidFromFilledItem.get(Arrays.asList(filledContainer.itemID, filledContainer.getItemDamage()));
-
-        return ret != null && ret.stillLiquid.isLiquidEqual(liquid);
-    }
-
-    public static boolean isBucket(ItemStack container)
-    {
-        if (container == null)
-        {
-            return false;
-        }
-
-        if (container.isItemEqual(EMPTY_BUCKET))
-        {
-            return true;
-        }
-
-        LiquidContainerData ret = mapLiquidFromFilledItem.get(Arrays.asList(container.itemID, container.getItemDamage()));
-        return ret != null && ret.container.isItemEqual(EMPTY_BUCKET);
-    }
-
-    public static boolean isContainer(ItemStack container)
-    {
-        return isEmptyContainer(container) || isFilledContainer(container);
-    }
-
-    public static boolean isEmptyContainer(ItemStack emptyContainer)
-    {
-        return emptyContainer != null && setContainerValidation.contains(Arrays.asList(emptyContainer.itemID, emptyContainer.getItemDamage()));
-    }
-
-    public static boolean isFilledContainer(ItemStack filledContainer)
-    {
-        return filledContainer != null && getLiquidForFilledItem(filledContainer) != null;
-    }
-
-    public static boolean isLiquid(ItemStack item)
-    {
-        return item != null && setLiquidValidation.contains(Arrays.asList(item.itemID, item.getItemDamage()));
-    }
-
-    public static LiquidContainerData[] getRegisteredLiquidContainerData()
-    {
-        return liquids.toArray(new LiquidContainerData[liquids.size()]);
-    }
-}

common/net/minecraftforge/liquids/LiquidDictionary.java

@@ -1,123 +0,0 @@
-package net.minecraftforge.liquids;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import net.minecraft.block.Block;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.Event;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.ImmutableMap;
-
-/**
- * When creating liquids you should register them with this class.
- *
- * @author CovertJaguar <railcraft.wikispaces.com>
- */
-public abstract class LiquidDictionary
-{
-
-    private static BiMap<String, LiquidStack> liquids = HashBiMap.create();
-
-    /**
-     * When creating liquids you should call this function.
-     *
-     * Upon passing it a name and liquid item it will return either
-     * a preexisting implementation of that liquid or the liquid passed in.
-     *
-     *
-     * @param name the name of the liquid
-     * @param liquid the liquid to use if one doesn't exist
-     * @return the matching liquid stack
-     */
-    public static LiquidStack getOrCreateLiquid(String name, LiquidStack liquid)
-    {
-        if (liquid == null)
-        {
-            throw new NullPointerException("You cannot register a null LiquidStack");
-        }
-        LiquidStack existing = liquids.get(name);
-        if(existing != null) {
-            return existing.copy();
-        }
-        liquids.put(name, liquid.copy());
-
-        MinecraftForge.EVENT_BUS.post(new LiquidRegisterEvent(name, liquid));
-        return liquid;
-    }
-
-    /**
-     * Returns the liquid matching the name,
-     * if such a liquid exists.
-     *
-     * Can return null.
-     *
-     * @param name the name of the liquid
-     * @param amount the amout of liquid
-     * @return a liquidstack for the requested liquid
-     */
-    public static LiquidStack getLiquid(String name, int amount)
-    {
-        LiquidStack liquid = liquids.get(name);
-        if(liquid == null)
-            return null;
-
-        liquid = liquid.copy();
-        liquid.amount = amount;
-        return liquid;
-    }
-
-    public static LiquidStack getCanonicalLiquid(String name)
-    {
-        return liquids.get(name);
-    }
-    /**
-     * Get an immutable list of the liquids defined
-     *
-     * @return the defined liquids
-     */
-    public static Map<String, LiquidStack> getLiquids()
-    {
-        return ImmutableMap.copyOf(liquids);
-    }
-    /**
-     * Fired when a new liquid is created
-     *
-     */
-    public static class LiquidRegisterEvent extends Event
-    {
-        public final String Name;
-        public final LiquidStack Liquid;
-
-        public LiquidRegisterEvent(String name, LiquidStack liquid)
-        {
-            this.Name = name;
-            this.Liquid = liquid.copy();
-        }
-    }
-
-    static
-    {
-        getOrCreateLiquid("Water", new LiquidStack(Block.waterStill, LiquidContainerRegistry.BUCKET_VOLUME));
-        getOrCreateLiquid("Lava", new LiquidStack(Block.lavaStill, LiquidContainerRegistry.BUCKET_VOLUME));
-    }
-
-    public static String findLiquidName(LiquidStack reference)
-    {
-        if (reference != null)
-        {
-            return liquids.inverse().get(reference);
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    public static LiquidStack getCanonicalLiquid(LiquidStack liquidStack)
-    {
-        return liquids.get(liquids.inverse().get(liquidStack));
-    }
-}

common/net/minecraftforge/liquids/LiquidEvent.java

@@ -1,96 +0,0 @@
-package net.minecraftforge.liquids;
-
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.Event;
-
-public class LiquidEvent extends Event {
-    public final LiquidStack liquid;
-    public final int x;
-    public final int y;
-    public final int z;
-    public final World world;
-
-    public LiquidEvent(LiquidStack liquid, World world, int x, int y, int z)
-    {
-        this.liquid = liquid;
-        this.world = world;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    /**
-     * Mods should fire this event when they move liquids around (pipe networks etc)
-     *
-     * @author cpw
-     *
-     */
-    public static class LiquidMotionEvent extends LiquidEvent
-    {
-        public LiquidMotionEvent(LiquidStack liquid, World world, int x, int y, int z)
-        {
-            super(liquid, world, x, y, z);
-        }
-    }
-
-    /**
-     * Mods should fire this event when a liquid is {@link ILiquidTank#fill(LiquidStack, boolean)} their tank implementation.
-     * {@link LiquidTank} does.
-     *
-     * @author cpw
-     *
-     */
-    public static class LiquidFillingEvent extends LiquidEvent
-    {
-        public final ILiquidTank tank;
-
-        public LiquidFillingEvent(LiquidStack liquid, World world, int x, int y, int z, ILiquidTank tank)
-        {
-            super(liquid, world, x, y, z);
-            this.tank = tank;
-        }
-    }
-
-    /**
-     * Mods should fire this event when a liquid is {@link ILiquidTank#drain(int, boolean)} from their tank.
-     * @author cpw
-     *
-     */
-    public static class LiquidDrainingEvent extends LiquidEvent
-    {
-        public final ILiquidTank tank;
-
-        public LiquidDrainingEvent(LiquidStack liquid, World world, int x, int y, int z, ILiquidTank tank)
-        {
-            super(liquid, world, x, y, z);
-            this.tank = tank;
-        }
-    }
-
-
-    /**
-     * Mods should fire this event when a liquid "spills", for example, if a block containing liquid is broken.
-     *
-     * @author cpw
-     *
-     */
-    public static class LiquidSpilledEvent extends LiquidEvent
-    {
-        public LiquidSpilledEvent(LiquidStack liquid, World world, int x, int y, int z)
-        {
-            super(liquid, world, x, y, z);
-        }
-    }
-
-    /**
-     * A handy shortcut for firing the various liquid events
-     *
-     * @param event
-     */
-    public static final void fireEvent(LiquidEvent event)
-    {
-        MinecraftForge.EVENT_BUS.post(event);
-    }
-}

common/net/minecraftforge/liquids/LiquidStack.java

@@ -1,256 +0,0 @@
-package net.minecraftforge.liquids;
-
-import static cpw.mods.fml.relauncher.Side.CLIENT;
-
-import com.google.common.base.Objects;
-
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockFluid;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.Icon;
-
-/**
- * ItemStack substitute for liquids
- * Things of note: they are equal if their items are equal. Amount does NOT matter for java equals() testing
- * <br/>
- * The canonical liquidstack is probably the only one that has a lot of the rendering data on it. Use {@link #canonical()}
- * to get it.
- *
- * @author SirSengir
- */
-public class LiquidStack
-{
-    public final int itemID;
-    public int amount;
-    public final int itemMeta;
-    public NBTTagCompound extra;
-
-    public LiquidStack(int itemID,  int amount) { this(itemID,        amount, 0); }
-    public LiquidStack(Item item,   int amount) { this(item.itemID,   amount, 0); }
-    public LiquidStack(Block block, int amount) { this(block.blockID, amount, 0); }
-
-    public LiquidStack(int itemID, int amount, int itemDamage)
-    {
-        this.itemID = itemID;
-        this.amount = amount;
-        this.itemMeta = itemDamage;
-    }
-
-    public LiquidStack(int itemID, int amount, int itemDamage, NBTTagCompound nbt)
-    {
-        this(itemID, amount, itemDamage);
-        if (nbt != null)
-        {
-            extra = (NBTTagCompound)nbt.copy();
-        }
-    }
-
-    public NBTTagCompound writeToNBT(NBTTagCompound nbt)
-    {
-        nbt.setInteger("Amount", amount);
-        nbt.setShort("Id", (short)itemID);
-        nbt.setShort("Meta", (short)itemMeta);
-        String name = LiquidDictionary.findLiquidName(this);
-        if(name != null)
-        {
-            nbt.setString("LiquidName", name);
-        }
-        if (extra != null)
-        {
-            nbt.setTag("extra", extra);
-        }
-        return nbt;
-    }
-
-    /**
-     * @return A copy of this LiquidStack
-     */
-    public LiquidStack copy()
-    {
-        return new LiquidStack(itemID, amount, itemMeta, extra);
-    }
-
-    /**
-     * @param other
-     * @return true if this LiquidStack contains the same liquid as the one passed in.
-     */
-    public boolean isLiquidEqual(LiquidStack other)
-    {
-        return other != null && itemID == other.itemID && itemMeta == other.itemMeta && (extra == null ? other.extra == null : extra.equals(other.extra));
-    }
-
-    /**
-     * @param other
-     * @return true if this LiquidStack contains the other liquid (liquids are equal and amount >= other.amount).
-     */
-    public boolean containsLiquid(LiquidStack other)
-    {
-        return isLiquidEqual(other) && amount >= other.amount;
-    }
-
-    /**
-     * @param other ItemStack containing liquids.
-     * @return true if this LiquidStack contains the same liquid as the one passed in.
-     */
-    public boolean isLiquidEqual(ItemStack other)
-    {
-        if (other == null)
-        {
-            return false;
-        }
-
-        if (itemID == other.itemID && itemMeta == other.getItemDamage())
-        {
-            return true;
-        }
-
-        return isLiquidEqual(LiquidContainerRegistry.getLiquidForFilledItem(other));
-    }
-
-    /**
-     * @return ItemStack representation of this LiquidStack
-     */
-    public ItemStack asItemStack()
-    {
-        ItemStack stack = new ItemStack(itemID, 1, itemMeta);
-        if (extra != null)
-        {
-            stack.stackTagCompound = (NBTTagCompound)extra.copy();
-        }
-        return stack;
-    }
-
-    /**
-     * Reads a liquid stack from the passed nbttagcompound and returns it.
-     *
-     * @param nbt
-     * @return the liquid stack
-     */
-    public static LiquidStack loadLiquidStackFromNBT(NBTTagCompound nbt)
-    {
-        if (nbt == null)
-        {
-            return null;
-        }
-        String liquidName = nbt.getString("LiquidName");
-        int itemID = nbt.getShort("Id");
-        int itemMeta = nbt.getShort("Meta");
-        LiquidStack liquid = LiquidDictionary.getCanonicalLiquid(liquidName);
-        if(liquid != null) {
-            itemID = liquid.itemID;
-            itemMeta = liquid.itemMeta;
-        }
-        // if the item is not existent, and no liquid dictionary is found, null returns
-        else if (Item.itemsList[itemID] == null)
-        {
-            return null;
-        }
-        int amount = nbt.getInteger("Amount");
-        LiquidStack liquidstack = new LiquidStack(itemID, amount, itemMeta);
-        if (nbt.hasKey("extra"))
-        {
-            liquidstack.extra = nbt.getCompoundTag("extra");
-        }
-        return liquidstack.itemID == 0 ? null : liquidstack;
-    }
-
-    private String textureSheet = "/terrain.png";
-
-    /**
-     * Return the textureSheet used for this liquid stack's texture Icon
-     * Defaults to '/terrain.png'
-     *
-     * See {@link #getRenderingIcon()} for the actual icon
-     *
-     * @return The texture sheet
-     */
-    public String getTextureSheet()
-    {
-        return textureSheet;
-    }
-
-    /**
-     * Set the texture sheet for this icon (usually /terrain.png or /gui/items.png)
-     *
-     * See also the {@link #setRenderingIcon(Icon)} for the icon itself
-     *
-     * @param textureSheet
-     * @return the liquid stack
-     */
-    public LiquidStack setTextureSheet(String textureSheet)
-    {
-        this.textureSheet = textureSheet;
-        return this;
-    }
-    @SideOnly(CLIENT)
-    private Icon renderingIcon;
-
-    /**
-     * Get the rendering icon for this liquid stack, for presentation in the world or in GUIs.
-     * Defaults to handling water and lava, and returns the set rendering icon otherwise.
-     *
-     * See {@link #getTextureSheet()} to get the texture sheet this icon is associated with
-     *
-     * @return The icon for rendering this liquid
-     */
-    @SideOnly(CLIENT)
-    public Icon getRenderingIcon()
-    {
-        if (itemID == Block.waterStill.blockID)
-        {
-            return BlockFluid.func_94424_b("water");
-        }
-        else if (itemID == Block.lavaStill.blockID)
-        {
-            return BlockFluid.func_94424_b("lava");
-        }
-        return renderingIcon;
-    }
-
-    /**
-     * Set the icon for rendering this liquid
-     * It should be refreshed whenever textures are refreshed.
-     *
-     * See also {@link #setTextureSheet(String)} for setting the sheet this icon is associated with
-     *
-     * @param icon The icon to render
-     * @return The liquid stack
-     */
-    @SideOnly(CLIENT)
-    public LiquidStack setRenderingIcon(Icon icon)
-    {
-        this.renderingIcon = icon;
-        return this;
-    }
-
-    @Override
-    public final int hashCode()
-    {
-        return 31 * itemMeta + itemID;
-    }
-
-    @Override
-    public final boolean equals(Object ob)
-    {
-        if (ob instanceof LiquidStack)
-        {
-            LiquidStack ls = (LiquidStack)ob;
-            return ls.itemID == itemID && ls.itemMeta == itemMeta && (extra == null ? ls.extra == null : extra.equals(ls.extra));
-        }
-        return false;
-    }
-
-
-    /**
-     * Get the canonical version of this liquid stack (will contain things like icons and texturesheets)
-     * @return The canonical liquidstack
-     */
-    public LiquidStack canonical()
-    {
-        return LiquidDictionary.getCanonicalLiquid(this);
-    }
-}

common/net/minecraftforge/liquids/LiquidTank.java

@@ -1,180 +0,0 @@
-package net.minecraftforge.liquids;
-
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-
-/**
- * Reference implementation of ILiquidTank. Use this or implement your own.
- */
-public class LiquidTank implements ILiquidTank {
-    private LiquidStack liquid;
-    private int capacity;
-    private int tankPressure;
-    private TileEntity tile;
-
-    public LiquidTank(int capacity)
-    {
-        this(null, capacity);
-    }
-
-    public LiquidTank(int liquidId, int quantity, int capacity)
-    {
-        this(new LiquidStack(liquidId, quantity), capacity);
-    }
-
-    public LiquidTank(int liquidId, int quantity, int capacity, TileEntity tile)
-    {
-        this(liquidId, quantity, capacity);
-        this.tile = tile;
-    }
-
-    public LiquidTank(LiquidStack liquid, int capacity)
-    {
-        this.liquid = liquid;
-        this.capacity = capacity;
-    }
-
-    public LiquidTank(LiquidStack liquid, int capacity, TileEntity tile)
-    {
-        this(liquid, capacity);
-        this.tile = tile;
-    }
-
-    @Override
-    public LiquidStack getLiquid()
-    {
-        return this.liquid;
-    }
-
-    @Override
-    public int getCapacity()
-    {
-        return this.capacity;
-    }
-
-    public void setLiquid(LiquidStack liquid)
-    {
-        this.liquid = liquid;
-    }
-
-    public void setCapacity(int capacity)
-    {
-        this.capacity = capacity;
-    }
-
-    @Override
-    public int fill(LiquidStack resource, boolean doFill)
-    {
-        if (resource == null || resource.itemID <= 0) return 0;
-
-        if (liquid == null || liquid.itemID <= 0)
-        {
-            if (resource.amount <= capacity)
-            {
-                if (doFill) this.liquid = resource.copy();
-                return resource.amount;
-            }
-            else
-            {
-                if (doFill)
-                {
-                    this.liquid = resource.copy();
-                    this.liquid.amount = capacity;
-                    if (tile != null)
-                        LiquidEvent.fireEvent(new LiquidEvent.LiquidFillingEvent(liquid, tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord, this));
-                }
-                return capacity;
-            }
-        }
-
-        if (!liquid.isLiquidEqual(resource)) return 0;
-
-        int space = capacity - liquid.amount;
-        if (resource.amount <= space)
-        {
-            if (doFill) this.liquid.amount += resource.amount;
-            return resource.amount;
-        }
-        else
-        {
-
-            if (doFill) this.liquid.amount = capacity;
-            return space;
-        }
-
-    }
-
-    @Override
-    public LiquidStack drain(int maxDrain, boolean doDrain)
-    {
-        if (liquid == null || liquid.itemID <= 0) return null;
-        if (liquid.amount <= 0) return null;
-
-        int used = maxDrain;
-        if (liquid.amount < used) used = liquid.amount;
-
-        if (doDrain)
-        {
-            liquid.amount -= used;
-        }
-
-        LiquidStack drained = new LiquidStack(liquid.itemID, used, liquid.itemMeta);
-
-        // Reset liquid if emptied
-        if (liquid.amount <= 0) liquid = null;
-
-        if (doDrain && tile != null)
-            LiquidEvent.fireEvent(new LiquidEvent.LiquidDrainingEvent(drained, tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord, this));
-
-        return drained;
-    }
-
-    @Override
-    public int getTankPressure()
-    {
-        return tankPressure;
-    }
-
-    public void setTankPressure(int pressure)
-    {
-        this.tankPressure = pressure;
-    }
-
-
-    public String getLiquidName()
-    {
-        return liquid!= null ? LiquidDictionary.findLiquidName(liquid) : null;
-    }
-
-    public boolean containsValidLiquid()
-    {
-        return LiquidDictionary.findLiquidName(liquid) != null;
-    }
-
-
-    public NBTTagCompound writeToNBT(NBTTagCompound nbt)
-    {
-        if (containsValidLiquid())
-        {
-            liquid.writeToNBT(nbt);
-        }
-        else
-        {
-            nbt.setString("emptyTank", "");
-        }
-        return nbt;
-    }
-
-    public LiquidTank readFromNBT(NBTTagCompound nbt)
-    {
-        if (!nbt.hasKey("emptyTank"))
-        {
-            LiquidStack liquid = LiquidStack.loadLiquidStackFromNBT(nbt);
-            if (liquid != null)
-            {
-                setLiquid(liquid);
-            }
-        }
-        return this;
-    }
-}

common/net/minecraftforge/oredict/OreDictionary.java

@@ -1,318 +0,0 @@
-package net.minecraftforge.oredict;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.ShapedRecipes;
-import net.minecraft.item.crafting.ShapelessRecipes;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.Event;
-
-public class OreDictionary
-{
-    private static boolean hasInit = false;
-    private static int maxID = 0;
-    private static HashMap<String, Integer> oreIDs = new HashMap<String, Integer>();
-    private static HashMap<Integer, ArrayList<ItemStack>> oreStacks = new HashMap<Integer, ArrayList<ItemStack>>();
-
-
-    /**
-     * Minecraft changed from -1 to Short.MAX_VALUE in 1.5 release for the "block wildcard". Use this in case it
-     * changes again.
-     */
-    public static final int WILDCARD_VALUE = Short.MAX_VALUE;
-
-    static {
-        initVanillaEntries();
-    }
-
-    public static void initVanillaEntries()
-    {
-        if (!hasInit)
-        {
-            registerOre("logWood",     new ItemStack(Block.wood, 1, WILDCARD_VALUE));
-            registerOre("plankWood",   new ItemStack(Block.planks, 1, WILDCARD_VALUE));
-            registerOre("slabWood",    new ItemStack(Block.woodSingleSlab, 1, WILDCARD_VALUE));
-            registerOre("stairWood",   Block.stairsWoodOak);
-            registerOre("stairWood",   Block.stairsWoodBirch);
-            registerOre("stairWood",   Block.stairsWoodJungle);
-            registerOre("stairWood",   Block.stairsWoodSpruce);
-            registerOre("stickWood",   Item.stick);
-            registerOre("treeSapling", new ItemStack(Block.sapling, 1, WILDCARD_VALUE));
-            registerOre("treeLeaves",  new ItemStack(Block.leaves, 1, WILDCARD_VALUE));
-            registerOre("oreGold", Block.oreGold);
-            registerOre("oreIron", Block.oreIron);
-            registerOre("oreLapis", Block.oreLapis);
-            registerOre("oreDiamond", Block.oreDiamond);
-            registerOre("oreRedstone", Block.oreRedstone);
-            registerOre("oreEmerald", Block.oreEmerald);
-            registerOre("oreQuartz", Block.oreNetherQuartz);
-        }
-
-        // Build our list of items to replace with ore tags
-        Map<ItemStack, String> replacements = new HashMap<ItemStack, String>();
-        replacements.put(new ItemStack(Block.planks, 1, WILDCARD_VALUE), "plankWood");
-        replacements.put(new ItemStack(Item.stick), "stickWood");
-
-        // Register dyes
-        String[] dyes =
-        {
-            "dyeBlack",
-            "dyeRed",
-            "dyeGreen",
-            "dyeBrown",
-            "dyeBlue",
-            "dyePurple",
-            "dyeCyan",
-            "dyeLightGray",
-            "dyeGray",
-            "dyePink",
-            "dyeLime",
-            "dyeYellow",
-            "dyeLightBlue",
-            "dyeMagenta",
-            "dyeOrange",
-            "dyeWhite"
-        };
-
-        for(int i = 0; i < 16; i++)
-        {
-            ItemStack dye = new ItemStack(Item.dyePowder, 1, i);
-            if (!hasInit)
-            {
-                registerOre(dyes[i], dye);
-            }
-            replacements.put(dye, dyes[i]);
-        }
-        hasInit = true;
-
-        ItemStack[] replaceStacks = replacements.keySet().toArray(new ItemStack[replacements.keySet().size()]);
-
-        // Ignore recipes for the following items
-        ItemStack[] exclusions = new ItemStack[]
-        {
-            new ItemStack(Block.blockLapis),
-            new ItemStack(Item.cookie),
-        };
-
-        List recipes = CraftingManager.getInstance().getRecipeList();
-        List<IRecipe> recipesToRemove = new ArrayList<IRecipe>();
-        List<IRecipe> recipesToAdd = new ArrayList<IRecipe>();
-
-        // Search vanilla recipes for recipes to replace
-        for(Object obj : recipes)
-        {
-            if(obj instanceof ShapedRecipes)
-            {
-                ShapedRecipes recipe = (ShapedRecipes)obj;
-                ItemStack output = recipe.getRecipeOutput();
-                if (output != null && containsMatch(false, exclusions, output))
-                {
-                    continue;
-                }
-
-                if(containsMatch(true, recipe.recipeItems, replaceStacks))
-                {
-                    recipesToRemove.add(recipe);
-                    recipesToAdd.add(new ShapedOreRecipe(recipe, replacements));
-                }
-            }
-            else if(obj instanceof ShapelessRecipes)
-            {
-                ShapelessRecipes recipe = (ShapelessRecipes)obj;
-                ItemStack output = recipe.getRecipeOutput();
-                if (output != null && containsMatch(false, exclusions, output))
-                {
-                    continue;
-                }
-
-                if(containsMatch(true, (ItemStack[])recipe.recipeItems.toArray(new ItemStack[recipe.recipeItems.size()]), replaceStacks))
-                {
-                    recipesToRemove.add((IRecipe)obj);
-                    IRecipe newRecipe = new ShapelessOreRecipe(recipe, replacements);
-                    recipesToAdd.add(newRecipe);
-                }
-            }
-        }
-
-        recipes.removeAll(recipesToRemove);
-        recipes.addAll(recipesToAdd);
-        if (recipesToRemove.size() > 0)
-        {
-            System.out.println("Replaced " + recipesToRemove.size() + " ore recipies");
-        }
-    }
-
-    /**
-     * Gets the integer ID for the specified ore name.
-     * If the name does not have a ID it assigns it a new one.
-     *
-     * @param name The unique name for this ore 'oreIron', 'ingotIron', etc..
-     * @return A number representing the ID for this ore type
-     */
-    public static int getOreID(String name)
-    {
-        Integer val = oreIDs.get(name);
-        if (val == null)
-        {
-            val = maxID++;
-            oreIDs.put(name, val);
-            oreStacks.put(val, new ArrayList<ItemStack>());
-        }
-        return val;
-    }
-
-    /**
-     * Reverse of getOreID, will not create new entries.
-     *
-     * @param id The ID to translate to a string
-     * @return The String name, or "Unknown" if not found.
-     */
-    public static String getOreName(int id)
-    {
-        for (Map.Entry<String, Integer> entry : oreIDs.entrySet())
-        {
-            if (id == entry.getValue())
-            {
-                return entry.getKey();
-            }
-        }
-        return "Unknown";
-    }
-
-    /**
-     * Gets the integer ID for the specified item stack.
-     * If the item stack is not linked to any ore, this will return -1 and no new entry will be created.
-     *
-     * @param itemStack The item stack of the ore.
-     * @return A number representing the ID for this ore type, or -1 if couldn't find it.
-     */
-    public static int getOreID(ItemStack itemStack)
-    {
-        if (itemStack == null)
-        {
-            return -1;
-        }
-
-        for(Entry<Integer, ArrayList<ItemStack>> ore : oreStacks.entrySet())
-        {
-            for(ItemStack target : ore.getValue())
-            {
-                if(itemStack.itemID == target.itemID && (target.getItemDamage() == WILDCARD_VALUE || itemStack.getItemDamage() == target.getItemDamage()))
-                {
-                    return ore.getKey();
-                }
-            }
-        }
-        return -1; // didn't find it.
-    }
-
-    /**
-     * Retrieves the ArrayList of items that are registered to this ore type.
-     * Creates the list as empty if it did not exist.
-     *
-     * @param name The ore name, directly calls getOreID
-     * @return An arrayList containing ItemStacks registered for this ore
-     */
-    public static ArrayList<ItemStack> getOres(String name)
-    {
-        return getOres(getOreID(name));
-    }
-
-    /**
-     * Retrieves a list of all unique ore names that are already registered.
-     *
-     * @return All unique ore names that are currently registered.
-     */
-    public static String[] getOreNames()
-    {
-        return oreIDs.keySet().toArray(new String[oreIDs.keySet().size()]);
-    }
-
-    /**
-     * Retrieves the ArrayList of items that are registered to this ore type.
-     * Creates the list as empty if it did not exist.
-     *
-     * @param id The ore ID, see getOreID
-     * @return An arrayList containing ItemStacks registered for this ore
-     */
-    public static ArrayList<ItemStack> getOres(Integer id)
-    {
-        ArrayList<ItemStack> val = oreStacks.get(id);
-        if (val == null)
-        {
-            val = new ArrayList<ItemStack>();
-            oreStacks.put(id, val);
-        }
-        return val;
-    }
-
-    private static boolean containsMatch(boolean strict, ItemStack[] inputs, ItemStack... targets)
-    {
-        for (ItemStack input : inputs)
-        {
-            for (ItemStack target : targets)
-            {
-                if (itemMatches(target, input, strict))
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    public static boolean itemMatches(ItemStack target, ItemStack input, boolean strict)
-    {
-        if (input == null && target != null || input != null && target == null)
-        {
-            return false;
-        }
-        return (target.itemID == input.itemID && ((target.getItemDamage() == WILDCARD_VALUE && !strict) || target.getItemDamage() == input.getItemDamage()));
-    }
-
-    //Convenience functions that make for cleaner code mod side. They all drill down to registerOre(String, int, ItemStack)
-    public static void registerOre(String name, Item      ore){ registerOre(name, new ItemStack(ore));  }
-    public static void registerOre(String name, Block     ore){ registerOre(name, new ItemStack(ore));  }
-    public static void registerOre(String name, ItemStack ore){ registerOre(name, getOreID(name), ore); }
-    public static void registerOre(int    id,   Item      ore){ registerOre(id,   new ItemStack(ore));  }
-    public static void registerOre(int    id,   Block     ore){ registerOre(id,   new ItemStack(ore));  }
-    public static void registerOre(int    id,   ItemStack ore){ registerOre(getOreName(id), id, ore);   }
-
-    /**
-     * Registers a ore item into the dictionary.
-     * Raises the registerOre function in all registered handlers.
-     *
-     * @param name The name of the ore
-     * @param id The ID of the ore
-     * @param ore The ore's ItemStack
-     */
-    private static void registerOre(String name, int id, ItemStack ore)
-    {
-        ArrayList<ItemStack> ores = getOres(id);
-        ore = ore.copy();
-        ores.add(ore);
-        MinecraftForge.EVENT_BUS.post(new OreRegisterEvent(name, ore));
-    }
-
-    public static class OreRegisterEvent extends Event
-    {
-        public final String Name;
-        public final ItemStack Ore;
-
-        public OreRegisterEvent(String name, ItemStack ore)
-        {
-            this.Name = name;
-            this.Ore = ore;
-        }
-    }
-}

common/net/minecraftforge/transformers/EventTransformer.java

@@ -1,164 +0,0 @@
-package net.minecraftforge.transformers;
-
-import java.util.List;
-
-import net.minecraft.launchwrapper.IClassTransformer;
-import net.minecraftforge.event.Event;
-import net.minecraftforge.event.ListenerList;
-
-import org.objectweb.asm.*;
-import org.objectweb.asm.tree.*;
-import static org.objectweb.asm.Opcodes.*;
-import static org.objectweb.asm.Type.*;
-import static org.objectweb.asm.ClassWriter.*;
-
-public class EventTransformer implements IClassTransformer
-{
-    public EventTransformer()
-    {
-    }
-
-    @Override
-    public byte[] transform(String name, String transformedName, byte[] bytes)
-    {
-        if (bytes == null || name.equals("net.minecraftforge.event.Event") || name.startsWith("net.minecraft.") || name.indexOf('.') == -1)
-        {
-            return bytes;
-        }
-        ClassReader cr = new ClassReader(bytes);
-        ClassNode classNode = new ClassNode();
-        cr.accept(classNode, 0);
-
-        try
-        {
-            if (buildEvents(classNode))
-            {
-                ClassWriter cw = new ClassWriter(COMPUTE_MAXS | COMPUTE_FRAMES);
-                classNode.accept(cw);
-                return cw.toByteArray();
-            }
-            return bytes;
-        }
-        catch (ClassNotFoundException ex)
-        {
-            // Discard silently- it's just noise
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-        return bytes;
-    }
-
-    @SuppressWarnings("unchecked")
-    private boolean buildEvents(ClassNode classNode) throws Exception
-    {
-        Class<?> parent = this.getClass().getClassLoader().loadClass(classNode.superName.replace('/', '.'));
-        if (!Event.class.isAssignableFrom(parent))
-        {
-            return false;
-        }
-
-        boolean hasSetup = false;
-        boolean hasGetListenerList = false;
-        boolean hasDefaultCtr = false;
-
-        Class<?> listenerListClazz = Class.forName("net.minecraftforge.event.ListenerList", false, getClass().getClassLoader());
-        Type tList = Type.getType(listenerListClazz);
-
-        for (MethodNode method : (List<MethodNode>)classNode.methods)
-        {
-                if (method.name.equals("setup") &&
-                    method.desc.equals(Type.getMethodDescriptor(VOID_TYPE)) &&
-                    (method.access & ACC_PROTECTED) == ACC_PROTECTED)
-                {
-                    hasSetup = true;
-                }
-                if (method.name.equals("getListenerList") &&
-                    method.desc.equals(Type.getMethodDescriptor(tList)) &&
-                    (method.access & ACC_PUBLIC) == ACC_PUBLIC)
-                {
-                    hasGetListenerList = true;
-                }
-                if (method.name.equals("<init>") &&
-                    method.desc.equals(Type.getMethodDescriptor(VOID_TYPE)))
-                {
-                    hasDefaultCtr = true;
-                }
-        }
-
-        if (hasSetup)
-        {
-                if (!hasGetListenerList)
-                {
-                        throw new RuntimeException("Event class defines setup() but does not define getListenerList! " + classNode.name);
-                }
-                else
-                {
-                        return false;
-                }
-        }
-
-        Type tSuper = Type.getType(classNode.superName);
-
-        //Add private static ListenerList LISTENER_LIST
-        classNode.fields.add(new FieldNode(ACC_PRIVATE | ACC_STATIC, "LISTENER_LIST", tList.getDescriptor(), null, null));
-
-        /*Add:
-         *      public <init>()
-         *      {
-         *              super();
-         *      }
-         */
-        MethodNode method = new MethodNode(ASM4, ACC_PUBLIC, "<init>", getMethodDescriptor(VOID_TYPE), null, null);
-        method.instructions.add(new VarInsnNode(ALOAD, 0));
-        method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "<init>", getMethodDescriptor(VOID_TYPE)));
-        method.instructions.add(new InsnNode(RETURN));
-        if (!hasDefaultCtr)
-        {
-            classNode.methods.add(method);
-        }
-
-        /*Add:
-         *      protected void setup()
-         *      {
-         *              super.setup();
-         *              if (LISTENER_LIST != NULL)
-         *              {
-         *                      return;
-         *              }
-         *              LISTENER_LIST = new ListenerList(super.getListenerList());
-         *      }
-         */
-        method = new MethodNode(ASM4, ACC_PROTECTED, "setup", getMethodDescriptor(VOID_TYPE), null, null);
-        method.instructions.add(new VarInsnNode(ALOAD, 0));
-        method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "setup", getMethodDescriptor(VOID_TYPE)));
-        method.instructions.add(new FieldInsnNode(GETSTATIC, classNode.name, "LISTENER_LIST", tList.getDescriptor()));
-        LabelNode initLisitener = new LabelNode();
-        method.instructions.add(new JumpInsnNode(IFNULL, initLisitener));
-        method.instructions.add(new InsnNode(RETURN));
-        method.instructions.add(initLisitener);
-        method.instructions.add(new FrameNode(F_SAME, 0, null, 0, null));
-        method.instructions.add(new TypeInsnNode(NEW, tList.getInternalName()));
-        method.instructions.add(new InsnNode(DUP));
-        method.instructions.add(new VarInsnNode(ALOAD, 0));
-        method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "getListenerList", getMethodDescriptor(tList)));
-        method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tList.getInternalName(), "<init>", getMethodDescriptor(VOID_TYPE, tList)));
-        method.instructions.add(new FieldInsnNode(PUTSTATIC, classNode.name, "LISTENER_LIST", tList.getDescriptor()));
-        method.instructions.add(new InsnNode(RETURN));
-        classNode.methods.add(method);
-
-        /*Add:
-         *      public ListenerList getListenerList()
-         *      {
-         *              return this.LISTENER_LIST;
-         *      }
-         */
-        method = new MethodNode(ASM4, ACC_PUBLIC, "getListenerList", getMethodDescriptor(tList), null, null);
-        method.instructions.add(new FieldInsnNode(GETSTATIC, classNode.name, "LISTENER_LIST", tList.getDescriptor()));
-        method.instructions.add(new InsnNode(ARETURN));
-        classNode.methods.add(method);
-        return true;
-    }
-}

fml/.gitattributes

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

fml/.gitignore

@@ -0,0 +1,21 @@
+#eclipse
+/bin
+/.settings
+/.classpath
+
+#idea
+/.idea
+*.iml
+
+#gradle
+/build
+/buildSrc
+/.gradle
+
+#occupational hazards
+/eclipse/
+/repo/
+
+
+#Patch reject
+*.rej

fml/CREDITS-fml.txt

@@ -0,0 +1,28 @@
+This is Forge Mod Loader.
+
+You can find the source code at all times at https://github.com/MinecraftForge/FML
+
+This minecraft mod is a clean open source implementation of a mod loader for minecraft servers
+and minecraft clients.
+
+The code is authored by cpw.
+
+It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
+http://www.minecraftforum.net/topic/75440-
+This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
+
+It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
+http://www.minecraftforge.net/
+
+Additionally, it contains an implementation of topological sort based on that 
+published at http://keithschwarz.com/interesting/code/?dir=topological-sort
+
+It also contains code from the Maven project for performing versioned dependency
+resolution. http://maven.apache.org/
+
+It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/
+with credit to it's authors.
+
+Forge Mod Loader downloads components from the Minecraft Coder Pack
+(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team.
+

fml/LICENSE-fml.txt

@@ -0,0 +1,491 @@
+This minecraft mod, Forge Mod Loader, including all parts herein except as noted below,
+is licensed under the GNU LGPL v2.1 or later.
+
+Homepage: https://github.com/MinecraftForge/FML
+
+This software includes portions from the Apache Maven project at
+http://maven.apache.org/ specifically the ComparableVersion.java code. It is
+included based on guidelines at
+http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html
+with notices intact. The only change is a non-functional change of package name.
+
+This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating
+binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/
+authored by genman, heikok, pivot.
+The only changes are to replace some Trove collection types with standard Java collections, and repackaged.
+
+
+=== MCP Data ===
+This software includes data from the Minecraft Coder Pack (MCP), with kind permission
+from them. The license to MCP data is not transitive - distribution of this data by
+third parties requires independent licensing from the MCP team. This data is not
+redistributable without permission from the MCP team.
+
+=== Sharing ===
+I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of
+the minecraft modding community. All contributions to these parts should be licensed under the same additional grant.
+
+-- Runtime patcher --
+License is granted to redistribute the runtime patcher code (common/cpw/mods/fml/patcher and subdirectories) under
+any alternative open source license as classified by the OSI (http://opensource.org/licenses)
+
+-- ASM transformers --
+License is granted to redistribute the ASM transformer code (common/cpw/mods/fml/common/asm/ and subdirectories)
+under any alternative open source license as classified by the OSI (http://opensource.org/licenses)
+
+========
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS

fml/README.txt

@@ -0,0 +1,94 @@
+This is Forge Mod Loader, or FML for short, by cpw.
+
+More information can be found at https://github.com/MinecraftForge/FML/wiki
+
+It is a clean reimplementation of a mod loading system for client and server.
+
+It can be installed on its own, or as part of Minecraft Forge.
+
+----------------------
+About Forge Mod Loader
+----------------------
+
+Environments and compatibility
+==============================
+FML covers two main environments: client and server. All environments share
+the main mod loading code base, with additional varying hooks based on the 
+specific environment.
+
+There are some very visible changes to the client when FML is installed.
+
+There are some bukkit compatibility hooks available, consult MCPC+, now known as Cauldron
+for more information.
+
+Minecraft Forge in all cases bundles FML as it's modloading technology of choice
+because FML is open source, freely distributable, and can be easily updated by
+contributors through github.
+
+Notable integrations
+====================
+Optifine has FML compatibility. It varies from Optifine release to release, however
+in general it will work well alongside an FML or 
+Minecraft Forge installation. FML will detect and ensure the good operation of
+Optifine (you can see it in your client as an additional data line on the 
+bottom left).
+
+Mod information
+===============
+FML exposes the mod information through a mod list visible on the main screen as
+well as some small branding enhancements. For full data mods need to provide an
+information file. This file is a standard format so hopefully tools providing
+launch capabilities can also leverage this content.
+
+-------------------------------
+Binary installation information
+-------------------------------
+If you have downloaded a binary zip file you can install it as follows (client
+or server):
+
+Installation
+============
+To install on a server, simply execute the FML or Forge jar file, with a copy of
+minecraft_server-@[email protected] placed in the same directory. FML will launch
+it's patched copy.
+
+To install on a client, run the installer by executing java -jar <installer>.jar.
+It will identify the location of you minecraft installation (this can be customized)
+and create a new profile "FML" there.
+
+Forge Installation
+==================
+This code also ships as a part of Minecraft Forge. You do not need to install it
+separately from your Minecraft Forge installation. Minecraft Forge contains the
+exact same code as this. You should not install FML if you are also installing
+Minecraft Forge.
+
+-------------------------------------------
+Source installation information for modders
+-------------------------------------------
+This code follows the Minecraft Forge installation methodology. It will apply
+some small patches to the vanilla MCP source code, giving you and it access 
+to some of the data and functions you need to build a successful mod.
+
+Note also that the patches are built against "unrenamed" MCP source code (aka
+srgnames) - this means that you will not be able to read them directly against
+normal code.
+
+Source pack installation information:
+
+Standalone source installation
+==============================
+
+To install this source code for development purposes, extract this zip file.
+It ships with a demonstration mod. Run "gradle setupDevWorkspace" to create
+a gradle environment primed with FML. Run gradle eclipse or gradle idea to
+create an IDE workspace of your choice.
+Refer to ForgeGradle for more information about the gradle environment
+
+Forge source installation
+=========================
+MinecraftForge ships with this code and installs it as part of the forge
+installation process, no further action is required on your part.
+
+For reference this is version @MAJOR@.@MINOR@.@REV@.@BUILD@ of FML
+for Minecraft version @MCVERSION@.

fml/build.gradle

@@ -0,0 +1,111 @@
+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'
+    }
+}
+
+import static net.minecraftforge.gradle.dev.FmlDevPlugin.*
+
+apply plugin: 'maven'
+apply plugin: 'fmldev'
+
+repositories {
+    flatDir {
+        name "fileRepo"
+        dirs "repo"
+    }
+}
+
+minecraft {
+    version = '1.7.10'
+    mcpVersion = '9.05'
+    fmlDir = projectDir.getAbsolutePath();
+    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
+    tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
+    installerVersion = "1.4"
+}
+
+group = 'net.minecraftforge'
+version = getVersionFromGit(getProject())
+
+jenkins {
+    job = 'fml'
+}
+
+uploadArchives {
+    repositories {
+        if (project.hasProperty("filesmaven")) {
+            logger.info('Publishing to files server')
+            
+            mavenDeployer {
+                configuration = configurations.deployJars
+
+                repository(url: project.filesmaven.url) {
+                    authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
+                }
+
+                pom {
+                    groupId = project.group
+                    version = project.version
+                    artifactId = project.archivesBaseName
+                    project {
+                        name project.archivesBaseName
+                        packaging 'jar'
+                        description 'ForgeModLoader'
+                        url 'https://github.com/MinecraftForge/FML'
+
+                        scm {
+                            url 'https://github.com/MinecraftForge/FML'
+                            connection 'scm:git:git://github.com/MinecraftForge/FML.git'
+                            developerConnection 'scm:git:[email protected]:MinecraftForge/FML.git'
+                        }
+
+                        issueManagement {
+                            system 'github'
+                            url 'https://github.com/MinecraftForge/FML/issues'
+                        }
+
+                        licenses {
+                            license {
+                                name 'GNU Lesser Public License (LGPL), Version 2.1'
+                                url 'http://www.gnu.org/licenses/lgpl-2.1.txt'
+                                distribution 'repo'
+                            }
+                        }
+
+                        developers {
+                            developer {
+                                id 'cpw'
+                                name 'cpw'
+                                roles { role 'developer' }
+                            }
+                            developer {
+                                id 'LexManos'
+                                name 'Lex Manos'
+                                roles { role 'developer' }
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            logger.info('Publishing to repo folder')
+            
+            mavenDeployer {
+                repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
+            }
+        }
+    }
+}

fml/conf/astyle.cfg

@@ -0,0 +1,19 @@
+# Artistic Style format configuration
+# see http://astyle.sourceforge.net/astyle.html
+
+style=allman
+
+add-brackets
+break-closing-brackets
+
+indent-switches
+
+max-instatement-indent=40
+
+pad-oper
+pad-header
+unpad-paren
+
+break-blocks
+
+delete-empty-lines