fix advancements

re-checks the amount of items in the recipe
only do fuzzy search for damageable items

.github/CONTRIBUTING.md

@@ -11,19 +11,36 @@ 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)
+    * If it is already possible with vanilla and AE2 itself, the suggestion will be considered invalid.
-3. Click new issue
+    * Asking for a smaller version, more compact version, or more efficient version of something will also be considered invalid.
-4. Enter your Issue's title (something that summarizes your issue), and then create a detailed description of the issue.
+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)
-	* To help in resolving your issues please try to include the follow if applicable:
+3. Enter your a title of your issue (something that summarizes your issue), and then create a detailed description of the issue.
-		* The problem that is happening?
+    * Do not tag it with something like `[Feature]`, `[Bug]`, or a version.
-		* What was expected?
+    * Restrict it to a single bug or feature, it makes managing them way easier for us.
-		* How to reproduce the problem?
+    * The following details are required. Also refer to the issue template when creating one.
-		* Server or Single Player?
+        * Forge version
-		* Mod Pack using and version?
+        * AE2 version
-		* Crash log (Please make sure to use [pastebin](http://pastebin.com/) for the log file) 
+        * Crash log, when reporting a crash (Please make sure to use [pastebin](http://pastebin.com/))
-		* Screen shots or Pictures of the problem
+            * Never post an excerpt of what you consider important
-5. Click `Submit New Issue`, and wait for feedback!
+            * Always post the full log
+        * Other mods and their version, when reporting an issue between AE and another mod
+            * Also consider updating these before submitting a new issue, it might be already fixed
+        * A detailed description of the bug or feature
+    * To further help in resolving your issues please try to include the follow if applicable:
+        * What was expected?
+        * How to reproduce the problem?
+            * This is usually a great detail and allows us to fix it way faster
+        * Server or Single Player?
+        * Screen shots or Pictures of the problem
+        * Mod Pack using and version?
+            * Keep in mind that some mods might use an outdated version of AE2
+            * If so you should report it to your modpack
+4. 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.
+
+Please note that we might close any issue not matching these requirements. 
 
 ### Submitting Changes
 
@@ -55,10 +72,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 +112,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. Please report any case of maintaining the correct formatting.
+
 ### 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: 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: You found a bug or encountered a crash? Please report it here.
+
+---
+
+<!-- Provide a summary of the issue in the Title above, please do not "[Tag]" it. -->
+
+**Describe the bug**
+<!-- Always use the most recent version from ae-mod.info, it might already be fixed. -->
+
+**To Reproduce**
+<!-- Please provide the steps to reproduce it, otherwise we might not be able to fix it. -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Additional context**
+<!-- Screenshots, crashlogs, etc. -->
+<!-- A complete crashlog is required when reporting a crash. No excerpts. -->
+<!-- Please use pastebin or gist for posting the complete crashlog. -->
+
+**Environment**
+<!-- Include as many relevant details about the environment -->
+<!-- Like the used version, SP/MP, other mods and their version -->
+<!-- The following ones are required, please note "latest" is not a version -->
+
+- Minecraft Version: 
+- AE2 Version: 
+- Forge Version:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature Request
+about: A feature request or suggestion to improve Applied Energistics 2
+
+---
+
+<!-- Provide a summary of the issue in the Title above, please do not "[Tag]" it. -->
+
+**Describe the feature**
+<!-- Tell us how it should work. -->
+
+**Reasons why it should be considered**
+<!-- This can help us in various degrees, e.g. to determine if it fits our design ideas. -->
+
+**Additional Context**
+<!-- Use this for further details, e.g. screenshots, links to mods for integrations. -->
+<!-- Features will only be considered for the latest/next version. -->

.github/workflows/lock.yml

@@ -0,0 +1,15 @@
+name: 'Lock threads'
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2
+        with:
+          github-token: ${{ github.token }}
+          issue-lock-inactive-days: '180'
+          pr-lock-inactive-days: '180'

.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/
@@ -21,4 +22,10 @@
 !.gitignore
 
 # code format to reduce noise in git commits
-!codeformat/
+!codeformat/
+
+# Github specific files and directories
+!.github/
+
+# Explicit ignores
+Thumbs.db

.travis.yml

@@ -0,0 +1,33 @@
+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/ForgeVersion.json
+  - rm -f $HOME/.gradle/caches/minecraft/ForgeVersion.json.etag
+  - rm -fr $HOME/.gradle/caches/minecraft/deobfedDeps
+  - rm -f $HOME/.gradle/caches/*/fileHashes/fileHashes.bin
+  - rm -f $HOME/.gradle/caches/*/fileHashes/fileHashes.lock
+
+cache:
+  directories:
+    - '$HOME/.m2/repository'
+    - '$HOME/.sonar/cache'
+    - '$HOME/.gradle/wrapper'
+    - '$HOME/.gradle/caches'
+
+addons:
+  sonarcloud:
+    organization: "appliedenergistics"
+
+install: "./gradlew setupCIWorkspace"
+script: 
+  - "./gradlew build"
+  - "./gradlew test"
+  - "./gradlew sonarqube"

README.md

@@ -1,155 +1,28 @@
-# Applied Energistics 2
+This is a fork of AE2 i made for trying to solve issues for the [Omnifactory](https://www.curseforge.com/minecraft/modpacks/omnifactory) modpack.
 
-## Table of Content
+See https://github.com/PrototypeTrousers/Applied-Energistics-2/tree/AE2-Omnifactory branch for commits
+and
+https://github.com/PrototypeTrousers/Applied-Energistics-2/releases for the compiled jars.
 
-* [About](#about)
+# Applied Energistics 2 (PrototypeTrousers fork for Omnifactory)
-* [Contacts](#contacts)
-* [License](#license)
-* [Downloads](#downloads)
-* [Installation](#installation)
-* [Issues](#issues)
-* [Building](#building)
-* [Contribution](#contribution)
-* [API](#applied-energistics-2-api)
-* [Localization](#applied-energistics-2-localization)
-* [Credits](#credits)
 
 ## About
 
 A Mod about Matter, Energy and using them to conquer the world..
 
-## Contacts
-
-* [Website](http://ae-mod.info/)
-* [IRC #appliedenergistics on esper.net](http://webchat.esper.net/?channels=appliedenergistics&prompt=1)
-* [GitHub](https://github.com/AppliedEnergistics/Applied-Energistics-2)
-
 ## License
 
-Applied Energistics 2 API is (c) 2013 - 2014 AlgorithmX2 and licensed under MIT.
+* Applied Energistics 2 API
-
+  - (c) 2013 - 2018 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 - 2018 AlgorithmX2 et al
-Textures and Models are licensed under Creative Commons 3.
+  - [![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
-## Downloads
+  - (c) 2013 - 2018 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/)
-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/).
+* Text and Translations
-
+  - [![License](https://img.shields.io/badge/License-No%20Restriction-green.svg?style=flat-square)](https://creativecommons.org/publicdomain/zero/1.0/)
-## Installation
-
-You install this mod by putting it into the `minecraft/mods/` folder. It has no additional hard dependencies.
-
-## Issues
-
-Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue now!
-
-1. Make sure your issue hasn't already been answered or fixed.  Also think about whether your issue is a valid one before submitting it.
-2. Go to [the issues page](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues)
-3. Click new issue
-4. Enter your Issue's title (something that summarizes your issue), and then create a detailed description of the issue.
-	* To help in resolving your issues please try to include the follow if applicable:
-		* The problem that is happening?
-		* What was expected?
-		* How to reproduce the problem?
-		* Server or Single Player?
-		* Mod Pack using and version?
-		* Crash log (Please make sure to use [pastebin](http://pastebin.com/) for the log file) 
-		* Screen shots or Pictures of the problem
-5. Click `Submit New Issue`, and wait for feedback!
-
-## Building
-
-1. Clone this repository via 
-  - SSH `git clone git@github.com:AppliedEnergistics/Applied-Energistics-2.git` or 
-  - HTTPS `git clone https://github.com/AppliedEnergistics/Applied-Energistics-2.git`
-2. Setup workspace 
-  - Decompiled source `gradlew setupDecompWorkspace`
-  - Obfuscated source `gradlew setupDevWorkspace`
-  - 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
-  - Eclipse: execute `gradlew eclipse`
-5. For add-on developer: Core-Mod Detection
-  - In order to have FML detect AE from your dev environment, add the following VM Option to your run profile
-  - `-Dfml.coreMods.load=appeng.transformer.AppEngCore`
-
-## Contribution
-
-Before you want to add major changes, you might want to discuss them with us first, before wasting your time.
-If you are still willing to contribute to this project, you can contribute via [Pull-Request](https://help.github.com/articles/creating-a-pull-request).
-
-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.
-* Use the file you are editing as a style guide.
-* Consider your feature. [Suggestion Guidelines](http://ae-mod.info/Suggestion-Guidelines/)
-  - Is your suggestion already possible using Vanilla + AE2?
-  - Make sure your feature isn't already in the works, or hasn't been rejected previously.
-  - Does your feature simplify another feature of AE2? These changes will not be accepted.
-  - If your feature can be done by any popular mod, discuss with us first.
-
-Getting Started
-
-1. Fork this repository
-2. Clone the fork via
-  * SSH `git clone git@github.com:<your username>/Applied-Energistics-2.git` or 
-  * HTTPS `git clone https://github.com/<your username>/Applied-Energistics-2.git`
-3. Change code base
-4. Add changes to git `git add -A`
-5. Commit changes to your clone `git commit -m "<summery of made changes>"`
-6. Push to your fork `git push`
-7. Create a Pull-Request on GitHub
-8. Wait for review
-9. Suqash 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.
-
-## Applied Energistics 2 API
-
-The API for Applied Energistics 2. It is open source to discuss changes, improve documentation, and provide better add-on support in general.
-
-Development and standard builds can be obtained [Here](http://ae2.ae-mod.info/Downloads/).
-
-### Maven
-
-When compiling against the AE2 API you can use gradle dependencies, just add
-
-    dependencies {
-	    compile "appeng:appliedenergistics2:rv_-_____-__:dev"
-    }
-
-or add the compile line to your existing dependencies task to your build.gradle
-
-Where the __ are filled in with the correct version criteria; AE2 is available from the default forge maven so no additional repositories are necessary.
-
-An example string would be `appeng:appliedenergistics2:rv2-alpha-30:dev`
-
-## Applied Energistics 2 Localization
-
-### English Text
-
-`en_US` is included in this repository, fixes to typos are welcome.
-
-### Encoding
-
-Files must be encoded as UTF-8.
-
-### License
-
-All Text and Translations submitted here can be used for any purpose, and may be re-distributed or used without any limitations.
-
-### New Translations
-
-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).
-
-### Final Note
-
-If you have have issues localizing something feel free to contact us on IRC, at #AppliedEnergistics on Esper.net
-
-Thanks to everyone helping out to improve localization of AE2.
 
 ## Credits
 

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,99 +16,106 @@
  * 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.3-SNAPSHOT'
     }
 }
 
-configurations.all {
+plugins {
-    resolutionStrategy.cacheDynamicVersionsFor 7200, 'hours'
+  id "org.sonarqube" version "2.6"
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_6
+apply plugin: 'net.minecraftforge.gradle.forge'
-targetCompatibility = JavaVersion.VERSION_1_6
+apply plugin: 'jacoco'
 
-version = config.version + "-" + config.aechannel + "-" + config.build
+repositories {
-group = config.group
+    mavenLocal()
-archivesBaseName = config.archivesBaseName
+    jcenter()
-
+    mavenCentral()
-// If TeamCity is running this build, lets set the version info
-if (hasProperty("teamcity")) {
-    version = teamcity["build.number"]
-
-    // Fix for main branch being built
-    version = version.replaceAll("/", "-")
 }
 
+apply from: 'gradle/scripts/dependencies.gradle'
+apply from: 'gradle/scripts/artifacts.gradle'
+apply from: 'gradle/scripts/optional.gradle'
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+// ensure everything uses UTF-8 and not some random codepage chosen by gradle
+compileJava.options.encoding = 'UTF-8'
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
+version = aeversion + "-" + aechannel + "-" + aebuild + " " + trousers
+group = aegroup
+archivesBaseName = aebasename
+
 // Add Coremod Manifest
 jar {
     manifest {
-        attributes 'FMLCorePlugin': 'appeng.transformer.AppEngCore'
+        attributes 'FMLAT': 'appeng_at.cfg'
-        attributes 'FMLCorePluginContainsFMLMod': 'true'
     }
 
+    from sourceSets.api.output
+    dependsOn apiClasses
+
     // specify which files are really included, can control which APIs should be in
     include "appeng/**"
     include "assets/**"
     include "mcmod.info"
     include "pack.mcmeta"
+    include "META-INF/appeng_at.cfg"
 }
 
 minecraft {
-    version = config.minecraft_version + "-" + config.forge_version
+    version = minecraft_version + "-" + forge_version
+
+    replaceIn "AEConfig.java"
+    replaceIn "package-info.java"
 
     replace "@version@", project.version
-    replace "@aechannel@", config.aechannel
+    replace "@aeversion@", aeversion
+    replace "@aechannel@", aechannel
+    replace "@aebuild@", aebuild
 
     // used when launching minecraft in dev env
     runDir = "run"
+    mappings = mcp_mappings
 }
 
 sourceSets {
-    main {
+    api
-        java {
+    main
-            srcDirs += 'src/api/java'
-            srcDirs += 'src/main/java/'
-        }
-
-        resources {
-            srcDir "src/main/resources/"
-            include "assets/appliedenergistics2/recipes/*.recipe",
-                    "assets/appliedenergistics2/lang/*.lang",
-                    "assets/appliedenergistics2/textures/blocks/*",
-                    "assets/appliedenergistics2/textures/guis/*",
-                    "assets/appliedenergistics2/textures/models/*",
-                    "assets/appliedenergistics2/textures/items/*"
-        }
-    }
 }
 
-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'
+    }
+
+    // move access transformer to META-INF
+    rename '(.+_at.cfg)', 'META-INF/$1'
+}

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.1230
-
-#########################################################
-# APIs used for development                             #
-#########################################################
-cb_minecraft_version=1.7.10
-fmp_version=1.1.0.311
-code_chicken_lib_version=1.1.1.105
-code_chicken_core_version=1.0.4.29
-nei_version=1.0.3.66
-waila_version=1.5.5_1.7.10
-
-#########################################################
-# API Stubs                                             #
-# Note: Do not edit these version numbers as they are   #
-# not the version of the mod, but stub code for AE2 to  #
-# compile                                               #
-#########################################################
-api_betterstorage_version=1
-api_coloredlightscore_version=1
-api_craftguide_version=1
-api_ic2_version=1
-api_immibis_version=1
-api_invtweaks_version=1
-api_mekansim_version=1
-api_mfr_version=1
-api_railcraft_version=1
-api_rblocks_version=1
-api_rf_version=2
-api_rotarycraft_version=1
-dev_buildcraft_version=1

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,49 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="12">
+<profiles version="13">
-<profile kind="CodeFormatterProfile" name="Algo" version="12">
+<profile kind="CodeFormatterProfile" name="AE2" version="13">
 <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"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="2"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
 <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"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="80"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="2"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
 <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.comment.count_line_length_from_starting_position" value="false"/>
+<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"/>
@@ -52,14 +58,16 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
 <setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
@@ -72,16 +80,17 @@
 <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.parentheses_positions_in_catch_clause" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
@@ -93,28 +102,30 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="next_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"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="0"/>
 <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"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
@@ -122,13 +133,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 +149,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,21 +158,24 @@
 <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"/>
 <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="80"/>
 <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
 <setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="insert"/>
@@ -182,7 +196,8 @@
 <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.wrap_before_assignment_operator" value="false"/>
 <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"/>
@@ -194,8 +209,10 @@
 <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
@@ -215,7 +232,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 +248,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"/>
@@ -256,6 +273,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
@@ -267,10 +285,11 @@
 <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.alignment_for_expressions_in_for_loop_header" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
@@ -283,13 +302,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,36 @@
+aeversion=rv6
+aechannel=stable
+aebuild=7
+aegroup=appeng
+aebasename=appliedenergistics2
+trousers=omni-fixes-v21b
+
+#########################################################
+# Versions                                              #
+#########################################################
+minecraft_version=1.12.2
+mcp_mappings=snapshot_20171003
+forge_version=14.23.5.2847
+
+#########################################################
+# Installable                                           #
+#########################################################
+hwyla_version=1.8.26-B41_1.12.2
+
+#########################################################
+# Provided APIs                                         #
+#########################################################
+jei_version=4.16.1.302
+tesla_version=1.0.63
+ic2_version=2.8.73-ex112
+top_version=1.12-1.4.23-16
+cofhcore_version=1.12.2-4.5.2.19
+crafttweaker_version=4.1.8.9
+inventorytweaks_version=1.63
+ctm_version=MC1.12.2-0.3.1.16
+
+#########################################################
+# Deployment                                            #
+#########################################################
+website_version=1.12.2
+curse_versions=1.12.2

gradle/scripts/artifacts.gradle

@@ -1,43 +1,67 @@
-task myJavadocs(type: Javadoc) {
+/*
-    source = sourceSets.api.java
+ * This file is part of Applied Energistics 2.
-    include "appeng/api/**"
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
-
+ *
-    classpath = configurations.compile
+ * 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')
+	}
 }
 
-task javadocJar(type: Jar, dependsOn: myJavadocs) {
+javadoc {
-    classifier = 'javadoc'
+	options.encoding = 'UTF-8'
-    from 'build/docs/javadoc/'
+	options.charSet = 'UTF-8'
 }
 
-task devJar(type: Jar) {
+task javadocs(type: Javadoc) {
+	source = sourceSets.api.java
+	include "appeng/api/**"
 
-    manifest {
+	// Due to ForgeGradle having to be a special snowflake,
-        attributes 'FMLCorePlugin': 'appeng.transformer.AppEngCore'
+	// we have to add some custom configurations to the normal compile configuration and hope it does not break.
-        attributes 'FMLCorePluginContainsFMLMod': 'true'
+	classpath = configurations.compile + configurations.forgeGradleMc + configurations.forgeGradleMcDeps 
-    }
+}
 
-    from(sourceSets.main.output) {
+task javadocJar(type: Jar, dependsOn: javadocs) {
-        include "appeng/**"
+	from javadoc.destinationDir
-        include "assets/**"
-        include 'mcmod.info'
-    }
 
-    classifier = 'dev'
+	classifier = 'javadoc'
 }
 
 task apiJar(type: Jar) {
+	from sourceSets.api.java
+	include "appeng/api/**"
 
-    from(sourceSets.api.java) {
+	from sourceSets.api.output
-        include "appeng/api/**"
+	include "appeng/api/**"
-    }
 
-    classifier = 'api'
+	classifier = 'api'
+}
 
+task sourceJar(type: Jar, overwrite: true) {
+	from sourceSets.api.allSource
+	from sourceSets.main.allSource
+
+	classifier = 'sources'
 }
 
 artifacts {
-    archives devJar
+	archives apiJar
-    archives apiJar
+	archives javadocJar
-    archives javadocJar
+	archives sourceJar
 }

gradle/scripts/autoinstallruntime.gradle

@@ -1,34 +0,0 @@
-// searches for NEI and Chicken stuff from compile set
-// and adds them to the mods in run dir
-task copyChicken(type: Copy, dependsOn: "extractUserDev") {
-    from { configurations.compile }
-    include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar"
-    exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_-
-    into file(minecraft.runDir + "/mods")
-    mustRunAfter "deobfBinJar"
-    mustRunAfter "repackMinecraft"
-}
-tasks.setupDevWorkspace.dependsOn copyChicken
-tasks.setupDecompWorkspace.dependsOn copyChicken
-
-// same for BC hacked file
-task copyBuildcraft(type: Copy, dependsOn: "extractUserDev") {
-    from { configurations.compile }
-    include "**/*buildcraft*.jar"
-    into file(minecraft.runDir + "/mods")
-    mustRunAfter "deobfBinJar"
-    mustRunAfter "repackMinecraft"
-}
-tasks.setupDevWorkspace.dependsOn copyBuildcraft
-tasks.setupDecompWorkspace.dependsOn copyBuildcraft
-
-// and for IC2 because it needs its EMLJ jar
-task copyIndustrialcraft(type: Copy, dependsOn: "extractUserDev") {
-    from { configurations.compile }
-    include "**/*industrialcraft*.jar"
-    into file(minecraft.runDir + "/mods")
-    mustRunAfter "deobfBinJar"
-    mustRunAfter "repackMinecraft"
-}
-tasks.setupDevWorkspace.dependsOn copyIndustrialcraft
-tasks.setupDecompWorkspace.dependsOn copyIndustrialcraft

gradle/scripts/dependencies.gradle

@@ -16,51 +16,99 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-
-
 repositories {
+    mavenLocal()
 
     maven {
-        name 'CB Maven FS'
+        name = "storagedrawers"
-        url "http://chickenbones.net/maven/"
+        url = "https://dl.bintray.com/jaquadro/dev/"
     }
 
     maven {
-        name "Waila Mobius Repo"
+        name "Mobius"
         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.mcmoddev.com"
+    }
+
+    maven {
+        name = "IC2 repo"
+        url = "http://maven.ic2.player.to"
+    }
+
+    maven {
+        name = "CoFH Maven"
+        url = "http://maven.covers1624.net"
+    }
+
+    maven { // TheOneProbe
+        name 'tterrag maven'
+        url "http://maven.tterrag.com/"
+    }
+
+    maven { // McJtyLib
+        name 'mcjty'
+        url "http://maven.k-4u.nl/"
+    }
+
+    maven { // Hwyla
+        name 'tehnut'
+        url "http://tehnut.info/maven"
+    }
+
+   	maven { // CraftTweaker
+        name 'jared maven'
+        url "http://maven.blamejared.com/"
+    }
+
+    //maven { // modmaven, maven proxy
+    //    name 'modmaven'
+    //    url "https://modmaven.k-4u.nl/"
+    //}
+
+    maven {
+		name = "CurseForge"
+		url = "https://minecraft.curseforge.com/api/maven/"
+	}
+}
+
+configurations {
+    mods
 }
 
 dependencies {
+    compileOnly "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.2-5.4.2:api"
+    compileOnly "gregtechce:gregtech:1.12.2:1.12.0.662"
 
-    compile "codechicken:ForgeMultipart:${config.cb_minecraft_version}-${config.fmp_version}:dev"
+    // installable runtime dependencies
-    compile "codechicken:CodeChickenLib:${config.cb_minecraft_version}-${config.code_chicken_lib_version}:dev"
+    mods "mcp.mobius.waila:Hwyla:${hwyla_version}"
-    compile "codechicken:CodeChickenCore:${config.cb_minecraft_version}-${config.code_chicken_core_version}:dev"
+    mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
-    compile "codechicken:NotEnoughItems:${config.cb_minecraft_version}-${config.nei_version}:dev"
+    mods "mcjty.theoneprobe:TheOneProbe-${minecraft_version}:${top_version}"
 
-    compile "mcp.mobius.waila:Waila:${config.waila_version}:dev"
+    // compile against provided APIs
-	
+    compileOnly "mezz.jei:jei_${minecraft_version}:${jei_version}:api"
-    compile(group: 'api', name: 'betterstorage', version: "${config.api_betterstorage_version}")
+    compileOnly "mcp.mobius.waila:Hwyla:${hwyla_version}"
-    compile(group: 'api', name: 'coloredlightscore', version: "${config.api_coloredlightscore_version}")
+    compileOnly "net.darkhax.tesla:Tesla-1.12.2:${tesla_version}"
-    compile(group: 'api', name: 'craftguide', version: "${config.api_craftguide_version}")
+    compileOnly "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
-    compile(group: 'api', name: 'ic2', version: "${config.api_ic2_version}")
+    compileOnly "mcjty.theoneprobe:TheOneProbe-1.12:${top_version}:api"
-    compile(group: 'api', name: 'immibis', version: "${config.api_immibis_version}")
+    compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf"
-    compile(group: 'api', name: 'invtweaks', version: "${config.api_invtweaks_version}")
+    compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}"
-    compile(group: 'api', name: 'mekansim', version: "${config.api_mekansim_version}")
+	compileOnly "inventory-tweaks:InventoryTweaks:${inventorytweaks_version}:api"
-    compile(group: 'api', name: 'mfr', version: "${config.api_mfr_version}")
+    compileOnly "team.chisel.ctm:CTM:${ctm_version}"
-    compile(group: 'api', name: 'railcraft', version: "${config.api_railcraft_version}")
-    compile(group: 'api', name: 'rblocks', version: "${config.api_rblocks_version}")
-    compile(group: 'api', name: 'rf', version: "${config.api_rf_version}")
-    compile(group: 'api', name: 'rotarycraft', version: "${config.api_rotarycraft_version}")
-    compile(group: 'dev', name: 'buildcraft', version: "${config.dev_buildcraft_version}")
 
-    // add hacked buildcraft jar to compile time (for facades)
+    // at runtime, use the full JEI jar
-    compile fileTree(dir: 'libs', include: '*.jar')
+    runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
+    runtime "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.2-5.4.2"
+    runtime "com.jaquadro.minecraft.chameleon:Chameleon:1.12-4.1.3"
 
-    testCompile "junit:junit:4.11"
+    // unit test dependencies
+    testCompile "junit:junit:4.12"
 }

gradle/scripts/optional.gradle

@@ -0,0 +1,55 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+ 
+task wrapper(type: Wrapper) {
+    gradleVersion = "2.14"
+}
+
+// HWYLA
+task installHwyla(type: Copy, dependsOn: "deinstallHwyla") {
+    from { configurations.mods }
+    include "**/*Hwyla*.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallHwyla(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Hwyla*.jar")
+}
+
+// IC2
+task installIC2(type: Copy, dependsOn: "deinstallIC2") {
+    from { configurations.mods }
+    include "**/*industrialcraft-2*.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallIC2(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*industrialcraft-2*.jar")
+}
+
+// TOP
+task installTop(type: Copy, dependsOn: ["deinstallTop"]) {
+    from { configurations.mods }
+    include "**/*TheOneProbe*.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallTop(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*TheOneProbe*.jar")
+}
+

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,5 @@
-#Sat Sep 13 21:58:22 CEST 2014
 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-4.8-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,47 +6,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +20,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+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"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -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`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+# Escape application args
-function splitJvmOpts() {
+save () {
-    JVM_OPTS=("$@")
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+APP_ARGS=$(save "$@")
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

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,10 +46,9 @@ 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
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,39 +23,56 @@
 
 package appeng.api;
 
-/**
- * 
- * Entry point for api.
- * 
- * Available IMCs:
- * 
- */
-public class AEApi
-{
 
-	static private IAppEngApi api = null;
+import java.lang.reflect.Field;
+
+import appeng.api.exceptions.CoreInaccessibleException;
+
+
+/**
+ * Entry point for api.
+ *
+ * Available IMCs:
+ */
+public enum AEApi
+{
+	;
+
+	private static final String CORE_API_FQN = "appeng.core.Api";
+	private static final String CORE_API_FIELD = "INSTANCE";
+	private static final IAppEngApi HELD_API;
+
+	static
+	{
+		try
+		{
+			final Class<?> apiClass = Class.forName( CORE_API_FQN );
+			final Field apiField = apiClass.getField( CORE_API_FIELD );
+
+			HELD_API = (IAppEngApi) apiField.get( apiClass );
+		}
+		catch( final ClassNotFoundException e )
+		{
+			throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FQN + " class, without it being declared." );
+		}
+		catch( final NoSuchFieldException e )
+		{
+			throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without it being declared." );
+		}
+		catch( final IllegalAccessException e )
+		{
+			throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without enough access permissions." );
+		}
+	}
 
 	/**
 	 * API Entry Point.
-	 * 
+	 *
-	 * @return the {@link IAppEngApi} or null if the instance could not be retrieved
+	 * @return the {@link IAppEngApi}
 	 */
 	public static IAppEngApi instance()
 	{
-		if ( api == null )
+		return HELD_API;
-		{
-			try
-			{
-				Class c = Class.forName( "appeng.core.Api" );
-				api = (IAppEngApi) c.getField( "instance" ).get( c );
-			}
-			catch (Throwable e)
-			{
-				return null;
-			}
-		}
-
-		return api;
 	}
 
 }

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

@@ -16,16 +16,19 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.tile;
+package appeng.api;
 
+
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
-import appeng.tile.events.TileEventType;
 
-@Retention(RetentionPolicy.RUNTIME)
+/**
-public @interface TileEvent {
+ * Marks interfaces that can be used as injectable constructor arguments for an {@link AEPlugin}.
-
+ */
-	TileEventType value();
+@Target( ElementType.TYPE )
-
+@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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,72 +23,47 @@
 
 package appeng.api;
 
-import appeng.api.definitions.Blocks;
+
-import appeng.api.definitions.Items;
+import appeng.api.definitions.IDefinitions;
-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;
+import appeng.api.networking.IGridHelper;
-import appeng.api.networking.IGridConnection;
-import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
 import appeng.api.parts.IPartHelper;
 import appeng.api.storage.IStorageHelper;
+import appeng.api.util.IClientHelper;
 
+
+@AEInjectable
 public interface IAppEngApi
 {
-
 	/**
 	 * @return Registry Container for the numerous registries in AE2.
 	 */
 	IRegistryContainer registries();
 
 	/**
-	 * @return helper for working with storage data types.
+	 * @return A helper for working with storage data types.
 	 */
 	IStorageHelper storage();
 
 	/**
-	 * @return helper for working with grids, and buses.
+	 * @return A helper to create {@link IGridNode} and other grid related objects.
+	 */
+	IGridHelper grid();
+
+	/**
+	 * @return A helper for working with grids, and buses.
 	 */
 	IPartHelper partHelper();
 
 	/**
-	 * @return an accessible list of all of AE's Items
+	 * @return An accessible list of all AE definitions
 	 */
-	Items items();
+	IDefinitions definitions();
 
 	/**
-	 * @return an accessible list of all of AE's materials; materials are items
+	 * @return Utility methods primarily useful for client side stuff
 	 */
-	Materials materials();
+	IClientHelper client();
-
-	/**
-	 * @return an accessible list of all of AE's blocks
-	 */
-	Blocks blocks();
-
-	/**
-	 * @return an accessible list of all of AE's parts, parts are items
-	 */
-	Parts parts();
-
-	/**
-	 * create a grid node for your {@link IGridHost}
-	 * 
-	 * @param block grid block
-	 * @return grid node of block
-	 */
-	IGridNode createGridNode(IGridBlock block);
-
-	/**
-	 * create a connection between two {@link IGridNode}
-	 * 
-	 * @param a to be connected gridnode
-	 * @param b to be connected gridnode
-	 * @throws FailedConnection
-	 */
-	IGridConnection createGridConnection(IGridNode a, IGridNode b) throws FailedConnection;
 
 }

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

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

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

src/api/java/appeng/api/config/Actionable.java

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

src/api/java/appeng/api/config/CondenserOutput.java

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

src/api/java/appeng/api/config/CopyMode.java

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

src/api/java/appeng/api/config/FullnessMode.java

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,22 +23,48 @@
 
 package appeng.api.config;
 
-public enum FuzzyMode
+public enum FuzzyMode {
-{
+    /**
-	// Note that percentage damaged, is the inverse of percentage durability.
+     * Matches any item from undamaged to including 0% durability, but not negative durability (where item damage
-	IGNORE_ALL(-1), PERCENT_99(0), PERCENT_75(25), PERCENT_50(50), PERCENT_25(75);
+     * exceeds maxdamage).
+     */
+    IGNORE_ALL(-1),
+    /**
+     * Matches items that have less than 100% durability (that is, at least 1 damage point) if a damaged item is used as
+     * the filter, or undamaged items otherwise.
+     */
+    PERCENT_99(0),
+    /**
+     * If an item with less than 75% durability is used as the filter, items with less than 75% durability are matched.
+     * Otherwise items with 75% durability or more are matched.
+     */
+    PERCENT_75(25),
+    /**
+     * If an item with less than 50% durability is used as the filter, items with less than 50% durability are matched.
+     * Otherwise items with 50% durability or more are matched.
+     */
+    PERCENT_50(50),
+    /**
+     * If an item with less than 25% durability is used as the filter, items with less than 50% durability are matched.
+     * Otherwise items with 25% durability or more are matched.
+     */
+    PERCENT_25(75);
 
-	final public float breakPoint;
+    public final float breakPoint;
-	final public float percentage;
+    /**
+     * Note this is percentage "damaged". It's the inverse of percentage durability.
+     */
+    public final float percentage;
 
-	private FuzzyMode(float p) {
+	FuzzyMode( final float p )
-		percentage = p;
+	{
-		breakPoint = p / 100.0f;
+		this.percentage = p;
+		this.breakPoint = p / 100.0f;
 	}
 
-	public int calculateBreakPoint(int maxDamage)
+	public int calculateBreakPoint( final int maxDamage )
 	{
-		return (int) ((percentage * maxDamage) / 100.0f);
+		return (int) ( ( this.percentage * maxDamage ) / 100.0f );
 	}
 
 }

src/api/java/appeng/api/config/IncludeExclude.java

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
- * Copyright (c) 2013 AlgorithmX2
+ * 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
@@ -21,19 +21,10 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package appeng.api.networking.security;
+package appeng.api.config;
 
-public class BaseActionSource
+
+public enum ItemSubstitution
 {
-
+	ENABLED, DISABLED;
-	public boolean isPlayer()
-	{
-		return false;
-	}
-
-	public boolean isMachine()
-	{
-		return false;
-	}
-
 }

src/api/java/appeng/api/config/LevelEmitterMode.java

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

src/api/java/appeng/api/config/LevelType.java

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

src/api/java/appeng/api/config/ModSettings.java

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

src/api/java/appeng/api/config/NetworkEmitterMode.java

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

src/api/java/appeng/api/config/OperationMode.java

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

src/api/java/appeng/api/config/OutputMode.java

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

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,43 +23,42 @@
 
 package appeng.api.config;
 
+
 public enum PowerUnits
 {
-	AE("gui.appliedenergistics2.units.appliedenergstics"), // Native Units - AE Energy
+	AE( "gui.appliedenergistics2.units.appliedenergstics" ), // Native Units - AE Energy
-	MJ("gui.appliedenergistics2.units.buildcraft"), // BuildCraft - Minecraft Joules
+	EU( "gui.appliedenergistics2.units.ic2" ), // IndustrialCraft 2 - Energy Units
-	EU("gui.appliedenergistics2.units.ic2"), // IndustrialCraft 2 - Energy Units
+	RF( "gui.appliedenergistics2.units.rf" ); // RF - Redstone Flux
-	WA("gui.appliedenergistics2.units.rotarycraft"), // RotaryCraft - Watts
-	RF("gui.appliedenergistics2.units.thermalexpansion"), // ThermalExpansion - Redstone Flux
-	MK("gui.appliedenergistics2.units.mekanism"); // Mekanism - Joules
-
-	private PowerUnits(String un) {
-		unlocalizedName = un;
-	}
 
+	/**
+	 * 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.
-	 * 
+	 *
 	 * Example: PowerUnits.EU.convertTo( PowerUnits.AE, 32 );
-	 * 
+	 *
 	 * will normally returns 64, as it will convert the EU, to AE with AE's power settings.
-	 * 
+	 *
 	 * @param target target power unit
 	 * @param value value
+	 *
 	 * @return value converted to target units, from this units.
 	 */
-	public double convertTo(PowerUnits target, double value)
+	public double convertTo( final PowerUnits target, final double value )
 	{
-		return (value * conversionRatio) / target.conversionRatio;
+		return ( value * this.conversionRatio ) / target.conversionRatio;
 	}
 
 }

src/api/java/appeng/api/config/RedstoneMode.java

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

src/api/java/appeng/api/config/RelativeDirection.java

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

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

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

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@
 
 package appeng.api.config;
 
+
 /**
  * Represent the security systems basic permissions, these are not for anti-griefing, they are part of the mod as a
  * gameplay feature.
@@ -56,15 +57,15 @@ public enum SecurityPermissions
 	 */
 	SECURITY;
 
-	final private String unlocalizedName = "gui.appliedenergistics2.security." + name().toLowerCase();
+	private final String unlocalizedName = "gui.appliedenergistics2.security." + this.name().toLowerCase();
 
 	public String getUnlocalizedName()
 	{
-		return unlocalizedName + ".name";
+		return this.unlocalizedName + ".name";
 	}
 
 	public String getUnlocalizedTip()
 	{
-		return unlocalizedName + ".tip";
+		return this.unlocalizedName + ".tip";
 	}
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,47 +23,81 @@
 
 package appeng.api.config;
 
+
 import java.util.EnumSet;
 
+import javax.annotation.Nonnull;
+
+
 public enum Settings
 {
-	LEVEL_EMITTER_MODE(EnumSet.allOf( LevelEmitterMode.class )),
+	LEVEL_EMITTER_MODE( EnumSet.allOf( LevelEmitterMode.class ) ),
 
-	REDSTONE_EMITTER(EnumSet.of( RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL )), REDSTONE_CONTROLLED(EnumSet.allOf( RedstoneMode.class )),
+	REDSTONE_EMITTER( EnumSet.of( RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL ) ),
 
-	CONDENSER_OUTPUT(EnumSet.allOf( CondenserOutput.class )),
+	REDSTONE_CONTROLLED( EnumSet.allOf( RedstoneMode.class ) ),
 
-	POWER_UNITS(EnumSet.allOf( PowerUnits.class )), ACCESS(EnumSet.of( AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE )),
+	CONDENSER_OUTPUT( EnumSet.allOf( CondenserOutput.class ) ),
 
-	SORT_DIRECTION(EnumSet.allOf( SortDir.class )), SORT_BY(EnumSet.allOf( SortOrder.class )),
+	POWER_UNITS( EnumSet.allOf( PowerUnits.class ) ),
 
-	SEARCH_TOOLTIPS(EnumSet.of( YesNo.YES, YesNo.NO )), VIEW_MODE(EnumSet.allOf( ViewItems.class )), SEARCH_MODE(EnumSet.allOf( SearchBoxMode.class )),
+	ACCESS( EnumSet.of( AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE ) ),
 
-	ACTIONS(EnumSet.allOf( ActionItems.class )), IO_DIRECTION(EnumSet.of( RelativeDirection.LEFT, RelativeDirection.RIGHT )),
+	SORT_DIRECTION( EnumSet.allOf( SortDir.class ) ),
 
-	BLOCK(EnumSet.of( YesNo.YES, YesNo.NO )), OPERATION_MODE(EnumSet.allOf( OperationMode.class )),
+	SORT_BY( EnumSet.allOf( SortOrder.class ) ),
 
-	FULLNESS_MODE(EnumSet.allOf( FullnessMode.class )), CRAFT_ONLY(EnumSet.of( YesNo.YES, YesNo.NO )),
+	SEARCH_TOOLTIPS( EnumSet.of( YesNo.YES, YesNo.NO ) ),
 
-	FUZZY_MODE(EnumSet.allOf( FuzzyMode.class )), LEVEL_TYPE(EnumSet.allOf( LevelType.class )),
+	VIEW_MODE( EnumSet.allOf( ViewItems.class ) ),
 
-	TERMINAL_STYLE(EnumSet.of( TerminalStyle.TALL, TerminalStyle.SMALL )), COPY_MODE(EnumSet.allOf( CopyMode.class )),
+	SEARCH_MODE( EnumSet.allOf( SearchBoxMode.class ) ),
 
-	INTERFACE_TERMINAL(EnumSet.of( YesNo.YES, YesNo.NO )), CRAFT_VIA_REDSTONE(EnumSet.of( YesNo.YES, YesNo.NO )),
+	ACTIONS( EnumSet.allOf( ActionItems.class ) ),
 
-	STORAGE_FILTER(EnumSet.allOf( StorageFilter.class ));
+	IO_DIRECTION( EnumSet.of( RelativeDirection.LEFT, RelativeDirection.RIGHT ) ),
 
-	private EnumSet values;
+	BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ),
 
-	public EnumSet getPossibleValues()
+	OPERATION_MODE( EnumSet.allOf( OperationMode.class ) ),
+
+	FULLNESS_MODE( EnumSet.allOf( FullnessMode.class ) ),
+
+	CRAFT_ONLY( EnumSet.of( YesNo.YES, YesNo.NO ) ),
+
+	FUZZY_MODE( EnumSet.allOf( FuzzyMode.class ) ),
+
+	LEVEL_TYPE( EnumSet.allOf( LevelType.class ) ),
+
+	TERMINAL_STYLE( EnumSet.of( TerminalStyle.TALL, TerminalStyle.SMALL ) ),
+
+	COPY_MODE( EnumSet.allOf( CopyMode.class ) ),
+
+	INTERFACE_TERMINAL( EnumSet.of( YesNo.YES, YesNo.NO ) ),
+
+	CRAFT_VIA_REDSTONE( EnumSet.of( YesNo.YES, YesNo.NO ) ),
+
+	STORAGE_FILTER( EnumSet.allOf( StorageFilter.class ) ),
+
+	PLACE_BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ),
+
+	SCHEDULING_MODE( EnumSet.allOf( SchedulingMode.class ) );
+
+	private final EnumSet<? extends Enum<?>> values;
+
+	Settings( @Nonnull final EnumSet<? extends Enum<?>> possibleOptions )
 	{
-		return values;
+		if( possibleOptions.isEmpty() )
+		{
+			throw new IllegalArgumentException( "Tried to instantiate an empty setting." );
+		}
+
+		this.values = possibleOptions;
 	}
 
-	private Settings(EnumSet set) {
+	public EnumSet<? extends Enum<?>> getPossibleValues()
-		if ( set == null || set.isEmpty() )
+	{
-			throw new RuntimeException( "Invalid configuration." );
+		return this.values;
-		values = set;
 	}
 
 }

src/api/java/appeng/api/config/SortDir.java

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

src/api/java/appeng/api/config/SortOrder.java

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

src/api/java/appeng/api/config/StorageFilter.java

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

src/api/java/appeng/api/config/TerminalStyle.java

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

src/api/java/appeng/api/config/TunnelType.java

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,40 +23,74 @@
 
 package appeng.api.config;
 
+
 import java.util.HashMap;
+import java.util.Map;
 
 import net.minecraft.item.ItemStack;
 
+import appeng.api.definitions.IItemDefinition;
+
+
 public enum Upgrades
 {
 	/**
 	 * Gold Tier Upgrades.
 	 */
-	CAPACITY(0), REDSTONE(0), CRAFTING(0),
+	CAPACITY( 0 ),
+	REDSTONE( 0 ),
+	CRAFTING( 0 ),
 
 	/**
 	 * Diamond Tier Upgrades.
 	 */
-	FUZZY(1), SPEED(1), INVERTER(1);
+	FUZZY( 1 ),
+	SPEED( 1 ),
+	INVERTER( 1 );
 
-	public final int myTier;
+	private final int tier;
-	public final HashMap<ItemStack, Integer> supportedMax = new HashMap<ItemStack, Integer>();
+	private final Map<ItemStack, Integer> supportedMax = new HashMap<>();
 
-	private Upgrades(int tier) {
+	Upgrades( final int tier )
-		myTier = tier;
+	{
+		this.tier = tier;
 	}
 
 	/**
 	 * @return list of Items/Blocks that support this upgrade, and how many it supports.
 	 */
-	public HashMap<ItemStack, Integer> getSupported()
+	public Map<ItemStack, Integer> getSupported()
 	{
-		return supportedMax;
+		return this.supportedMax;
 	}
 
-	public void registerItem(ItemStack myItem, int maxSupported)
+	/**
+	 * Registers a specific amount of this upgrade into a specific machine
+	 *
+	 * @param item machine in which this upgrade can be installed
+	 * @param maxSupported amount how many upgrades can be installed
+	 */
+	public void registerItem( final IItemDefinition item, final int maxSupported )
 	{
-		if ( myItem != null )
+		item.maybeStack( 1 ).ifPresent( is -> this.registerItem( is, maxSupported ) );
-			supportedMax.put( myItem, maxSupported );
+	}
+
+	/**
+	 * Registers a specific amount of this upgrade into a specific machine
+	 *
+	 * @param stack machine in which this upgrade can be installed
+	 * @param maxSupported amount how many upgrades can be installed
+	 */
+	public void registerItem( final ItemStack stack, final int maxSupported )
+	{
+		if( stack != null )
+		{
+			this.supportedMax.put( stack, maxSupported );
+		}
+	}
+
+	public int getTier()
+	{
+		return this.tier;
 	}
 }

src/api/java/appeng/api/config/ViewItems.java

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

src/api/java/appeng/api/config/YesNo.java

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

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

@@ -1,112 +0,0 @@
-/*
- * The MIT License (MIT)
- * 
- * Copyright (c) 2013 AlgorithmX2
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.definitions;
-
-import appeng.api.util.AEItemDefinition;
-
-public class Blocks
-{
-
-	/*
-	 * World Gen
-	 */
-	public AEItemDefinition blockQuartzOre;
-	public AEItemDefinition blockQuartzOreCharged;
-	public AEItemDefinition blockMatrixFrame;
-
-	/*
-	 * Decorative
-	 */
-	public AEItemDefinition blockQuartz;
-	public AEItemDefinition blockQuartzPillar;
-	public AEItemDefinition blockQuartzChiseled;
-	public AEItemDefinition blockQuartzGlass;
-	public AEItemDefinition blockQuartzVibrantGlass;
-	public AEItemDefinition blockQuartzTorch;
-	public AEItemDefinition blockFluix;
-	public AEItemDefinition blockSkyStone;
-	public AEItemDefinition blockSkyChest;
-	public AEItemDefinition blockSkyCompass;
-
-	/*
-	 * Misc
-	 */
-	public AEItemDefinition blockGrindStone;
-	public AEItemDefinition blockCrankHandle;
-	public AEItemDefinition blockInscriber;
-	public AEItemDefinition blockWireless;
-	public AEItemDefinition blockCharger;
-	public AEItemDefinition blockTinyTNT;
-	public AEItemDefinition blockSecurity;
-
-	/*
-	 * Quantum Network Bridge
-	 */
-	public AEItemDefinition blockQuantumRing;
-	public AEItemDefinition blockQuantumLink;
-
-	/*
-	 * Spatial IO
-	 */
-	public AEItemDefinition blockSpatialPylon;
-	public AEItemDefinition blockSpatialIOPort;
-
-	/*
-	 * Bus / Cables
-	 */
-	public AEItemDefinition blockMultiPart;
-
-	/*
-	 * Machines
-	 */
-	public AEItemDefinition blockController;
-	public AEItemDefinition blockDrive;
-	public AEItemDefinition blockChest;
-	public AEItemDefinition blockInterface;
-	public AEItemDefinition blockCellWorkbench;
-	public AEItemDefinition blockIOPort;
-	public AEItemDefinition blockCondenser;
-	public AEItemDefinition blockEnergyAcceptor;
-	public AEItemDefinition blockVibrationChamber;
-	public AEItemDefinition blockQuartzGrowthAccelerator;
-
-	public AEItemDefinition blockEnergyCell;
-	public AEItemDefinition blockEnergyCellDense;
-	public AEItemDefinition blockEnergyCellCreative;
-
-	// rv1
-	public AEItemDefinition blockCraftingUnit;
-	public AEItemDefinition blockCraftingAccelerator;
-	public AEItemDefinition blockCraftingStorage1k;
-	public AEItemDefinition blockCraftingStorage4k;
-	public AEItemDefinition blockCraftingStorage16k;
-	public AEItemDefinition blockCraftingStorage64k;
-	public AEItemDefinition blockCraftingMonitor;
-
-	public AEItemDefinition blockMolecularAssembler;
-
-	public AEItemDefinition blockLightDetector;
-	public AEItemDefinition blockPaint;
-
-}

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

@@ -0,0 +1,51 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.api.definitions;
+
+
+import java.util.Optional;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+
+
+public interface IBlockDefinition extends IItemDefinition
+{
+	/**
+	 * @return the {@link Block} implementation if applicable
+	 */
+	Optional<Block> maybeBlock();
+
+	/**
+	 * @return the {@link ItemBlock} implementation if applicable
+	 */
+	Optional<ItemBlock> maybeItemBlock();
+
+	/**
+	 * Compare Block with world.
+	 *
+	 * @param world world of block
+	 * @param pos location
+	 *
+	 * @return if the block is placed in the world at the specific location.
+	 */
+	boolean isSameAs( IBlockAccess world, BlockPos pos );
+}

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

@@ -0,0 +1,191 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.definitions;
+
+
+/**
+ * A list of all blocks in AE
+ */
+public interface IBlocks
+{
+	/*
+	 * world gen
+	 */
+	IBlockDefinition quartzOre();
+
+	IBlockDefinition quartzOreCharged();
+
+	IBlockDefinition matrixFrame();
+
+	/*
+	 * decorative
+	 */
+	IBlockDefinition quartzBlock();
+
+	IBlockDefinition quartzPillar();
+
+	IBlockDefinition chiseledQuartzBlock();
+
+	IBlockDefinition quartzGlass();
+
+	IBlockDefinition quartzVibrantGlass();
+
+	IBlockDefinition quartzFixture();
+
+	IBlockDefinition fluixBlock();
+
+	IBlockDefinition skyStoneBlock();
+
+	IBlockDefinition smoothSkyStoneBlock();
+
+	IBlockDefinition skyStoneBrick();
+
+	IBlockDefinition skyStoneSmallBrick();
+
+	IBlockDefinition skyStoneChest();
+
+	IBlockDefinition smoothSkyStoneChest();
+
+	IBlockDefinition skyCompass();
+
+	IBlockDefinition skyStoneStairs();
+
+	IBlockDefinition smoothSkyStoneStairs();
+
+	IBlockDefinition skyStoneBrickStairs();
+
+	IBlockDefinition skyStoneSmallBrickStairs();
+
+	IBlockDefinition fluixStairs();
+
+	IBlockDefinition quartzStairs();
+
+	IBlockDefinition chiseledQuartzStairs();
+
+	IBlockDefinition quartzPillarStairs();
+
+	IBlockDefinition skyStoneSlab();
+
+	IBlockDefinition smoothSkyStoneSlab();
+
+	IBlockDefinition skyStoneBrickSlab();
+
+	IBlockDefinition skyStoneSmallBrickSlab();
+
+	IBlockDefinition fluixSlab();
+
+	IBlockDefinition quartzSlab();
+
+	IBlockDefinition chiseledQuartzSlab();
+
+	IBlockDefinition quartzPillarSlab();
+
+	/*
+	 * misc
+	 */
+	ITileDefinition grindstone();
+
+	ITileDefinition crank();
+
+	ITileDefinition inscriber();
+
+	ITileDefinition wirelessAccessPoint();
+
+	ITileDefinition charger();
+
+	IBlockDefinition tinyTNT();
+
+	ITileDefinition securityStation();
+
+	/*
+	 * quantum Network Bridge
+	 */
+	ITileDefinition quantumRing();
+
+	ITileDefinition quantumLink();
+
+	/*
+	 * spatial iO
+	 */
+	ITileDefinition spatialPylon();
+
+	ITileDefinition spatialIOPort();
+
+	/*
+	 * Bus / cables
+	 */
+	ITileDefinition multiPart();
+
+	/*
+	 * machines
+	 */
+	ITileDefinition controller();
+
+	ITileDefinition drive();
+
+	ITileDefinition chest();
+
+	ITileDefinition iface();
+
+	ITileDefinition fluidIface();
+
+	ITileDefinition cellWorkbench();
+
+	ITileDefinition iOPort();
+
+	ITileDefinition condenser();
+
+	ITileDefinition energyAcceptor();
+
+	ITileDefinition vibrationChamber();
+
+	ITileDefinition quartzGrowthAccelerator();
+
+	ITileDefinition energyCell();
+
+	ITileDefinition energyCellDense();
+
+	ITileDefinition energyCellCreative();
+
+	// rv1
+	ITileDefinition craftingUnit();
+
+	ITileDefinition craftingAccelerator();
+
+	ITileDefinition craftingStorage1k();
+
+	ITileDefinition craftingStorage4k();
+
+	ITileDefinition craftingStorage16k();
+
+	ITileDefinition craftingStorage64k();
+
+	ITileDefinition craftingMonitor();
+
+	ITileDefinition molecularAssembler();
+
+	ITileDefinition lightDetector();
+
+	ITileDefinition paint();
+}

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

@@ -16,20 +16,27 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.block.stair;
+package appeng.api.definitions;
 
 
-import java.util.EnumSet;
+import net.minecraft.item.ItemStack;
-
-import appeng.block.AEBaseStairBlock;
-import appeng.block.solids.BlockQuartzPillar;
-import appeng.core.features.AEFeature;
 
 
-public class QuartzPillarStairBlock extends AEBaseStairBlock
+/**
+ * Interface to compare a definition with an itemstack or a block
+ *
+ * @author thatsIch
+ * @version rv2
+ * @since rv2
+ */
+public interface IComparableDefinition
 {
-	public QuartzPillarStairBlock( BlockQuartzPillar block )
+	/**
-	{
+	 * Compare {@link ItemStack} with this
-		super( block, 0, EnumSet.of( AEFeature.Core ) );
+	 *
-	}
+	 * @param comparableStack compared item
+	 *
+	 * @return true if the item stack is a matching item.
+	 */
+	boolean isSameAs( ItemStack comparableStack );
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -21,18 +21,31 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package appeng.api.implementations.tiles;
+package appeng.api.definitions;
 
-import net.minecraftforge.common.util.ForgeDirection;
-import appeng.api.networking.security.BaseActionSource;
-import appeng.api.storage.IStorageMonitorable;
 
 /**
- * Implemented on inventories that can share their inventories with other networks, best example, ME Interface.
+ * All definitions in AE
  */
-public interface ITileStorageMonitorable
+public interface IDefinitions
 {
+	/**
+	 * @return an accessible list of all of AE's blocks
+	 */
+	IBlocks blocks();
 
-	IStorageMonitorable getMonitorable(ForgeDirection side, BaseActionSource src);
+	/**
+	 * @return an accessible list of all of AE's Items
+	 */
+	IItems items();
 
+	/**
+	 * @return an accessible list of all of AE's materials; materials are items
+	 */
+	IMaterials materials();
+
+	/**
+	 * @return an accessible list of all of AE's parts, parts are items
+	 */
+	IParts parts();
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
- * Copyright (c) 2013 AlgorithmX2
+ * Copyright (c) 2013 - 2015 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -21,36 +21,38 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package appeng.api.storage.data;
+package appeng.api.definitions;
 
-import net.minecraft.nbt.NBTTagCompound;
-import appeng.api.features.IItemComparison;
 
-/**
+import java.util.Optional;
- * Don't cast this... either compare with it, or copy it.
+
- * 
+import javax.annotation.Nonnull;
- * Don't Implement.
+
- */
+import net.minecraft.item.Item;
-public interface IAETagCompound
+import net.minecraft.item.ItemStack;
+
+
+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 a copy ( the copy will not be a IAETagCompound, it will be a NBTTagCompound )
+	 * @return the {@link Item} Implementation if applicable
 	 */
-	public NBTTagCompound getNBTTagCompoundCopy();
+	Optional<Item> maybeItem();
 
 	/**
-	 * compare to other NBTTagCompounds or IAETagCompounds
+	 * @return an {@link ItemStack} with specified quantity of this item.
-	 * 
-	 * @param a compared object
-	 * @return true, if they are the same.
 	 */
-	@Override
+	Optional<ItemStack> maybeStack( int stackSize );
-	boolean equals(Object a);
 
 	/**
-	 * @return the special comparison for this tag
+	 * @return <tt>true</tt> if definition is enabled
 	 */
-	IItemComparison getSpecialComparison();
+	boolean isEnabled();
-
+}
-}

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

@@ -0,0 +1,117 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.definitions;
+
+
+import appeng.api.util.AEColoredItemDefinition;
+
+
+/**
+ * A list of all items in AE
+ */
+public interface IItems
+{
+	IItemDefinition certusQuartzAxe();
+
+	IItemDefinition certusQuartzHoe();
+
+	IItemDefinition certusQuartzShovel();
+
+	IItemDefinition certusQuartzPick();
+
+	IItemDefinition certusQuartzSword();
+
+	IItemDefinition certusQuartzWrench();
+
+	IItemDefinition certusQuartzKnife();
+
+	IItemDefinition netherQuartzAxe();
+
+	IItemDefinition netherQuartzHoe();
+
+	IItemDefinition netherQuartzShovel();
+
+	IItemDefinition netherQuartzPick();
+
+	IItemDefinition netherQuartzSword();
+
+	IItemDefinition netherQuartzWrench();
+
+	IItemDefinition netherQuartzKnife();
+
+	IItemDefinition entropyManipulator();
+
+	IItemDefinition wirelessTerminal();
+
+	IItemDefinition biometricCard();
+
+	IItemDefinition chargedStaff();
+
+	IItemDefinition massCannon();
+
+	IItemDefinition memoryCard();
+
+	IItemDefinition networkTool();
+
+	IItemDefinition portableCell();
+
+	IItemDefinition cellCreative();
+
+	IItemDefinition viewCell();
+
+	IItemDefinition cell1k();
+
+	IItemDefinition cell4k();
+
+	IItemDefinition cell16k();
+
+	IItemDefinition cell64k();
+
+	IItemDefinition fluidCell1k();
+
+	IItemDefinition fluidCell4k();
+
+	IItemDefinition fluidCell16k();
+
+	IItemDefinition fluidCell64k();
+
+	IItemDefinition spatialCell2();
+
+	IItemDefinition spatialCell16();
+
+	IItemDefinition spatialCell128();
+
+	IItemDefinition facade();
+
+	IItemDefinition crystalSeed();
+
+	// rv1
+	IItemDefinition encodedPattern();
+
+	IItemDefinition colorApplicator();
+
+	AEColoredItemDefinition coloredPaintBall();
+
+	AEColoredItemDefinition coloredLumenPaintBall();
+}

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

@@ -0,0 +1,145 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.definitions;
+
+
+/**
+ * A list of all materials in AE
+ */
+public interface IMaterials
+{
+	IItemDefinition cell2SpatialPart();
+
+	IItemDefinition cell16SpatialPart();
+
+	IItemDefinition cell128SpatialPart();
+
+	IItemDefinition silicon();
+
+	IItemDefinition skyDust();
+
+	IItemDefinition calcProcessorPress();
+
+	IItemDefinition engProcessorPress();
+
+	IItemDefinition logicProcessorPress();
+
+	IItemDefinition calcProcessorPrint();
+
+	IItemDefinition engProcessorPrint();
+
+	IItemDefinition logicProcessorPrint();
+
+	IItemDefinition siliconPress();
+
+	IItemDefinition siliconPrint();
+
+	IItemDefinition namePress();
+
+	IItemDefinition logicProcessor();
+
+	IItemDefinition calcProcessor();
+
+	IItemDefinition engProcessor();
+
+	IItemDefinition basicCard();
+
+	IItemDefinition advCard();
+
+	IItemDefinition purifiedCertusQuartzCrystal();
+
+	IItemDefinition purifiedNetherQuartzCrystal();
+
+	IItemDefinition purifiedFluixCrystal();
+
+	IItemDefinition cell1kPart();
+
+	IItemDefinition cell4kPart();
+
+	IItemDefinition cell16kPart();
+
+	IItemDefinition cell64kPart();
+
+	IItemDefinition emptyStorageCell();
+
+	IItemDefinition cardRedstone();
+
+	IItemDefinition cardSpeed();
+
+	IItemDefinition cardCapacity();
+
+	IItemDefinition cardFuzzy();
+
+	IItemDefinition cardInverter();
+
+	IItemDefinition cardCrafting();
+
+	IItemDefinition enderDust();
+
+	IItemDefinition flour();
+
+	IItemDefinition goldDust();
+
+	IItemDefinition ironDust();
+
+	IItemDefinition fluixDust();
+
+	IItemDefinition certusQuartzDust();
+
+	IItemDefinition netherQuartzDust();
+
+	IItemDefinition matterBall();
+
+	IItemDefinition certusQuartzCrystal();
+
+	IItemDefinition certusQuartzCrystalCharged();
+
+	IItemDefinition fluixCrystal();
+
+	IItemDefinition fluixPearl();
+
+	IItemDefinition woodenGear();
+
+	IItemDefinition wirelessReceiver();
+
+	IItemDefinition wirelessBooster();
+
+	IItemDefinition annihilationCore();
+
+	IItemDefinition formationCore();
+
+	IItemDefinition singularity();
+
+	IItemDefinition qESingularity();
+
+	IItemDefinition blankPattern();
+
+	IItemDefinition fluidCell1kPart();
+
+	IItemDefinition fluidCell4kPart();
+
+	IItemDefinition fluidCell16kPart();
+
+	IItemDefinition fluidCell64kPart();
+}

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

@@ -0,0 +1,126 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.definitions;
+
+
+import appeng.api.util.AEColoredItemDefinition;
+
+
+/**
+ * A list of all parts in AE
+ */
+public interface IParts
+{
+	AEColoredItemDefinition cableSmart();
+
+	AEColoredItemDefinition cableCovered();
+
+	AEColoredItemDefinition cableGlass();
+
+	AEColoredItemDefinition cableDenseCovered();
+
+	AEColoredItemDefinition cableDenseSmart();
+
+	AEColoredItemDefinition lumenCableSmart();
+
+	AEColoredItemDefinition lumenCableCovered();
+
+	AEColoredItemDefinition lumenCableGlass();
+
+	AEColoredItemDefinition lumenDenseCableSmart();
+
+	IItemDefinition quartzFiber();
+
+	IItemDefinition toggleBus();
+
+	IItemDefinition invertedToggleBus();
+
+	IItemDefinition storageBus();
+
+	IItemDefinition importBus();
+
+	IItemDefinition exportBus();
+
+	IItemDefinition iface();
+
+	IItemDefinition fluidIface();
+
+	IItemDefinition levelEmitter();
+
+	IItemDefinition annihilationPlane();
+
+	IItemDefinition identityAnnihilationPlane();
+
+	IItemDefinition formationPlane();
+
+	IItemDefinition p2PTunnelME();
+
+	IItemDefinition p2PTunnelRedstone();
+
+	IItemDefinition p2PTunnelItems();
+
+	IItemDefinition p2PTunnelFluids();
+
+	IItemDefinition p2PTunnelEU();
+
+	IItemDefinition p2PTunnelFE();
+
+	IItemDefinition p2PTunnelLight();
+
+	// IItemDefinition p2PTunnelOpenComputers();
+
+	IItemDefinition cableAnchor();
+
+	IItemDefinition monitor();
+
+	IItemDefinition semiDarkMonitor();
+
+	IItemDefinition darkMonitor();
+
+	IItemDefinition interfaceTerminal();
+
+	IItemDefinition patternTerminal();
+
+	IItemDefinition craftingTerminal();
+
+	IItemDefinition terminal();
+
+	IItemDefinition storageMonitor();
+
+	IItemDefinition conversionMonitor();
+
+	IItemDefinition fluidTerminal();
+
+	IItemDefinition fluidImportBus();
+
+	IItemDefinition fluidExportBus();
+
+	IItemDefinition fluidStorageBus();
+
+	IItemDefinition fluidLevelEmitter();
+
+	IItemDefinition fluidAnnihilationPlane();
+
+	IItemDefinition fluidFormationnPlane();
+}

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

@@ -16,16 +16,18 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.integration.abstraction;
+package appeng.api.definitions;
+
+
+import java.util.Optional;
 
 import net.minecraft.tileentity.TileEntity;
-import appeng.api.storage.IMEInventory;
 
-public interface IDSU
+
+public interface ITileDefinition extends IBlockDefinition
 {
-
+	/**
-	IMEInventory getDSU(TileEntity te);
+	 * @return the {@link TileEntity} Class if applicable.
-
+	 */
-	boolean isDSU(TileEntity te);
+	Optional<? extends Class<? extends TileEntity>> maybeEntity();
-
 }

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

@@ -1,77 +0,0 @@
-/*
- * The MIT License (MIT)
- * 
- * Copyright (c) 2013 AlgorithmX2
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.definitions;
-
-import appeng.api.util.AEColoredItemDefinition;
-import appeng.api.util.AEItemDefinition;
-
-public class Items
-{
-
-	public AEItemDefinition itemCertusQuartzAxe;
-	public AEItemDefinition itemCertusQuartzHoe;
-	public AEItemDefinition itemCertusQuartzShovel;
-	public AEItemDefinition itemCertusQuartzPick;
-	public AEItemDefinition itemCertusQuartzSword;
-	public AEItemDefinition itemCertusQuartzWrench;
-	public AEItemDefinition itemCertusQuartzKnife;
-
-	public AEItemDefinition itemNetherQuartzAxe;
-	public AEItemDefinition itemNetherQuartzHoe;
-	public AEItemDefinition itemNetherQuartzShovel;
-	public AEItemDefinition itemNetherQuartzPick;
-	public AEItemDefinition itemNetherQuartzSword;
-	public AEItemDefinition itemNetherQuartzWrench;
-	public AEItemDefinition itemNetherQuartzKnife;
-
-	public AEItemDefinition itemEntropyManipulator;
-	public AEItemDefinition itemWirelessTerminal;
-	public AEItemDefinition itemBiometricCard;
-	public AEItemDefinition itemChargedStaff;
-	public AEItemDefinition itemMassCannon;
-	public AEItemDefinition itemMemoryCard;
-	public AEItemDefinition itemNetworkTool;
-	public AEItemDefinition itemPortableCell;
-
-	public AEItemDefinition itemCellCreative;
-	public AEItemDefinition itemViewCell;
-
-	public AEItemDefinition itemCell1k;
-	public AEItemDefinition itemCell4k;
-	public AEItemDefinition itemCell16k;
-	public AEItemDefinition itemCell64k;
-
-	public AEItemDefinition itemSpatialCell2;
-	public AEItemDefinition itemSpatialCell16;
-	public AEItemDefinition itemSpatialCell128;
-
-	public AEItemDefinition itemFacade;
-	public AEItemDefinition itemCrystalSeed;
-
-	// rv1
-	public AEItemDefinition itemEncodedPattern;
-	public AEItemDefinition itemColorApplicator;
-	public AEColoredItemDefinition itemPaintBall;
-	public AEColoredItemDefinition itemLumenPaintBall;
-}

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

@@ -1,103 +0,0 @@
-/*
- * The MIT License (MIT)
- * 
- * Copyright (c) 2013 AlgorithmX2
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.definitions;
-
-import appeng.api.util.AEItemDefinition;
-
-public class Materials
-{
-
-	public AEItemDefinition materialCell2SpatialPart;
-	public AEItemDefinition materialCell16SpatialPart;
-	public AEItemDefinition materialCell128SpatialPart;
-
-	public AEItemDefinition materialSilicon;
-	public AEItemDefinition materialSkyDust;
-
-	public AEItemDefinition materialCalcProcessorPress;
-	public AEItemDefinition materialEngProcessorPress;
-	public AEItemDefinition materialLogicProcessorPress;
-
-	public AEItemDefinition materialCalcProcessorPrint;
-	public AEItemDefinition materialEngProcessorPrint;
-	public AEItemDefinition materialLogicProcessorPrint;
-
-	public AEItemDefinition materialSiliconPress;
-	public AEItemDefinition materialSiliconPrint;
-
-	public AEItemDefinition materialNamePress;
-
-	public AEItemDefinition materialLogicProcessor;
-	public AEItemDefinition materialCalcProcessor;
-	public AEItemDefinition materialEngProcessor;
-
-	public AEItemDefinition materialBasicCard;
-	public AEItemDefinition materialAdvCard;
-
-	public AEItemDefinition materialPurifiedCertusQuartzCrystal;
-	public AEItemDefinition materialPurifiedNetherQuartzCrystal;
-	public AEItemDefinition materialPurifiedFluixCrystal;
-
-	public AEItemDefinition materialCell1kPart;
-	public AEItemDefinition materialCell4kPart;
-	public AEItemDefinition materialCell16kPart;
-	public AEItemDefinition materialCell64kPart;
-	public AEItemDefinition materialEmptyStorageCell;
-
-	public AEItemDefinition materialCardRedstone;
-	public AEItemDefinition materialCardSpeed;
-	public AEItemDefinition materialCardCapacity;
-	public AEItemDefinition materialCardFuzzy;
-	public AEItemDefinition materialCardInverter;
-	public AEItemDefinition materialCardCrafting;
-
-	public AEItemDefinition materialEnderDust;
-	public AEItemDefinition materialFlour;
-	public AEItemDefinition materialGoldDust;
-	public AEItemDefinition materialIronDust;
-	public AEItemDefinition materialFluixDust;
-	public AEItemDefinition materialCertusQuartzDust;
-	public AEItemDefinition materialNetherQuartzDust;
-
-	public AEItemDefinition materialMatterBall;
-	public AEItemDefinition materialIronNugget;
-
-	public AEItemDefinition materialCertusQuartzCrystal;
-	public AEItemDefinition materialCertusQuartzCrystalCharged;
-	public AEItemDefinition materialFluixCrystal;
-	public AEItemDefinition materialFluixPearl;
-
-	public AEItemDefinition materialWoodenGear;
-
-	public AEItemDefinition materialWireless;
-	public AEItemDefinition materialWirelessBooster;
-
-	public AEItemDefinition materialAnnihilationCore;
-	public AEItemDefinition materialFormationCore;
-
-	public AEItemDefinition materialSingularity;
-	public AEItemDefinition materialQESingularity;
-	public AEItemDefinition materialBlankPattern;
-
-}

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

@@ -1,77 +0,0 @@
-/*
- * The MIT License (MIT)
- * 
- * Copyright (c) 2013 AlgorithmX2
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.definitions;
-
-import appeng.api.util.AEColoredItemDefinition;
-import appeng.api.util.AEItemDefinition;
-
-public class Parts
-{
-
-	public AEColoredItemDefinition partCableSmart;
-	public AEColoredItemDefinition partCableCovered;
-	public AEColoredItemDefinition partCableGlass;
-	public AEColoredItemDefinition partCableDense;
-
-	public AEColoredItemDefinition partLumenCableSmart;
-	public AEColoredItemDefinition partLumenCableCovered;
-	public AEColoredItemDefinition partLumenCableGlass;
-	public AEColoredItemDefinition partLumenCableDense;
-
-	public AEItemDefinition partQuartzFiber;
-	public AEItemDefinition partToggleBus;
-	public AEItemDefinition partInvertedToggleBus;
-
-	public AEItemDefinition partStorageBus;
-	public AEItemDefinition partImportBus;
-	public AEItemDefinition partExportBus;
-	public AEItemDefinition partInterface;
-
-	public AEItemDefinition partLevelEmitter;
-
-	public AEItemDefinition partAnnihilationPlane;
-	public AEItemDefinition partFormationPlane;
-
-	public AEItemDefinition partP2PTunnelME;
-	public AEItemDefinition partP2PTunnelRedstone;
-	public AEItemDefinition partP2PTunnelItems;
-	public AEItemDefinition partP2PTunnelLiquids;
-	public AEItemDefinition partP2PTunnelMJ;
-	public AEItemDefinition partP2PTunnelEU;
-	public AEItemDefinition partP2PTunnelRF;
-	public AEItemDefinition partP2PTunnelLight;
-
-	public AEItemDefinition partCableAnchor;
-	public AEItemDefinition partMonitor;
-	public AEItemDefinition partSemiDarkMonitor;
-	public AEItemDefinition partDarkMonitor;
-
-	public AEItemDefinition partInterfaceTerminal;
-	public AEItemDefinition partPatternTerminal;
-	public AEItemDefinition partCraftingTerminal;
-	public AEItemDefinition partTerminal;
-	public AEItemDefinition partStorageMonitor;
-	public AEItemDefinition partConversionMonitor;
-
-}

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

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

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

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

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

@@ -0,0 +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.exceptions;
+
+
+public class CoreInaccessibleException extends RuntimeException
+{
+	private static final long serialVersionUID = -7434641554655517242L;
+
+	public CoreInaccessibleException( final String message )
+	{
+		super( message );
+	}
+}

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

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

src/api/java/appeng/api/exceptions/FailedConnectionException.java

@@ -0,0 +1,56 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.exceptions;
+
+
+import appeng.api.networking.IGridNode;
+
+
+/**
+ * Exception 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 FailedConnectionException extends Exception
+{
+
+	private static final long serialVersionUID = -2544208090248293753L;
+
+	public FailedConnectionException()
+	{
+	}
+
+	public FailedConnectionException( String message )
+	{
+		super( message );
+	}
+}

src/api/java/appeng/api/exceptions/MissingDefinitionException.java

@@ -16,19 +16,15 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.core.features.registries;
+package appeng.api.exceptions;
 
-import net.minecraft.tileentity.TileEntity;
 
-public class WirelessRangeResult
+public class MissingDefinitionException extends RuntimeException
 {
+	private static final long serialVersionUID = -6547396584255825761L;
 
-	public WirelessRangeResult(TileEntity t, float d) {
+	public MissingDefinitionException( final String message )
-		dist = d;
+	{
-		te = t;
+		super( message );
 	}
-
-	final public float dist;
-	final public TileEntity te;
-
 }

src/api/java/appeng/api/exceptions/MissingIngredientException.java

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

src/api/java/appeng/api/exceptions/ModNotInstalledException.java

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,13 +23,14 @@
 
 package appeng.api.exceptions;
 
-public class ModNotInstalled extends Exception
+
+public class ModNotInstalledException extends Exception
 {
 
 	private static final long serialVersionUID = -9052435206368425494L;
 
-	public ModNotInstalled(String t) {
+	public ModNotInstalledException( 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 FailedConnectionException
+{
+
+	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/RecipeException.java

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

src/api/java/appeng/api/exceptions/RegistrationException.java

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

@@ -0,0 +1,84 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 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.features;
+
+
+import javax.annotation.Nonnegative;
+import javax.annotation.Nonnull;
+
+import net.minecraft.item.Item;
+
+import appeng.api.implementations.items.IAEItemPowerStorage;
+
+
+/**
+ * A registry to allow mapping {@link Item}s to a specific charge rate when being placed inside a charger.
+ * 
+ * The registry is used in favor of an additional method for {@link IAEItemPowerStorage} with a fixed value per item.
+ * This allows more flexibility for other charger like machines to choose their own values when needed.
+ * 
+ * There is no guarantee that this is charged per tick, it only represents the value per operation.
+ * By default this is one charging operation every 10 ticks in case of an AE2 charger.
+ * 
+ * @author yueh
+ * @version rv5
+ * @since rv5
+ */
+public interface IChargerRegistry
+{
+
+	/**
+	 * Fetch a charge rate for a specific item.
+	 * 
+	 * The specific item does not need to have a mapping registered at all.
+	 * In this case it will use a default value of 160 AE.
+	 * 
+	 * @param item A {@link Item} implementing {@link IAEItemPowerStorage}.
+	 * @return custom rate or default of 160
+	 */
+	@Nonnegative
+	double getChargeRate( @Nonnull Item item );
+
+	/**
+	 * Register a custom charge rate for a specific item.
+	 * 
+	 * Capped at 16000 to avoid extracting too much energy from a network for each operation.
+	 * This is done silently without any feedback or exception.
+	 * Further the cap is not fixed, it can change at any time in the future should power issues arise.
+	 * 
+	 * @param item A {@link Item} implementing {@link IAEItemPowerStorage}.
+	 * @param chargeRate the custom rate, must be > 0, capped to 16000d
+	 */
+	void addChargeRate( @Nonnull Item item, @Nonnegative double chargeRate );
+
+	/**
+	 * Remove the custom rate for a specific item.
+	 * 
+	 * It will revert to the default value afterwards.
+	 * 
+	 * @param item A {@link Item} implementing {@link IAEItemPowerStorage}.
+	 */
+	void removeChargeRate( @Nonnull Item item );
+
+}

src/api/java/appeng/api/features/IGrinderRecipe.java

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,97 +23,71 @@
 
 package appeng.api.features;
 
+
+import java.util.Optional;
+
+import javax.annotation.Nonnull;
+
 import net.minecraft.item.ItemStack;
 
+
 /**
  * Registration Records for {@link IGrinderRegistry}
  */
-public interface IGrinderEntry
+public interface IGrinderRecipe
 {
 
 	/**
 	 * the current input
-	 * 
+	 *
 	 * @return input that the grinder will accept.
 	 */
-	public ItemStack getInput();
+	@Nonnull
-
+	ItemStack getInput();
-	/**
-	 * lets you change the grinder recipe by changing its input.
-	 * 
-	 * @param input input item
-	 */
-	public void setInput(ItemStack input);
 
 	/**
 	 * gets the current output
-	 * 
+	 *
 	 * @return output that the grinder will produce
 	 */
-	public ItemStack getOutput();
+	@Nonnull
+	ItemStack getOutput();
 
 	/**
 	 * gets the current output
-	 * 
+	 *
 	 * @return output that the grinder will produce
 	 */
-	public ItemStack getOptionalOutput();
+	@Nonnull
+	Optional<ItemStack> getOptionalOutput();
 
 	/**
 	 * gets the current output
-	 * 
+	 *
 	 * @return output that the grinder will produce
 	 */
-	public ItemStack getSecondOptionalOutput();
+	Optional<ItemStack> getSecondOptionalOutput();
-
-	/**
-	 * allows you to change the output.
-	 * 
-	 * @param output output item
-	 */
-	public void setOutput(ItemStack output);
-
-	/**
-	 * stack, and 0.0-1.0 chance that it will be generated.
-	 * 
-	 * @param output output item
-	 * @param chance generation chance
-	 */
-	public void setOptionalOutput(ItemStack output, float chance);
 
 	/**
 	 * 0.0 - 1.0 the chance that the optional output will be generated.
-	 * 
+	 *
 	 * @return chance of optional output
 	 */
-	public float getOptionalChance();
+	@Nonnull
-
+	float getOptionalChance();
-	/**
-	 * stack, and 0.0-1.0 chance that it will be generated.
-	 * 
-	 * @param output second optional output item
-	 * @param chance second optional output chance
-	 */
-	public void setSecondOptionalOutput(ItemStack output, float chance);
 
 	/**
 	 * 0.0 - 1.0 the chance that the optional output will be generated.
-	 * 
+	 *
 	 * @return second optional output chance
 	 */
-	public float getSecondOptionalChance();
+	float getSecondOptionalChance();
 
 	/**
-	 * Energy cost, in turns.
+	 * Amount of turns required to process the item.
-	 * 
+	 *
 	 * @return number of turns it takes to produce the output from the input.
 	 */
-	public int getEnergyCost();
+	int getRequiredTurns();
 
-	/**
-	 * Allows you to adjust the number of turns
-	 * 
-	 * @param c number of turns to produce output.
-	 */
-	public void setEnergyCost(int c);
 }

src/api/java/appeng/api/features/IGrinderRecipeBuilder.java

@@ -0,0 +1,115 @@
+/*
+ * 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.features;
+
+
+import javax.annotation.Nonnegative;
+import javax.annotation.Nonnull;
+
+import net.minecraft.item.ItemStack;
+
+
+/**
+ * Builder for a grinder recipe.
+ * 
+ * The only default value provided are turns at a value of 8.
+ *
+ * @author yueh
+ * @version rv5
+ * @since rv5
+ */
+public interface IGrinderRecipeBuilder
+{
+
+	/**
+	 * Creates an grinder recipe with inputs.
+	 * Needs to be invoked.
+	 *
+	 * @param input new input for the recipe
+	 *
+	 * @return currently used builder
+	 */
+	@Nonnull
+	IGrinderRecipeBuilder withInput( @Nonnull ItemStack input );
+
+	/**
+	 * Creates an grinder recipe with output.
+	 * Needs to be invoked.
+	 *
+	 * @param output new output for the recipe
+	 *
+	 * @return currently used builder
+	 */
+	@Nonnull
+	IGrinderRecipeBuilder withOutput( @Nonnull ItemStack output );
+
+	/**
+	 * Creates an grinder recipe with the first optional output and its chance.
+	 *
+	 * @param optional new first optional for the recipe
+	 * @param chance chance for the first optional output, must be within 0.0 - 1.0
+	 *
+	 * @return currently used builder
+	 */
+	@Nonnull
+	IGrinderRecipeBuilder withFirstOptional( @Nonnull ItemStack optional, float chance );
+
+	/**
+	 * Creates an grinder recipe with the second optional output and its chance.
+	 *
+	 * @param optional new second optional for the recipe
+	 * @param chance chance for the second optional output, must be within 0.0 - 1.0
+	 *
+	 * @return currently used builder
+	 */
+	@Nonnull
+	IGrinderRecipeBuilder withSecondOptional( @Nonnull ItemStack optional, float chance );
+
+	/**
+	 * Creates an grinder recipe with the amount of turns as cost.
+	 * 
+	 * Defaults to 8 when not called.
+	 *
+	 * @param turns new turns for the recipe, must be > 0
+	 *
+	 * @return currently used builder
+	 */
+	@Nonnull
+	IGrinderRecipeBuilder withTurns( @Nonnegative int turns );
+
+	/**
+	 * Finalizes the process of making the recipe.
+	 * Needs to be invoked to fetch grinder recipe.
+	 *
+	 * @return valid grinder 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
+	IGrinderRecipe build();
+}

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,9 +23,14 @@
 
 package appeng.api.features;
 
+
+import java.util.Collection;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import net.minecraft.item.ItemStack;
 
-import java.util.List;
 
 /**
  * Lets you manipulate Grinder Recipes, by adding or editing existing ones.
@@ -34,51 +39,63 @@ public interface IGrinderRegistry
 {
 
 	/**
-	 * Current list of registered recipes, you can modify this if you want too.
+	 * Extensible way to create a grinder recipe.
-	 * 
+	 *
+	 * @return builder for grinder recipes
+	 */
+	@Nonnull
+	IGrinderRecipeBuilder builder();
+
+	/**
+	 * An immutable list of the currently registered recipes.
+	 *
 	 * @return currentlyRegisteredRecipes
 	 */
-	public List<IGrinderEntry> getRecipes();
+	@Nonnull
+	Collection<IGrinderRecipe> getRecipes();
 
 	/**
-	 * add a new recipe the easy way, in &#8594; out, how many turns., duplicates will not be added.
+	 * Add a new recipe to the registry.
-	 * 
-	 * @param in input
-	 * @param out output
-	 * @param turns amount of turns to turn the input into the output
 	 */
-	public void addRecipe(ItemStack in, ItemStack out, int turns);
+	boolean addRecipe( IGrinderRecipe recipe );
 
 	/**
-	 * add a new recipe with optional outputs, duplicates will not be added.
+	 * Remove the specific from the recipe list.
 	 * 
-	 * @param in input
+	 * @param recipe The recipe to be removed.
-	 * @param out output
+	 * @return true, if it was removed
-	 * @param optional optional output
-	 * @param chance chance to get the optional output within 0.0 - 1.0
-	 * @param turns amount of turns to turn the input into the outputs
 	 */
-	void addRecipe(ItemStack in, ItemStack out, ItemStack optional, float chance, int turns);
+	boolean removeRecipe( @Nonnull IGrinderRecipe recipe );
-
-	/**
-	 * add a new recipe with optional outputs, duplicates will not be added.
-	 * 
-	 * @param in input
-	 * @param out output
-	 * @param optional optional output
-	 * @param chance chance to get the optional output within 0.0 - 1.0
-	 * @param optional2 second optional output
-	 * @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
-	 */
-	void addRecipe(ItemStack in, ItemStack out, ItemStack optional, float chance, ItemStack optional2, float chance2, int turns);
 
 	/**
 	 * Searches for a recipe for a given input, and returns it.
-	 * 
+	 *
-	 * @param input input
+	 * @param input The {@link ItemStack} to be grinded.
+	 *
 	 * @return identified recipe or null
 	 */
-	public IGrinderEntry getRecipeForInput(ItemStack input);
+	@Nullable
+	IGrinderRecipe getRecipeForInput( @Nonnull ItemStack input );
+
+	/**
+	 * Allows do add a custom ratio from an ore to dust when being grinded.
+	 * 
+	 * The default ratio is 1 ore to 2 dusts.
+	 * 
+	 * These have to be added before any recipe is registered. Otherwise it will use the default value.
+	 * 
+	 * @param oredictName The name of the ore;
+	 * @param ratio The amount, must be > 0;
+	 */
+	void addDustRatio( @Nonnull String oredictName, int ratio );
+
+	/**
+	 * Remove a custom ratio for a specific ore name.
+	 * 
+	 * Will use the default of 2 value afterwards.
+	 * 
+	 * @param oredictName The name of the ore;
+	 */
+	boolean removeDustRatio( @Nonnull String oredictName );
 
 }

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,97 @@
+/*
+ * 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 rv5
+ * @since rv2
+ */
+public interface IInscriberRegistry
+{
+	/**
+	 * Extensible way to create an inscriber recipe.
+	 *
+	 * @return builder for inscriber recipes
+	 */
+	@Nonnull
+	IInscriberRecipeBuilder builder();
+
+	/**
+	 * 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();
+
+	/**
+	 * 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
+	 * 
+	 * @return true, when successfully added
+	 *
+	 * @throws IllegalArgumentException if null is added
+	 */
+	boolean addRecipe( IInscriberRecipe recipe );
+
+	/**
+	 * Removes all equal recipes from the registry.
+	 * 
+	 * @param toBeRemovedRecipe to be removed recipe, can be null, makes just no sense.
+	 * 
+	 * @return true, when successfully removed
+	 */
+	boolean removeRecipe( IInscriberRecipe toBeRemovedRecipe );
+
+}

src/api/java/appeng/api/features/IItemComparison.java

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

src/api/java/appeng/api/features/IItemComparisonProvider.java

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

src/api/java/appeng/api/features/ILocatable.java

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

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

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

src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,28 +23,28 @@
 
 package appeng.api.features;
 
+
 import net.minecraft.item.ItemStack;
 
-public interface INetworkEncodable {
+
+public interface INetworkEncodable
+{
 
 	/**
 	 * Used to get the current key from the item.
-	 * 
+	 *
 	 * @param item item
+	 *
 	 * @return string key of item
 	 */
-	String getEncryptionKey(ItemStack item);
+	String getEncryptionKey( ItemStack item );
 
 	/**
 	 * Encode the wireless frequency via the Controller.
-	 * 
+	 *
-	 * @param item
+	 * @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);
+	void setEncryptionKey( ItemStack item, String encKey, String name );
-
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
- * Copyright (c) 2013 AlgorithmX2
+ * Copyright (c) 2013 - 2015 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,9 +23,16 @@
 
 package appeng.api.features;
 
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.capabilities.Capability;
+
 import appeng.api.config.TunnelType;
 
+
 /**
  * A Registry for how p2p Tunnels are attuned
  */
@@ -35,20 +42,23 @@ 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
 	 */
-	public abstract void addNewAttunement(ItemStack trigger, TunnelType type);
+	void addNewAttunement( @Nonnull ItemStack trigger, @Nullable TunnelType type );
+
+	void addNewAttunement( @Nonnull String ModId, @Nullable TunnelType type );
+
+	void addNewAttunement( @Nonnull Capability<?> cap, @Nullable TunnelType type );
 
 	/**
 	 * returns null if no attunement can be found.
-	 * 
+	 *
 	 * @param trigger attunement trigger
+	 *
 	 * @return null if no attunement can be found or attunement
 	 */
-	TunnelType getTunnelTypeByItem(ItemStack trigger);
+	@Nonnull
-
+	TunnelType getTunnelTypeByItem( ItemStack trigger );
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
- * Copyright (c) 2013 AlgorithmX2
+ * Copyright (c) 2013 - 2015 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,10 +23,14 @@
 
 package appeng.api.features;
 
-import net.minecraft.entity.player.EntityPlayer;
+
+import javax.annotation.Nullable;
 
 import com.mojang.authlib.GameProfile;
 
+import net.minecraft.entity.player.EntityPlayer;
+
+
 /**
  * Maintains a save specific list of userids and username combinations this greatly simplifies storage internally and
  * gives a common place to look up and get IDs for the security framework.
@@ -36,20 +40,23 @@ public interface IPlayerRegistry
 
 	/**
 	 * @param gameProfile user game profile
+	 *
 	 * @return user id of a username.
 	 */
-	int getID(GameProfile gameProfile);
+	int getID( GameProfile gameProfile );
 
 	/**
 	 * @param player player
+	 *
 	 * @return user id of a player entity.
 	 */
-	int getID(EntityPlayer player);
+	int getID( EntityPlayer player );
 
 	/**
 	 * @param playerID to be found player id
+	 *
 	 * @return PlayerEntity, or null if the player could not be found.
 	 */
-	EntityPlayer findPlayer(int playerID);
+	@Nullable
-
+	EntityPlayer findPlayer( int playerID );
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
- * Copyright (c) 2013 AlgorithmX2
+ * Copyright (c) 2013 - 2015 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,50 +23,66 @@
 
 package appeng.api.features;
 
+
+import javax.annotation.Nullable;
+
 import appeng.api.recipes.ICraftHandler;
 import appeng.api.recipes.IRecipeHandler;
 import appeng.api.recipes.ISubItemResolver;
 
+
+/**
+ * @author AlgorithmX2
+ * @author thatsIch
+ * @version rv3 - 10.08.2015
+ * @since rv0
+ */
 public interface IRecipeHandlerRegistry
 {
 
 	/**
 	 * Add a new Recipe Handler to the parser.
-	 * 
+	 *
 	 * MUST BE CALLED IN PRE-INIT
-	 * 
+	 *
 	 * @param name name of crafthandler
 	 * @param handler class of crafthandler
 	 */
-	void addNewCraftHandler(String name, Class<? extends ICraftHandler> handler);
+	@Deprecated
+	void addNewCraftHandler( String name, Class<? extends ICraftHandler> handler );
 
 	/**
 	 * Add a new resolver to the parser.
-	 * 
+	 *
 	 * MUST BE CALLED IN PRE-INIT
-	 * 
+	 *
 	 * @param sir sub item resolver
 	 */
-	void addNewSubItemResolver(ISubItemResolver sir);
+	void addNewSubItemResolver( ISubItemResolver sir );
 
 	/**
 	 * @param name name of crafting handler
+	 *
 	 * @return A recipe handler by name, returns null on failure.
 	 */
-	ICraftHandler getCraftHandlerFor(String name);
+	@Nullable
+	@Deprecated
+	ICraftHandler getCraftHandlerFor( String name );
 
 	/**
 	 * @return a new recipe handler, which can be used to parse, and read recipe files.
 	 */
-	public IRecipeHandler createNewRecipehandler();
+	@Deprecated
+	IRecipeHandler createNewRecipehandler();
 
 	/**
 	 * resolve sub items by name.
-	 * 
+	 *
 	 * @param nameSpace namespace of item
 	 * @param itemName full name of item
-	 * @return ResolverResult or ResolverResultSet
+	 *
+	 * @return ResolverResult or ResolverResultSet or null if could not resolve
 	 */
-	Object resolveItem(String nameSpace, String itemName);
+	@Nullable
-
+	Object resolveItem( String nameSpace, String itemName );
 }