Merge pull request #1454 from TheJulianJES/doublePlayerInvInscriber

Don't add the player inventory two times (rv2)
2015-05-14 12:43:21 +02:00 · 2015-05-14 12:38:44 +02:00 · 2015-05-10 12:12:08 +02:00 · 2015-05-10 12:11:58 +02:00 · 2015-05-10 10:34:54 +02:00 · 2015-05-10 00:14:56 +02:00
3645 changed files with 141722 additions and 149198 deletions
@@ -1,3 +0,0 @@
-*         text=auto eol=lf
-*.java    text diff=java eol=lf
-*.gradle  text diff=java eol=lf
@@ -1,105 +0,0 @@
-# How to contribute
-
-We want to keep it as easy as possible to contribute changes to support
-the growth and stability of AE2. There are a few guidelines that we
-need contributors to follow so that we can have a chance of keeping on
-top of things.
-
-## Getting Started
-
-### Reporting an Issue
-
-Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue now!
-
-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.
-    * If it is already possible with vanilla and AE2 itself, the suggestion will be considered invalid.
-    * Asking for a smaller version, more compact version, or more efficient version of something will also be considered invalid.
-2. Go to [the issues page](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues) and click [new issue](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/new)
-3. If applicable, use on of the provided templates. It will also contain further details about required or useful information to add.
-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
-
-* Submit an issue to the github project, assuming one does not already exist.
-  * Clearly describe the issue including steps to reproduce when it is a bug.
-  * Make sure you fill in the earliest version that you know has the issue.
-  * Waiting for feedback is suggested.
-* Fork the repository on GitHub
-* Create a topic branch from where you want to base your work.
-  * This `master` branch that is under active development.
-  * Only target release branches if you are certain your fix must be on that
-    branch.
-  * To quickly create a topic branch based on the development branch; `git 
-    checkout -b my_contribution_branch`. Please avoid working 
-    directly on the `master` branch.
-* Make commits of logical units.
-* Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in the proper format.
-  * You can either use the gradle `spotlessCheck` and `spotlessApply` tasks or use the provided eclipse formatter config in `/codeformat`
-
-````
-    (#12345) Make the example in CONTRIBUTING imperative and concrete
-
-    Without this patch applied the example commit message in the CONTRIBUTING
-    document is not a concrete example.  This is a problem because the
-    contributor is left to imagine what the commit message should look like
-    based on a description rather than an example.  This patch fixes the
-    problem by making the example concrete and imperative.
-
-    The first line is a real life imperative statement with a ticket number
-    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 enough in scope, then fully test AE2.
-* Describing the process you used to test your changes in detail will help speed up this process.
-
-## Making Trivial Changes
-
-### Documentation
-
-For changes of a trivial nature to comments and documentation, it is not always necessary to create a new issue. 
-We usually use `squash and merge`. This allows us to easily append the PR number for future reference.
-
-````
-    Add documentation commit example to CONTRIBUTING
-
-    There is no example for contributing a documentation commit
-    to the Puppet repository. This is a problem because the contributor
-    is left to assume how a commit of this nature may appear.
-
-    The first line is a real life imperative statement with '(doc)' in
-    place of what would have been the ticket number in a
-    non-documentation related commit. The body describes the nature of
-    the new documentation or comments added.
-````
-
-### Semantic Changes
-
-In order to keep the code in a state where PRs can be safely merged, it is important to
-avoid changes to syntax or changes that don't add any real value to the code base. PRs
-that make changes only to syntax or "clean up" the code will be rejected. Any code clean-up
-should be coordinated with the core team first.
-
-
-## Style Guidelines
-
-Applied Energistics does not follow standard Java syntax. The guidelines below illustrate
-the styling guidelines used by AE. 
-
-PRs that do not conform to these standards will be rejected.
-
-You can find presets for Eclipse in the `codeformat` folder. For IntelliJ IDEA we recommend the eclipse formatter plugin.
-
-There is also a gradle task available to check for syntax errors (`spotlessCheck`) as well as applying the fixes (`spotlessApply`).
-
-We try to keep them up to date. Please report any problem with maintaining the correct formatting.
-
-# Additional Resources
-
-* [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-* #AppliedEnergistics IRC channel on esper.net
@@ -1,13 +0,0 @@
-<!-- Provide a summary of the issue in the Title above, please do not "[Tag]" it. -->
-
-**Describe the issue**
-<!-- 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 -->
-<!-- A forced crash report by pressing F3+c for 10 seconds. Use pastebin, gist, etc. -->
-<!-- Without it, we will automatically close the issue. -->
-
- Environment: 
@@ -1,28 +0,0 @@
---
-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 -->
-<!-- A forced crash report by pressing F3+c for 10 seconds. Use pastebin, gist, etc. -->
-<!-- Without it, we will automatically close the issue. -->
-
- Environment: 
@@ -1,17 +0,0 @@
---
-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. -->
@@ -1,33 +0,0 @@
-name: 'Build branches'
-
-on:
-  push:
-    branches-ignore: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Use gradle cache for faster builds
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-      - name: Validate no assets
-        run: test ! -d ./src/generated
-      - name: Generate assets
-        uses: GabrielBB/xvfb-action@v1.2
-        with:
-          run: ./gradlew runData --no-daemon
-      - name: Validate assets
-        run: test -d ./src/generated
-      - name: Build with Gradle
-        run: ./gradlew build --no-daemon
@@ -1,15 +0,0 @@
-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'
@@ -1,33 +0,0 @@
-name: 'Build master'
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Use gradle cache for faster builds
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-      - name: Validate no assets
-        run: test ! -d ./src/generated
-      - name: Generate assets
-        uses: GabrielBB/xvfb-action@v1.2
-        with:
-          run: ./gradlew runData --no-daemon
-      - name: Validate assets
-        run: test -d ./src/generated
-      - name: Build with Gradle
-        run: ./gradlew build --no-daemon
@@ -1,39 +0,0 @@
-name: 'Build PRs'
-
-on:
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Use gradle cache for faster builds
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-      - name: Validate no assets
-        run: test ! -d ./src/generated
-      - name: Generate assets
-        uses: GabrielBB/xvfb-action@v1.2
-        with:
-          run: ./gradlew runData --no-daemon
-      - name: Validate assets
-        run: test -d ./src/generated
-      - name: Build with Gradle
-        env:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-        run: ./gradlew build --no-daemon
-      - uses: actions/upload-artifact@v2
-        with:
-          name: dist
-          path: build/libs/
@@ -1,59 +0,0 @@
-name: 'Release'
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Validate semver
-        env:
-          TAG: ${{ github.event.release.tag_name }}
-        run: |
-          echo $TAG | grep -oP '^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'
-          echo "::set-env name=RELEASE::${TAG:1}"
-      - name: Export keystore
-        env:
-          KEY_STORE: ${{ secrets.KEY_STORE }}
-        run: |
-          echo $KEY_STORE | base64 -d > $HOME/keystore.jks
-          echo "::set-env name=KEY_STORE_FILE::$HOME/keystore.jks"
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Validate no assets
-        run: test ! -d ./src/generated
-      - name: Generate assets
-        uses: GabrielBB/xvfb-action@v1.2
-        with:
-          run: ./gradlew runData --no-daemon
-      - name: Validate assets
-        run: test -d ./src/generated
-      - name: Build, sign, and publish with Gradle
-        env:
-          KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
-          KEY_STORE_ALIAS: ${{ secrets.KEY_STORE_ALIAS }}
-          KEY_STORE_KEY_PASS: ${{ secrets.KEY_STORE_KEY_PASS }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build publish --no-daemon
-      - name: Prepare artifact metadata
-        id: prepare_artifact_metadata
-        run: |
-          echo ::set-output name=ARTIFACT_PATH::./build/libs/appliedenergistics2-${RELEASE}.jar
-          echo ::set-output name=ARTIFACT_NAME::appliedenergistics2-${RELEASE}.jar
-      - name: Upload Release Artifact
-        uses: actions/upload-release-asset@v1.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ steps.prepare_artifact_metadata.outputs.ARTIFACT_PATH }}
-          asset_name: ${{ steps.prepare_artifact_metadata.outputs.ARTIFACT_NAME }}
-          asset_content_type: application/zip
@@ -8,26 +8,17 @@
 !gradlew.bat
 !build.gradle
 !gradle.properties
-!.travis.yml

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

-# include sourcecode except generated
+# include sourcecode
 !src/
-src/generated

 # include git important files
 !.gitmodules
 !.gitignore
-!.gitattributes

 # code format to reduce noise in git commits
-!codeformat/
-
-# Github specific files and directories
-!.github/
-
-# Explicit ignores
-Thumbs.db
+!codeformat/
@@ -0,0 +1,152 @@
+# How to contribute
+
+We want to keep it as easy as possible to contribute changes to support
+the growth and stability of AE2. There are a few guidelines that we
+need contributors to follow so that we can have a chance of keeping on
+top of things.
+
+## Getting Started
+
+### Reporting an Issue
+
+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!
+
+### Submitting Changes
+
+* Submit an issue to the github project, assuming one does not already exist.
+  * Clearly describe the issue including steps to reproduce when it is a bug.
+  * Make sure you fill in the earliest version that you know has the issue.
+* Fork the repository on GitHub
+* Create a topic branch from where you want to base your work.
+  * This is revison branch that is under active development.
+  * Only target release branches if you are certain your fix must be on that
+    branch.
+  * To quickly create a topic branch based on the development branch; `git 
+    checkout -b fix/master/my_contribution branch`. Please avoid working 
+    directly on the `active development` branch.
+* Make commits of logical units.
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are in the proper format.
+
+````
+    (#12345) Make the example in CONTRIBUTING imperative and concrete
+
+    Without this patch applied the example commit message in the CONTRIBUTING
+    document is not a concrete example.  This is a problem because the
+    contributor is left to imagine what the commit message should look like
+    based on a description rather than an example.  This patch fixes the
+    problem by making the example concrete and imperative.
+
+    The first line is a real life imperative statement with a ticket number
+    from our issue tracker.  The body describes the behavior without the patch,
+    why this is a problem, and how the patch fixes the problem when applied.
+````
+* Always fully test your changes. If they are large engouh in scope, then fully
+	test AE2.
+* Describing the process you used to test your changes in detail will help speed
+  up this process.
+
+## Making Trivial Changes
+
+### Documentation
+
+For changes of a trivial nature to comments and documentation, it is not
+always necessary to create a new issue. In this case, it is
+appropriate to start the first line of a commit with '(doc)' instead of
+a ticket number.
+
+````
+    (doc) Add documentation commit example to CONTRIBUTING
+
+    There is no example for contributing a documentation commit
+    to the Puppet repository. This is a problem because the contributor
+    is left to assume how a commit of this nature may appear.
+
+    The first line is a real life imperative statement with '(doc)' in
+    place of what would have been the ticket number in a
+    non-documentation related commit. The body describes the nature of
+    the new documentation or comments added.
+````
+
+### Semantic Changes
+
+In order to keep the code in a state where PRs can be safely merged, it is important to
+avoid changes to syntax or changes that don't add any real value to the code base. PRs
+that make changes only to syntax or "clean up" the code will be rejected. Any code clean-up
+should be coordinated with the core team first.
+
+
+## Style Guidelines
+
+Applied Energistics does not follow standard Java syntax. The guidelines below illustrate
+the styling guidelines used by AE. 
+
+PRs that do not conform to these standards will be rejected.
+
+### Whitespace
+
+#### Tabs or spaces
+Configure your IDE to use tabs as padding whitespace. Ensure that there is no extra whitespace 
+at the end of lines, or on blank lines.
+
+#### Pad parenthes with whitespace
+````
+if( item.equals( newItem )
+
+public void DeleteItem( item )
+
+catch( Throwable )
+````
+
+### Braces
+
+Place opening and closing braces on a new line. Always include open and close braces, even if
+the body is a single line.
+
+````
+if( item.equals( newItem )
+{
+
+}
+else
+{
+
+}
+
+public void DeleteItem( item )
+{
+
+}
+````
+
+## Submitting Changes
+
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request to the repository in the puppetlabs organization.
+* Update your issue to mark that you have submitted code and are ready for it to be reviewed.
+  * Include a link to the pull request in the ticket.
+* The core team looks at Pull Requests on a regular basis.
+  * There are many reasons why it will take a long time to pull your PR. Be patient, we'll
+    get to it.
+* After feedback has been given we expect responses within two weeks. After two
+  weeks will may close the pull request if it isn't showing any activity.
+
+# Additional Resources
+
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* #AppliedEnergistics IRC channel on esper.net
@@ -1,6 +1,5 @@
-[![Build master](https://img.shields.io/github/workflow/status/AppliedEnergistics/Applied-Energistics-2/Build%20master?style=flat-square)](https://github.com/AppliedEnergistics/Applied-Energistics-2/actions?query=workflow%3A%22Build+master%22)
-[![Latest Release](https://img.shields.io/github/v/release/AppliedEnergistics/Applied-Energistics-2?style=flat-square&label=Release)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases)
-[![Latest PreRelease](https://img.shields.io/github/v/release/AppliedEnergistics/Applied-Energistics-2?include_prereleases&style=flat-square&label=Pre)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases)
+<!--[![Latest Release](https://img.shields.io/github/tag/AppliedEnergistics/Applied-Energistics-2.svg?label=Latest Release)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases) -->
+[![Latest Build](https://img.shields.io/teamcity/http/ci.tsr.me/s/AppliedEnergistics_AutoHeadBuild.svg?label=Latest Build)](http://ci.tsr.me/viewType.html?buildTypeId=AppliedEnergistics_AutoHeadBuild&tab=buildTypeStatusDiv)

 # Applied Energistics 2

@@ -15,7 +14,6 @@
 * [Building](#building)
 * [Contribution](#contribution)
 * [API](#applied-energistics-2-api)
-* [CraftTweaker](#applied-energistics-2-crafttweaker)
 * [Localization](#applied-energistics-2-localization)
 * [Credits](#credits)

@@ -28,21 +26,20 @@ A Mod about Matter, Energy and using them to conquer the world..
 * [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)
-* [Discord](https://discord.gg/GygKjjm)

 ## License

 * Applied Energistics 2 API
-  - (c) 2013 - 2020 AlgorithmX2 et al
-  - [![License](https://img.shields.io/badge/License-MIT-red.svg?style=flat-square)](http://opensource.org/licenses/MIT)
+  - (c) 2013 - 2015 AlgorithmX2 et al
+  - ![License](https://img.shields.io/badge/License-MIT-red.svg?style=flat)
 * Applied Energistics 2
-  - (c) 2013 - 2020 AlgorithmX2 et al
-  - [![License](https://img.shields.io/badge/License-LGPLv3-blue.svg?style=flat-square)](https://raw.githubusercontent.com/AppliedEnergistics/Applied-Energistics-2/rv2/LICENSE)
+  - (c) 2013 - 2015 AlgorithmX2 et al
+  - [![License](https://img.shields.io/badge/License-LGPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/AppliedEnergistics/Applied-Energistics-2/rv2/LICENSE)
 * Textures and Models
-  - (c) 2013 - 2020 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/)
+  - (c) 2013 - 2015 AlgorithmX2 et al
+  - [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%203.0-yellow.svg?style=flat)](https://creativecommons.org/licenses/by-nc-sa/3.0/)
 * Text and Translations
-  - [![License](https://img.shields.io/badge/License-No%20Restriction-green.svg?style=flat-square)](https://creativecommons.org/publicdomain/zero/1.0/)
+  - ![License](https://img.shields.io/badge/License-No%20Restriction-green.svg?style=flat)

 ## Downloads

@@ -56,34 +53,42 @@ You install this mod by putting it into the `minecraft/mods/` folder. It has no

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

-1. Make sure your issue 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.
-    * If it is already possible with vanilla and AE2 itself, the suggestion will be considered invalid.
-    * Asking for a smaller version, more compact version, or more efficient version of something will also be considered invalid.
-2. Go to [the issues page](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues) and click [new issue](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/new)
-3. If applicable, use on of the provided templates. It will also contain further details about required or useful information to add.
-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. 
+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. Build using the gradle `build` task. Jar will be in `build/libs`
-3. For core developer: Setup IDE
-  - IntelliJ: Import as gradle project
-  - Eclipse: Import as gradle project or execute gradle task `eclipse` and potentially `genEclipseRuns`
+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).

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

 * A PR should be focused on content. Any PRs where the changes are only syntax will be rejected.
@@ -94,7 +99,7 @@ Here are a few things to keep in mind that will help get your PR approved.
  - 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**
+Getting Started

 1. Fork this repository
 2. Clone the fork via
@@ -102,7 +107,7 @@ Here are a few things to keep in mind that will help get your PR approved.
  * 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 "<summary of made changes>"`
+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
@@ -114,61 +119,21 @@ If you are only doing single file pull requests, GitHub supports using a quick w

 The API for Applied Energistics 2. It is open source to discuss changes, improve documentation, and provide better add-on support in general.

-Universal builds obtained [Here](http://ae2.ae-mod.info/Downloads/) should work in a development environment.
+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_-_____-__:api"
+	    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:rv5-stable-1:api` for the API only or `appeng:appliedenergistics2:rv5-stable-1`  for the whole mod.
-
-## Applied Energistics 2 CraftTweaker
-
-### Inscriber
-
-The inscriber uses the vanilla recipe system with a custom `type` of `appliedenergistics2:inscriber`.
-See the [inscriber recipe folder](src/main/resources/data/appliedenergistics2/recipes/inscriber) for some examples.
-
-### Grindstone
-
-The grindstone uses the vanilla recipe system with a custom `type` of `appliedenergistics2:grinder`.
-See the [grinder recipe folder](src/main/resources/data/appliedenergistics2/recipes/grinder) for some examples.
-
-### Spatial
-Whitelist a TileEntity class for Spatial IO.
-
-	mods.appliedenergistics2.Spatial.whitelistEntity( String fullEntityClassName );
-
-### Attunement
-Attune a ItemStack or ModID to a specific P2P-Tunnel type. ModID's are used as fallback when no ItemStack was found.
-
-	mods.appliedenergistics2.Attunement.attuneME( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneME( String modID );
-	mods.appliedenergistics2.Attunement.attuneItem( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneItem( String modID );
-	mods.appliedenergistics2.Attunement.attuneFluid( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneFluid( String modID );
-	mods.appliedenergistics2.Attunement.attuneRedstone( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneRedstone( String modID );
-	mods.appliedenergistics2.Attunement.attuneRF( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneRF( String modID );
-	mods.appliedenergistics2.Attunement.attuneIC2( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneIC2( String modID );
-	mods.appliedenergistics2.Attunement.attuneLight( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneLight( String modID );
-
-### Cannon
-Add ammo types for the matter cannon.
-
-	mods.appliedenergistics2.Cannon.registerAmmo( ItemStack itemStack, double weight );
+An example string would be `appeng:appliedenergistics2:rv2-alpha-30:dev`

 ## Applied Energistics 2 Localization

@@ -180,17 +145,9 @@ Add ammo types for the matter cannon.

 Files must be encoded as UTF-8.

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

-The language files are located in `/src/main/resources/assets/appliedenergistics2/lang/` and use the [appropriate locale code](http://minecraft.gamepedia.com/Language) as name and `.lang` as extension.
-
-To update an translation edit the corresponding file and improve/correct the existing entry. Or copy any entries from `en_US.lang` for missing translation.
-
-To create a new translation, copy the contents of `en_US.lang`, create a new file with appropriate filename, and translate it to your language.
-
-Please keep in mind that we use [String format](https://docs.oracle.com/javase/8/docs/api/java/util/Formatter.html) to pass additional data to the text for displaying.
-Therefore you should preserve parts like `%s` or `%1$d%%`, which allows us to replace them with the correct values while you still have the option to change their order for match the rules of grammar.
-This might not be possible for some languages. Should this be the case, please contact us.
+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

@@ -1,6 +1,6 @@
 /*
 * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
+ * 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
@@ -16,176 +16,103 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-buildscript {
-    repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
-    }
-}
-
-plugins {
-  id "maven-publish"
-  id "com.diffplug.gradle.spotless" version "4.3.0"
-  id "org.sonarqube" version "2.8"
-  id "jacoco"
-}
-
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: "eclipse"
-
-repositories {
-    mavenLocal()
-    jcenter()
-    mavenCentral()
-}
-
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
-compileJava {
-    sourceCompatibility = 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'
-}
-
-// Create version number
-version = version_major + "." + version_minor + "." + version_patch
-
-ext.pr = System.getenv('PR_NUMBER') ?: ""
-if (ext.pr) {
-  version = version + "+pr." + ext.pr
-}
-
-ext.branch = System.getenv('BRANCH') ?: ""
-if (ext.branch) {
-  version = version + "+branch." + ext.branch
-}
-
-ext.release = System.getenv('RELEASE') ?: ""
-if (ext.release) {
-  version = ext.release
-}
-
-
-// Maven group and artifact name
-group = artifact_group
-archivesBaseName = artifact_basename
-
-sourceSets {
-    api
-    main {
-        compileClasspath += sourceSets.api.output
-        runtimeClasspath += sourceSets.api.output
-        resources {
-            srcDir 'src/generated/resources'
-        }
-    }
-    test {
-        compileClasspath += sourceSets.api.output
-        runtimeClasspath += sourceSets.api.output
-        java {
-            exclude '**/*'
-        }
-    }
-}
-
-configurations {
-    apiCompile.extendsFrom(compile)
-}
+apply plugin: 'forge'

 apply from: 'gradle/scripts/dependencies.gradle'
-apply from: 'gradle/scripts/spotless.gradle'
+apply from: 'gradle/scripts/artifacts.gradle'
+apply from: 'gradle/scripts/autoinstallruntime.gradle'
+apply from: 'gradle/scripts/integration.gradle'
+apply from: 'gradle/scripts/optional.gradle'
+
+buildscript {
+    repositories {
+        mavenLocal()
+        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'
+    }
+}
+
+configurations.all {
+    resolutionStrategy.cacheDynamicVersionsFor 7200, 'hours'
+}
+
+sourceCompatibility = JavaVersion.VERSION_1_6
+targetCompatibility = JavaVersion.VERSION_1_6
+
+version = aeversion + "-" + aechannel + "-" + aebuild
+group = aegroup
+archivesBaseName = aebasename
+
+// 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("/", "-")
+}
+
+// Add Coremod Manifest
+jar {
+    manifest {
+        attributes 'FMLCorePlugin': 'appeng.transformer.AppEngCore'
+        attributes 'FMLCorePluginContainsFMLMod': 'true'
+    }
+
+    // specify which files are really included, can control which APIs should be in
+    include "appeng/**"
+    include "assets/**"
+    include "mcmod.info"
+    include "pack.mcmeta"
+}

 minecraft {
-    mappings channel: "snapshot", version: project.mcp_mappings
+    version = minecraft_version + "-" + forge_version

-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+    replaceIn "AEConfig.java"
+    replace "@version@", project.version
+    replace "@aechannel@", aechannel

-    runs {
-        client {
-            property 'forge.logging.console.level', 'debug'
-            workingDirectory project.file('run')
-            mods {
-                appliedenergistics2 {
-                    source sourceSets.main
-                    source sourceSets.api
-                }
-            }
+    // used when launching minecraft in dev env
+    runDir = "run"
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs += 'src/api/java'
+            srcDirs += 'src/main/java/'
        }
-        server {
-            property 'forge.logging.console.level', 'debug'
-            workingDirectory project.file('run')
-            mods {
-                appliedenergistics2 {
-                    source sourceSets.main
-                    source sourceSets.api
-                }
-            }
-        }
-        data {
-            property 'forge.logging.console.level', 'debug'
-            workingDirectory project.file('run')
-            args '--mod', 'appliedenergistics2', '--all', '--output', file('src/generated/resources/')
-            mods {
-                appliedenergistics2 {
-                    source sourceSets.main
-                    source sourceSets.api
-                }
-            }
+
+        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/*"
        }
    }
 }

-def signProps = [:]
-if (System.getenv("KEY_STORE_FILE")) {
-    signProps['keyStore'] = System.getenv("KEY_STORE_FILE")
-    signProps['storePass'] = System.getenv("KEY_STORE_PASS")
-    signProps['alias'] = System.getenv("KEY_STORE_ALIAS")
-    signProps['keyPass'] = System.getenv("KEY_STORE_KEY_PASS")
-}
-
-task signJar(type: net.minecraftforge.gradle.common.task.SignJar, dependsOn: 'reobfJar') {
-    onlyIf { !signProps.isEmpty() }
-
-    if (!signProps.isEmpty()) {
-        keyStore = signProps.keyStore
-        alias = signProps.alias
-        storePass = signProps.storePass
-        keyPass = signProps.keyPass
-
-        inputFile = jar.archivePath
-        outputFile = jar.archivePath
+processResources {
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+        expand 'version': project.version, 'mcversion': minecraft_version
+        include 'pack.mcmeta'
    }
-}
-
-apply from: 'gradle/scripts/artifacts.gradle'
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            groupId = project.group
-            artifactId = project.archivesBaseName
-            version = project.version
-            from components.java
-            artifact sourcesJar
-            artifact javadocJar
-            artifact apiJar
-        }
-    }
-    repositories {
-        maven {
-            credentials {
-                username System.getenv("GITHUB_ACTOR")
-                password System.getenv("GITHUB_TOKEN")
-            }
-            name = "GitHubPackages"
-            url = "https://maven.pkg.github.com/AppliedEnergistics/Applied-Energistics-2"
-        }
-    }
-}
+}
@@ -1,11 +0,0 @@
-#Organize Import Order
-#Sat Jun 13 15:22:41 CEST 2015
-8=appeng
-7=
-6=cpw
-5=net
-4=io
-3=org
-2=com
-1=javax
-0=java
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+    This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+    Checkstyle-Configuration: AE2
+    Description: none
+-->
+<module name="Checker">
+  <property name="severity" value="warning"/>
+  <module name="TreeWalker">
+    <property name="tabWidth" value="4"/>
+    <module name="ConstantName"/>
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName"/>
+    <module name="MemberName"/>
+    <module name="MethodName"/>
+    <module name="PackageName"/>
+    <module name="ParameterName"/>
+    <module name="StaticVariableName"/>
+    <module name="TypeName"/>
+    <module name="AvoidStarImport"/>
+    <module name="IllegalImport"/>
+    <module name="RedundantImport"/>
+    <module name="UnusedImports"/>
+    <module name="EmptyForIteratorPad"/>
+    <module name="MethodParamPad"/>
+    <module name="NoWhitespaceAfter">
+      <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+    </module>
+    <module name="NoWhitespaceBefore"/>
+    <module name="OperatorWrap"/>
+    <module name="ParenPad">
+      <property name="option" value="space"/>
+    </module>
+    <module name="TypecastParenPad">
+      <property name="option" value="space"/>
+      <property name="tokens" value="RPAREN,TYPECAST"/>
+    </module>
+    <module name="WhitespaceAfter"/>
+    <module name="WhitespaceAround"/>
+    <module name="ModifierOrder"/>
+    <module name="RedundantModifier"/>
+    <module name="AvoidNestedBlocks"/>
+    <module name="EmptyBlock">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="LeftCurly">
+      <property name="option" value="nl"/>
+    </module>
+    <module name="NeedBraces"/>
+    <module name="RightCurly">
+      <property name="option" value="alone"/>
+    </module>
+    <module name="AvoidInlineConditionals">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="EmptyStatement"/>
+    <module name="EqualsHashCode"/>
+    <module name="HiddenField"/>
+    <module name="IllegalInstantiation"/>
+    <module name="InnerAssignment"/>
+    <module name="MagicNumber"/>
+    <module name="MissingSwitchDefault"/>
+    <module name="RedundantThrows">
+      <property name="suppressLoadErrors" value="true"/>
+    </module>
+    <module name="SimplifyBooleanExpression"/>
+    <module name="SimplifyBooleanReturn"/>
+    <module name="FinalClass"/>
+    <module name="HideUtilityClassConstructor"/>
+    <module name="InterfaceIsType"/>
+    <module name="VisibilityModifier"/>
+    <module name="ArrayTypeStyle"/>
+    <module name="FinalParameters"/>
+    <module name="UpperEll"/>
+  </module>
+  <module name="Translation"/>
+  <module name="RegexpSingleline">
+    <property name="format" value="\s+$"/>
+    <property name="message" value="Line has trailing spaces."/>
+  </module>
+  <module name="Header">
+    <property name="severity" value="error"/>
+    <property name="headerFile" value="${config_loc}/copyright.txt"/>
+    <property name="fileExtensions" value="java"/>
+  </module>
+</module>
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="18">
-<profile kind="CodeFormatterProfile" name="AE2" version="18">
-<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_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_logical_operator" value="insert"/>
-<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="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not 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_after_arrow_in_switch_default" 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_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
-<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.number_of_blank_lines_before_code_block" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<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="16"/>
-<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.comment.count_line_length_from_starting_position" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<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.insert_space_before_arrow_in_switch_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
-<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_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<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="do not 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="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<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.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"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<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="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<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="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
-<setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
-<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="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.parentheses_positions_in_catch_clause" value="common_lines"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
-<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"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<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="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
-<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_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="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="16"/>
-<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="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
-<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.alignment_for_relational_operator" value="0"/>
-<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_unary_operator" value="do not insert"/>
-<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="false"/>
-<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_after_additive_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not 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_space_after_string_concatenation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not 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.text_block_indentation" value="0"/>
-<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.alignment_for_module_statements" value="16"/>
-<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.number_of_blank_lines_after_code_block" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<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.align_assignment_statements_on_columns" value="false"/>
-<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="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
-<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="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not 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_closing_paren_in_switch" value="do not 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="true"/>
-<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="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
-<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.alignment_for_bitwise_operator" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_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="80"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<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="16"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<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="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="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.formatter.insert_space_after_not_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<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="16"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
-<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"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<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="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="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="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
-<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="do not 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="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="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
-<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_after_shift_operator" value="insert"/>
-<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"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_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.wrap_before_additive_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<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="false"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
-<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.wrap_before_string_concatenation" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-</profile>
-</profiles>
@@ -0,0 +1,10 @@
+#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
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="12">
+<profile kind="CodeFormatterProfile" name="Algo" version="12">
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="do not insert"/>
+<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.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.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.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.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_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.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.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.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_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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="insert"/>
+<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.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.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.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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<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.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.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<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.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_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.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_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_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.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.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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<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_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.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"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="0"/>
+<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_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"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="insert"/>
+<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.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.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.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.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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<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_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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<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.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.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"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<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_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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<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.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"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+<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.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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="insert"/>
+<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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<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.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"/>
+</profile>
+</profiles>
@@ -1,5 +1,5 @@
 This file is part of Applied Energistics 2.
-Copyright (c) 2013 - $YEAR, AlgorithmX2, All rights reserved.
+Copyright (c) 2013 - $today.year, 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
@@ -1,34 +1,57 @@
-version_major=0
-version_minor=0
-version_patch=0
-
-artifact_group=appeng
-artifact_basename=appliedenergistics2
+aeversion=rv2
+aechannel=beta
+aebuild=0
+aegroup=appeng
+aebasename=appliedenergistics2

 #########################################################
-# Minecraft Versions                                    #
+# Versions                                              #
 #########################################################
-minecraft_release=1.15
-minecraft_version=1.15.2
-mcp_mappings=20200701-1.15.1
-forge_version=31.2.20
+minecraft_version=1.7.10
+forge_version=10.13.2.1291
+
+#########################################################
+# Installable                                           #
+#########################################################
+waila_version=1.5.10
+jabba_version=1.2.1a
+enderstorage_version=1.4.7.33
+translocator_version=1.1.1.14
+ic2_version=2.2.717
+enderio_version=2.3.0.375_beta
+#cofhlib_version=1.0.1-157
+#cofhcore_version=3.0.2-270
+#texpansion_version=4.0.0-176
+#tfoundation_version=1.0.0-82
+betterstorage_version=0.11.3.123.20
+invtweaks_version=1.58

 #########################################################
 # Provided APIs                                         #
 #########################################################
-jei_version=6.0.0.4
-top_version=2.0.4-5
-hwyla_version=1.10.8-B72_1.15.2
-ctm_version=MC1.15.2-1.1.0.9
+fmp_version=1.1.1.324
+code_chicken_lib_version=1.1.3.127
+code_chicken_core_version=1.0.4.35
+nei_version=1.0.4.90
+bc_version=6.4.6

 #########################################################
-# Deployment                                            #
+# Self Compiled APIs                                    #
 #########################################################
-website_version=1.15.2
-curse_versions=1.15.2
+mekansim_version=8.0.1.198
+rotarycraft_version=V5c
+

 #########################################################
-# Gradle                                                #
+# Self Compiled 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                                               #
 #########################################################
-# Various tasks like runData will fail when run as daemon
-org.gradle.daemon=false
+api_coloredlightscore_version=1
+api_craftguide_version=1
+api_immibis_version=1
+api_mfr_version=1
+api_railcraft_version=1
+api_rblocks_version=1
+api_rf_version=2
@@ -1,81 +1,43 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-processResources {
-    exclude '.cache'
-}
-
-jar {
-    finalizedBy 'reobfJar'
-    finalizedBy 'signJar'
-
-    from sourceSets.main.output.classesDirs
-    from sourceSets.api.output.classesDirs
-    from sourceSets.main.output.resourcesDir
-    from sourceSets.api.output.resourcesDir
-
-    manifest {
-        attributes([
-                "Specification-Title": "Applied Energistics 2",
-                "Specification-Vendor": "TeamAppliedEnergistics",
-                "Specification-Version": "${project.version}",
-                "Implementation-Title": "${project.name}",
-                "Implementation-Version": "${project.version}",
-                "Implementation-Vendor" :"TeamAppliedEnergistics",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-        ])
-    }
-}
-
-task javadocs(type: Javadoc) {
-    classpath = sourceSets.main.compileClasspath
+task myJavadocs(type: Javadoc) {
    source = sourceSets.api.java
    include "appeng/api/**"

-    options.addStringOption('Xdoclint:none', '-quiet')
-    options.encoding = 'UTF-8'
-    options.charSet = 'UTF-8'
+    classpath = configurations.compile
 }

-task javadocJar(type: Jar, dependsOn: javadocs) {
-    classifier = "javadoc"
-    from javadoc.destinationDir
+task javadocJar(type: Jar, dependsOn: myJavadocs) {
+    classifier = 'javadoc'
+    from 'build/docs/javadoc/'
 }

-task sourcesJar(type: Jar) {
-    classifier = "sources"
-    from sourceSets.main.allJava
-    from sourceSets.api.allJava
+task devJar(type: Jar) {
+
+    manifest {
+        attributes 'FMLCorePlugin': 'appeng.transformer.AppEngCore'
+        attributes 'FMLCorePluginContainsFMLMod': 'true'
+    }
+
+    from(sourceSets.main.output) {
+        include "appeng/**"
+        include "assets/**"
+        include 'mcmod.info'
+    }
+
+    classifier = 'dev'
 }

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

-    // TODO: when FG bug is fixed, remove allJava from the api jar.
-    // https://github.com/MinecraftForge/ForgeGradle/issues/369
-    // Gradle should be able to pull them from the -sources jar.
-    from sourceSets.api.allJava
+    from sourceSets.main.output
+    include "appeng/api/**"
+
+    classifier = 'api'
 }

 artifacts {
-    archives javadocJar
-    archives sourcesJar
+    archives devJar
    archives apiJar
+    archives javadocJar
 }
@@ -0,0 +1,12 @@
+// 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
@@ -16,12 +16,13 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

+
+
 repositories {
    mavenLocal()
-
-    maven { // modmaven, maven proxy
-        name 'modmaven'
-        url "https://modmaven.k-4u.nl/"
+    maven {
+        name "ChickenBones"
+        url "http://chickenbones.net/maven/"
    }

    maven {
@@ -30,58 +31,89 @@ repositories {
    }

    maven {
-        name = "JEI repo"
-        url "http://dvs1.progwml6.com/files/maven"
+        name "FireBall API Depot"
+        url "http://dl.tsr.me/artifactory/libs-release-local"
    }

    maven {
-        name = "Tesla repo"
-        url "http://maven.mcmoddev.com"
+        name = "Player"
+        url = "http://maven.ic2.player.to/"
    }

    maven {
-        name = "IC2 repo"
-        url = "http://maven.ic2.player.to"
+        name = "Tterrag"
+        url = "http://maven.tterrag.com/"
    }

-    maven {
-        name = "CoFH Maven"
-        url = "http://maven.covers1624.net"
+    maven  {
+        name = "RX14 Proxy"
+        url = "http://mvn.rx14.co.uk/repo/"
    }
+//  CurseForge DNS for TE is not available or I am just being unlucky, code part can stay since this is applicable to any other curseforge mod though
+//    ivy {
+//        name = "CoFHLib"
+//        artifactPattern "http://addons.cursecdn.com/files/2212/893/[module]-[revision].[ext]"
+//    }
+//
+//    ivy {
+//        name = "CoFHCore"
+//        artifactPattern "http://addons.cursecdn.com/files/2212/895/[module]-[revision].[ext]"
+//    }

-    maven { // TheOneProbe
-        name 'tterrag maven'
-        url "http://maven.tterrag.com/"
-    }
+//    ivy {
+//        name = "ThermalExpansion"
+//        artifactPattern "http://addons.curse.cursecdn.com/files/2212/446/[module]-[revision].[ext]"
+//    }

-    maven {
-        name 'mcjty'
-        url "http://maven.k-4u.nl/"
-    }
+//    ivy {
+//        name = "ThermalFoundation"
+//        artifactPattern "http://addons.curse.cursecdn.com/files/2212/444/[module]-[revision].[ext]"
+//    }
+}

-   	maven { // CraftTweaker
-        name 'jared maven'
-        url "http://maven.blamejared.com/"
-    }
-
-    maven {
-		name = "CurseForge"
-		url = "https://minecraft.curseforge.com/api/maven/"
-	}
+configurations {
+    mods
 }

 dependencies {
-    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+    // installable
+    mods "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev"
+    mods "mcp.mobius.jabba:Jabba:${jabba_version}_${minecraft_version}:dev"
+    mods "codechicken:EnderStorage:${minecraft_version}-${enderstorage_version}:dev"
+    mods "codechicken:Translocator:${minecraft_version}-${translocator_version}:dev"
+    mods "net.industrial-craft:industrialcraft-2:${ic2_version}-experimental:dev"
+    mods "com.enderio:EnderIO:${minecraft_version}-${enderio_version}:dev"
+    mods "net.mcft.copy.betterstorage:BetterStorage:${minecraft_version}-${betterstorage_version}:deobf"
+    mods "inventorytweaks:InventoryTweaks:${invtweaks_version}:deobf"
+//    mods name: 'CoFHLib', version: "[${minecraft_version}]${cofhlib_version}-dev", ext: 'jar'
+//    mods name: 'CoFHCore', version: "[${minecraft_version}]${cofhcore_version}-dev", ext: 'jar'
+//    mods name: 'ThermalExpansion', version: "[${minecraft_version}]${texpansion_version}-dev", ext: 'jar'
+//    mods name: 'ThermalFoundation', version: "[${minecraft_version}]${tfoundation_version}-dev", ext: 'jar'

-    // compile against provided APIs
-    compileOnly "mezz.jei:jei-${minecraft_version}:${jei_version}:api"
-    compileOnly "mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}:api"
+    compile "codechicken:ForgeMultipart:${minecraft_version}-${fmp_version}:dev"
+    compile "codechicken:CodeChickenLib:${minecraft_version}-${code_chicken_lib_version}:dev"
+    compile "codechicken:CodeChickenCore:${minecraft_version}-${code_chicken_core_version}:dev"
+    compile "codechicken:NotEnoughItems:${minecraft_version}-${nei_version}:dev"
+    compile "com.mod-buildcraft:buildcraft:${bc_version}:dev"

-    // Runtime, Mods
-    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
-    runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}")
-    runtimeOnly fg.deobf("team.chisel.ctm:CTM:${ctm_version}")
+    // provided APIs
+    compile "net.industrial-craft:industrialcraft-2:${ic2_version}-experimental:api"
+    compile "net.mcft.copy.betterstorage:BetterStorage:${minecraft_version}-${betterstorage_version}:api"

-    // unit test dependencies
-    testCompile "junit:junit:4.13"
+    // self compiled APIs
+    compile "appeng:Waila:${waila_version}_${minecraft_version}:api"
+    compile "appeng:RotaryCraft:${rotarycraft_version}:api"
+    compile "appeng:mekanism:${minecraft_version}-${mekansim_version}:api"
+    compile "appeng:InventoryTweaks:${invtweaks_version}:api"
+
+    // self compiled stubs
+    compile(group: 'api', name: 'coloredlightscore', version: "${api_coloredlightscore_version}")
+    compile(group: 'api', name: 'craftguide', version: "${api_craftguide_version}")
+    compile(group: 'api', name: 'immibis', version: "${api_immibis_version}")
+    compile(group: 'api', name: 'mfr', version: "${api_mfr_version}")
+    compile(group: 'api', name: 'railcraft', version: "${api_railcraft_version}")
+    compile(group: 'api', name: 'rblocks', version: "${api_rblocks_version}")
+    compile(group: 'api', name: 'rf', version: "${api_rf_version}")
+
+    testCompile "junit:junit:4.11"
 }
@@ -0,0 +1,7 @@
+apply plugin: 'idea'
+
+idea {
+    module {
+        inheritOutputDirs = true
+    }
+}
@@ -0,0 +1,106 @@
+task wrapper(type: Wrapper) {
+    gradleVersion = "2.3"
+}
+
+// WAILA
+task installWaila(type: Copy, dependsOn: "deinstallWaila") {
+    from { configurations.mods }
+    include "**/*Waila*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallWaila(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Waila*.jar")
+}
+
+// JABBA
+task installJabba(type: Copy, dependsOn: "deinstallJabba") {
+    from { configurations.mods }
+    include "**/*Jabba*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallJabba(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Jabba*.jar")
+}
+
+// ENDER STORAGE
+task installEnderStorage(type: Copy, dependsOn: "deinstallEnderStorage") {
+    from { configurations.mods }
+    include "**/*EnderStorage*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallEnderStorage(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*EnderStorage*.jar")
+}
+
+// TRANSLOCATOR
+task installTranslocator(type: Copy, dependsOn: "deinstallTranslocator") {
+    from { configurations.mods }
+    include "**/*Translocator*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallTranslocator(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Translocator*.jar")
+}
+
+// INDUSTRIALCRAFT
+task installIC2(type: Copy, dependsOn: "deinstallIC2") {
+    from { configurations.mods }
+    include "**/*industrialcraft*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallIC2(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*industrialcraft*.jar")
+}
+
+// ENDER IO
+task installEnderIO(type: Copy, dependsOn: "deinstallEnderIO") {
+    from { configurations.mods }
+    include "**/*EnderIO*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallEnderIO(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*EnderIO*.jar")
+}
+
+// TE
+//task installTE(type: Copy, dependsOn: "deinstallTE") {
+//    from { configurations.mods }
+//    include "**/*CoFHLib*.jar"
+//    include "**/*CoFHCore*.jar"
+//    include "**/*ThermalFoundation*.jar"
+//    include "**/*ThermalExpansion*.jar"
+//
+//    into file(minecraft.runDir + "/mods")
+//}
+//
+//task deinstallTE(type: Delete) {
+//    delete fileTree(dir: minecraft.runDir + "/mods", includes: ["*CoFHLib*.jar", "*CoFHCore*.jar", "*ThermalFoundation*.jar", "*ThermalExpansion*.jar"])
+//}
+
+// INV TWEAKS
+task installInvTweaks(type: Copy, dependsOn: "deinstallInvTweaks") {
+    from { configurations.mods }
+    include "**/*InventoryTweaks*dev*.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallInvTweaks(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*InventoryTweaks*.jar")
+}
+
+// BETTER STORAGE
+task installBetterStorage(type: Copy, dependsOn: "deinstallBetterStorage") {
+    from { configurations.mods }
+    include "**/*BetterStorage*deobf*.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallBetterStorage(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*BetterStorage*.jar")
+}
@@ -1,32 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2020, 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
- *g 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>.
- */
-
-spotless {
-    java {
-        target 'src/*/java/appeng/**/*.java'
-
-        indentWithSpaces()
-        eclipse().configFile 'codeformat/codeformat.xml'
-        importOrderFile 'codeformat/ae2.importorder'
-    }
-    format 'json', {
-        target 'src/*/resources/**/*.json'
-        targetExclude 'src/generated/resources/**'
-        prettier().config(['parser': 'json'])
-    }
-}
@@ -1,5 +1,6 @@
+#Sat May 02 19:28:20 CEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash

 ##############################################################################
 ##
@@ -6,6 +6,47 @@
 ##
 ##############################################################################

+# 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"
@@ -20,49 +61,9 @@ while [ -h "$PRG" ] ; do
    fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
+cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-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
+cd "$SAVED" >&-

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

@@ -89,7 +90,7 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
    MAX_FD_LIMIT=`ulimit -H -n`
    if [ $? -eq 0 ] ; then
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -113,7 +114,6 @@ 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,19 +154,11 @@ if $cygwin ; then
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
 }
-APP_ARGS=$(save "$@")
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"

-# 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" "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
@@ -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,9 +46,10 @@ echo location of your Java installation.
 goto fail

 :init
-@rem Get command-line arguments, handling Windows variants
+@rem Get command-line arguments, handling Windowz 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.
@@ -59,6 +60,11 @@ 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
@@ -23,45 +23,56 @@

 package appeng.api;

+
 import java.lang.reflect.Field;

 import appeng.api.exceptions.CoreInaccessibleException;

+
 /**
 * Entry point for api.
+ *
+ * Available IMCs:
 */
-public enum AEApi {
-    ;
+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;
+	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);
+	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.");
-        }
-    }
+			HELD_API = (IAppEngApi) apiField.get( apiClass );
+		}
+		catch( ClassNotFoundException e )
+		{
+			throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FQN + " class, without it being declared." );
+		}
+		catch( NoSuchFieldException e )
+		{
+			throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without it being declared." );
+		}
+		catch( 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}
-     */
-    public static IAppEngApi instance() {
-        return HELD_API;
-    }
+	/**
+	 * API Entry Point.
+	 *
+	 * @return the {@link IAppEngApi}
+	 */
+	public static IAppEngApi instance()
+	{
+		return HELD_API;
+	}

 }
@@ -1,33 +0,0 @@
-/*
- * 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.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks interfaces that can be used as injectable constructor arguments for an
- * {@link AEPlugin}.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface AEInjectable {
-}
@@ -1,37 +0,0 @@
-/*
- * 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 {
-}
@@ -23,44 +23,92 @@

 package appeng.api;

+
+import appeng.api.definitions.Blocks;
 import appeng.api.definitions.IDefinitions;
+import appeng.api.definitions.Items;
+import appeng.api.definitions.Materials;
+import appeng.api.definitions.Parts;
+import appeng.api.exceptions.FailedConnection;
 import appeng.api.features.IRegistryContainer;
-import appeng.api.networking.IGridHelper;
+import appeng.api.networking.IGridBlock;
+import appeng.api.networking.IGridConnection;
 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 A helper for working with storage data types.
-     */
-    IStorageHelper storage();
+public interface IAppEngApi
+{

-    /**
-     * @return A helper to create {@link IGridNode} and other grid related objects.
-     */
-    IGridHelper grid();
+	/**
+	 * @return Registry Container for the numerous registries in AE2.
+	 */
+	IRegistryContainer registries();

-    /**
-     * @return A helper for working with grids, and buses.
-     */
-    IPartHelper partHelper();
+	/**
+	 * @return helper for working with storage data types.
+	 */
+	IStorageHelper storage();

-    /**
-     * @return An accessible list of all AE definitions
-     */
-    IDefinitions definitions();
+	/**
+	 * @return helper for working with grids, and buses.
+	 */
+	IPartHelper partHelper();

-    /**
-     * @return Utility methods primarily useful for client side stuff
-     */
-    IClientHelper client();
+	/**
+	 * @return an accessible list of all of AE's Items
+	 *
+	 * @deprecated use {@link appeng.api.definitions.IDefinitions#items()}
+	 */
+	@Deprecated
+	Items items();

+	/**
+	 * @return an accessible list of all of AE's materials; materials are items
+	 *
+	 * @deprecated use {@link appeng.api.definitions.IDefinitions#materials()}
+	 */
+	@Deprecated
+	Materials materials();
+
+	/**
+	 * @return an accessible list of all of AE's blocks
+	 *
+	 * @deprecated use {@link appeng.api.definitions.IDefinitions#blocks()}
+	 */
+	@Deprecated
+	Blocks blocks();
+
+	/**
+	 * @return an accessible list of all of AE's parts, parts are items
+	 *
+	 * @deprecated use {@link appeng.api.definitions.IDefinitions#parts()}
+	 */
+	@Deprecated
+	Parts parts();
+
+	/**
+	 * @return an accessible list of all AE definitions
+	 */
+	IDefinitions definitions();
+
+	/**
+	 * create a grid node for your {@link appeng.api.networking.IGridHost}
+	 *
+	 * @param block grid block
+	 *
+	 * @return grid node of block
+	 */
+	IGridNode createGridNode( IGridBlock block );
+
+	/**
+	 * create a connection between two {@link appeng.api.networking.IGridNode}
+	 *
+	 * @param a to be connected gridnode
+	 * @param b to be connected gridnode
+	 *
+	 * @throws appeng.api.exceptions.FailedConnection
+	 */
+	IGridConnection createGridConnection( IGridNode a, IGridNode b ) throws FailedConnection;
 }
@@ -23,42 +23,51 @@

 package appeng.api.config;

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

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

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

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

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

-    private AccessRestriction getPermByBit(final int bit) {
-        switch (bit) {
-            default:
-            case 0:
-                return NO_ACCESS;
-            case 1:
-                return READ;
-            case 2:
-                return WRITE;
-            case 3:
-                return READ_WRITE;
-        }
-    }
+	public AccessRestriction restrictPermissions( AccessRestriction ar )
+	{
+		return this.getPermByBit( this.permissionBit & ar.permissionBit );
+	}

-    public AccessRestriction addPermissions(final AccessRestriction ar) {
-        return this.getPermByBit(this.permissionBit | ar.permissionBit);
-    }
+	private AccessRestriction getPermByBit( int bit )
+	{
+		switch( bit )
+		{
+			default:
+			case 0:
+				return NO_ACCESS;
+			case 1:
+				return READ;
+			case 2:
+				return WRITE;
+			case 3:
+				return READ_WRITE;
+		}
+	}

-    public AccessRestriction removePermissions(final AccessRestriction ar) {
-        return this.getPermByBit(this.permissionBit & (~ar.permissionBit));
-    }
+	public AccessRestriction addPermissions( AccessRestriction ar )
+	{
+		return this.getPermByBit( this.permissionBit | ar.permissionBit );
+	}
+
+	public AccessRestriction removePermissions( AccessRestriction ar )
+	{
+		return this.getPermByBit( this.permissionBit & ( ~ar.permissionBit ) );
+	}
 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

-public enum ActionItems {
-    WRENCH, CLOSE, STASH, ENCODE, ENABLE_SUBSTITUTION, DISABLE_SUBSTITUTION
+
+public enum ActionItems
+{
+	WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION
 }
@@ -23,26 +23,16 @@

 package appeng.api.config;

-import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;

-public enum Actionable {
-    /**
-     * Perform the intended action.
-     */
-    MODULATE(FluidAction.EXECUTE),
+public enum Actionable
+{
+	/**
+	 * Perform the intended action.
+	 */
+	MODULATE,

-    /**
-     * Pretend to perform the action.
-     */
-    SIMULATE(FluidAction.SIMULATE);
-
-    private final FluidAction fluidAction;
-
-    Actionable(FluidAction fluidAction) {
-        this.fluidAction = fluidAction;
-    }
-
-    public FluidAction getFluidAction() {
-        return fluidAction;
-    }
+	/**
+	 * Pretend to perform the action.
+	 */
+	SIMULATE
 }
@@ -23,14 +23,16 @@

 package appeng.api.config;

-public enum CondenserOutput {

-    TRASH, // 0
+public enum CondenserOutput
+{

-    MATTER_BALLS, // 256
+	TRASH, // 0

-    SINGULARITY; // 250,000
+	MATTER_BALLS, // 256

-    public int requiredPower = 0;
+	SINGULARITY; // 250,000
+
+	public int requiredPower = 0;

 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

-public enum CopyMode {
-    CLEAR_ON_REMOVE, KEEP_ON_REMOVE
+
+public enum CopyMode
+{
+	CLEAR_ON_REMOVE, KEEP_ON_REMOVE
 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

-public enum FullnessMode {
-    EMPTY, HALF, FULL
+
+public enum FullnessMode
+{
+	EMPTY, HALF, FULL
 }
@@ -23,20 +23,24 @@

 package appeng.api.config;

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

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

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

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

 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

-public enum IncludeExclude {
-    WHITELIST, BLACKLIST
+
+public enum IncludeExclude
+{
+	WHITELIST, BLACKLIST
 }
@@ -23,10 +23,12 @@

 package appeng.api.config;

-public enum LevelEmitterMode {

-    STORED_AMOUNT,
+public enum LevelEmitterMode
+{

-    STORABLE_AMOUNT
+	STORED_AMOUNT,
+
+	STORABLE_AMOUNT

 }
@@ -23,10 +23,12 @@

 package appeng.api.config;

-public enum LevelType {

-    ITEM_LEVEL,
+public enum LevelType
+{

-    ENERGY_LEVEL
+	ITEM_LEVEL,
+
+	ENERGY_LEVEL

 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

-public enum ModSettings {
+
+public enum ModSettings
+{

 }
@@ -23,12 +23,14 @@

 package appeng.api.config;

-public enum NetworkEmitterMode {

-    POWER_LEVEL,
+public enum NetworkEmitterMode
+{

-    BOOTING,
+	POWER_LEVEL,

-    CHANNEL_ERROR
+	BOOTING,
+
+	CHANNEL_ERROR

 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

-public enum OperationMode {
-    FILL, EMPTY
+
+public enum OperationMode
+{
+	FILL, EMPTY
 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

-public enum OutputMode {
-    EXPORT_ONLY, EXPORT_OR_CRAFT, CRAFT_ONLY
+
+public enum OutputMode
+{
+	EXPORT_ONLY, EXPORT_OR_CRAFT, CRAFT_ONLY
 }
@@ -23,19 +23,23 @@

 package appeng.api.config;

-public enum PowerMultiplier {
-    ONE, CONFIG;

-    /**
-     * please do not edit this value, it is set when AE loads its config files.
-     */
-    public double multiplier = 1.0;
+public enum PowerMultiplier
+{
+	ONE, CONFIG;

-    public double multiply(final double in) {
-        return in * this.multiplier;
-    }
+	/**
+	 * please do not edit this value, it is set when AE loads its config files.
+	 */
+	public double multiplier = 1.0;

-    public double divide(final double in) {
-        return in / this.multiplier;
-    }
+	public double multiply( double in )
+	{
+		return in * this.multiplier;
+	}
+
+	public double divide( double in )
+	{
+		return in / this.multiplier;
+	}
 }
@@ -23,46 +23,44 @@

 package appeng.api.config;

-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TranslationTextComponent;

-public enum PowerUnits {
-    AE("gui.appliedenergistics2.units.appliedenergstics"), // Native Units - AE Energy
-    EU("gui.appliedenergistics2.units.ic2"), // IndustrialCraft 2 - Energy Units
-    RF("gui.appliedenergistics2.units.rf"); // RF - Redstone Flux
+public enum PowerUnits
+{
+	AE( "gui.appliedenergistics2.units.appliedenergstics" ), // Native Units - AE Energy
+	EU( "gui.appliedenergistics2.units.ic2" ), // IndustrialCraft 2 - Energy Units
+	WA( "gui.appliedenergistics2.units.rotarycraft" ), // RotaryCraft - Watts
+	RF( "gui.appliedenergistics2.units.thermalexpansion" ), // ThermalExpansion - Redstone Flux
+	MK( "gui.appliedenergistics2.units.mekanism" ); // Mekanism - Joules

-    /**
-     * unlocalized name for the power unit.
-     */
-    public final String unlocalizedName;
-    /**
-     * please do not edit this value, it is set when AE loads its config files.
-     */
-    public double conversionRatio = 1.0;
+	/**
+	 * unlocalized name for the power unit.
+	 */
+	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) {
-        this.unlocalizedName = un;
-    }
+	PowerUnits( String un )
+	{
+		this.unlocalizedName = un;
+	}

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

 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

-public enum RedstoneMode {
-    IGNORE, LOW_SIGNAL, HIGH_SIGNAL, SIGNAL_PULSE
+
+public enum RedstoneMode
+{
+	IGNORE, LOW_SIGNAL, HIGH_SIGNAL, SIGNAL_PULSE
 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

-public enum RelativeDirection {
-    LEFT, RIGHT, UP, DOW
+
+public enum RelativeDirection
+{
+	LEFT, RIGHT, UP, DOW
 }
@@ -1,28 +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.config;
-
-public enum SchedulingMode {
-    DEFAULT, ROUNDROBIN, RANDOM
-}
@@ -23,18 +23,8 @@

 package appeng.api.config;

-public enum SearchBoxMode {
-    AUTOSEARCH(false), AUTOSEARCH_KEEP(false), MANUAL_SEARCH(false), MANUAL_SEARCH_KEEP(false), JEI_AUTOSEARCH(true),
-    JEI_AUTOSEARCH_KEEP(true), JEI_MANUAL_SEARCH(true), JEI_MANUAL_SEARCH_KEEP(true);
-
-    private final boolean requiresJei;
-
-    SearchBoxMode(boolean requiresJei) {
-        this.requiresJei = requiresJei;
-    }
-
-    public boolean isRequiresJei() {
-        return requiresJei;
-    }

+public enum SearchBoxMode
+{
+	AUTOSEARCH, MANUAL_SEARCH, NEI_AUTOSEARCH, NEI_MANUAL_SEARCH
 }
@@ -23,48 +23,49 @@

 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.
+ * Represent the security systems basic permissions, these are not for anti-griefing, they are part of the mod as a
+ * gameplay feature.
 */
-public enum SecurityPermissions {
-    /**
-     * required to insert items into the network via terminal ( also used for
-     * machines based on the owner of the network, which is determined by its
-     * Security Block. )
-     */
-    INJECT,
+public enum SecurityPermissions
+{
+	/**
+	 * required to insert items into the network via terminal ( also used for machines based on the owner of the
+	 * network, which is determined by its Security Block. )
+	 */
+	INJECT,

-    /**
-     * required to extract items from the network via terminal ( also used for
-     * machines based on the owner of the network, which is determined by its
-     * Security Block. )
-     */
-    EXTRACT,
+	/**
+	 * required to extract items from the network via terminal ( also used for machines based on the owner of the
+	 * network, which is determined by its Security Block. )
+	 */
+	EXTRACT,

-    /**
-     * required to request crafting from the network via terminal.
-     */
-    CRAFT,
+	/**
+	 * required to request crafting from the network via terminal.
+	 */
+	CRAFT,

-    /**
-     * required to modify automation, and make modifications to the networks
-     * physical layout.
-     */
-    BUILD,
+	/**
+	 * required to modify automation, and make modifications to the networks physical layout.
+	 */
+	BUILD,

-    /**
-     * required to modify the security blocks settings.
-     */
-    SECURITY;
+	/**
+	 * required to modify the security blocks settings.
+	 */
+	SECURITY;

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

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

-    public String getTranslatedTip() {
-        return this.translationKey + ".tip";
-    }
+	public String getUnlocalizedTip()
+	{
+		return this.unlocalizedName + ".tip";
+	}
 }
@@ -23,73 +23,54 @@

 package appeng.api.config;

-import java.util.EnumSet;

+import java.util.EnumSet;
 import javax.annotation.Nonnull;

-public enum Settings {
-    LEVEL_EMITTER_MODE(EnumSet.allOf(LevelEmitterMode.class)),

-    REDSTONE_EMITTER(EnumSet.of(RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL)),
+public enum Settings
+{
+	LEVEL_EMITTER_MODE( EnumSet.allOf( LevelEmitterMode.class ) ),

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

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

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

-    ACCESS(EnumSet.of(AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE)),
+	SORT_DIRECTION( EnumSet.allOf( SortDir.class ) ), SORT_BY( EnumSet.allOf( SortOrder.class ) ),

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

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

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

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

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

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

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

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

-    FULLNESS_MODE(EnumSet.allOf(FullnessMode.class)),
+	private final EnumSet<? extends Enum<?>> values;

-    CRAFT_ONLY(EnumSet.of(YesNo.YES, YesNo.NO)),
+	Settings( @Nonnull EnumSet<? extends Enum<?>> possibleOptions )
+	{
+		if ( possibleOptions.isEmpty() )
+		{
+			throw new IllegalArgumentException( "Tried to instantiate an empty setting." );
+		}

-    FUZZY_MODE(EnumSet.allOf(FuzzyMode.class)),
+		this.values = possibleOptions;
+	}

-    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) {
-        if (possibleOptions.isEmpty()) {
-            throw new IllegalArgumentException("Tried to instantiate an empty setting.");
-        }
-
-        this.values = possibleOptions;
-    }
-
-    public EnumSet<? extends Enum<?>> getPossibleValues() {
-        return this.values;
-    }
+	public EnumSet<? extends Enum<?>> getPossibleValues()
+	{
+		return this.values;
+	}

 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

-public enum SortDir {
-    ASCENDING, DESCENDING
+
+public enum SortDir
+{
+	ASCENDING, DESCENDING
 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

-public enum SortOrder {
-    NAME, AMOUNT, MOD
+
+public enum SortOrder
+{
+	NAME, AMOUNT, MOD, INVTWEAKS
 }
@@ -23,10 +23,12 @@

 package appeng.api.config;

-public enum StorageFilter {

-    NONE,
+public enum StorageFilter
+{

-    EXTRACTABLE_ONLY
+	NONE,
+
+	EXTRACTABLE_ONLY

 }
@@ -23,12 +23,14 @@

 package appeng.api.config;

-public enum TerminalStyle {

-    TALL,
+public enum TerminalStyle
+{

-    FULL,
+	TALL,

-    SMALL
+	FULL,
+
+	SMALL

 }
@@ -23,14 +23,16 @@

 package appeng.api.config;

-public enum TunnelType {
-    ME, // Network Tunnel
-    IC2_POWER, // EU Tunnel
-    FE_POWER, // Forge Energy tunnel
-    REDSTONE, // Redstone Tunnel
-    FLUID, // Fluid Tunnel
-    ITEM, // Item Tunnel
-    LIGHT, // Light Tunnel
-    BUNDLED_REDSTONE, // Bundled Redstone Tunnel
-    COMPUTER_MESSAGE // Computer Message Tunnel
+
+public enum TunnelType
+{
+	ME, // Network Tunnel
+	IC2_POWER, // EU Tunnel
+	RF_POWER, // RF Tunnel
+	REDSTONE, // Redstone Tunnel
+	FLUID, // Fluid Tunnel
+	ITEM, // Item Tunnel
+	LIGHT, // Light Tunnel
+	BUNDLED_REDSTONE, // Bundled Redstone Tunnel
+	COMPUTER_MESSAGE // Computer Message Tunnel
 }
@@ -23,141 +23,108 @@

 package appeng.api.config;

-import java.util.*;

-import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;

-import com.google.common.base.Preconditions;
+import net.minecraft.item.ItemStack;

-import net.minecraft.block.Block;
-import net.minecraft.item.BlockItem;
-import net.minecraft.item.Item;
-import net.minecraft.util.IItemProvider;
-import net.minecraft.util.text.ITextComponent;
+import com.google.common.base.Optional;

-public enum Upgrades {
-    /**
-     * Gold Tier Upgrades.
-     */
-    CAPACITY(0), REDSTONE(0), CRAFTING(0),
+import appeng.api.definitions.IItemDefinition;
+import appeng.api.util.AEItemDefinition;

-    /**
-     * Diamond Tier Upgrades.
-     */
-    FUZZY(1), SPEED(1), INVERTER(1);

-    private final int tier;
-    private final List<Supported> supported = new ArrayList<>();
-    private List<ITextComponent> supportedTooltipLines;
+public enum Upgrades
+{
+	/**
+	 * Gold Tier Upgrades.
+	 */
+	CAPACITY( 0 ), REDSTONE( 0 ), CRAFTING( 0 ),

-    Upgrades(final int tier) {
-        this.tier = tier;
-    }
+	/**
+	 * Diamond Tier Upgrades.
+	 */
+	FUZZY( 1 ), SPEED( 1 ), INVERTER( 1 );

-    /**
-     * @return list of Items/Blocks that support this upgrade, and how many it
-     *         supports.
-     */
-    public List<Supported> getSupported() {
-        return this.supported;
-    }
+	/**
+	 * @deprecated use {@link Upgrades#getTier()}
+	 */
+	@Deprecated
+	public final int tier;

-    public void registerItem(final IItemProvider item, final int maxSupported) {
-        this.registerItem(item, maxSupported, null);
-    }
+	/**
+	 * @deprecated use {@link Upgrades#getSupported()}
+	 */
+	@Deprecated
+	private final Map<ItemStack, Integer> supportedMax = new HashMap<ItemStack, Integer>();

-    /**
-     * 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
-     * @param tooltipGroup If more than one item of the same group are supported,
-     *                     the tooltip will show this group name instead. If the
-     *                     items have different maxSupported values, the highest
-     *                     will be shown.
-     */
-    public void registerItem(final IItemProvider item, final int maxSupported, @Nullable ITextComponent tooltipGroup) {
-        Preconditions.checkNotNull(item);
-        this.supported.add(new Supported(item.asItem(), maxSupported, tooltipGroup));
-        supportedTooltipLines = null; // Reset tooltip
-    }
+	Upgrades( int tier )
+	{
+		this.tier = tier;
+	}

-    public List<ITextComponent> getTooltipLines() {
-        if (supportedTooltipLines == null) {
-            supported.sort(Comparator.comparingInt(o -> o.maxCount));
-            supportedTooltipLines = new ArrayList<>(supported.size());
+	/**
+	 * @return list of Items/Blocks that support this upgrade, and how many it supports.
+	 */
+	public Map<ItemStack, Integer> getSupported()
+	{
+		return this.supportedMax;
+	}

-            // Use a separate set because the final text will include numbers
-            Set<ITextComponent> namesAdded = new HashSet<>();
+	/**
+	 * 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( IItemDefinition item, int maxSupported )
+	{
+		final Optional<ItemStack> maybeStack = item.maybeStack( 1 );
+		for( ItemStack stack : maybeStack.asSet() )
+		{
+			this.registerItem( stack, maxSupported );
+		}
+	}

-            for (int i = 0; i < supported.size(); i++) {
-                Supported supported = this.supported.get(i);
-                ITextComponent name = supported.item.getName();
+	/**
+	 * 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( ItemStack stack, int maxSupported )
+	{
+		if( stack != null )
+		{
+			this.supportedMax.put( stack, maxSupported );
+		}
+	}

-                // If the group was already added by a previous item, skip this
-                if (supported.tooltipGroup != null && namesAdded.contains(supported.tooltipGroup)) {
-                    continue;
-                }
+	/**
+	 * Registers a specific amount of this upgrade into a specific machine
+	 *
+	 * @param item         machine in which this upgrade can be installed
+	 * @param maxSupported amount how many upgrades can be installed
+	 *
+	 * @deprecated use {@link Upgrades#registerItem(IItemDefinition, int)}
+	 */
+	@Deprecated
+	public void registerItem( AEItemDefinition item, int maxSupported )
+	{
+		if( item != null )
+		{
+			final ItemStack stack = item.stack( 1 );

-                // If any of the following items would be of the same group, use the group name
-                // instead
-                if (supported.tooltipGroup != null) {
-                    for (int j = i + 1; j < this.supported.size(); j++) {
-                        ITextComponent otherGroup = this.supported.get(j).tooltipGroup;
-                        if (supported.tooltipGroup.equals(otherGroup)) {
-                            name = supported.tooltipGroup;
-                            break;
-                        }
-                    }
-                }
-
-                if (namesAdded.add(name)) {
-                    // append the supported count only if its > 1
-                    if (supported.maxCount > 1) {
-                        name = name.deepCopy().appendText(" (" + supported.maxCount + ")");
-                    }
-                    supportedTooltipLines.add(name);
-                }
-            }
-        }
-
-        return supportedTooltipLines;
-    }
-
-    public int getTier() {
-        return this.tier;
-    }
-
-    public static class Supported {
-        private final Item item;
-        private final Block block;
-        private final int maxCount;
-        @Nullable
-        private final ITextComponent tooltipGroup;
-
-        public Supported(Item item, int maxCount, @Nullable ITextComponent tooltipGroup) {
-            this.item = item;
-            if (item.getItem() instanceof BlockItem) {
-                this.block = ((BlockItem) item.getItem()).getBlock();
-            } else {
-                this.block = null;
-            }
-            this.maxCount = maxCount;
-            this.tooltipGroup = tooltipGroup;
-        }
-
-        public int getMaxCount() {
-            return maxCount;
-        }
-
-        public boolean isSupported(Block block) {
-            return block != null && this.block == block;
-        }
-
-        public boolean isSupported(Item item) {
-            return item != null && this.item == item;
-        }
-
-    }
+			if( stack != null )
+			{
+				this.registerItem( stack, maxSupported );
+			}
+		}
+	}

+	public int getTier()
+	{
+		return this.tier;
+	}
 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

-public enum ViewItems {
-    ALL, STORED, CRAFTABLE
+
+public enum ViewItems
+{
+	ALL, STORED, CRAFTABLE
 }
@@ -23,6 +23,8 @@

 package appeng.api.config;

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

-public interface IBlockDefinition extends IItemDefinition {
-    /**
-     * @return the {@link Block} implementation if applicable
-     */
-    default Optional<Block> maybeBlock() {
-        return Optional.of(block());
-    }
+import com.google.common.base.Optional;

-    Block block();

-    /**
-     * @return the {@link BlockItem} implementation if applicable
-     */
-    default Optional<BlockItem> maybeBlockItem() {
-        return Optional.of(blockItem());
-    }
+public interface IBlockDefinition extends IItemDefinition
+{
+	/**
+	 * @return the {@link Block} implementation if applicable
+	 */
+	Optional<Block> maybeBlock();

-    BlockItem blockItem();
+	/**
+	 * @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(IBlockReader world, BlockPos pos);
+	/**
+	 * Compare Block with world.
+	 *
+	 * @param world world of block
+	 * @param x     x pos of block
+	 * @param y     y pos of block
+	 * @param z     z pos of block
+	 *
+	 * @return if the block is placed in the world at the specific location.
+	 */
+	boolean isSameAs( IBlockAccess world, int x, int y, int z );
 }
@@ -23,167 +23,143 @@

 package appeng.api.definitions;

+
 /**
 * A list of all blocks in AE
 */
-public interface IBlocks {
-    /*
-     * world gen
-     */
-    IBlockDefinition quartzOre();
+public interface IBlocks
+{
+	/*
+	 * world gen
+	 */
+	IBlockDefinition quartzOre();

-    IBlockDefinition quartzOreCharged();
+	IBlockDefinition quartzOreCharged();

-    IBlockDefinition matrixFrame();
+	IBlockDefinition matrixFrame();

-    /*
-     * decorative
-     */
-    IBlockDefinition quartzBlock();
+	/*
+	 * decorative
+	 */
+	IBlockDefinition quartz();

-    IBlockDefinition quartzPillar();
+	IBlockDefinition quartzPillar();

-    IBlockDefinition chiseledQuartzBlock();
+	IBlockDefinition quartzChiseled();

-    IBlockDefinition quartzGlass();
+	IBlockDefinition quartzGlass();

-    IBlockDefinition quartzVibrantGlass();
+	IBlockDefinition quartzVibrantGlass();

-    IBlockDefinition quartzFixture();
+	IBlockDefinition quartzTorch();

-    IBlockDefinition fluixBlock();
+	IBlockDefinition fluix();

-    IBlockDefinition skyStoneBlock();
+	IBlockDefinition skyStone();

-    IBlockDefinition smoothSkyStoneBlock();
+	IBlockDefinition skyChest();

-    IBlockDefinition skyStoneBrick();
+	IBlockDefinition skyCompass();

-    IBlockDefinition skyStoneSmallBrick();
+	IBlockDefinition skyStoneStair();

-    IBlockDefinition skyStoneChest();
+	IBlockDefinition skyStoneBlockStair();

-    IBlockDefinition smoothSkyStoneChest();
+	IBlockDefinition skyStoneBrickStair();

-    IBlockDefinition skyCompass();
+	IBlockDefinition skyStoneSmallBrickStair();

-    IBlockDefinition skyStoneStairs();
+	IBlockDefinition fluixStair();

-    IBlockDefinition smoothSkyStoneStairs();
+	IBlockDefinition quartzStair();

-    IBlockDefinition skyStoneBrickStairs();
+	IBlockDefinition chiseledQuartzStair();

-    IBlockDefinition skyStoneSmallBrickStairs();
+	IBlockDefinition quartzPillarStair();

-    IBlockDefinition fluixStairs();
+	/*
+	 * misc
+	 */
+	ITileDefinition grindStone();

-    IBlockDefinition quartzStairs();
+	ITileDefinition crankHandle();

-    IBlockDefinition chiseledQuartzStairs();
+	ITileDefinition inscriber();

-    IBlockDefinition quartzPillarStairs();
+	ITileDefinition wireless();

-    IBlockDefinition skyStoneSlab();
+	ITileDefinition charger();

-    IBlockDefinition smoothSkyStoneSlab();
+	ITileDefinition tinyTNT();

-    IBlockDefinition skyStoneBrickSlab();
+	ITileDefinition security();

-    IBlockDefinition skyStoneSmallBrickSlab();
+	/*
+	 * quantum Network Bridge
+	 */
+	ITileDefinition quantumRing();

-    IBlockDefinition fluixSlab();
+	ITileDefinition quantumLink();

-    IBlockDefinition quartzSlab();
+	/*
+	 * spatial iO
+	 */
+	ITileDefinition spatialPylon();

-    IBlockDefinition chiseledQuartzSlab();
+	ITileDefinition spatialIOPort();

-    IBlockDefinition quartzPillarSlab();
+	/*
+	 * Bus / cables
+	 */
+	ITileDefinition multiPart();

-    /*
-     * misc
-     */
-    ITileDefinition grindstone();
+	/*
+	 * machines
+	 */
+	ITileDefinition controller();

-    ITileDefinition crank();
+	ITileDefinition drive();

-    ITileDefinition inscriber();
+	ITileDefinition chest();

-    ITileDefinition wirelessAccessPoint();
+	ITileDefinition iface();

-    ITileDefinition charger();
+	ITileDefinition cellWorkbench();

-    IBlockDefinition tinyTNT();
+	ITileDefinition iOPort();

-    ITileDefinition securityStation();
+	ITileDefinition condenser();

-    /*
-     * quantum Network Bridge
-     */
-    ITileDefinition quantumRing();
+	ITileDefinition energyAcceptor();

-    ITileDefinition quantumLink();
+	ITileDefinition vibrationChamber();

-    /*
-     * spatial iO
-     */
-    ITileDefinition spatialPylon();
+	ITileDefinition quartzGrowthAccelerator();

-    ITileDefinition spatialIOPort();
+	ITileDefinition energyCell();

-    /*
-     * Bus / cables
-     */
-    ITileDefinition multiPart();
+	ITileDefinition energyCellDense();

-    /*
-     * machines
-     */
-    ITileDefinition controller();
+	ITileDefinition energyCellCreative();

-    ITileDefinition drive();
+	// rv1
+	ITileDefinition craftingUnit();

-    ITileDefinition chest();
+	ITileDefinition craftingAccelerator();

-    ITileDefinition iface();
+	ITileDefinition craftingStorage1k();

-    ITileDefinition fluidIface();
+	ITileDefinition craftingStorage4k();

-    ITileDefinition cellWorkbench();
+	ITileDefinition craftingStorage16k();

-    ITileDefinition iOPort();
+	ITileDefinition craftingStorage64k();

-    ITileDefinition condenser();
+	ITileDefinition craftingMonitor();

-    ITileDefinition energyAcceptor();
+	ITileDefinition molecularAssembler();

-    ITileDefinition vibrationChamber();
+	ITileDefinition lightDetector();

-    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();
+	ITileDefinition paint();
 }
@@ -1,24 +1,9 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
 package appeng.api.definitions;

+
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.IBlockAccess;
+

 /**
 * Interface to compare a definition with an itemstack or a block
@@ -27,13 +12,29 @@ import net.minecraft.item.ItemStack;
 * @version rv2
 * @since rv2
 */
-public interface IComparableDefinition {
-    /**
-     * Compare {@link ItemStack} with this
-     *
-     * @param comparableStack compared item
-     *
-     * @return true if the item stack is a matching item.
-     */
-    boolean isSameAs(ItemStack comparableStack);
+public interface IComparableDefinition
+{
+	/**
+	 * Compare {@link ItemStack} with this
+	 *
+	 * @param comparableStack compared item
+	 *
+	 * @return true if the item stack is a matching item.
+	 */
+	boolean isSameAs( ItemStack comparableStack );
+
+	/**
+	 * Compare Block with world.
+	 *
+	 * @param world world of block
+	 * @param x     x pos of block
+	 * @param y     y pos of block
+	 * @param z     z pos of block
+	 *
+	 * @return if the block is placed in the world at the specific location.
+	 *
+	 * @deprecated moved to {@link IBlockDefinition}. Is removed in the next major release rv3
+	 */
+	@Deprecated
+	boolean isSameAs( IBlockAccess world, int x, int y, int z );
 }
@@ -23,27 +23,29 @@

 package appeng.api.definitions;

+
 /**
 * All definitions in AE
 */
-public interface IDefinitions {
-    /**
-     * @return an accessible list of all of AE's blocks
-     */
-    IBlocks blocks();
+public interface IDefinitions
+{
+	/**
+	 * @return an accessible list of all of AE's blocks
+	 */
+	IBlocks blocks();

-    /**
-     * @return an accessible list of all of AE's Items
-     */
-    IItems items();
+	/**
+	 * @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 materials; materials are items
+	 */
+	IMaterials materials();

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

-import java.util.Optional;
-import java.util.Set;
-
-import javax.annotation.Nonnull;

 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.IItemProvider;

-import appeng.api.features.AEFeature;
+import com.google.common.base.Optional;

-public interface IItemDefinition extends IComparableDefinition, IItemProvider {
-    /**
-     * @return the unique name of the definition which will be used to register the
-     *         underlying structure. Will never be null
-     */
-    @Nonnull
-    String identifier();

-    /**
-     * @return the {@link Item} Implementation if applicable
-     */
-    default Optional<Item> maybeItem() {
-        return Optional.of(item());
-    }
-
-    Item item();
-
-    /**
-     * @return an {@link ItemStack} with specified quantity of this item.
-     */
-    default Optional<ItemStack> maybeStack(int stackSize) {
-        return Optional.of(stack(stackSize));
-    }
-
-    ItemStack stack(int stackSize);
-
-    /**
-     * @return an immutable set of the features of this item
-     */
-    Set<AEFeature> features();
-
-    @Override
-    default Item asItem() {
-        return item();
-    }
+public interface IItemDefinition extends IComparableDefinition
+{
+	/**
+	 * @return the {@link Item} Implementation if applicable
+	 */
+	Optional<Item> maybeItem();

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

 package appeng.api.definitions;

+
 import appeng.api.util.AEColoredItemDefinition;

+
 /**
 * A list of all items in AE
 */
-public interface IItems {
-    IItemDefinition certusQuartzAxe();
+public interface IItems
+{
+	IItemDefinition certusQuartzAxe();

-    IItemDefinition certusQuartzHoe();
+	IItemDefinition certusQuartzHoe();

-    IItemDefinition certusQuartzShovel();
+	IItemDefinition certusQuartzShovel();

-    IItemDefinition certusQuartzPick();
+	IItemDefinition certusQuartzPick();

-    IItemDefinition certusQuartzSword();
+	IItemDefinition certusQuartzSword();

-    IItemDefinition certusQuartzWrench();
+	IItemDefinition certusQuartzWrench();

-    IItemDefinition certusQuartzKnife();
+	IItemDefinition certusQuartzKnife();

-    IItemDefinition netherQuartzAxe();
+	IItemDefinition netherQuartzAxe();

-    IItemDefinition netherQuartzHoe();
+	IItemDefinition netherQuartzHoe();

-    IItemDefinition netherQuartzShovel();
+	IItemDefinition netherQuartzShovel();

-    IItemDefinition netherQuartzPick();
+	IItemDefinition netherQuartzPick();

-    IItemDefinition netherQuartzSword();
+	IItemDefinition netherQuartzSword();

-    IItemDefinition netherQuartzWrench();
+	IItemDefinition netherQuartzWrench();

-    IItemDefinition netherQuartzKnife();
+	IItemDefinition netherQuartzKnife();

-    IItemDefinition entropyManipulator();
+	IItemDefinition entropyManipulator();

-    IItemDefinition wirelessTerminal();
+	IItemDefinition wirelessTerminal();

-    IItemDefinition biometricCard();
+	IItemDefinition biometricCard();

-    IItemDefinition chargedStaff();
+	IItemDefinition chargedStaff();

-    IItemDefinition massCannon();
+	IItemDefinition massCannon();

-    IItemDefinition memoryCard();
+	IItemDefinition memoryCard();

-    IItemDefinition networkTool();
+	IItemDefinition networkTool();

-    IItemDefinition portableCell();
+	IItemDefinition portableCell();

-    IItemDefinition cellCreative();
+	IItemDefinition cellCreative();

-    IItemDefinition viewCell();
+	IItemDefinition viewCell();

-    IItemDefinition cell1k();
+	IItemDefinition cell1k();

-    IItemDefinition cell4k();
+	IItemDefinition cell4k();

-    IItemDefinition cell16k();
+	IItemDefinition cell16k();

-    IItemDefinition cell64k();
+	IItemDefinition cell64k();

-    IItemDefinition fluidCell1k();
+	IItemDefinition spatialCell2();

-    IItemDefinition fluidCell4k();
+	IItemDefinition spatialCell16();

-    IItemDefinition fluidCell16k();
+	IItemDefinition spatialCell128();

-    IItemDefinition fluidCell64k();
+	IItemDefinition facade();

-    IItemDefinition spatialCell2();
+	IItemDefinition crystalSeed();

-    IItemDefinition spatialCell16();
+	// rv1
+	IItemDefinition encodedPattern();

-    IItemDefinition spatialCell128();
+	IItemDefinition colorApplicator();

-    IItemDefinition facade();
+	AEColoredItemDefinition coloredPaintBall();

-    IItemDefinition certusCrystalSeed();
-
-    IItemDefinition fluixCrystalSeed();
-
-    IItemDefinition netherQuartzSeed();
-
-    IItemDefinition dummyFluidItem();
-
-    // rv1
-    IItemDefinition encodedPattern();
-
-    IItemDefinition colorApplicator();
-
-    AEColoredItemDefinition coloredPaintBall();
-
-    AEColoredItemDefinition coloredLumenPaintBall();
+	AEColoredItemDefinition coloredLumenPaintBall();
 }
@@ -23,121 +23,117 @@

 package appeng.api.definitions;

+
 /**
 * A list of all materials in AE
 */
-public interface IMaterials {
-    IItemDefinition cell2SpatialPart();
+public interface IMaterials
+{
+	IItemDefinition cell2SpatialPart();

-    IItemDefinition cell16SpatialPart();
+	IItemDefinition cell16SpatialPart();

-    IItemDefinition cell128SpatialPart();
+	IItemDefinition cell128SpatialPart();

-    IItemDefinition silicon();
+	IItemDefinition silicon();

-    IItemDefinition skyDust();
+	IItemDefinition skyDust();

-    IItemDefinition calcProcessorPress();
+	IItemDefinition calcProcessorPress();

-    IItemDefinition engProcessorPress();
+	IItemDefinition engProcessorPress();

-    IItemDefinition logicProcessorPress();
+	IItemDefinition logicProcessorPress();

-    IItemDefinition calcProcessorPrint();
+	IItemDefinition calcProcessorPrint();

-    IItemDefinition engProcessorPrint();
+	IItemDefinition engProcessorPrint();

-    IItemDefinition logicProcessorPrint();
+	IItemDefinition logicProcessorPrint();

-    IItemDefinition siliconPress();
+	IItemDefinition siliconPress();

-    IItemDefinition siliconPrint();
+	IItemDefinition siliconPrint();

-    IItemDefinition namePress();
+	IItemDefinition namePress();

-    IItemDefinition logicProcessor();
+	IItemDefinition logicProcessor();

-    IItemDefinition calcProcessor();
+	IItemDefinition calcProcessor();

-    IItemDefinition engProcessor();
+	IItemDefinition engProcessor();

-    IItemDefinition basicCard();
+	IItemDefinition basicCard();

-    IItemDefinition advCard();
+	IItemDefinition advCard();

-    IItemDefinition purifiedCertusQuartzCrystal();
+	IItemDefinition purifiedCertusQuartzCrystal();

-    IItemDefinition purifiedNetherQuartzCrystal();
+	IItemDefinition purifiedNetherQuartzCrystal();

-    IItemDefinition purifiedFluixCrystal();
+	IItemDefinition purifiedFluixCrystal();

-    IItemDefinition cell1kPart();
+	IItemDefinition cell1kPart();

-    IItemDefinition cell4kPart();
+	IItemDefinition cell4kPart();

-    IItemDefinition cell16kPart();
+	IItemDefinition cell16kPart();

-    IItemDefinition cell64kPart();
+	IItemDefinition cell64kPart();

-    IItemDefinition emptyStorageCell();
+	IItemDefinition emptyStorageCell();

-    IItemDefinition cardRedstone();
+	IItemDefinition cardRedstone();

-    IItemDefinition cardSpeed();
+	IItemDefinition cardSpeed();

-    IItemDefinition cardCapacity();
+	IItemDefinition cardCapacity();

-    IItemDefinition cardFuzzy();
+	IItemDefinition cardFuzzy();

-    IItemDefinition cardInverter();
+	IItemDefinition cardInverter();

-    IItemDefinition cardCrafting();
+	IItemDefinition cardCrafting();

-    IItemDefinition enderDust();
+	IItemDefinition enderDust();

-    IItemDefinition flour();
+	IItemDefinition flour();

-    IItemDefinition goldDust();
+	IItemDefinition goldDust();

-    IItemDefinition ironDust();
+	IItemDefinition ironDust();

-    IItemDefinition fluixDust();
+	IItemDefinition fluixDust();

-    IItemDefinition certusQuartzDust();
+	IItemDefinition certusQuartzDust();

-    IItemDefinition netherQuartzDust();
+	IItemDefinition netherQuartzDust();

-    IItemDefinition matterBall();
+	IItemDefinition matterBall();

-    IItemDefinition certusQuartzCrystal();
+	IItemDefinition ironNugget();

-    IItemDefinition certusQuartzCrystalCharged();
+	IItemDefinition certusQuartzCrystal();

-    IItemDefinition fluixCrystal();
+	IItemDefinition certusQuartzCrystalCharged();

-    IItemDefinition fluixPearl();
+	IItemDefinition fluixCrystal();

-    IItemDefinition woodenGear();
+	IItemDefinition fluixPearl();

-    IItemDefinition wirelessReceiver();
+	IItemDefinition woodenGear();

-    IItemDefinition wirelessBooster();
+	IItemDefinition wireless();

-    IItemDefinition annihilationCore();
+	IItemDefinition wirelessBooster();

-    IItemDefinition formationCore();
+	IItemDefinition annihilationCore();

-    IItemDefinition singularity();
+	IItemDefinition formationCore();

-    IItemDefinition qESingularity();
+	IItemDefinition singularity();

-    IItemDefinition blankPattern();
+	IItemDefinition qESingularity();

-    IItemDefinition fluidCell1kPart();
-
-    IItemDefinition fluidCell4kPart();
-
-    IItemDefinition fluidCell16kPart();
-
-    IItemDefinition fluidCell64kPart();
+	IItemDefinition blankPattern();
 }
@@ -23,91 +23,82 @@

 package appeng.api.definitions;

+
 import appeng.api.util.AEColoredItemDefinition;

+
 /**
 * A list of all parts in AE
 */
-public interface IParts {
-    AEColoredItemDefinition cableSmart();
+public interface IParts
+{
+	AEColoredItemDefinition cableSmart();

-    AEColoredItemDefinition cableCovered();
+	AEColoredItemDefinition cableCovered();

-    AEColoredItemDefinition cableGlass();
+	AEColoredItemDefinition cableGlass();

-    AEColoredItemDefinition cableDenseCovered();
+	AEColoredItemDefinition cableDense();

-    AEColoredItemDefinition cableDenseSmart();
+	AEColoredItemDefinition lumenCableSmart();

-    IItemDefinition quartzFiber();
+	AEColoredItemDefinition lumenCableCovered();

-    IItemDefinition toggleBus();
+	AEColoredItemDefinition lumenCableGlass();

-    IItemDefinition invertedToggleBus();
+	AEColoredItemDefinition lumenCableDense();

-    IItemDefinition storageBus();
+	IItemDefinition quartzFiber();

-    IItemDefinition importBus();
+	IItemDefinition toggleBus();

-    IItemDefinition exportBus();
+	IItemDefinition invertedToggleBus();

-    IItemDefinition iface();
+	IItemDefinition storageBus();

-    IItemDefinition fluidIface();
+	IItemDefinition importBus();

-    IItemDefinition levelEmitter();
+	IItemDefinition exportBus();

-    IItemDefinition annihilationPlane();
+	IItemDefinition iface();

-    IItemDefinition identityAnnihilationPlane();
+	IItemDefinition levelEmitter();

-    IItemDefinition formationPlane();
+	IItemDefinition annihilationPlane();

-    IItemDefinition p2PTunnelME();
+	IItemDefinition formationPlane();

-    IItemDefinition p2PTunnelRedstone();
+	IItemDefinition p2PTunnelME();

-    IItemDefinition p2PTunnelItems();
+	IItemDefinition p2PTunnelRedstone();

-    IItemDefinition p2PTunnelFluids();
+	IItemDefinition p2PTunnelItems();

-    IItemDefinition p2PTunnelEU();
+	IItemDefinition p2PTunnelLiquids();

-    IItemDefinition p2PTunnelFE();
+	IItemDefinition p2PTunnelEU();

-    IItemDefinition p2PTunnelLight();
+	IItemDefinition p2PTunnelRF();

-    IItemDefinition cableAnchor();
+	IItemDefinition p2PTunnelLight();

-    IItemDefinition monitor();
+	IItemDefinition cableAnchor();

-    IItemDefinition semiDarkMonitor();
+	IItemDefinition monitor();

-    IItemDefinition darkMonitor();
+	IItemDefinition semiDarkMonitor();

-    IItemDefinition interfaceTerminal();
+	IItemDefinition darkMonitor();

-    IItemDefinition patternTerminal();
+	IItemDefinition interfaceTerminal();

-    IItemDefinition craftingTerminal();
+	IItemDefinition patternTerminal();

-    IItemDefinition terminal();
+	IItemDefinition craftingTerminal();

-    IItemDefinition storageMonitor();
+	IItemDefinition terminal();

-    IItemDefinition conversionMonitor();
+	IItemDefinition storageMonitor();

-    IItemDefinition fluidTerminal();
-
-    IItemDefinition fluidImportBus();
-
-    IItemDefinition fluidExportBus();
-
-    IItemDefinition fluidStorageBus();
-
-    IItemDefinition fluidLevelEmitter();
-
-    IItemDefinition fluidAnnihilationPlane();
-
-    IItemDefinition fluidFormationnPlane();
+	IItemDefinition conversionMonitor();
 }
@@ -1,30 +1,15 @@
-/*
- * 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.tileentity.TileEntity;

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

 package appeng.api.events;

-import net.minecraftforge.eventbus.api.Event;
+
+import cpw.mods.fml.common.eventhandler.Event;

 import appeng.api.features.ILocatable;

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

-    public final ILocatable target;
-    public final LocatableEvent change;
+	public final ILocatable target;
+	public final LocatableEvent change;

-    public LocatableEventAnnounce(final ILocatable o, final LocatableEvent ev) {
-        this.target = o;
-        this.change = ev;
-    }
+	public LocatableEventAnnounce( ILocatable o, LocatableEvent ev )
+	{
+		this.target = o;
+		this.change = ev;
+	}

-    public enum LocatableEvent {
-        /**
-         * Adds the locatable to the registry
-         */
-        REGISTER,
-
-        /**
-         * Removes the locatable from the registry
-         */
-        UNREGISTER
-    }
+	public enum LocatableEvent
+	{
+		Register, // Adds the locatable to the registry
+		Unregister // Removes the locatable from the registry
+	}
 }
@@ -23,11 +23,14 @@

 package appeng.api.exceptions;

-public class AppEngException extends Exception {

-    private static final long serialVersionUID = -9051434206368465494L;
+public class AppEngException extends Exception
+{

-    public AppEngException(final String t) {
-        super(t);
-    }
+	private static final long serialVersionUID = -9051434206368465494L;
+
+	public AppEngException( String t )
+	{
+		super( t );
+	}
 }
@@ -1,27 +1,10 @@
-/*
- * 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);
-    }
+public class CoreInaccessibleException extends RuntimeException
+{
+	public CoreInaccessibleException( String message )
+	{
+		super( message );
+	}
 }
@@ -1,52 +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.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);
-    }
-
-}
@@ -0,0 +1,35 @@
+/*
+ * 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;
+
+
+public class FailedConnection extends Exception
+{
+
+	private static final long serialVersionUID = -2544208090248293753L;
+
+	public FailedConnection()
+	{
+	}
+}
@@ -1,51 +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.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);
-    }
-}
@@ -0,0 +1,10 @@
+package appeng.api.exceptions;
+
+
+public class MissingDefinition extends RuntimeException
+{
+	public MissingDefinition( String message )
+	{
+		super( message );
+	}
+}
@@ -1,27 +0,0 @@
-/*
- * 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 MissingDefinitionException extends RuntimeException {
-    private static final long serialVersionUID = -6547396584255825761L;
-
-    public MissingDefinitionException(final String message) {
-        super(message);
-    }
-}
@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+
+public class MissingIngredientError extends Exception
+{
+
+	private static final long serialVersionUID = -998858343831371697L;
+
+	public MissingIngredientError( String n )
+	{
+		super( n );
+	}
+}
@@ -1,33 +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.exceptions;
-
-public class MissingIngredientException extends Exception {
-
-    private static final long serialVersionUID = -998858343831371697L;
-
-    public MissingIngredientException(final String n) {
-        super(n);
-    }
-}
@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+
+public class ModNotInstalled extends Exception
+{
+
+	private static final long serialVersionUID = -9052435206368425494L;
+
+	public ModNotInstalled( String t )
+	{
+		super( t );
+	}
+}
@@ -1,33 +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.exceptions;
-
-public class ModNotInstalledException extends Exception {
-
-    private static final long serialVersionUID = -9052435206368425494L;
-
-    public ModNotInstalledException(final String t) {
-        super(t);
-    }
-}
@@ -1,49 +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.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);
-    }
-
-}
@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+
+public class RecipeError extends Exception
+{
+
+	private static final long serialVersionUID = -6602870588617670262L;
+
+	public RecipeError( String n )
+	{
+		super( n );
+	}
+}
@@ -1,33 +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.exceptions;
-
-public class RecipeException extends Exception {
-
-    private static final long serialVersionUID = -6602870588617670262L;
-
-    public RecipeException(final String n) {
-        super(n);
-    }
-}
@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+
+public class RegistrationError extends Exception
+{
+
+	private static final long serialVersionUID = -6602870588617670263L;
+
+	public RegistrationError( String n )
+	{
+		super( n );
+	}
+}
@@ -1,33 +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.exceptions;
-
-public class RegistrationException extends Exception {
-
-    private static final long serialVersionUID = -6602870588617670263L;
-
-    public RegistrationException(final String n) {
-        super(n);
-    }
-}
@@ -1,48 +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.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);
-    }
-
-}
@@ -1,439 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2018, 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;
-
-public enum AEFeature {
-    // stuff that has no reason for ever being turned off, or that
-    // is just flat out required by tons of
-    // important stuff.
-    CORE("Core", null, false) {
-        @Override
-        public boolean isVisible() {
-            return false;
-        }
-    },
-
-    /**
-     * Worldgen related
-     */
-    CERTUS_QUARTZ_WORLD_GEN("CertusQuartzWorldGen", Constants.CATEGORY_WORLD, true),
-
-    METEORITE_WORLD_GEN("MeteoriteWorldGen", Constants.CATEGORY_WORLD, true),
-
-    DECORATIVE_LIGHTS("DecorativeLights", Constants.CATEGORY_WORLD, false),
-
-    DECORATIVE_BLOCKS("DecorativeBlocks", Constants.CATEGORY_WORLD, false,
-            "Blocks that are not used in any essential recipes, also slabs and stairs."),
-
-    SKY_STONE_CHESTS("SkyStoneChests", Constants.CATEGORY_WORLD, false),
-
-    SPAWN_PRESSES_IN_METEORITES("SpawnPressesInMeteorites", Constants.CATEGORY_WORLD, true),
-
-    FLOUR("Flour", Constants.CATEGORY_WORLD, false), CHEST_LOOT("ChestLoot", Constants.CATEGORY_WORLD, false),
-
-    VILLAGER_TRADING("VillagerTrading", Constants.CATEGORY_WORLD, true),
-
-    TINY_TNT("TinyTNT", Constants.CATEGORY_WORLD, false),
-
-    CERTUS_ORE("CertusOre", Constants.CATEGORY_WORLD, false),
-
-    CHARGED_CERTUS_ORE("ChargedCertusOre", Constants.CATEGORY_WORLD, false),
-
-    /**
-     * Machines
-     */
-    GRIND_STONE("GrindStone", Constants.CATEGORY_MACHINES, false),
-
-    INSCRIBER("Inscriber", Constants.CATEGORY_MACHINES, false),
-
-    CHARGER("Charger", Constants.CATEGORY_MACHINES, false),
-
-    CRYSTAL_GROWTH_ACCELERATOR("CrystalGrowthAccelerator", Constants.CATEGORY_MACHINES, false),
-
-    POWER_GEN("VibrationChamber", Constants.CATEGORY_MACHINES, false),
-
-    /**
-     * Tools
-     */
-    POWERED_TOOLS("PoweredTools", Constants.CATEGORY_TOOLS_CLASSIFICATIONS, false),
-
-    CERTUS_QUARTZ_TOOLS("CertusQuartzTools", Constants.CATEGORY_TOOLS_CLASSIFICATIONS, false),
-
-    NETHER_QUARTZ_TOOLS("NetherQuartzTools", Constants.CATEGORY_TOOLS_CLASSIFICATIONS, false),
-
-    QUARTZ_HOE("QuartzHoe", Constants.CATEGORY_TOOLS, false),
-
-    QUARTZ_SPADE("QuartzSpade", Constants.CATEGORY_TOOLS, false),
-
-    QUARTZ_SWORD("QuartzSword", Constants.CATEGORY_TOOLS, false),
-
-    QUARTZ_PICKAXE("QuartzPickaxe", Constants.CATEGORY_TOOLS, false),
-
-    QUARTZ_AXE("QuartzAxe", Constants.CATEGORY_TOOLS, false),
-
-    QUARTZ_KNIFE("QuartzKnife", Constants.CATEGORY_TOOLS, false),
-
-    QUARTZ_WRENCH("QuartzWrench", Constants.CATEGORY_TOOLS, false),
-
-    CHARGED_STAFF("ChargedStaff", Constants.CATEGORY_TOOLS, false),
-
-    ENTROPY_MANIPULATOR("EntropyManipulator", Constants.CATEGORY_TOOLS, false),
-
-    MATTER_CANNON("MatterCannon", Constants.CATEGORY_TOOLS, false),
-
-    WIRELESS_ACCESS_TERMINAL("WirelessAccessTerminal", Constants.CATEGORY_TOOLS, false),
-
-    COLOR_APPLICATOR("ColorApplicator", Constants.CATEGORY_TOOLS, false),
-
-    PAINT_BALLS("PaintBalls", Constants.CATEGORY_TOOLS, false),
-
-    METEORITE_COMPASS("MeteoriteCompass", Constants.CATEGORY_TOOLS, false),
-
-    LIGHT_DETECTOR("LightDetector", Constants.CATEGORY_MISC, false),
-
-    /**
-     * Network
-     */
-    SECURITY("Security", Constants.CATEGORY_NETWORK_FEATURES, false),
-
-    SPATIAL_IO("SpatialIO", Constants.CATEGORY_NETWORK_FEATURES, false),
-
-    QUANTUM_NETWORK_BRIDGE("QuantumNetworkBridge", Constants.CATEGORY_NETWORK_FEATURES, false),
-
-    CHANNELS("Channels", Constants.CATEGORY_NETWORK_FEATURES, false),
-
-    /**
-     * Buses and parts
-     */
-    INTERFACE("Interface", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    FLUID_INTERFACE("FluidInterface", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    LEVEL_EMITTER("LevelEmitter", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    FLUID_LEVEL_EMITTER("FluidLevelEmitter", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    FLUID_TERMINAL("FluidTerminal", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    CRAFTING_TERMINAL("CraftingTerminal", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    TERMINAL("Terminal", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    STORAGE_MONITOR("StorageMonitor", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    P2P_TUNNEL("P2PTunnel", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    FORMATION_PLANE("FormationPlane", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    FLUID_FORMATION_PLANE("FluidFormationPlane", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    ANNIHILATION_PLANE("AnnihilationPlane", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    IDENTITY_ANNIHILATION_PLANE("IdentityAnnihilationPlane", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    FLUID_ANNIHILATION_PLANE("FluidAnnihilationPlane", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    IMPORT_BUS("ImportBus", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    FLUID_IMPORT_BUS("FluidImportBus", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    EXPORT_BUS("ExportBus", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    FLUID_EXPORT_BUS("FluidExportBus", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    STORAGE_BUS("StorageBus", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    FLUID_STORAGE_BUS("FluidStorageBus", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    PART_CONVERSION_MONITOR("PartConversionMonitor", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    TOGGLE_BUS("ToggleBus", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    PANELS("Panels", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    QUARTZ_FIBER("QuartzFiber", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    CABLE_ANCHOR("CableAnchor", Constants.CATEGORY_NETWORK_BUSES, false),
-
-    /**
-     * Portable cells
-     */
-    PORTABLE_CELL("PortableCell", Constants.CATEGORY_PORTABLE_CELL, false),
-
-    /**
-     * Storage
-     */
-    STORAGE_CELLS("StorageCells", Constants.CATEGORY_STORAGE, false),
-
-    ME_CHEST("MEChest", Constants.CATEGORY_STORAGE, false),
-
-    ME_DRIVE("MEDrive", Constants.CATEGORY_STORAGE, false),
-
-    IO_PORT("IOPort", Constants.CATEGORY_STORAGE, false),
-
-    CONDENSER("Condenser", Constants.CATEGORY_STORAGE, false),
-
-    /**
-     * Network tools
-     */
-    NETWORK_TOOL("NetworkTool", Constants.CATEGORY_NETWORK_TOOL, false),
-
-    MEMORY_CARD("MemoryCard", Constants.CATEGORY_NETWORK_TOOL, false),
-
-    /**
-     * Cables
-     */
-    GLASS_CABLES("GlassCables", Constants.CATEGORY_CABLES, false),
-
-    COVERED_CABLES("CoveredCables", Constants.CATEGORY_CABLES, false),
-
-    SMART_CABLES("SmartCables", Constants.CATEGORY_CABLES, false),
-
-    DENSE_CABLES("DenseCables", Constants.CATEGORY_CABLES, false),
-
-    /**
-     * Energy cells
-     */
-    ENERGY_CELLS("EnergyCells", Constants.CATEGORY_ENERGY, false),
-
-    ENERGY_ACCEPTOR("EnergyAcceptor", Constants.CATEGORY_ENERGY, false),
-
-    DENSE_ENERGY_CELLS("DenseEnergyCells", Constants.CATEGORY_ENERGY, false),
-
-    /**
-     * P2P Tunnels
-     */
-    P2P_TUNNEL_ME("P2PTunnelME", Constants.CATEGORY_P2P_TUNNELS, false),
-
-    P2P_TUNNEL_ITEMS("P2PTunnelItems", Constants.CATEGORY_P2P_TUNNELS, false),
-
-    P2P_TUNNEL_REDSTONE("P2PTunnelRedstone", Constants.CATEGORY_P2P_TUNNELS, false),
-
-    P2P_TUNNEL_EU("P2PTunnelEU", Constants.CATEGORY_P2P_TUNNELS, false),
-
-    P2P_TUNNEL_FE("P2PTunnelFE", Constants.CATEGORY_P2P_TUNNELS, false),
-
-    P2P_TUNNEL_FLUIDS("P2PTunnelFluids", Constants.CATEGORY_P2P_TUNNELS, false),
-
-    P2P_TUNNEL_LIGHT("P2PTunnelLight", Constants.CATEGORY_P2P_TUNNELS, false),
-
-    P2P_TUNNEL_OPEN_COMPUTERS("P2PTunnelOpenComputers", Constants.CATEGORY_P2P_TUNNELS, false),
-
-    P2P_TUNNEL_PRESSURE("P2PTunnelPressure", Constants.CATEGORY_P2P_TUNNELS, false),
-
-    /**
-     * Block damage by items or blocks
-     */
-    MASS_CANNON_BLOCK_DAMAGE("MassCannonBlockDamage", Constants.CATEGORY_BLOCK_FEATURES, false),
-
-    TINY_TNT_BLOCK_DAMAGE("TinyTNTBlockDamage", Constants.CATEGORY_BLOCK_FEATURES, false),
-
-    /**
-     * Facades
-     */
-    FACADES("Facades", Constants.CATEGORY_FACADES, false),
-    TILE_ENTITY_FACADES("TileEntityFacades", Constants.CATEGORY_FACADES, false, true,
-            "Unsupported: Allows whitelisting TileEntity as facades. Could work, have render issues, or corrupt your world. USE AT YOUR OWN RISK."),
-
-    /**
-     * Debug
-     */
-    UNSUPPORTED_DEVELOPER_TOOLS("UnsupportedDeveloperTools", Constants.CATEGORY_MISC, false, true),
-
-    CREATIVE("Creative", Constants.CATEGORY_MISC, false),
-
-    GRINDER_LOGGING("GrinderLogging", Constants.CATEGORY_MISC, false, false),
-
-    LOGGING("Logging", Constants.CATEGORY_MISC, false),
-
-    INTEGRATION_LOGGING("IntegrationLogging", Constants.CATEGORY_MISC, false, true),
-
-    WEBSITE_RECIPES("WebsiteRecipes", Constants.CATEGORY_MISC, false, true),
-
-    LOG_SECURITY_AUDITS("LogSecurityAudits", Constants.CATEGORY_MISC, false, true),
-
-    ACHIEVEMENTS("Achievements", Constants.CATEGORY_MISC, false),
-
-    UPDATE_LOGGING("UpdateLogging", Constants.CATEGORY_MISC, false, true),
-
-    PACKET_LOGGING("PacketLogging", Constants.CATEGORY_MISC, false, true),
-
-    CRAFTING_LOG("CraftingLog", Constants.CATEGORY_MISC, false, true),
-
-    DEBUG_LOGGING("DebugLogging", Constants.CATEGORY_MISC, false, true),
-
-    /**
-     * Crafting
-     */
-    ENABLE_FACADE_CRAFTING("EnableFacadeCrafting", Constants.CATEGORY_CRAFTING, true),
-
-    IN_WORLD_SINGULARITY("InWorldSingularity", Constants.CATEGORY_CRAFTING, true),
-
-    IN_WORLD_FLUIX("InWorldFluix", Constants.CATEGORY_CRAFTING, true),
-
-    IN_WORLD_PURIFICATION("InWorldPurification", Constants.CATEGORY_CRAFTING, true),
-
-    INTERFACE_TERMINAL("InterfaceTerminal", Constants.CATEGORY_CRAFTING, false),
-
-    ENABLE_DISASSEMBLY_CRAFTING("EnableDisassemblyCrafting", Constants.CATEGORY_CRAFTING, true),
-
-    /**
-     * Rendering
-     */
-    ALPHA_PASS("AlphaPass", Constants.CATEGORY_RENDERING, true),
-
-    /**
-     * Crafting machines
-     */
-    MOLECULAR_ASSEMBLER("MolecularAssembler", Constants.CATEGORY_CRAFTING_FEATURES, false),
-
-    PATTERNS("Patterns", Constants.CATEGORY_CRAFTING_FEATURES, false),
-
-    CRAFTING_CPU("CraftingCPU", Constants.CATEGORY_CRAFTING_FEATURES, false),
-
-    /**
-     * Upgrades
-     */
-    BASIC_CARDS("BasicCards", Constants.CATEGORY_UPGRADES, false),
-
-    ADVANCED_CARDS("AdvancedCards", Constants.CATEGORY_UPGRADES, false),
-
-    VIEW_CELL("ViewCell", Constants.CATEGORY_UPGRADES, false),
-
-    CRYSTAL_SEEDS("CrystalSeeds", Constants.CATEGORY_MATERIALS, false),
-
-    PURE_CRYSTALS("PureCrystals", Constants.CATEGORY_MATERIALS, false),
-
-    /**
-     * Materials. Items mostly for crafting
-     */
-    CERTUS("Certus", Constants.CATEGORY_MATERIALS, false),
-
-    FLUIX("Fluix", Constants.CATEGORY_MATERIALS, false),
-
-    SILICON("Silicon", Constants.CATEGORY_MATERIALS, false),
-
-    DUSTS("Dusts", Constants.CATEGORY_MATERIALS, false),
-
-    NUGGETS("Nuggets", Constants.CATEGORY_MATERIALS, false),
-
-    QUARTZ_GLASS("QuartzGlass", Constants.CATEGORY_MATERIALS, false),
-
-    SKY_STONE("SkyStone", Constants.CATEGORY_MATERIALS, false),
-
-    PROCESSORS("Processors", Constants.CATEGORY_COMPONENTS, false),
-
-    PRINTED_CIRCUITS("PrintedCircuits", Constants.CATEGORY_COMPONENTS, false),
-
-    PRESSES("Presses", Constants.CATEGORY_COMPONENTS, false),
-
-    MATTER_BALL("MatterBall", Constants.CATEGORY_COMPONENTS, false),
-
-    CORES("Cores", Constants.CATEGORY_COMPONENTS, false),
-
-    /**
-     * Server commands
-     */
-    CHUNK_LOGGER_TRACE("ChunkLoggerTrace", Constants.CATEGORY_COMMANDS, false, true);
-
-    private final String key;
-    private final String category;
-    private final boolean enabled;
-    private final String comment;
-    private final boolean config;
-
-    AEFeature(final String key, final String cat, boolean config) {
-        this(key, cat, true, config);
-    }
-
-    AEFeature(final String key, final String cat, boolean config, final String comment) {
-        this(key, cat, true, config, comment);
-    }
-
-    AEFeature(final String key, final String cat, final boolean enabled, boolean config) {
-        this(key, cat, enabled, config, null);
-    }
-
-    AEFeature(final String key, final String cat, final boolean enabled, boolean config, final String comment) {
-        this.key = key;
-        this.category = cat;
-        this.enabled = enabled;
-        this.comment = comment;
-        this.config = config;
-    }
-
-    /**
-     * override to set visibility
-     *
-     * @return default true
-     */
-    public boolean isVisible() {
-        return true;
-    }
-
-    public String key() {
-        return this.key;
-    }
-
-    public String category() {
-        return this.category;
-    }
-
-    public boolean isEnabled() {
-        return this.enabled;
-    }
-
-    /**
-     * If exposed as config option.
-     */
-    public boolean isConfig() {
-        return config;
-    }
-
-    public String comment() {
-        return this.comment;
-    }
-
-    private enum Constants {
-        ;
-
-        private static final String CATEGORY_MISC = "Misc";
-        private static final String CATEGORY_CRAFTING = "Crafting";
-        private static final String CATEGORY_WORLD = "World";
-        private static final String CATEGORY_MACHINES = "Machines";
-        private static final String CATEGORY_TOOLS = "Tools";
-        private static final String CATEGORY_TOOLS_CLASSIFICATIONS = "ToolsClassifications";
-        private static final String CATEGORY_NETWORK_BUSES = "NetworkBuses";
-        private static final String CATEGORY_P2P_TUNNELS = "P2PTunnels";
-        private static final String CATEGORY_BLOCK_FEATURES = "BlockFeatures";
-        private static final String CATEGORY_CRAFTING_FEATURES = "CraftingFeatures";
-        private static final String CATEGORY_STORAGE = "Storage";
-        private static final String CATEGORY_CABLES = "Cables";
-        private static final String CATEGORY_NETWORK_FEATURES = "NetworkFeatures";
-        private static final String CATEGORY_COMMANDS = "Commands";
-        private static final String CATEGORY_RENDERING = "Rendering";
-        private static final String CATEGORY_FACADES = "Facades";
-        private static final String CATEGORY_NETWORK_TOOL = "NetworkTool";
-        private static final String CATEGORY_PORTABLE_CELL = "PortableCell";
-        private static final String CATEGORY_ENERGY = "Energy";
-        private static final String CATEGORY_UPGRADES = "Upgrades";
-        private static final String CATEGORY_MATERIALS = "Materials";
-        private static final String CATEGORY_COMPONENTS = "CraftingComponents";
-    }
-}
@@ -1,86 +0,0 @@
-/*
- * 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);
-
-}
@@ -0,0 +1,121 @@
+/*
+ * 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 net.minecraft.item.ItemStack;
+
+
+/**
+ * Registration Records for {@link IGrinderRegistry}
+ */
+public interface IGrinderEntry
+{
+
+	/**
+	 * the current input
+	 *
+	 * @return input that the grinder will accept.
+	 */
+	ItemStack getInput();
+
+	/**
+	 * lets you change the grinder recipe by changing its input.
+	 *
+	 * @param input input item
+	 */
+	void setInput( ItemStack input );
+
+	/**
+	 * gets the current output
+	 *
+	 * @return output that the grinder will produce
+	 */
+	ItemStack getOutput();
+
+	/**
+	 * allows you to change the output.
+	 *
+	 * @param output output item
+	 */
+	void setOutput( ItemStack output );
+
+	/**
+	 * gets the current output
+	 *
+	 * @return output that the grinder will produce
+	 */
+	ItemStack getOptionalOutput();
+
+	/**
+	 * gets the current output
+	 *
+	 * @return output that the grinder will produce
+	 */
+	ItemStack getSecondOptionalOutput();
+
+	/**
+	 * stack, and 0.0-1.0 chance that it will be generated.
+	 *
+	 * @param output output item
+	 * @param chance generation chance
+	 */
+	void setOptionalOutput( ItemStack output, float chance );
+
+	/**
+	 * 0.0 - 1.0 the chance that the optional output will be generated.
+	 *
+	 * @return chance of optional output
+	 */
+	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
+	 */
+	void setSecondOptionalOutput( ItemStack output, float chance );
+
+	/**
+	 * 0.0 - 1.0 the chance that the optional output will be generated.
+	 *
+	 * @return second optional output chance
+	 */
+	float getSecondOptionalChance();
+
+	/**
+	 * Energy cost, in turns.
+	 *
+	 * @return number of turns it takes to produce the output from the input.
+	 */
+	int getEnergyCost();
+
+	/**
+	 * Allows you to adjust the number of turns
+	 *
+	 * @param c number of turns to produce output.
+	 */
+	void setEnergyCost( int c );
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
thatsIch	d9f362270b	Merge pull request #1454 from TheJulianJES/doublePlayerInvInscriber Don't add the player inventory two times (rv2)	2015-05-14 12:43:21 +02:00
TheJulianJES	37aef15a02	Don't add the player inventory two times (rv2)	2015-05-14 12:38:44 +02:00
thatsIch	2d8728f0e1	Merge pull request #1437 from TheJulianJES/GermanLang Changed things in de_DE.lang (rv2)	2015-05-10 12:12:08 +02:00
thatsIch	3498a0902b	Merge pull request #1434 from plumpudding/errorEclipse Error eclipse for rv2 branch	2015-05-10 12:11:58 +02:00
TheJulianJES	bb4b6719fe	Changed things in de_DE.lang	2015-05-10 10:34:54 +02:00
TheJulianJES	34f78a7ce4	Fix warnings in eclipse Close scanner instead of doing it with a warning Make the scanner final..	2015-05-10 00:14:56 +02:00
thatsIch	064acc21ee	Fixes #1411 : Adds recipes for stairs	2015-05-08 18:36:42 +02:00
Lorenzo Dalla Costa Cervelin	deeb67f07d	Update pt_BR.lang	2015-05-08 17:59:55 +02:00
thatsIch	2eeaa80b59	Merge pull request #1380 from thatsIch/e-fix-javadoc Fixed missing Javadoc parameter	2015-05-03 21:48:53 +02:00
thatsIch	7cb485aa48	Fixed missing Javadoc parameter Reworked the instantiation a bit Added some additional checks due to the new nonnullability.	2015-05-03 16:45:27 +02:00