Fixes #2729 : Fix transformer regression introduced during FG downtime. (#2730 )

Added a unittest to verify the necessary string returns match the actual existing classes, in case something screws up the refactoring.
Replaces old fluid handlers with the new capability based ones. (#2727 )
2016-12-31 18:25:16 +01:00 · 2016-12-31 16:01:29 +01:00 · 2016-12-31 16:00:45 +01:00 · 2016-12-31 15:21:25 +01:00 · 2016-12-29 15:51:17 +01:00 · 2016-12-29 15:50:02 +01:00
2599 changed files with 109895 additions and 75253 deletions
@@ -11,20 +11,32 @@ top of things.

 Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue now!

-1. Make sure your issue hasn't already been answered or fixed.  Also think about whether your issue is a valid one before submitting it.
-2. Go to [the issues page](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues)
-3. Click new issue
-4. Enter your Issue's title (something that summarizes your issue), and then create a detailed description of the issue.
-	* To help in resolving your issues please try to include the follow if applicable:
-		* The problem that is happening?
-		* What was expected?
-		* How to reproduce the problem?
-		* Server or Single Player?
-		* Mod Pack using and version?
-		* Crash log (Please make sure to use [pastebin](http://pastebin.com/) for the log file) 
-		* Screen shots or Pictures of the problem
+1. Make sure your issue has not already been answered or fixed and you are using the latest version. Also think about whether your issue is a valid one before submitting it.
+2. Go to [the issues page](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues) and click [new issue](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/new)
+3. Enter your a title of your issue (something that summarizes your issue), and then create a detailed description of the issue.
+    * Do not tag it with something like `[Feature]` or `[Bug]`. When it is applicable, we will take care of it.
+    * The following details are required. Not including them can cause the issue to be closed.
+        * Forge version
+        * AE2 version
+        * Crash log, when reporting a crash (Please make sure to use [pastebin](http://pastebin.com/))
+            * Do not post an excerpt of what you consider important, instead:
+            * Post the full log
+        * Other mods and their version, when reporting an issue between AE and another mod
+            * Also consider updating these before submitting a new issue, it might be already fixed
+        * A detailed description of the bug or feature
+    * To further help in resolving your issues please try to include the follow if applicable:
+        * What was expected?
+        * How to reproduce the problem?
+            * This is usually a great detail and allows us to fix it way faster
+        * Server or Single Player?
+        * Screen shots or Pictures of the problem
+        * Mod Pack using and version?
+            * Keep in mind that some mods might use an outdated version of AE2
+            * If so you should report it to your modpack
 5. Click `Submit New Issue`, and wait for feedback!

+Providing as many details as possible does help us to find and resolve the issue faster and also you getting a fixed version as fast as possible.
+
 ### Submitting Changes

 * Submit an issue to the github project, assuming one does not already exist.
@@ -55,10 +67,8 @@ Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue
    from our issue tracker.  The body describes the behavior without the patch,
    why this is a problem, and how the patch fixes the problem when applied.
 ````
-* Always fully test your changes. If they are large engouh in scope, then fully
-	test AE2.
-* Describing the process you used to test your changes in detail will help speed
-  up this process.
+* Always fully test your changes. If they are large engouh in scope, then fully test AE2.
+* Describing the process you used to test your changes in detail will help speed up this process.

 ## Making Trivial Changes

@@ -97,6 +107,9 @@ the styling guidelines used by AE.

 PRs that do not conform to these standards will be rejected.

+You can find presets for Eclipse and IntelliJ IDEA in the `codeformat` folder.
+We try to keep them up to date, but in case you find them not formatting it correctly, then please report it 
+
 ### Whitespace

 #### Tabs or spaces
@@ -0,0 +1,16 @@
+<!-- Provide a summary of the issue in the Title above, please do not "[Tag]" it -->
+
+#### Description
+<!-- Always use the most recent version from ae-mod.info, it might already be fixed -->
+<!-- When describing a bug, tell us what was expected and what the actual behaviour is -->
+<!-- When suggesting a feature, tell us how it should work and why it should be considered -->
+
+#### Environment
+<!-- Include as many relevant details about the environment -->
+<!-- Like the used version, SP/MP, other mods and their version, crashlogs etc -->
+<!-- Please use pastebin or gist for posting the complete crashlog, no excerpt -->
+<!-- The following ones are required, please note "latest" is not a version -->
+
+- Minecraft Version: 
+- AE2 Version: 
+- Forge Version: 
@@ -7,11 +7,12 @@
 !gradlew
 !gradlew.bat
 !build.gradle
-!build.properties
+!gradle.properties
+!.travis.yml

 # include markdowns
 !README.md
-!License.md
+!LICENSE

 # include sourcecode
 !src/
@@ -21,4 +22,10 @@
 !.gitignore

 # code format to reduce noise in git commits
-!codeformat/
+!codeformat/
+
+# Github specific files and directories
+!.github/
+
+# Explicit ignores
+Thumbs.db
@@ -0,0 +1,20 @@
+sudo: required
+dist: trusty
+
+language: java
+jdk:
+  - oraclejdk8
+  - openjdk8
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar
+  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+
+install: "./gradlew setupCIWorkspace"
+script: "./gradlew build test"
@@ -1,11 +1,15 @@
+[![Travis](https://img.shields.io/travis/AppliedEnergistics/Applied-Energistics-2.svg?maxAge=2592000&style=flat-square)](https://travis-ci.org/AppliedEnergistics/Applied-Energistics-2)
+[![Latest Release](https://img.shields.io/github/release/AppliedEnergistics/Applied-Energistics-2.svg?label=Latest Release&style=flat-square)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases)
+
 # Applied Energistics 2

-## Table of Content
+## Table of Contents

 * [About](#about)
 * [Contacts](#contacts)
 * [License](#license)
 * [Downloads](#downloads)
+* [Nightly Builds](#nightly-builds)
 * [Installation](#installation)
 * [Issues](#issues)
 * [Building](#building)
@@ -26,17 +30,30 @@ A Mod about Matter, Energy and using them to conquer the world..

 ## License

-Applied Energistics 2 API is (c) 2013 - 2014 AlgorithmX2 and licensed under MIT.
-
-Applied Energistics 2 is (c) 2013 - 2014 AlgorithmX2 and licensed under LGPL v3.
-See the LICENSE.txt for details or go to http://www.gnu.org/licenses/lgpl-3.0.txt for more information.
-
-Textures and Models are licensed under Creative Commons 3.
+* Applied Energistics 2 API
+  - (c) 2013 - 2015 AlgorithmX2 et al
+  - [![License](https://img.shields.io/badge/License-MIT-red.svg?style=flat-square)](http://opensource.org/licenses/MIT)
+* Applied Energistics 2
+  - (c) 2013 - 2015 AlgorithmX2 et al
+  - [![License](https://img.shields.io/badge/License-LGPLv3-blue.svg?style=flat-square)](https://raw.githubusercontent.com/AppliedEnergistics/Applied-Energistics-2/rv2/LICENSE)
+* Textures and Models
+  - (c) 2013 - 2015 AlgorithmX2 et al
+  - [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%203.0-yellow.svg?style=flat-square)](https://creativecommons.org/licenses/by-nc-sa/3.0/)
+* Text and Translations
+  - [![License](https://img.shields.io/badge/License-No%20Restriction-green.svg?style=flat-square)](https://creativecommons.org/publicdomain/zero/1.0/)

 ## Downloads

 Downloads can be found on [CurseForge](http://www.curse.com/mc-mods/minecraft/223794-applied-energistics-2) or on the [official website](http://ae-mod.info/Downloads/).

+## Nightly Builds
+
+[![Build status](https://ci.appveyor.com/api/projects/status/w0sg7upakn0vj5gc?svg=true)](https://ci.appveyor.com/project/shartte/applied-energistics-2/history)
+
+[Download Latest Nightly Build](https://ci.appveyor.com/api/projects/shartte/applied-energistics-2/artifacts/ae2-rv4-nightly.zip?branch=master)
+
+Nightly builds for the Minecraft 1.10.2 branch of AE2 (rv4-alpha) are available from [AppVeyor](https://ci.appveyor.com/project/shartte/applied-energistics-2/history). These builds are only for testing purposes and might lead to loss of data, and will contain significant bugs. Please see below on how you can report bugs you find during testing.
+
 ## Installation

 You install this mod by putting it into the `minecraft/mods/` folder. It has no additional hard dependencies.
@@ -45,20 +62,32 @@ You install this mod by putting it into the `minecraft/mods/` folder. It has no

 Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue now!

-1. Make sure your issue hasn't already been answered or fixed.  Also think about whether your issue is a valid one before submitting it.
-2. Go to [the issues page](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues)
-3. Click new issue
-4. Enter your Issue's title (something that summarizes your issue), and then create a detailed description of the issue.
-	* To help in resolving your issues please try to include the follow if applicable:
-		* The problem that is happening?
-		* What was expected?
-		* How to reproduce the problem?
-		* Server or Single Player?
-		* Mod Pack using and version?
-		* Crash log (Please make sure to use [pastebin](http://pastebin.com/) for the log file) 
-		* Screen shots or Pictures of the problem
+1. Make sure your issue has not already been answered or fixed and you are using the latest version. Also think about whether your issue is a valid one before submitting it.
+2. Go to [the issues page](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues) and click [new issue](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/new)
+3. Enter your a title of your issue (something that summarizes your issue), and then create a detailed description of the issue.
+    * Do not tag it with something like `[Feature]` or `[Bug]`. When it is applicable, we will take care of it.
+    * The following details are required. Not including them can cause the issue to be closed.
+        * Forge version
+        * AE2 version
+        * Crash log, when reporting a crash (Please make sure to use [pastebin](http://pastebin.com/))
+            * Do not post an excerpt of what you consider important, instead:
+            * Post the full log
+        * Other mods and their version, when reporting an issue between AE and another mod
+            * Also consider updating these before submitting a new issue, it might be already fixed
+        * A detailed description of the bug or feature
+    * To further help in resolving your issues please try to include the follow if applicable:
+        * What was expected?
+        * How to reproduce the problem?
+            * This is usually a great detail and allows us to fix it way faster
+        * Server or Single Player?
+        * Screen shots or Pictures of the problem
+        * Mod Pack using and version?
+            * Keep in mind that some mods might use an outdated version of AE2
+            * If so you should report it to your modpack
 5. Click `Submit New Issue`, and wait for feedback!

+Providing as many details as possible does help us to find and resolve the issue faster and also you getting a fixed version as fast as possible.
+
 ## Building

 1. Clone this repository via 
@@ -70,17 +99,19 @@ Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue
  - CI server `gradlew setupCIWorkspace`
 3. Build `gradlew build`. Jar will be in `build/libs`
 4. For core developer: Setup IDE
-  - IntelliJ: Import into IDE and execute `gradlew genIntellijRuns` afterwards
+  - IntelliJ: Import into IDE, execute `gradlew genIntellijRuns` and change RunConfiguration to `*_main` as quickfix for [ForgeGradle](https://github.com/MinecraftForge/ForgeGradle/issues/357)
  - Eclipse: execute `gradlew eclipse`
 5. For add-on developer: Core-Mod Detection
  - In order to have FML detect AE from your dev environment, add the following VM Option to your run profile
-  - `-Dfml.coreMods.load=appeng.transformer.AppEngCore`
+  - `-Dfml.coreMods.load=appeng.coremod.AppEngCore`

 ## Contribution

 Before you want to add major changes, you might want to discuss them with us first, before wasting your time.
 If you are still willing to contribute to this project, you can contribute via [Pull-Request](https://help.github.com/articles/creating-a-pull-request).

+The [guidelines for contributing](https://github.com/AppliedEnergistics/Applied-Energistics-2/blob/master/CONTRIBUTING.md) contain more detailed information about topics like the used code style and should also be considered.
+
 Here are a few things to keep in mind that will help get your PR approved.

 * A PR should be focused on content. Any PRs where the changes are only syntax will be rejected.
@@ -103,7 +134,7 @@ Getting Started
 6. Push to your fork `git push`
 7. Create a Pull-Request on GitHub
 8. Wait for review
-9. Suqash commits for cleaner history
+9. Squash commits for cleaner history

 If you are only doing single file pull requests, GitHub supports using a quick way without the need of cloning your fork. Also read up about [synching](https://help.github.com/articles/syncing-a-fork) if you plan to contribute on regular basis.

@@ -118,7 +149,7 @@ Development and standard builds can be obtained [Here](http://ae2.ae-mod.info/Do
 When compiling against the AE2 API you can use gradle dependencies, just add

    dependencies {
-	    compile "appeng:appliedenergistics2:rv_-_____-__:dev"
+        compile "appeng:appliedenergistics2:rv_-_____-__:dev"
    }

 or add the compile line to your existing dependencies task to your build.gradle
@@ -137,13 +168,17 @@ An example string would be `appeng:appliedenergistics2:rv2-alpha-30:dev`

 Files must be encoded as UTF-8.

-### License
+### New or updated Translations

-All Text and Translations submitted here can be used for any purpose, and may be re-distributed or used without any limitations.
+The language files are located in `/src/main/resources/assets/appliedenergistics2/lang/` and use the [appropriate locale code](http://minecraft.gamepedia.com/Language) as name and `.lang` as extension.

-### New Translations
+To update an translation edit the corresponding file and improve/correct the existing entry. Or copy any entries from `en_US.lang` for missing translation.

-You can provide any additional languages by creating a new file with the [appropriate language code](http://download1.parallels.com/SiteBuilder/Windows/docs/3.2/en_US/sitebulder-3.2-win-sdk-localization-pack-creation-guide/30801.htm).
+To create a new translation, copy the contents of `en_US.lang`, create a new file with appropriate filename, and translate it to your language.
+
+Please keep in mind that we use [String format](https://docs.oracle.com/javase/8/docs/api/java/util/Formatter.html) to pass additional data to the text for displaying.
+Therefore you should preserve parts like `%s` or `%1$d%%`, which allows us to replace them with the correct values while you still have the option to change their order for match the rules of grammar.
+This might not be possible for some languages. Should this be the case, please contact us.

 ### Final Note

@@ -1,6 +1,6 @@
 /*
 * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
 *
 * Applied Energistics 2 is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
@@ -16,99 +16,110 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-apply plugin: 'forge'
-
-apply from: 'gradle/scripts/propertyloader.gradle'
-apply from: 'gradle/scripts/dependencies.gradle'
-apply from: 'gradle/scripts/artifacts.gradle'
-apply from: 'gradle/scripts/autoinstallruntime.gradle'
-
 buildscript {
    repositories {
+        mavenLocal()
+        jcenter()
        mavenCentral()
-
        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'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
    }
 }
+apply plugin: 'net.minecraftforge.gradle.forge'

-configurations.all {
-    resolutionStrategy.cacheDynamicVersionsFor 7200, 'hours'
+repositories {
+    mavenLocal()
+    jcenter()
+    mavenCentral()
 }

-sourceCompatibility = JavaVersion.VERSION_1_6
-targetCompatibility = JavaVersion.VERSION_1_6
+apply from: 'gradle/scripts/dependencies.gradle'
+apply from: 'gradle/scripts/artifacts.gradle'
+apply from: 'gradle/scripts/optional.gradle'

-version = config.version + "-" + config.aechannel + "-" + config.build
-group = config.group
-archivesBaseName = config.archivesBaseName
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8

-// If TeamCity is running this build, lets set the version info
-if (hasProperty("teamcity")) {
-    version = teamcity["build.number"]
-
-    // Fix for main branch being built
-    version = version.replaceAll("/", "-")
-}
+version = aeversion + "-" + aechannel + "-" + aebuild
+group = aegroup
+archivesBaseName = aebasename

 // Add Coremod Manifest
 jar {
    manifest {
-        attributes 'FMLCorePlugin': 'appeng.transformer.AppEngCore'
        attributes 'FMLCorePluginContainsFMLMod': 'true'
+        attributes 'FMLAT': 'appeng_at.cfg'
    }

+    from sourceSets.api.output
+    dependsOn apiClasses
+
    // specify which files are really included, can control which APIs should be in
    include "appeng/**"
    include "assets/**"
    include "mcmod.info"
    include "pack.mcmeta"
+    include "META-INF/appeng_at.cfg"
 }

 minecraft {
-    version = config.minecraft_version + "-" + config.forge_version
+    coreMod = "appeng.coremod.AppEngCore"
+
+    version = minecraft_version + "-" + forge_version
+
+    replaceIn "AEConfig.java"
+    replaceIn "package-info.java"

    replace "@version@", project.version
-    replace "@aechannel@", config.aechannel
+    replace "@aeversion@", aeversion
+    replace "@aechannel@", aechannel
+    replace "@aebuild@", aebuild

    // used when launching minecraft in dev env
    runDir = "run"
+    mappings = mcp_mappings
 }

 sourceSets {
-    main {
-        java {
-            srcDirs += 'src/api/java'
-            srcDirs += 'src/main/java/'
-        }

-        resources {
-            srcDir "src/main/resources/"
-            include "assets/appliedenergistics2/recipes/*.recipe",
-                    "assets/appliedenergistics2/lang/*.lang",
-                    "assets/appliedenergistics2/textures/blocks/*",
-                    "assets/appliedenergistics2/textures/guis/*",
-                    "assets/appliedenergistics2/textures/models/*",
-                    "assets/appliedenergistics2/textures/items/*"
-        }
+    api
+
+    // This source set will contain third party API code that we need to compile, but which is not shipped with the jar
+    thirdparty {
+        // Third Party APIs often need access to Minecraft classes (i.e. EnumFacing), so set this up here
+        compileClasspath += configurations.forgeGradleMc + configurations.forgeGradleMcDeps
    }
+
+    main
+
 }

-processResources {
+dependencies {
+    compile sourceSets.thirdparty.output
+}
+
+processResources
+{
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
    // replace stuff in mcmod.info, nothing else
    from(sourceSets.main.resources.srcDirs) {
        include 'mcmod.info'
-        expand 'version': project.version, 'mcversion': config.minecraft_version
+        expand 'version': project.version, 'mcversion': project.minecraft.version
    }
+
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+
+    // move access transformer to META-INF
+    rename '(.+_at.cfg)', 'META-INF/$1'
 }
@@ -1,41 +0,0 @@
-version=rv2
-aechannel=beta
-build=0
-group=appeng
-archivesBaseName=appliedenergistics2
-
-#########################################################
-# Versions                                              #
-#########################################################
-minecraft_version=1.7.10
-forge_version=10.13.2.1230
-
-#########################################################
-# APIs used for development                             #
-#########################################################
-cb_minecraft_version=1.7.10
-fmp_version=1.1.0.311
-code_chicken_lib_version=1.1.1.105
-code_chicken_core_version=1.0.4.29
-nei_version=1.0.3.66
-waila_version=1.5.5_1.7.10
-
-#########################################################
-# API Stubs                                             #
-# Note: Do not edit these version numbers as they are   #
-# not the version of the mod, but stub code for AE2 to  #
-# compile                                               #
-#########################################################
-api_betterstorage_version=1
-api_coloredlightscore_version=1
-api_craftguide_version=1
-api_ic2_version=1
-api_immibis_version=1
-api_invtweaks_version=1
-api_mekansim_version=1
-api_mfr_version=1
-api_railcraft_version=1
-api_rblocks_version=1
-api_rf_version=2
-api_rotarycraft_version=1
-dev_buildcraft_version=1
@@ -1,10 +0,0 @@
-#Organize Import Order
-#Thu Oct 09 12:52:21 CEST 2014
-6=
-5=cpw
-4=net
-3=io
-2=org
-1=com
-0=java
-7=appeng
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <profiles version="12">
-<profile kind="CodeFormatterProfile" name="Algo" version="12">
+<profile kind="CodeFormatterProfile" name="AE2" version="12">
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="do not insert"/>
@@ -22,7 +22,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
 <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
@@ -37,13 +37,13 @@
 <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="2"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
@@ -72,14 +72,14 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
@@ -96,7 +96,7 @@
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="0"/>
@@ -106,7 +106,7 @@
 <setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
@@ -122,13 +122,13 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="insert"/>
@@ -138,7 +138,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
@@ -147,7 +147,7 @@
 <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
@@ -182,7 +182,7 @@
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
@@ -215,7 +215,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
@@ -231,7 +231,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="insert"/>
@@ -267,8 +267,8 @@
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="insert"/>
@@ -283,13 +283,13 @@
 <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="160"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="do not insert"/>
 </profile>
 </profiles>
@@ -0,0 +1,11 @@
+#Organize Import Order
+#Sat Jun 13 15:22:41 CEST 2015
+8=appeng
+7=
+6=cpw
+5=net
+4=io
+3=org
+2=com
+1=javax
+0=java
@@ -0,0 +1,25 @@
+aeversion=rv4
+aechannel=alpha
+aebuild=0
+aegroup=appeng
+aebasename=appliedenergistics2
+
+#########################################################
+# Versions                                              #
+#########################################################
+minecraft_version=1.10.2
+mcp_mappings=snapshot_20161111
+forge_version=12.18.3.2185
+
+#########################################################
+# Installable                                           #
+#########################################################
+waila_version=1.7.0-B3_1.9.4
+
+#########################################################
+# Provided APIs                                         #
+#########################################################
+jei_version=3.13.6.391
+tesla_version=1.10.2-1.2.1.50
+ic2_version=2.6.99-ex110
+top_version=1.10-1.3.3-41
@@ -1,43 +1,59 @@
-task myJavadocs(type: Javadoc) {
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+ 
+// Suppresses warnings/errors when building javadocs
+allprojects {
+	tasks.withType(Javadoc) {
+		options.addStringOption('Xdoclint:none', '-quiet')
+	}
+}
+
+javadoc {
+    options.encoding = 'UTF-8'
+    options.charSet = 'UTF-8'
+}
+
+task javadocs(type: Javadoc) {
    source = sourceSets.api.java
    include "appeng/api/**"

-    classpath = configurations.compile
+    // Due to ForgeGradle having to be a special snowflake,
+    // we have to add some custom configurations to the normal compile configuration and hope it does not break.
+    classpath = configurations.compile + configurations.forgeGradleMc + configurations.forgeGradleMcDeps 
 }

-task javadocJar(type: Jar, dependsOn: myJavadocs) {
+task javadocJar(type: Jar, dependsOn: javadocs) {
+	from javadoc.destinationDir
    classifier = 'javadoc'
-    from 'build/docs/javadoc/'
-}
-
-task devJar(type: Jar) {
-
-    manifest {
-        attributes 'FMLCorePlugin': 'appeng.transformer.AppEngCore'
-        attributes 'FMLCorePluginContainsFMLMod': 'true'
-    }
-
-    from(sourceSets.main.output) {
-        include "appeng/**"
-        include "assets/**"
-        include 'mcmod.info'
-    }
-
-    classifier = 'dev'
 }

 task apiJar(type: Jar) {
+    from sourceSets.api.java
+    include "appeng/api/**"

-    from(sourceSets.api.java) {
-        include "appeng/api/**"
-    }
+    from sourceSets.api.output
+    include "appeng/api/**"

    classifier = 'api'
-
 }

 artifacts {
-    archives devJar
    archives apiJar
    archives javadocJar
+    archives sourceJar
 }
@@ -1,34 +0,0 @@
-// searches for NEI and Chicken stuff from compile set
-// and adds them to the mods in run dir
-task copyChicken(type: Copy, dependsOn: "extractUserDev") {
-    from { configurations.compile }
-    include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar"
-    exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_-
-    into file(minecraft.runDir + "/mods")
-    mustRunAfter "deobfBinJar"
-    mustRunAfter "repackMinecraft"
-}
-tasks.setupDevWorkspace.dependsOn copyChicken
-tasks.setupDecompWorkspace.dependsOn copyChicken
-
-// same for BC hacked file
-task copyBuildcraft(type: Copy, dependsOn: "extractUserDev") {
-    from { configurations.compile }
-    include "**/*buildcraft*.jar"
-    into file(minecraft.runDir + "/mods")
-    mustRunAfter "deobfBinJar"
-    mustRunAfter "repackMinecraft"
-}
-tasks.setupDevWorkspace.dependsOn copyBuildcraft
-tasks.setupDecompWorkspace.dependsOn copyBuildcraft
-
-// and for IC2 because it needs its EMLJ jar
-task copyIndustrialcraft(type: Copy, dependsOn: "extractUserDev") {
-    from { configurations.compile }
-    include "**/*industrialcraft*.jar"
-    into file(minecraft.runDir + "/mods")
-    mustRunAfter "deobfBinJar"
-    mustRunAfter "repackMinecraft"
-}
-tasks.setupDevWorkspace.dependsOn copyIndustrialcraft
-tasks.setupDecompWorkspace.dependsOn copyIndustrialcraft
@@ -16,51 +16,55 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-
-
 repositories {
+    mavenLocal()

    maven {
-        name 'CB Maven FS'
-        url "http://chickenbones.net/maven/"
-    }
-
-    maven {
-        name "Waila Mobius Repo"
+        name "Mobius"
        url "http://mobiusstrip.eu/maven"
    }

    maven {
-        name "FireBall API Depot"
-        url "http://dl.tsr.me/artifactory/libs-release-local"
+        name = "JEI repo"
+        url "http://dvs1.progwml6.com/files/maven"
+    }
+
+    maven {
+        name = "Tesla repo"
+        url "http://maven.epoxide.xyz"
+    }
+
+    maven {
+        name = "IC2 repo"
+        url = "http://maven.ic2.player.to"
+    }
+
+    maven { // TheOneProbe
+        name 'tterrag maven'
+        url "http://maven.tterrag.com/"
    }
 }

-dependencies {
-
-    compile "codechicken:ForgeMultipart:${config.cb_minecraft_version}-${config.fmp_version}:dev"
-    compile "codechicken:CodeChickenLib:${config.cb_minecraft_version}-${config.code_chicken_lib_version}:dev"
-    compile "codechicken:CodeChickenCore:${config.cb_minecraft_version}-${config.code_chicken_core_version}:dev"
-    compile "codechicken:NotEnoughItems:${config.cb_minecraft_version}-${config.nei_version}:dev"
-
-    compile "mcp.mobius.waila:Waila:${config.waila_version}:dev"
-	
-    compile(group: 'api', name: 'betterstorage', version: "${config.api_betterstorage_version}")
-    compile(group: 'api', name: 'coloredlightscore', version: "${config.api_coloredlightscore_version}")
-    compile(group: 'api', name: 'craftguide', version: "${config.api_craftguide_version}")
-    compile(group: 'api', name: 'ic2', version: "${config.api_ic2_version}")
-    compile(group: 'api', name: 'immibis', version: "${config.api_immibis_version}")
-    compile(group: 'api', name: 'invtweaks', version: "${config.api_invtweaks_version}")
-    compile(group: 'api', name: 'mekansim', version: "${config.api_mekansim_version}")
-    compile(group: 'api', name: 'mfr', version: "${config.api_mfr_version}")
-    compile(group: 'api', name: 'railcraft', version: "${config.api_railcraft_version}")
-    compile(group: 'api', name: 'rblocks', version: "${config.api_rblocks_version}")
-    compile(group: 'api', name: 'rf', version: "${config.api_rf_version}")
-    compile(group: 'api', name: 'rotarycraft', version: "${config.api_rotarycraft_version}")
-    compile(group: 'dev', name: 'buildcraft', version: "${config.dev_buildcraft_version}")
-
-    // add hacked buildcraft jar to compile time (for facades)
-    compile fileTree(dir: 'libs', include: '*.jar')
-
-    testCompile "junit:junit:4.11"
+configurations {
+    mods
+}
+
+dependencies {
+    // installable runtime dependencies
+    mods "mcp.mobius.waila:Waila:${waila_version}"
+    mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
+    mods "mcjty.theoneprobe:TheOneProbe:${top_version}"
+
+    // compile against provided APIs
+    compileOnly "mezz.jei:jei_${minecraft_version}:${jei_version}:api"
+    compileOnly "mcp.mobius.waila:Waila:${waila_version}"
+    compileOnly "net.darkhax.tesla:Tesla:${tesla_version}"
+    compileOnly "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
+    compileOnly "mcjty.theoneprobe:TheOneProbe:${top_version}:api"
+
+    // at runtime, use the full JEI jar
+    runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
+
+    // unit test dependencies
+    testCompile "junit:junit:4.12"
 }
@@ -0,0 +1,55 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+ 
+task wrapper(type: Wrapper) {
+    gradleVersion = "2.14"
+}
+
+// WAILA
+task installWaila(type: Copy, dependsOn: "deinstallWaila") {
+    from { configurations.mods }
+    include "**/*Waila*.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallWaila(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Waila*.jar")
+}
+
+// IC2
+task installIC2(type: Copy, dependsOn: "deinstallIC2") {
+    from { configurations.mods }
+    include "**/*industrialcraft-2*.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallIC2(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*industrialcraft-2*.jar")
+}
+
+// TOP
+task installTop(type: Copy, dependsOn: "deinstallTop") {
+    from { configurations.mods }
+    include "**/*TheOneProbe*.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallTop(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*TheOneProbe*.jar")
+}
+
@@ -1,9 +0,0 @@
-// define the properties file
-ext.configFile = file "build.properties"
-
-configFile.withReader {
-    // read config.  it shall from now on be referenced as simply config or as project.config
-    def prop = new Properties()
-    prop.load(it)
-    project.ext.config = new ConfigSlurper().parse prop
-}
@@ -1,6 +1,6 @@
-#Sat Sep 13 21:58:22 CEST 2014
+#Fri Sep 16 14:56:32 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
@@ -6,12 +6,30 @@
 ##
 ##############################################################################

-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null

 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
  CYGWIN* )
    cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
  MINGW* )
    msys=true
    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac

-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
    MAX_FD_LIMIT=`ulimit -H -n`
    if [ $? -eq 0 ] ; then
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`

    # We build the pattern for arguments to be converted via cygpath
    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal

-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail

 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants

 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,39 +23,56 @@

 package appeng.api;

-/**
- * 
- * Entry point for api.
- * 
- * Available IMCs:
- * 
- */
-public class AEApi
-{

-	static private IAppEngApi api = null;
+import java.lang.reflect.Field;
+
+import appeng.api.exceptions.CoreInaccessibleException;
+
+
+/**
+ * Entry point for api.
+ *
+ * Available IMCs:
+ */
+public enum AEApi
+{
+	;
+
+	private static final String CORE_API_FQN = "appeng.core.Api";
+	private static final String CORE_API_FIELD = "INSTANCE";
+	private static final IAppEngApi HELD_API;
+
+	static
+	{
+		try
+		{
+			final Class<?> apiClass = Class.forName( CORE_API_FQN );
+			final Field apiField = apiClass.getField( CORE_API_FIELD );
+
+			HELD_API = (IAppEngApi) apiField.get( apiClass );
+		}
+		catch( final ClassNotFoundException e )
+		{
+			throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FQN + " class, without it being declared." );
+		}
+		catch( final NoSuchFieldException e )
+		{
+			throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without it being declared." );
+		}
+		catch( final IllegalAccessException e )
+		{
+			throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without enough access permissions." );
+		}
+	}

 	/**
 	 * API Entry Point.
-	 * 
-	 * @return the {@link IAppEngApi} or null if the instance could not be retrieved
+	 *
+	 * @return the {@link IAppEngApi}
 	 */
 	public static IAppEngApi instance()
 	{
-		if ( api == null )
-		{
-			try
-			{
-				Class c = Class.forName( "appeng.core.Api" );
-				api = (IAppEngApi) c.getField( "instance" ).get( c );
-			}
-			catch (Throwable e)
-			{
-				return null;
-			}
-		}
-
-		return api;
+		return HELD_API;
 	}

 }
@@ -16,20 +16,19 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.block.stair;
+package appeng.api;


-import java.util.EnumSet;
-
-import appeng.block.AEBaseStairBlock;
-import appeng.block.solids.BlockQuartzPillar;
-import appeng.core.features.AEFeature;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;


-public class QuartzPillarStairBlock extends AEBaseStairBlock
-{
-	public QuartzPillarStairBlock( BlockQuartzPillar block )
-	{
-		super( block, 0, EnumSet.of( AEFeature.Core ) );
-	}
-}
+/**
+ * Marks interfaces that can be used as injectable constructor arguments for an {@link AEPlugin}.
+ */
+@Target( ElementType.TYPE )
+@Retention( RetentionPolicy.RUNTIME )
+public @interface AEInjectable
+{}
@@ -0,0 +1,39 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.api;
+
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * Use this annotation on a class in your Mod to have it instantiated during the initialization phase of Applied
+ * Energistics.
+ * AE expects your class to have a single constructor and can supply certain arguments to your constructor using
+ * dependency injection.
+ */
+@Target( ElementType.TYPE )
+@Retention( RetentionPolicy.RUNTIME )
+@Documented
+public @interface AEPlugin
+{}
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,22 +23,19 @@

 package appeng.api;

-import appeng.api.definitions.Blocks;
-import appeng.api.definitions.Items;
-import appeng.api.definitions.Materials;
-import appeng.api.definitions.Parts;
+
+import appeng.api.definitions.IDefinitions;
 import appeng.api.exceptions.FailedConnection;
 import appeng.api.features.IRegistryContainer;
 import appeng.api.networking.IGridBlock;
 import appeng.api.networking.IGridConnection;
-import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
 import appeng.api.parts.IPartHelper;
 import appeng.api.storage.IStorageHelper;

+@AEInjectable
 public interface IAppEngApi
 {
-
 	/**
 	 * @return Registry Container for the numerous registries in AE2.
 	 */
@@ -55,40 +52,26 @@ public interface IAppEngApi
 	IPartHelper partHelper();

 	/**
-	 * @return an accessible list of all of AE's Items
+	 * @return an accessible list of all AE definitions
 	 */
-	Items items();
+	IDefinitions definitions();

 	/**
-	 * @return an accessible list of all of AE's materials; materials are items
-	 */
-	Materials materials();
-
-	/**
-	 * @return an accessible list of all of AE's blocks
-	 */
-	Blocks blocks();
-
-	/**
-	 * @return an accessible list of all of AE's parts, parts are items
-	 */
-	Parts parts();
-
-	/**
-	 * create a grid node for your {@link IGridHost}
-	 * 
+	 * create a grid node for your {@link appeng.api.networking.IGridHost}
+	 *
 	 * @param block grid block
+	 *
 	 * @return grid node of block
 	 */
-	IGridNode createGridNode(IGridBlock block);
+	IGridNode createGridNode( IGridBlock block );

 	/**
-	 * create a connection between two {@link IGridNode}
-	 * 
+	 * create a connection between two {@link appeng.api.networking.IGridNode}
+	 *
 	 * @param a to be connected gridnode
 	 * @param b to be connected gridnode
-	 * @throws FailedConnection
+	 *
+	 * @throws appeng.api.exceptions.FailedConnection
 	 */
-	IGridConnection createGridConnection(IGridNode a, IGridNode b) throws FailedConnection;
-
+	IGridConnection createGridConnection( IGridNode a, IGridNode b ) throws FailedConnection;
 }
@@ -0,0 +1,64 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.client;
+
+
+import java.util.List;
+
+import com.google.common.collect.ImmutableList;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.util.EnumFacing;
+
+/**
+ * TODO: Needs to be moved to an internal class. API is only allowed to contain interfaces and/or data.
+ *
+ * @deprecated
+ */
+@Deprecated
+public class BakingPipeline<F, T> implements BakingPipelineElement<F, T>
+{
+
+	private final ImmutableList<BakingPipelineElement<?, ?>> pipeline;
+
+	public BakingPipeline( BakingPipelineElement<?, ?>... pipeline )
+	{
+		this.pipeline = ImmutableList.copyOf( pipeline );
+	}
+
+	/**
+	 * TODO: fix generics
+	 */
+	@Override
+	public List pipe( List things, IBakedModel parent, IBlockState state, EnumFacing side, long rand )
+	{
+		for( BakingPipelineElement pipe : pipeline )
+		{
+			things = pipe.pipe( things, parent, state, side, rand );
+		}
+		return things;
+	}
+
+}
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -21,18 +21,19 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

-package appeng.api.implementations.tiles;
+package appeng.api.client;

-import net.minecraftforge.common.util.ForgeDirection;
-import appeng.api.networking.security.BaseActionSource;
-import appeng.api.storage.IStorageMonitorable;

-/**
- * Implemented on inventories that can share their inventories with other networks, best example, ME Interface.
- */
-public interface ITileStorageMonitorable
+import java.util.List;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.util.EnumFacing;
+
+
+public interface BakingPipelineElement<F, T>
 {

-	IStorageMonitorable getMonitorable(ForgeDirection side, BaseActionSource src);
+	public List<T> pipe( List<F> elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand );

 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,49 +23,51 @@

 package appeng.api.config;

+
 public enum AccessRestriction
 {
-	NO_ACCESS(0), READ(1), WRITE(2), READ_WRITE(3);
+	NO_ACCESS( 0 ), READ( 1 ), WRITE( 2 ), READ_WRITE( 3 );

 	private final int permissionBit;

-	private AccessRestriction(int v) {
-		permissionBit = v;
+	AccessRestriction( final int v )
+	{
+		this.permissionBit = v;
 	}

-	public boolean hasPermission(AccessRestriction ar)
+	public boolean hasPermission( final AccessRestriction ar )
 	{
-		return (permissionBit & ar.permissionBit) == ar.permissionBit;
+		return ( this.permissionBit & ar.permissionBit ) == ar.permissionBit;
 	}

-	public AccessRestriction restrictPermissions(AccessRestriction ar)
+	public AccessRestriction restrictPermissions( final AccessRestriction ar )
 	{
-		return getPermByBit( permissionBit & ar.permissionBit);
+		return this.getPermByBit( this.permissionBit & ar.permissionBit );
 	}

-	public AccessRestriction addPermissions(AccessRestriction ar)
+	private AccessRestriction getPermByBit( final int bit )
 	{
-		return getPermByBit( permissionBit | ar.permissionBit);
-	}
-
-	public AccessRestriction removePermissions(AccessRestriction ar)
-	{
-		return getPermByBit( permissionBit & (~ar.permissionBit) );
-	}
-
-	private AccessRestriction getPermByBit(int bit)
-	{
-		switch (bit)
+		switch( bit )
 		{
-		default:
-		case 0:
-			return NO_ACCESS;
-		case 1:
-			return READ;
-		case 2:
-			return WRITE;
-		case 3:
-			return READ_WRITE;
+			default:
+			case 0:
+				return NO_ACCESS;
+			case 1:
+				return READ;
+			case 2:
+				return WRITE;
+			case 3:
+				return READ_WRITE;
 		}
 	}
+
+	public AccessRestriction addPermissions( final AccessRestriction ar )
+	{
+		return this.getPermByBit( this.permissionBit | ar.permissionBit );
+	}
+
+	public AccessRestriction removePermissions( final AccessRestriction ar )
+	{
+		return this.getPermByBit( this.permissionBit & ( ~ar.permissionBit ) );
+	}
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum ActionItems
 {
 	WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum Actionable
 {
 	/**
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum CopyMode
 {
 	CLEAR_ON_REMOVE, KEEP_ON_REMOVE
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum FullnessMode
 {
 	EMPTY, HALF, FULL
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,22 +23,28 @@

 package appeng.api.config;

+
 public enum FuzzyMode
 {
 	// Note that percentage damaged, is the inverse of percentage durability.
-	IGNORE_ALL(-1), PERCENT_99(0), PERCENT_75(25), PERCENT_50(50), PERCENT_25(75);
+	IGNORE_ALL( -1 ),
+	PERCENT_99( 0 ),
+	PERCENT_75( 25 ),
+	PERCENT_50( 50 ),
+	PERCENT_25( 75 );

-	final public float breakPoint;
-	final public float percentage;
+	public final float breakPoint;
+	public final float percentage;

-	private FuzzyMode(float p) {
-		percentage = p;
-		breakPoint = p / 100.0f;
+	FuzzyMode( final float p )
+	{
+		this.percentage = p;
+		this.breakPoint = p / 100.0f;
 	}

-	public int calculateBreakPoint(int maxDamage)
+	public int calculateBreakPoint( final int maxDamage )
 	{
-		return (int) ((percentage * maxDamage) / 100.0f);
+		return (int) ( ( this.percentage * maxDamage ) / 100.0f );
 	}

 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum IncludeExclude
 {
 	WHITELIST, BLACKLIST
@@ -0,0 +1,30 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.config;
+
+
+public enum ItemSubstitution
+{
+	ENABLED, DISABLED;
+}
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum LevelEmitterMode
 {

@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum LevelType
 {

@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum ModSettings
 {

@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum NetworkEmitterMode
 {

@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum OperationMode
 {
 	FILL, EMPTY
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum OutputMode
 {
 	EXPORT_ONLY, EXPORT_OR_CRAFT, CRAFT_ONLY
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum PowerMultiplier
 {
 	ONE, CONFIG;
@@ -32,13 +33,13 @@ public enum PowerMultiplier
 	 */
 	public double multiplier = 1.0;

-	public double multiply(double in)
+	public double multiply( final double in )
 	{
-		return in * multiplier;
+		return in * this.multiplier;
 	}

-	public double divide(double in)
+	public double divide( final double in )
 	{
-		return in / multiplier;
+		return in / this.multiplier;
 	}
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,43 +23,42 @@

 package appeng.api.config;

+
 public enum PowerUnits
 {
-	AE("gui.appliedenergistics2.units.appliedenergstics"), // Native Units - AE Energy
-	MJ("gui.appliedenergistics2.units.buildcraft"), // BuildCraft - Minecraft Joules
-	EU("gui.appliedenergistics2.units.ic2"), // IndustrialCraft 2 - Energy Units
-	WA("gui.appliedenergistics2.units.rotarycraft"), // RotaryCraft - Watts
-	RF("gui.appliedenergistics2.units.thermalexpansion"), // ThermalExpansion - Redstone Flux
-	MK("gui.appliedenergistics2.units.mekanism"); // Mekanism - Joules
-
-	private PowerUnits(String un) {
-		unlocalizedName = un;
-	}
+	AE( "gui.appliedenergistics2.units.appliedenergstics" ), // Native Units - AE Energy
+	EU( "gui.appliedenergistics2.units.ic2" ), // IndustrialCraft 2 - Energy Units
+	RF( "gui.appliedenergistics2.units.rf" ); // RF - Redstone Flux

+	/**
+	 * unlocalized name for the power unit.
+	 */
+	public final String unlocalizedName;
 	/**
 	 * please do not edit this value, it is set when AE loads its config files.
 	 */
 	public double conversionRatio = 1.0;

-	/**
-	 * unlocalized name for the power unit.
-	 */
-	final public String unlocalizedName;
+	PowerUnits( final String un )
+	{
+		this.unlocalizedName = un;
+	}

 	/**
 	 * do power conversion using AE's conversion rates.
-	 * 
+	 *
 	 * Example: PowerUnits.EU.convertTo( PowerUnits.AE, 32 );
-	 * 
+	 *
 	 * will normally returns 64, as it will convert the EU, to AE with AE's power settings.
-	 * 
+	 *
 	 * @param target target power unit
 	 * @param value value
+	 *
 	 * @return value converted to target units, from this units.
 	 */
-	public double convertTo(PowerUnits target, double value)
+	public double convertTo( final PowerUnits target, final double value )
 	{
-		return (value * conversionRatio) / target.conversionRatio;
+		return ( value * this.conversionRatio ) / target.conversionRatio;
 	}

 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum RedstoneMode
 {
 	IGNORE, LOW_SIGNAL, HIGH_SIGNAL, SIGNAL_PULSE
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum RelativeDirection
 {
 	LEFT, RIGHT, UP, DOW
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -21,10 +21,10 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

-package appeng.api.parts;
+package appeng.api.config;


-public interface ISimplifiedBundle
+public enum SchedulingMode
 {
-
+	DEFAULT, ROUNDROBIN, RANDOM
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,7 +23,8 @@

 package appeng.api.config;

+
 public enum SearchBoxMode
 {
-	AUTOSEARCH, MANUAL_SEARCH, NEI_AUTOSEARCH, NEI_MANUAL_SEARCH
+	AUTOSEARCH, MANUAL_SEARCH, JEI_AUTOSEARCH, JEI_MANUAL_SEARCH
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 /**
 * Represent the security systems basic permissions, these are not for anti-griefing, they are part of the mod as a
 * gameplay feature.
@@ -56,15 +57,15 @@ public enum SecurityPermissions
 	 */
 	SECURITY;

-	final private String unlocalizedName = "gui.appliedenergistics2.security." + name().toLowerCase();
+	private final String unlocalizedName = "gui.appliedenergistics2.security." + this.name().toLowerCase();

 	public String getUnlocalizedName()
 	{
-		return unlocalizedName + ".name";
+		return this.unlocalizedName + ".name";
 	}

 	public String getUnlocalizedTip()
 	{
-		return unlocalizedName + ".tip";
+		return this.unlocalizedName + ".tip";
 	}
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,47 +23,57 @@

 package appeng.api.config;

+
 import java.util.EnumSet;

+import javax.annotation.Nonnull;
+
+
 public enum Settings
 {
-	LEVEL_EMITTER_MODE(EnumSet.allOf( LevelEmitterMode.class )),
+	LEVEL_EMITTER_MODE( EnumSet.allOf( LevelEmitterMode.class ) ),

-	REDSTONE_EMITTER(EnumSet.of( RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL )), REDSTONE_CONTROLLED(EnumSet.allOf( RedstoneMode.class )),
+	REDSTONE_EMITTER( EnumSet.of( RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL ) ), REDSTONE_CONTROLLED( EnumSet.allOf( RedstoneMode.class ) ),

-	CONDENSER_OUTPUT(EnumSet.allOf( CondenserOutput.class )),
+	CONDENSER_OUTPUT( EnumSet.allOf( CondenserOutput.class ) ),

-	POWER_UNITS(EnumSet.allOf( PowerUnits.class )), ACCESS(EnumSet.of( AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE )),
+	POWER_UNITS( EnumSet.allOf( PowerUnits.class ) ), ACCESS( EnumSet.of( AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE ) ),

-	SORT_DIRECTION(EnumSet.allOf( SortDir.class )), SORT_BY(EnumSet.allOf( SortOrder.class )),
+	SORT_DIRECTION( EnumSet.allOf( SortDir.class ) ), SORT_BY( EnumSet.allOf( SortOrder.class ) ),

-	SEARCH_TOOLTIPS(EnumSet.of( YesNo.YES, YesNo.NO )), VIEW_MODE(EnumSet.allOf( ViewItems.class )), SEARCH_MODE(EnumSet.allOf( SearchBoxMode.class )),
+	SEARCH_TOOLTIPS( EnumSet.of( YesNo.YES, YesNo.NO ) ), VIEW_MODE( EnumSet.allOf( ViewItems.class ) ), SEARCH_MODE( EnumSet.allOf( SearchBoxMode.class ) ),

-	ACTIONS(EnumSet.allOf( ActionItems.class )), IO_DIRECTION(EnumSet.of( RelativeDirection.LEFT, RelativeDirection.RIGHT )),
+	ACTIONS( EnumSet.allOf( ActionItems.class ) ), IO_DIRECTION( EnumSet.of( RelativeDirection.LEFT, RelativeDirection.RIGHT ) ),

-	BLOCK(EnumSet.of( YesNo.YES, YesNo.NO )), OPERATION_MODE(EnumSet.allOf( OperationMode.class )),
+	BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ), OPERATION_MODE( EnumSet.allOf( OperationMode.class ) ),

-	FULLNESS_MODE(EnumSet.allOf( FullnessMode.class )), CRAFT_ONLY(EnumSet.of( YesNo.YES, YesNo.NO )),
+	FULLNESS_MODE( EnumSet.allOf( FullnessMode.class ) ), CRAFT_ONLY( EnumSet.of( YesNo.YES, YesNo.NO ) ),

-	FUZZY_MODE(EnumSet.allOf( FuzzyMode.class )), LEVEL_TYPE(EnumSet.allOf( LevelType.class )),
+	FUZZY_MODE( EnumSet.allOf( FuzzyMode.class ) ), LEVEL_TYPE( EnumSet.allOf( LevelType.class ) ),

-	TERMINAL_STYLE(EnumSet.of( TerminalStyle.TALL, TerminalStyle.SMALL )), COPY_MODE(EnumSet.allOf( CopyMode.class )),
+	TERMINAL_STYLE( EnumSet.of( TerminalStyle.TALL, TerminalStyle.SMALL ) ), COPY_MODE( EnumSet.allOf( CopyMode.class ) ),

-	INTERFACE_TERMINAL(EnumSet.of( YesNo.YES, YesNo.NO )), CRAFT_VIA_REDSTONE(EnumSet.of( YesNo.YES, YesNo.NO )),
+	INTERFACE_TERMINAL( EnumSet.of( YesNo.YES, YesNo.NO ) ), CRAFT_VIA_REDSTONE( EnumSet.of( YesNo.YES, YesNo.NO ) ),

-	STORAGE_FILTER(EnumSet.allOf( StorageFilter.class ));
+	STORAGE_FILTER( EnumSet.allOf( StorageFilter.class ) ), PLACE_BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ),

-	private EnumSet values;
+	SCHEDULING_MODE( EnumSet.allOf( SchedulingMode.class ) );

-	public EnumSet getPossibleValues()
+	private final EnumSet<? extends Enum<?>> values;
+
+	Settings( @Nonnull final EnumSet<? extends Enum<?>> possibleOptions )
 	{
-		return values;
+		if( possibleOptions.isEmpty() )
+		{
+			throw new IllegalArgumentException( "Tried to instantiate an empty setting." );
+		}
+
+		this.values = possibleOptions;
 	}

-	private Settings(EnumSet set) {
-		if ( set == null || set.isEmpty() )
-			throw new RuntimeException( "Invalid configuration." );
-		values = set;
+	public EnumSet<? extends Enum<?>> getPossibleValues()
+	{
+		return this.values;
 	}

 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum SortDir
 {
 	ASCENDING, DESCENDING
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum SortOrder
 {
 	NAME, AMOUNT, MOD, INVTWEAKS
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum StorageFilter
 {

@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum TerminalStyle
 {

@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,10 +23,10 @@

 package appeng.api.config;

+
 public enum TunnelType
 {
 	ME, // Network Tunnel
-	BC_POWER, // MJ Tunnel
 	IC2_POWER, // EU Tunnel
 	RF_POWER, // RF Tunnel
 	REDSTONE, // Redstone Tunnel
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -25,10 +25,11 @@ package appeng.api.config;


 import java.util.HashMap;
+import java.util.Map;

 import net.minecraft.item.ItemStack;

-import appeng.api.util.AEItemDefinition;
+import appeng.api.definitions.IItemDefinition;


 public enum Upgrades
@@ -43,39 +44,49 @@ public enum Upgrades
 	 */
 	FUZZY( 1 ), SPEED( 1 ), INVERTER( 1 );

-	public final int myTier;
-	public final HashMap<ItemStack, Integer> supportedMax = new HashMap<ItemStack, Integer>();
+	private final int tier;
+	private final Map<ItemStack, Integer> supportedMax = new HashMap<>();

-	private Upgrades( int tier )
+	Upgrades( final int tier )
 	{
-		this.myTier = tier;
+		this.tier = tier;
 	}

 	/**
 	 * @return list of Items/Blocks that support this upgrade, and how many it supports.
 	 */
-	public HashMap<ItemStack, Integer> getSupported()
+	public Map<ItemStack, Integer> getSupported()
 	{
 		return this.supportedMax;
 	}

-
-
-	public void registerItem( AEItemDefinition myItem, int maxSupported )
+	/**
+	 * Registers a specific amount of this upgrade into a specific machine
+	 *
+	 * @param item machine in which this upgrade can be installed
+	 * @param maxSupported amount how many upgrades can be installed
+	 */
+	public void registerItem( final IItemDefinition item, final int maxSupported )
 	{
-		if ( myItem != null )
-		{
-			final ItemStack stack = myItem.stack( 1 );
-
-			this.registerItem( stack, maxSupported );
-		}
+		item.maybeStack( 1 ).ifPresent( is -> this.registerItem( is, maxSupported ) );
 	}

-	public void registerItem( ItemStack stack, int maxSupported )
+	/**
+	 * Registers a specific amount of this upgrade into a specific machine
+	 *
+	 * @param stack machine in which this upgrade can be installed
+	 * @param maxSupported amount how many upgrades can be installed
+	 */
+	public void registerItem( final ItemStack stack, final int maxSupported )
 	{
-		if ( stack != null )
+		if( stack != null )
 		{
 			this.supportedMax.put( stack, maxSupported );
 		}
 	}
+
+	public int getTier()
+	{
+		return this.tier;
+	}
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum ViewItems
 {
 	ALL, STORED, CRAFTABLE
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.config;

+
 public enum YesNo
 {
 	YES, NO, UNDECIDED
@@ -1,112 +0,0 @@
-/*
- * The MIT License (MIT)
- * 
- * Copyright (c) 2013 AlgorithmX2
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.definitions;
-
-import appeng.api.util.AEItemDefinition;
-
-public class Blocks
-{
-
-	/*
-	 * World Gen
-	 */
-	public AEItemDefinition blockQuartzOre;
-	public AEItemDefinition blockQuartzOreCharged;
-	public AEItemDefinition blockMatrixFrame;
-
-	/*
-	 * Decorative
-	 */
-	public AEItemDefinition blockQuartz;
-	public AEItemDefinition blockQuartzPillar;
-	public AEItemDefinition blockQuartzChiseled;
-	public AEItemDefinition blockQuartzGlass;
-	public AEItemDefinition blockQuartzVibrantGlass;
-	public AEItemDefinition blockQuartzTorch;
-	public AEItemDefinition blockFluix;
-	public AEItemDefinition blockSkyStone;
-	public AEItemDefinition blockSkyChest;
-	public AEItemDefinition blockSkyCompass;
-
-	/*
-	 * Misc
-	 */
-	public AEItemDefinition blockGrindStone;
-	public AEItemDefinition blockCrankHandle;
-	public AEItemDefinition blockInscriber;
-	public AEItemDefinition blockWireless;
-	public AEItemDefinition blockCharger;
-	public AEItemDefinition blockTinyTNT;
-	public AEItemDefinition blockSecurity;
-
-	/*
-	 * Quantum Network Bridge
-	 */
-	public AEItemDefinition blockQuantumRing;
-	public AEItemDefinition blockQuantumLink;
-
-	/*
-	 * Spatial IO
-	 */
-	public AEItemDefinition blockSpatialPylon;
-	public AEItemDefinition blockSpatialIOPort;
-
-	/*
-	 * Bus / Cables
-	 */
-	public AEItemDefinition blockMultiPart;
-
-	/*
-	 * Machines
-	 */
-	public AEItemDefinition blockController;
-	public AEItemDefinition blockDrive;
-	public AEItemDefinition blockChest;
-	public AEItemDefinition blockInterface;
-	public AEItemDefinition blockCellWorkbench;
-	public AEItemDefinition blockIOPort;
-	public AEItemDefinition blockCondenser;
-	public AEItemDefinition blockEnergyAcceptor;
-	public AEItemDefinition blockVibrationChamber;
-	public AEItemDefinition blockQuartzGrowthAccelerator;
-
-	public AEItemDefinition blockEnergyCell;
-	public AEItemDefinition blockEnergyCellDense;
-	public AEItemDefinition blockEnergyCellCreative;
-
-	// rv1
-	public AEItemDefinition blockCraftingUnit;
-	public AEItemDefinition blockCraftingAccelerator;
-	public AEItemDefinition blockCraftingStorage1k;
-	public AEItemDefinition blockCraftingStorage4k;
-	public AEItemDefinition blockCraftingStorage16k;
-	public AEItemDefinition blockCraftingStorage64k;
-	public AEItemDefinition blockCraftingMonitor;
-
-	public AEItemDefinition blockMolecularAssembler;
-
-	public AEItemDefinition blockLightDetector;
-	public AEItemDefinition blockPaint;
-
-}
@@ -0,0 +1,51 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.api.definitions;
+
+
+import java.util.Optional;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+
+
+public interface IBlockDefinition extends IItemDefinition
+{
+	/**
+	 * @return the {@link Block} implementation if applicable
+	 */
+	Optional<Block> maybeBlock();
+
+	/**
+	 * @return the {@link ItemBlock} implementation if applicable
+	 */
+	Optional<ItemBlock> maybeItemBlock();
+
+	/**
+	 * Compare Block with world.
+	 *
+	 * @param world world of block
+	 * @param pos location
+	 *
+	 * @return if the block is placed in the world at the specific location.
+	 */
+	boolean isSameAs( IBlockAccess world, BlockPos pos );
+}
@@ -0,0 +1,189 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.definitions;
+
+
+/**
+ * A list of all blocks in AE
+ */
+public interface IBlocks
+{
+	/*
+	 * world gen
+	 */
+	IBlockDefinition quartzOre();
+
+	IBlockDefinition quartzOreCharged();
+
+	IBlockDefinition matrixFrame();
+
+	/*
+	 * decorative
+	 */
+	IBlockDefinition quartzBlock();
+
+	IBlockDefinition quartzPillar();
+
+	IBlockDefinition chiseledQuartzBlock();
+
+	IBlockDefinition quartzGlass();
+
+	IBlockDefinition quartzVibrantGlass();
+
+	IBlockDefinition quartzFixture();
+
+	IBlockDefinition fluixBlock();
+
+	IBlockDefinition skyStoneBlock();
+
+	IBlockDefinition smoothSkyStoneBlock();
+
+	IBlockDefinition skyStoneBrick();
+
+	IBlockDefinition skyStoneSmallBrick();
+
+	IBlockDefinition skyStoneChest();
+
+	IBlockDefinition smoothSkyStoneChest();
+
+	IBlockDefinition skyCompass();
+
+	IBlockDefinition skyStoneStairs();
+
+	IBlockDefinition smoothSkyStoneStairs();
+
+	IBlockDefinition skyStoneBrickStairs();
+
+	IBlockDefinition skyStoneSmallBrickStairs();
+
+	IBlockDefinition fluixStairs();
+
+	IBlockDefinition quartzStairs();
+
+	IBlockDefinition chiseledQuartzStairs();
+
+	IBlockDefinition quartzPillarStairs();
+
+	IBlockDefinition skyStoneSlab();
+
+	IBlockDefinition smoothSkyStoneSlab();
+
+	IBlockDefinition skyStoneBrickSlab();
+
+	IBlockDefinition skyStoneSmallBrickSlab();
+
+	IBlockDefinition fluixSlab();
+
+	IBlockDefinition quartzSlab();
+
+	IBlockDefinition chiseledQuartzSlab();
+
+	IBlockDefinition quartzPillarSlab();
+
+	/*
+	 * misc
+	 */
+	ITileDefinition grindstone();
+
+	ITileDefinition crank();
+
+	ITileDefinition inscriber();
+
+	ITileDefinition wirelessAccessPoint();
+
+	ITileDefinition charger();
+
+	IBlockDefinition tinyTNT();
+
+	ITileDefinition securityStation();
+
+	/*
+	 * quantum Network Bridge
+	 */
+	ITileDefinition quantumRing();
+
+	ITileDefinition quantumLink();
+
+	/*
+	 * spatial iO
+	 */
+	ITileDefinition spatialPylon();
+
+	ITileDefinition spatialIOPort();
+
+	/*
+	 * Bus / cables
+	 */
+	ITileDefinition multiPart();
+
+	/*
+	 * machines
+	 */
+	ITileDefinition controller();
+
+	ITileDefinition drive();
+
+	ITileDefinition chest();
+
+	ITileDefinition iface();
+
+	ITileDefinition cellWorkbench();
+
+	ITileDefinition iOPort();
+
+	ITileDefinition condenser();
+
+	ITileDefinition energyAcceptor();
+
+	ITileDefinition vibrationChamber();
+
+	ITileDefinition quartzGrowthAccelerator();
+
+	ITileDefinition energyCell();
+
+	ITileDefinition energyCellDense();
+
+	ITileDefinition energyCellCreative();
+
+	// rv1
+	ITileDefinition craftingUnit();
+
+	ITileDefinition craftingAccelerator();
+
+	ITileDefinition craftingStorage1k();
+
+	ITileDefinition craftingStorage4k();
+
+	ITileDefinition craftingStorage16k();
+
+	ITileDefinition craftingStorage64k();
+
+	ITileDefinition craftingMonitor();
+
+	ITileDefinition molecularAssembler();
+
+	ITileDefinition lightDetector();
+
+	ITileDefinition paint();
+}
@@ -16,21 +16,27 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.block.solids;
+package appeng.api.definitions;

-import java.util.EnumSet;

-import net.minecraft.block.material.Material;
+import net.minecraft.item.ItemStack;

-import appeng.block.AEDecorativeBlock;
-import appeng.core.features.AEFeature;

-public class BlockQuartzChiseled extends AEDecorativeBlock
+/**
+ * Interface to compare a definition with an itemstack or a block
+ *
+ * @author thatsIch
+ * @version rv2
+ * @since rv2
+ */
+public interface IComparableDefinition
 {
-
-	public BlockQuartzChiseled() {
-		super( BlockQuartzChiseled.class, Material.rock );
-		this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
-	}
-
+	/**
+	 * Compare {@link ItemStack} with this
+	 *
+	 * @param comparableStack compared item
+	 *
+	 * @return true if the item stack is a matching item.
+	 */
+	boolean isSameAs( ItemStack comparableStack );
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -21,23 +21,31 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

-package appeng.api.integration;
+package appeng.api.definitions;
+

 /**
- * An interface to get access to the individual settings for AE's Internal Bee
- * Comparison handler.
- * 
- * Assessable via: ( IBeeComparison )
- * IAEItemStack.getTagCompound().getSpecialComparison()
- * 
- * If you don't have the forestry API, just delete this file when using the API.
+ * All definitions in AE
 */
-public interface IBeeComparison
+public interface IDefinitions
 {
+	/**
+	 * @return an accessible list of all of AE's blocks
+	 */
+	IBlocks blocks();

 	/**
-	 * @return the Forestry IIndividual for this comparison object - cast this to a IIndividual if you want to use it.
+	 * @return an accessible list of all of AE's Items
 	 */
-	Object getIndividual();
+	IItems items();

-}
+	/**
+	 * @return an accessible list of all of AE's materials; materials are items
+	 */
+	IMaterials materials();
+
+	/**
+	 * @return an accessible list of all of AE's parts, parts are items
+	 */
+	IParts parts();
+}
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
- * Copyright (c) 2013 AlgorithmX2
- * 
+ *
+ * Copyright (c) 2013 - 2015 AlgorithmX2
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -21,57 +21,38 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

-package appeng.api.util;
+package appeng.api.definitions;
+
+
+import java.util.Optional;
+
+import javax.annotation.Nonnull;

-import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;

-/**
- * Gives easy access to different part of the various, items/blocks/materials in AE.
- */
-public interface AEItemDefinition
+
+public interface IItemDefinition extends IComparableDefinition
 {
-
 	/**
-	 * @return the {@link Block} Implementation if applicable
+	 * @return the unique name of the definition which will be used to register the underlying structure. Will never be
+	 * null
 	 */
-	Block block();
+	@Nonnull
+	String identifier();

 	/**
 	 * @return the {@link Item} Implementation if applicable
 	 */
-	Item item();
-
-	/**
-	 * @return the {@link TileEntity} Class if applicable.
-	 */
-	Class<? extends TileEntity> entity();
+	Optional<Item> maybeItem();

 	/**
 	 * @return an {@link ItemStack} with specified quantity of this item.
 	 */
-	ItemStack stack(int stackSize);
+	Optional<ItemStack> maybeStack( int stackSize );

 	/**
-	 * Compare {@link ItemStack} with this {@link AEItemDefinition}
-	 * 
-	 * @param comparableItem compared item
-	 * @return true if the item stack is a matching item.
+	 * @return <tt>true</tt> if definition is enabled
 	 */
-	boolean sameAsStack(ItemStack comparableItem);
-
-	/**
-	 * Compare Block with world.
-	 * 
-	 * @param world world of block
-	 * @param x x pos of block
-	 * @param y y pos of block
-	 * @param z z pos of block
-	 * 
-	 * @return if the block is placed in the world at the specific location.
-	 */
-	boolean sameAsBlock(IBlockAccess world, int x, int y, int z);
+	boolean isEnabled();
 }
@@ -0,0 +1,109 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.definitions;
+
+
+import appeng.api.util.AEColoredItemDefinition;
+
+
+/**
+ * A list of all items in AE
+ */
+public interface IItems
+{
+	IItemDefinition certusQuartzAxe();
+
+	IItemDefinition certusQuartzHoe();
+
+	IItemDefinition certusQuartzShovel();
+
+	IItemDefinition certusQuartzPick();
+
+	IItemDefinition certusQuartzSword();
+
+	IItemDefinition certusQuartzWrench();
+
+	IItemDefinition certusQuartzKnife();
+
+	IItemDefinition netherQuartzAxe();
+
+	IItemDefinition netherQuartzHoe();
+
+	IItemDefinition netherQuartzShovel();
+
+	IItemDefinition netherQuartzPick();
+
+	IItemDefinition netherQuartzSword();
+
+	IItemDefinition netherQuartzWrench();
+
+	IItemDefinition netherQuartzKnife();
+
+	IItemDefinition entropyManipulator();
+
+	IItemDefinition wirelessTerminal();
+
+	IItemDefinition biometricCard();
+
+	IItemDefinition chargedStaff();
+
+	IItemDefinition massCannon();
+
+	IItemDefinition memoryCard();
+
+	IItemDefinition networkTool();
+
+	IItemDefinition portableCell();
+
+	IItemDefinition cellCreative();
+
+	IItemDefinition viewCell();
+
+	IItemDefinition cell1k();
+
+	IItemDefinition cell4k();
+
+	IItemDefinition cell16k();
+
+	IItemDefinition cell64k();
+
+	IItemDefinition spatialCell2();
+
+	IItemDefinition spatialCell16();
+
+	IItemDefinition spatialCell128();
+
+	IItemDefinition facade();
+
+	IItemDefinition crystalSeed();
+
+	// rv1
+	IItemDefinition encodedPattern();
+
+	IItemDefinition colorApplicator();
+
+	AEColoredItemDefinition coloredPaintBall();
+
+	AEColoredItemDefinition coloredLumenPaintBall();
+}
@@ -0,0 +1,139 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.definitions;
+
+
+/**
+ * A list of all materials in AE
+ */
+public interface IMaterials
+{
+	IItemDefinition cell2SpatialPart();
+
+	IItemDefinition cell16SpatialPart();
+
+	IItemDefinition cell128SpatialPart();
+
+	IItemDefinition silicon();
+
+	IItemDefinition skyDust();
+
+	IItemDefinition calcProcessorPress();
+
+	IItemDefinition engProcessorPress();
+
+	IItemDefinition logicProcessorPress();
+
+	IItemDefinition calcProcessorPrint();
+
+	IItemDefinition engProcessorPrint();
+
+	IItemDefinition logicProcessorPrint();
+
+	IItemDefinition siliconPress();
+
+	IItemDefinition siliconPrint();
+
+	IItemDefinition namePress();
+
+	IItemDefinition logicProcessor();
+
+	IItemDefinition calcProcessor();
+
+	IItemDefinition engProcessor();
+
+	IItemDefinition basicCard();
+
+	IItemDefinition advCard();
+
+	IItemDefinition purifiedCertusQuartzCrystal();
+
+	IItemDefinition purifiedNetherQuartzCrystal();
+
+	IItemDefinition purifiedFluixCrystal();
+
+	IItemDefinition cell1kPart();
+
+	IItemDefinition cell4kPart();
+
+	IItemDefinition cell16kPart();
+
+	IItemDefinition cell64kPart();
+
+	IItemDefinition emptyStorageCell();
+
+	IItemDefinition cardRedstone();
+
+	IItemDefinition cardSpeed();
+
+	IItemDefinition cardCapacity();
+
+	IItemDefinition cardFuzzy();
+
+	IItemDefinition cardInverter();
+
+	IItemDefinition cardCrafting();
+
+	IItemDefinition enderDust();
+
+	IItemDefinition flour();
+
+	IItemDefinition goldDust();
+
+	IItemDefinition ironDust();
+
+	IItemDefinition fluixDust();
+
+	IItemDefinition certusQuartzDust();
+
+	IItemDefinition netherQuartzDust();
+
+	IItemDefinition matterBall();
+
+	IItemDefinition ironNugget();
+
+	IItemDefinition certusQuartzCrystal();
+
+	IItemDefinition certusQuartzCrystalCharged();
+
+	IItemDefinition fluixCrystal();
+
+	IItemDefinition fluixPearl();
+
+	IItemDefinition woodenGear();
+
+	IItemDefinition wirelessReceiver();
+
+	IItemDefinition wirelessBooster();
+
+	IItemDefinition annihilationCore();
+
+	IItemDefinition formationCore();
+
+	IItemDefinition singularity();
+
+	IItemDefinition qESingularity();
+
+	IItemDefinition blankPattern();
+}
@@ -0,0 +1,108 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.definitions;
+
+
+import appeng.api.util.AEColoredItemDefinition;
+
+
+/**
+ * A list of all parts in AE
+ */
+public interface IParts
+{
+	AEColoredItemDefinition cableSmart();
+
+	AEColoredItemDefinition cableCovered();
+
+	AEColoredItemDefinition cableGlass();
+
+	AEColoredItemDefinition cableDense();
+
+	AEColoredItemDefinition lumenCableSmart();
+
+	AEColoredItemDefinition lumenCableCovered();
+
+	AEColoredItemDefinition lumenCableGlass();
+
+	AEColoredItemDefinition lumenCableDense();
+
+	IItemDefinition quartzFiber();
+
+	IItemDefinition toggleBus();
+
+	IItemDefinition invertedToggleBus();
+
+	IItemDefinition storageBus();
+
+	IItemDefinition importBus();
+
+	IItemDefinition exportBus();
+
+	IItemDefinition iface();
+
+	IItemDefinition levelEmitter();
+
+	IItemDefinition annihilationPlane();
+
+	IItemDefinition identityAnnihilationPlane();
+
+	IItemDefinition formationPlane();
+
+	IItemDefinition p2PTunnelME();
+
+	IItemDefinition p2PTunnelRedstone();
+
+	IItemDefinition p2PTunnelItems();
+
+	IItemDefinition p2PTunnelFluids();
+
+	IItemDefinition p2PTunnelEU();
+
+	// IItemDefinition p2PTunnelRF();
+
+	IItemDefinition p2PTunnelLight();
+
+	// IItemDefinition p2PTunnelOpenComputers();
+
+	IItemDefinition cableAnchor();
+
+	IItemDefinition monitor();
+
+	IItemDefinition semiDarkMonitor();
+
+	IItemDefinition darkMonitor();
+
+	IItemDefinition interfaceTerminal();
+
+	IItemDefinition patternTerminal();
+
+	IItemDefinition craftingTerminal();
+
+	IItemDefinition terminal();
+
+	IItemDefinition storageMonitor();
+
+	IItemDefinition conversionMonitor();
+}
@@ -16,19 +16,18 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.core.features.registries;
+package appeng.api.definitions;
+
+
+import java.util.Optional;

 import net.minecraft.tileentity.TileEntity;

-public class WirelessRangeResult
+
+public interface ITileDefinition extends IBlockDefinition
 {
-
-	public WirelessRangeResult(TileEntity t, float d) {
-		this.dist = d;
-		this.te = t;
-	}
-
-	final public float dist;
-	final public TileEntity te;
-
+	/**
+	 * @return the {@link TileEntity} Class if applicable.
+	 */
+	Optional<? extends Class<? extends TileEntity>> maybeEntity();
 }
@@ -1,77 +0,0 @@
-/*
- * The MIT License (MIT)
- * 
- * Copyright (c) 2013 AlgorithmX2
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.definitions;
-
-import appeng.api.util.AEColoredItemDefinition;
-import appeng.api.util.AEItemDefinition;
-
-public class Items
-{
-
-	public AEItemDefinition itemCertusQuartzAxe;
-	public AEItemDefinition itemCertusQuartzHoe;
-	public AEItemDefinition itemCertusQuartzShovel;
-	public AEItemDefinition itemCertusQuartzPick;
-	public AEItemDefinition itemCertusQuartzSword;
-	public AEItemDefinition itemCertusQuartzWrench;
-	public AEItemDefinition itemCertusQuartzKnife;
-
-	public AEItemDefinition itemNetherQuartzAxe;
-	public AEItemDefinition itemNetherQuartzHoe;
-	public AEItemDefinition itemNetherQuartzShovel;
-	public AEItemDefinition itemNetherQuartzPick;
-	public AEItemDefinition itemNetherQuartzSword;
-	public AEItemDefinition itemNetherQuartzWrench;
-	public AEItemDefinition itemNetherQuartzKnife;
-
-	public AEItemDefinition itemEntropyManipulator;
-	public AEItemDefinition itemWirelessTerminal;
-	public AEItemDefinition itemBiometricCard;
-	public AEItemDefinition itemChargedStaff;
-	public AEItemDefinition itemMassCannon;
-	public AEItemDefinition itemMemoryCard;
-	public AEItemDefinition itemNetworkTool;
-	public AEItemDefinition itemPortableCell;
-
-	public AEItemDefinition itemCellCreative;
-	public AEItemDefinition itemViewCell;
-
-	public AEItemDefinition itemCell1k;
-	public AEItemDefinition itemCell4k;
-	public AEItemDefinition itemCell16k;
-	public AEItemDefinition itemCell64k;
-
-	public AEItemDefinition itemSpatialCell2;
-	public AEItemDefinition itemSpatialCell16;
-	public AEItemDefinition itemSpatialCell128;
-
-	public AEItemDefinition itemFacade;
-	public AEItemDefinition itemCrystalSeed;
-
-	// rv1
-	public AEItemDefinition itemEncodedPattern;
-	public AEItemDefinition itemColorApplicator;
-	public AEColoredItemDefinition itemPaintBall;
-	public AEColoredItemDefinition itemLumenPaintBall;
-}
@@ -1,103 +0,0 @@
-/*
- * The MIT License (MIT)
- * 
- * Copyright (c) 2013 AlgorithmX2
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.definitions;
-
-import appeng.api.util.AEItemDefinition;
-
-public class Materials
-{
-
-	public AEItemDefinition materialCell2SpatialPart;
-	public AEItemDefinition materialCell16SpatialPart;
-	public AEItemDefinition materialCell128SpatialPart;
-
-	public AEItemDefinition materialSilicon;
-	public AEItemDefinition materialSkyDust;
-
-	public AEItemDefinition materialCalcProcessorPress;
-	public AEItemDefinition materialEngProcessorPress;
-	public AEItemDefinition materialLogicProcessorPress;
-
-	public AEItemDefinition materialCalcProcessorPrint;
-	public AEItemDefinition materialEngProcessorPrint;
-	public AEItemDefinition materialLogicProcessorPrint;
-
-	public AEItemDefinition materialSiliconPress;
-	public AEItemDefinition materialSiliconPrint;
-
-	public AEItemDefinition materialNamePress;
-
-	public AEItemDefinition materialLogicProcessor;
-	public AEItemDefinition materialCalcProcessor;
-	public AEItemDefinition materialEngProcessor;
-
-	public AEItemDefinition materialBasicCard;
-	public AEItemDefinition materialAdvCard;
-
-	public AEItemDefinition materialPurifiedCertusQuartzCrystal;
-	public AEItemDefinition materialPurifiedNetherQuartzCrystal;
-	public AEItemDefinition materialPurifiedFluixCrystal;
-
-	public AEItemDefinition materialCell1kPart;
-	public AEItemDefinition materialCell4kPart;
-	public AEItemDefinition materialCell16kPart;
-	public AEItemDefinition materialCell64kPart;
-	public AEItemDefinition materialEmptyStorageCell;
-
-	public AEItemDefinition materialCardRedstone;
-	public AEItemDefinition materialCardSpeed;
-	public AEItemDefinition materialCardCapacity;
-	public AEItemDefinition materialCardFuzzy;
-	public AEItemDefinition materialCardInverter;
-	public AEItemDefinition materialCardCrafting;
-
-	public AEItemDefinition materialEnderDust;
-	public AEItemDefinition materialFlour;
-	public AEItemDefinition materialGoldDust;
-	public AEItemDefinition materialIronDust;
-	public AEItemDefinition materialFluixDust;
-	public AEItemDefinition materialCertusQuartzDust;
-	public AEItemDefinition materialNetherQuartzDust;
-
-	public AEItemDefinition materialMatterBall;
-	public AEItemDefinition materialIronNugget;
-
-	public AEItemDefinition materialCertusQuartzCrystal;
-	public AEItemDefinition materialCertusQuartzCrystalCharged;
-	public AEItemDefinition materialFluixCrystal;
-	public AEItemDefinition materialFluixPearl;
-
-	public AEItemDefinition materialWoodenGear;
-
-	public AEItemDefinition materialWireless;
-	public AEItemDefinition materialWirelessBooster;
-
-	public AEItemDefinition materialAnnihilationCore;
-	public AEItemDefinition materialFormationCore;
-
-	public AEItemDefinition materialSingularity;
-	public AEItemDefinition materialQESingularity;
-	public AEItemDefinition materialBlankPattern;
-
-}
@@ -1,76 +0,0 @@
-/*
- * The MIT License (MIT)
- * 
- * Copyright (c) 2013 AlgorithmX2
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.definitions;
-
-import appeng.api.util.AEColoredItemDefinition;
-import appeng.api.util.AEItemDefinition;
-
-public class Parts
-{
-
-	public AEColoredItemDefinition partCableSmart;
-	public AEColoredItemDefinition partCableCovered;
-	public AEColoredItemDefinition partCableGlass;
-	public AEColoredItemDefinition partCableDense;
-
-	public AEColoredItemDefinition partLumenCableSmart;
-	public AEColoredItemDefinition partLumenCableCovered;
-	public AEColoredItemDefinition partLumenCableGlass;
-	public AEColoredItemDefinition partLumenCableDense;
-
-	public AEItemDefinition partQuartzFiber;
-	public AEItemDefinition partToggleBus;
-	public AEItemDefinition partInvertedToggleBus;
-
-	public AEItemDefinition partStorageBus;
-	public AEItemDefinition partImportBus;
-	public AEItemDefinition partExportBus;
-	public AEItemDefinition partInterface;
-
-	public AEItemDefinition partLevelEmitter;
-
-	public AEItemDefinition partAnnihilationPlane;
-	public AEItemDefinition partFormationPlane;
-
-	public AEItemDefinition partP2PTunnelME;
-	public AEItemDefinition partP2PTunnelRedstone;
-	public AEItemDefinition partP2PTunnelItems;
-	public AEItemDefinition partP2PTunnelLiquids;
-	public AEItemDefinition partP2PTunnelMJ;
-	public AEItemDefinition partP2PTunnelEU;
-	public AEItemDefinition partP2PTunnelRF;
-	public AEItemDefinition partP2PTunnelLight;
-
-	public AEItemDefinition partCableAnchor;
-	public AEItemDefinition partMonitor;
-	public AEItemDefinition partSemiDarkMonitor;
-	public AEItemDefinition partDarkMonitor;
-
-	public AEItemDefinition partInterfaceTerminal;
-	public AEItemDefinition partPatternTerminal;
-	public AEItemDefinition partCraftingTerminal;
-	public AEItemDefinition partTerminal;
-	public AEItemDefinition partStorageMonitor;
-	public AEItemDefinition partConversionMonitor;
-}
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,29 +23,39 @@

 package appeng.api.events;

+
+import net.minecraftforge.fml.common.eventhandler.Event;
+
 import appeng.api.features.ILocatable;
-import cpw.mods.fml.common.eventhandler.Event;
+

 /**
 * Input Event:
- * 
+ *
 * Used to Notify the Location Registry of objects, and their availability.
 */
 public class LocatableEventAnnounce extends Event
 {

+	public final ILocatable target;
+	public final LocatableEvent change;
+
+	public LocatableEventAnnounce( final ILocatable o, final LocatableEvent ev )
+	{
+		this.target = o;
+		this.change = ev;
+	}
+
 	public enum LocatableEvent
 	{
-		Register, // Adds the locatable to the registry
-		Unregister // Removes the locatable from the registry
+		/**
+		 * Adds the locatable to the registry
+		 */
+		REGISTER,
+
+		/**
+		 * Removes the locatable from the registry
+		 */
+		UNREGISTER
 	}
-
-	final public ILocatable target;
-	final public LocatableEvent change;
-
-	public LocatableEventAnnounce(ILocatable o, LocatableEvent ev) {
-		target = o;
-		change = ev;
-	}
-
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,12 +23,14 @@

 package appeng.api.exceptions;

+
 public class AppEngException extends Exception
 {

 	private static final long serialVersionUID = -9051434206368465494L;

-	public AppEngException(String t) {
+	public AppEngException( final String t )
+	{
 		super( t );
 	}
 }
@@ -0,0 +1,28 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.api.exceptions;
+
+
+public class CoreInaccessibleException extends RuntimeException
+{
+	public CoreInaccessibleException( final String message )
+	{
+		super( message );
+	}
+}
@@ -0,0 +1,56 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.exceptions;
+
+
+import appeng.api.networking.IGridNode;
+
+
+/**
+ * Exception occurred because of an already existing connection between the two {@link IGridNode}s
+ *
+ * Intended to signal an internal exception and not intended to be thrown by
+ * any 3rd party module.
+ *
+ * @author yueh
+ * @version rv3
+ * @since rv3
+ */
+public class ExistingConnectionException extends FailedConnection
+{
+
+	private static final long serialVersionUID = 2975450379720353182L;
+	private static final String DEFAULT_MESSAGE = "Connection between both nodes already exists.";
+
+	public ExistingConnectionException()
+	{
+		super( DEFAULT_MESSAGE );
+	}
+
+	public ExistingConnectionException( String message )
+	{
+		super( message );
+	}
+
+}
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,11 +23,34 @@

 package appeng.api.exceptions;

+
+import appeng.api.networking.IGridNode;
+
+
+/**
+ * Exception indicating a failed connection between two {@link IGridNode}s.
+ *
+ * Intended to signal an internal exception and not intended to be thrown by
+ * any 3rd party module.
+ *
+ * See any subclass for a more specific reason.
+ *
+ * @author AlgorithmX2
+ * @author yueh
+ * @version rv3
+ * @since rv0
+ */
 public class FailedConnection extends Exception
 {

 	private static final long serialVersionUID = -2544208090248293753L;

-	public FailedConnection() {
+	public FailedConnection()
+	{
+	}
+
+	public FailedConnection( String message )
+	{
+		super( message );
 	}
 }
@@ -0,0 +1,28 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.api.exceptions;
+
+
+public class MissingDefinition extends RuntimeException
+{
+	public MissingDefinition( final String message )
+	{
+		super( message );
+	}
+}
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,12 +23,14 @@

 package appeng.api.exceptions;

-public class MissingIngredientError extends Exception {
+
+public class MissingIngredientError extends Exception
+{

 	private static final long serialVersionUID = -998858343831371697L;

-	public MissingIngredientError(String n) {
+	public MissingIngredientError( final String n )
+	{
 		super( n );
 	}
-
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,13 +23,14 @@

 package appeng.api.exceptions;

+
 public class ModNotInstalled extends Exception
 {

 	private static final long serialVersionUID = -9052435206368425494L;

-	public ModNotInstalled(String t) {
+	public ModNotInstalled( final String t )
+	{
 		super( t );
 	}
-
 }
@@ -0,0 +1,53 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.exceptions;
+
+
+/**
+ * Exception due to trying to connect one or more null values.
+ *
+ * Intended to signal an internal exception and not intended to be thrown by
+ * any 3rd party module.
+ *
+ * @author yueh
+ * @version rv3
+ * @since rv3
+ */
+public class NullNodeConnectionException extends FailedConnection
+{
+
+	private static final long serialVersionUID = -2143719383495321764L;
+	private static final String DEFAULT_MESSAGE = "Connection forged between null entities.";
+
+	public NullNodeConnectionException()
+	{
+		super( DEFAULT_MESSAGE );
+	}
+
+	public NullNodeConnectionException( String message )
+	{
+		super( message );
+	}
+
+}
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,13 +23,14 @@

 package appeng.api.exceptions;

+
 public class RecipeError extends Exception
 {

 	private static final long serialVersionUID = -6602870588617670262L;

-	public RecipeError(String n) {
+	public RecipeError( final String n )
+	{
 		super( n );
 	}
-
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,13 +23,14 @@

 package appeng.api.exceptions;

+
 public class RegistrationError extends Exception
 {

 	private static final long serialVersionUID = -6602870588617670263L;

-	public RegistrationError(String n) {
+	public RegistrationError( final String n )
+	{
 		super( n );
 	}
-
 }
@@ -0,0 +1,52 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.exceptions;
+
+
+/**
+ * Exception due to trying to connect different security realms.
+ *
+ * Intended to signal an internal exception and not intended to be thrown by
+ * any 3rd party module.
+ *
+ * @author yueh
+ * @version rv3
+ * @since rv3
+ */
+public class SecurityConnectionException extends FailedConnection
+{
+	private static final long serialVersionUID = 5048714900434215426L;
+	private static final String DEFAULT_MESSAGE = "Connection failed due to different security realms.";
+
+	public SecurityConnectionException()
+	{
+		super( DEFAULT_MESSAGE );
+	}
+
+	public SecurityConnectionException( String message )
+	{
+		super( message );
+	}
+
+}
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,97 +23,71 @@

 package appeng.api.features;

+
+import java.util.Optional;
+
+import javax.annotation.Nonnull;
+
 import net.minecraft.item.ItemStack;

+
 /**
 * Registration Records for {@link IGrinderRegistry}
 */
-public interface IGrinderEntry
+public interface IGrinderRecipe
 {

 	/**
 	 * the current input
-	 * 
+	 *
 	 * @return input that the grinder will accept.
 	 */
-	public ItemStack getInput();
-
-	/**
-	 * lets you change the grinder recipe by changing its input.
-	 * 
-	 * @param input input item
-	 */
-	public void setInput(ItemStack input);
+	@Nonnull
+	ItemStack getInput();

 	/**
 	 * gets the current output
-	 * 
+	 *
 	 * @return output that the grinder will produce
 	 */
-	public ItemStack getOutput();
+	@Nonnull
+	ItemStack getOutput();

 	/**
 	 * gets the current output
-	 * 
+	 *
 	 * @return output that the grinder will produce
 	 */
-	public ItemStack getOptionalOutput();
+	@Nonnull
+	Optional<ItemStack> getOptionalOutput();

 	/**
 	 * gets the current output
-	 * 
+	 *
 	 * @return output that the grinder will produce
 	 */
-	public ItemStack getSecondOptionalOutput();
-
-	/**
-	 * allows you to change the output.
-	 * 
-	 * @param output output item
-	 */
-	public void setOutput(ItemStack output);
-
-	/**
-	 * stack, and 0.0-1.0 chance that it will be generated.
-	 * 
-	 * @param output output item
-	 * @param chance generation chance
-	 */
-	public void setOptionalOutput(ItemStack output, float chance);
+	Optional<ItemStack> getSecondOptionalOutput();

 	/**
 	 * 0.0 - 1.0 the chance that the optional output will be generated.
-	 * 
+	 *
 	 * @return chance of optional output
 	 */
-	public float getOptionalChance();
-
-	/**
-	 * stack, and 0.0-1.0 chance that it will be generated.
-	 * 
-	 * @param output second optional output item
-	 * @param chance second optional output chance
-	 */
-	public void setSecondOptionalOutput(ItemStack output, float chance);
+	@Nonnull
+	float getOptionalChance();

 	/**
 	 * 0.0 - 1.0 the chance that the optional output will be generated.
-	 * 
+	 *
 	 * @return second optional output chance
 	 */
-	public float getSecondOptionalChance();
+	float getSecondOptionalChance();

 	/**
-	 * Energy cost, in turns.
-	 * 
+	 * Amount of turns required to process the item.
+	 *
 	 * @return number of turns it takes to produce the output from the input.
 	 */
-	public int getEnergyCost();
+	int getRequiredTurns();

-	/**
-	 * Allows you to adjust the number of turns
-	 * 
-	 * @param c number of turns to produce output.
-	 */
-	public void setEnergyCost(int c);
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,9 +23,14 @@

 package appeng.api.features;

+
+import java.util.Collection;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import net.minecraft.item.ItemStack;

-import java.util.List;

 /**
 * Lets you manipulate Grinder Recipes, by adding or editing existing ones.
@@ -34,51 +39,90 @@ public interface IGrinderRegistry
 {

 	/**
-	 * Current list of registered recipes, you can modify this if you want too.
-	 * 
+	 * An immutable list of the currently registered recipes.
+	 *
 	 * @return currentlyRegisteredRecipes
 	 */
-	public List<IGrinderEntry> getRecipes();
+	@Nonnull
+	Collection<IGrinderRecipe> getRecipes();

 	/**
-	 * add a new recipe the easy way, in &#8594; out, how many turns., duplicates will not be added.
+	 * Add a new recipe with a single input and output and how many turns it requires.
 	 * 
-	 * @param in input
-	 * @param out output
-	 * @param turns amount of turns to turn the input into the output
+	 * Will ignore duplicate recipes with the same input item.
+	 *
+	 * @param in The {@link ItemStack} to grind.
+	 * @param out The {@link ItemStack} to output.
+	 * @param turns Amount of turns to turn the input into the output, with turns > 0.
 	 */
-	public void addRecipe(ItemStack in, ItemStack out, int turns);
+	void addRecipe( @Nonnull ItemStack in, @Nonnull ItemStack out, int turns );
+
+	/**
+	 * Add a new recipe with an input, output and a single optional output.
+	 * 
+	 * Will ignore duplicate recipes with the same input item.
+	 *
+	 * @param in The {@link ItemStack} to grind.
+	 * @param out The {@link ItemStack} to output.
+	 * @param optional The optional {@link ItemStack} to output of a certain chance.
+	 * @param chance Chance to get the optional output within 0.0 - 1.0
+	 * @param turns Amount of turns to turn the input into the output, with turns > 0.
+	 */
+	void addRecipe( @Nonnull ItemStack in, @Nonnull ItemStack out, @Nonnull ItemStack optional, float chance, int turns );

 	/**
 	 * add a new recipe with optional outputs, duplicates will not be added.
 	 * 
-	 * @param in input
-	 * @param out output
-	 * @param optional optional output
-	 * @param chance chance to get the optional output within 0.0 - 1.0
-	 * @param turns amount of turns to turn the input into the outputs
-	 */
-	void addRecipe(ItemStack in, ItemStack out, ItemStack optional, float chance, int turns);
-
-	/**
-	 * add a new recipe with optional outputs, duplicates will not be added.
-	 * 
-	 * @param in input
-	 * @param out output
-	 * @param optional optional output
-	 * @param chance chance to get the optional output within 0.0 - 1.0
-	 * @param optional2 second optional output
+	 * Will ignore duplicate recipes with the same input item.
+	 *
+	 * @param in The {@link ItemStack} to grind.
+	 * @param out The {@link ItemStack} to output.
+	 * @param optional The first optional {@link ItemStack} to output of a certain chance.
+	 * @param chance Chance to get the first optional output within 0.0 - 1.0
+	 * @param optional2 The second optional {@link ItemStack} to output of a certain chance.
 	 * @param chance2 chance to get the second optional output within 0.0 - 1.0
-	 * @param turns amount of turns to turn the input into the outputs
+	 * @param turns Amount of turns to turn the input into the output, with turns > 0.
+	 * 
 	 */
-	void addRecipe(ItemStack in, ItemStack out, ItemStack optional, float chance, ItemStack optional2, float chance2, int turns);
+	void addRecipe( @Nonnull ItemStack in, @Nonnull ItemStack out, @Nonnull ItemStack optional, float chance, @Nonnull ItemStack optional2, float chance2, int turns );
+
+	/**
+	 * Remove the specific from the recipe list.
+	 * 
+	 * @param recipe The recipe to be removed.
+	 * @return true, if it was removed
+	 */
+	boolean removeRecipe( @Nonnull IGrinderRecipe recipe );

 	/**
 	 * Searches for a recipe for a given input, and returns it.
-	 * 
-	 * @param input input
+	 *
+	 * @param input The {@link ItemStack} to be grinded.
+	 *
 	 * @return identified recipe or null
 	 */
-	public IGrinderEntry getRecipeForInput(ItemStack input);
+	@Nullable
+	IGrinderRecipe getRecipeForInput( @Nonnull ItemStack input );
+
+	/**
+	 * Allows do add a custom ratio from an ore to dust when being grinded.
+	 * 
+	 * The default ratio is 1 ore to 2 dusts.
+	 * 
+	 * These have to be added before any recipe is registered. Otherwise it will use the default value.
+	 * 
+	 * @param oredictName The name of the ore;
+	 * @param ratio The amount, must be > 0;
+	 */
+	void addDustRatio( @Nonnull String oredictName, int ratio );
+
+	/**
+	 * Remove a custom ratio for a specific ore name.
+	 * 
+	 * Will use the default of 2 value afterwards.
+	 * 
+	 * @param oredictName The name of the ore;
+	 */
+	boolean removeDustRatio( @Nonnull String oredictName );

 }
@@ -0,0 +1,83 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.api.features;
+
+
+import java.util.List;
+import java.util.Optional;
+
+import javax.annotation.Nonnull;
+
+import net.minecraft.item.ItemStack;
+
+
+/**
+ * Registration Records for {@link IInscriberRegistry}
+ *
+ * You have to pay attention though, that recipes are not mirrored,
+ * where the top and bottom slots are switching places.
+ *
+ * This is applied on runtime.
+ *
+ * @author thatsIch
+ * @version rv2
+ * @since rv2
+ */
+public interface IInscriberRecipe
+{
+	/**
+	 * the current inputs
+	 *
+	 * @return inputs the inscriber will accept
+	 */
+	@Nonnull
+	List<ItemStack> getInputs();
+
+	/**
+	 * gets the current output
+	 *
+	 * @return output that the recipe will produce
+	 */
+	@Nonnull
+	ItemStack getOutput();
+
+	/**
+	 * gets the top optional
+	 *
+	 * @return item which is used top
+	 */
+	@Nonnull
+	Optional<ItemStack> getTopOptional();
+
+	/**
+	 * gets the bottom optional
+	 *
+	 * @return item which is used bottom
+	 */
+	@Nonnull
+	Optional<ItemStack> getBottomOptional();
+
+	/**
+	 * type of inscriber process
+	 *
+	 * @return type of process the inscriber is doing
+	 */
+	@Nonnull
+	InscriberProcessType getProcessType();
+}
@@ -0,0 +1,107 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.api.features;
+
+
+import java.util.Collection;
+
+import javax.annotation.Nonnull;
+
+import net.minecraft.item.ItemStack;
+
+
+/**
+ * Builder for an inscriber recipe
+ *
+ * @author thatsIch
+ * @version rv2
+ * @since rv2
+ */
+public interface IInscriberRecipeBuilder
+{
+	/**
+	 * Creates an inscriber recipe with inputs.
+	 * Needs to be invoked.
+	 *
+	 * @param inputs new inputs for the recipe
+	 *
+	 * @return currently used builder
+	 */
+	@Nonnull
+	IInscriberRecipeBuilder withInputs( @Nonnull Collection<ItemStack> inputs );
+
+	/**
+	 * Creates an inscriber recipe with output.
+	 * Needs to be invoked.
+	 *
+	 * @param output new output for the recipe
+	 *
+	 * @return currently used builder
+	 */
+	@Nonnull
+	IInscriberRecipeBuilder withOutput( @Nonnull ItemStack output );
+
+	/**
+	 * Creates an inscriber recipe with top.
+	 * Either this or bot needs to be invoked.
+	 *
+	 * @param topOptional new top for the recipe
+	 *
+	 * @return currently used builder
+	 */
+	@Nonnull
+	IInscriberRecipeBuilder withTopOptional( @Nonnull ItemStack topOptional );
+
+	/**
+	 * Creates an inscriber recipe with bot.
+	 * Either this or top needs to be invoked.
+	 *
+	 * @param bottomOptional new bot for the recipe
+	 *
+	 * @return currently used builder
+	 */
+	@Nonnull
+	IInscriberRecipeBuilder withBottomOptional( @Nonnull ItemStack bottomOptional );
+
+	/**
+	 * Creates an inscriber recipe with type.
+	 * Needs to be invoked.
+	 *
+	 * @param type new type for the recipe
+	 *
+	 * @return currently used builder
+	 */
+	@Nonnull
+	IInscriberRecipeBuilder withProcessType( @Nonnull InscriberProcessType type );
+
+	/**
+	 * Finalizes the process of making the recipe.
+	 * Needs to be invoked to fetch inscriber recipe.
+	 *
+	 * @return legal inscriber recipe
+	 *
+	 * @throws IllegalStateException when input is not defined
+	 * @throws IllegalStateException when input has no size
+	 * @throws IllegalStateException when output is not defined
+	 * @throws IllegalStateException when both optionals are not defined
+	 * @throws IllegalStateException when process type is not defined
+	 */
+	@Nonnull
+	IInscriberRecipe build();
+}
@@ -0,0 +1,93 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.api.features;
+
+
+import java.util.Collection;
+import java.util.Set;
+
+import javax.annotation.Nonnull;
+
+import net.minecraft.item.ItemStack;
+
+
+/**
+ * Lets you manipulate Inscriber Recipes, by adding or editing existing ones.
+ *
+ * @author thatsIch
+ * @version rv3
+ * @since rv2
+ */
+public interface IInscriberRegistry
+{
+	/**
+	 * An immutable copy of currently registered recipes.
+	 *
+	 * Use the provided methods to actually modify the inscriber recipes.
+	 *
+	 * @see IInscriberRegistry#addRecipe(IInscriberRecipe)
+	 * @see IInscriberRegistry#removeRecipe(IInscriberRecipe)
+	 *
+	 * @return currentlyRegisteredRecipes
+	 */
+	@Nonnull
+	Collection<IInscriberRecipe> getRecipes();
+
+	/**
+	 * Optional items which are used in the top or bottom slot.
+	 *
+	 * @return set of all optional items
+	 */
+	@Nonnull
+	Set<ItemStack> getOptionals();
+
+	/**
+	 * Get all registered items which are valid inputs.
+	 *
+	 * @return set of all input items
+	 */
+	@Nonnull
+	Set<ItemStack> getInputs();
+
+	/**
+	 * Extensible way to create an inscriber recipe.
+	 *
+	 * @return builder for inscriber recipes
+	 */
+	@Nonnull
+	IInscriberRecipeBuilder builder();
+
+	/**
+	 * add a new recipe the easy way, duplicates will not be added.
+	 * Added recipes will be automatically added to the optionals and inputs.
+	 *
+	 * @param recipe new recipe
+	 *
+	 * @throws IllegalArgumentException if null is added
+	 */
+	void addRecipe( IInscriberRecipe recipe );
+
+	/**
+	 * Removes all equal recipes from the registry.
+	 *
+	 * @param toBeRemovedRecipe to be removed recipe, can be null, makes just no sense.
+	 */
+	void removeRecipe( IInscriberRecipe toBeRemovedRecipe );
+
+}
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,11 +23,10 @@

 package appeng.api.features;

+
 public interface IItemComparison
 {
+	boolean sameAsPrecise( IItemComparison comp );

-	public boolean sameAsPrecise(IItemComparison comp);
-
-	public boolean sameAsFuzzy(IItemComparison comp);
-
+	boolean sameAsFuzzy( IItemComparison comp );
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,8 +23,10 @@

 package appeng.api.features;

+
 import net.minecraft.item.ItemStack;

+
 /**
 * Provider for special comparisons. when an item is encountered AE Will request
 * if the comparison function handles the item, by trying to request a
@@ -36,18 +38,19 @@ public interface IItemComparisonProvider
 	/**
 	 * should return a new IItemComparison, or return null if it doesn't handle
 	 * the supplied item.
-	 * 
+	 *
 	 * @param is item
+	 *
 	 * @return IItemComparison, or null
 	 */
-	IItemComparison getComparison(ItemStack is);
+	IItemComparison getComparison( ItemStack is );

 	/**
 	 * Simple test for support ( AE generally skips this and calls the above function. )
-	 * 
+	 *
 	 * @param stack item
+	 *
 	 * @return true, if getComparison will return a valid IItemComparison Object
 	 */
-	public boolean canHandle(ItemStack stack);
-
+	boolean canHandle( ItemStack stack );
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,8 +23,10 @@

 package appeng.api.features;

+
 import appeng.api.events.LocatableEventAnnounce;

+
 /**
 * A registration record for the {@link ILocatableRegistry} use the {@link LocatableEventAnnounce} event on the Forge
 * Event bus to update the registry.
@@ -36,5 +38,4 @@ public interface ILocatable
 	 * @return the serial for a locatable object
 	 */
 	long getLocatableSerial();
-
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@

 package appeng.api.features;

+
 /**
 * A Registry for locatable items, works based on serial numbers.
 */
@@ -30,12 +31,11 @@ public interface ILocatableRegistry
 {

 	/**
-	 * Attempts to find the object with the serial specified, if it can it
-	 * returns the object.
-	 * 
+	 * Gets the {@link ILocatable} with the registered serial, if available
+	 *
 	 * @param serial serial
-	 * @return requestedObject, or null
+	 *
+	 * @return requestedObject, or null, if the object does not exist anymore
 	 */
-	public abstract Object findLocatableBySerial(long serial);
-
+	ILocatable getLocatableBy( long serial );
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,25 +23,27 @@

 package appeng.api.features;

+
 import net.minecraft.item.ItemStack;

+
 public interface IMatterCannonAmmoRegistry
 {

 	/**
 	 * register a new ammo, generally speaking this is based off of atomic weight to make it easier to guess at
-	 * 
+	 *
 	 * @param ammo new ammo
 	 * @param weight atomic weight
 	 */
-	void registerAmmo(ItemStack ammo, double weight);
+	void registerAmmo( ItemStack ammo, double weight );

 	/**
 	 * get the penetration value for a particular ammo, 0 indicates a non-ammo.
-	 * 
+	 *
 	 * @param is ammo
+	 *
 	 * @return 0 or a valid penetration value.
 	 */
-	float getPenetration(ItemStack is);
-
+	float getPenetration( ItemStack is );
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,28 +23,28 @@

 package appeng.api.features;

+
 import net.minecraft.item.ItemStack;

-public interface INetworkEncodable {
+
+public interface INetworkEncodable
+{

 	/**
 	 * Used to get the current key from the item.
-	 * 
+	 *
 	 * @param item item
+	 *
 	 * @return string key of item
 	 */
-	String getEncryptionKey(ItemStack item);
+	String getEncryptionKey( ItemStack item );

 	/**
 	 * Encode the wireless frequency via the Controller.
-	 * 
-	 * @param item
-	 *            the wireless terminal.
-	 * @param encKey
-	 *            the wireless encryption key.
-	 * @param name
-	 *            null for now.
+	 *
+	 * @param item the wireless terminal.
+	 * @param encKey the wireless encryption key.
+	 * @param name null for now.
 	 */
-	void setEncryptionKey(ItemStack item, String encKey, String name);
-
+	void setEncryptionKey( ItemStack item, String encKey, String name );
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
- * Copyright (c) 2013 AlgorithmX2
- * 
+ *
+ * Copyright (c) 2013 - 2015 AlgorithmX2
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,9 +23,14 @@

 package appeng.api.features;

+
+import javax.annotation.Nullable;
+
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.TunnelType;

+
 /**
 * A Registry for how p2p Tunnels are attuned
 */
@@ -35,20 +40,19 @@ public interface IP2PTunnelRegistry
 	/**
 	 * Allows third parties to register items from their mod as potential
 	 * attunements for AE's P2P Tunnels
-	 * 
-	 * @param trigger
-	 *            - the item which triggers attunement
-	 * @param type
-	 *            - the type of tunnel
+	 *
+	 * @param trigger - the item which triggers attunement. Nullable, but then ignored
+	 * @param type - the type of tunnel. Nullable, but then ignored
 	 */
-	public abstract void addNewAttunement(ItemStack trigger, TunnelType type);
+	void addNewAttunement( @Nullable ItemStack trigger, @Nullable TunnelType type );

 	/**
 	 * returns null if no attunement can be found.
-	 * 
+	 *
 	 * @param trigger attunement trigger
+	 *
 	 * @return null if no attunement can be found or attunement
 	 */
-	TunnelType getTunnelTypeByItem(ItemStack trigger);
-
+	@Nullable
+	TunnelType getTunnelTypeByItem( ItemStack trigger );
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
- * Copyright (c) 2013 AlgorithmX2
- * 
+ *
+ * Copyright (c) 2013 - 2015 AlgorithmX2
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,10 +23,14 @@

 package appeng.api.features;

-import net.minecraft.entity.player.EntityPlayer;
+
+import javax.annotation.Nullable;

 import com.mojang.authlib.GameProfile;

+import net.minecraft.entity.player.EntityPlayer;
+
+
 /**
 * Maintains a save specific list of userids and username combinations this greatly simplifies storage internally and
 * gives a common place to look up and get IDs for the security framework.
@@ -36,20 +40,23 @@ public interface IPlayerRegistry

 	/**
 	 * @param gameProfile user game profile
+	 *
 	 * @return user id of a username.
 	 */
-	int getID(GameProfile gameProfile);
+	int getID( GameProfile gameProfile );

 	/**
 	 * @param player player
+	 *
 	 * @return user id of a player entity.
 	 */
-	int getID(EntityPlayer player);
+	int getID( EntityPlayer player );

 	/**
 	 * @param playerID to be found player id
+	 *
 	 * @return PlayerEntity, or null if the player could not be found.
 	 */
-	EntityPlayer findPlayer(int playerID);
-
+	@Nullable
+	EntityPlayer findPlayer( int playerID );
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
- * Copyright (c) 2013 AlgorithmX2
- * 
+ *
+ * Copyright (c) 2013 - 2015 AlgorithmX2
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,50 +23,63 @@

 package appeng.api.features;

+
+import javax.annotation.Nullable;
+
 import appeng.api.recipes.ICraftHandler;
 import appeng.api.recipes.IRecipeHandler;
 import appeng.api.recipes.ISubItemResolver;

+
+/**
+ * @author AlgorithmX2
+ * @author thatsIch
+ * @version rv3 - 10.08.2015
+ * @since rv0
+ */
 public interface IRecipeHandlerRegistry
 {

 	/**
 	 * Add a new Recipe Handler to the parser.
-	 * 
+	 *
 	 * MUST BE CALLED IN PRE-INIT
-	 * 
+	 *
 	 * @param name name of crafthandler
 	 * @param handler class of crafthandler
 	 */
-	void addNewCraftHandler(String name, Class<? extends ICraftHandler> handler);
+	void addNewCraftHandler( String name, Class<? extends ICraftHandler> handler );

 	/**
 	 * Add a new resolver to the parser.
-	 * 
+	 *
 	 * MUST BE CALLED IN PRE-INIT
-	 * 
+	 *
 	 * @param sir sub item resolver
 	 */
-	void addNewSubItemResolver(ISubItemResolver sir);
+	void addNewSubItemResolver( ISubItemResolver sir );

 	/**
 	 * @param name name of crafting handler
+	 *
 	 * @return A recipe handler by name, returns null on failure.
 	 */
-	ICraftHandler getCraftHandlerFor(String name);
+	@Nullable
+	ICraftHandler getCraftHandlerFor( String name );

 	/**
 	 * @return a new recipe handler, which can be used to parse, and read recipe files.
 	 */
-	public IRecipeHandler createNewRecipehandler();
+	IRecipeHandler createNewRecipehandler();

 	/**
 	 * resolve sub items by name.
-	 * 
+	 *
 	 * @param nameSpace namespace of item
 	 * @param itemName full name of item
-	 * @return ResolverResult or ResolverResultSet
+	 *
+	 * @return ResolverResult or ResolverResultSet or null if could not resolve
 	 */
-	Object resolveItem(String nameSpace, String itemName);
-
+	@Nullable
+	Object resolveItem( String nameSpace, String itemName );
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,11 +23,21 @@

 package appeng.api.features;

+
+import appeng.api.AEInjectable;
 import appeng.api.movable.IMovableRegistry;
 import appeng.api.networking.IGridCacheRegistry;
+import appeng.api.parts.IPartModels;
 import appeng.api.storage.ICellRegistry;
-import appeng.api.storage.IExternalStorageRegistry;

+
+/**
+ * @author AlgorithmX2
+ * @author thatsIch
+ * @version rv2
+ * @since rv0
+ */
+@AEInjectable
 public interface IRegistryContainer
 {

@@ -41,12 +51,6 @@ public interface IRegistryContainer
 	 */
 	IGridCacheRegistry gridCache();

-	/**
-	 * Add additional storage bus handlers to improve interplay with mod blocks that contains special inventories that
-	 * function unlike vanilla chests. AE uses this internally for barrels, DSU's, quantum chests, AE Networks and more.
-	 */
-	IExternalStorageRegistry externalStorage();
-
 	/**
 	 * Add additional special comparison functionality, AE Uses this internally for Bees.
 	 */
@@ -67,6 +71,11 @@ public interface IRegistryContainer
 	 */
 	IGrinderRegistry grinder();

+	/**
+	 * Manage inscriber recipes via API
+	 */
+	IInscriberRegistry inscriber();
+
 	/**
 	 * get access to the locatable registry
 	 */
@@ -96,4 +105,9 @@ public interface IRegistryContainer
 	 * get access to the world-gen api.
 	 */
 	IWorldGen worldgen();
+
+	/**
+	 * Register your IPart models before using them.
+	 */
+	IPartModels partModels();
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,28 +23,29 @@

 package appeng.api.features;

+
 import net.minecraft.item.ItemStack;

+
 /**
 * A Registry of any special comparison handlers for AE To use.
- * 
 */
 public interface ISpecialComparisonRegistry
 {

 	/**
 	 * return TheHandler or null.
-	 * 
+	 *
 	 * @param stack item
+	 *
 	 * @return a handler it found for a specific item
 	 */
-	IItemComparison getSpecialComparison(ItemStack stack);
+	IItemComparison getSpecialComparison( ItemStack stack );

 	/**
 	 * Register a new special comparison function with AE.
-	 * 
+	 *
 	 * @param prov comparison provider
 	 */
-	public void addComparisonProvider(IItemComparisonProvider prov);
-
+	void addComparisonProvider( IItemComparisonProvider prov );
 }
@@ -1,18 +1,18 @@
 /*
 * The MIT License (MIT)
- * 
+ *
 * Copyright (c) 2013 AlgorithmX2
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
 * the Software without restriction, including without limitation the rights to
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 * the Software, and to permit persons to whom the Software is furnished to do so,
 * subject to the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included in all
 * copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,10 +23,13 @@

 package appeng.api.features;

+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.util.IConfigManager;

+
 /**
 * A handler for a wireless terminal.
 */
@@ -35,35 +38,37 @@ public interface IWirelessTermHandler extends INetworkEncodable

 	/**
 	 * @param is wireless terminal
+	 *
 	 * @return true, if usePower, hasPower, etc... can be called for the provided item
 	 */
-	boolean canHandle(ItemStack is);
+	boolean canHandle( ItemStack is );

 	/**
 	 * use an amount of power, in AE units
-	 * 
-	 * @param amount
-	 *            is in AE units ( 5 per MJ ), if you return false, the item should be dead and return false for
-	 *            hasPower
+	 *
+	 * @param amount is in AE units ( 5 per MJ ), if you return false, the item should be dead and return false for
+	 * hasPower
 	 * @param is wireless terminal
+	 *
 	 * @return true if wireless terminal uses power
 	 */
-	boolean usePower(EntityPlayer player, double amount, ItemStack is);
+	boolean usePower( EntityPlayer player, double amount, ItemStack is );

 	/**
 	 * gets the power status of the item.
-	 * 
+	 *
 	 * @param is wireless terminal
+	 *
 	 * @return returns true if there is any power left.
 	 */
-	boolean hasPower(EntityPlayer player, double amount, ItemStack is);
+	boolean hasPower( EntityPlayer player, double amount, ItemStack is );

 	/**
 	 * Return the config manager for the wireless terminal.
-	 * 
+	 *
 	 * @param is wireless terminal
+	 *
 	 * @return config manager of wireless terminal
 	 */
-	IConfigManager getConfigManager(ItemStack is);
-	
+	IConfigManager getConfigManager( ItemStack is );
 }
--- a/Show More
+++ b/Show More