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

Added a unittest to verify the necessary string returns match the actual existing classes, in case something screws up the refactoring.
Replaces old fluid handlers with the new capability based ones. (#2727 )
2016-12-31 18:25:16 +01:00 · 2016-12-31 16:01:29 +01:00 · 2016-12-31 16:00:45 +01:00 · 2016-12-31 15:21:25 +01:00 · 2016-12-29 15:51:17 +01:00 · 2016-12-29 15:50:02 +01:00
1741 changed files with 24632 additions and 38811 deletions
@@ -12,18 +12,15 @@ top of things.
 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. Enter your a title of your issue (something that summarizes your issue), and then create a detailed description of the issue.
-    * Do not tag it with something like `[Feature]`, `[Bug]`, or a version.
-    * Restrict it to a single bug or feature, it makes managing them way easier for us.
-    * The following details are required. Also refer to the issue template when creating one.
+    * Do not tag it with something like `[Feature]` or `[Bug]`. When it is applicable, we will take care of it.
+    * The following details are required. Not including them can cause the issue to be closed.
        * Forge version
        * AE2 version
        * Crash log, when reporting a crash (Please make sure to use [pastebin](http://pastebin.com/))
-            * Never post an excerpt of what you consider important
-            * Always post the full log
+            * Do not post an excerpt of what you consider important, instead:
+            * Post the full log
        * Other mods and their version, when reporting an issue between AE and another mod
            * Also consider updating these before submitting a new issue, it might be already fixed
        * A detailed description of the bug or feature
@@ -36,12 +33,10 @@ Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue
        * Mod Pack using and version?
            * Keep in mind that some mods might use an outdated version of AE2
            * If so you should report it to your modpack
-4. Click `Submit New Issue`, and wait for feedback!
+5. Click `Submit New Issue`, and wait for feedback!

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

-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.
@@ -113,7 +108,7 @@ the styling guidelines used by AE.
 PRs that do not conform to these standards will be rejected.

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

 ### Whitespace

@@ -1,5 +1,5 @@
 [![Travis](https://img.shields.io/travis/AppliedEnergistics/Applied-Energistics-2.svg?maxAge=2592000&style=flat-square)](https://travis-ci.org/AppliedEnergistics/Applied-Energistics-2)
-[![Latest Release](https://img.shields.io/github/release/AppliedEnergistics/Applied-Energistics-2.svg?label=Latest%20Release&style=flat-square)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases)
+[![Latest Release](https://img.shields.io/github/release/AppliedEnergistics/Applied-Energistics-2.svg?label=Latest Release&style=flat-square)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases)

 # Applied Energistics 2

@@ -9,12 +9,12 @@
 * [Contacts](#contacts)
 * [License](#license)
 * [Downloads](#downloads)
+* [Nightly Builds](#nightly-builds)
 * [Installation](#installation)
 * [Issues](#issues)
 * [Building](#building)
 * [Contribution](#contribution)
 * [API](#applied-energistics-2-api)
-* [CraftTweaker](#applied-energistics-2-crafttweaker)
 * [Localization](#applied-energistics-2-localization)
 * [Credits](#credits)

@@ -31,13 +31,13 @@ A Mod about Matter, Energy and using them to conquer the world..
 ## License

 * Applied Energistics 2 API
-  - (c) 2013 - 2017 AlgorithmX2 et al
+  - (c) 2013 - 2015 AlgorithmX2 et al
  - [![License](https://img.shields.io/badge/License-MIT-red.svg?style=flat-square)](http://opensource.org/licenses/MIT)
 * Applied Energistics 2
-  - (c) 2013 - 2017 AlgorithmX2 et al
+  - (c) 2013 - 2015 AlgorithmX2 et al
  - [![License](https://img.shields.io/badge/License-LGPLv3-blue.svg?style=flat-square)](https://raw.githubusercontent.com/AppliedEnergistics/Applied-Energistics-2/rv2/LICENSE)
 * Textures and Models
-  - (c) 2013 - 2017 AlgorithmX2 et al
+  - (c) 2013 - 2015 AlgorithmX2 et al
  - [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%203.0-yellow.svg?style=flat-square)](https://creativecommons.org/licenses/by-nc-sa/3.0/)
 * Text and Translations
  - [![License](https://img.shields.io/badge/License-No%20Restriction-green.svg?style=flat-square)](https://creativecommons.org/publicdomain/zero/1.0/)
@@ -46,6 +46,14 @@ A Mod about Matter, Energy and using them to conquer the world..

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

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

 You install this mod by putting it into the `minecraft/mods/` folder. It has no additional hard dependencies.
@@ -55,18 +63,15 @@ 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. Enter your a title of your issue (something that summarizes your issue), and then create a detailed description of the issue.
-    * Do not tag it with something like `[Feature]`, `[Bug]`, or a version.
-    * Restrict it to a single bug or feature, it makes managing them way easier for us.
-    * The following details are required. Also refer to the issue template when creating one.
+    * Do not tag it with something like `[Feature]` or `[Bug]`. When it is applicable, we will take care of it.
+    * The following details are required. Not including them can cause the issue to be closed.
        * Forge version
        * AE2 version
        * Crash log, when reporting a crash (Please make sure to use [pastebin](http://pastebin.com/))
-            * Never post an excerpt of what you consider important
-            * Always post the full log
+            * Do not post an excerpt of what you consider important, instead:
+            * Post the full log
        * Other mods and their version, when reporting an issue between AE and another mod
            * Also consider updating these before submitting a new issue, it might be already fixed
        * A detailed description of the bug or feature
@@ -79,12 +84,10 @@ Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue
        * Mod Pack using and version?
            * Keep in mind that some mods might use an outdated version of AE2
            * If so you should report it to your modpack
-4. Click `Submit New Issue`, and wait for feedback!
+5. Click `Submit New Issue`, and wait for feedback!

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

-Please note that we might close any issue not matching these requirements. 
-
 ## Building

 1. Clone this repository via 
@@ -107,7 +110,7 @@ Please note that we might close any issue not matching these requirements.
 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.
+The [guidelines for contributing](https://github.com/AppliedEnergistics/Applied-Energistics-2/blob/master/CONTRIBUTING.md) contain more detailed information about topics like the used code style and should also be considered.

 Here are a few things to keep in mind that will help get your PR approved.

@@ -119,7 +122,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
@@ -139,7 +142,7 @@ 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

@@ -155,57 +158,6 @@ Where the __ are filled in with the correct version criteria; AE2 is available f

 An example string would be `appeng:appliedenergistics2:rv2-alpha-30:dev`

-## Applied Energistics 2 CraftTweaker
-
-### Inscriber
-Add a recipe. When `inscribe` is true the bottom and top inputs are not consumed.
-
-	mods.appliedenergistics2.Inscriber.addRecipe(ItemStack output, ItemStack input, boolean inscribe, 
-	                                             @Optional ItemStack topInput, @Optional ItemStack bottomInput );
-
-Remove all recipes for this output stack. 
-	                                             
-	mods.appliedenergistics2.Inscriber.removeRecipe(ItemStack output);	
-
-### Grindstone
-Add a recipe.
-
-	mods.appliedenergistics2.Grinder.addRecipe( ItemStack output, ItemStack input, int turns, 
-	                                            @Optional ItemStack secondary1Output, @Optional float secondary1Chance,
-	                                            @Optional ItemStack secondary2Output, @Optional float secondary2Chance);
-	
-Remove recipes for this input.
-
-	mods.appliedenergistics2.Grinder.removeRecipe(ItemStack input);	
-
-### 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 );
-
 ## Applied Energistics 2 Localization

 ### English Text
@@ -27,7 +27,7 @@ buildscript {
        }
    }
    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
    }
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
@@ -45,12 +45,6 @@ apply from: 'gradle/scripts/optional.gradle'
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8

-// ensure everything uses UTF-8 and not some random codepage chosen by gradle
-compileJava.options.encoding = 'UTF-8'
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-}
-
 version = aeversion + "-" + aechannel + "-" + aebuild
 group = aegroup
 archivesBaseName = aebasename
@@ -58,6 +52,7 @@ archivesBaseName = aebasename
 // Add Coremod Manifest
 jar {
    manifest {
+        attributes 'FMLCorePluginContainsFMLMod': 'true'
        attributes 'FMLAT': 'appeng_at.cfg'
    }

@@ -73,6 +68,8 @@ jar {
 }

 minecraft {
+    coreMod = "appeng.coremod.AppEngCore"
+
    version = minecraft_version + "-" + forge_version

    replaceIn "AEConfig.java"
@@ -89,8 +86,21 @@ minecraft {
 }

 sourceSets {
+
    api
+
+    // This source set will contain third party API code that we need to compile, but which is not shipped with the jar
+    thirdparty {
+        // Third Party APIs often need access to Minecraft classes (i.e. EnumFacing), so set this up here
+        compileClasspath += configurations.forgeGradleMc + configurations.forgeGradleMcDeps
+    }
+
    main
+
+}
+
+dependencies {
+    compile sourceSets.thirdparty.output
 }

 processResources
@@ -1,28 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="13">
-<profile kind="CodeFormatterProfile" name="AE2" version="13">
+<profiles version="12">
+<profile kind="CodeFormatterProfile" name="AE2" version="12">
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="2"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
@@ -30,19 +26,17 @@
 <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="80"/>
+<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.parentheses_positions_in_if_while_statement" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
@@ -58,16 +52,14 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
 <setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/>
+<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"/>
@@ -90,7 +82,6 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
@@ -102,16 +93,15 @@
 <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="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="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<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"/>
@@ -122,10 +112,9 @@
 <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="16"/>
+<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.parentheses_positions_in_annotation" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
@@ -164,18 +153,15 @@
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.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"/>
@@ -197,7 +183,6 @@
 <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="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
@@ -209,10 +194,8 @@
 <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
@@ -273,7 +256,6 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
@@ -289,7 +271,6 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
@@ -1,4 +1,4 @@
-aeversion=rv5
+aeversion=rv4
 aechannel=alpha
 aebuild=0
 aegroup=appeng
@@ -7,27 +7,19 @@ aebasename=appliedenergistics2
 #########################################################
 # Versions                                              #
 #########################################################
-minecraft_version=1.12.2
-mcp_mappings=snapshot_20171003
-forge_version=14.23.1.2554
+minecraft_version=1.10.2
+mcp_mappings=snapshot_20161111
+forge_version=12.18.3.2185

 #########################################################
 # Installable                                           #
 #########################################################
-hwyla_version=1.8.20-B35_1.12
+waila_version=1.7.0-B3_1.9.4

 #########################################################
 # Provided APIs                                         #
 #########################################################
-jei_version=4.8.0.105
-tesla_version=1.0.61
-ic2_version=2.8.19-ex112
-top_version=1.12-1.4.18-10
-cofhcore_version=1.12-4.+
-crafttweaker_version=4.0.10.310
-
-#########################################################
-# Deployment                                            #
-#########################################################
-website_version=1.12.2
-curse_versions=1.12.2
+jei_version=3.13.6.391
+tesla_version=1.10.2-1.2.1.50
+ic2_version=2.6.99-ex110
+top_version=1.10-1.3.3-41
@@ -31,7 +31,7 @@ repositories {

    maven {
        name = "Tesla repo"
-        url "http://maven.mcmoddev.com"
+        url "http://maven.epoxide.xyz"
    }

    maven {
@@ -39,35 +39,10 @@ repositories {
        url = "http://maven.ic2.player.to"
    }

-    maven {
-        name = "CoFH Maven"
-        url = "http://maven.covers1624.net"
-    }
-
    maven { // TheOneProbe
        name 'tterrag maven'
        url "http://maven.tterrag.com/"
    }
-
-    maven { // McJtyLib
-        name 'mcjty'
-        url "http://maven.k-4u.nl/"
-    }
-
-    maven { // Hwyla
-        name 'tehnut'
-        url "http://tehnut.info/maven"
-    }
-
-   	maven { // CraftTweaker
-        name 'jared maven'
-        url "http://maven.blamejared.com/"
-    }
-
-    maven { // modmaven, maven proxy
-        name 'modmaven'
-        url "https://modmaven.k-4u.nl/"
-    }
 }

 configurations {
@@ -76,18 +51,16 @@ configurations {

 dependencies {
    // installable runtime dependencies
-    mods "mcp.mobius.waila:Hwyla:${hwyla_version}"
+    mods "mcp.mobius.waila:Waila:${waila_version}"
    mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
-    mods "mcjty.theoneprobe:TheOneProbe-${minecraft_version}:${top_version}"
+    mods "mcjty.theoneprobe:TheOneProbe:${top_version}"

    // compile against provided APIs
    compileOnly "mezz.jei:jei_${minecraft_version}:${jei_version}:api"
-    compileOnly "mcp.mobius.waila:Hwyla:${hwyla_version}"
-    compileOnly "net.darkhax.tesla:Tesla-1.12:${tesla_version}"
+    compileOnly "mcp.mobius.waila:Waila:${waila_version}"
+    compileOnly "net.darkhax.tesla:Tesla:${tesla_version}"
    compileOnly "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
-    compileOnly "mcjty.theoneprobe:TheOneProbe-1.12:${top_version}:api"
-    compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf"
-    compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}"
+    compileOnly "mcjty.theoneprobe:TheOneProbe:${top_version}:api"

    // at runtime, use the full JEI jar
    runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
@@ -20,15 +20,15 @@ task wrapper(type: Wrapper) {
    gradleVersion = "2.14"
 }

-// HWYLA
-task installHwyla(type: Copy, dependsOn: "deinstallHwyla") {
+// WAILA
+task installWaila(type: Copy, dependsOn: "deinstallWaila") {
    from { configurations.mods }
-    include "**/*Hwyla*.jar"
+    include "**/*Waila*.jar"
    into file(minecraft.runDir + "/mods")
 }

-task deinstallHwyla(type: Delete) {
-    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Hwyla*.jar")
+task deinstallWaila(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Waila*.jar")
 }

 // IC2
@@ -43,7 +43,7 @@ task deinstallIC2(type: Delete) {
 }

 // TOP
-task installTop(type: Copy, dependsOn: ["deinstallTop"]) {
+task installTop(type: Copy, dependsOn: "deinstallTop") {
    from { configurations.mods }
    include "**/*TheOneProbe*.jar"
    into file(minecraft.runDir + "/mods")
@@ -1,4 +1,4 @@
-#Tue Jul 04 22:38:49 CEST 2017
+#Fri Sep 16 14:56:32 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
@@ -25,13 +25,14 @@ package appeng.api;


 import appeng.api.definitions.IDefinitions;
+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;

-
@AEInjectable
 public interface IAppEngApi
 {
@@ -41,23 +42,36 @@ public interface IAppEngApi
 	IRegistryContainer registries();

 	/**
-	 * @return A helper for working with storage data types.
+	 * @return helper for working with storage data types.
 	 */
 	IStorageHelper storage();

 	/**
-	 * @return A helper to create {@link IGridNode} and other grid related objects.
-	 */
-	IGridHelper grid();
-
-	/**
-	 * @return A helper for working with grids, and buses.
+	 * @return helper for working with grids, and buses.
 	 */
 	IPartHelper partHelper();

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

 public enum SearchBoxMode
 {
-	AUTOSEARCH, AUTOSEARCH_KEEP, MANUAL_SEARCH, MANUAL_SEARCH_KEEP, JEI_AUTOSEARCH, JEI_AUTOSEARCH_KEEP, JEI_MANUAL_SEARCH, JEI_MANUAL_SEARCH_KEEP
+	AUTOSEARCH, MANUAL_SEARCH, JEI_AUTOSEARCH, JEI_MANUAL_SEARCH
 }
@@ -33,53 +33,29 @@ public enum Settings
 {
 	LEVEL_EMITTER_MODE( EnumSet.allOf( LevelEmitterMode.class ) ),

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

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

-	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 ) ),

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

-	IO_DIRECTION( EnumSet.of( RelativeDirection.LEFT, RelativeDirection.RIGHT ) ),
+	INTERFACE_TERMINAL( EnumSet.of( YesNo.YES, YesNo.NO ) ), CRAFT_VIA_REDSTONE( EnumSet.of( YesNo.YES, YesNo.NO ) ),

-	BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ),
-
-	OPERATION_MODE( EnumSet.allOf( OperationMode.class ) ),
-
-	FULLNESS_MODE( EnumSet.allOf( FullnessMode.class ) ),
-
-	CRAFT_ONLY( EnumSet.of( YesNo.YES, YesNo.NO ) ),
-
-	FUZZY_MODE( EnumSet.allOf( FuzzyMode.class ) ),
-
-	LEVEL_TYPE( EnumSet.allOf( LevelType.class ) ),
-
-	TERMINAL_STYLE( EnumSet.of( TerminalStyle.TALL, TerminalStyle.SMALL ) ),
-
-	COPY_MODE( EnumSet.allOf( CopyMode.class ) ),
-
-	INTERFACE_TERMINAL( EnumSet.of( YesNo.YES, YesNo.NO ) ),
-
-	CRAFT_VIA_REDSTONE( EnumSet.of( YesNo.YES, YesNo.NO ) ),
-
-	STORAGE_FILTER( EnumSet.allOf( StorageFilter.class ) ),
-
-	PLACE_BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ),
+	STORAGE_FILTER( EnumSet.allOf( StorageFilter.class ) ), PLACE_BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ),

 	SCHEDULING_MODE( EnumSet.allOf( SchedulingMode.class ) );

@@ -28,7 +28,7 @@ public enum TunnelType
 {
 	ME, // Network Tunnel
 	IC2_POWER, // EU Tunnel
-	FE_POWER, // Forge Energy tunnel
+	RF_POWER, // RF Tunnel
 	REDSTONE, // Redstone Tunnel
 	FLUID, // Fluid Tunnel
 	ITEM, // Item Tunnel
@@ -111,6 +111,8 @@ public interface IMaterials

 	IItemDefinition matterBall();

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

 	IItemDefinition certusQuartzCrystalCharged();
@@ -38,9 +38,7 @@ public interface IParts

 	AEColoredItemDefinition cableGlass();

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

 	AEColoredItemDefinition lumenCableSmart();

@@ -48,7 +46,7 @@ public interface IParts

 	AEColoredItemDefinition lumenCableGlass();

-	AEColoredItemDefinition lumenDenseCableSmart();
+	AEColoredItemDefinition lumenCableDense();

 	IItemDefinition quartzFiber();

@@ -82,7 +80,7 @@ public interface IParts

 	IItemDefinition p2PTunnelEU();

-	IItemDefinition p2PTunnelFE();
+	// IItemDefinition p2PTunnelRF();

 	IItemDefinition p2PTunnelLight();

@@ -21,8 +21,6 @@ package appeng.api.exceptions;

 public class CoreInaccessibleException extends RuntimeException
 {
-	private static final long serialVersionUID = -7434641554655517242L;
-
 	public CoreInaccessibleException( final String message )
 	{
 		super( message );
@@ -37,7 +37,7 @@ import appeng.api.networking.IGridNode;
 * @version rv3
 * @since rv3
 */
-public class ExistingConnectionException extends FailedConnectionException
+public class ExistingConnectionException extends FailedConnection
 {

 	private static final long serialVersionUID = 2975450379720353182L;
@@ -40,16 +40,16 @@ import appeng.api.networking.IGridNode;
 * @version rv3
 * @since rv0
 */
-public class FailedConnectionException extends Exception
+public class FailedConnection extends Exception
 {

 	private static final long serialVersionUID = -2544208090248293753L;

-	public FailedConnectionException()
+	public FailedConnection()
 	{
 	}

-	public FailedConnectionException( String message )
+	public FailedConnection( String message )
 	{
 		super( message );
 	}
@@ -19,11 +19,9 @@
 package appeng.api.exceptions;


-public class MissingDefinitionException extends RuntimeException
+public class MissingDefinition extends RuntimeException
 {
-	private static final long serialVersionUID = -6547396584255825761L;
-
-	public MissingDefinitionException( final String message )
+	public MissingDefinition( final String message )
 	{
 		super( message );
 	}
@@ -24,12 +24,12 @@
 package appeng.api.exceptions;


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

 	private static final long serialVersionUID = -998858343831371697L;

-	public MissingIngredientException( final String n )
+	public MissingIngredientError( final String n )
 	{
 		super( n );
 	}
@@ -24,12 +24,12 @@
 package appeng.api.exceptions;


-public class ModNotInstalledException extends Exception
+public class ModNotInstalled extends Exception
 {

 	private static final long serialVersionUID = -9052435206368425494L;

-	public ModNotInstalledException( final String t )
+	public ModNotInstalled( final String t )
 	{
 		super( t );
 	}
@@ -34,7 +34,7 @@ package appeng.api.exceptions;
 * @version rv3
 * @since rv3
 */
-public class NullNodeConnectionException extends FailedConnectionException
+public class NullNodeConnectionException extends FailedConnection
 {

 	private static final long serialVersionUID = -2143719383495321764L;
@@ -24,12 +24,12 @@
 package appeng.api.exceptions;


-public class RecipeException extends Exception
+public class RecipeError extends Exception
 {

 	private static final long serialVersionUID = -6602870588617670262L;

-	public RecipeException( final String n )
+	public RecipeError( final String n )
 	{
 		super( n );
 	}
@@ -24,12 +24,12 @@
 package appeng.api.exceptions;


-public class RegistrationException extends Exception
+public class RegistrationError extends Exception
 {

 	private static final long serialVersionUID = -6602870588617670263L;

-	public RegistrationException( final String n )
+	public RegistrationError( final String n )
 	{
 		super( n );
 	}
@@ -34,7 +34,7 @@ package appeng.api.exceptions;
 * @version rv3
 * @since rv3
 */
-public class SecurityConnectionException extends FailedConnectionException
+public class SecurityConnectionException extends FailedConnection
 {
 	private static final long serialVersionUID = 5048714900434215426L;
 	private static final String DEFAULT_MESSAGE = "Connection failed due to different security realms.";
@@ -1,84 +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 );
-
-}
@@ -1,115 +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.features;
-
-
-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
-
-import net.minecraft.item.ItemStack;
-
-
-/**
- * Builder for a grinder recipe.
- * 
- * The only default value provided are turns at a value of 8.
- *
- * @author yueh
- * @version rv5
- * @since rv5
- */
-public interface IGrinderRecipeBuilder
-{
-
-	/**
-	 * Creates an grinder recipe with inputs.
-	 * Needs to be invoked.
-	 *
-	 * @param input new input for the recipe
-	 *
-	 * @return currently used builder
-	 */
-	@Nonnull
-	IGrinderRecipeBuilder withInput( @Nonnull ItemStack input );
-
-	/**
-	 * Creates an grinder recipe with output.
-	 * Needs to be invoked.
-	 *
-	 * @param output new output for the recipe
-	 *
-	 * @return currently used builder
-	 */
-	@Nonnull
-	IGrinderRecipeBuilder withOutput( @Nonnull ItemStack output );
-
-	/**
-	 * Creates an grinder recipe with the first optional output and its chance.
-	 *
-	 * @param optional new first optional for the recipe
-	 * @param chance chance for the first optional output, must be within 0.0 - 1.0
-	 *
-	 * @return currently used builder
-	 */
-	@Nonnull
-	IGrinderRecipeBuilder withFirstOptional( @Nonnull ItemStack optional, float chance );
-
-	/**
-	 * Creates an grinder recipe with the second optional output and its chance.
-	 *
-	 * @param optional new second optional for the recipe
-	 * @param chance chance for the second optional output, must be within 0.0 - 1.0
-	 *
-	 * @return currently used builder
-	 */
-	@Nonnull
-	IGrinderRecipeBuilder withSecondOptional( @Nonnull ItemStack optional, float chance );
-
-	/**
-	 * Creates an grinder recipe with the amount of turns as cost.
-	 * 
-	 * Defaults to 8 when not called.
-	 *
-	 * @param turns new turns for the recipe, must be > 0
-	 *
-	 * @return currently used builder
-	 */
-	@Nonnull
-	IGrinderRecipeBuilder withTurns( @Nonnegative int turns );
-
-	/**
-	 * Finalizes the process of making the recipe.
-	 * Needs to be invoked to fetch grinder recipe.
-	 *
-	 * @return valid grinder recipe
-	 *
-	 * @throws IllegalStateException when input is not defined
-	 * @throws IllegalStateException when input has no size
-	 * @throws IllegalStateException when output is not defined
-	 * @throws IllegalStateException when both optionals are not defined
-	 * @throws IllegalStateException when process type is not defined
-	 */
-	@Nonnull
-	IGrinderRecipe build();
-}
@@ -38,14 +38,6 @@ import net.minecraft.item.ItemStack;
 public interface IGrinderRegistry
 {

-	/**
-	 * Extensible way to create a grinder recipe.
-	 *
-	 * @return builder for grinder recipes
-	 */
-	@Nonnull
-	IGrinderRecipeBuilder builder();
-
 	/**
 	 * An immutable list of the currently registered recipes.
 	 *
@@ -55,9 +47,44 @@ public interface IGrinderRegistry
 	Collection<IGrinderRecipe> getRecipes();

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

 	/**
 	 * Remove the specific from the recipe list.
@@ -31,19 +31,11 @@ import net.minecraft.item.ItemStack;
 * Lets you manipulate Inscriber Recipes, by adding or editing existing ones.
 *
 * @author thatsIch
- * @version rv5
+ * @version rv3
 * @since rv2
 */
 public interface IInscriberRegistry
 {
-	/**
-	 * Extensible way to create an inscriber recipe.
-	 *
-	 * @return builder for inscriber recipes
-	 */
-	@Nonnull
-	IInscriberRecipeBuilder builder();
-
 	/**
 	 * An immutable copy of currently registered recipes.
 	 *
@@ -73,25 +65,29 @@ public interface IInscriberRegistry
 	@Nonnull
 	Set<ItemStack> getInputs();

+	/**
+	 * Extensible way to create an inscriber recipe.
+	 *
+	 * @return builder for inscriber recipes
+	 */
+	@Nonnull
+	IInscriberRecipeBuilder builder();
+
 	/**
 	 * add a new recipe the easy way, duplicates will not be added.
 	 * Added recipes will be automatically added to the optionals and inputs.
 	 *
 	 * @param recipe new recipe
-	 * 
-	 * @return true, when successfully added
 	 *
 	 * @throws IllegalArgumentException if null is added
 	 */
-	boolean addRecipe( IInscriberRecipe recipe );
+	void addRecipe( IInscriberRecipe recipe );

 	/**
 	 * Removes all equal recipes from the registry.
-	 * 
+	 *
 	 * @param toBeRemovedRecipe to be removed recipe, can be null, makes just no sense.
-	 * 
-	 * @return true, when successfully removed
 	 */
-	boolean removeRecipe( IInscriberRecipe toBeRemovedRecipe );
+	void removeRecipe( IInscriberRecipe toBeRemovedRecipe );

 }
@@ -24,11 +24,9 @@
 package appeng.api.features;


-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.capabilities.Capability;

 import appeng.api.config.TunnelType;

@@ -46,9 +44,7 @@ public interface IP2PTunnelRegistry
 	 * @param trigger - the item which triggers attunement. Nullable, but then ignored
 	 * @param type - the type of tunnel. Nullable, but then ignored
 	 */
-	void addNewAttunement( @Nonnull ItemStack trigger, @Nullable TunnelType type );
-	void addNewAttunement( @Nonnull String ModId, @Nullable TunnelType type );
-	void addNewAttunement( @Nonnull Capability<?> cap, @Nullable TunnelType type );
+	void addNewAttunement( @Nullable ItemStack trigger, @Nullable TunnelType type );

 	/**
 	 * returns null if no attunement can be found.
@@ -57,6 +53,6 @@ public interface IP2PTunnelRegistry
 	 *
 	 * @return null if no attunement can be found or attunement
 	 */
-	@Nonnull
+	@Nullable
 	TunnelType getTunnelTypeByItem( ItemStack trigger );
 }
@@ -48,7 +48,6 @@ public interface IRecipeHandlerRegistry
 	 * @param name name of crafthandler
 	 * @param handler class of crafthandler
 	 */
-	@Deprecated
 	void addNewCraftHandler( String name, Class<? extends ICraftHandler> handler );

 	/**
@@ -66,13 +65,11 @@ public interface IRecipeHandlerRegistry
 	 * @return A recipe handler by name, returns null on failure.
 	 */
 	@Nullable
-	@Deprecated
 	ICraftHandler getCraftHandlerFor( String name );

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

 	/**
@@ -34,8 +34,7 @@ import appeng.api.storage.ICellRegistry;
 /**
 * @author AlgorithmX2
 * @author thatsIch
- * @author yueh
- * @version rv5
+ * @version rv2
 * @since rv0
 */
@AEInjectable
@@ -77,11 +76,6 @@ public interface IRegistryContainer
 	 */
 	IInscriberRegistry inscriber();

-	/**
-	 * Manage charger via API
-	 */
-	IChargerRegistry charger();
-
 	/**
 	 * get access to the locatable registry
 	 */
@@ -24,7 +24,7 @@
 package appeng.api.implementations.guiobjects;


-import net.minecraftforge.items.IItemHandler;
+import net.minecraft.inventory.IInventory;

 import appeng.api.networking.IGridHost;

@@ -32,9 +32,8 @@ import appeng.api.networking.IGridHost;
 /**
 * Obtained via {@link IGuiItem} getGuiObject
 */
-public interface INetworkTool extends IGuiItemObject
+public interface INetworkTool extends IInventory, IGuiItemObject
 {
+
 	IGridHost getGridHost(); // null for most purposes.
-	
-	IItemHandler getInventory();
 }
@@ -27,7 +27,6 @@ package appeng.api.implementations.items;
 import net.minecraft.item.ItemStack;

 import appeng.api.config.AccessRestriction;
-import appeng.api.config.Actionable;
 import appeng.api.networking.energy.IAEPowerStorage;


@@ -43,27 +42,27 @@ public interface IAEItemPowerStorage
 	 *
 	 * @return amount unable to be stored
 	 */
-	double injectAEPower( ItemStack stack, double amount, Actionable mode );
+	double injectAEPower( ItemStack is, double amt );

 	/**
 	 * Attempt to extract power from the device, it will extract what it can and
 	 * return it.
 	 *
-	 * @param amount to be extracted power from device
+	 * @param amt to be extracted power from device
 	 *
 	 * @return what it could extract
 	 */
-	double extractAEPower( ItemStack stack, double amount, Actionable mode );
+	double extractAEPower( ItemStack is, double amt );

 	/**
 	 * @return the current maximum power ( this can change :P )
 	 */
-	double getAEMaxPower( ItemStack stack );
+	double getAEMaxPower( ItemStack is );

 	/**
 	 * @return the current AE Power Level, this may exceed getMEMaxPower()
 	 */
-	double getAECurrentPower( ItemStack stack );
+	double getAECurrentPower( ItemStack is );

 	/**
 	 * Control the power flow by telling what the network can do, either add? or
@@ -71,5 +70,5 @@ public interface IAEItemPowerStorage
 	 *
 	 * @return access restriction of network
 	 */
-	AccessRestriction getPowerFlow( ItemStack stack );
+	AccessRestriction getPowerFlow( ItemStack is );
 }
@@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;

 import appeng.api.implementations.TransitionResult;
-import appeng.api.storage.ISpatialDimension;
 import appeng.api.util.WorldCoord;


@@ -58,7 +57,7 @@ public interface ISpatialStorageCell
 	 *
 	 * @return the world for this cell
 	 */
-	ISpatialDimension getSpatialDimension();
+	World getWorld( ItemStack is );

 	/**
 	 * get the currently stored size.
@@ -70,13 +69,22 @@ public interface ISpatialStorageCell
 	WorldCoord getStoredSize( ItemStack is );

 	/**
-	 * get the currently stored Dimension id.
+	 * Minimum coordinates in its world for the storage cell.
 	 *
 	 * @param is spatial storage cell
 	 *
-	 * @return dimension id or -1
+	 * @return minimum coordinate of dimension
 	 */
-	int getStoredDimensionID( ItemStack is );
+	WorldCoord getMin( ItemStack is );
+
+	/**
+	 * Maximum coordinates in its world for the storage cell.
+	 *
+	 * @param is spatial storage cell
+	 *
+	 * @return maximum coordinate of dimension
+	 */
+	WorldCoord getMax( ItemStack is );

 	/**
 	 * Perform a spatial swap with the contents of the cell, and the world.
@@ -85,9 +93,9 @@ public interface ISpatialStorageCell
 	 * @param w world of spatial
 	 * @param min min coord
 	 * @param max max coord
-	 * @param playerId owner of current grid or -1
+	 * @param doTransition transition
 	 *
 	 * @return result of transition
 	 */
-	TransitionResult doSpatialTransition( ItemStack is, World w, WorldCoord min, WorldCoord max, int playerId );
+	TransitionResult doSpatialTransition( ItemStack is, World w, WorldCoord min, WorldCoord max, boolean doTransition );
 }
@@ -23,7 +23,8 @@

 package appeng.api.implementations.tiles;

-import net.minecraftforge.items.IItemHandler;
+
+import net.minecraft.inventory.IInventory;


 public interface ISegmentedInventory
@@ -37,5 +38,5 @@ public interface ISegmentedInventory
 	 *
 	 * @return inventory with inventory name
 	 */
-	IItemHandler getInventoryByName( String name );
+	IInventory getInventoryByName( String name );
 }
@@ -23,7 +23,8 @@

 package appeng.api.implementations.tiles;

-import net.minecraftforge.items.IItemHandler;
+
+import net.minecraft.inventory.IInventory;


 public interface IViewCellStorage
@@ -34,5 +35,5 @@ public interface IViewCellStorage
 	 *
 	 * @return inventory with at least 5 slot
 	 */
-	IItemHandler getViewCellStorage();
+	IInventory getViewCellStorage();
 }
@@ -1,64 +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.networking;
-
-
-import appeng.api.exceptions.FailedConnectionException;
-
-
-/**
- * A helper responsible for creating new {@link IGridNode}, {@link IGridConnection} or potentially similar tasks.
- * 
- * @author yueh
- * @version rv5
- * @since rv5
- */
-public interface IGridHelper
-{
-
-	/**
-	 * Create a grid node for your {@link IGridHost}
-	 * 
-	 * The passed {@link IGridBlock} represents the definition for properties like connectable sides.
-	 * Refer to its documentation for further details.
-	 *
-	 * @param block grid block
-	 *
-	 * @return grid node of block
-	 */
-	IGridNode createGridNode( IGridBlock block );
-
-	/**
-	 * Create a direct connection between two {@link IGridNode}.
-	 * 
-	 * This will be considered as having a distance of 1, regardless of the location of both nodes.
-	 * 
-	 * @param a to be connected gridnode
-	 * @param b to be connected gridnode
-	 *
-	 * @throws appeng.api.exceptions.FailedConnectionException
-	 */
-	IGridConnection createGridConnection( IGridNode a, IGridNode b ) throws FailedConnectionException;
-
-}
@@ -24,7 +24,7 @@
 package appeng.api.networking.crafting;


-import appeng.api.networking.security.IActionSource;
+import appeng.api.networking.security.BaseActionSource;
 import appeng.api.networking.storage.IBaseMonitor;
 import appeng.api.storage.data.IAEItemStack;

@@ -40,7 +40,7 @@ public interface ICraftingCPU extends IBaseMonitor<IAEItemStack>
 	/**
 	 * @return the action source for the CPU.
 	 */
-	IActionSource getActionSource();
+	BaseActionSource getActionSource();

 	/**
 	 * @return the available storage in bytes
@@ -33,7 +33,7 @@ import net.minecraft.world.World;

 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridCache;
-import appeng.api.networking.security.IActionSource;
+import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.data.IAEItemStack;


@@ -63,7 +63,7 @@ public interface ICraftingGrid extends IGridCache
 	 * @return a future which will at an undetermined point in the future get you the {@link ICraftingJob} do not wait
 	 * on this, your be waiting forever.
 	 */
-	Future<ICraftingJob> beginCraftingJob( World world, IGrid grid, IActionSource actionSrc, IAEItemStack craftWhat, ICraftingCallback callback );
+	Future<ICraftingJob> beginCraftingJob( World world, IGrid grid, BaseActionSource actionSrc, IAEItemStack craftWhat, ICraftingCallback callback );

 	/**
 	 * Submit the job to the Crafting system for processing.
@@ -82,7 +82,7 @@ public interface ICraftingGrid extends IGridCache
 	 * {@link ICraftingRequester} methods. if you send null, this object should be discarded after verifying the
 	 * return state.
 	 */
-	ICraftingLink submitJob( ICraftingJob job, ICraftingRequester requestingMachine, ICraftingCPU target, boolean prioritizePower, IActionSource src );
+	ICraftingLink submitJob( ICraftingJob job, ICraftingRequester requestingMachine, ICraftingCPU target, boolean prioritizePower, BaseActionSource src );

 	/**
 	 * @return list of all the crafting cpus on the grid
@@ -29,16 +29,16 @@ import appeng.api.storage.data.IAEStack;

 /**
 * DO NOT IMPLEMENT.
- *
+ * 
 * Will be injected when adding an {@link ICraftingWatcherHost} to a grid.
 */
 public interface ICraftingWatcher
 {
 	/**
 	 * Add a specific {@link IAEStack} to watch.
-	 *
+	 * 
 	 * Supports multiple values, duplicate ones will not be added.
-	 *
+	 * 
 	 * @param stack
 	 * @return true, if successfully added.
 	 */
@@ -46,7 +46,7 @@ public interface ICraftingWatcher

 	/**
 	 * Remove a specific {@link IAEStack} from the watcher.
-	 *
+	 * 
 	 * @param stack
 	 * @return true, if successfully removed.
 	 */
@@ -24,10 +24,7 @@
 package appeng.api.networking.energy;


-import java.util.Collection;
-
-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
+import java.util.Set;

 import appeng.api.config.Actionable;

@@ -38,91 +35,17 @@ import appeng.api.config.Actionable;
 public interface IEnergyGridProvider
 {
 	/**
-	 * internal use only
-	 * 
-	 * Can return a list of providers behind the current.
-	 * 
-	 * An example would be something acting as proxy between different {@link IEnergyGrid}s.
-	 * 
-	 * This can contain duplicate entries, AE will ensure that each provider is only visited once.
-	 * 
 	 * internal use only
 	 */
-	@Nonnull
-	Collection<IEnergyGridProvider> providers();
+	double extractAEPower( double amt, Actionable mode, Set<IEnergyGrid> seen );

 	/**
 	 * internal use only
-	 * 
-	 * Extracts the requested amount from the provider.
-	 * 
-	 * This should never forward a call to another {@link IEnergyGridProvider}, instead return them via
-	 * {@link IEnergyGridProvider#providers()}
-	 * 
-	 * @return the used amount
 	 */
-	@Nonnegative
-	double extractProviderPower( @Nonnegative double amt, @Nonnull Actionable mode );
-
-	/**
-	 * Injects the offered amount into the provider.
-	 * 
-	 * This should never forward a call to another {@link IEnergyGridProvider}, instead return them via
-	 * {@link IEnergyGridProvider#providers()}
-	 * 
-	 * internal use only
-	 * 
-	 * @return the leftover amount
-	 */
-	@Nonnegative
-	double injectProviderPower( @Nonnegative double amt, @Nonnull Actionable mode );
+	double injectAEPower( double amt, Actionable mode, Set<IEnergyGrid> seen );

 	/**
 	 * internal use only
-	 * 
-	 * Returns the current demand of an provider.
-	 * 
-	 * This should never forward a call to another {@link IEnergyGridProvider}, instead return them via
-	 * {@link IEnergyGridProvider#providers()}
-	 * 
-	 * 
-	 * @param d the max amount offered, the demand should never exceed it.
-	 * @return the total amount demanded
 	 */
-	@Nonnegative
-	double getProviderEnergyDemand( @Nonnegative double d );
-
-	/**
-	 * internal use only
-	 * 
-	 * AE currently uses this to enqueue the next visited provider.
-	 * 
-	 * There is no guarantee that this works on in a perfect way.
-	 * It can be limited to the returns of the past {@link IEnergyGridProvider#providers()}, but not any future one
-	 * discovered by visiting further providers.
-	 * 
-	 * E.g. inject into the the lowest one first or extract from the highest one.
-	 * 
-	 * @return the current stored amount.
-	 * 
-	 * 
-	 */
-	@Nonnegative
-	double getProviderStoredEnergy();
-
-	/**
-	 * internal use only
-	 * 
-	 * AE currently uses this to enqueue the next visited provider.
-	 * 
-	 * There is no guarantee that this works on in a perfect way.
-	 * It can be limited to the returns of the past {@link IEnergyGridProvider#providers()}, but not any future one
-	 * discovered by visiting further providers.
-	 * 
-	 * E.g. inject into the the lowest one first or extract from the highest one.
-	 * 
-	 * @return the maximum amount stored.
-	 */
-	@Nonnegative
-	double getProviderMaxEnergy();
+	double getEnergyDemand( double d, Set<IEnergyGrid> seen );
 }
@@ -26,16 +26,16 @@ package appeng.api.networking.energy;

 /**
 * DO NOT IMPLEMENT.
- *
+ * 
 * Will be injected when adding an {@link IEnergyWatcherHost} to a grid.
 */
 public interface IEnergyWatcher
 {
 	/**
 	 * Add a specific threshold to watch.
-	 *
+	 * 
 	 * Supports multiple values, duplicate ones will not be added.
-	 *
+	 * 
 	 * @param amount
 	 * @return true, if successfully added.
 	 */
@@ -43,7 +43,7 @@ public interface IEnergyWatcher

 	/**
 	 * Remove a specific threshold from the watcher.
-	 *
+	 * 
 	 * @param amount
 	 * @return true, if successfully removed.
 	 */
@@ -25,7 +25,7 @@ package appeng.api.networking.events;


 import appeng.api.storage.IMEMonitor;
-import appeng.api.storage.IStorageChannel;
+import appeng.api.storage.StorageChannel;


 /**
@@ -40,9 +40,9 @@ public class MENetworkStorageEvent extends MENetworkEvent
 {

 	public final IMEMonitor monitor;
-	public final IStorageChannel channel;
+	public final StorageChannel channel;

-	public MENetworkStorageEvent( final IMEMonitor o, final IStorageChannel chan )
+	public MENetworkStorageEvent( final IMEMonitor o, final StorageChannel chan )
 	{
 		this.monitor = o;
 		this.channel = chan;
@@ -0,0 +1,41 @@
+/*
+ * 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.networking.security;
+
+/**
+ * TODO: Consider refactoring.
+ */
+public class BaseActionSource
+{
+
+	public boolean isPlayer()
+	{
+		return false;
+	}
+
+	public boolean isMachine()
+	{
+		return false;
+	}
+}
@@ -24,10 +24,11 @@
 package appeng.api.networking.security;


+import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;


-public interface IActionHost
+public interface IActionHost extends IGridHost
 {

 	/**
@@ -1,77 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2013 AlgorithmX2
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.networking.security;
-
-
-import java.util.Optional;
-
-import javax.annotation.Nonnull;
-
-import net.minecraft.entity.player.EntityPlayer;
-
-
-/**
- * The source of any action.
- * 
- * This can either be a {@link EntityPlayer} or an {@link IActionHost}.
- * 
- * In most cases this is used for security checks, but can be used to validate the source itself.
- *
- */
-public interface IActionSource
-{
-
-	/**
-	 * If present, AE will consider the player being the source for the action.
-	 * 
-	 * This will take precedence over {@link IActionSource#machine()} in any case.
-	 * 
-	 * @return An optional player issuing the action.
-	 */
-	@Nonnull
-	Optional<EntityPlayer> player();
-
-	/**
-	 * If present, it indicates the {@link IActionHost} of the source.
-	 * 
-	 * Should {@link IActionSource#player()} be absent, it will consider a machine as source.
-	 *
-	 * It is recommended to include the machine even when a player is present.
-	 * 
-	 * @return An optional machine issuing the action or acting as proxy for a player.
-	 */
-	@Nonnull
-	Optional<IActionHost> machine();
-
-	/**
-	 * An {@link IActionSource} can have multiple optional contexts.
-	 * 
-	 * It is strongly recommended to limit the uses for absolutely necessary cases.
-	 * 
-	 * Currently there are no public contexts made available by AE.
-	 * An example would be the context interfaces use internally to avoid looping items between each other.
-	 */
-	@Nonnull
-	<T> Optional<T> context( @Nonnull Class<T> key );
-}
@@ -0,0 +1,44 @@
+/*
+ * 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.networking.security;
+
+/**
+ * TODO: Consider refactoring.
+ */
+public class MachineSource extends BaseActionSource
+{
+
+	public final IActionHost via;
+
+	public MachineSource( final IActionHost v )
+	{
+		this.via = v;
+	}
+
+	@Override
+	public boolean isMachine()
+	{
+		return true;
+	}
+}
@@ -0,0 +1,49 @@
+/*
+ * 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.networking.security;
+
+
+import net.minecraft.entity.player.EntityPlayer;
+
+/**
+ * TODO: Consider refactoring.
+ */
+public class PlayerSource extends BaseActionSource
+{
+
+	public final EntityPlayer player;
+	public final IActionHost via;
+
+	public PlayerSource( final EntityPlayer p, final IActionHost v )
+	{
+		this.player = p;
+		this.via = v;
+	}
+
+	@Override
+	public boolean isPlayer()
+	{
+		return true;
+	}
+}
@@ -28,7 +28,7 @@ import appeng.api.storage.IMEMonitorHandlerReceiver;
 import appeng.api.storage.data.IAEStack;


-public interface IBaseMonitor<T extends IAEStack<T>>
+public interface IBaseMonitor<T extends IAEStack>
 {

 	/**
@@ -29,16 +29,16 @@ import appeng.api.storage.data.IAEStack;

 /**
 * DO NOT IMPLEMENT.
- *
+ * 
 * Will be injected when adding an {@link IStackWatcherHost} to a grid.
 */
 public interface IStackWatcher
 {
 	/**
 	 * Add a specific {@link IAEStack} to watch.
-	 *
+	 * 
 	 * Supports multiple values, duplicate ones will not be added.
-	 *
+	 * 
 	 * @param stack
 	 * @return true, if successfully added.
 	 */
@@ -46,7 +46,7 @@ public interface IStackWatcher

 	/**
 	 * Remove a specific {@link IAEStack} from the watcher.
-	 *
+	 * 
 	 * @param stack
 	 * @return true, if successfully removed.
 	 */
@@ -24,8 +24,8 @@
 package appeng.api.networking.storage;


-import appeng.api.networking.security.IActionSource;
-import appeng.api.storage.IStorageChannel;
+import appeng.api.networking.security.BaseActionSource;
+import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;

@@ -50,5 +50,5 @@ public interface IStackWatcherHost
 	 * @param src action source
 	 * @param chan storage channel
 	 */
-	void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan );
+	void onStackChange( IItemList o, IAEStack fullStack, IAEStack diffStack, BaseActionSource src, StorageChannel chan );
 }
@@ -26,11 +26,11 @@ package appeng.api.networking.storage;

 import appeng.api.networking.IGridCache;
 import appeng.api.networking.IGridHost;
-import appeng.api.networking.security.IActionSource;
+import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.ICellContainer;
 import appeng.api.storage.ICellProvider;
-import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.IStorageMonitorable;
+import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEStack;


@@ -50,7 +50,7 @@ public interface IStorageGrid extends IGridCache, IStorageMonitorable
 	 *
 	 * @param input injected items
 	 */
-	void postAlterationOfStoredItems( IStorageChannel<?> chan, Iterable<? extends IAEStack<?>> input, IActionSource src );
+	void postAlterationOfStoredItems( StorageChannel chan, Iterable<? extends IAEStack> input, BaseActionSource src );

 	/**
 	 * Used to add a cell provider to the storage system
@@ -29,5 +29,5 @@ public enum BusSupport
 	CABLE,

 	DENSE_CABLE
-
+	
 }
@@ -24,6 +24,8 @@
 package appeng.api.parts;


+import javax.annotation.Nullable;
+
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
@@ -69,6 +71,7 @@ public interface IFacadePart
 	/**
 	 * The item that this facade masquerades as.
 	 */
+	@Nullable
 	ItemStack getTextureItem();

 	/**
@@ -42,7 +42,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.fml.relauncher.Side;
@@ -130,7 +129,7 @@ public interface IPart extends IBoxProvider, ICustomCableConnection
 	/**
 	 * a block around the bus's host has been changed.
 	 */
-	void onNeighborChanged( IBlockAccess w, BlockPos pos, BlockPos neighbor );
+	void onNeighborChanged();

 	/**
 	 * @return output redstone on facing side
@@ -41,9 +41,9 @@ public interface IPartModel
 	/**
 	 * A solid {@link IPartModel} indicates that the rendering requires a cable connection, which will also result in
 	 * creating an intersection for the cable.
-	 *
+	 * 
 	 * This should be true for pretty much all parts.
-	 *
+	 * 
 	 * @return true for a solid part.
 	 */
 	default boolean requireCableConnection()
@@ -53,7 +53,7 @@ public interface IPartModel

 	/**
 	 * A collection of {@link ResourceLocation} used as models for a part.
-	 *
+	 * 
 	 * @return a collection of models, never null.
 	 */
 	@Nonnull
@@ -26,11 +26,11 @@ package appeng.api.recipes;

 import java.util.List;

-import appeng.api.exceptions.MissingIngredientException;
-import appeng.api.exceptions.RecipeException;
-import appeng.api.exceptions.RegistrationException;
+import appeng.api.exceptions.MissingIngredientError;
+import appeng.api.exceptions.RecipeError;
+import appeng.api.exceptions.RegistrationError;
+

-@Deprecated
 public interface ICraftHandler
 {

@@ -40,15 +40,15 @@ public interface ICraftHandler
 	 * @param input parsed inputs
 	 * @param output parsed outputs
 	 *
-	 * @throws RecipeException
+	 * @throws RecipeError
 	 */
-	void setup( List<List<IIngredient>> input, List<List<IIngredient>> output ) throws RecipeException;
+	void setup( List<List<IIngredient>> input, List<List<IIngredient>> output ) throws RecipeError;

 	/**
 	 * called when all recipes are parsed, and your required to register your recipe.
 	 *
-	 * @throws RegistrationException
-	 * @throws MissingIngredientException
+	 * @throws RegistrationError
+	 * @throws MissingIngredientError
 	 */
-	void register() throws RegistrationException, MissingIngredientException;
+	void register() throws RegistrationError, MissingIngredientError;
 }
@@ -26,10 +26,10 @@ package appeng.api.recipes;

 import net.minecraft.item.ItemStack;

-import appeng.api.exceptions.MissingIngredientException;
-import appeng.api.exceptions.RegistrationException;
+import appeng.api.exceptions.MissingIngredientError;
+import appeng.api.exceptions.RegistrationError;
+

-@Deprecated
 public interface IIngredient
 {

@@ -39,10 +39,10 @@ public interface IIngredient
 	 *
 	 * @return a single ItemStack for the recipe handler.
 	 *
-	 * @throws RegistrationException
-	 * @throws MissingIngredientException
+	 * @throws RegistrationError
+	 * @throws MissingIngredientError
 	 */
-	ItemStack getItemStack() throws RegistrationException, MissingIngredientException;
+	ItemStack getItemStack() throws RegistrationError, MissingIngredientError;

 	/**
 	 * Acquire a list of all the input stacks for the current recipe, this is for handlers that support
@@ -50,10 +50,10 @@ public interface IIngredient
 	 *
 	 * @return an array of ItemStacks for the recipe handler.
 	 *
-	 * @throws RegistrationException
-	 * @throws MissingIngredientException
+	 * @throws RegistrationError
+	 * @throws MissingIngredientError
 	 */
-	ItemStack[] getItemStackSet() throws RegistrationException, MissingIngredientException;
+	ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredientError;

 	/**
 	 * If you wish to support air, you must test before getting the ItemStack, or ItemStackSet
@@ -85,8 +85,8 @@ public interface IIngredient
 	/**
 	 * Bakes the lists in for faster runtime look-ups.
 	 *
-	 * @throws MissingIngredientException
-	 * @throws RegistrationException
+	 * @throws MissingIngredientError
+	 * @throws RegistrationError
 	 */
-	void bake() throws RegistrationException, MissingIngredientException;
+	void bake() throws RegistrationError, MissingIngredientError;
 }
@@ -27,7 +27,6 @@ package appeng.api.recipes;
 /**
 * Represents the AE2 Recipe Loading/Reading Class
 */
-@Deprecated
 public interface IRecipeHandler
 {

@@ -28,7 +28,7 @@ import java.io.BufferedReader;

 import javax.annotation.Nonnull;

-@Deprecated
+
 public interface IRecipeLoader
 {
 	/**
@@ -28,7 +28,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

 import appeng.api.implementations.tiles.IChestOrDrive;
-import appeng.api.storage.data.IAEStack;


 /**
@@ -57,7 +56,7 @@ public interface ICellHandler
 	 *
 	 * @return a new IMEHandler for the provided item
 	 */
-	<T extends IAEStack<T>> IMEInventoryHandler<T> getCellInventory( ItemStack is, ISaveProvider host, IStorageChannel<T> channel );
+	IMEInventoryHandler getCellInventory( ItemStack is, ISaveProvider host, StorageChannel channel );

 	/**
 	 * Called when the storage cell is planed in an ME Chest and the user tries to open the terminal side, if your item
@@ -71,7 +70,7 @@ public interface ICellHandler
 	 * @param is item
 	 * @param chan storage channel
 	 */
-	<T extends IAEStack<T>> void openChestGui( EntityPlayer player, IChestOrDrive chest, ICellHandler cellHandler, IMEInventoryHandler<T> inv, ItemStack is, IStorageChannel<T> chan );
+	void openChestGui( EntityPlayer player, IChestOrDrive chest, ICellHandler cellHandler, IMEInventoryHandler inv, ItemStack is, StorageChannel chan );

 	/**
 	 * 0 - cell is missing.
@@ -87,10 +86,10 @@ public interface ICellHandler
 	 *
 	 * @return get the status of the cell based on its contents.
 	 */
-	<T extends IAEStack<T>> int getStatusForCell( ItemStack is, IMEInventory<T> handler );
+	int getStatusForCell( ItemStack is, IMEInventory handler );

 	/**
 	 * @return the ae/t to drain for this storage cell inside a chest/drive.
 	 */
-	<T extends IAEStack<T>> double cellIdleDrain( ItemStack is, IMEInventory<T> handler );
+	double cellIdleDrain( ItemStack is, IMEInventory handler );
 }
@@ -24,8 +24,8 @@
 package appeng.api.storage;


+import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.IItemHandler;

 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.data.IAEItemStack;
@@ -52,12 +52,12 @@ public interface ICellInventory extends IMEInventory<IAEItemStack>
 	/**
 	 * @return access configured list
 	 */
-	IItemHandler getConfigInventory();
+	IInventory getConfigInventory();

 	/**
 	 * @return access installed upgrades.
 	 */
-	IItemHandler getUpgradesInventory();
+	IInventory getUpgradesInventory();

 	/**
 	 * @return How many bytes are used for each type?
@@ -42,7 +42,7 @@ public interface ICellProvider
 	 *
 	 * @return a valid list of handlers, NEVER NULL
 	 */
-	List<IMEInventoryHandler> getCellArray( IStorageChannel<?> channel );
+	List<IMEInventoryHandler> getCellArray( StorageChannel channel );

 	/**
 	 * the storage's priority.
@@ -27,7 +27,6 @@ package appeng.api.storage;
 import net.minecraft.item.ItemStack;

 import appeng.api.IAppEngApi;
-import appeng.api.storage.data.IAEStack;


 /**
@@ -74,5 +73,5 @@ public interface ICellRegistry
 	 *
 	 * @return new IMEInventoryHandler, or null if there isn't one.
 	 */
-	<T extends IAEStack<T>> IMEInventoryHandler<T> getCellInventory( ItemStack is, ISaveProvider host, IStorageChannel<T> chan );
+	IMEInventoryHandler getCellInventory( ItemStack is, ISaveProvider host, StorageChannel chan );
 }
@@ -24,8 +24,8 @@
 package appeng.api.storage;


+import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.IItemHandler;

 import appeng.api.config.FuzzyMode;

@@ -48,7 +48,7 @@ public interface ICellWorkbenchItem
 	 *
 	 * onInventoryChange will be called when saving is needed.
 	 */
-	IItemHandler getUpgradesInventory( ItemStack is );
+	IInventory getUpgradesInventory( ItemStack is );

 	/**
 	 * Used to extract, or mirror the contents of the work bench onto the cell.
@@ -57,7 +57,7 @@ public interface ICellWorkbenchItem
 	 *
 	 * onInventoryChange will be called when saving is needed.
 	 */
-	IItemHandler getConfigInventory( ItemStack is );
+	IInventory getConfigInventory( ItemStack is );

 	/**
 	 * @return the current fuzzy status.
@@ -25,7 +25,7 @@ package appeng.api.storage;


 import appeng.api.config.Actionable;
-import appeng.api.networking.security.IActionSource;
+import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;

@@ -40,7 +40,7 @@ import appeng.api.storage.data.IItemList;
 * If you want to request a stack of an item, you should should determine that prior to requesting the stack from the
 * inventory.
 */
-public interface IMEInventory<T extends IAEStack<T>>
+public interface IMEInventory<StackType extends IAEStack>
 {

 	/**
@@ -52,7 +52,7 @@ public interface IMEInventory<T extends IAEStack<T>>
 	 *
 	 * @return returns the number of items not added.
 	 */
-	T injectItems( T input, Actionable type, IActionSource src );
+	StackType injectItems( StackType input, Actionable type, BaseActionSource src );

 	/**
 	 * Extract the specified item from the ME Inventory
@@ -62,7 +62,7 @@ public interface IMEInventory<T extends IAEStack<T>>
 	 *
 	 * @return returns the number of items extracted, null
 	 */
-	T extractItems( T request, Actionable mode, IActionSource src );
+	StackType extractItems( StackType request, Actionable mode, BaseActionSource src );

 	/**
 	 * request a full report of all available items, storage.
@@ -71,10 +71,10 @@ public interface IMEInventory<T extends IAEStack<T>>
 	 *
 	 * @return returns same list that was passed in, is passed out
 	 */
-	IItemList<T> getAvailableItems( IItemList<T> out );
+	IItemList<StackType> getAvailableItems( IItemList<StackType> out );

 	/**
 	 * @return the type of channel your handler should be part of
 	 */
-	IStorageChannel<T> getChannel();
+	StorageChannel getChannel();
 }
@@ -32,9 +32,9 @@ import appeng.api.storage.data.IAEStack;
 * Thin logic layer that can be swapped with different IMEInventory implementations, used to handle features related to
 * storage, that are Separate from the storage medium itself.
 *
- * @param <T>
+ * @param <StackType>
 */
-public interface IMEInventoryHandler<T extends IAEStack<T>> extends IMEInventory<T>
+public interface IMEInventoryHandler<StackType extends IAEStack> extends IMEInventory<StackType>
 {

 	/**
@@ -52,7 +52,7 @@ public interface IMEInventoryHandler<T extends IAEStack<T>> extends IMEInventory
 	 *
 	 * @return if its prioritized
 	 */
-	boolean isPrioritized( T input );
+	boolean isPrioritized( StackType input );

 	/**
 	 * determine if an item can be accepted and stored.
@@ -61,7 +61,7 @@ public interface IMEInventoryHandler<T extends IAEStack<T>> extends IMEInventory
 	 *
 	 * @return if the item can be added
 	 */
-	boolean canAccept( T input );
+	boolean canAccept( StackType input );

 	/**
 	 * determine what the priority of the inventory is.
@@ -29,7 +29,7 @@ import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;


-public interface IMEMonitor<T extends IAEStack<T>> extends IMEInventoryHandler<T>, IBaseMonitor<T>
+public interface IMEMonitor<T extends IAEStack> extends IMEInventoryHandler<T>, IBaseMonitor<T>
 {

 	/**
@@ -37,7 +37,7 @@ public interface IMEMonitor<T extends IAEStack<T>> extends IMEInventoryHandler<T
 	 */
 	@Override
 	@Deprecated
-	IItemList<T> getAvailableItems( IItemList<T> out );
+	IItemList<T> getAvailableItems( IItemList out );

 	/**
 	 * Get access to the full item list of the network, preferred over {@link IMEInventory} .getAvailableItems(...)
@@ -24,12 +24,12 @@
 package appeng.api.storage;


-import appeng.api.networking.security.IActionSource;
+import appeng.api.networking.security.BaseActionSource;
 import appeng.api.networking.storage.IBaseMonitor;
 import appeng.api.storage.data.IAEStack;


-public interface IMEMonitorHandlerReceiver<T extends IAEStack<T>>
+public interface IMEMonitorHandlerReceiver<StackType extends IAEStack>
 {

 	/**
@@ -46,7 +46,7 @@ public interface IMEMonitorHandlerReceiver<T extends IAEStack<T>>
 	 *
 	 * @param change done change
 	 */
-	void postChange( IBaseMonitor<T> monitor, Iterable<T> change, IActionSource actionSource );
+	void postChange( IBaseMonitor<StackType> monitor, Iterable<StackType> change, BaseActionSource actionSource );

 	/**
 	 * called when the list updates its contents, this is mostly for handling power events.
@@ -27,5 +27,5 @@ package appeng.api.storage;
 public interface ISaveProvider
 {

-	void saveChanges( IMEInventory<?> cellInventory );
+	void saveChanges( IMEInventory cellInventory );
 }
@@ -1,41 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2017, 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.storage;
-
-
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-
-public interface ISpatialDimension
-{
-	World getWorld();
-
-	int createNewCellDimension( BlockPos contentSize, int playerId );
-
-	void deleteCellDimension( int cellDimId );
-
-	boolean isCellDimension( int cellDimID );
-
-	int getCellDimensionOwner( int cellDimId );
-
-	BlockPos getCellDimensionOrigin( int cellDimId );
-
-	BlockPos getCellContentSize( int cellDimId );
-}
@@ -1,116 +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.storage;
-
-
-import java.io.IOException;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import io.netty.buffer.ByteBuf;
-
-import net.minecraft.item.ItemStack;
-
-import appeng.api.networking.energy.IEnergySource;
-import appeng.api.networking.security.IActionSource;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IAEStack;
-import appeng.api.storage.data.IItemList;
-
-
-public interface IStorageChannel<T extends IAEStack<T>>
-{
-
-	/**
-	 * Can be used as factor for transferring stacks of a channel.
-	 * 
-	 * E.g. used by IO Ports to transfer 1000 mB, not 1 mB to match the
-	 * item channel transferring a full bucket per operation.
-	 * 
-	 * @return
-	 */
-	default int transferFactor()
-	{
-		return 1;
-	}
-
-	/**
-	 * Create a new {@link IItemList} of the specific type.
-	 * 
-	 * @return
-	 */
-	@Nonnull
-	IItemList<T> createList();
-
-	/**
-	 * Create a new {@link IAEStack} subtype of the specific object.
-	 * 
-	 * The parameter is unbound to allow a slightly more flexible approach.
-	 * But the general intention is about converting an {@link ItemStack} into the corresponding {@link IAEItemStack}.
-	 * Another valid case might be to use it instead of {@link IAEStack#copy()}, but this might not be supported by all
-	 * types.
-	 * 
-	 * @param input The object to turn into an {@link IAEStack}
-	 * @return The converted stack or null
-	 */
-	@Nullable
-	T createStack( @Nonnull Object input );
-
-	/**
-	 * 
-	 * @param input
-	 * @return
-	 * @throws IOException
-	 */
-	@Nullable
-	T readFromPacket( @Nonnull ByteBuf input ) throws IOException;
-
-	/**
-	 * use energy from energy, to remove request items from cell, at the request of src.
-	 *
-	 * @param energy to be drained energy source
-	 * @param cell cell of requested items
-	 * @param request requested items
-	 * @param src action source
-	 *
-	 * @return items that successfully extracted.
-	 */
-	@Nullable
-	T poweredExtraction( @Nonnull IEnergySource energy, @Nonnull IMEInventory<T> cell, @Nonnull T request, @Nonnull IActionSource src );
-
-	/**
-	 * use energy from energy, to inject input items into cell, at the request of src
-	 *
-	 * @param energy to be added energy source
-	 * @param cell injected cell
-	 * @param input to be injected items
-	 * @param src action source
-	 *
-	 * @return items that failed to insert.
-	 */
-	@Nullable
-	T poweredInsert( @Nonnull IEnergySource energy, @Nonnull IMEInventory<T> cell, @Nonnull T input, @Nonnull IActionSource src );
-
-}
@@ -24,63 +24,26 @@
 package appeng.api.storage;


-import java.util.Collection;
+import java.io.IOException;

-import javax.annotation.Nonnull;
+import io.netty.buffer.ByteBuf;

+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;

 import appeng.api.networking.crafting.ICraftingLink;
 import appeng.api.networking.crafting.ICraftingRequester;
+import appeng.api.networking.energy.IEnergySource;
+import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IItemList;


 public interface IStorageHelper
 {

-	/**
-	 * Register a new storage channel.
-	 * 
-	 * AE2 already provides native channels for {@link IAEItemStack} and {@link IAEFluidStack}.
-	 * 
-	 * Each {@link IAEStack} subtype can only have a single factory instance. Overwriting is not intended.
-	 * Each subtype should be a direct one, this might be enforced at any time.
-	 * 
-	 * Channel class and factory instance can be used interchangeable as identifier. In most cases the factory instance
-	 * is used as key as having direct access the methods is more beneficial compared to being forced to query the
-	 * registry each time.
-	 * 
-	 * Caching the factory instance in a field or local variable is perfectly for performance reasons. But do not use
-	 * any AE2 internal field as they can change randomly between releases.
-	 * 
-	 * @param channel The channel type, must be a subtype of {@link IStorageChannel}
-	 * @param factory An instance implementing the channel, must be be an instance of channel
-	 */
-	@Nonnull
-	<T extends IAEStack<T>, C extends IStorageChannel<T>> void registerStorageChannel( @Nonnull Class<C> channel, @Nonnull C factory );
-
-	/**
-	 * Fetch the factory instance for a specific storage channel.
-	 * 
-	 * Channel must be a direct subtype of {@link IStorageChannel}.
-	 * 
-	 * @throws NullPointerException when fetching an unregistered channel.
-	 * @param channel The channel type
-	 * @return the factory instance
-	 */
-	@Nonnull
-	<T extends IAEStack<T>, C extends IStorageChannel<T>> C getStorageChannel( @Nonnull Class<C> channel );
-
-	/**
-	 * An unmodifiable collection of all registered factory instance.
-	 * 
-	 * This is mainly used as helper to let storage grids construct their internal storage for each type.
-	 */
-	@Nonnull
-	Collection<IStorageChannel<? extends IAEStack<?>>> storageChannels();
-
 	/**
 	 * load a crafting link from nbt data.
 	 *
@@ -90,4 +53,73 @@ public interface IStorageHelper
 	 */
 	ICraftingLink loadCraftingLink( NBTTagCompound data, ICraftingRequester req );

+	/**
+	 * @param is An ItemStack
+	 *
+	 * @return a new INSTANCE of {@link IAEItemStack} from a MC {@link ItemStack}
+	 */
+	IAEItemStack createItemStack( ItemStack is );
+
+	/**
+	 * @param is A FluidStack
+	 *
+	 * @return a new INSTANCE of {@link IAEFluidStack} from a Forge {@link FluidStack}
+	 */
+	IAEFluidStack createFluidStack( FluidStack is );
+
+	/**
+	 * @return a new INSTANCE of {@link IItemList} for items
+	 */
+	IItemList<IAEItemStack> createItemList();
+
+	/**
+	 * @return a new INSTANCE of {@link IItemList} for fluids
+	 */
+	IItemList<IAEFluidStack> createFluidList();
+
+	/**
+	 * Read a AE Item Stack from a byte stream, returns a AE item stack or null.
+	 *
+	 * @param input to be loaded data
+	 *
+	 * @return item based of data
+	 *
+	 * @throws IOException if file could not be read
+	 */
+	IAEItemStack readItemFromPacket( ByteBuf input ) throws IOException;
+
+	/**
+	 * Read a AE Fluid Stack from a byte stream, returns a AE fluid stack or null.
+	 *
+	 * @param input to be loaded data
+	 *
+	 * @return fluid based on data
+	 *
+	 * @throws IOException if file could not be written
+	 */
+	IAEFluidStack readFluidFromPacket( ByteBuf input ) throws IOException;
+
+	/**
+	 * use energy from energy, to remove request items from cell, at the request of src.
+	 *
+	 * @param energy to be drained energy source
+	 * @param cell cell of requested items
+	 * @param request requested items
+	 * @param src action source
+	 *
+	 * @return items that successfully extracted.
+	 */
+	IAEItemStack poweredExtraction( IEnergySource energy, IMEInventory<IAEItemStack> cell, IAEItemStack request, BaseActionSource src );
+
+	/**
+	 * use energy from energy, to inject input items into cell, at the request of src
+	 *
+	 * @param energy to be added energy source
+	 * @param cell injected cell
+	 * @param input to be injected items
+	 * @param src action source
+	 *
+	 * @return items that failed to insert.
+	 */
+	IAEItemStack poweredInsert( IEnergySource energy, IMEInventory<IAEItemStack> cell, IAEItemStack input, BaseActionSource src );
 }
@@ -24,7 +24,8 @@
 package appeng.api.storage;


-import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.api.storage.data.IAEItemStack;


 /**
@@ -34,6 +35,13 @@ import appeng.api.storage.data.IAEStack;
 public interface IStorageMonitorable
 {

-	<T extends IAEStack<T>> IMEMonitor<T> getInventory( IStorageChannel<T> channel );
+	/**
+	 * Access the item inventory for the monitorable storage.
+	 */
+	IMEMonitor<IAEItemStack> getItemInventory();

+	/**
+	 * Access the fluid inventory for the monitorable storage.
+	 */
+	IMEMonitor<IAEFluidStack> getFluidInventory();
 }
@@ -4,7 +4,7 @@ package appeng.api.storage;

 import javax.annotation.Nullable;

-import appeng.api.networking.security.IActionSource;
+import appeng.api.networking.security.BaseActionSource;


 /**
@@ -22,5 +22,5 @@ public interface IStorageMonitorableAccessor
 	 * @return Null if the network cannot be accessed by the given action source (i.e. security doesn't permit it).
 	 */
 	@Nullable
-	IStorageMonitorable getInventory( IActionSource src );
+	IStorageMonitorable getInventory( BaseActionSource src );
 }
@@ -21,7 +21,7 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

-package appeng.me.helpers;
+package appeng.api.storage;


 import java.util.HashMap;
@@ -32,11 +32,7 @@ import com.google.common.collect.ImmutableList;

 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
-import appeng.api.networking.security.IActionSource;
-import appeng.api.storage.IMEInventoryHandler;
-import appeng.api.storage.IMEMonitor;
-import appeng.api.storage.IMEMonitorHandlerReceiver;
-import appeng.api.storage.IStorageChannel;
+import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;

@@ -45,45 +41,47 @@ import appeng.api.storage.data.IItemList;
 * Common implementation of a simple class that monitors injection/extraction of a inventory to send events to a list of
 * listeners.
 *
- * @param <T>
+ * @param <StackType>
+ * @deprecated
 *
- * TODO: Needs to be redesigned to solve performance issues.
+ * TODO: Needs to be redesigned to solve performance issues. Also should not be part of the API as class.
 */
-public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
+@Deprecated
+public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<StackType>
 {

-	private final IMEInventoryHandler<T> internalHandler;
-	private final IItemList<T> cachedList;
-	private final HashMap<IMEMonitorHandlerReceiver<T>, Object> listeners = new HashMap<>();
+	private final IMEInventoryHandler<StackType> internalHandler;
+	private final IItemList<StackType> cachedList;
+	private final HashMap<IMEMonitorHandlerReceiver<StackType>, Object> listeners = new HashMap<IMEMonitorHandlerReceiver<StackType>, Object>();

 	protected boolean hasChanged = true;

-	public MEMonitorHandler( final IMEInventoryHandler<T> t )
+	public MEMonitorHandler( final IMEInventoryHandler<StackType> t )
 	{
 		this.internalHandler = t;
 		this.cachedList = t.getChannel().createList();
 	}

-	public MEMonitorHandler( final IMEInventoryHandler<T> t, final IStorageChannel<T> chan )
+	public MEMonitorHandler( final IMEInventoryHandler<StackType> t, final StorageChannel chan )
 	{
 		this.internalHandler = t;
 		this.cachedList = chan.createList();
 	}

 	@Override
-	public void addListener( final IMEMonitorHandlerReceiver<T> l, final Object verificationToken )
+	public void addListener( final IMEMonitorHandlerReceiver<StackType> l, final Object verificationToken )
 	{
 		this.listeners.put( l, verificationToken );
 	}

 	@Override
-	public void removeListener( final IMEMonitorHandlerReceiver<T> l )
+	public void removeListener( final IMEMonitorHandlerReceiver<StackType> l )
 	{
 		this.listeners.remove( l );
 	}

 	@Override
-	public T injectItems( final T input, final Actionable mode, final IActionSource src )
+	public StackType injectItems( final StackType input, final Actionable mode, final BaseActionSource src )
 	{
 		if( mode == Actionable.SIMULATE )
 		{
@@ -92,14 +90,14 @@ public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
 		return this.monitorDifference( input.copy(), this.getHandler().injectItems( input, mode, src ), false, src );
 	}

-	protected IMEInventoryHandler<T> getHandler()
+	protected IMEInventoryHandler<StackType> getHandler()
 	{
 		return this.internalHandler;
 	}

-	private T monitorDifference( final T original, final T leftOvers, final boolean extraction, final IActionSource src )
+	private StackType monitorDifference( final IAEStack original, final StackType leftOvers, final boolean extraction, final BaseActionSource src )
 	{
-		final T diff = original.copy();
+		final StackType diff = (StackType) original.copy();

 		if( extraction )
 		{
@@ -118,19 +116,19 @@ public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
 		return leftOvers;
 	}

-	protected void postChangesToListeners( final Iterable<T> changes, final IActionSource src )
+	protected void postChangesToListeners( final Iterable<StackType> changes, final BaseActionSource src )
 	{
 		this.notifyListenersOfChange( changes, src );
 	}

-	protected void notifyListenersOfChange( final Iterable<T> diff, final IActionSource src )
+	protected void notifyListenersOfChange( final Iterable<StackType> diff, final BaseActionSource src )
 	{
 		this.hasChanged = true;// need to update the cache.
-		final Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = this.getListeners();
+		final Iterator<Entry<IMEMonitorHandlerReceiver<StackType>, Object>> i = this.getListeners();
 		while( i.hasNext() )
 		{
-			final Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
-			final IMEMonitorHandlerReceiver<T> receiver = o.getKey();
+			final Entry<IMEMonitorHandlerReceiver<StackType>, Object> o = i.next();
+			final IMEMonitorHandlerReceiver<StackType> receiver = o.getKey();
 			if( receiver.isValid( o.getValue() ) )
 			{
 				receiver.postChange( this, diff, src );
@@ -142,13 +140,13 @@ public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
 		}
 	}

-	protected Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> getListeners()
+	protected Iterator<Entry<IMEMonitorHandlerReceiver<StackType>, Object>> getListeners()
 	{
 		return this.listeners.entrySet().iterator();
 	}

 	@Override
-	public T extractItems( final T request, final Actionable mode, final IActionSource src )
+	public StackType extractItems( final StackType request, final Actionable mode, final BaseActionSource src )
 	{
 		if( mode == Actionable.SIMULATE )
 		{
@@ -158,7 +156,7 @@ public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
 	}

 	@Override
-	public IStorageChannel<T> getChannel()
+	public StorageChannel getChannel()
 	{
 		return this.getHandler().getChannel();
 	}
@@ -170,7 +168,7 @@ public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
 	}

 	@Override
-	public IItemList<T> getStorageList()
+	public IItemList<StackType> getStorageList()
 	{
 		if( this.hasChanged )
 		{
@@ -183,19 +181,19 @@ public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
 	}

 	@Override
-	public boolean isPrioritized( final T input )
+	public boolean isPrioritized( final StackType input )
 	{
 		return this.getHandler().isPrioritized( input );
 	}

 	@Override
-	public boolean canAccept( final T input )
+	public boolean canAccept( final StackType input )
 	{
 		return this.getHandler().canAccept( input );
 	}

 	@Override
-	public IItemList<T> getAvailableItems( final IItemList<T> out )
+	public IItemList<StackType> getAvailableItems( final IItemList out )
 	{
 		return this.getHandler().getAvailableItems( out );
 	}
@@ -1,7 +1,7 @@
 /*
 * The MIT License (MIT)
 *
- * Copyright (c) 2017 AlgorithmX2
+ * 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
@@ -21,14 +21,44 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

-package appeng.api.storage.channels;
+package appeng.api.storage;


-import appeng.api.storage.IStorageChannel;
+import appeng.api.AEApi;
 import appeng.api.storage.data.IAEFluidStack;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IItemList;


-public interface IFluidStorageChannel extends IStorageChannel<IAEFluidStack>
+public enum StorageChannel
 {
+	/**
+	 * AE2's Default Storage.
+	 */
+	ITEMS( IAEItemStack.class ),

+	/**
+	 * AE2's Fluid Based Storage ( mainly added to better support ExtraCells )
+	 */
+	FLUIDS( IAEFluidStack.class );
+
+	public final Class<? extends IAEStack> type;
+
+	StorageChannel( final Class<? extends IAEStack> t )
+	{
+		this.type = t;
+	}
+
+	public IItemList createList()
+	{
+		if( this == ITEMS )
+		{
+			return AEApi.instance().storage().createItemList();
+		}
+		else
+		{
+			return AEApi.instance().storage().createFluidList();
+		}
+	}
 }
@@ -1,34 +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.storage.channels;
-
-
-import appeng.api.storage.IStorageChannel;
-import appeng.api.storage.data.IAEItemStack;
-
-
-public interface IItemStorageChannel extends IStorageChannel<IAEItemStack>
-{
-
-}
@@ -37,7 +37,7 @@ import net.minecraftforge.fluids.FluidStack;
 *
 * Don't Implement.
 *
- * Construct with AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class).createStack( FluidStack )
+ * Construct with Util.createFluidStack( FluidStack )
 */
 public interface IAEFluidStack extends IAEStack<IAEFluidStack>
 {
@@ -36,7 +36,7 @@ import net.minecraft.item.ItemStack;
 *
 * Don't Implement.
 *
- * Construct with AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class).createStack( ItemStack )
+ * Construct with Util.createItemStack( ItemStack )
 */
 public interface IAEItemStack extends IAEStack<IAEItemStack>
 {
@@ -46,7 +46,7 @@ public interface IAEItemStack extends IAEStack<IAEItemStack>
 	 *
 	 * @return new ItemStack
 	 */
-	ItemStack createItemStack();
+	ItemStack getItemStack();

 	/**
 	 * is there NBT Data for this item?
@@ -105,11 +105,4 @@ public interface IAEItemStack extends IAEStack<IAEItemStack>
 	 * @return true if it is the same type (same item, damage, nbt)
 	 */
 	boolean isSameType( ItemStack stored );
-
-	/**
-	 * DO NOT MODIFY THIS STACK! NEVER. If you think about it .. DON'T
-	 * 
-	 * @return definition stack
-	 */
-	ItemStack getDefinition();
 }
@@ -28,14 +28,13 @@ import java.io.IOException;

 import io.netty.buffer.ByteBuf;

-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

 import appeng.api.config.FuzzyMode;
-import appeng.api.storage.IStorageChannel;
+import appeng.api.storage.StorageChannel;


-public interface IAEStack<T extends IAEStack<T>>
+public interface IAEStack<StackType extends IAEStack>
 {

 	/**
@@ -43,7 +42,7 @@ public interface IAEStack<T extends IAEStack<T>>
 	 *
 	 * @param is added item
 	 */
-	void add( T is );
+	void add( StackType is );

 	/**
 	 * number of items in the stack.
@@ -57,7 +56,7 @@ public interface IAEStack<T extends IAEStack<T>>
 	 *
 	 * @param stackSize , ItemStack.stackSize = N
 	 */
-	T setStackSize( long stackSize );
+	StackType setStackSize( long stackSize );

 	/**
 	 * Same as getStackSize, but for requestable items. ( LP )
@@ -71,7 +70,7 @@ public interface IAEStack<T extends IAEStack<T>>
 	 *
 	 * @return basically itemStack.stackSize = N but for setStackSize items.
 	 */
-	T setCountRequestable( long countRequestable );
+	StackType setCountRequestable( long countRequestable );

 	/**
 	 * true, if the item can be crafted.
@@ -85,12 +84,12 @@ public interface IAEStack<T extends IAEStack<T>>
 	 *
 	 * @param isCraftable can item be crafted
 	 */
-	T setCraftable( boolean isCraftable );
+	StackType setCraftable( boolean isCraftable );

 	/**
 	 * clears, requestable, craftable, and stack sizes.
 	 */
-	T reset();
+	StackType reset();

 	/**
 	 * returns true, if the item can be crafted, requested, or extracted.
@@ -174,14 +173,21 @@ public interface IAEStack<T extends IAEStack<T>>
 	 *
 	 * @return a new Stack, which is copied from the original.
 	 */
-	T copy();
+	StackType copy();

 	/**
 	 * create an empty stack.
 	 *
 	 * @return a new stack, which represents an empty copy of the original.
 	 */
-	T empty();
+	StackType empty();
+
+	/**
+	 * obtain the NBT Data for the item.
+	 *
+	 * @return nbt data
+	 */
+	IAETagCompound getTagCompound();

 	/**
 	 * @return true if the stack is a {@link IAEItemStack}
@@ -196,12 +202,5 @@ public interface IAEStack<T extends IAEStack<T>>
 	/**
 	 * @return ITEM or FLUID
 	 */
-	IStorageChannel<T> getChannel();
-
-	/**
-	 * Returns itemstack for display and similar purposes. Always has a count of 1.
-	 * 
-	 * @return itemstack
-	 */
-	ItemStack asItemStackRepresentation();
+	StorageChannel getChannel();
 }
@@ -0,0 +1,59 @@
+/*
+ * 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.storage.data;
+
+
+import net.minecraft.nbt.NBTTagCompound;
+
+import appeng.api.features.IItemComparison;
+
+
+/**
+ * Don't cast this... either compare with it, or copy it.
+ *
+ * Don't Implement.
+ */
+public interface IAETagCompound
+{
+
+	/**
+	 * @return a copy ( the copy will not be a IAETagCompound, it will be a NBTTagCompound )
+	 */
+	NBTTagCompound getNBTTagCompoundCopy();
+
+	/**
+	 * compare to other NBTTagCompounds or IAETagCompounds
+	 *
+	 * @param a compared object
+	 *
+	 * @return true, if they are the same.
+	 */
+	@Override
+	boolean equals( Object a );
+
+	/**
+	 * @return the special comparison for this tag
+	 */
+	IItemComparison getSpecialComparison();
+}
@@ -34,8 +34,9 @@ import appeng.api.config.FuzzyMode;
 *
 * Don't Implement.
 *
+ * Construct with Util.createItemList()
 */
-public interface IItemContainer<T extends IAEStack<T>>
+public interface IItemContainer<StackType extends IAEStack>
 {

 	/**
@@ -43,7 +44,7 @@ public interface IItemContainer<T extends IAEStack<T>>
 	 *
 	 * @param option added stack
 	 */
-	void add( T option ); // adds stack as is
+	void add( StackType option ); // adds stack as is

 	/**
 	 * @param i compared item
@@ -51,14 +52,14 @@ public interface IItemContainer<T extends IAEStack<T>>
 	 * @return a stack equivalent to the stack passed in, but with the correct stack size information, or null if its
 	 * not present
 	 */
-	T findPrecise( T i );
+	StackType findPrecise( StackType i );

 	/**
 	 * @param input compared item
 	 *
 	 * @return a list of relevant fuzzy matched stacks
 	 */
-	Collection<T> findFuzzy( T input, FuzzyMode fuzzy );
+	Collection<StackType> findFuzzy( StackType input, FuzzyMode fuzzy );

 	/**
 	 * @return true if there are no items in the list
@@ -26,20 +26,15 @@ package appeng.api.storage.data;

 import java.util.Iterator;

-import appeng.api.storage.IStorageChannel;
-

 /**
 * Represents a list of items in AE.
 *
 * Don't Implement.
 *
- * Construct with
- * - For items: AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class).createList()
- * - For fluids: AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class).createList()
- * - Replace with the corresponding {@link IStorageChannel} type for non native channels
+ * Construct with Util.createItemList()
 */
-public interface IItemList<T extends IAEStack<T>> extends IItemContainer<T>, Iterable<T>
+public interface IItemList<StackType extends IAEStack> extends IItemContainer<StackType>, Iterable<StackType>
 {

 	/**
@@ -48,14 +43,14 @@ public interface IItemList<T extends IAEStack<T>> extends IItemContainer<T>, Ite
 	 *
 	 * @param option stacktype option
 	 */
-	void addStorage( T option ); // adds a stack as stored
+	void addStorage( StackType option ); // adds a stack as stored

 	/**
 	 * add a stack to the list as craftable, this will merge the stack with an item already in the list if found.
 	 *
 	 * @param option stacktype option
 	 */
-	void addCrafting( T option );
+	void addCrafting( StackType option );

 	/**
 	 * add a stack to the list, stack size is used to add to requestable, this will merge the stack with an item already
@@ -63,12 +58,12 @@ public interface IItemList<T extends IAEStack<T>> extends IItemContainer<T>, Ite
 	 *
 	 * @param option stacktype option
 	 */
-	void addRequestable( T option ); // adds a stack as requestable
+	void addRequestable( StackType option ); // adds a stack as requestable

 	/**
 	 * @return the first item in the list
 	 */
-	T getFirstItem();
+	StackType getFirstItem();

 	/**
 	 * @return the number of items in the list
@@ -79,7 +74,7 @@ public interface IItemList<T extends IAEStack<T>> extends IItemContainer<T>, Ite
 	 * allows you to iterate the list.
 	 */
 	@Override
-	Iterator<T> iterator();
+	Iterator<StackType> iterator();

 	/**
 	 * resets stack sizes to 0.
@@ -47,21 +47,15 @@ public enum AECableType
 	SMART,

 	/**
-	 * Smart Dense Cable, represents a tier 2 block that can carry 32 channels.
+	 * Dense Cable, represents a tier 2 block that can carry 32 channels.
 	 */
-	DENSE_COVERED,
-
-	/**
-	 * Smart Dense Cable, represents a tier 2 block that can carry 32 channels.
-	 */
-	DENSE_SMART;
+	DENSE;

 	public static final AECableType[] VALIDCABLES = {
 			GLASS,
 			COVERED,
 			SMART,
-			DENSE_COVERED,
-			DENSE_SMART
+			DENSE
 	};

 }
@@ -146,14 +146,14 @@ public enum AEColor
 			case 0:
 				return -1;
 			case TINTINDEX_DARK:
-				return this.blackVariant;
+				return blackVariant;
 			case TINTINDEX_MEDIUM:
-				return this.mediumVariant;
+				return mediumVariant;
 			case TINTINDEX_BRIGHT:
-				return this.whiteVariant;
+				return whiteVariant;
 			case TINTINDEX_MEDIUM_BRIGHT:
-				final int light = this.whiteVariant;
-				final int dark = this.mediumVariant;
+				final int light = whiteVariant;
+				final int dark = mediumVariant;
 				return ( ( ( ( ( light >> 16 ) & 0xff ) + ( ( dark >> 16 ) & 0xff ) ) / 2 ) << 16 ) | ( ( ( ( ( light >> 8 ) & 0xff ) + ( ( dark >> 8 ) & 0xff ) ) / 2 ) << 8 ) | ( ( ( ( light ) & 0xff ) + ( ( dark ) & 0xff ) ) / 2 );
 			default:
 				return -1;
@@ -31,7 +31,6 @@ import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -94,6 +93,12 @@ public abstract class AEBaseBlock extends Block
 		this.fullBlock = this.isFullSize();
 	}

+	@Override
+	public final boolean isVisuallyOpaque()
+	{
+		return this.isOpaque() && this.isFullSize();
+	}
+
 	@Override
 	protected BlockStateContainer createBlockState()
 	{
@@ -109,23 +114,22 @@ public abstract class AEBaseBlock extends Block
 	@Override
 	public AxisAlignedBB getBoundingBox( IBlockState state, IBlockAccess source, BlockPos pos )
 	{
-		return this.boundingBox;
+		return boundingBox;
 	}

-	@SuppressWarnings( "deprecation" )
 	@Override
-	public void addCollisionBoxToList( final IBlockState state, final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, @Nullable final Entity e, boolean p_185477_7_ )
+	public void addCollisionBoxToList( final IBlockState state, final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
 	{
 		final ICustomCollision collisionHandler = this.getCustomCollision( w, pos );

 		if( collisionHandler != null && bb != null )
 		{
-			final List<AxisAlignedBB> tmp = new ArrayList<>();
+			final List<AxisAlignedBB> tmp = new ArrayList<AxisAlignedBB>();
 			collisionHandler.addCollidingBlockToList( w, pos, bb, tmp, e );
 			for( final AxisAlignedBB b : tmp )
 			{
 				final AxisAlignedBB offset = b.offset( pos.getX(), pos.getY(), pos.getZ() );
-				if( bb.intersects( offset ) )
+				if( bb.intersectsWith( offset ) )
 				{
 					out.add( offset );
 				}
@@ -133,11 +137,10 @@ public abstract class AEBaseBlock extends Block
 		}
 		else
 		{
-			super.addCollisionBoxToList( state, w, pos, bb, out, e, p_185477_7_ );
+			super.addCollisionBoxToList( state, w, pos, bb, out, e );
 		}
 	}

-	@SuppressWarnings( "deprecation" )
 	@Override
 	@SideOnly( Side.CLIENT )
 	public AxisAlignedBB getSelectedBoundingBox( IBlockState state, final World w, final BlockPos pos )
@@ -148,10 +151,10 @@ public abstract class AEBaseBlock extends Block
 		{
 			if( Platform.isClient() )
 			{
-				final EntityPlayer player = Minecraft.getMinecraft().player;
+				final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
 				final LookDirection ld = Platform.getPlayerRay( player, Platform.getEyeOffset( player ) );

-				final Iterable<AxisAlignedBB> bbs = collisionHandler.getSelectedBoundingBoxesFromPool( w, pos, Minecraft.getMinecraft().player, true );
+				final Iterable<AxisAlignedBB> bbs = collisionHandler.getSelectedBoundingBoxesFromPool( w, pos, Minecraft.getMinecraft().thePlayer, true );
 				AxisAlignedBB br = null;

 				double lastDist = 0;
@@ -166,9 +169,9 @@ public abstract class AEBaseBlock extends Block

 					if( r != null )
 					{
-						final double xLen = ( ld.getA().x - r.hitVec.x );
-						final double yLen = ( ld.getA().y - r.hitVec.y );
-						final double zLen = ( ld.getA().z - r.hitVec.z );
+						final double xLen = ( ld.getA().xCoord - r.hitVec.xCoord );
+						final double yLen = ( ld.getA().yCoord - r.hitVec.yCoord );
+						final double zLen = ( ld.getA().zCoord - r.hitVec.zCoord );

 						final double thisDist = xLen * xLen + yLen * yLen + zLen * zLen;

@@ -230,7 +233,6 @@ public abstract class AEBaseBlock extends Block
 		return this.isOpaque();
 	}

-	@SuppressWarnings( "deprecation" )
 	@Override
 	public RayTraceResult collisionRayTrace( final IBlockState state, final World w, final BlockPos pos, final Vec3d a, final Vec3d b )
 	{
@@ -253,9 +255,9 @@ public abstract class AEBaseBlock extends Block

 				if( r != null )
 				{
-					final double xLen = ( a.x - r.hitVec.x );
-					final double yLen = ( a.y - r.hitVec.y );
-					final double zLen = ( a.z - r.hitVec.z );
+					final double xLen = ( a.xCoord - r.hitVec.xCoord );
+					final double yLen = ( a.yCoord - r.hitVec.yCoord );
+					final double zLen = ( a.zCoord - r.hitVec.zCoord );

 					final double thisDist = xLen * xLen + yLen * yLen + zLen * zLen;
 					if( br == null || lastDist > thisDist )
@@ -336,9 +338,8 @@ public abstract class AEBaseBlock extends Block
 		return new EnumFacing[0];
 	}

-	@SideOnly( Side.CLIENT )
 	@Override
-	public void addInformation( final ItemStack is, final World world, final List<String> lines, final ITooltipFlag advancedItemTooltips )
+	public void addInformation( final ItemStack is, final EntityPlayer player, final List<String> lines, final boolean advancedItemTooltips )
 	{

 	}
@@ -416,8 +417,8 @@ public abstract class AEBaseBlock extends Block
 	@Override
 	public String toString()
 	{
-		String regName = this.getRegistryName() != null ? this.getRegistryName().getResourcePath() : "unregistered";
-		return this.getClass().getSimpleName() + "[" + regName + "]";
+		String regName = getRegistryName() != null ? getRegistryName().getResourcePath() : "unregistered";
+		return getClass().getSimpleName() + "[" + regName + "]";
 	}

 	protected String getUnlocalizedName( final ItemStack is )
@@ -23,7 +23,6 @@ import java.util.List;

 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
@@ -67,15 +66,16 @@ public class AEBaseItemBlock extends ItemBlock

 	@Override
 	@SideOnly( Side.CLIENT )
-	public final void addInformation( final ItemStack itemStack, final World world, final List<String> toolTip, final ITooltipFlag advancedTooltips )
+	@SuppressWarnings( "unchecked" )
+	public final void addInformation( final ItemStack itemStack, final EntityPlayer player, final List toolTip, final boolean advancedTooltips )
 	{
-		this.addCheckedInformation( itemStack, world, toolTip, advancedTooltips );
+		this.addCheckedInformation( itemStack, player, toolTip, advancedTooltips );
 	}

 	@SideOnly( Side.CLIENT )
-	public void addCheckedInformation( final ItemStack itemStack, final World world, final List<String> toolTip, final ITooltipFlag advancedTooltips )
+	public void addCheckedInformation( final ItemStack itemStack, final EntityPlayer player, final List<String> toolTip, final boolean advancedToolTips )
 	{
-		this.blockType.addInformation( itemStack, world, toolTip, advancedTooltips );
+		this.blockType.addInformation( itemStack, player, toolTip, advancedToolTips );
 	}

 	@Override
@@ -126,7 +126,7 @@ public class AEBaseItemBlock extends ItemBlock
 			{
 				up = EnumFacing.UP;

-				final byte rotation = (byte) ( MathHelper.floor( ( player.rotationYaw * 4F ) / 360F + 2.5D ) & 3 );
+				final byte rotation = (byte) ( MathHelper.floor_double( ( player.rotationYaw * 4F ) / 360F + 2.5D ) & 3 );

 				switch( rotation )
 				{
@@ -23,15 +23,13 @@ import java.text.MessageFormat;
 import java.util.List;

 import net.minecraft.block.Block;
-import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

 import appeng.api.config.AccessRestriction;
-import appeng.api.config.Actionable;
 import appeng.api.config.PowerUnits;
 import appeng.api.definitions.IBlockDefinition;
 import appeng.api.implementations.items.IAEItemPowerStorage;
@@ -50,9 +48,9 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte

 	@Override
 	@SideOnly( Side.CLIENT )
-	public void addCheckedInformation( final ItemStack stack, final World world, final List<String> lines, final ITooltipFlag advancedTooltips )
+	public void addCheckedInformation( final ItemStack itemStack, final EntityPlayer player, final List<String> toolTip, final boolean advancedTooltips )
 	{
-		final NBTTagCompound tag = stack.getTagCompound();
+		final NBTTagCompound tag = itemStack.getTagCompound();
 		double internalCurrentPower = 0;
 		final double internalMaxPower = this.getMaxEnergyCapacity();

@@ -63,43 +61,70 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte

 		final double percent = internalCurrentPower / internalMaxPower;

-		lines.add( GuiText.StoredEnergy.getLocal() + ':' + MessageFormat.format( " {0,number,#} ", internalCurrentPower ) + Platform
-				.gui_localize( PowerUnits.AE.unlocalizedName ) + " - " + MessageFormat.format( " {0,number,#.##%} ", percent ) );
+		toolTip.add( GuiText.StoredEnergy.getLocal() + ':' + MessageFormat.format( " {0,number,#} ", internalCurrentPower ) + Platform.gui_localize( PowerUnits.AE.unlocalizedName ) + " - " + MessageFormat.format( " {0,number,#.##%} ", percent ) );
+	}
+
+	private double getMaxEnergyCapacity()
+	{
+		final Block blockID = Block.getBlockFromItem( this );
+		final IBlockDefinition energyCell = Api.INSTANCE.definitions().blocks().energyCell();
+		return energyCell.maybeBlock().map( block -> {
+					if( blockID == block )
+					{
+						return 200000;
+					}
+					else
+					{
+						return 8 * 200000;
+					}
+				}
+		).orElse( 0 );
 	}

 	@Override
-	public double injectAEPower( final ItemStack is, double amount, Actionable mode )
+	public double injectAEPower( final ItemStack is, double amt )
 	{
-		final double internalCurrentPower = this.getInternal( is );
-		final double internalMaxPower = this.getAEMaxPower( is );
-		final double required = internalMaxPower - internalCurrentPower;
-		final double overflow = Math.max( 0, amount - required );
-
-		if( mode == Actionable.MODULATE )
+		double internalCurrentPower = this.getInternal( is );
+		final double internalMaxPower = this.getMaxEnergyCapacity();
+		internalCurrentPower += amt;
+		if( internalCurrentPower > internalMaxPower )
 		{
-			final double toAdd = Math.min( required, amount );
-			final double newPowerStored = internalCurrentPower + toAdd;
-
-			this.setInternal( is, newPowerStored );
+			amt = internalCurrentPower - internalMaxPower;
+			internalCurrentPower = internalMaxPower;
+			this.setInternal( is, internalCurrentPower );
+			return amt;
 		}

-		return overflow;
+		this.setInternal( is, internalCurrentPower );
+		return 0;
+	}
+
+	private double getInternal( final ItemStack is )
+	{
+		final NBTTagCompound nbt = Platform.openNbtData( is );
+		return nbt.getDouble( "internalCurrentPower" );
+	}
+
+	private void setInternal( final ItemStack is, final double amt )
+	{
+		final NBTTagCompound nbt = Platform.openNbtData( is );
+		nbt.setDouble( "internalCurrentPower", amt );
 	}

 	@Override
-	public double extractAEPower( final ItemStack is, double amount, Actionable mode )
+	public double extractAEPower( final ItemStack is, double amt )
 	{
-		final double internalCurrentPower = this.getInternal( is );
-		final double fulfillable = Math.min( amount, internalCurrentPower );
-
-		if( mode == Actionable.MODULATE )
+		double internalCurrentPower = this.getInternal( is );
+		if( internalCurrentPower > amt )
 		{
-			final double newPowerStored = internalCurrentPower - fulfillable;
-
-			this.setInternal( is, newPowerStored );
+			internalCurrentPower -= amt;
+			this.setInternal( is, internalCurrentPower );
+			return amt;
 		}

-		return fulfillable;
+		amt = internalCurrentPower;
+		this.setInternal( is, 0 );
+		return amt;
 	}

 	@Override
@@ -119,34 +144,4 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte
 	{
 		return AccessRestriction.WRITE;
 	}
-
-	private double getMaxEnergyCapacity()
-	{
-		final Block blockID = Block.getBlockFromItem( this );
-		final IBlockDefinition energyCell = Api.INSTANCE.definitions().blocks().energyCell();
-
-		return energyCell.maybeBlock().map( block ->
-		{
-			if( blockID == block )
-			{
-				return 200000;
-			}
-			else
-			{
-				return 8 * 200000;
-			}
-		} ).orElse( 0 );
-	}
-
-	private double getInternal( final ItemStack is )
-	{
-		final NBTTagCompound nbt = Platform.openNbtData( is );
-		return nbt.getDouble( "internalCurrentPower" );
-	}
-
-	private void setInternal( final ItemStack is, final double amt )
-	{
-		final NBTTagCompound nbt = Platform.openNbtData( is );
-		nbt.setDouble( "internalCurrentPower", amt );
-	}
 }
@@ -43,8 +43,8 @@ public abstract class AEBaseStairBlock extends BlockStairs
 	@Override
 	public String toString()
 	{
-		String regName = this.getRegistryName() != null ? this.getRegistryName().getResourcePath() : "unregistered";
-		return this.getClass().getSimpleName() + "[" + regName + "]";
+		String regName = getRegistryName() != null ? getRegistryName().getResourcePath() : "unregistered";
+		return getClass().getSimpleName() + "[" + regName + "]";
 	}

 }
@@ -34,6 +34,8 @@ import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -46,7 +48,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.common.property.IUnlistedProperty;
-import net.minecraftforge.items.ItemHandlerHelper;

 import appeng.api.implementations.items.IMemoryCard;
 import appeng.api.implementations.items.MemoryCardMessages;
@@ -55,7 +56,6 @@ import appeng.api.util.AEColor;
 import appeng.api.util.IOrientable;
 import appeng.block.networking.BlockCableBus;
 import appeng.helpers.ICustomCollision;
-import appeng.tile.AEBaseInvTile;
 import appeng.tile.AEBaseTile;
 import appeng.tile.networking.TileCableBus;
 import appeng.tile.storage.TileSkyChest;
@@ -86,7 +86,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 			return state;
 		}

-		AEBaseTile tile = this.getTileEntity( world, pos );
+		AEBaseTile tile = getTileEntity( world, pos );
 		if( tile == null )
 		{
 			return state; // No info available
@@ -99,7 +99,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	@Override
 	protected BlockStateContainer createBlockState()
 	{
-		return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] {
+		return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] {
 				FORWARD,
 				UP
 		} );
@@ -111,17 +111,16 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 		return 0;
 	}

-	// TODO : Was this change needed?
-	public void setTileEntity( final Class<? extends AEBaseTile> c )
+	protected void setTileEntity( final Class<? extends AEBaseTile> c )
 	{
 		this.tileEntityType = c;
-		this.setInventory( AEBaseInvTile.class.isAssignableFrom( c ) );
+		this.setInventory( IInventory.class.isAssignableFrom( c ) );
 	}

 	@Override
 	public boolean hasTileEntity( IBlockState state )
 	{
-		return this.hasBlockTileEntity();
+		return hasBlockTileEntity();
 	}

 	private boolean hasBlockTileEntity()
@@ -185,7 +184,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 		final AEBaseTile te = this.getTileEntity( w, pos );
 		if( te != null )
 		{
-			final ArrayList<ItemStack> drops = new ArrayList<>();
+			final ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
 			if( te.dropItems() )
 			{
 				te.getDrops( w, pos, drops );
@@ -241,13 +240,9 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	public int getComparatorInputOverride( IBlockState state, final World w, final BlockPos pos )
 	{
 		final TileEntity te = this.getTileEntity( w, pos );
-		if( te instanceof AEBaseInvTile )
+		if( te instanceof IInventory )
 		{
-			AEBaseInvTile invTile = (AEBaseInvTile) te;
-			if( invTile.getInternalInventory().getSlots() > 0 )
-			{
-				return ItemHandlerHelper.calcRedstoneFromInventory( invTile.getInternalInventory() );
-			}
+			return Container.calcRedstoneFromInventory( (IInventory) te );
 		}
 		return 0;
 	}
@@ -274,16 +269,13 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	}

 	@Override
-	public boolean onBlockActivated( World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ )
+	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
 	{
-		ItemStack heldItem;
-		if( player != null && !player.getHeldItem( hand ).isEmpty() )
+		if( player != null && heldItem != null )
 		{
-			heldItem = player.getHeldItem( hand );
-
 			if( Platform.isWrench( player, heldItem, pos ) && player.isSneaking() )
 			{
-				final IBlockState blockState = world.getBlockState( pos );
+				final IBlockState blockState = w.getBlockState( pos );
 				final Block block = blockState.getBlock();

 				if( block == null )
@@ -291,7 +283,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 					return false;
 				}

-				final AEBaseTile tile = this.getTileEntity( world, pos );
+				final AEBaseTile tile = this.getTileEntity( w, pos );

 				if( tile == null )
 				{
@@ -303,7 +295,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 					return false;
 				}

-				final ItemStack[] itemDropCandidates = Platform.getBlockDrops( world, pos );
+				final ItemStack[] itemDropCandidates = Platform.getBlockDrops( w, pos );
 				final ItemStack op = new ItemStack( this );

 				for( final ItemStack ol : itemDropCandidates )
@@ -318,11 +310,11 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 					}
 				}

-				if( block.removedByPlayer( blockState, world, pos, player, false ) )
+				if( block.removedByPlayer( blockState, w, pos, player, false ) )
 				{
 					final List<ItemStack> itemsToDrop = Lists.newArrayList( itemDropCandidates );
-					Platform.spawnDrops( world, pos, itemsToDrop );
-					world.setBlockToAir( pos );
+					Platform.spawnDrops( w, pos, itemsToDrop );
+					w.setBlockToAir( pos );
 				}

 				return false;
@@ -331,7 +323,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 			if( heldItem.getItem() instanceof IMemoryCard && !( this instanceof BlockCableBus ) )
 			{
 				final IMemoryCard memoryCard = (IMemoryCard) heldItem.getItem();
-				final AEBaseTile tileEntity = this.getTileEntity( world, pos );
+				final AEBaseTile tileEntity = this.getTileEntity( w, pos );

 				if( tileEntity == null )
 				{
@@ -369,7 +361,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 			}
 		}

-		return this.onActivated( world, pos, player, hand, player.getHeldItem( hand ), facing, hitX, hitY, hitZ );
+		return this.onActivated( w, pos, player, hand, heldItem, side, hitX, hitY, hitZ );
 	}

 	@Override
@@ -36,7 +36,7 @@ public class UnlistedDirection implements IUnlistedProperty<EnumFacing>
 	@Override
 	public String getName()
 	{
-		return this.name;
+		return name;
 	}

 	@Override
@@ -19,12 +19,14 @@
 package appeng.block.crafting;


+import java.util.List;
+
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.property.ExtendedBlockState;
@@ -46,12 +48,13 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
 	public BlockCraftingMonitor()
 	{
 		super( CraftingUnitType.MONITOR );
+		this.setTileEntity( TileCraftingMonitorTile.class );
 	}

 	@Override
 	protected BlockStateContainer createBlockState()
 	{
-		return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] {
+		return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] {
 				STATE,
 				COLOR,
 				FORWARD,
@@ -66,7 +69,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
 		EnumFacing forward = EnumFacing.NORTH;
 		EnumFacing up = EnumFacing.UP;

-		TileCraftingMonitorTile te = this.getTileEntity( world, pos );
+		TileCraftingMonitorTile te = getTileEntity( world, pos );
 		if( te != null )
 		{
 			color = te.getColor();
@@ -82,7 +85,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit

 	@Override
 	@SideOnly( Side.CLIENT )
-	public void getSubBlocks( final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks )
+	public void getSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
 	{
 		itemStacks.add( new ItemStack( this, 1, 0 ) );
 	}
@@ -19,12 +19,16 @@
 package appeng.block.crafting;


+import appeng.tile.crafting.TileCraftingStorageTile;
+
+
 public class BlockCraftingStorage extends BlockCraftingUnit
 {

 	public BlockCraftingStorage( final CraftingUnitType type )
 	{
 		super( type );
+		this.setTileEntity( TileCraftingStorageTile.class );
 	}

 }
@@ -21,6 +21,8 @@ package appeng.block.crafting;

 import java.util.EnumSet;

+import javax.annotation.Nullable;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
@@ -28,6 +30,7 @@ import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
@@ -60,6 +63,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 		super( Material.IRON );

 		this.type = type;
+		this.setTileEntity( TileCraftingTile.class );
 	}

 	@Override
@@ -76,7 +80,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock

 		for( EnumFacing facing : EnumFacing.values() )
 		{
-			if( this.isConnected( world, pos, facing ) )
+			if( isConnected( world, pos, facing ) )
 			{
 				connections.add( facing );
 			}
@@ -96,7 +100,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 	@Override
 	protected BlockStateContainer createBlockState()
 	{
-		return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { STATE } );
+		return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] { STATE } );
 	}

 	@Override
@@ -114,7 +118,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 	}

 	@Override
-	public void neighborChanged( final IBlockState state, final World worldIn, final BlockPos pos, final Block blockIn, final BlockPos fromPos )
+	public void neighborChanged( final IBlockState state, final World worldIn, final BlockPos pos, final Block neighborBlock )
 	{
 		final TileCraftingTile cp = this.getTileEntity( worldIn, pos );
 		if( cp != null )
@@ -142,7 +146,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 	}

 	@Override
-	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
 	{
 		final TileCraftingTile tg = this.getTileEntity( w, pos );

@@ -157,7 +161,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 			return true;
 		}

-		return super.onBlockActivated( w, pos, state, p, hand, side, hitX, hitY, hitZ );
+		return super.onBlockActivated( w, pos, state, p, hand, heldItem, side, hitX, hitY, hitZ );
 	}

 	public enum CraftingUnitType
@@ -19,11 +19,14 @@
 package appeng.block.crafting;


+import javax.annotation.Nullable;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
@@ -39,7 +42,6 @@ import appeng.core.sync.GuiBridge;
 import appeng.tile.crafting.TileMolecularAssembler;
 import appeng.util.Platform;

-
 public class BlockMolecularAssembler extends AEBaseTileBlock
 {

@@ -49,6 +51,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
 	{
 		super( Material.IRON );

+		this.setTileEntity( TileMolecularAssembler.class );
 		this.setOpaque( false );
 		this.lightOpacity = 1;
 	}
@@ -63,7 +66,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
 	public IBlockState getActualState( IBlockState state, IBlockAccess worldIn, BlockPos pos )
 	{
 		boolean powered = false;
-		TileMolecularAssembler te = this.getTileEntity( worldIn, pos );
+		TileMolecularAssembler te = getTileEntity( worldIn, pos );
 		if( te != null )
 		{
 			powered = te.isPowered();
@@ -85,19 +88,18 @@ public class BlockMolecularAssembler extends AEBaseTileBlock

 	@SideOnly( Side.CLIENT )
 	@Override
-	public boolean canRenderInLayer( IBlockState state, BlockRenderLayer layer )
+	public boolean canRenderInLayer( BlockRenderLayer layer )
 	{
 		return layer == BlockRenderLayer.TRANSLUCENT;
 	}

-	@Override
-	public boolean isFullCube( IBlockState state )
+	public boolean isFullCube(IBlockState state)
 	{
 		return false;
 	}

 	@Override
-	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
 	{
 		final TileMolecularAssembler tg = this.getTileEntity( w, pos );
 		if( tg != null && !p.isSneaking() )
@@ -105,7 +107,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
 			Platform.openGUI( p, tg, AEPartLocation.fromFacing( side ), GuiBridge.GUI_MAC );
 			return true;
 		}
-
-		return super.onBlockActivated( w, pos, state, p, hand, side, hitX, hitY, hitZ );
+		
+		return super.onBlockActivated( w, pos, state, p, hand, heldItem, side, hitX, hitY, hitZ );
 	}
 }
@@ -39,7 +39,7 @@ public class ItemCraftingStorage extends AEBaseItemBlock
 	@Override
 	public ItemStack getContainerItem( final ItemStack itemStack )
 	{
-		return AEApi.instance().definitions().blocks().craftingUnit().maybeStack( 1 ).orElse( ItemStack.EMPTY );
+		return AEApi.instance().definitions().blocks().craftingUnit().maybeStack( 1 ).orElse( null );
 	}

 	@Override
@@ -23,7 +23,6 @@ import javax.annotation.Nullable;

 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -33,7 +32,6 @@ import net.minecraft.util.EnumBlockRenderType;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;

@@ -43,7 +41,6 @@ import appeng.core.stats.Stats;
 import appeng.tile.AEBaseTile;
 import appeng.tile.grindstone.TileCrank;

-
 public class BlockCrank extends AEBaseTileBlock
 {

@@ -51,6 +48,7 @@ public class BlockCrank extends AEBaseTileBlock
 	{
 		super( Material.WOOD );

+		this.setTileEntity( TileCrank.class );
 		this.setLightOpacity( 0 );
 		this.setHarvestLevel( "axe", 0 );
 		this.setFullSize( this.setOpaque( false ) );
@@ -80,7 +78,7 @@ public class BlockCrank extends AEBaseTileBlock
 	private void dropCrank( final World world, final BlockPos pos )
 	{
 		world.destroyBlock( pos, true ); // w.destroyBlock( x, y, z, true );
-		world.notifyBlockUpdate( pos, this.getDefaultState(), world.getBlockState( pos ), 3 );
+		world.notifyBlockUpdate( pos, getDefaultState(), world.getBlockState( pos ), 3 );
 	}

 	@Override
@@ -137,7 +135,7 @@ public class BlockCrank extends AEBaseTileBlock
 	}

 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( final IBlockState state, final World world, final BlockPos pos, final Block neighborBlock )
 	{

 		final AEBaseTile tile = this.getTileEntity( world, pos );
@@ -166,16 +164,4 @@ public class BlockCrank extends AEBaseTileBlock
 		return false;
 	}

-	@Override
-	public boolean canPlaceTorchOnTop( IBlockState state, IBlockAccess world, BlockPos pos )
-	{
-		return false;
-	}
-
-	@Override
-	public BlockFaceShape getBlockFaceShape( IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face )
-	{
-		return BlockFaceShape.UNDEFINED;
-	}
-
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yueh	c720584e49	Fixes #2729 : Fix transformer regression introduced during FG downtime. (#2730 ) Added a unittest to verify the necessary string returns match the actual existing classes, in case something screws up the refactoring.	2016-12-31 18:25:16 +01:00
yueh	ab89278274	Replaces old fluid handlers with the new capability based ones. (#2727 ) * Changed ME Chest and P2P tunnels to use fluid capabilities. * Renamed all occurrences of liquid to fluids.	2016-12-31 16:01:29 +01:00
yueh	7c5f777e41	Fixes #2713 : Call super#onBlockActivated() for wrench interaction. (#2728 )	2016-12-31 16:00:45 +01:00
yueh	8b0637d05d	Fixes IDE not correctly cleaning up the list of staged files.	2016-12-31 15:21:25 +01:00
yueh	497f1c9ace	Fixes #2714 : Use a concurrent list to back NetworkList (#2715 )	2016-12-29 15:51:17 +01:00
yueh	2ab0528015	Fixes #2724 : Use capitalized oredict name for dyes, not uppercase.	2016-12-29 15:50:02 +01:00