Fixes #2525: Break particles for all attachments of a cable bus.

Wraps the internal inventory into an ItemListIgnoreCrafting to hide
craftable items from it. As the ItemLists will always create a copy of the
actual stack before changing them, it will not affect any itemstack stored
elsewhere.

.github/CONTRIBUTING.md

@@ -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.
+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)
+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. Click new issue
+3. Enter your a title of your issue (something that summarizes your issue), and then create a detailed description of the issue.
-4. Enter your Issue's title (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.
-	* To help in resolving your issues please try to include the follow if applicable:
+    * The following details are required. Not including them can cause the issue to be closed.
-		* The problem that is happening?
+        * Forge version
-		* What was expected?
+        * AE2 version
-		* How to reproduce the problem?
+        * Crash log, when reporting a crash (Please make sure to use [pastebin](http://pastebin.com/))
-		* Server or Single Player?
+            * Do not post an excerpt of what you consider important, instead:
-		* Mod Pack using and version?
+            * Post the full log
-		* Crash log (Please make sure to use [pastebin](http://pastebin.com/) for the log file) 
+        * Other mods and their version, when reporting an issue between AE and another mod
-		* Screen shots or Pictures of the problem
+            * 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
+* Always fully test your changes. If they are large engouh in scope, then fully test AE2.
-	test AE2.
+* Describing the process you used to test your changes in detail will help speed up this process.
-* 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

.github/ISSUE_TEMPLATE.md

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

.gitignore

@@ -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/
@@ -22,3 +23,6 @@
 
 # code format to reduce noise in git commits
 !codeformat/
+
+# Github specific files and directories
+!.github/

.travis.yml

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

README.md

@@ -1,3 +1,7 @@
+[![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 Tag](https://img.shields.io/github/tag/AppliedEnergistics/Applied-Energistics-2.svg?label=Latest Tag&style=flat-square)](https://github.com/AppliedEnergistics/Applied-Energistics-2/tags)
+[![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 Contents
@@ -6,6 +10,7 @@
 * [Contacts](#contacts)
 * [License](#license)
 * [Downloads](#downloads)
+* [Nightly Builds](#nightly-builds)
 * [Installation](#installation)
 * [Issues](#issues)
 * [Building](#building)
@@ -26,17 +31,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 API
-
+  - (c) 2013 - 2015 AlgorithmX2 et al
-Applied Energistics 2 is (c) 2013 - 2014 AlgorithmX2 and licensed under LGPL v3.
+  - [![License](https://img.shields.io/badge/License-MIT-red.svg?style=flat-square)](http://opensource.org/licenses/MIT)
-See the LICENSE.txt for details or go to http://www.gnu.org/licenses/lgpl-3.0.txt for more information.
+* Applied Energistics 2
-
+  - (c) 2013 - 2015 AlgorithmX2 et al
-Textures and Models are licensed under [Creative Commons, Attribution-NonCommercial-ShareAlike 3.0]( https://creativecommons.org/licenses/by-nc-sa/3.0/).
+  - [![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/api/projects/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 +63,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.
+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)
+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. Click new issue
+3. Enter your a title of your issue (something that summarizes your issue), and then create a detailed description of the issue.
-4. Enter your Issue's title (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.
-	* To help in resolving your issues please try to include the follow if applicable:
+    * The following details are required. Not including them can cause the issue to be closed.
-		* The problem that is happening?
+        * Forge version
-		* What was expected?
+        * AE2 version
-		* How to reproduce the problem?
+        * Crash log, when reporting a crash (Please make sure to use [pastebin](http://pastebin.com/))
-		* Server or Single Player?
+            * Do not post an excerpt of what you consider important, instead:
-		* Mod Pack using and version?
+            * Post the full log
-		* Crash log (Please make sure to use [pastebin](http://pastebin.com/) for the log file) 
+        * Other mods and their version, when reporting an issue between AE and another mod
-		* Screen shots or Pictures of the problem
+            * 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,7 +100,7 @@ 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
@@ -81,6 +111,8 @@ Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue
 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 +135,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 +150,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 +169,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
 

build.gradle

@@ -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,56 +16,43 @@
  * 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 {
+repositories {
-    resolutionStrategy.cacheDynamicVersionsFor 7200, 'hours'
+    mavenLocal()
+    jcenter()
+    mavenCentral()
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_6
+apply from: 'gradle/scripts/dependencies.gradle'
-targetCompatibility = JavaVersion.VERSION_1_6
+apply from: 'gradle/scripts/artifacts.gradle'
+apply from: 'gradle/scripts/integration.gradle'
+apply from: 'gradle/scripts/optional.gradle'
 
-version = config.version + "-" + config.aechannel + "-" + config.build
+sourceCompatibility = JavaVersion.VERSION_1_8
-group = config.group
+targetCompatibility = JavaVersion.VERSION_1_8
-archivesBaseName = config.archivesBaseName
 
-// If TeamCity is running this build, lets set the version info
+version = aeversion + "-" + aechannel + "-" + aebuild
-if (hasProperty("teamcity")) {
+group = aegroup
-    version = teamcity["build.number"]
+archivesBaseName = aebasename
-
-    // Fix for main branch being built
-    version = version.replaceAll("/", "-")
-}
 
 // Add Coremod Manifest
 jar {
     manifest {
-        attributes 'FMLCorePlugin': 'appeng.transformer.AppEngCore'
         attributes 'FMLCorePluginContainsFMLMod': 'true'
     }
 
@@ -77,14 +64,21 @@ jar {
 }
 
 minecraft {
-    version = config.minecraft_version + "-" + config.forge_version
+    coreMod = "appeng.transformer.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 {
@@ -96,20 +90,34 @@ sourceSets {
 
         resources {
             srcDir "src/main/resources/"
-            include "assets/appliedenergistics2/recipes/*.recipe",
+            include "assets/appliedenergistics2/recipes/**/*.recipe",
+                    "assets/appliedenergistics2/recipes/README.html",
                     "assets/appliedenergistics2/lang/*.lang",
-                    "assets/appliedenergistics2/textures/blocks/*",
+                    "assets/appliedenergistics2/blockstates/**/*.json",
-                    "assets/appliedenergistics2/textures/guis/*",
+                    "assets/appliedenergistics2/models/**/*.json",
-                    "assets/appliedenergistics2/textures/models/*",
+                    "assets/appliedenergistics2/textures/**/*.png",
-                    "assets/appliedenergistics2/textures/items/*"
+                    "assets/appliedenergistics2/textures/**/*.mcmeta",
+                    "assets/appliedenergistics2/meta/*",
+                    "mcmod.info",
+                    "pack.mcmeta"
         }
     }
 }
 
-processResources {
+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'
     }
 }

build.properties

@@ -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.1291
-
-#########################################################
-# APIs used for development                             #
-#########################################################
-cb_minecraft_version=1.7.10
-fmp_version=1.1.1.324
-code_chicken_lib_version=1.1.3.127
-code_chicken_core_version=1.0.4.35
-nei_version=1.0.4.90
-bc_version=6.4.3
-
-#########################################################
-# 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.7.10-8.0.1.198
-api_mfr_version=1
-api_railcraft_version=1
-api_rblocks_version=1
-api_rf_version=2
-api_rotarycraft_version=V5c
-api_waila_version=1.5.10_1.7.10

codeformat/consistent.importorder

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

codeformat/eclipse-code-format.xml

@@ -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_for" value="do not 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_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>

codeformat/eclipse.importorder

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

gradle.properties

@@ -0,0 +1,24 @@
+aeversion=rv4
+aechannel=alpha
+aebuild=0
+aegroup=appeng
+aebasename=appliedenergistics2
+
+#########################################################
+# Versions                                              #
+#########################################################
+minecraft_version=1.10.2
+mcp_mappings=snapshot_20161018
+forge_version=12.18.2.2104
+
+#########################################################
+# Installable                                           #
+#########################################################
+waila_version=1.7.0-B3_1.9.4
+
+#########################################################
+# Provided APIs                                         #
+#########################################################
+jei_version=3.12.7.312
+tesla_version=1.10.2-1.2.1.49
+ic2_version=2.6.96-ex110

gradle/scripts/artifacts.gradle

@@ -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) {
+    from sourceSets.main.output
-        include "appeng/api/**"
+    include "appeng/api/**"
-    }
 
     classifier = 'api'
-
 }
 
 artifacts {
-    archives devJar
     archives apiJar
     archives javadocJar
+    archives sourceJar
 }

gradle/scripts/autoinstallruntime.gradle

@@ -1,12 +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

gradle/scripts/dependencies.gradle

@@ -16,49 +16,48 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-
-
 repositories {
+    mavenLocal()
 
     maven {
-        name 'CB Maven FS'
+        name "Mobius"
-        url "http://chickenbones.net/maven/"
-    }
-
-    maven {
-        name "Waila Mobius Repo"
         url "http://mobiusstrip.eu/maven"
     }
 
     maven {
-        name "FireBall API Depot"
+        name = "JEI repo"
-        url "http://dl.tsr.me/artifactory/libs-release-local"
+        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"
     }
 }
 
-dependencies {
+configurations {
-
+    mods
-    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"
+dependencies {
-    compile "codechicken:NotEnoughItems:${config.cb_minecraft_version}-${config.nei_version}:dev"
+    // installable runtime dependencies
-
+    mods "mcp.mobius.waila:Waila:${waila_version}"
-    compile "com.mod-buildcraft:buildcraft:${config.bc_version}:dev"
+    mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
-
+
-    // self compiled APIs
+    // compile against provided APIs
-    compile(group: 'api', name: 'betterstorage', version: "${config.api_betterstorage_version}")
+    compileOnly "mezz.jei:jei_${minecraft_version}:${jei_version}:api"
-    compile(group: 'api', name: 'coloredlightscore', version: "${config.api_coloredlightscore_version}")
+    compileOnly "mcp.mobius.waila:Waila:${waila_version}"
-    compile(group: 'api', name: 'craftguide', version: "${config.api_craftguide_version}")
+    compileOnly "net.darkhax.tesla:Tesla:${tesla_version}"
-    compile(group: 'api', name: 'ic2', version: "${config.api_ic2_version}")
+    compileOnly "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
-    compile(group: 'api', name: 'immibis', version: "${config.api_immibis_version}")
+
-    compile(group: 'api', name: 'invtweaks', version: "${config.api_invtweaks_version}")
+    // at runtime, use the full JEI jar
-    compile(group: 'api', name: 'mekanism', version: "${config.api_mekansim_version}", classifier: 'api')
+    runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
-    compile(group: 'api', name: 'mfr', version: "${config.api_mfr_version}")
+
-    compile(group: 'api', name: 'railcraft', version: "${config.api_railcraft_version}")
+    // unit test dependencies
-    compile(group: 'api', name: 'rblocks', version: "${config.api_rblocks_version}")
+    testCompile "junit:junit:4.12"
-    compile(group: 'api', name: 'rf', version: "${config.api_rf_version}")
-    compile "appeng:Waila:${config.api_waila_version}:api"
-    compile "appeng:RotaryCraft:${config.api_rotarycraft_version}:api"
-
-    testCompile "junit:junit:4.11"
 }

gradle/scripts/integration.gradle

@@ -16,19 +16,14 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.integration;
+// Should be provided by ForgeGradle, some idea user should confirm it.
+apply plugin: 'idea'
 
-public abstract class BaseModule implements IIntegrationModule {
+idea {
-
+    module {
-	protected void testClassExistence( Class<?> clz )
+        inheritOutputDirs = true
-	{
-		 clz.isInstance(this);
-	}
-
-	@Override
-	public abstract void init() throws Throwable;
-
-	@Override
-	public abstract  void postInit();
 
+        // excludes integration due to not being available upon port
+        excludeDirs += file('src/main/java/appeng/parts/layers/')
+    }
 }

gradle/scripts/optional.gradle

@@ -0,0 +1,43 @@
+/*
+ * 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")
+}
+
+// IC²
+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")
+}

gradle/scripts/propertyloader.gradle

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

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -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.
+# Attempt to set APP_HOME
-DEFAULT_JVM_OPTS=""
+# 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`

gradlew.bat

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

src/api/java/appeng/api/AEApi.java

@@ -24,7 +24,9 @@
 package appeng.api;
 
 
-import appeng.api.exceptions.CouldNotAccessCoreAPI;
+import java.lang.reflect.Field;
+
+import appeng.api.exceptions.CoreInaccessibleException;
 
 
 /**
@@ -35,34 +37,42 @@ import appeng.api.exceptions.CouldNotAccessCoreAPI;
 public enum AEApi
 {
 	;
-	private static final String CORE_API_PATH = "appeng.core.Api";
-	private static final String API_INSTANCE_NAME = "INSTANCE";
 
-	private static IAppEngApi instance = null;
+	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}
-	 *
-	 * @throws CouldNotAccessCoreAPI if the INSTANCE could not be retrieved
 	 */
 	public static IAppEngApi instance()
-
 	{
-		if ( instance == null )
+		return HELD_API;
-		{
-			try
-			{
-				Class<?> c = Class.forName( CORE_API_PATH );
-				instance = (IAppEngApi) c.getField( API_INSTANCE_NAME ).get( c );
-			}
-			catch ( Throwable e )
-			{
-				throw new CouldNotAccessCoreAPI( "Either core API was not in " + CORE_API_PATH + " or " + API_INSTANCE_NAME + " was not accessible" );
-			}
-		}
-
-		return instance;
 	}
+
 }

src/api/java/appeng/api/AEInjectable.java

@@ -16,21 +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 java.lang.annotation.ElementType;
-
+import java.lang.annotation.Retention;
-import net.minecraft.block.Block;
+import java.lang.annotation.RetentionPolicy;
-
+import java.lang.annotation.Target;
-import appeng.block.AEBaseStairBlock;
-import appeng.core.features.AEFeature;
 
 
-public class QuartzPillarStairBlock extends AEBaseStairBlock
+/**
-{
+ * Marks interfaces that can be used as injectable constructor arguments for an {@link AEPlugin}.
-	public QuartzPillarStairBlock( Block block )
+ */
-	{
+@Target( ElementType.TYPE )
-		super( block, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
+@Retention( RetentionPolicy.RUNTIME )
-	}
+public @interface AEInjectable
-}
+{}

src/api/java/appeng/api/AEPlugin.java

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

src/api/java/appeng/api/IAppEngApi.java

@@ -24,11 +24,7 @@
 package appeng.api;
 
 
-import appeng.api.definitions.Blocks;
 import appeng.api.definitions.IDefinitions;
-import appeng.api.definitions.Items;
-import appeng.api.definitions.Materials;
-import appeng.api.definitions.Parts;
 import appeng.api.exceptions.FailedConnection;
 import appeng.api.features.IRegistryContainer;
 import appeng.api.networking.IGridBlock;
@@ -37,10 +33,9 @@ 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.
 	 */
@@ -56,38 +51,6 @@ public interface IAppEngApi
 	 */
 	IPartHelper partHelper();
 
-	/**
-	 * @return an accessible list of all of AE's Items
-	 *
-	 * @deprecated use {@link appeng.api.definitions.IDefinitions#items()}
-	 */
-	@Deprecated
-	Items items();
-
-	/**
-	 * @return an accessible list of all of AE's materials; materials are items
-	 *
-	 * @deprecated use {@link appeng.api.definitions.IDefinitions#materials()}
-	 */
-	@Deprecated
-	Materials materials();
-
-	/**
-	 * @return an accessible list of all of AE's blocks
-	 *
-	 * @deprecated use {@link appeng.api.definitions.IDefinitions#blocks()}
-	 */
-	@Deprecated
-	Blocks blocks();
-
-	/**
-	 * @return an accessible list of all of AE's parts, parts are items
-	 *
-	 * @deprecated use {@link appeng.api.definitions.IDefinitions#parts()}
-	 */
-	@Deprecated
-	Parts parts();
-
 	/**
 	 * @return an accessible list of all AE definitions
 	 */

src/api/java/appeng/api/client/BakingPipeline.java

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

src/api/java/appeng/api/client/BakingPipelineElement.java

@@ -21,20 +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 java.util.List;
 
-import appeng.api.networking.security.BaseActionSource;
+import net.minecraft.block.state.IBlockState;
-import appeng.api.storage.IStorageMonitorable;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.util.EnumFacing;
 
 
-/**
+public interface BakingPipelineElement<F, T>
- * Implemented on inventories that can share their inventories with other networks, best example, ME Interface.
- */
-public interface ITileStorageMonitorable
 {
 
-	IStorageMonitorable getMonitorable( ForgeDirection side, BaseActionSource src );
+	public List<T> pipe( List<F> elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand );
+
 }

src/api/java/appeng/api/config/AccessRestriction.java

@@ -30,33 +30,24 @@ public enum AccessRestriction
 
 	private final int permissionBit;
 
-	AccessRestriction( int v ) {
+	AccessRestriction( final int v )
+	{
 		this.permissionBit = v;
 	}
 
-	public boolean hasPermission( AccessRestriction ar )
+	public boolean hasPermission( final AccessRestriction ar )
 	{
 		return ( this.permissionBit & ar.permissionBit ) == ar.permissionBit;
 	}
 
-	public AccessRestriction restrictPermissions( AccessRestriction ar )
+	public AccessRestriction restrictPermissions( final AccessRestriction ar )
 	{
 		return this.getPermByBit( this.permissionBit & ar.permissionBit );
 	}
 
-	public AccessRestriction addPermissions( AccessRestriction ar )
+	private AccessRestriction getPermByBit( final int bit )
 	{
-		return this.getPermByBit( this.permissionBit | ar.permissionBit );
+		switch( bit )
-	}
-
-	public AccessRestriction removePermissions( AccessRestriction ar )
-	{
-		return this.getPermByBit( this.permissionBit & ( ~ar.permissionBit ) );
-	}
-
-	private AccessRestriction getPermByBit( int bit )
-	{
-		switch ( bit )
 		{
 			default:
 			case 0:
@@ -69,4 +60,14 @@ public enum AccessRestriction
 				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 ) );
+	}
 }

src/api/java/appeng/api/config/FuzzyMode.java

@@ -27,17 +27,22 @@ 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;
+	public final float breakPoint;
-	final public float percentage;
+	public final float percentage;
 
-	FuzzyMode( float p ) {
+	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) ( ( this.percentage * maxDamage ) / 100.0f );
 	}

src/api/java/appeng/api/config/ItemSubstitution.java

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

src/api/java/appeng/api/config/PowerMultiplier.java

@@ -33,12 +33,12 @@ public enum PowerMultiplier
 	 */
 	public double multiplier = 1.0;
 
-	public double multiply( double in )
+	public double multiply( final double in )
 	{
 		return in * this.multiplier;
 	}
 
-	public double divide( double in )
+	public double divide( final double in )
 	{
 		return in / this.multiplier;
 	}

src/api/java/appeng/api/config/PowerUnits.java

@@ -28,23 +28,21 @@ public enum PowerUnits
 {
 	AE( "gui.appliedenergistics2.units.appliedenergstics" ), // Native Units - AE Energy
 	EU( "gui.appliedenergistics2.units.ic2" ), // IndustrialCraft 2 - Energy Units
-	WA( "gui.appliedenergistics2.units.rotarycraft" ), // RotaryCraft - Watts
+	RF( "gui.appliedenergistics2.units.rf" ); // RF - Redstone Flux
-	RF( "gui.appliedenergistics2.units.thermalexpansion" ), // ThermalExpansion - Redstone Flux
-	MK( "gui.appliedenergistics2.units.mekanism" ); // Mekanism - Joules
-
-	PowerUnits( String un ) {
-		this.unlocalizedName = un;
-	}
 
+	/**
+	 * 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;
 
-	/**
+	PowerUnits( final String un )
-	 * unlocalized name for the power unit.
+	{
-	 */
+		this.unlocalizedName = un;
-	final public String unlocalizedName;
+	}
 
 	/**
 	 * do power conversion using AE's conversion rates.
@@ -54,11 +52,11 @@ public enum PowerUnits
 	 * 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
+	 * @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 * this.conversionRatio ) / target.conversionRatio;
 	}

src/api/java/appeng/api/config/SchedulingMode.java

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

src/api/java/appeng/api/config/SearchBoxMode.java

@@ -26,5 +26,5 @@ package appeng.api.config;
 
 public enum SearchBoxMode
 {
-	AUTOSEARCH, MANUAL_SEARCH, NEI_AUTOSEARCH, NEI_MANUAL_SEARCH
+	AUTOSEARCH, MANUAL_SEARCH, JEI_AUTOSEARCH, JEI_MANUAL_SEARCH
 }

src/api/java/appeng/api/config/SecurityPermissions.java

@@ -57,7 +57,7 @@ public enum SecurityPermissions
 	 */
 	SECURITY;
 
-	final private String unlocalizedName = "gui.appliedenergistics2.security." + this.name().toLowerCase();
+	private final String unlocalizedName = "gui.appliedenergistics2.security." + this.name().toLowerCase();
 
 	public String getUnlocalizedName()
 	{

src/api/java/appeng/api/config/Settings.java

@@ -26,6 +26,8 @@ package appeng.api.config;
 
 import java.util.EnumSet;
 
+import javax.annotation.Nonnull;
+
 
 public enum Settings
 {
@@ -53,20 +55,25 @@ public enum Settings
 
 	INTERFACE_TERMINAL( EnumSet.of( YesNo.YES, YesNo.NO ) ), CRAFT_VIA_REDSTONE( EnumSet.of( YesNo.YES, YesNo.NO ) ),
 
-	STORAGE_FILTER( EnumSet.allOf( StorageFilter.class ) ), PLACE_BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) );
+	STORAGE_FILTER( EnumSet.allOf( StorageFilter.class ) ), PLACE_BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ),
 
-	private final EnumSet values;
+	SCHEDULING_MODE( EnumSet.allOf( SchedulingMode.class ) );
 
-	public EnumSet getPossibleValues()
+	private final EnumSet<? extends Enum<?>> values;
+
+	Settings( @Nonnull final EnumSet<? extends Enum<?>> possibleOptions )
+	{
+		if( possibleOptions.isEmpty() )
+		{
+			throw new IllegalArgumentException( "Tried to instantiate an empty setting." );
+		}
+
+		this.values = possibleOptions;
+	}
+
+	public EnumSet<? extends Enum<?>> getPossibleValues()
 	{
 		return this.values;
 	}
 
-	Settings( EnumSet set )
-	{
-		if ( set == null || set.isEmpty() )
-			throw new RuntimeException( "Invalid configuration." );
-		this.values = set;
-	}
-
 }

src/api/java/appeng/api/config/Upgrades.java

@@ -29,10 +29,7 @@ import java.util.Map;
 
 import net.minecraft.item.ItemStack;
 
-import com.google.common.base.Optional;
-
 import appeng.api.definitions.IItemDefinition;
-import appeng.api.util.AEItemDefinition;
 
 
 public enum Upgrades
@@ -47,19 +44,10 @@ public enum Upgrades
 	 */
 	FUZZY( 1 ), SPEED( 1 ), INVERTER( 1 );
 
-	/**
+	private final int tier;
-	 * @deprecated use {@link Upgrades#getTier()}
+	private final Map<ItemStack, Integer> supportedMax = new HashMap<>();
-	 */
-	@Deprecated
-	public final int tier;
 
-	/**
+	Upgrades( final int tier )
-	 * @deprecated use {@link Upgrades#getSupported()}
-	 */
-	@Deprecated
-	private final Map<ItemStack, Integer> supportedMax = new HashMap<ItemStack, Integer>();
-
-	Upgrades( int tier )
 	{
 		this.tier = tier;
 	}
@@ -78,35 +66,9 @@ public enum Upgrades
 	 * @param item machine in which this upgrade can be installed
 	 * @param maxSupported amount how many upgrades can be installed
 	 */
-	public void registerItem( IItemDefinition item, int maxSupported )
+	public void registerItem( final IItemDefinition item, final int maxSupported )
 	{
-		final Optional<ItemStack> maybeStack = item.maybeStack( 1 );
+		item.maybeStack( 1 ).ifPresent( is -> this.registerItem( is, maxSupported ) );
-		for ( ItemStack stack : maybeStack.asSet() )
-		{
-			this.registerItem( stack, 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
-	 *
-	 * @deprecated use {@link Upgrades#registerItem(IItemDefinition, int)}
-	 */
-	@Deprecated
-	public void registerItem( AEItemDefinition item, int maxSupported )
-	{
-		if ( item != null )
-		{
-			final ItemStack stack = item.stack( 1 );
-
-			if ( stack != null )
-			{
-				this.registerItem( stack, maxSupported );
-			}
-		}
 	}
 
 	/**
@@ -115,9 +77,9 @@ public enum Upgrades
 	 * @param stack machine in which this upgrade can be installed
 	 * @param maxSupported amount how many upgrades can be installed
 	 */
-	public void registerItem( ItemStack stack, int maxSupported )
+	public void registerItem( final ItemStack stack, final int maxSupported )
 	{
-		if ( stack != null )
+		if( stack != null )
 		{
 			this.supportedMax.put( stack, maxSupported );
 		}

src/api/java/appeng/api/definitions/Blocks.java

@@ -1,131 +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;
-
-
-/**
- * @deprecated use {@link IBlocks} now
- */
-@Deprecated
-public class Blocks
-{
-	public AEItemDefinition blockQuartzOre;
-
-	public AEItemDefinition blockQuartzOreCharged;
-
-	public AEItemDefinition blockMatrixFrame;
-
-	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;
-
-	public AEItemDefinition blockGrindStone;
-
-	public AEItemDefinition blockCrankHandle;
-
-	public AEItemDefinition blockInscriber;
-
-	public AEItemDefinition blockWireless;
-
-	public AEItemDefinition blockCharger;
-
-	public AEItemDefinition blockTinyTNT;
-
-	public AEItemDefinition blockSecurity;
-
-	public AEItemDefinition blockQuantumRing;
-
-	public AEItemDefinition blockQuantumLink;
-
-	public AEItemDefinition blockSpatialPylon;
-
-	public AEItemDefinition blockSpatialIOPort;
-
-	public AEItemDefinition blockMultiPart;
-
-	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;
-
-	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;
-}

src/api/java/appeng/api/definitions/IBlockDefinition.java

@@ -1,10 +1,30 @@
+/*
+ * 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 com.google.common.base.Optional;
+import net.minecraft.world.IBlockAccess;
 
 
 public interface IBlockDefinition extends IItemDefinition
@@ -18,4 +38,14 @@ public interface IBlockDefinition extends IItemDefinition
 	 * @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 );
 }

src/api/java/appeng/api/definitions/IBlocks.java

@@ -20,6 +20,7 @@
  * 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;
 
 
@@ -40,58 +41,82 @@ public interface IBlocks
 	/*
 	 * decorative
 	 */
-	IBlockDefinition quartz();
+	IBlockDefinition quartzBlock();
 
 	IBlockDefinition quartzPillar();
 
-	IBlockDefinition quartzChiseled();
+	IBlockDefinition chiseledQuartzBlock();
 
 	IBlockDefinition quartzGlass();
 
 	IBlockDefinition quartzVibrantGlass();
 
-	IBlockDefinition quartzTorch();
+	IBlockDefinition quartzFixture();
 
-	IBlockDefinition fluix();
+	IBlockDefinition fluixBlock();
 
-	IBlockDefinition skyStone();
+	IBlockDefinition skyStoneBlock();
 
-	IBlockDefinition skyChest();
+	IBlockDefinition smoothSkyStoneBlock();
+
+	IBlockDefinition skyStoneBrick();
+
+	IBlockDefinition skyStoneSmallBrick();
+
+	IBlockDefinition skyStoneChest();
+
+	IBlockDefinition smoothSkyStoneChest();
 
 	IBlockDefinition skyCompass();
 
-	IBlockDefinition skyStoneStair();
+	IBlockDefinition skyStoneStairs();
 
-	IBlockDefinition skyStoneBlockStair();
+	IBlockDefinition smoothSkyStoneStairs();
 
-	IBlockDefinition skyStoneBrickStair();
+	IBlockDefinition skyStoneBrickStairs();
 
-	IBlockDefinition skyStoneSmallBrickStair();
+	IBlockDefinition skyStoneSmallBrickStairs();
 
-	IBlockDefinition fluixStair();
+	IBlockDefinition fluixStairs();
 
-	IBlockDefinition quartzStair();
+	IBlockDefinition quartzStairs();
 
-	IBlockDefinition chiseledQuartzStair();
+	IBlockDefinition chiseledQuartzStairs();
 
-	IBlockDefinition quartzPillarStair();
+	IBlockDefinition quartzPillarStairs();
+
+	IBlockDefinition skyStoneSlab();
+
+	IBlockDefinition smoothSkyStoneSlab();
+
+	IBlockDefinition skyStoneBrickSlab();
+
+	IBlockDefinition skyStoneSmallBrickSlab();
+
+	IBlockDefinition fluixSlab();
+
+	IBlockDefinition quartzSlab();
+
+	IBlockDefinition chiseledQuartzSlab();
+
+	IBlockDefinition quartzPillarSlab();
 
 	/*
 	 * misc
 	 */
-	ITileDefinition grindStone();
+	ITileDefinition grindstone();
 
-	ITileDefinition crankHandle();
+	ITileDefinition crank();
 
 	ITileDefinition inscriber();
 
-	ITileDefinition wireless();
+	ITileDefinition wirelessAccessPoint();
 
 	ITileDefinition charger();
 
-	ITileDefinition tinyTNT();
+	IBlockDefinition tinyTNT();
 
-	ITileDefinition security();
+	ITileDefinition securityStation();
 
 	/*
 	 * quantum Network Bridge

src/api/java/appeng/api/definitions/IComparableDefinition.java

@@ -1,12 +1,33 @@
+/*
+ * 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 net.minecraft.item.ItemStack;
-import net.minecraft.world.IBlockAccess;
 
 
 /**
  * Interface to compare a definition with an itemstack or a block
+ *
+ * @author thatsIch
+ * @version rv2
+ * @since rv2
  */
 public interface IComparableDefinition
 {
@@ -14,19 +35,8 @@ public interface IComparableDefinition
 	 * Compare {@link ItemStack} with this
 	 *
 	 * @param comparableStack compared item
+	 *
 	 * @return true if the item stack is a matching item.
 	 */
 	boolean isSameAs( ItemStack comparableStack );
-
-	/**
-	 * 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 isSameAs( IBlockAccess world, int x, int y, int z );
 }

src/api/java/appeng/api/definitions/IDefinitions.java

@@ -20,6 +20,7 @@
  * 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;
 
 

src/api/java/appeng/api/definitions/IItemDefinition.java

@@ -1,14 +1,46 @@
+/*
+ * The MIT License (MIT)
+ *
+ * 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
+ * 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 java.util.Optional;
+
+import javax.annotation.Nonnull;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import com.google.common.base.Optional;
-
 
 public interface IItemDefinition extends IComparableDefinition
 {
+	/**
+	 * @return the unique name of the definition which will be used to register the underlying structure. Will never be
+	 * null
+	 */
+	@Nonnull
+	String identifier();
+
 	/**
 	 * @return the {@link Item} Implementation if applicable
 	 */
@@ -17,5 +49,10 @@ public interface IItemDefinition extends IComparableDefinition
 	/**
 	 * @return an {@link ItemStack} with specified quantity of this item.
 	 */
-	Optional<ItemStack> maybeStack(int stackSize);
+	Optional<ItemStack> maybeStack( int stackSize );
+
+	/**
+	 * @return <tt>true</tt> if definition is enabled
+	 */
+	boolean isEnabled();
 }

src/api/java/appeng/api/definitions/IItems.java

@@ -20,6 +20,7 @@
  * 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;
 
 

src/api/java/appeng/api/definitions/IMaterials.java

@@ -20,6 +20,7 @@
  * 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;
 
 
@@ -122,7 +123,7 @@ public interface IMaterials
 
 	IItemDefinition woodenGear();
 
-	IItemDefinition wireless();
+	IItemDefinition wirelessReceiver();
 
 	IItemDefinition wirelessBooster();
 

src/api/java/appeng/api/definitions/IParts.java

@@ -66,6 +66,8 @@ public interface IParts
 
 	IItemDefinition annihilationPlane();
 
+	IItemDefinition identityAnnihilationPlane();
+
 	IItemDefinition formationPlane();
 
 	IItemDefinition p2PTunnelME();
@@ -76,12 +78,14 @@ public interface IParts
 
 	IItemDefinition p2PTunnelLiquids();
 
-	IItemDefinition p2PTunnelEU();
+	// IItemDefinition p2PTunnelEU();
 
-	IItemDefinition p2PTunnelRF();
+	// IItemDefinition p2PTunnelRF();
 
 	IItemDefinition p2PTunnelLight();
 
+	// IItemDefinition p2PTunnelOpenComputers();
+
 	IItemDefinition cableAnchor();
 
 	IItemDefinition monitor();

src/api/java/appeng/api/definitions/ITileDefinition.java

@@ -1,9 +1,27 @@
+/*
+ * 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 net.minecraft.tileentity.TileEntity;
+import java.util.Optional;
 
-import com.google.common.base.Optional;
+import net.minecraft.tileentity.TileEntity;
 
 
 public interface ITileDefinition extends IBlockDefinition

src/api/java/appeng/api/definitions/Items.java

@@ -1,110 +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;
-
-
-/**
- * @deprecated use {@link IItems}
- */
-@Deprecated
-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;
-
-	public AEItemDefinition itemEncodedPattern;
-
-	public AEItemDefinition itemColorApplicator;
-
-	public AEColoredItemDefinition itemPaintBall;
-
-	public AEColoredItemDefinition itemLumenPaintBall;
-}

src/api/java/appeng/api/definitions/Materials.java

@@ -1,143 +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;
-
-
-/**
- * @deprecated use {@link IMaterials}
- */
-@Deprecated
-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;
-}

src/api/java/appeng/api/definitions/Parts.java

@@ -1,106 +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;
-
-
-/**
- * @deprecated use {@link IParts}
- */
-@Deprecated
-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 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;
-}

src/api/java/appeng/api/events/LocatableEventAnnounce.java

@@ -24,7 +24,7 @@
 package appeng.api.events;
 
 
-import cpw.mods.fml.common.eventhandler.Event;
+import net.minecraftforge.fml.common.eventhandler.Event;
 
 import appeng.api.features.ILocatable;
 
@@ -37,19 +37,25 @@ import appeng.api.features.ILocatable;
 public class LocatableEventAnnounce extends Event
 {
 
-	public enum LocatableEvent
+	public final ILocatable target;
-	{
+	public final LocatableEvent change;
-		Register, // Adds the locatable to the registry
-		Unregister // Removes the locatable from the registry
-	}
 
-
+	public LocatableEventAnnounce( final ILocatable o, final LocatableEvent ev )
-	final public ILocatable target;
-	final public LocatableEvent change;
-
-	public LocatableEventAnnounce( ILocatable o, LocatableEvent ev )
 	{
 		this.target = o;
 		this.change = ev;
 	}
+
+	public enum LocatableEvent
+	{
+		/**
+		 * Adds the locatable to the registry
+		 */
+		REGISTER,
+
+		/**
+		 * Removes the locatable from the registry
+		 */
+		UNREGISTER
+	}
 }

src/api/java/appeng/api/exceptions/AppEngException.java

@@ -29,7 +29,7 @@ public class AppEngException extends Exception
 
 	private static final long serialVersionUID = -9051434206368465494L;
 
-	public AppEngException( String t )
+	public AppEngException( final String t )
 	{
 		super( t );
 	}

src/api/java/appeng/api/exceptions/CoreInaccessibleException.java

@@ -16,16 +16,13 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.integration.abstraction;
+package appeng.api.exceptions;
 
-import net.minecraft.client.renderer.entity.RenderItem;
-import net.minecraft.inventory.Slot;
 
-public interface INEI
+public class CoreInaccessibleException extends RuntimeException
 {
-
+	public CoreInaccessibleException( final String message )
-	void drawSlot(Slot s);
+	{
-
+		super( message );
-	RenderItem setItemRender(RenderItem renderItem);
+	}
-
 }

src/api/java/appeng/api/exceptions/CouldNotAccessCoreAPI.java

@@ -1,10 +0,0 @@
-package appeng.api.exceptions;
-
-
-public class CouldNotAccessCoreAPI extends RuntimeException
-{
-	public CouldNotAccessCoreAPI( String message )
-	{
-		super( message );
-	}
-}

src/api/java/appeng/api/exceptions/ExistingConnectionException.java

@@ -21,37 +21,36 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package appeng.api.storage;
+package appeng.api.exceptions;
 
 
-import net.minecraft.tileentity.TileEntity;
+import appeng.api.networking.IGridNode;
-import net.minecraftforge.common.util.ForgeDirection;
 
-import appeng.api.IAppEngApi;
-import appeng.api.networking.security.BaseActionSource;
 
 /**
- * A Registry of External Storage handlers.
+ * Exception occurred because of an already existing connection between the two {@link IGridNode}s
  *
- * Do not implement obtain via {@link IAppEngApi}.registries().getExternalStorageRegistry()
+ * Intended to signal an internal exception and not intended to be thrown by
+ * any 3rd party module.
+ *
+ * @author yueh
+ * @version rv3
+ * @since rv3
  */
-public interface IExternalStorageRegistry
+public class ExistingConnectionException extends FailedConnection
 {
 
-	/**
+	private static final long serialVersionUID = 2975450379720353182L;
-	 * A registry for StorageBus interactions
+	private static final String DEFAULT_MESSAGE = "Connection between both nodes already exists.";
-	 *
-	 * @param esh storage handler
-	 */
-	void addExternalStorageInterface(IExternalStorageHandler esh);
 
-	/**
+	public ExistingConnectionException()
-	 * @param te tile entity
+	{
-	 * @param opposite direction
+		super( DEFAULT_MESSAGE );
-	 * @param channel channel
+	}
-	 * @param mySrc source
+
-	 * @return the handler for a given tile / forge direction
+	public ExistingConnectionException( String message )
-	 */
+	{
-	IExternalStorageHandler getHandler(TileEntity te, ForgeDirection opposite, StorageChannel channel, BaseActionSource mySrc);
+		super( message );
+	}
 
 }

src/api/java/appeng/api/exceptions/FailedConnection.java

@@ -24,6 +24,22 @@
 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
 {
 
@@ -32,4 +48,9 @@ public class FailedConnection extends Exception
 	public FailedConnection()
 	{
 	}
+
+	public FailedConnection( String message )
+	{
+		super( message );
+	}
 }

src/api/java/appeng/api/exceptions/MissingDefinition.java

@@ -1,9 +1,27 @@
+/*
+ * 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( String message )
+	public MissingDefinition( final String message )
 	{
 		super( message );
 	}

src/api/java/appeng/api/exceptions/MissingIngredientError.java

@@ -29,7 +29,7 @@ public class MissingIngredientError extends Exception
 
 	private static final long serialVersionUID = -998858343831371697L;
 
-	public MissingIngredientError( String n )
+	public MissingIngredientError( final String n )
 	{
 		super( n );
 	}

src/api/java/appeng/api/exceptions/ModNotInstalled.java

@@ -29,7 +29,7 @@ public class ModNotInstalled extends Exception
 
 	private static final long serialVersionUID = -9052435206368425494L;
 
-	public ModNotInstalled( String t )
+	public ModNotInstalled( final String t )
 	{
 		super( t );
 	}

src/api/java/appeng/api/exceptions/NullNodeConnectionException.java

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

src/api/java/appeng/api/exceptions/RecipeError.java

@@ -29,7 +29,7 @@ public class RecipeError extends Exception
 
 	private static final long serialVersionUID = -6602870588617670262L;
 
-	public RecipeError( String n )
+	public RecipeError( final String n )
 	{
 		super( n );
 	}

src/api/java/appeng/api/exceptions/RegistrationError.java

@@ -29,7 +29,7 @@ public class RegistrationError extends Exception
 
 	private static final long serialVersionUID = -6602870588617670263L;
 
-	public RegistrationError( String n )
+	public RegistrationError( final String n )
 	{
 		super( n );
 	}

src/api/java/appeng/api/exceptions/SecurityConnectionException.java

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

src/api/java/appeng/api/features/IGrinderEntry.java

@@ -54,6 +54,13 @@ public interface IGrinderEntry
 	 */
 	ItemStack getOutput();
 
+	/**
+	 * allows you to change the output.
+	 *
+	 * @param output output item
+	 */
+	void setOutput( ItemStack output );
+
 	/**
 	 * gets the current output
 	 *
@@ -68,13 +75,6 @@ public interface IGrinderEntry
 	 */
 	ItemStack getSecondOptionalOutput();
 
-	/**
-	 * allows you to change the output.
-	 *
-	 * @param output output item
-	 */
-	void setOutput( ItemStack output );
-
 	/**
 	 * stack, and 0.0-1.0 chance that it will be generated.
 	 *

src/api/java/appeng/api/features/IGrinderRegistry.java

@@ -57,8 +57,8 @@ public interface IGrinderRegistry
 	 * @param in input
 	 * @param out output
 	 * @param optional optional output
-	 * @param chance   chance to get the optional output within 0.0 - 1.0
+	 * @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
+	 * @param turns amount of turns to turn the input into the outputs
 	 */
 	void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, int turns );
 
@@ -70,8 +70,8 @@ public interface IGrinderRegistry
 	 * @param optional optional output
 	 * @param chance chance to get the optional output within 0.0 - 1.0
 	 * @param optional2 second optional output
-	 * @param chance2   chance to get the second optional output within 0.0 - 1.0
+	 * @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 outputs
 	 */
 	void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, ItemStack optional2, float chance2, int turns );
 

src/api/java/appeng/api/features/IInscriberRecipe.java

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

src/api/java/appeng/api/features/IInscriberRecipeBuilder.java

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

src/api/java/appeng/api/features/IInscriberRegistry.java

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

src/api/java/appeng/api/features/ILocatableRegistry.java

@@ -29,18 +29,6 @@ package appeng.api.features;
  */
 public interface ILocatableRegistry
 {
-	/**
-	 * Attempts to find the object with the serial specified, if it can it
-	 * returns the object.
-	 *
-	 * @param serial serial
-	 *
-	 * @return requestedObject, or null
-	 *
-	 * @deprecated use {@link ILocatableRegistry#getLocatableBy(long)}
-	 */
-	@Deprecated
-	Object findLocatableBySerial( long serial );
 
 	/**
 	 * Gets the {@link ILocatable} with the registered serial, if available

src/api/java/appeng/api/features/INetworkEncodable.java

@@ -42,12 +42,9 @@ public interface INetworkEncodable
 	/**
 	 * Encode the wireless frequency via the Controller.
 	 *
-	 * @param item
+	 * @param item the wireless terminal.
-	 *            the wireless terminal.
+	 * @param encKey the wireless encryption key.
-	 * @param encKey
+	 * @param name null for now.
-	 *            the wireless encryption key.
-	 * @param name
-	 *            null for now.
 	 */
 	void setEncryptionKey( ItemStack item, String encKey, String name );
 }

src/api/java/appeng/api/features/IP2PTunnelRegistry.java

@@ -1,7 +1,7 @@
 /*
  * 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
@@ -24,6 +24,8 @@
 package appeng.api.features;
 
 
+import javax.annotation.Nullable;
+
 import net.minecraft.item.ItemStack;
 
 import appeng.api.config.TunnelType;
@@ -39,12 +41,10 @@ public interface IP2PTunnelRegistry
 	 * Allows third parties to register items from their mod as potential
 	 * attunements for AE's P2P Tunnels
 	 *
-	 * @param trigger
+	 * @param trigger - the item which triggers attunement. Nullable, but then ignored
-	 *            - the item which triggers attunement
+	 * @param type - the type of tunnel. Nullable, but then ignored
-	 * @param type
-	 *            - the type of tunnel
 	 */
-	void addNewAttunement( ItemStack trigger, TunnelType type );
+	void addNewAttunement( @Nullable ItemStack trigger, @Nullable TunnelType type );
 
 	/**
 	 * returns null if no attunement can be found.
@@ -53,5 +53,6 @@ public interface IP2PTunnelRegistry
 	 *
 	 * @return null if no attunement can be found or attunement
 	 */
+	@Nullable
 	TunnelType getTunnelTypeByItem( ItemStack trigger );
 }

src/api/java/appeng/api/features/IPlayerRegistry.java

@@ -1,7 +1,7 @@
 /*
  * 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
@@ -24,10 +24,12 @@
 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
@@ -55,5 +57,6 @@ public interface IPlayerRegistry
 	 *
 	 * @return PlayerEntity, or null if the player could not be found.
 	 */
+	@Nullable
 	EntityPlayer findPlayer( int playerID );
 }

src/api/java/appeng/api/features/IRecipeHandlerRegistry.java

@@ -1,7 +1,7 @@
 /*
  * 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
@@ -24,11 +24,19 @@
 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
 {
 
@@ -56,6 +64,7 @@ public interface IRecipeHandlerRegistry
 	 *
 	 * @return A recipe handler by name, returns null on failure.
 	 */
+	@Nullable
 	ICraftHandler getCraftHandlerFor( String name );
 
 	/**
@@ -67,9 +76,10 @@ public interface IRecipeHandlerRegistry
 	 * resolve sub items by name.
 	 *
 	 * @param nameSpace namespace of item
-	 * @param itemName  full name of item
+	 * @param itemName full name of item
 	 *
-	 * @return ResolverResult or ResolverResultSet
+	 * @return ResolverResult or ResolverResultSet or null if could not resolve
 	 */
+	@Nullable
 	Object resolveItem( String nameSpace, String itemName );
 }

src/api/java/appeng/api/features/IRegistryContainer.java

@@ -24,12 +24,20 @@
 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
 {
 
@@ -43,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.
 	 */
@@ -69,6 +71,11 @@ public interface IRegistryContainer
 	 */
 	IGrinderRegistry grinder();
 
+	/**
+	 * Manage inscriber recipes via API
+	 */
+	IInscriberRegistry inscriber();
+
 	/**
 	 * get access to the locatable registry
 	 */
@@ -98,4 +105,9 @@ public interface IRegistryContainer
 	 * get access to the world-gen api.
 	 */
 	IWorldGen worldgen();
+
+	/**
+	 * Register your IPart models before using them.
+	 */
+	IPartModels partModels();
 }

src/api/java/appeng/api/features/IWirelessTermHandler.java

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

src/api/java/appeng/api/features/IWorldGen.java

@@ -31,11 +31,6 @@ import net.minecraft.world.WorldProvider;
 public interface IWorldGen
 {
 
-	enum WorldGenType
-	{
-		CertusQuartz, ChargedCertusQuartz, Meteorites
-	}
-
 	void disableWorldGenForProviderID( WorldGenType type, Class<? extends WorldProvider> provider );
 
 	void enableWorldGenForDimension( WorldGenType type, int dimID );
@@ -43,4 +38,9 @@ public interface IWorldGen
 	void disableWorldGenForDimension( WorldGenType type, int dimID );
 
 	boolean isWorldGenEnabled( WorldGenType type, World w );
+
+	enum WorldGenType
+	{
+		CERTUS_QUARTZ, CHARGED_CERTUS_QUARTZ, METEORITES
+	}
 }

src/api/java/appeng/api/features/InscriberProcessType.java

@@ -16,17 +16,18 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.core.features;
+package appeng.api.features;
 
 
-import appeng.api.definitions.IItemDefinition;
+public enum InscriberProcessType
-
-
-public interface IFeatureHandler
 {
-	boolean isFeatureAvailable();
+	/**
+	 * uses the optionals as catalyst
+	 */
+	INSCRIBE,
 
-	IItemDefinition getDefinition();
+	/**
-
+	 * spends the optionals
-	void register();
+	 */
+	PRESS
 }

src/api/java/appeng/api/implementations/ICraftingPatternItem.java

@@ -41,7 +41,7 @@ public interface ICraftingPatternItem
 	 * Access Details about a pattern
 	 *
 	 * @param is pattern
-	 * @param w  crafting world
+	 * @param w crafting world
 	 *
 	 * @return details of pattern
 	 */

src/api/java/appeng/api/implementations/TransitionResult.java

@@ -33,7 +33,7 @@ public class TransitionResult
 	public final boolean success;
 	public final double energyUsage;
 
-	public TransitionResult( boolean _success, double power )
+	public TransitionResult( final boolean _success, final double power )
 	{
 		this.success = _success;
 		this.energyUsage = power;

src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java

@@ -25,6 +25,7 @@ package appeng.api.implementations.guiobjects;
 
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 
@@ -35,5 +36,5 @@ import net.minecraft.world.World;
 public interface IGuiItem
 {
 
-	IGuiItemObject getGuiObject( ItemStack is, World world, int x, int y, int z );
+	IGuiItemObject getGuiObject( ItemStack is, World world, BlockPos pos );
 }

src/api/java/appeng/api/implementations/items/IAEWrench.java

@@ -26,6 +26,7 @@ package appeng.api.implementations.items;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
 
 
 /**
@@ -39,11 +40,9 @@ public interface IAEWrench
 	 * Check if the wrench can be used.
 	 *
 	 * @param player wrenching player
-	 * @param x      x pos of wrenched block
+	 * @param pos of block.
-	 * @param y      y pos of wrenched block
-	 * @param z      z pos of wrenched block
 	 *
 	 * @return true if wrench can be used
 	 */
-	boolean canWrench( ItemStack wrench, EntityPlayer player, int x, int y, int z );
+	boolean canWrench( ItemStack wrench, EntityPlayer player, BlockPos pos );
 }

src/api/java/appeng/api/implementations/items/IBiometricCard.java

@@ -26,10 +26,10 @@ package appeng.api.implementations.items;
 
 import java.util.EnumSet;
 
-import net.minecraft.item.ItemStack;
-
 import com.mojang.authlib.GameProfile;
 
+import net.minecraft.item.ItemStack;
+
 import appeng.api.config.SecurityPermissions;
 import appeng.api.features.IPlayerRegistry;
 import appeng.api.networking.security.ISecurityRegistry;
@@ -39,7 +39,7 @@ public interface IBiometricCard
 {
 
 	/**
-	 * Set the  {@link GameProfile} to null, to clear it.
+	 * Set the {@link GameProfile} to null, to clear it.
 	 */
 	void setProfile( ItemStack itemStack, GameProfile username );
 
@@ -84,8 +84,8 @@ public interface IBiometricCard
 	 * lets you handle submission of security values on the card for custom behavior.
 	 *
 	 * @param registry security registry
-	 * @param pr       player registry
+	 * @param pr player registry
-	 * @param is       card
+	 * @param is card
 	 */
 	void registerPermissions( ISecurityRegistry registry, IPlayerRegistry pr, ItemStack is );
 }

src/api/java/appeng/api/implementations/items/IMemoryCard.java

@@ -42,12 +42,10 @@ public interface IMemoryCard
 	 * localized when displayed.
 	 *
 	 * @param is item
-	 * @param SettingsName
+	 * @param SettingsName unlocalized string that represents the tile entity.
-	 *            unlocalized string that represents the tile entity.
+	 * @param data may contain a String called "tooltip" which is is a
-	 * @param data
+	 * unlocalized string displayed after the settings name, optional
-	 *            may contain a String called "tooltip" which is is a
+	 * but can be used to add details to the card for later.
-	 *            unlocalized string displayed after the settings name, optional
-	 *            but can be used to add details to the card for later.
 	 */
 	void setMemoryCardContents( ItemStack is, String SettingsName, NBTTagCompound data );
 
@@ -73,10 +71,8 @@ public interface IMemoryCard
 	/**
 	 * notify the user of a outcome related to the memory card.
 	 *
-	 * @param player
+	 * @param player that used the card.
-	 *            that used the card.
+	 * @param msg which message to send.
-	 * @param msg
-	 *            which message to send.
 	 */
 	void notifyUser( EntityPlayer player, MemoryCardMessages msg );
 }

src/api/java/appeng/api/implementations/items/IStorageCell.java

@@ -60,7 +60,7 @@ public interface IStorageCell extends ICellWorkbenchItem
 	 *
 	 * @return number of bytes
 	 */
-	int BytePerType( ItemStack cellItem );
+	int getBytesPerType( ItemStack cellItem );
 
 	/**
 	 * Must be between 1 and 63, indicates how many types you want to store on

src/api/java/appeng/api/implementations/parts/IPartCable.java

@@ -27,7 +27,7 @@ package appeng.api.implementations.parts;
 import java.util.EnumSet;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraft.util.EnumFacing;
 
 import appeng.api.networking.IGridHost;
 import appeng.api.parts.BusSupport;
@@ -35,10 +35,11 @@ import appeng.api.parts.IPart;
 import appeng.api.parts.IPartHost;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEColor;
+import appeng.api.util.AEPartLocation;
 
 
 /**
- * Implemented on the {@link IPart}s cable objects that can be placed at {@link ForgeDirection}.UNKNOWN in
+ * Implemented on the {@link IPart}s cable objects that can be placed at {@link AEPartLocation}.UNKNOWN in
  * {@link IPartHost}s
  */
 public interface IPartCable extends IPart, IGridHost
@@ -75,7 +76,7 @@ public interface IPartCable extends IPart, IGridHost
 	 *
 	 * @param sides sides of cable
 	 */
-	void setValidSides( EnumSet<ForgeDirection> sides );
+	void setValidSides( EnumSet<EnumFacing> sides );
 
 	/**
 	 * used to tests if a cable connects to neighbors visually.
@@ -84,5 +85,6 @@ public interface IPartCable extends IPart, IGridHost
 	 *
 	 * @return true if this side is currently connects to an external block.
 	 */
-	boolean isConnected( ForgeDirection side );
+	boolean isConnected( EnumFacing side );
+
 }

src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java

@@ -23,10 +23,12 @@
 
 package appeng.api.implementations.tiles;
 
+
 import appeng.api.networking.IGridHost;
 import appeng.api.storage.ICellContainer;
 import appeng.api.util.IOrientable;
 
+
 public interface IChestOrDrive extends ICellContainer, IGridHost, IOrientable
 {
 
@@ -45,9 +47,10 @@ public interface IChestOrDrive extends ICellContainer, IGridHost, IOrientable
 	 * 3 - red
 	 *
 	 * @param slot slot index
+	 *
 	 * @return status of the slot, one of the above indices.
 	 */
-	int getCellStatus(int slot);
+	int getCellStatus( int slot );
 
 	/**
 	 * @return if the device is online you should check this before providing any other information.
@@ -56,8 +59,8 @@ public interface IChestOrDrive extends ICellContainer, IGridHost, IOrientable
 
 	/**
 	 * @param slot slot index
+	 *
 	 * @return is the cell currently blinking to show activity.
 	 */
-	boolean isCellBlinking(int slot);
+	boolean isCellBlinking( int slot );
-
 }

src/api/java/appeng/api/implementations/tiles/IColorableTile.java

@@ -25,7 +25,7 @@ package appeng.api.implementations.tiles;
 
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraft.util.EnumFacing;
 
 import appeng.api.util.AEColor;
 
@@ -35,5 +35,5 @@ public interface IColorableTile
 
 	AEColor getColor();
 
-	boolean recolourBlock( ForgeDirection side, AEColor colour, EntityPlayer who );
+	boolean recolourBlock( EnumFacing side, AEColor colour, EntityPlayer who );
 }

src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java

@@ -25,10 +25,11 @@ package appeng.api.implementations.tiles;
 
 
 import net.minecraft.inventory.InventoryCrafting;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraft.util.EnumFacing;
 
 import appeng.api.networking.crafting.ICraftingPatternDetails;
 
+
 public interface ICraftingMachine
 {
 
@@ -41,7 +42,7 @@ public interface ICraftingMachine
 	 *
 	 * @return if it was accepted, all or nothing.
 	 */
-	boolean pushPattern(ICraftingPatternDetails patternDetails, InventoryCrafting table, ForgeDirection ejectionDirection);
+	boolean pushPattern( ICraftingPatternDetails patternDetails, InventoryCrafting table, EnumFacing ejectionDirection );
 
 	/**
 	 * check if the crafting machine is accepting pushes via pushPattern, if this is false, all calls to push will fail,
@@ -50,5 +51,4 @@ public interface ICraftingMachine
 	 * @return true, if pushPattern can complete, if its false push will always be false.
 	 */
 	boolean acceptsPlans();
-
 }

src/api/java/appeng/api/implementations/tiles/ICrankable.java

@@ -23,7 +23,9 @@
 
 package appeng.api.implementations.tiles;
 
-import net.minecraftforge.common.util.ForgeDirection;
+
+import net.minecraft.util.EnumFacing;
+
 
 /**
  * Crank/Crankable API,
@@ -53,6 +55,5 @@ public interface ICrankable
 	/**
 	 * @return true if the crank can attach on the given side.
 	 */
-	boolean canCrankAttach(ForgeDirection directionToCrank);
+	boolean canCrankAttach( EnumFacing directionToCrank );
-
 }

src/api/java/appeng/api/implementations/tiles/IMEChest.java

@@ -27,7 +27,7 @@ package appeng.api.implementations.tiles;
 import appeng.api.networking.energy.IEnergySource;
 
 
-public interface IMEChest extends IChestOrDrive, ITileStorageMonitorable, IEnergySource
+public interface IMEChest extends IChestOrDrive, IEnergySource
 {
 
 }

src/api/java/appeng/api/movable/IMovableHandler.java

@@ -23,9 +23,12 @@
 
 package appeng.api.movable;
 
+
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+
 public interface IMovableHandler
 {
 
@@ -35,9 +38,10 @@ public interface IMovableHandler
 	 *
 	 * @param myClass tile entity class
 	 * @param tile tile entity
+	 *
 	 * @return true if it can handle moving
 	 */
-	boolean canHandle(Class<? extends TileEntity> myClass, TileEntity tile);
+	boolean canHandle( Class<? extends TileEntity> myClass, TileEntity tile );
 
 	/**
 	 * request that the handler move the the tile from its current location to
@@ -47,21 +51,22 @@ public interface IMovableHandler
 	 * Potential Example:
 	 *
 	 * <pre>
-	 * {@code
+	 * {
-	 * Chunk c = world.getChunkFromBlockCoords( x, z ); c.setChunkBlockTileEntity( x
+	 * 	&#064;code
-	 * & 0xF, y + y, z & 0xF, tile );
+	 * 	Chunk c = world.getChunkFromBlockCoords( x, z );
+	 * 	c.setChunkBlockTileEntity( x &amp; 0xF, y + y, z &amp; 0xF, tile );
 	 *
-	 * if ( c.isChunkLoaded ) { world.addTileEntity( tile ); world.markBlockForUpdate( x,
+	 * 	if( c.isChunkLoaded )
-	 * y, z ); }
+	 * 	{
+	 * 		world.addTileEntity( tile );
+	 * 		world.markBlockForUpdate( x, y, z );
+	 * 	}
 	 * }
 	 * </pre>
 	 *
 	 * @param tile to be moved tile
 	 * @param world world of tile
-	 * @param x x coord of tile
+	 * @param newPosition the new location
-	 * @param y y coord of tile
-	 * @param z z coord of tile
 	 */
-	void moveTile(TileEntity tile, World world, int x, int y, int z);
+	void moveTile( TileEntity tile, World world, BlockPos newPosition );
-
 }

src/api/java/appeng/api/movable/IMovableRegistry.java

@@ -23,9 +23,11 @@
 
 package appeng.api.movable;
 
+
 import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
 
+
 /**
  * Used to determine if a tile is marked as movable, a block will be considered movable, if...
  *
@@ -64,7 +66,7 @@ public interface IMovableRegistry
 	 *
 	 * @param blk block
 	 */
-	void blacklistBlock(Block blk);
+	void blacklistBlock( Block blk );
 
 	/**
 	 * White list your tile entity with the registry.
@@ -74,27 +76,28 @@ public interface IMovableRegistry
 	 *
 	 * If you tile is handled with IMovableHandler or IMovableTile you do not need to white list it.
 	 */
-	void whiteListTileEntity(Class<? extends TileEntity> c);
+	void whiteListTileEntity( Class<? extends TileEntity> c );
 
 	/**
 	 * @param te to be moved tile entity
+	 *
 	 * @return true if the tile has accepted your request to move it
 	 */
-	boolean askToMove(TileEntity te);
+	boolean askToMove( TileEntity te );
 
 	/**
 	 * tells the tile you are done moving it.
 	 *
 	 * @param te moved tile entity
 	 */
-	void doneMoving(TileEntity te);
+	void doneMoving( TileEntity te );
 
 	/**
 	 * add a new handler movable handler.
 	 *
 	 * @param handler moving handler
 	 */
-	void addHandler(IMovableHandler handler);
+	void addHandler( IMovableHandler handler );
 
 	/**
 	 * handlers are used to perform movement, this allows you to override AE's internal version.
@@ -102,9 +105,10 @@ public interface IMovableRegistry
 	 * only valid after askToMove(...) = true
 	 *
 	 * @param te tile entity
+	 *
 	 * @return moving handler of tile entity
 	 */
-	IMovableHandler getHandler(TileEntity te);
+	IMovableHandler getHandler( TileEntity te );
 
 	/**
 	 * @return a copy of the default handler
@@ -113,8 +117,8 @@ public interface IMovableRegistry
 
 	/**
 	 * @param blk block
+	 *
 	 * @return true if this block is blacklisted
 	 */
-	boolean isBlacklisted(Block blk);
+	boolean isBlacklisted( Block blk );
-
 }

src/api/java/appeng/api/networking/GridFlags.java

@@ -56,7 +56,8 @@ public enum GridFlags
 	DENSE_CAPACITY,
 
 	/**
-	 * This block is part of a multiblock, used in conjunction with REQUIRE_CHANNEL, and {@link IGridMultiblock} see this
+	 * This block is part of a multiblock, used in conjunction with REQUIRE_CHANNEL, and {@link IGridMultiblock} see
+	 * this
 	 * interface for details.
 	 */
 	MULTIBLOCK,

src/api/java/appeng/api/networking/GridNotification.java

@@ -29,5 +29,5 @@ public enum GridNotification
 	/**
 	 * the visible connections for this node have changed, useful for cable.
 	 */
-	ConnectionsChanged,
+	CONNECTIONS_CHANGED,
 }

src/api/java/appeng/api/networking/IGrid.java

@@ -23,9 +23,11 @@
 
 package appeng.api.networking;
 
+
 import appeng.api.networking.events.MENetworkEvent;
 import appeng.api.util.IReadOnlyCollection;
 
+
 /**
  * Gives you access to Grid based information.
  *
@@ -38,6 +40,7 @@ public interface IGrid
 	 * Get Access to various grid modules
 	 *
 	 * @param iface face
+	 *
 	 * @return the IGridCache you requested.
 	 */
 	<C extends IGridCache> C getCache( Class<? extends IGridCache> iface );
@@ -45,8 +48,8 @@ public interface IGrid
 	/**
 	 * Post an event into the network event bus.
 	 *
-	 * @param ev
+	 * @param ev - event to post
-	 *            - event to post
+	 *
 	 * @return returns ev back to original poster
 	 */
 	MENetworkEvent postEvent( MENetworkEvent ev );
@@ -54,8 +57,8 @@ public interface IGrid
 	/**
 	 * Post an event into the network event bus, but direct it at a single node.
 	 *
-	 * @param ev
+	 * @param ev event to post
-	 *            event to post
+	 *
 	 * @return returns ev back to original poster
 	 */
 	MENetworkEvent postEventTo( IGridNode node, MENetworkEvent ev );
@@ -72,6 +75,7 @@ public interface IGrid
 	 * Get machines on the network.
 	 *
 	 * @param gridHostClass class of the grid host
+	 *
 	 * @return IMachineSet of all nodes belonging to hosts of specified class.
 	 */
 	IMachineSet getMachines( Class<? extends IGridHost> gridHostClass );
@@ -90,5 +94,4 @@ public interface IGrid
 	 * @return the node considered the pivot point of the grid.
 	 */
 	IGridNode getPivot();
-
 }

src/api/java/appeng/api/networking/IGridBlock.java

@@ -27,12 +27,13 @@ package appeng.api.networking;
 import java.util.EnumSet;
 
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraft.util.EnumFacing;
 
 import appeng.api.parts.IPart;
 import appeng.api.util.AEColor;
 import appeng.api.util.DimensionalCoord;
 
+
 /**
  * An Implementation is required to create your node for IGridHost
  *
@@ -79,7 +80,7 @@ public interface IGridBlock
 	/**
 	 * Notifies your IGridBlock that changes were made to your connections
 	 */
-	void onGridNotification(GridNotification notification);
+	void onGridNotification( GridNotification notification );
 
 	/**
 	 * Update Blocks network/connection/booting status. grid,
@@ -93,7 +94,7 @@ public interface IGridBlock
 	 * Determine which sides of the block can be connected too, only used when isWorldAccessible returns true, not used
 	 * for {@link IPart} implementations.
 	 */
-	EnumSet<ForgeDirection> getConnectableSides();
+	EnumSet<EnumFacing> getConnectableSides();
 
 	/**
 	 * @return the IGridHost for the node, this will be an IGridPart or a TileEntity generally speaking.

src/api/java/appeng/api/networking/IGridCache.java

@@ -23,14 +23,13 @@
 
 package appeng.api.networking;
 
+
 /**
- *
  * Allows you to create a network wise service, AE2 uses these for providing
  * item, spatial, and tunnel services.
  *
  * Any Class that implements this, should have a public default constructor that
  * takes a single argument of type IGrid.
- *
  */
 public interface IGridCache
 {
@@ -38,7 +37,6 @@ public interface IGridCache
 	/**
 	 * Called each tick for the network, allows you to have active network wide
 	 * behaviors.
-	 *
 	 */
 	void onUpdateTick();
 
@@ -52,7 +50,7 @@ public interface IGridCache
 	 * @param gridNode removed from that grid
 	 * @param machine to be removed machine
 	 */
-	void removeNode(IGridNode gridNode, IGridHost machine);
+	void removeNode( IGridNode gridNode, IGridHost machine );
 
 	/**
 	 * informs you cache that a machine was added to the grid.
@@ -64,7 +62,7 @@ public interface IGridCache
 	 * @param gridNode added to grid node
 	 * @param machine to be added machine
 	 */
-	void addNode(IGridNode gridNode, IGridHost machine);
+	void addNode( IGridNode gridNode, IGridHost machine );
 
 	/**
 	 * Called when a grid splits into two grids, AE will call a split as it
@@ -73,7 +71,7 @@ public interface IGridCache
 	 *
 	 * @param destinationStorage storage which receives half of old grid
 	 */
-	void onSplit(IGridStorage destinationStorage);
+	void onSplit( IGridStorage destinationStorage );
 
 	/**
 	 * Called when two grids merge into one, AE will call a join as it
@@ -82,13 +80,12 @@ public interface IGridCache
 	 *
 	 * @param sourceStorage old storage
 	 */
-	void onJoin(IGridStorage sourceStorage);
+	void onJoin( IGridStorage sourceStorage );
 
 	/**
 	 * Called when saving changes,
 	 *
 	 * @param destinationStorage storage
 	 */
-	void populateGridStorage(IGridStorage destinationStorage);
+	void populateGridStorage( IGridStorage destinationStorage );
-
 }

src/api/java/appeng/api/networking/IGridConnection.java

@@ -23,7 +23,9 @@
 
 package appeng.api.networking;
 
-import net.minecraftforge.common.util.ForgeDirection;
+
+import appeng.api.util.AEPartLocation;
+
 
 /**
  * Access to AE's internal grid connections.
@@ -40,17 +42,19 @@ public interface IGridConnection
 	 * lets you get the opposing node of the connection by passing your own node.
 	 *
 	 * @param gridNode current grid node
+	 *
 	 * @return the IGridNode which represents the opposite side of the connection.
 	 */
-	IGridNode getOtherSide(IGridNode gridNode);
+	IGridNode getOtherSide( IGridNode gridNode );
 
 	/**
 	 * determine the direction of the connection based on your node.
 	 *
 	 * @param gridNode current grid node
+	 *
 	 * @return the direction of the connection, only valid for in world connections.
 	 */
-	ForgeDirection getDirection(IGridNode gridNode);
+	AEPartLocation getDirection( IGridNode gridNode );
 
 	/**
 	 * by destroying a connection you may create new grids, and trigger un-expected behavior, you should only destroy
@@ -77,5 +81,4 @@ public interface IGridConnection
 	 * @return how many channels pass over this connections.
 	 */
 	int getUsedChannels();
-
 }

src/api/java/appeng/api/networking/IGridConnectionVisitor.java

@@ -23,15 +23,14 @@
 
 package appeng.api.networking;
 
+
 public interface IGridConnectionVisitor extends IGridVisitor
 {
 
 	/**
 	 * Called for each connection on the network.
 	 *
-	 * @param n
+	 * @param n the connection.
-	 *            the connection.
 	 */
 	void visitConnection( IGridConnection n );
-
 }