chore: bump version

fixes #13

.clang-format

@@ -0,0 +1,130 @@
+---
+AccessModifierOffset: 0
+AlignAfterOpenBracket: BlockIndent
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments: None
+AlignConsecutiveMacros: None
+AlignConsecutiveBitFields: None
+AlignConsecutiveDeclarations: None
+AlignEscapedNewlines: DontAlign
+AlignOperands: DontAlign
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: MultiLine
+AttributeMacros: []
+BinPackArguments: false
+BinPackParameters: false
+BitFieldColonSpacing: After
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterStruct: false
+  AfterUnion: false
+  AfterExternBlock: false
+  BeforeCatch: false
+  BeforeElse: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakAfterJavaFieldAnnotations: true
+#BreakArrays: false
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Custom
+BreakBeforeConceptDeclarations: true
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: AfterColon
+BreakInheritanceList: AfterColon
+BreakStringLiterals: true
+ColumnLimit: 90
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: false
+DeriveLineEnding: false
+DerivePointerAlignment: false
+DisableFormat: false # wtf
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: Always
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: false
+ForEachMacros: ["BOOST_FOREACH"]
+IfMacros: []
+IncludeBlocks: Regroup
+IndentAccessModifiers: false
+IndentCaseBlocks: false
+IndentCaseLabels: true
+IndentExternBlock: Indent
+IndentGotoLabels: true
+IndentPPDirectives: BeforeHash
+#IndentRequiresClause: false
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+#InsertBraces: false
+InsertTrailingCommas: Wrapped
+JavaImportGroups: ["java"]
+JavaScriptQuotes: Double
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: OuterScope
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: All
+PackConstructorInitializers: NextLine
+PointerAlignment: Left
+QualifierAlignment: Left
+ReferenceAlignment: Left
+ReflowComments: true
+#RemoveSemicolon: true
+#RequiresClausePosition: OwnLine
+#RequiresExpressionIndentation: OuterScope
+SeparateDefinitionBlocks: Always
+SortIncludes: CaseInsensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceAroundPointerQualifiers: After
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: false
+SpaceBeforeInheritanceColon: false
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesInAngles: Never
+SpacesInCStyleCastParentheses: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInLineCommentPrefix:
+  Minimum: 0
+  Maximum: -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: c++20
+StatementAttributeLikeMacros: []
+StatementMacros: []
+TabWidth: 4
+TypenameMacros: []
+UseCRLF: false # wtf
+UseTab: Never
+WhitespaceSensitiveMacros: ["BOOST_PP_STRINGSIZE"]

.gitignore

@@ -15,6 +15,7 @@
 !LICENSE
 !CONTRIBUTING.md
 !CHANGELOG.md
+!austri3Fix.md
 
 # include sourcecode
 !src/
@@ -25,9 +26,10 @@
 # include git important files
 !.gitmodules
 !.gitignore
+!.clang-format
 
 # code format to reduce noise in git commits
 !codeformat/
 
 # exclude vim files
-*.swp
+*.swp

.travis.yml

@@ -1,27 +0,0 @@
-language: java
-dist: trusty
-branches:
-  only:
-    - rv3-1.7.10
-jdk:
-  - oraclejdk8
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-cache:
-  directories:
-    - "$HOME/.gradle/caches/"
-    - "$HOME/.gradle/wrapper/"
-install: "./gradlew setupCIWorkspace"
-script: "./gradlew build test"
-deploy:
-  provider: releases
-  api_key:
-    secure: hoIOb6WkNbwuv1T67zh4Gj1YPG2IhYzstd5m5JtbzQdAxGd/9w55tRtk6TxmHGlFnj2UR3hsvNH6LT6pUTqHUCR29LnMQwLBZUyUDYm+sg0sF26sv1FkORZrzuV0n+v3EBkDuQxuUjfzEXtPfZen4mca3EpTz2lKRm9f7Xt38yGWW3CLdgplD06N6SU2m+3f1tIneSZ5oNrKuZd6407yrS1l6UN14Z5vqmPiXga6LW+ryKhAmREULOZJSJOX7wrvGGMddMjVbySlJBz3LYPEf8ow15f5UQJ4MMu46wswSnKpDkwBelwZa/vweuGsbCmX2i0G4pO7675tHGySez1VAVK6itc4awqVRd4DHGt5X0++7nyeRLMbh/35Llsjm4QyFzepBOf2UoTVdEb6ATGVcZ4PExm3zVX3IdEw/2OweB5IkXZkYWnDnTCczfKT3AtvEyZH+6CKVFdW5KNbgWtur98uGAIuVI9T8/B4vKyfa0JfWzrtlLBdPWev4LvUsX5laOTkbmH+2K/cURVPaqX2VtMzQiM3dJvp/kwEtaRHVpift/yEyaqpHcnUmJ1rGWqkWlHfxabAQaRyWyCGsfVfmGwPJUkuHAXvKHP77MfsEsbEHlECHP8DXZfM4sm3eZiCT62Cni0JV3iIZDqolk0QLWQ84RtbbUBm1f64M/ErBSE=
-  file_glob: true
-  file: build/libs/*
-  skip_cleanup: true
-  on:
-    tags: true
-    repo: xsun2001/Applied-Energistics-2-Unofficial
-    branch: rv3-1.7.10

CONTRIBUTING.md

@@ -1,165 +0,0 @@
-# How to contribute
-
-We want to keep it as easy as possible to contribute changes to support
-the growth and stability of AE2. There are a few guidelines that we
-need contributors to follow so that we can have a chance of keeping on
-top of things.
-
-## Getting Started
-
-### Reporting an Issue
-
-Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue now!
-
-1. Make sure your issue has not already been answered or fixed and you are using the latest version. Also think about whether your issue is a valid one before submitting it.
-2. Go to [the issues page](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues) and click [new issue](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/new)
-3. Enter your a title of your issue (something that summarizes your issue), and then create a detailed description of the issue.
-    * Do not tag it with something like `[Feature]` or `[Bug]`. When it is applicable, we will take care of it.
-    * The following details are required. Not including them can cause the issue to be closed.
-        * Forge version
-        * AE2 version
-        * Crash log, when reporting a crash (Please make sure to use [pastebin](http://pastebin.com/))
-            * Do not post an excerpt of what you consider important, instead:
-            * Post the full log
-        * Other mods and their version, when reporting an issue between AE and another mod
-            * Also consider updating these before submitting a new issue, it might be already fixed
-        * A detailed description of the bug or feature
-    * To further help in resolving your issues please try to include the follow if applicable:
-        * What was expected?
-        * How to reproduce the problem?
-            * This is usually a great detail and allows us to fix it way faster
-        * Server or Single Player?
-        * Screen shots or Pictures of the problem
-        * Mod Pack using and version?
-            * Keep in mind that some mods might use an outdated version of AE2
-            * If so you should report it to your modpack
-5. Click `Submit New Issue`, and wait for feedback!
-
-Providing as many details as possible does help us to find and resolve the issue faster and also you getting a fixed version as fast as possible.
-
-### Submitting Changes
-
-* Submit an issue to the github project, assuming one does not already exist.
-  * Clearly describe the issue including steps to reproduce when it is a bug.
-  * Make sure you fill in the earliest version that you know has the issue.
-* Fork the repository on GitHub
-* Create a topic branch from where you want to base your work.
-  * This is revison branch that is under active development.
-  * Only target release branches if you are certain your fix must be on that
-    branch.
-  * To quickly create a topic branch based on the development branch; `git 
-    checkout -b fix/master/my_contribution branch`. Please avoid working 
-    directly on the `active development` branch.
-* Make commits of logical units.
-* Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in the proper format.
-
-````
-    (#12345) Make the example in CONTRIBUTING imperative and concrete
-
-    Without this patch applied the example commit message in the CONTRIBUTING
-    document is not a concrete example.  This is a problem because the
-    contributor is left to imagine what the commit message should look like
-    based on a description rather than an example.  This patch fixes the
-    problem by making the example concrete and imperative.
-
-    The first line is a real life imperative statement with a ticket number
-    from our issue tracker.  The body describes the behavior without the patch,
-    why this is a problem, and how the patch fixes the problem when applied.
-````
-* Always fully test your changes. If they are large engouh in scope, then fully test AE2.
-* Describing the process you used to test your changes in detail will help speed up this process.
-
-## Making Trivial Changes
-
-### Documentation
-
-For changes of a trivial nature to comments and documentation, it is not
-always necessary to create a new issue. In this case, it is
-appropriate to start the first line of a commit with '(doc)' instead of
-a ticket number.
-
-````
-    (doc) Add documentation commit example to CONTRIBUTING
-
-    There is no example for contributing a documentation commit
-    to the Puppet repository. This is a problem because the contributor
-    is left to assume how a commit of this nature may appear.
-
-    The first line is a real life imperative statement with '(doc)' in
-    place of what would have been the ticket number in a
-    non-documentation related commit. The body describes the nature of
-    the new documentation or comments added.
-````
-
-### Semantic Changes
-
-In order to keep the code in a state where PRs can be safely merged, it is important to
-avoid changes to syntax or changes that don't add any real value to the code base. PRs
-that make changes only to syntax or "clean up" the code will be rejected. Any code clean-up
-should be coordinated with the core team first.
-
-
-## Style Guidelines
-
-Applied Energistics does not follow standard Java syntax. The guidelines below illustrate
-the styling guidelines used by AE. 
-
-PRs that do not conform to these standards will be rejected.
-
-You can find presets for Eclipse and IntelliJ IDEA in the `codeformat` folder.
-We try to keep them up to date, but in case you find them not formatting it correctly, then please report it 
-
-### Whitespace
-
-#### Tabs or spaces
-Configure your IDE to use tabs as padding whitespace. Ensure that there is no extra whitespace 
-at the end of lines, or on blank lines.
-
-#### Pad parenthes with whitespace
-````
-if( item.equals( newItem )
-
-public void DeleteItem( item )
-
-catch( Throwable )
-````
-
-### Braces
-
-Place opening and closing braces on a new line. Always include open and close braces, even if
-the body is a single line.
-
-````
-if( item.equals( newItem )
-{
-
-}
-else
-{
-
-}
-
-public void DeleteItem( item )
-{
-
-}
-````
-
-## Submitting Changes
-
-* Push your changes to a topic branch in your fork of the repository.
-* Submit a pull request to the repository in the puppetlabs organization.
-* Update your issue to mark that you have submitted code and are ready for it to be reviewed.
-  * Include a link to the pull request in the ticket.
-* The core team looks at Pull Requests on a regular basis.
-  * There are many reasons why it will take a long time to pull your PR. Be patient, we'll
-    get to it.
-* After feedback has been given we expect responses within two weeks. After two
-  weeks will may close the pull request if it isn't showing any activity.
-
-# Additional Resources
-
-* [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-* #AppliedEnergistics IRC channel on esper.net

build.gradle

@@ -1,21 +1,3 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
 apply plugin: 'forge'
 apply plugin: 'maven-publish'
 
@@ -43,7 +25,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') {
+            changing = true
+        }
     }
 }
 
@@ -71,6 +55,8 @@ jar {
 
     // specify which files are really included, can control which APIs should be in
     include "appeng/**"
+    include "dev/**"
+    include "com/**"
     include "assets/**"
     include "mcmod.info"
     include "pack.mcmeta"
@@ -100,24 +86,28 @@ sourceSets {
 
         resources {
             srcDir "src/main/resources/"
-            include "assets/appliedenergistics2/recipes/**/*.recipe",
-                    "assets/appliedenergistics2/recipes/README.html",
-                    "assets/appliedenergistics2/lang/*.lang",
-                    "assets/appliedenergistics2/textures/blocks/*",
-                    "assets/appliedenergistics2/textures/guis/*",
-                    "assets/appliedenergistics2/textures/models/*",
-                    "assets/appliedenergistics2/textures/items/*",
-                    "assets/appliedenergistics2/meta/*",
-                    "mcmod.info",
-                    "pack.mcmeta"
+            include(
+                "assets/appliedenergistics2/recipes/**/*.recipe",
+                "assets/appliedenergistics2/recipes/README.html",
+                "assets/appliedenergistics2/lang/*.lang",
+                "assets/appliedenergistics2/textures/blocks/*",
+                "assets/appliedenergistics2/textures/guis/*",
+                "assets/appliedenergistics2/textures/models/*",
+                "assets/appliedenergistics2/textures/items/*",
+                "assets/appliedenergistics2/meta/*",
+                "mcmod.info",
+                "pack.mcmeta"
+            )
         }
     }
 }
 
 processResources {
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-        expand 'version': project.version, 'mcversion': minecraft_version
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    filesMatching('mcmod.info') {
+        expand 'version':project.version, 'mcversion':project.minecraft.version
     }
-}
+}
+ 

codeformat/checkstyle.xml

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
-    This configuration file was written by the eclipse-cs plugin configuration editor
--->
-<!--
-    Checkstyle-Configuration: AE2
-    Description: none
--->
-<module name="Checker">
-  <property name="severity" value="warning"/>
-  <module name="TreeWalker">
-    <property name="tabWidth" value="4"/>
-    <module name="ConstantName"/>
-    <module name="LocalFinalVariableName"/>
-    <module name="LocalVariableName"/>
-    <module name="MemberName"/>
-    <module name="MethodName"/>
-    <module name="PackageName"/>
-    <module name="ParameterName"/>
-    <module name="StaticVariableName"/>
-    <module name="TypeName"/>
-    <module name="AvoidStarImport"/>
-    <module name="IllegalImport"/>
-    <module name="RedundantImport"/>
-    <module name="UnusedImports"/>
-    <module name="EmptyForIteratorPad"/>
-    <module name="MethodParamPad"/>
-    <module name="NoWhitespaceAfter">
-      <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
-    </module>
-    <module name="NoWhitespaceBefore"/>
-    <module name="OperatorWrap"/>
-    <module name="ParenPad">
-      <property name="option" value="space"/>
-    </module>
-    <module name="TypecastParenPad">
-      <property name="option" value="space"/>
-      <property name="tokens" value="RPAREN,TYPECAST"/>
-    </module>
-    <module name="WhitespaceAfter"/>
-    <module name="WhitespaceAround"/>
-    <module name="ModifierOrder"/>
-    <module name="RedundantModifier"/>
-    <module name="AvoidNestedBlocks"/>
-    <module name="EmptyBlock">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="LeftCurly">
-      <property name="option" value="nl"/>
-    </module>
-    <module name="NeedBraces"/>
-    <module name="RightCurly">
-      <property name="option" value="alone"/>
-    </module>
-    <module name="AvoidInlineConditionals">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="EmptyStatement"/>
-    <module name="EqualsHashCode"/>
-    <module name="HiddenField"/>
-    <module name="IllegalInstantiation"/>
-    <module name="InnerAssignment"/>
-    <module name="MagicNumber"/>
-    <module name="MissingSwitchDefault"/>
-    <module name="RedundantThrows">
-      <property name="suppressLoadErrors" value="true"/>
-    </module>
-    <module name="SimplifyBooleanExpression"/>
-    <module name="SimplifyBooleanReturn"/>
-    <module name="FinalClass"/>
-    <module name="HideUtilityClassConstructor"/>
-    <module name="InterfaceIsType"/>
-    <module name="VisibilityModifier"/>
-    <module name="ArrayTypeStyle"/>
-    <module name="FinalParameters"/>
-    <module name="UpperEll"/>
-  </module>
-  <module name="Translation"/>
-  <module name="RegexpSingleline">
-    <property name="format" value="\s+$"/>
-    <property name="message" value="Line has trailing spaces."/>
-  </module>
-  <module name="Header">
-    <property name="severity" value="error"/>
-    <property name="headerFile" value="${config_loc}/copyright.txt"/>
-    <property name="fileExtensions" value="java"/>
-  </module>
-</module>

codeformat/copyright.txt

@@ -1,15 +0,0 @@
-This file is part of Applied Energistics 2.
-Copyright (c) 2013 - $today.year, AlgorithmX2, All rights reserved.
-
-Applied Energistics 2 is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-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>.

codeformat/eclipse-code-format.xml

@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="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.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="160"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="do not insert"/>
-</profile>
-</profiles>

codeformat/eclipse.importorder

@@ -1,11 +0,0 @@
-#Organize Import Order
-#Sat Jun 13 15:22:41 CEST 2015
-8=appeng
-7=
-6=cpw
-5=net
-4=io
-3=org
-2=com
-1=javax
-0=java

gradle.properties

@@ -1,6 +1,6 @@
 aeversion=rv3
 aechannel=beta
-aebuild=18
+aebuild=24
 aegroup=appeng
 aebasename=appliedenergistics2
 
@@ -8,7 +8,7 @@ aebasename=appliedenergistics2
 # Versions                                              #
 #########################################################
 minecraft_version=1.7.10
-forge_version=10.13.4.1448-1.7.10
+forge_version=10.13.4.1614-1.7.10
 
 #########################################################
 # Installable                                           #

gradle/scripts/artifacts.gradle

@@ -1,15 +1,3 @@
-task myJavadocs(type: Javadoc) {
-    source = sourceSets.api.java
-    include "appeng/api/**"
-
-    classpath = configurations.compile
-}
-
-task javadocJar(type: Jar, dependsOn: myJavadocs) {
-    classifier = 'javadoc'
-    from 'build/docs/javadoc/'
-}
-
 task sourceJar(type: Jar, dependsOn: classes) {
     classifier = 'sources'
     from sourceSets.main.allSource
@@ -24,6 +12,8 @@ task devJar(type: Jar) {
 
     from(sourceSets.main.output) {
         include "appeng/**"
+        include "dev/**"
+        include "com/**"
         include "assets/**"
         include 'mcmod.info'
     }
@@ -44,6 +34,5 @@ task apiJar(type: Jar) {
 artifacts {
     archives devJar
     archives apiJar
-    archives javadocJar
     archives sourceJar
 }

gradle/scripts/dependencies.gradle

@@ -1,24 +1,3 @@
-
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-
-
 repositories {
     mavenLocal()
 //    ChickenBones' maven repo is unavailable now...
@@ -30,36 +9,54 @@ repositories {
     maven {
         name "Mobius"
         url "http://mobiusstrip.eu/maven"
+        metadataSources {
+            artifact()
+        }  
     }
 
     maven {
         name = "Player"
         url = "http://maven.ic2.player.to/"
+        metadataSources {
+            artifact()
+        }  
     }
 
     maven {
         name = "Tterrag"
         url = "http://maven.tterrag.com/"
+        metadataSources {
+            artifact()
+        }  
     }
 
     maven {
         name "OpenComputers Repo"
         url = "http://maven.cil.li/"
+        metadataSources {
+            artifact()
+        }  
     }
 
     maven {
         name = "MM repo"
         url = "http://maven.k-4u.nl/"
+        metadataSources {
+            artifact()
+        }  
     }
 
     maven {
         name = "tilera"
-        url = "https://data.tilera.xyz/maven/"
+        url = "https://maven.tilera.xyz/"
     }
 
     ivy {
         name "BuildCraft"
         artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
+        metadataSources {
+            artifact()
+        }  
     }
 
     ivy {
@@ -67,6 +64,9 @@ repositories {
         layout "pattern", {
             artifact "[revision]/artifact/build/libs/[artifact]-0.9.3.[revision](-[classifier]).[ext]"
         }
+        metadataSources {
+            artifact()
+        }  
     }
 
 //  CurseForge DNS for TE is not available or I am just being unlucky, code part can stay since this is applicable to any other curseforge mod though
@@ -106,7 +106,7 @@ dependencies {
 //    mods "net.mcft.copy.betterstorage:BetterStorage:${minecraft_version}-${betterstorage_version}:deobf"
     mods "inventorytweaks:InventoryTweaks:${invtweaks_version}:deobf"
     mods "li.cil.oc:OpenComputers:MC${minecraft_version}-${opencomputers_version}:dev"
-    compile "logisticspipes:logisticspipes:${logisticspipes_build}:dev"
+    implementation "logisticspipes:logisticspipes:${logisticspipes_build}:dev"
 
 //    mods name: 'CoFHLib', version: "[${minecraft_version}]${cofhlib_version}-dev", ext: 'jar'
 //    mods name: 'CoFHCore', version: "[${minecraft_version}]${cofhcore_version}-dev", ext: 'jar'
@@ -122,27 +122,27 @@ dependencies {
     compileOnly files("lib/CodeChickenCore-${minecraft_version}-${code_chicken_core_version}-dev.jar")
     compileOnly files("lib/NotEnoughItems-${minecraft_version}-${nei_version}-dev.jar")
 
-    compile files("lib/buildcraft-${bc_version}-dev.jar")
-    compile files("lib/PneumaticCraft-${minecraft_version}-${pneumaticcraft_version}-api.jar")
+    implementation files("lib/buildcraft-${bc_version}-dev.jar")
+    implementation files("lib/PneumaticCraft-${minecraft_version}-${pneumaticcraft_version}-api.jar")
 
     // provided APIs
-    compile files("lib/OpenComputers-MC${minecraft_version}-${opencomputers_version}-api.jar")
-    compile files("lib/industrialcraft-2-${ic2_version}-experimental-api.jar")
-    compile files("lib/BetterStorage-${minecraft_version}-${betterstorage_version}-api.jar")
+    implementation files("lib/OpenComputers-MC${minecraft_version}-${opencomputers_version}-api.jar")
+    implementation files("lib/industrialcraft-2-${ic2_version}-experimental-api.jar")
+    implementation files("lib/BetterStorage-${minecraft_version}-${betterstorage_version}-api.jar")
 
     // self compiled APIs
-    compile "appeng:Waila:${waila_version}_${minecraft_version}:api"
-    compile "appeng:RotaryCraft:${rotarycraft_version}:api"
-    compile "appeng:mekanism:${minecraft_version}-${mekansim_version}:api"
-    compile "appeng:InventoryTweaks:${invtweaks_version}:api"
+    implementation "appeng:Waila:${waila_version}_${minecraft_version}:api"
+    implementation "appeng:RotaryCraft:${rotarycraft_version}:api"
+    implementation "appeng:mekanism:${minecraft_version}-${mekansim_version}:api"
+    implementation "appeng:InventoryTweaks:${invtweaks_version}:api"
 
     // self compiled stubs
-    compile(group: 'api', name: 'coloredlightscore', version: "${api_coloredlightscore_version}")
-    compile(group: 'api', name: 'craftguide', version: "${api_craftguide_version}")
-    compile(group: 'api', name: 'immibis', version: "${api_immibis_version}")
-    compile(group: 'api', name: 'mfr', version: "${api_mfr_version}")
-    compile(group: 'api', name: 'railcraft', version: "${api_railcraft_version}")
-    compile(group: 'api', name: 'rf', version: "${api_rf_version}")
+    implementation(group: 'api', name: 'coloredlightscore', version: "${api_coloredlightscore_version}")
+    implementation(group: 'api', name: 'craftguide', version: "${api_craftguide_version}")
+    implementation(group: 'api', name: 'immibis', version: "${api_immibis_version}")
+    implementation(group: 'api', name: 'mfr', version: "${api_mfr_version}")
+    implementation(group: 'api', name: 'railcraft', version: "${api_railcraft_version}")
+    implementation(group: 'api', name: 'rf', version: "${api_rf_version}")
 
-    testCompile "junit:junit:4.12"
+    testImplementation "junit:junit:4.12"
 }

gradle/scripts/maven.gradle

@@ -2,13 +2,11 @@ publishing {
     tasks.publish.dependsOn 'build'
     publications {
         mavenJava(MavenPublication) {
-            artifactId = project.archivesBaseName
-
-            from components.java
+            artifactId = "appliedenergistics2"
 
+            artifact jar
             artifact devJar
             artifact sourceJar
-            artifact javadocJar
             artifact apiJar
         }
     }

gradle/scripts/optional.gradle

@@ -1,7 +1,3 @@
-task wrapper(type: Wrapper) {
-    gradleVersion = "2.4"
-}
-
 // WAILA
 task installWaila(type: Copy, dependsOn: "deinstallWaila") {
     from { configurations.mods }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip

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

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

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

@@ -23,7 +23,6 @@
 
 package appeng.api;
 
-
 import appeng.api.definitions.*;
 import appeng.api.exceptions.FailedConnection;
 import appeng.api.features.IRegistryContainer;
@@ -33,72 +32,70 @@ import appeng.api.networking.IGridNode;
 import appeng.api.parts.IPartHelper;
 import appeng.api.storage.IStorageHelper;
 
+public interface IAppEngApi {
+    /**
+     * @return Registry Container for the numerous registries in AE2.
+     */
+    IRegistryContainer registries();
 
-public interface IAppEngApi
-{
+    /**
+     * @return helper for working with storage data types.
+     */
+    IStorageHelper storage();
 
-	/**
-	 * @return Registry Container for the numerous registries in AE2.
-	 */
-	IRegistryContainer registries();
+    /**
+     * @return helper for working with grids, and buses.
+     */
+    IPartHelper partHelper();
 
-	/**
-	 * @return helper for working with storage data types.
-	 */
-	IStorageHelper storage();
+    /**
+     * @return an accessible list of all of AE's Items
+     * @deprecated use {@link appeng.api.definitions.IDefinitions#items()}
+     */
+    @Deprecated
+    Items items();
 
-	/**
-	 * @return helper for working with grids, and buses.
-	 */
-	IPartHelper partHelper();
+    /**
+     * @return an accessible list of all of AE's materials; materials are items
+     * @deprecated use {@link appeng.api.definitions.IDefinitions#materials()}
+     */
+    @Deprecated
+    Materials materials();
 
-	/**
-	 * @return an accessible list of all of AE's Items
-	 * @deprecated use {@link appeng.api.definitions.IDefinitions#items()}
-	 */
-	@Deprecated
-	Items items();
+    /**
+     * @return an accessible list of all of AE's blocks
+     * @deprecated use {@link appeng.api.definitions.IDefinitions#blocks()}
+     */
+    @Deprecated
+    Blocks blocks();
 
-	/**
-	 * @return an accessible list of all of AE's materials; materials are items
-	 * @deprecated use {@link appeng.api.definitions.IDefinitions#materials()}
-	 */
-	@Deprecated
-	Materials materials();
+    /**
+     * @return an accessible list of all of AE's parts, parts are items
+     * @deprecated use {@link appeng.api.definitions.IDefinitions#parts()}
+     */
+    @Deprecated
+    Parts parts();
 
-	/**
-	 * @return an accessible list of all of AE's blocks
-	 * @deprecated use {@link appeng.api.definitions.IDefinitions#blocks()}
-	 */
-	@Deprecated
-	Blocks blocks();
+    /**
+     * @return an accessible list of all AE definitions
+     */
+    IDefinitions definitions();
 
-	/**
-	 * @return an accessible list of all of AE's parts, parts are items
-	 * @deprecated use {@link appeng.api.definitions.IDefinitions#parts()}
-	 */
-	@Deprecated
-	Parts parts();
+    /**
+     * create a grid node for your {@link appeng.api.networking.IGridHost}
+     *
+     * @param block grid block
+     * @return grid node of block
+     */
+    IGridNode createGridNode(IGridBlock block);
 
-	/**
-	 * @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;
+    /**
+     * 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;
 }

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

@@ -23,51 +23,45 @@
 
 package appeng.api.config;
 
+public enum AccessRestriction {
+    NO_ACCESS(0),
+    READ(1),
+    WRITE(2),
+    READ_WRITE(3);
 
-public enum AccessRestriction
-{
-	NO_ACCESS( 0 ), READ( 1 ), WRITE( 2 ), READ_WRITE( 3 );
+    private final int permissionBit;
 
-	private final int permissionBit;
+    AccessRestriction(final int v) {
+        this.permissionBit = v;
+    }
 
-	AccessRestriction( final int v )
-	{
-		this.permissionBit = v;
-	}
+    public boolean hasPermission(final AccessRestriction ar) {
+        return (this.permissionBit & ar.permissionBit) == ar.permissionBit;
+    }
 
-	public boolean hasPermission( final AccessRestriction ar )
-	{
-		return ( this.permissionBit & ar.permissionBit ) == ar.permissionBit;
-	}
+    public AccessRestriction restrictPermissions(final AccessRestriction ar) {
+        return this.getPermByBit(this.permissionBit & ar.permissionBit);
+    }
 
-	public AccessRestriction restrictPermissions( final AccessRestriction ar )
-	{
-		return this.getPermByBit( this.permissionBit & ar.permissionBit );
-	}
+    private AccessRestriction getPermByBit(final int bit) {
+        switch (bit) {
+            default:
+            case 0:
+                return NO_ACCESS;
+            case 1:
+                return READ;
+            case 2:
+                return WRITE;
+            case 3:
+                return READ_WRITE;
+        }
+    }
 
-	private AccessRestriction getPermByBit( final int bit )
-	{
-		switch( bit )
-		{
-			default:
-			case 0:
-				return NO_ACCESS;
-			case 1:
-				return READ;
-			case 2:
-				return WRITE;
-			case 3:
-				return READ_WRITE;
-		}
-	}
+    public AccessRestriction addPermissions(final AccessRestriction ar) {
+        return this.getPermByBit(this.permissionBit | ar.permissionBit);
+    }
 
-	public AccessRestriction addPermissions( final AccessRestriction ar )
-	{
-		return this.getPermByBit( this.permissionBit | ar.permissionBit );
-	}
-
-	public AccessRestriction removePermissions( final AccessRestriction ar )
-	{
-		return this.getPermByBit( this.permissionBit & ( ~ar.permissionBit ) );
-	}
+    public AccessRestriction removePermissions(final AccessRestriction ar) {
+        return this.getPermByBit(this.permissionBit & (~ar.permissionBit));
+    }
 }

src/api/java/appeng/api/config/ActionItems.java

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum ActionItems
-{
-	WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION
-}
+public enum ActionItems { WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION }

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

@@ -23,16 +23,14 @@
 
 package appeng.api.config;
 
+public enum Actionable {
+    /**
+     * Perform the intended action.
+     */
+    MODULATE,
 
-public enum Actionable
-{
-	/**
-	 * Perform the intended action.
-	 */
-	MODULATE,
-
-	/**
-	 * Pretend to perform the action.
-	 */
-	SIMULATE
+    /**
+     * Pretend to perform the action.
+     */
+    SIMULATE
 }

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

@@ -23,16 +23,12 @@
 
 package appeng.api.config;
 
+public enum CondenserOutput {
+    TRASH, // 0
 
-public enum CondenserOutput
-{
+    MATTER_BALLS, // 256
 
-	TRASH, // 0
-
-	MATTER_BALLS, // 256
-
-	SINGULARITY; // 250,000
-
-	public int requiredPower = 0;
+    SINGULARITY; // 250,000
 
+    public int requiredPower = 0;
 }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum CopyMode
-{
-	CLEAR_ON_REMOVE, KEEP_ON_REMOVE
-}
+public enum CopyMode { CLEAR_ON_REMOVE, KEEP_ON_REMOVE }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum FullnessMode
-{
-	EMPTY, HALF, FULL
-}
+public enum FullnessMode { EMPTY, HALF, FULL }

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

@@ -23,24 +23,23 @@
 
 package appeng.api.config;
 
+public enum FuzzyMode {
+    // Note that percentage damaged, is the inverse of percentage durability.
+    IGNORE_ALL(-1),
+    PERCENT_99(0),
+    PERCENT_75(25),
+    PERCENT_50(50),
+    PERCENT_25(75);
 
-public enum FuzzyMode
-{
-	// Note that percentage damaged, is the inverse of percentage durability.
-	IGNORE_ALL( -1 ), PERCENT_99( 0 ), PERCENT_75( 25 ), PERCENT_50( 50 ), PERCENT_25( 75 );
+    public final float breakPoint;
+    public final float percentage;
 
-	public final float breakPoint;
-	public final float percentage;
-
-	FuzzyMode( final float p )
-	{
-		this.percentage = p;
-		this.breakPoint = p / 100.0f;
-	}
-
-	public int calculateBreakPoint( final int maxDamage )
-	{
-		return (int) ( ( this.percentage * maxDamage ) / 100.0f );
-	}
+    FuzzyMode(final float p) {
+        this.percentage = p;
+        this.breakPoint = p / 100.0f;
+    }
 
+    public int calculateBreakPoint(final int maxDamage) {
+        return (int) ((this.percentage * maxDamage) / 100.0f);
+    }
 }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum IncludeExclude
-{
-	WHITELIST, BLACKLIST
-}
+public enum IncludeExclude { WHITELIST, BLACKLIST }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum ItemSubstitution
-{
-	ENABLED, DISABLED
-}
+public enum ItemSubstitution { ENABLED, DISABLED }

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

@@ -23,12 +23,10 @@
 
 package appeng.api.config;
 
+public enum LevelEmitterMode {
 
-public enum LevelEmitterMode
-{
+    STORED_AMOUNT,
 
-	STORED_AMOUNT,
-
-	STORABLE_AMOUNT
+    STORABLE_AMOUNT
 
 }

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

@@ -23,12 +23,10 @@
 
 package appeng.api.config;
 
+public enum LevelType {
 
-public enum LevelType
-{
+    ITEM_LEVEL,
 
-	ITEM_LEVEL,
-
-	ENERGY_LEVEL
+    ENERGY_LEVEL
 
 }

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

@@ -23,8 +23,6 @@
 
 package appeng.api.config;
 
-
-public enum ModSettings
-{
+public enum ModSettings {
 
 }

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

@@ -23,14 +23,12 @@
 
 package appeng.api.config;
 
+public enum NetworkEmitterMode {
 
-public enum NetworkEmitterMode
-{
+    POWER_LEVEL,
 
-	POWER_LEVEL,
+    BOOTING,
 
-	BOOTING,
-
-	CHANNEL_ERROR
+    CHANNEL_ERROR
 
 }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum OperationMode
-{
-	FILL, EMPTY
-}
+public enum OperationMode { FILL, EMPTY }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum OutputMode
-{
-	EXPORT_ONLY, EXPORT_OR_CRAFT, CRAFT_ONLY
-}
+public enum OutputMode { EXPORT_ONLY, EXPORT_OR_CRAFT, CRAFT_ONLY }

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

@@ -23,23 +23,20 @@
 
 package appeng.api.config;
 
+public enum PowerMultiplier {
+    ONE,
+    CONFIG;
 
-public enum PowerMultiplier
-{
-	ONE, CONFIG;
+    /**
+     * please do not edit this value, it is set when AE loads its config files.
+     */
+    public double multiplier = 1.0;
 
-	/**
-	 * please do not edit this value, it is set when AE loads its config files.
-	 */
-	public double multiplier = 1.0;
+    public double multiply(final double in) {
+        return in * this.multiplier;
+    }
 
-	public double multiply( final double in )
-	{
-		return in * this.multiplier;
-	}
-
-	public double divide( final double in )
-	{
-		return in / this.multiplier;
-	}
+    public double divide(final double in) {
+        return in / this.multiplier;
+    }
 }

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

@@ -23,43 +23,40 @@
 
 package appeng.api.config;
 
+public enum PowerUnits {
+    AE("gui.appliedenergistics2.units.appliedenergstics"), // Native Units - AE Energy
+    EU("gui.appliedenergistics2.units.ic2"), // IndustrialCraft 2 - Energy Units
+    WA("gui.appliedenergistics2.units.rotarycraft"), // RotaryCraft - Watts
+    RF("gui.appliedenergistics2.units.thermalexpansion"
+    ), // ThermalExpansion - Redstone Flux
+    MK("gui.appliedenergistics2.units.mekanism"); // Mekanism - Joules
 
-public enum PowerUnits
-{
-	AE( "gui.appliedenergistics2.units.appliedenergstics" ), // Native Units - AE Energy
-	EU( "gui.appliedenergistics2.units.ic2" ), // IndustrialCraft 2 - Energy Units
-	WA( "gui.appliedenergistics2.units.rotarycraft" ), // RotaryCraft - Watts
-	RF( "gui.appliedenergistics2.units.thermalexpansion" ), // ThermalExpansion - Redstone Flux
-	MK( "gui.appliedenergistics2.units.mekanism" ); // Mekanism - Joules
+    /**
+     * unlocalized name for the power unit.
+     */
+    public final String unlocalizedName;
+    /**
+     * please do not edit this value, it is set when AE loads its config files.
+     */
+    public double conversionRatio = 1.0;
 
-	/**
-	 * unlocalized name for the power unit.
-	 */
-	public final String unlocalizedName;
-	/**
-	 * please do not edit this value, it is set when AE loads its config files.
-	 */
-	public double conversionRatio = 1.0;
-
-	PowerUnits( final String un )
-	{
-		this.unlocalizedName = un;
-	}
-
-	/**
-	 * do power conversion using AE's conversion rates.
-	 * <p>
-	 * Example: PowerUnits.EU.convertTo( PowerUnits.AE, 32 );
-	 * <p>
-	 * will normally returns 64, as it will convert the EU, to AE with AE's power settings.
-	 *
-	 * @param target target power unit
-	 * @param value  value
-	 * @return value converted to target units, from this units.
-	 */
-	public double convertTo( final PowerUnits target, final double value )
-	{
-		return ( value * this.conversionRatio ) / target.conversionRatio;
-	}
+    PowerUnits(final String un) {
+        this.unlocalizedName = un;
+    }
 
+    /**
+     * do power conversion using AE's conversion rates.
+     * <p>
+     * Example: PowerUnits.EU.convertTo( PowerUnits.AE, 32 );
+     * <p>
+     * will normally returns 64, as it will convert the EU, to AE with AE's power
+     * settings.
+     *
+     * @param target target power unit
+     * @param value  value
+     * @return value converted to target units, from this units.
+     */
+    public double convertTo(final PowerUnits target, final double value) {
+        return (value * this.conversionRatio) / target.conversionRatio;
+    }
 }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum RedstoneMode
-{
-	IGNORE, LOW_SIGNAL, HIGH_SIGNAL, SIGNAL_PULSE
-}
+public enum RedstoneMode { IGNORE, LOW_SIGNAL, HIGH_SIGNAL, SIGNAL_PULSE }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum RelativeDirection
-{
-	LEFT, RIGHT, UP, DOW
-}
+public enum RelativeDirection { LEFT, RIGHT, UP, DOW }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum SchedulingMode
-{
-	DEFAULT, ROUNDROBIN, RANDOM
-}
+public enum SchedulingMode { DEFAULT, ROUNDROBIN, RANDOM }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum SearchBoxMode
-{
-	AUTOSEARCH, MANUAL_SEARCH, NEI_AUTOSEARCH, NEI_MANUAL_SEARCH
-}
+public enum SearchBoxMode { AUTOSEARCH, MANUAL_SEARCH, NEI_AUTOSEARCH, NEI_MANUAL_SEARCH }

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

@@ -23,49 +23,47 @@
 
 package appeng.api.config;
 
-
 /**
- * Represent the security systems basic permissions, these are not for anti-griefing, they are part of the mod as a
- * gameplay feature.
+ * Represent the security systems basic permissions, these are not for anti-griefing, they
+ * are part of the mod as a gameplay feature.
  */
-public enum SecurityPermissions
-{
-	/**
-	 * required to insert items into the network via terminal ( also used for machines based on the owner of the
-	 * network, which is determined by its Security Block. )
-	 */
-	INJECT,
+public enum SecurityPermissions {
+    /**
+     * required to insert items into the network via terminal ( also used for machines
+     * based on the owner of the network, which is determined by its Security Block. )
+     */
+    INJECT,
 
-	/**
-	 * required to extract items from the network via terminal ( also used for machines based on the owner of the
-	 * network, which is determined by its Security Block. )
-	 */
-	EXTRACT,
+    /**
+     * required to extract items from the network via terminal ( also used for machines
+     * based on the owner of the network, which is determined by its Security Block. )
+     */
+    EXTRACT,
 
-	/**
-	 * required to request crafting from the network via terminal.
-	 */
-	CRAFT,
+    /**
+     * required to request crafting from the network via terminal.
+     */
+    CRAFT,
 
-	/**
-	 * required to modify automation, and make modifications to the networks physical layout.
-	 */
-	BUILD,
+    /**
+     * required to modify automation, and make modifications to the networks physical
+     * layout.
+     */
+    BUILD,
 
-	/**
-	 * required to modify the security blocks settings.
-	 */
-	SECURITY;
+    /**
+     * required to modify the security blocks settings.
+     */
+    SECURITY;
 
-	private final String unlocalizedName = "gui.appliedenergistics2.security." + this.name().toLowerCase();
+    private final String unlocalizedName
+        = "gui.appliedenergistics2.security." + this.name().toLowerCase();
 
-	public String getUnlocalizedName()
-	{
-		return this.unlocalizedName + ".name";
-	}
+    public String getUnlocalizedName() {
+        return this.unlocalizedName + ".name";
+    }
 
-	public String getUnlocalizedTip()
-	{
-		return this.unlocalizedName + ".tip";
-	}
+    public String getUnlocalizedTip() {
+        return this.unlocalizedName + ".tip";
+    }
 }

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

@@ -23,56 +23,63 @@
 
 package appeng.api.config;
 
-
-import javax.annotation.Nonnull;
 import java.util.EnumSet;
+import javax.annotation.Nonnull;
 
+public enum Settings {
+    LEVEL_EMITTER_MODE(EnumSet.allOf(LevelEmitterMode.class)),
 
-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)),
 
-	CONDENSER_OUTPUT( EnumSet.allOf( CondenserOutput.class ) ),
+    POWER_UNITS(EnumSet.allOf(PowerUnits.class)),
+    ACCESS(EnumSet.of(
+        AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE
+    )),
 
-	POWER_UNITS( EnumSet.allOf( PowerUnits.class ) ), ACCESS( EnumSet.of( AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE ) ),
+    SORT_DIRECTION(EnumSet.allOf(SortDir.class)),
+    SORT_BY(EnumSet.allOf(SortOrder.class)),
 
-	SORT_DIRECTION( EnumSet.allOf( SortDir.class ) ), SORT_BY( EnumSet.allOf( SortOrder.class ) ),
+    SEARCH_TOOLTIPS(EnumSet.of(YesNo.YES, YesNo.NO)),
+    VIEW_MODE(EnumSet.allOf(ViewItems.class)),
+    SEARCH_MODE(EnumSet.allOf(SearchBoxMode.class)),
 
-	SEARCH_TOOLTIPS( EnumSet.of( YesNo.YES, YesNo.NO ) ), VIEW_MODE( EnumSet.allOf( ViewItems.class ) ), SEARCH_MODE( EnumSet.allOf( SearchBoxMode.class ) ),
+    ACTIONS(EnumSet.allOf(ActionItems.class)),
+    IO_DIRECTION(EnumSet.of(RelativeDirection.LEFT, RelativeDirection.RIGHT)),
 
-	ACTIONS( EnumSet.allOf( ActionItems.class ) ), IO_DIRECTION( EnumSet.of( RelativeDirection.LEFT, RelativeDirection.RIGHT ) ),
+    BLOCK(EnumSet.of(YesNo.YES, YesNo.NO)),
+    OPERATION_MODE(EnumSet.allOf(OperationMode.class)),
 
-	BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ), OPERATION_MODE( EnumSet.allOf( OperationMode.class ) ),
+    FULLNESS_MODE(EnumSet.allOf(FullnessMode.class)),
+    CRAFT_ONLY(EnumSet.of(YesNo.YES, YesNo.NO)),
 
-	FULLNESS_MODE( EnumSet.allOf( FullnessMode.class ) ), CRAFT_ONLY( EnumSet.of( YesNo.YES, YesNo.NO ) ),
+    FUZZY_MODE(EnumSet.allOf(FuzzyMode.class)),
+    LEVEL_TYPE(EnumSet.allOf(LevelType.class)),
 
-	FUZZY_MODE( EnumSet.allOf( FuzzyMode.class ) ), LEVEL_TYPE( EnumSet.allOf( LevelType.class ) ),
+    TERMINAL_STYLE(EnumSet.of(TerminalStyle.TALL, TerminalStyle.SMALL)),
+    COPY_MODE(EnumSet.allOf(CopyMode.class)),
 
-	TERMINAL_STYLE( EnumSet.of( TerminalStyle.TALL, TerminalStyle.SMALL ) ), COPY_MODE( EnumSet.allOf( CopyMode.class ) ),
+    INTERFACE_TERMINAL(EnumSet.of(YesNo.YES, YesNo.NO)),
+    CRAFT_VIA_REDSTONE(EnumSet.of(YesNo.YES, YesNo.NO)),
 
-	INTERFACE_TERMINAL( EnumSet.of( YesNo.YES, YesNo.NO ) ), CRAFT_VIA_REDSTONE( EnumSet.of( YesNo.YES, YesNo.NO ) ),
+    STORAGE_FILTER(EnumSet.allOf(StorageFilter.class)),
+    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));
 
-	SCHEDULING_MODE( EnumSet.allOf( SchedulingMode.class ) );
+    private final EnumSet<? extends Enum<?>> values;
 
-	private final EnumSet<? extends Enum<?>> values;
+    Settings(@Nonnull final EnumSet<? extends Enum<?>> possibleOptions) {
+        if (possibleOptions.isEmpty()) {
+            throw new IllegalArgumentException("Tried to instantiate an empty setting.");
+        }
 
-	Settings( @Nonnull final EnumSet<? extends Enum<?>> possibleOptions )
-	{
-		if( possibleOptions.isEmpty() )
-		{
-			throw new IllegalArgumentException( "Tried to instantiate an empty setting." );
-		}
-
-		this.values = possibleOptions;
-	}
-
-	public EnumSet<? extends Enum<?>> getPossibleValues()
-	{
-		return this.values;
-	}
+        this.values = possibleOptions;
+    }
 
+    public EnumSet<? extends Enum<?>> getPossibleValues() {
+        return this.values;
+    }
 }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum SortDir
-{
-	ASCENDING, DESCENDING
-}
+public enum SortDir { ASCENDING, DESCENDING }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum SortOrder
-{
-	NAME, AMOUNT, MOD, INVTWEAKS
-}
+public enum SortOrder { NAME, AMOUNT, MOD, INVTWEAKS }

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

@@ -23,12 +23,10 @@
 
 package appeng.api.config;
 
+public enum StorageFilter {
 
-public enum StorageFilter
-{
+    NONE,
 
-	NONE,
-
-	EXTRACTABLE_ONLY
+    EXTRACTABLE_ONLY
 
 }

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

@@ -23,14 +23,12 @@
 
 package appeng.api.config;
 
+public enum TerminalStyle {
 
-public enum TerminalStyle
-{
+    TALL,
 
-	TALL,
+    FULL,
 
-	FULL,
-
-	SMALL
+    SMALL
 
 }

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

@@ -23,17 +23,15 @@
 
 package appeng.api.config;
 
-
-public enum TunnelType
-{
-	ME, // Network Tunnel
-	IC2_POWER, // EU Tunnel
-	RF_POWER, // RF Tunnel
-	REDSTONE, // Redstone Tunnel
-	FLUID, // Fluid Tunnel
-	ITEM, // Item Tunnel
-	LIGHT, // Light Tunnel
-	BUNDLED_REDSTONE, // Bundled Redstone Tunnel
-	COMPUTER_MESSAGE, // Computer Message Tunnel
-	PRESSURE // PneumaticCraft Tunnel
+public enum TunnelType {
+    ME, // Network Tunnel
+    IC2_POWER, // EU Tunnel
+    RF_POWER, // RF Tunnel
+    REDSTONE, // Redstone Tunnel
+    FLUID, // Fluid Tunnel
+    ITEM, // Item Tunnel
+    LIGHT, // Light Tunnel
+    BUNDLED_REDSTONE, // Bundled Redstone Tunnel
+    COMPUTER_MESSAGE, // Computer Message Tunnel
+    PRESSURE // PneumaticCraft Tunnel
 }

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

@@ -23,105 +23,97 @@
 
 package appeng.api.config;
 
+import java.util.HashMap;
+import java.util.Map;
 
 import appeng.api.definitions.IItemDefinition;
 import appeng.api.util.AEItemDefinition;
 import com.google.common.base.Optional;
 import net.minecraft.item.ItemStack;
 
-import java.util.HashMap;
-import java.util.Map;
+public enum Upgrades {
+    /**
+     * Gold Tier Upgrades.
+     */
+    CAPACITY(0),
+    REDSTONE(0),
+    CRAFTING(0),
 
+    /**
+     * Diamond Tier Upgrades.
+     */
+    FUZZY(1),
+    SPEED(1),
+    INVERTER(1);
 
-public enum Upgrades
-{
-	/**
-	 * Gold Tier Upgrades.
-	 */
-	CAPACITY( 0 ), REDSTONE( 0 ), CRAFTING( 0 ),
+    /**
+     * @deprecated use {@link Upgrades#getTier()}
+     */
+    @Deprecated
+    public final int tier;
 
-	/**
-	 * Diamond Tier Upgrades.
-	 */
-	FUZZY( 1 ), SPEED( 1 ), INVERTER( 1 );
+    /**
+     * @deprecated use {@link Upgrades#getSupported()}
+     */
+    @Deprecated
+    private final Map<ItemStack, Integer> supportedMax
+        = new HashMap<ItemStack, Integer>();
 
-	/**
-	 * @deprecated use {@link Upgrades#getTier()}
-	 */
-	@Deprecated
-	public final int tier;
+    Upgrades(final int tier) {
+        this.tier = tier;
+    }
 
-	/**
-	 * @deprecated use {@link Upgrades#getSupported()}
-	 */
-	@Deprecated
-	private final Map<ItemStack, Integer> supportedMax = new HashMap<ItemStack, Integer>();
+    /**
+     * @return list of Items/Blocks that support this upgrade, and how many it supports.
+     */
+    public Map<ItemStack, Integer> getSupported() {
+        return this.supportedMax;
+    }
 
-	Upgrades( final int tier )
-	{
-		this.tier = tier;
-	}
+    /**
+     * Registers a specific amount of this upgrade into a specific machine
+     *
+     * @param item         machine in which this upgrade can be installed
+     * @param maxSupported amount how many upgrades can be installed
+     */
+    public void registerItem(final IItemDefinition item, final int maxSupported) {
+        final Optional<ItemStack> maybeStack = item.maybeStack(1);
+        for (final ItemStack stack : maybeStack.asSet()) {
+            this.registerItem(stack, maxSupported);
+        }
+    }
 
-	/**
-	 * @return list of Items/Blocks that support this upgrade, and how many it supports.
-	 */
-	public Map<ItemStack, Integer> getSupported()
-	{
-		return this.supportedMax;
-	}
+    /**
+     * Registers a specific amount of this upgrade into a specific machine
+     *
+     * @param stack        machine in which this upgrade can be installed
+     * @param maxSupported amount how many upgrades can be installed
+     */
+    public void registerItem(final ItemStack stack, final int maxSupported) {
+        if (stack != null) {
+            this.supportedMax.put(stack, maxSupported);
+        }
+    }
 
-	/**
-	 * Registers a specific amount of this upgrade into a specific machine
-	 *
-	 * @param item         machine in which this upgrade can be installed
-	 * @param maxSupported amount how many upgrades can be installed
-	 */
-	public void registerItem( final IItemDefinition item, final int maxSupported )
-	{
-		final Optional<ItemStack> maybeStack = item.maybeStack( 1 );
-		for( final ItemStack stack : maybeStack.asSet() )
-		{
-			this.registerItem( stack, maxSupported );
-		}
-	}
+    /**
+     * Registers a specific amount of this upgrade into a specific machine
+     *
+     * @param item         machine in which this upgrade can be installed
+     * @param maxSupported amount how many upgrades can be installed
+     * @deprecated use {@link Upgrades#registerItem(IItemDefinition, int)}
+     */
+    @Deprecated
+    public void registerItem(final AEItemDefinition item, final int maxSupported) {
+        if (item != null) {
+            final ItemStack stack = item.stack(1);
 
-	/**
-	 * Registers a specific amount of this upgrade into a specific machine
-	 *
-	 * @param stack        machine in which this upgrade can be installed
-	 * @param maxSupported amount how many upgrades can be installed
-	 */
-	public void registerItem( final ItemStack stack, final int maxSupported )
-	{
-		if( stack != null )
-		{
-			this.supportedMax.put( stack, maxSupported );
-		}
-	}
+            if (stack != null) {
+                this.registerItem(stack, maxSupported);
+            }
+        }
+    }
 
-	/**
-	 * Registers a specific amount of this upgrade into a specific machine
-	 *
-	 * @param item         machine in which this upgrade can be installed
-	 * @param maxSupported amount how many upgrades can be installed
-	 * @deprecated use {@link Upgrades#registerItem(IItemDefinition, int)}
-	 */
-	@Deprecated
-	public void registerItem( final AEItemDefinition item, final int maxSupported )
-	{
-		if( item != null )
-		{
-			final ItemStack stack = item.stack( 1 );
-
-			if( stack != null )
-			{
-				this.registerItem( stack, maxSupported );
-			}
-		}
-	}
-
-	public int getTier()
-	{
-		return this.tier;
-	}
+    public int getTier() {
+        return this.tier;
+    }
 }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum ViewItems
-{
-	ALL, STORED, CRAFTABLE
-}
+public enum ViewItems { ALL, STORED, CRAFTABLE }

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

@@ -23,8 +23,4 @@
 
 package appeng.api.config;
 
-
-public enum YesNo
-{
-	YES, NO, UNDECIDED
-}
+public enum YesNo { YES, NO, UNDECIDED }

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

@@ -23,109 +23,106 @@
 
 package appeng.api.definitions;
 
-
 import appeng.api.util.AEItemDefinition;
 
-
 /**
  * @deprecated use {@link IBlocks} now
  */
 @Deprecated
-public class Blocks
-{
-	public AEItemDefinition blockQuartzOre;
+public class Blocks {
+    public AEItemDefinition blockQuartzOre;
 
-	public AEItemDefinition blockQuartzOreCharged;
+    public AEItemDefinition blockQuartzOreCharged;
 
-	public AEItemDefinition blockMatrixFrame;
+    public AEItemDefinition blockMatrixFrame;
 
-	public AEItemDefinition blockQuartz;
+    public AEItemDefinition blockQuartz;
 
-	public AEItemDefinition blockQuartzPillar;
+    public AEItemDefinition blockQuartzPillar;
 
-	public AEItemDefinition blockQuartzChiseled;
+    public AEItemDefinition blockQuartzChiseled;
 
-	public AEItemDefinition blockQuartzGlass;
+    public AEItemDefinition blockQuartzGlass;
 
-	public AEItemDefinition blockQuartzVibrantGlass;
+    public AEItemDefinition blockQuartzVibrantGlass;
 
-	public AEItemDefinition blockQuartzTorch;
+    public AEItemDefinition blockQuartzTorch;
 
-	public AEItemDefinition blockFluix;
+    public AEItemDefinition blockFluix;
 
-	public AEItemDefinition blockSkyStone;
+    public AEItemDefinition blockSkyStone;
 
-	public AEItemDefinition blockSkyChest;
+    public AEItemDefinition blockSkyChest;
 
-	public AEItemDefinition blockSkyCompass;
+    public AEItemDefinition blockSkyCompass;
 
-	public AEItemDefinition blockGrindStone;
+    public AEItemDefinition blockGrindStone;
 
-	public AEItemDefinition blockCrankHandle;
+    public AEItemDefinition blockCrankHandle;
 
-	public AEItemDefinition blockInscriber;
+    public AEItemDefinition blockInscriber;
 
-	public AEItemDefinition blockWireless;
+    public AEItemDefinition blockWireless;
 
-	public AEItemDefinition blockCharger;
+    public AEItemDefinition blockCharger;
 
-	public AEItemDefinition blockTinyTNT;
+    public AEItemDefinition blockTinyTNT;
 
-	public AEItemDefinition blockSecurity;
+    public AEItemDefinition blockSecurity;
 
-	public AEItemDefinition blockQuantumRing;
+    public AEItemDefinition blockQuantumRing;
 
-	public AEItemDefinition blockQuantumLink;
+    public AEItemDefinition blockQuantumLink;
 
-	public AEItemDefinition blockSpatialPylon;
+    public AEItemDefinition blockSpatialPylon;
 
-	public AEItemDefinition blockSpatialIOPort;
+    public AEItemDefinition blockSpatialIOPort;
 
-	public AEItemDefinition blockMultiPart;
+    public AEItemDefinition blockMultiPart;
 
-	public AEItemDefinition blockController;
+    public AEItemDefinition blockController;
 
-	public AEItemDefinition blockDrive;
+    public AEItemDefinition blockDrive;
 
-	public AEItemDefinition blockChest;
+    public AEItemDefinition blockChest;
 
-	public AEItemDefinition blockInterface;
+    public AEItemDefinition blockInterface;
 
-	public AEItemDefinition blockCellWorkbench;
+    public AEItemDefinition blockCellWorkbench;
 
-	public AEItemDefinition blockIOPort;
+    public AEItemDefinition blockIOPort;
 
-	public AEItemDefinition blockCondenser;
+    public AEItemDefinition blockCondenser;
 
-	public AEItemDefinition blockEnergyAcceptor;
+    public AEItemDefinition blockEnergyAcceptor;
 
-	public AEItemDefinition blockVibrationChamber;
+    public AEItemDefinition blockVibrationChamber;
 
-	public AEItemDefinition blockQuartzGrowthAccelerator;
+    public AEItemDefinition blockQuartzGrowthAccelerator;
 
-	public AEItemDefinition blockEnergyCell;
+    public AEItemDefinition blockEnergyCell;
 
-	public AEItemDefinition blockEnergyCellDense;
+    public AEItemDefinition blockEnergyCellDense;
 
-	public AEItemDefinition blockEnergyCellCreative;
+    public AEItemDefinition blockEnergyCellCreative;
 
-	public AEItemDefinition blockCraftingUnit;
+    public AEItemDefinition blockCraftingUnit;
 
-	public AEItemDefinition blockCraftingAccelerator;
+    public AEItemDefinition blockCraftingAccelerator;
 
-	public AEItemDefinition blockCraftingStorage1k;
+    public AEItemDefinition blockCraftingStorage1k;
 
-	public AEItemDefinition blockCraftingStorage4k;
+    public AEItemDefinition blockCraftingStorage4k;
 
-	public AEItemDefinition blockCraftingStorage16k;
+    public AEItemDefinition blockCraftingStorage16k;
 
-	public AEItemDefinition blockCraftingStorage64k;
+    public AEItemDefinition blockCraftingStorage64k;
 
-	public AEItemDefinition blockCraftingMonitor;
+    public AEItemDefinition blockCraftingMonitor;
 
-	public AEItemDefinition blockMolecularAssembler;
+    public AEItemDefinition blockMolecularAssembler;
 
-	public AEItemDefinition blockLightDetector;
+    public AEItemDefinition blockLightDetector;
 
-	public AEItemDefinition blockPaint;
+    public AEItemDefinition blockPaint;
 }

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

@@ -1,32 +1,29 @@
 package appeng.api.definitions;
 
-
 import com.google.common.base.Optional;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.world.IBlockAccess;
 
+public interface IBlockDefinition extends IItemDefinition {
+    /**
+     * @return the {@link Block} implementation if applicable
+     */
+    Optional<Block> maybeBlock();
 
-public interface IBlockDefinition extends IItemDefinition
-{
-	/**
-	 * @return the {@link Block} implementation if applicable
-	 */
-	Optional<Block> maybeBlock();
+    /**
+     * @return the {@link ItemBlock} implementation if applicable
+     */
+    Optional<ItemBlock> maybeItemBlock();
 
-	/**
-	 * @return the {@link ItemBlock} implementation if applicable
-	 */
-	Optional<ItemBlock> maybeItemBlock();
-
-	/**
-	 * Compare Block with world.
-	 *
-	 * @param world world of block
-	 * @param x     x pos of block
-	 * @param y     y pos of block
-	 * @param z     z pos of block
-	 * @return if the block is placed in the world at the specific location.
-	 */
-	boolean isSameAs( IBlockAccess world, int x, int y, int z );
+    /**
+     * Compare Block with world.
+     *
+     * @param world world of block
+     * @param x     x pos of block
+     * @param y     y pos of block
+     * @param z     z pos of block
+     * @return if the block is placed in the world at the specific location.
+     */
+    boolean isSameAs(IBlockAccess world, int x, int y, int z);
 }

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

@@ -23,159 +23,162 @@
 
 package appeng.api.definitions;
 
-
 /**
  * A list of all blocks in AE
  */
-public interface IBlocks
-{
-	/*
-	 * world gen
-	 */
-	IBlockDefinition quartzOre();
+public interface IBlocks {
+    /*
+     * world gen
+     */
+    IBlockDefinition quartzOre();
 
-	IBlockDefinition quartzOreCharged();
+    IBlockDefinition quartzOreCharged();
 
-	IBlockDefinition matrixFrame();
+    IBlockDefinition matrixFrame();
 
-	/*
-	 * decorative
-	 */
-	IBlockDefinition quartz();
+    /*
+     * decorative
+     */
+    IBlockDefinition quartz();
 
-	IBlockDefinition quartzPillar();
+    IBlockDefinition quartzPillar();
 
-	IBlockDefinition quartzChiseled();
+    IBlockDefinition quartzChiseled();
 
-	IBlockDefinition quartzGlass();
+    IBlockDefinition quartzGlass();
 
-	IBlockDefinition quartzVibrantGlass();
+    IBlockDefinition quartzVibrantGlass();
 
-	IBlockDefinition quartzTorch();
+    IBlockDefinition quartzTorch();
 
-	IBlockDefinition fluix();
+    IBlockDefinition fluix();
 
-	IBlockDefinition skyStone();
+    IBlockDefinition skyStone();
 
-	IBlockDefinition skyChest();
+    IBlockDefinition skyChest();
 
-	IBlockDefinition skyCompass();
+    IBlockDefinition skyCompass();
 
-	IBlockDefinition skyStoneStair();
+    IBlockDefinition skyStoneStair();
 
-	IBlockDefinition skyStoneBlockStair();
+    IBlockDefinition skyStoneBlockStair();
 
-	IBlockDefinition skyStoneBrickStair();
+    IBlockDefinition skyStoneBrickStair();
 
-	IBlockDefinition skyStoneSmallBrickStair();
+    IBlockDefinition skyStoneSmallBrickStair();
 
-	IBlockDefinition fluixStair();
+    IBlockDefinition fluixStair();
 
-	IBlockDefinition quartzStair();
+    IBlockDefinition quartzStair();
 
-	IBlockDefinition chiseledQuartzStair();
+    IBlockDefinition chiseledQuartzStair();
 
-	IBlockDefinition quartzPillarStair();
+    IBlockDefinition quartzPillarStair();
 
-	IBlockDefinition skyStoneSlab();
+    IBlockDefinition skyStoneSlab();
 
-	IBlockDefinition skyStoneBlockSlab();
+    IBlockDefinition skyStoneBlockSlab();
 
-	IBlockDefinition skyStoneBrickSlab();
+    IBlockDefinition skyStoneBrickSlab();
 
-	IBlockDefinition skyStoneSmallBrickSlab();
+    IBlockDefinition skyStoneSmallBrickSlab();
 
-	IBlockDefinition fluixSlab();
+    IBlockDefinition fluixSlab();
 
-	IBlockDefinition quartzSlab();
+    IBlockDefinition quartzSlab();
 
-	IBlockDefinition chiseledQuartzSlab();
+    IBlockDefinition chiseledQuartzSlab();
 
-	IBlockDefinition quartzPillarSlab();
+    IBlockDefinition quartzPillarSlab();
 
-	/*
-	 * misc
-	 */
-	ITileDefinition grindStone();
+    /*
+     * misc
+     */
+    ITileDefinition grindStone();
 
-	ITileDefinition crankHandle();
+    ITileDefinition crankHandle();
 
-	ITileDefinition inscriber();
+    ITileDefinition inscriber();
 
-	ITileDefinition wireless();
+    ITileDefinition wireless();
 
-	ITileDefinition charger();
+    ITileDefinition charger();
 
-	IBlockDefinition tinyTNT();
+    IBlockDefinition tinyTNT();
 
-	ITileDefinition security();
+    ITileDefinition security();
 
-	/*
-	 * quantum Network Bridge
-	 */
-	ITileDefinition quantumRing();
+    /*
+     * quantum Network Bridge
+     */
+    ITileDefinition quantumRing();
 
-	ITileDefinition quantumLink();
+    ITileDefinition quantumLink();
 
-	/*
-	 * spatial iO
-	 */
-	ITileDefinition spatialPylon();
+    /*
+     * spatial iO
+     */
+    ITileDefinition spatialPylon();
 
-	ITileDefinition spatialIOPort();
+    ITileDefinition spatialIOPort();
 
-	/*
-	 * Bus / cables
-	 */
-	ITileDefinition multiPart();
+    /*
+     * Bus / cables
+     */
+    ITileDefinition multiPart();
 
-	/*
-	 * machines
-	 */
-	ITileDefinition controller();
+    /*
+     * machines
+     */
+    ITileDefinition controller();
 
-	ITileDefinition drive();
+    ITileDefinition drive();
 
-	ITileDefinition chest();
+    ITileDefinition chest();
 
-	ITileDefinition iface();
+    ITileDefinition iface();
 
-	ITileDefinition cellWorkbench();
+    ITileDefinition cellWorkbench();
 
-	ITileDefinition iOPort();
+    ITileDefinition iOPort();
 
-	ITileDefinition condenser();
+    ITileDefinition condenser();
 
-	ITileDefinition energyAcceptor();
+    ITileDefinition energyAcceptor();
 
-	ITileDefinition vibrationChamber();
+    ITileDefinition vibrationChamber();
 
-	ITileDefinition quartzGrowthAccelerator();
+    ITileDefinition quartzGrowthAccelerator();
 
-	ITileDefinition energyCell();
+    ITileDefinition energyCell();
 
-	ITileDefinition energyCellDense();
+    ITileDefinition energyCellDense();
 
-	ITileDefinition energyCellCreative();
+    ITileDefinition energyCellCreative();
 
-	// rv1
-	ITileDefinition craftingUnit();
+    /*
+     * legacy
+     */
+    ITileDefinition legacyController();
 
-	ITileDefinition craftingAccelerator();
+    // rv1
+    ITileDefinition craftingUnit();
 
-	ITileDefinition craftingStorage1k();
+    ITileDefinition craftingAccelerator();
 
-	ITileDefinition craftingStorage4k();
+    ITileDefinition craftingStorage1k();
 
-	ITileDefinition craftingStorage16k();
+    ITileDefinition craftingStorage4k();
 
-	ITileDefinition craftingStorage64k();
+    ITileDefinition craftingStorage16k();
 
-	ITileDefinition craftingMonitor();
+    ITileDefinition craftingStorage64k();
 
-	ITileDefinition molecularAssembler();
+    ITileDefinition craftingMonitor();
 
-	ITileDefinition lightDetector();
+    ITileDefinition molecularAssembler();
 
-	ITileDefinition paint();
+    ITileDefinition lightDetector();
+
+    ITileDefinition paint();
 }

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

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

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

@@ -23,29 +23,27 @@
 
 package appeng.api.definitions;
 
-
 /**
  * All definitions in AE
  */
-public interface IDefinitions
-{
-	/**
-	 * @return an accessible list of all of AE's blocks
-	 */
-	IBlocks blocks();
+public interface IDefinitions {
+    /**
+     * @return an accessible list of all of AE's blocks
+     */
+    IBlocks blocks();
 
-	/**
-	 * @return an accessible list of all of AE's Items
-	 */
-	IItems items();
+    /**
+     * @return an accessible list of all of AE's Items
+     */
+    IItems items();
 
-	/**
-	 * @return an accessible list of all of AE's materials; materials are items
-	 */
-	IMaterials materials();
+    /**
+     * @return an accessible list of all of AE's materials; materials are items
+     */
+    IMaterials materials();
 
-	/**
-	 * @return an accessible list of all of AE's parts, parts are items
-	 */
-	IParts parts();
+    /**
+     * @return an accessible list of all of AE's parts, parts are items
+     */
+    IParts parts();
 }

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

@@ -23,26 +23,23 @@
 
 package appeng.api.definitions;
 
-
 import com.google.common.base.Optional;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
+public interface IItemDefinition extends IComparableDefinition {
+    /**
+     * @return the {@link Item} Implementation if applicable
+     */
+    Optional<Item> maybeItem();
 
-public interface IItemDefinition extends IComparableDefinition
-{
-	/**
-	 * @return the {@link Item} Implementation if applicable
-	 */
-	Optional<Item> maybeItem();
+    /**
+     * @return an {@link ItemStack} with specified quantity of this item.
+     */
+    Optional<ItemStack> maybeStack(int stackSize);
 
-	/**
-	 * @return an {@link ItemStack} with specified quantity of this item.
-	 */
-	Optional<ItemStack> maybeStack( int stackSize );
-
-	/**
-	 * @return <tt>true</tt> if definition is enabled
-	 */
-	boolean isEnabled();
+    /**
+     * @return <tt>true</tt> if definition is enabled
+     */
+    boolean isEnabled();
 }

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

@@ -23,87 +23,84 @@
 
 package appeng.api.definitions;
 
-
 import appeng.api.util.AEColoredItemDefinition;
 
-
 /**
  * A list of all items in AE
  */
-public interface IItems
-{
-	IItemDefinition certusQuartzAxe();
+public interface IItems {
+    IItemDefinition certusQuartzAxe();
 
-	IItemDefinition certusQuartzHoe();
+    IItemDefinition certusQuartzHoe();
 
-	IItemDefinition certusQuartzShovel();
+    IItemDefinition certusQuartzShovel();
 
-	IItemDefinition certusQuartzPick();
+    IItemDefinition certusQuartzPick();
 
-	IItemDefinition certusQuartzSword();
+    IItemDefinition certusQuartzSword();
 
-	IItemDefinition certusQuartzWrench();
+    IItemDefinition certusQuartzWrench();
 
-	IItemDefinition certusQuartzKnife();
+    IItemDefinition certusQuartzKnife();
 
-	IItemDefinition netherQuartzAxe();
+    IItemDefinition netherQuartzAxe();
 
-	IItemDefinition netherQuartzHoe();
+    IItemDefinition netherQuartzHoe();
 
-	IItemDefinition netherQuartzShovel();
+    IItemDefinition netherQuartzShovel();
 
-	IItemDefinition netherQuartzPick();
+    IItemDefinition netherQuartzPick();
 
-	IItemDefinition netherQuartzSword();
+    IItemDefinition netherQuartzSword();
 
-	IItemDefinition netherQuartzWrench();
+    IItemDefinition netherQuartzWrench();
 
-	IItemDefinition netherQuartzKnife();
+    IItemDefinition netherQuartzKnife();
 
-	IItemDefinition entropyManipulator();
+    IItemDefinition entropyManipulator();
 
-	IItemDefinition wirelessTerminal();
+    IItemDefinition wirelessTerminal();
 
-	IItemDefinition biometricCard();
+    IItemDefinition biometricCard();
 
-	IItemDefinition chargedStaff();
+    IItemDefinition chargedStaff();
 
-	IItemDefinition massCannon();
+    IItemDefinition massCannon();
 
-	IItemDefinition memoryCard();
+    IItemDefinition memoryCard();
 
-	IItemDefinition networkTool();
+    IItemDefinition networkTool();
 
-	IItemDefinition portableCell();
+    IItemDefinition portableCell();
 
-	IItemDefinition cellCreative();
+    IItemDefinition cellCreative();
 
-	IItemDefinition viewCell();
+    IItemDefinition viewCell();
 
-	IItemDefinition cell1k();
+    IItemDefinition cell1k();
 
-	IItemDefinition cell4k();
+    IItemDefinition cell4k();
 
-	IItemDefinition cell16k();
+    IItemDefinition cell16k();
 
-	IItemDefinition cell64k();
+    IItemDefinition cell64k();
 
-	IItemDefinition spatialCell2();
+    IItemDefinition spatialCell2();
 
-	IItemDefinition spatialCell16();
+    IItemDefinition spatialCell16();
 
-	IItemDefinition spatialCell128();
+    IItemDefinition spatialCell128();
 
-	IItemDefinition facade();
+    IItemDefinition facade();
 
-	IItemDefinition crystalSeed();
+    IItemDefinition crystalSeed();
 
-	// rv1
-	IItemDefinition encodedPattern();
+    // rv1
+    IItemDefinition encodedPattern();
 
-	IItemDefinition colorApplicator();
+    IItemDefinition colorApplicator();
 
-	AEColoredItemDefinition coloredPaintBall();
+    AEColoredItemDefinition coloredPaintBall();
 
-	AEColoredItemDefinition coloredLumenPaintBall();
+    AEColoredItemDefinition coloredLumenPaintBall();
 }

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

@@ -23,117 +23,117 @@
 
 package appeng.api.definitions;
 
-
 /**
  * A list of all materials in AE
  */
-public interface IMaterials
-{
-	IItemDefinition cell2SpatialPart();
+public interface IMaterials {
+    IItemDefinition cell2SpatialPart();
 
-	IItemDefinition cell16SpatialPart();
+    IItemDefinition cell16SpatialPart();
 
-	IItemDefinition cell128SpatialPart();
+    IItemDefinition cell128SpatialPart();
 
-	IItemDefinition silicon();
+    IItemDefinition silicon();
 
-	IItemDefinition skyDust();
+    IItemDefinition skyDust();
 
-	IItemDefinition calcProcessorPress();
+    IItemDefinition calcProcessorPress();
 
-	IItemDefinition engProcessorPress();
+    IItemDefinition engProcessorPress();
 
-	IItemDefinition logicProcessorPress();
+    IItemDefinition logicProcessorPress();
 
-	IItemDefinition calcProcessorPrint();
+    IItemDefinition calcProcessorPrint();
 
-	IItemDefinition engProcessorPrint();
+    IItemDefinition engProcessorPrint();
 
-	IItemDefinition logicProcessorPrint();
+    IItemDefinition logicProcessorPrint();
 
-	IItemDefinition siliconPress();
+    IItemDefinition siliconPress();
 
-	IItemDefinition siliconPrint();
+    IItemDefinition siliconPrint();
 
-	IItemDefinition namePress();
+    IItemDefinition namePress();
 
-	IItemDefinition logicProcessor();
+    IItemDefinition logicProcessor();
 
-	IItemDefinition calcProcessor();
+    IItemDefinition calcProcessor();
 
-	IItemDefinition engProcessor();
+    IItemDefinition engProcessor();
 
-	IItemDefinition basicCard();
+    IItemDefinition basicCard();
 
-	IItemDefinition advCard();
+    IItemDefinition advCard();
 
-	IItemDefinition purifiedCertusQuartzCrystal();
+    IItemDefinition purifiedCertusQuartzCrystal();
 
-	IItemDefinition purifiedNetherQuartzCrystal();
+    IItemDefinition purifiedNetherQuartzCrystal();
 
-	IItemDefinition purifiedFluixCrystal();
+    IItemDefinition purifiedFluixCrystal();
 
-	IItemDefinition cell1kPart();
+    IItemDefinition cell1kPart();
 
-	IItemDefinition cell4kPart();
+    IItemDefinition cell4kPart();
 
-	IItemDefinition cell16kPart();
+    IItemDefinition cell16kPart();
 
-	IItemDefinition cell64kPart();
+    IItemDefinition cell64kPart();
 
-	IItemDefinition emptyStorageCell();
+    IItemDefinition emptyStorageCell();
 
-	IItemDefinition cardRedstone();
+    IItemDefinition cardRedstone();
 
-	IItemDefinition cardSpeed();
+    IItemDefinition cardSpeed();
 
-	IItemDefinition cardCapacity();
+    IItemDefinition cardCapacity();
 
-	IItemDefinition cardFuzzy();
+    IItemDefinition cardFuzzy();
 
-	IItemDefinition cardInverter();
+    IItemDefinition cardInverter();
 
-	IItemDefinition cardCrafting();
+    IItemDefinition cardCrafting();
 
-	IItemDefinition enderDust();
+    IItemDefinition enderDust();
 
-	IItemDefinition flour();
+    IItemDefinition flour();
 
-	IItemDefinition goldDust();
+    IItemDefinition goldDust();
 
-	IItemDefinition ironDust();
+    IItemDefinition ironDust();
 
-	IItemDefinition fluixDust();
+    IItemDefinition fluixDust();
 
-	IItemDefinition certusQuartzDust();
+    IItemDefinition certusQuartzDust();
 
-	IItemDefinition netherQuartzDust();
+    IItemDefinition netherQuartzDust();
 
-	IItemDefinition matterBall();
+    IItemDefinition matterBall();
 
-	IItemDefinition ironNugget();
+    IItemDefinition ironNugget();
 
-	IItemDefinition certusQuartzCrystal();
+    IItemDefinition certusQuartzCrystal();
 
-	IItemDefinition certusQuartzCrystalCharged();
+    IItemDefinition certusQuartzCrystalCharged();
 
-	IItemDefinition fluixCrystal();
+    IItemDefinition fluixCrystal();
 
-	IItemDefinition fluixPearl();
+    IItemDefinition fluixPearl();
 
-	IItemDefinition woodenGear();
+    IItemDefinition woodenGear();
 
-	IItemDefinition wireless();
+    IItemDefinition wireless();
 
-	IItemDefinition wirelessBooster();
+    IItemDefinition wirelessBooster();
 
-	IItemDefinition annihilationCore();
+    IItemDefinition annihilationCore();
 
-	IItemDefinition formationCore();
+    IItemDefinition formationCore();
 
-	IItemDefinition singularity();
+    IItemDefinition singularity();
 
-	IItemDefinition qESingularity();
+    IItemDefinition qESingularity();
 
-	IItemDefinition blankPattern();
+    IItemDefinition blankPattern();
+
+    IItemDefinition conversionMatrix();
 }

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

@@ -23,88 +23,85 @@
 
 package appeng.api.definitions;
 
-
 import appeng.api.util.AEColoredItemDefinition;
 
-
 /**
  * A list of all parts in AE
  */
-public interface IParts
-{
-	AEColoredItemDefinition cableSmart();
+public interface IParts {
+    AEColoredItemDefinition cableSmart();
 
-	AEColoredItemDefinition cableCovered();
+    AEColoredItemDefinition cableCovered();
 
-	AEColoredItemDefinition cableGlass();
+    AEColoredItemDefinition cableGlass();
 
-	AEColoredItemDefinition cableDense();
+    AEColoredItemDefinition cableDense();
 
-	AEColoredItemDefinition lumenCableSmart();
+    AEColoredItemDefinition lumenCableSmart();
 
-	AEColoredItemDefinition lumenCableCovered();
+    AEColoredItemDefinition lumenCableCovered();
 
-	AEColoredItemDefinition lumenCableGlass();
+    AEColoredItemDefinition lumenCableGlass();
 
-	AEColoredItemDefinition lumenCableDense();
+    AEColoredItemDefinition lumenCableDense();
 
-	IItemDefinition quartzFiber();
+    IItemDefinition quartzFiber();
 
-	IItemDefinition toggleBus();
+    IItemDefinition toggleBus();
 
-	IItemDefinition invertedToggleBus();
+    IItemDefinition invertedToggleBus();
 
-	IItemDefinition storageBus();
+    IItemDefinition storageBus();
 
-	IItemDefinition importBus();
+    IItemDefinition importBus();
 
-	IItemDefinition exportBus();
+    IItemDefinition exportBus();
 
-	IItemDefinition iface();
+    IItemDefinition iface();
 
-	IItemDefinition levelEmitter();
+    IItemDefinition levelEmitter();
 
-	IItemDefinition annihilationPlane();
+    IItemDefinition annihilationPlane();
 
-	IItemDefinition identityAnnihilationPlane();
+    IItemDefinition identityAnnihilationPlane();
 
-	IItemDefinition formationPlane();
+    IItemDefinition formationPlane();
 
-	IItemDefinition p2PTunnelME();
+    IItemDefinition p2PTunnelME();
 
-	IItemDefinition p2PTunnelRedstone();
+    IItemDefinition p2PTunnelRedstone();
 
-	IItemDefinition p2PTunnelItems();
+    IItemDefinition p2PTunnelItems();
 
-	IItemDefinition p2PTunnelLiquids();
+    IItemDefinition p2PTunnelLiquids();
 
-	IItemDefinition p2PTunnelEU();
+    IItemDefinition p2PTunnelEU();
 
-	IItemDefinition p2PTunnelRF();
+    IItemDefinition p2PTunnelRF();
 
-	IItemDefinition p2PTunnelLight();
+    IItemDefinition p2PTunnelLight();
 
-	IItemDefinition p2PTunnelOpenComputers();
+    IItemDefinition p2PTunnelOpenComputers();
 
-	IItemDefinition p2PTunnelPneumaticCraft();
+    IItemDefinition p2PTunnelPneumaticCraft();
 
-	IItemDefinition cableAnchor();
+    IItemDefinition cableAnchor();
 
-	IItemDefinition monitor();
+    IItemDefinition monitor();
 
-	IItemDefinition semiDarkMonitor();
+    IItemDefinition semiDarkMonitor();
 
-	IItemDefinition darkMonitor();
+    IItemDefinition darkMonitor();
 
-	IItemDefinition interfaceTerminal();
+    IItemDefinition interfaceTerminal();
 
-	IItemDefinition patternTerminal();
+    IItemDefinition patternTerminal();
 
-	IItemDefinition craftingTerminal();
+    IItemDefinition craftingTerminal();
 
-	IItemDefinition terminal();
+    IItemDefinition terminal();
 
-	IItemDefinition storageMonitor();
+    IItemDefinition storageMonitor();
 
-	IItemDefinition conversionMonitor();
+    IItemDefinition conversionMonitor();
 }

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

@@ -1,14 +1,11 @@
 package appeng.api.definitions;
 
-
 import com.google.common.base.Optional;
 import net.minecraft.tileentity.TileEntity;
 
-
-public interface ITileDefinition extends IBlockDefinition
-{
-	/**
-	 * @return the {@link TileEntity} Class if applicable.
-	 */
-	Optional<? extends Class<? extends TileEntity>> maybeEntity();
+public interface ITileDefinition extends IBlockDefinition {
+    /**
+     * @return the {@link TileEntity} Class if applicable.
+     */
+    Optional<? extends Class<? extends TileEntity>> maybeEntity();
 }

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

@@ -23,88 +23,85 @@
 
 package appeng.api.definitions;
 
-
 import appeng.api.util.AEColoredItemDefinition;
 import appeng.api.util.AEItemDefinition;
 
-
 /**
  * @deprecated use {@link IItems}
  */
 @Deprecated
-public class Items
-{
-	public AEItemDefinition itemCertusQuartzAxe;
+public class Items {
+    public AEItemDefinition itemCertusQuartzAxe;
 
-	public AEItemDefinition itemCertusQuartzHoe;
+    public AEItemDefinition itemCertusQuartzHoe;
 
-	public AEItemDefinition itemCertusQuartzShovel;
+    public AEItemDefinition itemCertusQuartzShovel;
 
-	public AEItemDefinition itemCertusQuartzPick;
+    public AEItemDefinition itemCertusQuartzPick;
 
-	public AEItemDefinition itemCertusQuartzSword;
+    public AEItemDefinition itemCertusQuartzSword;
 
-	public AEItemDefinition itemCertusQuartzWrench;
+    public AEItemDefinition itemCertusQuartzWrench;
 
-	public AEItemDefinition itemCertusQuartzKnife;
+    public AEItemDefinition itemCertusQuartzKnife;
 
-	public AEItemDefinition itemNetherQuartzAxe;
+    public AEItemDefinition itemNetherQuartzAxe;
 
-	public AEItemDefinition itemNetherQuartzHoe;
+    public AEItemDefinition itemNetherQuartzHoe;
 
-	public AEItemDefinition itemNetherQuartzShovel;
+    public AEItemDefinition itemNetherQuartzShovel;
 
-	public AEItemDefinition itemNetherQuartzPick;
+    public AEItemDefinition itemNetherQuartzPick;
 
-	public AEItemDefinition itemNetherQuartzSword;
+    public AEItemDefinition itemNetherQuartzSword;
 
-	public AEItemDefinition itemNetherQuartzWrench;
+    public AEItemDefinition itemNetherQuartzWrench;
 
-	public AEItemDefinition itemNetherQuartzKnife;
+    public AEItemDefinition itemNetherQuartzKnife;
 
-	public AEItemDefinition itemEntropyManipulator;
+    public AEItemDefinition itemEntropyManipulator;
 
-	public AEItemDefinition itemWirelessTerminal;
+    public AEItemDefinition itemWirelessTerminal;
 
-	public AEItemDefinition itemBiometricCard;
+    public AEItemDefinition itemBiometricCard;
 
-	public AEItemDefinition itemChargedStaff;
+    public AEItemDefinition itemChargedStaff;
 
-	public AEItemDefinition itemMassCannon;
+    public AEItemDefinition itemMassCannon;
 
-	public AEItemDefinition itemMemoryCard;
+    public AEItemDefinition itemMemoryCard;
 
-	public AEItemDefinition itemNetworkTool;
+    public AEItemDefinition itemNetworkTool;
 
-	public AEItemDefinition itemPortableCell;
+    public AEItemDefinition itemPortableCell;
 
-	public AEItemDefinition itemCellCreative;
+    public AEItemDefinition itemCellCreative;
 
-	public AEItemDefinition itemViewCell;
+    public AEItemDefinition itemViewCell;
 
-	public AEItemDefinition itemCell1k;
+    public AEItemDefinition itemCell1k;
 
-	public AEItemDefinition itemCell4k;
+    public AEItemDefinition itemCell4k;
 
-	public AEItemDefinition itemCell16k;
+    public AEItemDefinition itemCell16k;
 
-	public AEItemDefinition itemCell64k;
+    public AEItemDefinition itemCell64k;
 
-	public AEItemDefinition itemSpatialCell2;
+    public AEItemDefinition itemSpatialCell2;
 
-	public AEItemDefinition itemSpatialCell16;
+    public AEItemDefinition itemSpatialCell16;
 
-	public AEItemDefinition itemSpatialCell128;
+    public AEItemDefinition itemSpatialCell128;
 
-	public AEItemDefinition itemFacade;
+    public AEItemDefinition itemFacade;
 
-	public AEItemDefinition itemCrystalSeed;
+    public AEItemDefinition itemCrystalSeed;
 
-	public AEItemDefinition itemEncodedPattern;
+    public AEItemDefinition itemEncodedPattern;
 
-	public AEItemDefinition itemColorApplicator;
+    public AEItemDefinition itemColorApplicator;
 
-	public AEColoredItemDefinition itemPaintBall;
+    public AEColoredItemDefinition itemPaintBall;
 
-	public AEColoredItemDefinition itemLumenPaintBall;
+    public AEColoredItemDefinition itemLumenPaintBall;
 }

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

@@ -23,121 +23,118 @@
 
 package appeng.api.definitions;
 
-
 import appeng.api.util.AEItemDefinition;
 
-
 /**
  * @deprecated use {@link IMaterials}
  */
 @Deprecated
-public class Materials
-{
-	public AEItemDefinition materialCell2SpatialPart;
+public class Materials {
+    public AEItemDefinition materialCell2SpatialPart;
 
-	public AEItemDefinition materialCell16SpatialPart;
+    public AEItemDefinition materialCell16SpatialPart;
 
-	public AEItemDefinition materialCell128SpatialPart;
+    public AEItemDefinition materialCell128SpatialPart;
 
-	public AEItemDefinition materialSilicon;
+    public AEItemDefinition materialSilicon;
 
-	public AEItemDefinition materialSkyDust;
+    public AEItemDefinition materialSkyDust;
 
-	public AEItemDefinition materialCalcProcessorPress;
+    public AEItemDefinition materialCalcProcessorPress;
 
-	public AEItemDefinition materialEngProcessorPress;
+    public AEItemDefinition materialEngProcessorPress;
 
-	public AEItemDefinition materialLogicProcessorPress;
+    public AEItemDefinition materialLogicProcessorPress;
 
-	public AEItemDefinition materialCalcProcessorPrint;
+    public AEItemDefinition materialCalcProcessorPrint;
 
-	public AEItemDefinition materialEngProcessorPrint;
+    public AEItemDefinition materialEngProcessorPrint;
 
-	public AEItemDefinition materialLogicProcessorPrint;
+    public AEItemDefinition materialLogicProcessorPrint;
 
-	public AEItemDefinition materialSiliconPress;
+    public AEItemDefinition materialSiliconPress;
 
-	public AEItemDefinition materialSiliconPrint;
+    public AEItemDefinition materialSiliconPrint;
 
-	public AEItemDefinition materialNamePress;
+    public AEItemDefinition materialNamePress;
 
-	public AEItemDefinition materialLogicProcessor;
+    public AEItemDefinition materialLogicProcessor;
 
-	public AEItemDefinition materialCalcProcessor;
+    public AEItemDefinition materialCalcProcessor;
 
-	public AEItemDefinition materialEngProcessor;
+    public AEItemDefinition materialEngProcessor;
 
-	public AEItemDefinition materialBasicCard;
+    public AEItemDefinition materialBasicCard;
 
-	public AEItemDefinition materialAdvCard;
+    public AEItemDefinition materialAdvCard;
 
-	public AEItemDefinition materialPurifiedCertusQuartzCrystal;
+    public AEItemDefinition materialPurifiedCertusQuartzCrystal;
 
-	public AEItemDefinition materialPurifiedNetherQuartzCrystal;
+    public AEItemDefinition materialPurifiedNetherQuartzCrystal;
 
-	public AEItemDefinition materialPurifiedFluixCrystal;
+    public AEItemDefinition materialPurifiedFluixCrystal;
 
-	public AEItemDefinition materialCell1kPart;
+    public AEItemDefinition materialCell1kPart;
 
-	public AEItemDefinition materialCell4kPart;
+    public AEItemDefinition materialCell4kPart;
 
-	public AEItemDefinition materialCell16kPart;
+    public AEItemDefinition materialCell16kPart;
 
-	public AEItemDefinition materialCell64kPart;
+    public AEItemDefinition materialCell64kPart;
 
-	public AEItemDefinition materialEmptyStorageCell;
+    public AEItemDefinition materialEmptyStorageCell;
 
-	public AEItemDefinition materialCardRedstone;
+    public AEItemDefinition materialCardRedstone;
 
-	public AEItemDefinition materialCardSpeed;
+    public AEItemDefinition materialCardSpeed;
 
-	public AEItemDefinition materialCardCapacity;
+    public AEItemDefinition materialCardCapacity;
 
-	public AEItemDefinition materialCardFuzzy;
+    public AEItemDefinition materialCardFuzzy;
 
-	public AEItemDefinition materialCardInverter;
+    public AEItemDefinition materialCardInverter;
 
-	public AEItemDefinition materialCardCrafting;
+    public AEItemDefinition materialCardCrafting;
 
-	public AEItemDefinition materialEnderDust;
+    public AEItemDefinition materialEnderDust;
 
-	public AEItemDefinition materialFlour;
+    public AEItemDefinition materialFlour;
 
-	public AEItemDefinition materialGoldDust;
+    public AEItemDefinition materialGoldDust;
 
-	public AEItemDefinition materialIronDust;
+    public AEItemDefinition materialIronDust;
 
-	public AEItemDefinition materialFluixDust;
+    public AEItemDefinition materialFluixDust;
 
-	public AEItemDefinition materialCertusQuartzDust;
+    public AEItemDefinition materialCertusQuartzDust;
 
-	public AEItemDefinition materialNetherQuartzDust;
+    public AEItemDefinition materialNetherQuartzDust;
 
-	public AEItemDefinition materialMatterBall;
+    public AEItemDefinition materialMatterBall;
 
-	public AEItemDefinition materialIronNugget;
+    public AEItemDefinition materialIronNugget;
 
-	public AEItemDefinition materialCertusQuartzCrystal;
+    public AEItemDefinition materialCertusQuartzCrystal;
 
-	public AEItemDefinition materialCertusQuartzCrystalCharged;
+    public AEItemDefinition materialCertusQuartzCrystalCharged;
 
-	public AEItemDefinition materialFluixCrystal;
+    public AEItemDefinition materialFluixCrystal;
 
-	public AEItemDefinition materialFluixPearl;
+    public AEItemDefinition materialFluixPearl;
 
-	public AEItemDefinition materialWoodenGear;
+    public AEItemDefinition materialWoodenGear;
 
-	public AEItemDefinition materialWireless;
+    public AEItemDefinition materialWireless;
 
-	public AEItemDefinition materialWirelessBooster;
+    public AEItemDefinition materialWirelessBooster;
 
-	public AEItemDefinition materialAnnihilationCore;
+    public AEItemDefinition materialAnnihilationCore;
 
-	public AEItemDefinition materialFormationCore;
+    public AEItemDefinition materialFormationCore;
 
-	public AEItemDefinition materialSingularity;
+    public AEItemDefinition materialSingularity;
 
-	public AEItemDefinition materialQESingularity;
+    public AEItemDefinition materialQESingularity;
 
-	public AEItemDefinition materialBlankPattern;
+    public AEItemDefinition materialBlankPattern;
 }

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

@@ -23,84 +23,81 @@
 
 package appeng.api.definitions;
 
-
 import appeng.api.util.AEColoredItemDefinition;
 import appeng.api.util.AEItemDefinition;
 
-
 /**
  * @deprecated use {@link IParts}
  */
 @Deprecated
-public class Parts
-{
-	public AEColoredItemDefinition partCableSmart;
+public class Parts {
+    public AEColoredItemDefinition partCableSmart;
 
-	public AEColoredItemDefinition partCableCovered;
+    public AEColoredItemDefinition partCableCovered;
 
-	public AEColoredItemDefinition partCableGlass;
+    public AEColoredItemDefinition partCableGlass;
 
-	public AEColoredItemDefinition partCableDense;
+    public AEColoredItemDefinition partCableDense;
 
-	public AEColoredItemDefinition partLumenCableSmart;
+    public AEColoredItemDefinition partLumenCableSmart;
 
-	public AEColoredItemDefinition partLumenCableCovered;
+    public AEColoredItemDefinition partLumenCableCovered;
 
-	public AEColoredItemDefinition partLumenCableGlass;
+    public AEColoredItemDefinition partLumenCableGlass;
 
-	public AEColoredItemDefinition partLumenCableDense;
+    public AEColoredItemDefinition partLumenCableDense;
 
-	public AEItemDefinition partQuartzFiber;
+    public AEItemDefinition partQuartzFiber;
 
-	public AEItemDefinition partToggleBus;
+    public AEItemDefinition partToggleBus;
 
-	public AEItemDefinition partInvertedToggleBus;
+    public AEItemDefinition partInvertedToggleBus;
 
-	public AEItemDefinition partStorageBus;
+    public AEItemDefinition partStorageBus;
 
-	public AEItemDefinition partImportBus;
+    public AEItemDefinition partImportBus;
 
-	public AEItemDefinition partExportBus;
+    public AEItemDefinition partExportBus;
 
-	public AEItemDefinition partInterface;
+    public AEItemDefinition partInterface;
 
-	public AEItemDefinition partLevelEmitter;
+    public AEItemDefinition partLevelEmitter;
 
-	public AEItemDefinition partAnnihilationPlane;
+    public AEItemDefinition partAnnihilationPlane;
 
-	public AEItemDefinition partFormationPlane;
+    public AEItemDefinition partFormationPlane;
 
-	public AEItemDefinition partP2PTunnelME;
+    public AEItemDefinition partP2PTunnelME;
 
-	public AEItemDefinition partP2PTunnelRedstone;
+    public AEItemDefinition partP2PTunnelRedstone;
 
-	public AEItemDefinition partP2PTunnelItems;
+    public AEItemDefinition partP2PTunnelItems;
 
-	public AEItemDefinition partP2PTunnelLiquids;
+    public AEItemDefinition partP2PTunnelLiquids;
 
-	public AEItemDefinition partP2PTunnelEU;
+    public AEItemDefinition partP2PTunnelEU;
 
-	public AEItemDefinition partP2PTunnelRF;
+    public AEItemDefinition partP2PTunnelRF;
 
-	public AEItemDefinition partP2PTunnelLight;
+    public AEItemDefinition partP2PTunnelLight;
 
-	public AEItemDefinition partCableAnchor;
+    public AEItemDefinition partCableAnchor;
 
-	public AEItemDefinition partMonitor;
+    public AEItemDefinition partMonitor;
 
-	public AEItemDefinition partSemiDarkMonitor;
+    public AEItemDefinition partSemiDarkMonitor;
 
-	public AEItemDefinition partDarkMonitor;
+    public AEItemDefinition partDarkMonitor;
 
-	public AEItemDefinition partInterfaceTerminal;
+    public AEItemDefinition partInterfaceTerminal;
 
-	public AEItemDefinition partPatternTerminal;
+    public AEItemDefinition partPatternTerminal;
 
-	public AEItemDefinition partCraftingTerminal;
+    public AEItemDefinition partCraftingTerminal;
 
-	public AEItemDefinition partTerminal;
+    public AEItemDefinition partTerminal;
 
-	public AEItemDefinition partStorageMonitor;
+    public AEItemDefinition partStorageMonitor;
 
-	public AEItemDefinition partConversionMonitor;
+    public AEItemDefinition partConversionMonitor;
 }

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

@@ -23,31 +23,25 @@
 
 package appeng.api.events;
 
-
 import appeng.api.features.ILocatable;
 import cpw.mods.fml.common.eventhandler.Event;
 
-
 /**
  * Input Event:
  * <p>
  * Used to Notify the Location Registry of objects, and their availability.
  */
-public class LocatableEventAnnounce extends Event
-{
+public class LocatableEventAnnounce extends Event {
+    public final ILocatable target;
+    public final LocatableEvent change;
 
-	public final ILocatable target;
-	public final LocatableEvent change;
+    public LocatableEventAnnounce(final ILocatable o, final LocatableEvent ev) {
+        this.target = o;
+        this.change = ev;
+    }
 
-	public LocatableEventAnnounce( final ILocatable o, final LocatableEvent ev )
-	{
-		this.target = o;
-		this.change = ev;
-	}
-
-	public enum LocatableEvent
-	{
-		Register, // Adds the locatable to the registry
-		Unregister // Removes the locatable from the registry
-	}
+    public enum LocatableEvent {
+        Register, // Adds the locatable to the registry
+        Unregister // Removes the locatable from the registry
+    }
 }

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

@@ -23,14 +23,10 @@
 
 package appeng.api.exceptions;
 
+public class AppEngException extends Exception {
+    private static final long serialVersionUID = -9051434206368465494L;
 
-public class AppEngException extends Exception
-{
-
-	private static final long serialVersionUID = -9051434206368465494L;
-
-	public AppEngException( final String t )
-	{
-		super( t );
-	}
+    public AppEngException(final String t) {
+        super(t);
+    }
 }

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

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

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

@@ -23,34 +23,27 @@
 
 package appeng.api.exceptions;
 
-
 import appeng.api.networking.IGridNode;
 
-
 /**
- * Exception occurred because of an already existing connection between the two {@link IGridNode}s
- * <p>
- * Intended to signal an internal exception and not intended to be thrown by
- * any 3rd party module.
+ * Exception occurred because of an already existing connection between the two {@link
+ * IGridNode}s <p> Intended to signal an internal exception and not intended to be thrown
+ * by any 3rd party module.
  *
  * @author yueh
  * @version rv3
  * @since rv3
  */
-public class ExistingConnectionException extends FailedConnection
-{
+public class ExistingConnectionException extends FailedConnection {
+    private static final long serialVersionUID = 2975450379720353182L;
+    private static final String DEFAULT_MESSAGE
+        = "Connection between both nodes already exists.";
 
-	private static final long serialVersionUID = 2975450379720353182L;
-	private static final String DEFAULT_MESSAGE = "Connection between both nodes already exists.";
-
-	public ExistingConnectionException()
-	{
-		super( DEFAULT_MESSAGE );
-	}
-
-	public ExistingConnectionException( String message )
-	{
-		super( message );
-	}
+    public ExistingConnectionException() {
+        super(DEFAULT_MESSAGE);
+    }
 
+    public ExistingConnectionException(String message) {
+        super(message);
+    }
 }

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

@@ -23,10 +23,8 @@
 
 package appeng.api.exceptions;
 
-
 import appeng.api.networking.IGridNode;
 
-
 /**
  * Exception indicating a failed connection between two {@link IGridNode}s.
  * <p>
@@ -40,17 +38,12 @@ import appeng.api.networking.IGridNode;
  * @version rv3
  * @since rv0
  */
-public class FailedConnection extends Exception
-{
+public class FailedConnection extends Exception {
+    private static final long serialVersionUID = -2544208090248293753L;
 
-	private static final long serialVersionUID = -2544208090248293753L;
+    public FailedConnection() {}
 
-	public FailedConnection()
-	{
-	}
-
-	public FailedConnection( String message )
-	{
-		super( message );
-	}
+    public FailedConnection(String message) {
+        super(message);
+    }
 }

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

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

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

@@ -23,14 +23,10 @@
 
 package appeng.api.exceptions;
 
+public class MissingIngredientError extends Exception {
+    private static final long serialVersionUID = -998858343831371697L;
 
-public class MissingIngredientError extends Exception
-{
-
-	private static final long serialVersionUID = -998858343831371697L;
-
-	public MissingIngredientError( final String n )
-	{
-		super( n );
-	}
+    public MissingIngredientError(final String n) {
+        super(n);
+    }
 }

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

@@ -23,14 +23,10 @@
 
 package appeng.api.exceptions;
 
+public class ModNotInstalled extends Exception {
+    private static final long serialVersionUID = -9052435206368425494L;
 
-public class ModNotInstalled extends Exception
-{
-
-	private static final long serialVersionUID = -9052435206368425494L;
-
-	public ModNotInstalled( final String t )
-	{
-		super( t );
-	}
+    public ModNotInstalled(final String t) {
+        super(t);
+    }
 }

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

@@ -23,7 +23,6 @@
 
 package appeng.api.exceptions;
 
-
 /**
  * Exception due to trying to connect one or more null values.
  * <p>
@@ -34,20 +33,16 @@ package appeng.api.exceptions;
  * @version rv3
  * @since rv3
  */
-public class NullNodeConnectionException extends FailedConnection
-{
+public class NullNodeConnectionException extends FailedConnection {
+    private static final long serialVersionUID = -2143719383495321764L;
+    private static final String DEFAULT_MESSAGE
+        = "Connection forged between null entities.";
 
-	private static final long serialVersionUID = -2143719383495321764L;
-	private static final String DEFAULT_MESSAGE = "Connection forged between null entities.";
-
-	public NullNodeConnectionException()
-	{
-		super( DEFAULT_MESSAGE );
-	}
-
-	public NullNodeConnectionException( String message )
-	{
-		super( message );
-	}
+    public NullNodeConnectionException() {
+        super(DEFAULT_MESSAGE);
+    }
 
+    public NullNodeConnectionException(String message) {
+        super(message);
+    }
 }

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

@@ -23,14 +23,10 @@
 
 package appeng.api.exceptions;
 
+public class RecipeError extends Exception {
+    private static final long serialVersionUID = -6602870588617670262L;
 
-public class RecipeError extends Exception
-{
-
-	private static final long serialVersionUID = -6602870588617670262L;
-
-	public RecipeError( final String n )
-	{
-		super( n );
-	}
+    public RecipeError(final String n) {
+        super(n);
+    }
 }

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

@@ -23,14 +23,10 @@
 
 package appeng.api.exceptions;
 
+public class RegistrationError extends Exception {
+    private static final long serialVersionUID = -6602870588617670263L;
 
-public class RegistrationError extends Exception
-{
-
-	private static final long serialVersionUID = -6602870588617670263L;
-
-	public RegistrationError( final String n )
-	{
-		super( n );
-	}
+    public RegistrationError(final String n) {
+        super(n);
+    }
 }

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

@@ -23,7 +23,6 @@
 
 package appeng.api.exceptions;
 
-
 /**
  * Exception due to trying to connect different security realms.
  * <p>
@@ -34,19 +33,16 @@ package appeng.api.exceptions;
  * @version rv3
  * @since rv3
  */
-public class SecurityConnectionException extends FailedConnection
-{
-	private static final long serialVersionUID = 5048714900434215426L;
-	private static final String DEFAULT_MESSAGE = "Connection failed due to different security realms.";
+public class SecurityConnectionException extends FailedConnection {
+    private static final long serialVersionUID = 5048714900434215426L;
+    private static final String DEFAULT_MESSAGE
+        = "Connection failed due to different security realms.";
 
-	public SecurityConnectionException()
-	{
-		super( DEFAULT_MESSAGE );
-	}
-
-	public SecurityConnectionException( String message )
-	{
-		super( message );
-	}
+    public SecurityConnectionException() {
+        super(DEFAULT_MESSAGE);
+    }
 
+    public SecurityConnectionException(String message) {
+        super(message);
+    }
 }

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

@@ -23,99 +23,95 @@
 
 package appeng.api.features;
 
-
 import net.minecraft.item.ItemStack;
 
-
 /**
  * Registration Records for {@link IGrinderRegistry}
  */
-public interface IGrinderEntry
-{
+public interface IGrinderEntry {
+    /**
+     * the current input
+     *
+     * @return input that the grinder will accept.
+     */
+    ItemStack getInput();
 
-	/**
-	 * the current input
-	 *
-	 * @return input that the grinder will accept.
-	 */
-	ItemStack getInput();
+    /**
+     * lets you change the grinder recipe by changing its input.
+     *
+     * @param input input item
+     */
+    void setInput(ItemStack input);
 
-	/**
-	 * lets you change the grinder recipe by changing its input.
-	 *
-	 * @param input input item
-	 */
-	void setInput( ItemStack input );
+    /**
+     * gets the current output
+     *
+     * @return output that the grinder will produce
+     */
+    ItemStack getOutput();
 
-	/**
-	 * gets the current output
-	 *
-	 * @return output that the grinder will produce
-	 */
-	ItemStack getOutput();
+    /**
+     * allows you to change the output.
+     *
+     * @param output output item
+     */
+    void setOutput(ItemStack output);
 
-	/**
-	 * allows you to change the output.
-	 *
-	 * @param output output item
-	 */
-	void setOutput( ItemStack output );
+    /**
+     * gets the current output
+     *
+     * @return output that the grinder will produce
+     */
+    ItemStack getOptionalOutput();
 
-	/**
-	 * gets the current output
-	 *
-	 * @return output that the grinder will produce
-	 */
-	ItemStack getOptionalOutput();
+    /**
+     * gets the current output
+     *
+     * @return output that the grinder will produce
+     */
+    ItemStack getSecondOptionalOutput();
 
-	/**
-	 * gets the current output
-	 *
-	 * @return output that the grinder will produce
-	 */
-	ItemStack getSecondOptionalOutput();
+    /**
+     * stack, and 0.0-1.0 chance that it will be generated.
+     *
+     * @param output output item
+     * @param chance generation chance
+     */
+    void setOptionalOutput(ItemStack output, float chance);
 
-	/**
-	 * stack, and 0.0-1.0 chance that it will be generated.
-	 *
-	 * @param output output item
-	 * @param chance generation chance
-	 */
-	void setOptionalOutput( ItemStack output, float chance );
+    /**
+     * 0.0 - 1.0 the chance that the optional output will be generated.
+     *
+     * @return chance of optional output
+     */
+    float getOptionalChance();
 
-	/**
-	 * 0.0 - 1.0 the chance that the optional output will be generated.
-	 *
-	 * @return chance of optional output
-	 */
-	float getOptionalChance();
+    /**
+     * stack, and 0.0-1.0 chance that it will be generated.
+     *
+     * @param output second optional output item
+     * @param chance second optional output chance
+     */
+    void setSecondOptionalOutput(ItemStack output, float chance);
 
-	/**
-	 * stack, and 0.0-1.0 chance that it will be generated.
-	 *
-	 * @param output second optional output item
-	 * @param chance second optional output chance
-	 */
-	void setSecondOptionalOutput( ItemStack output, float chance );
+    /**
+     * 0.0 - 1.0 the chance that the optional output will be generated.
+     *
+     * @return second optional output chance
+     */
+    float getSecondOptionalChance();
 
-	/**
-	 * 0.0 - 1.0 the chance that the optional output will be generated.
-	 *
-	 * @return second optional output chance
-	 */
-	float getSecondOptionalChance();
+    /**
+     * Energy cost, in turns.
+     *
+     * @return number of turns it takes to produce the output from the input.
+     */
+    int getEnergyCost();
 
-	/**
-	 * Energy cost, in turns.
-	 *
-	 * @return number of turns it takes to produce the output from the input.
-	 */
-	int getEnergyCost();
-
-	/**
-	 * Allows you to adjust the number of turns
-	 *
-	 * @param c number of turns to produce output.
-	 */
-	void setEnergyCost( int c );
+    /**
+     * Allows you to adjust the number of turns
+     *
+     * @param c number of turns to produce output.
+     */
+    void setEnergyCost(int c);
 }

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

@@ -23,63 +23,69 @@
 
 package appeng.api.features;
 
-
-import net.minecraft.item.ItemStack;
-
 import java.util.List;
 
+import net.minecraft.item.ItemStack;
 
 /**
  * Lets you manipulate Grinder Recipes, by adding or editing existing ones.
  */
-public interface IGrinderRegistry
-{
+public interface IGrinderRegistry {
+    /**
+     * Current list of registered recipes, you can modify this if you want too.
+     *
+     * @return currentlyRegisteredRecipes
+     */
+    List<IGrinderEntry> getRecipes();
 
-	/**
-	 * Current list of registered recipes, you can modify this if you want too.
-	 *
-	 * @return currentlyRegisteredRecipes
-	 */
-	List<IGrinderEntry> getRecipes();
+    /**
+     * add a new recipe the easy way, in &#8594; out, how many turns., duplicates will not
+     * be added.
+     *
+     * @param in    input
+     * @param out   output
+     * @param turns amount of turns to turn the input into the output
+     */
+    void addRecipe(ItemStack in, ItemStack out, int turns);
 
-	/**
-	 * add a new recipe the easy way, in &#8594; out, how many turns., duplicates will not be added.
-	 *
-	 * @param in    input
-	 * @param out   output
-	 * @param turns amount of turns to turn the input into the output
-	 */
-	void addRecipe( ItemStack in, ItemStack out, int turns );
+    /**
+     * add a new recipe with optional outputs, duplicates will not be added.
+     *
+     * @param in       input
+     * @param out      output
+     * @param optional optional output
+     * @param chance   chance to get the optional output within 0.0 - 1.0
+     * @param turns    amount of turns to turn the input into the outputs
+     */
+    void
+    addRecipe(ItemStack in, ItemStack out, ItemStack optional, float chance, int turns);
 
-	/**
-	 * add a new recipe with optional outputs, duplicates will not be added.
-	 *
-	 * @param in       input
-	 * @param out      output
-	 * @param optional optional output
-	 * @param chance   chance to get the optional output within 0.0 - 1.0
-	 * @param turns    amount of turns to turn the input into the outputs
-	 */
-	void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, int turns );
+    /**
+     * add a new recipe with optional outputs, duplicates will not be added.
+     *
+     * @param in        input
+     * @param out       output
+     * @param optional  optional output
+     * @param chance    chance to get the optional output within 0.0 - 1.0
+     * @param optional2 second optional output
+     * @param chance2   chance to get the second optional output within 0.0 - 1.0
+     * @param turns     amount of turns to turn the input into the outputs
+     */
+    void addRecipe(
+        ItemStack in,
+        ItemStack out,
+        ItemStack optional,
+        float chance,
+        ItemStack optional2,
+        float chance2,
+        int turns
+    );
 
-	/**
-	 * add a new recipe with optional outputs, duplicates will not be added.
-	 *
-	 * @param in        input
-	 * @param out       output
-	 * @param optional  optional output
-	 * @param chance    chance to get the optional output within 0.0 - 1.0
-	 * @param optional2 second optional output
-	 * @param chance2   chance to get the second optional output within 0.0 - 1.0
-	 * @param turns     amount of turns to turn the input into the outputs
-	 */
-	void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, ItemStack optional2, float chance2, int turns );
-
-	/**
-	 * Searches for a recipe for a given input, and returns it.
-	 *
-	 * @param input input
-	 * @return identified recipe or null
-	 */
-	IGrinderEntry getRecipeForInput( ItemStack input );
+    /**
+     * Searches for a recipe for a given input, and returns it.
+     *
+     * @param input input
+     * @return identified recipe or null
+     */
+    IGrinderEntry getRecipeForInput(ItemStack input);
 }

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

@@ -1,13 +1,11 @@
 package appeng.api.features;
 
+import java.util.List;
+import javax.annotation.Nonnull;
 
 import com.google.common.base.Optional;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-import java.util.List;
-
-
 /**
  * Registration Records for {@link IInscriberRegistry}
  * <p>
@@ -20,45 +18,44 @@ import java.util.List;
  * @version rv2
  * @since rv2
  */
-public interface IInscriberRecipe
-{
-	/**
-	 * the current inputs
-	 *
-	 * @return inputs the inscriber will accept
-	 */
-	@Nonnull
-	List<ItemStack> getInputs();
+public interface IInscriberRecipe {
+    /**
+     * the current inputs
+     *
+     * @return inputs the inscriber will accept
+     */
+    @Nonnull
+    List<ItemStack> getInputs();
 
-	/**
-	 * gets the current output
-	 *
-	 * @return output that the recipe will produce
-	 */
-	@Nonnull
-	ItemStack getOutput();
+    /**
+     * gets the current output
+     *
+     * @return output that the recipe will produce
+     */
+    @Nonnull
+    ItemStack getOutput();
 
-	/**
-	 * gets the top optional
-	 *
-	 * @return item which is used top
-	 */
-	@Nonnull
-	Optional<ItemStack> getTopOptional();
+    /**
+     * gets the top optional
+     *
+     * @return item which is used top
+     */
+    @Nonnull
+    Optional<ItemStack> getTopOptional();
 
-	/**
-	 * gets the bottom optional
-	 *
-	 * @return item which is used bottom
-	 */
-	@Nonnull
-	Optional<ItemStack> getBottomOptional();
+    /**
+     * gets the bottom optional
+     *
+     * @return item which is used bottom
+     */
+    @Nonnull
+    Optional<ItemStack> getBottomOptional();
 
-	/**
-	 * type of inscriber process
-	 *
-	 * @return type of process the inscriber is doing
-	 */
-	@Nonnull
-	InscriberProcessType getProcessType();
+    /**
+     * type of inscriber process
+     *
+     * @return type of process the inscriber is doing
+     */
+    @Nonnull
+    InscriberProcessType getProcessType();
 }

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

@@ -1,12 +1,10 @@
 package appeng.api.features;
 
+import java.util.Collection;
+import javax.annotation.Nonnull;
 
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-import java.util.Collection;
-
-
 /**
  * Builder for an inscriber recipe
  *
@@ -14,69 +12,68 @@ import java.util.Collection;
  * @version rv2
  * @since rv2
  */
-public interface IInscriberRecipeBuilder
-{
-	/**
-	 * Creates an inscriber recipe with inputs.
-	 * Needs to be invoked.
-	 *
-	 * @param inputs new inputs for the recipe
-	 * @return currently used builder
-	 */
-	@Nonnull
-	IInscriberRecipeBuilder withInputs( @Nonnull Collection<ItemStack> inputs );
+public interface IInscriberRecipeBuilder {
+    /**
+     * Creates an inscriber recipe with inputs.
+     * Needs to be invoked.
+     *
+     * @param inputs new inputs for the recipe
+     * @return currently used builder
+     */
+    @Nonnull
+    IInscriberRecipeBuilder withInputs(@Nonnull Collection<ItemStack> inputs);
 
-	/**
-	 * Creates an inscriber recipe with output.
-	 * Needs to be invoked.
-	 *
-	 * @param output new output for the recipe
-	 * @return currently used builder
-	 */
-	@Nonnull
-	IInscriberRecipeBuilder withOutput( @Nonnull ItemStack output );
+    /**
+     * Creates an inscriber recipe with output.
+     * Needs to be invoked.
+     *
+     * @param output new output for the recipe
+     * @return currently used builder
+     */
+    @Nonnull
+    IInscriberRecipeBuilder withOutput(@Nonnull ItemStack output);
 
-	/**
-	 * Creates an inscriber recipe with top.
-	 * Either this or bot needs to be invoked.
-	 *
-	 * @param topOptional new top for the recipe
-	 * @return currently used builder
-	 */
-	@Nonnull
-	IInscriberRecipeBuilder withTopOptional( @Nonnull ItemStack topOptional );
+    /**
+     * Creates an inscriber recipe with top.
+     * Either this or bot needs to be invoked.
+     *
+     * @param topOptional new top for the recipe
+     * @return currently used builder
+     */
+    @Nonnull
+    IInscriberRecipeBuilder withTopOptional(@Nonnull ItemStack topOptional);
 
-	/**
-	 * Creates an inscriber recipe with bot.
-	 * Either this or top needs to be invoked.
-	 *
-	 * @param bottomOptional new bot for the recipe
-	 * @return currently used builder
-	 */
-	@Nonnull
-	IInscriberRecipeBuilder withBottomOptional( @Nonnull ItemStack bottomOptional );
+    /**
+     * Creates an inscriber recipe with bot.
+     * Either this or top needs to be invoked.
+     *
+     * @param bottomOptional new bot for the recipe
+     * @return currently used builder
+     */
+    @Nonnull
+    IInscriberRecipeBuilder withBottomOptional(@Nonnull ItemStack bottomOptional);
 
-	/**
-	 * Creates an inscriber recipe with type.
-	 * Needs to be invoked.
-	 *
-	 * @param type new type for the recipe
-	 * @return currently used builder
-	 */
-	@Nonnull
-	IInscriberRecipeBuilder withProcessType( @Nonnull InscriberProcessType type );
+    /**
+     * Creates an inscriber recipe with type.
+     * Needs to be invoked.
+     *
+     * @param type new type for the recipe
+     * @return currently used builder
+     */
+    @Nonnull
+    IInscriberRecipeBuilder withProcessType(@Nonnull InscriberProcessType type);
 
-	/**
-	 * Finalizes the process of making the recipe.
-	 * Needs to be invoked to fetch inscriber recipe.
-	 *
-	 * @return legal inscriber recipe
-	 * @throws IllegalStateException when input is not defined
-	 * @throws IllegalStateException when input has no size
-	 * @throws IllegalStateException when output is not defined
-	 * @throws IllegalStateException when both optionals are not defined
-	 * @throws IllegalStateException when process type is not defined
-	 */
-	@Nonnull
-	IInscriberRecipe build();
+    /**
+     * Finalizes the process of making the recipe.
+     * Needs to be invoked to fetch inscriber recipe.
+     *
+     * @return legal inscriber recipe
+     * @throws IllegalStateException when input is not defined
+     * @throws IllegalStateException when input has no size
+     * @throws IllegalStateException when output is not defined
+     * @throws IllegalStateException when both optionals are not defined
+     * @throws IllegalStateException when process type is not defined
+     */
+    @Nonnull
+    IInscriberRecipe build();
 }

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

@@ -1,12 +1,10 @@
 package appeng.api.features;
 
-
-import net.minecraft.item.ItemStack;
-
-import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.Set;
+import javax.annotation.Nonnull;
 
+import net.minecraft.item.ItemStack;
 
 /**
  * Lets you manipulate Inscriber Recipes, by adding or editing existing ones.
@@ -15,58 +13,56 @@ import java.util.Set;
  * @version rv3
  * @since rv2
  */
-public interface IInscriberRegistry
-{
-	/**
-	 * An immutable copy of currently registered recipes.
-	 * <p>
-	 * Use the provided methods to actually modify the inscriber recipes.
-	 *
-	 * @return currentlyRegisteredRecipes
-	 * @see IInscriberRegistry#addRecipe(IInscriberRecipe)
-	 * @see IInscriberRegistry#removeRecipe(IInscriberRecipe)
-	 */
-	@Nonnull
-	Collection<IInscriberRecipe> getRecipes();
+public interface IInscriberRegistry {
+    /**
+     * An immutable copy of currently registered recipes.
+     * <p>
+     * Use the provided methods to actually modify the inscriber recipes.
+     *
+     * @return currentlyRegisteredRecipes
+     * @see IInscriberRegistry#addRecipe(IInscriberRecipe)
+     * @see IInscriberRegistry#removeRecipe(IInscriberRecipe)
+     */
+    @Nonnull
+    Collection<IInscriberRecipe> getRecipes();
 
-	/**
-	 * Optional items which are used in the top or bottom slot.
-	 *
-	 * @return set of all optional items
-	 */
-	@Nonnull
-	Set<ItemStack> getOptionals();
+    /**
+     * Optional items which are used in the top or bottom slot.
+     *
+     * @return set of all optional items
+     */
+    @Nonnull
+    Set<ItemStack> getOptionals();
 
-	/**
-	 * Get all registered items which are valid inputs.
-	 *
-	 * @return set of all input items
-	 */
-	@Nonnull
-	Set<ItemStack> getInputs();
+    /**
+     * Get all registered items which are valid inputs.
+     *
+     * @return set of all input items
+     */
+    @Nonnull
+    Set<ItemStack> getInputs();
 
-	/**
-	 * Extensible way to create an inscriber recipe.
-	 *
-	 * @return builder for inscriber recipes
-	 */
-	@Nonnull
-	IInscriberRecipeBuilder builder();
+    /**
+     * Extensible way to create an inscriber recipe.
+     *
+     * @return builder for inscriber recipes
+     */
+    @Nonnull
+    IInscriberRecipeBuilder builder();
 
-	/**
-	 * add a new recipe the easy way, duplicates will not be added.
-	 * Added recipes will be automatically added to the optionals and inputs.
-	 *
-	 * @param recipe new recipe
-	 * @throws IllegalArgumentException if null is added
-	 */
-	void addRecipe( IInscriberRecipe recipe );
-
-	/**
-	 * Removes all equal recipes from the registry.
-	 *
-	 * @param toBeRemovedRecipe to be removed recipe, can be null, makes just no sense.
-	 */
-	void removeRecipe( IInscriberRecipe toBeRemovedRecipe );
+    /**
+     * add a new recipe the easy way, duplicates will not be added.
+     * Added recipes will be automatically added to the optionals and inputs.
+     *
+     * @param recipe new recipe
+     * @throws IllegalArgumentException if null is added
+     */
+    void addRecipe(IInscriberRecipe recipe);
 
+    /**
+     * Removes all equal recipes from the registry.
+     *
+     * @param toBeRemovedRecipe to be removed recipe, can be null, makes just no sense.
+     */
+    void removeRecipe(IInscriberRecipe toBeRemovedRecipe);
 }

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

@@ -23,10 +23,8 @@
 
 package appeng.api.features;
 
+public interface IItemComparison {
+    boolean sameAsPrecise(IItemComparison comp);
 
-public interface IItemComparison
-{
-	boolean sameAsPrecise( IItemComparison comp );
-
-	boolean sameAsFuzzy( IItemComparison comp );
+    boolean sameAsFuzzy(IItemComparison comp);
 }

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

@@ -23,32 +23,28 @@
 
 package appeng.api.features;
 
-
 import net.minecraft.item.ItemStack;
 
-
 /**
  * Provider for special comparisons. when an item is encountered AE Will request
  * if the comparison function handles the item, by trying to request a
  * IItemComparison class.
  */
-public interface IItemComparisonProvider
-{
+public interface IItemComparisonProvider {
+    /**
+     * should return a new IItemComparison, or return null if it doesn't handle
+     * the supplied item.
+     *
+     * @param is item
+     * @return IItemComparison, or null
+     */
+    IItemComparison getComparison(ItemStack is);
 
-	/**
-	 * should return a new IItemComparison, or return null if it doesn't handle
-	 * the supplied item.
-	 *
-	 * @param is item
-	 * @return IItemComparison, or null
-	 */
-	IItemComparison getComparison( ItemStack is );
-
-	/**
-	 * Simple test for support ( AE generally skips this and calls the above function. )
-	 *
-	 * @param stack item
-	 * @return true, if getComparison will return a valid IItemComparison Object
-	 */
-	boolean canHandle( ItemStack stack );
+    /**
+     * Simple test for support ( AE generally skips this and calls the above function. )
+     *
+     * @param stack item
+     * @return true, if getComparison will return a valid IItemComparison Object
+     */
+    boolean canHandle(ItemStack stack);
 }

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

@@ -23,19 +23,15 @@
 
 package appeng.api.features;
 
-
 import appeng.api.events.LocatableEventAnnounce;
 
-
 /**
- * A registration record for the {@link ILocatableRegistry} use the {@link LocatableEventAnnounce} event on the Forge
- * Event bus to update the registry.
+ * A registration record for the {@link ILocatableRegistry} use the {@link
+ * LocatableEventAnnounce} event on the Forge Event bus to update the registry.
  */
-public interface ILocatable
-{
-
-	/**
-	 * @return the serial for a locatable object
-	 */
-	long getLocatableSerial();
+public interface ILocatable {
+    /**
+     * @return the serial for a locatable object
+     */
+    long getLocatableSerial();
 }

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

@@ -23,28 +23,26 @@
 
 package appeng.api.features;
 
-
 /**
  * A Registry for locatable items, works based on serial numbers.
  */
-public interface ILocatableRegistry
-{
-	/**
-	 * Attempts to find the object with the serial specified, if it can it
-	 * returns the object.
-	 *
-	 * @param serial serial
-	 * @return requestedObject, or null
-	 * @deprecated use {@link ILocatableRegistry#getLocatableBy(long)}
-	 */
-	@Deprecated
-	Object findLocatableBySerial( long serial );
+public interface ILocatableRegistry {
+    /**
+     * Attempts to find the object with the serial specified, if it can it
+     * returns the object.
+     *
+     * @param serial serial
+     * @return requestedObject, or null
+     * @deprecated use {@link ILocatableRegistry#getLocatableBy(long)}
+     */
+    @Deprecated
+    Object findLocatableBySerial(long serial);
 
-	/**
-	 * Gets the {@link ILocatable} with the registered serial, if available
-	 *
-	 * @param serial serial
-	 * @return requestedObject, or null, if the object does not exist anymore
-	 */
-	ILocatable getLocatableBy( long serial );
+    /**
+     * Gets the {@link ILocatable} with the registered serial, if available
+     *
+     * @param serial serial
+     * @return requestedObject, or null, if the object does not exist anymore
+     */
+    ILocatable getLocatableBy(long serial);
 }

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

@@ -23,26 +23,23 @@
 
 package appeng.api.features;
 
-
 import net.minecraft.item.ItemStack;
 
+public interface IMatterCannonAmmoRegistry {
+    /**
+     * register a new ammo, generally speaking this is based off of atomic weight to make
+     * it easier to guess at
+     *
+     * @param ammo   new ammo
+     * @param weight atomic weight
+     */
+    void registerAmmo(ItemStack ammo, double weight);
 
-public interface IMatterCannonAmmoRegistry
-{
-
-	/**
-	 * register a new ammo, generally speaking this is based off of atomic weight to make it easier to guess at
-	 *
-	 * @param ammo   new ammo
-	 * @param weight atomic weight
-	 */
-	void registerAmmo( ItemStack ammo, double weight );
-
-	/**
-	 * get the penetration value for a particular ammo, 0 indicates a non-ammo.
-	 *
-	 * @param is ammo
-	 * @return 0 or a valid penetration value.
-	 */
-	float getPenetration( ItemStack is );
+    /**
+     * get the penetration value for a particular ammo, 0 indicates a non-ammo.
+     *
+     * @param is ammo
+     * @return 0 or a valid penetration value.
+     */
+    float getPenetration(ItemStack is);
 }

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

@@ -23,27 +23,23 @@
 
 package appeng.api.features;
 
-
 import net.minecraft.item.ItemStack;
 
+public interface INetworkEncodable {
+    /**
+     * Used to get the current key from the item.
+     *
+     * @param item item
+     * @return string key of item
+     */
+    String getEncryptionKey(ItemStack item);
 
-public interface INetworkEncodable
-{
-
-	/**
-	 * Used to get the current key from the item.
-	 *
-	 * @param item item
-	 * @return string key of item
-	 */
-	String getEncryptionKey( ItemStack item );
-
-	/**
-	 * Encode the wireless frequency via the Controller.
-	 *
-	 * @param item   the wireless terminal.
-	 * @param encKey the wireless encryption key.
-	 * @param name   null for now.
-	 */
-	void setEncryptionKey( ItemStack item, String encKey, String name );
+    /**
+     * Encode the wireless frequency via the Controller.
+     *
+     * @param item   the wireless terminal.
+     * @param encKey the wireless encryption key.
+     * @param name   null for now.
+     */
+    void setEncryptionKey(ItemStack item, String encKey, String name);
 }

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

@@ -23,34 +23,30 @@
 
 package appeng.api.features;
 
+import javax.annotation.Nullable;
 
 import appeng.api.config.TunnelType;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nullable;
-
-
 /**
  * A Registry for how p2p Tunnels are attuned
  */
-public interface IP2PTunnelRegistry
-{
+public interface IP2PTunnelRegistry {
+    /**
+     * Allows third parties to register items from their mod as potential
+     * attunements for AE's P2P Tunnels
+     *
+     * @param trigger - the item which triggers attunement. Nullable, but then ignored
+     * @param type    - the type of tunnel. Nullable, but then ignored
+     */
+    void addNewAttunement(@Nullable ItemStack trigger, @Nullable TunnelType type);
 
-	/**
-	 * Allows third parties to register items from their mod as potential
-	 * attunements for AE's P2P Tunnels
-	 *
-	 * @param trigger - the item which triggers attunement. Nullable, but then ignored
-	 * @param type    - the type of tunnel. Nullable, but then ignored
-	 */
-	void addNewAttunement( @Nullable ItemStack trigger, @Nullable TunnelType type );
-
-	/**
-	 * returns null if no attunement can be found.
-	 *
-	 * @param trigger attunement trigger
-	 * @return null if no attunement can be found or attunement
-	 */
-	@Nullable
-	TunnelType getTunnelTypeByItem( ItemStack trigger );
+    /**
+     * returns null if no attunement can be found.
+     *
+     * @param trigger attunement trigger
+     * @return null if no attunement can be found or attunement
+     */
+    @Nullable
+    TunnelType getTunnelTypeByItem(ItemStack trigger);
 }

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

@@ -23,36 +23,33 @@
 
 package appeng.api.features;
 
+import javax.annotation.Nullable;
 
 import com.mojang.authlib.GameProfile;
 import net.minecraft.entity.player.EntityPlayer;
 
-import javax.annotation.Nullable;
-
-
 /**
- * Maintains a save specific list of userids and username combinations this greatly simplifies storage internally and
- * gives a common place to look up and get IDs for the security framework.
+ * Maintains a save specific list of userids and username combinations this greatly
+ * simplifies storage internally and gives a common place to look up and get IDs for the
+ * security framework.
  */
-public interface IPlayerRegistry
-{
+public interface IPlayerRegistry {
+    /**
+     * @param gameProfile user game profile
+     * @return user id of a username.
+     */
+    int getID(GameProfile gameProfile);
 
-	/**
-	 * @param gameProfile user game profile
-	 * @return user id of a username.
-	 */
-	int getID( GameProfile gameProfile );
+    /**
+     * @param player player
+     * @return user id of a player entity.
+     */
+    int getID(EntityPlayer player);
 
-	/**
-	 * @param player player
-	 * @return user id of a player entity.
-	 */
-	int getID( EntityPlayer player );
-
-	/**
-	 * @param playerID to be found player id
-	 * @return PlayerEntity, or null if the player could not be found.
-	 */
-	@Nullable
-	EntityPlayer findPlayer( int playerID );
+    /**
+     * @param playerID to be found player id
+     * @return PlayerEntity, or null if the player could not be found.
+     */
+    @Nullable
+    EntityPlayer findPlayer(int playerID);
 }

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

@@ -23,61 +23,57 @@
 
 package appeng.api.features;
 
+import javax.annotation.Nullable;
 
 import appeng.api.recipes.ICraftHandler;
 import appeng.api.recipes.IRecipeHandler;
 import appeng.api.recipes.ISubItemResolver;
 
-import javax.annotation.Nullable;
-
-
 /**
  * @author AlgorithmX2
  * @author thatsIch
  * @version rv3 - 10.08.2015
  * @since rv0
  */
-public interface IRecipeHandlerRegistry
-{
+public interface IRecipeHandlerRegistry {
+    /**
+     * Add a new Recipe Handler to the parser.
+     * <p>
+     * MUST BE CALLED IN PRE-INIT
+     *
+     * @param name    name of crafthandler
+     * @param handler class of crafthandler
+     */
+    void addNewCraftHandler(String name, Class<? extends ICraftHandler> handler);
 
-	/**
-	 * Add a new Recipe Handler to the parser.
-	 * <p>
-	 * MUST BE CALLED IN PRE-INIT
-	 *
-	 * @param name    name of crafthandler
-	 * @param handler class of crafthandler
-	 */
-	void addNewCraftHandler( String name, Class<? extends ICraftHandler> handler );
+    /**
+     * Add a new resolver to the parser.
+     * <p>
+     * MUST BE CALLED IN PRE-INIT
+     *
+     * @param sir sub item resolver
+     */
+    void addNewSubItemResolver(ISubItemResolver sir);
 
-	/**
-	 * Add a new resolver to the parser.
-	 * <p>
-	 * MUST BE CALLED IN PRE-INIT
-	 *
-	 * @param sir sub item resolver
-	 */
-	void addNewSubItemResolver( ISubItemResolver sir );
+    /**
+     * @param name name of crafting handler
+     * @return A recipe handler by name, returns null on failure.
+     */
+    @Nullable
+    ICraftHandler getCraftHandlerFor(String name);
 
-	/**
-	 * @param name name of crafting handler
-	 * @return A recipe handler by name, returns null on failure.
-	 */
-	@Nullable
-	ICraftHandler getCraftHandlerFor( String name );
+    /**
+     * @return a new recipe handler, which can be used to parse, and read recipe files.
+     */
+    IRecipeHandler createNewRecipehandler();
 
-	/**
-	 * @return a new recipe handler, which can be used to parse, and read recipe files.
-	 */
-	IRecipeHandler createNewRecipehandler();
-
-	/**
-	 * resolve sub items by name.
-	 *
-	 * @param nameSpace namespace of item
-	 * @param itemName  full name of item
-	 * @return ResolverResult or ResolverResultSet or null if could not resolve
-	 */
-	@Nullable
-	Object resolveItem( String nameSpace, String itemName );
+    /**
+     * resolve sub items by name.
+     *
+     * @param nameSpace namespace of item
+     * @param itemName  full name of item
+     * @return ResolverResult or ResolverResultSet or null if could not resolve
+     */
+    @Nullable
+    Object resolveItem(String nameSpace, String itemName);
 }

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

@@ -23,90 +23,87 @@
 
 package appeng.api.features;
 
-
 import appeng.api.movable.IMovableRegistry;
 import appeng.api.networking.IGridCacheRegistry;
 import appeng.api.storage.ICellRegistry;
 import appeng.api.storage.IExternalStorageRegistry;
 
-
 /**
  * @author AlgorithmX2
  * @author thatsIch
  * @version rv2
  * @since rv0
  */
-public interface IRegistryContainer
-{
+public interface IRegistryContainer {
+    /**
+     * Use the movable registry to white list your tiles.
+     */
+    IMovableRegistry movable();
 
-	/**
-	 * Use the movable registry to white list your tiles.
-	 */
-	IMovableRegistry movable();
+    /**
+     * Add new Grid Caches for use during run time, only use during loading phase.
+     */
+    IGridCacheRegistry gridCache();
 
-	/**
-	 * Add new Grid Caches for use during run time, only use during loading phase.
-	 */
-	IGridCacheRegistry gridCache();
+    /**
+     * Add additional storage bus handlers to improve interplay with mod blocks that
+     * contains special inventories that function unlike vanilla chests. AE uses this
+     * internally for barrels, DSU's, quantum chests, AE Networks and more.
+     */
+    IExternalStorageRegistry externalStorage();
 
-	/**
-	 * Add additional storage bus handlers to improve interplay with mod blocks that contains special inventories that
-	 * function unlike vanilla chests. AE uses this internally for barrels, DSU's, quantum chests, AE Networks and more.
-	 */
-	IExternalStorageRegistry externalStorage();
+    /**
+     * Add additional special comparison functionality, AE Uses this internally for Bees.
+     */
+    ISpecialComparisonRegistry specialComparison();
 
-	/**
-	 * Add additional special comparison functionality, AE Uses this internally for Bees.
-	 */
-	ISpecialComparisonRegistry specialComparison();
+    /**
+     * Lets you register your items as wireless terminals
+     */
+    IWirelessTermRegistry wireless();
 
-	/**
-	 * Lets you register your items as wireless terminals
-	 */
-	IWirelessTermRegistry wireless();
+    /**
+     * Allows you to register new cell types, these will function in drives
+     */
+    ICellRegistry cell();
 
-	/**
-	 * Allows you to register new cell types, these will function in drives
-	 */
-	ICellRegistry cell();
+    /**
+     * Manage grinder recipes via API
+     */
+    IGrinderRegistry grinder();
 
-	/**
-	 * Manage grinder recipes via API
-	 */
-	IGrinderRegistry grinder();
+    /**
+     * Manage inscriber recipes via API
+     */
+    IInscriberRegistry inscriber();
 
-	/**
-	 * Manage inscriber recipes via API
-	 */
-	IInscriberRegistry inscriber();
+    /**
+     * get access to the locatable registry
+     */
+    ILocatableRegistry locatable();
 
-	/**
-	 * get access to the locatable registry
-	 */
-	ILocatableRegistry locatable();
+    /**
+     * get access to the p2p tunnel registry.
+     */
+    IP2PTunnelRegistry p2pTunnel();
 
-	/**
-	 * get access to the p2p tunnel registry.
-	 */
-	IP2PTunnelRegistry p2pTunnel();
+    /**
+     * get access to the ammo registry.
+     */
+    IMatterCannonAmmoRegistry matterCannon();
 
-	/**
-	 * get access to the ammo registry.
-	 */
-	IMatterCannonAmmoRegistry matterCannon();
+    /**
+     * get access to the player registry
+     */
+    IPlayerRegistry players();
 
-	/**
-	 * get access to the player registry
-	 */
-	IPlayerRegistry players();
+    /**
+     * get access to the ae2 recipe api
+     */
+    IRecipeHandlerRegistry recipes();
 
-	/**
-	 * get access to the ae2 recipe api
-	 */
-	IRecipeHandlerRegistry recipes();
-
-	/**
-	 * get access to the world-gen api.
-	 */
-	IWorldGen worldgen();
+    /**
+     * get access to the world-gen api.
+     */
+    IWorldGen worldgen();
 }

src/api/java/appeng/api/features/ISpecialComparisonRegistry.java

@@ -23,28 +23,24 @@
 
 package appeng.api.features;
 
-
 import net.minecraft.item.ItemStack;
 
-
 /**
  * A Registry of any special comparison handlers for AE To use.
  */
-public interface ISpecialComparisonRegistry
-{
+public interface ISpecialComparisonRegistry {
+    /**
+     * return TheHandler or null.
+     *
+     * @param stack item
+     * @return a handler it found for a specific item
+     */
+    IItemComparison getSpecialComparison(ItemStack stack);
 
-	/**
-	 * return TheHandler or null.
-	 *
-	 * @param stack item
-	 * @return a handler it found for a specific item
-	 */
-	IItemComparison getSpecialComparison( ItemStack stack );
-
-	/**
-	 * Register a new special comparison function with AE.
-	 *
-	 * @param prov comparison provider
-	 */
-	void addComparisonProvider( IItemComparisonProvider prov );
+    /**
+     * Register a new special comparison function with AE.
+     *
+     * @param prov comparison provider
+     */
+    void addComparisonProvider(IItemComparisonProvider prov);
 }

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

@@ -23,47 +23,44 @@
 
 package appeng.api.features;
 
-
 import appeng.api.util.IConfigManager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-
 /**
  * A handler for a wireless terminal.
  */
-public interface IWirelessTermHandler extends INetworkEncodable
-{
+public interface IWirelessTermHandler extends INetworkEncodable {
+    /**
+     * @param is wireless terminal
+     * @return true, if usePower, hasPower, etc... can be called for the provided item
+     */
+    boolean canHandle(ItemStack is);
 
-	/**
-	 * @param is wireless terminal
-	 * @return true, if usePower, hasPower, etc... can be called for the provided item
-	 */
-	boolean canHandle( ItemStack is );
+    /**
+     * use an amount of power, in AE units
+     *
+     * @param amount is in AE units ( 5 per MJ ), if you return false, the item should be
+     *     dead and return false for
+     *               hasPower
+     * @param is     wireless terminal
+     * @return true if wireless terminal uses power
+     */
+    boolean usePower(EntityPlayer player, double amount, ItemStack is);
 
-	/**
-	 * use an amount of power, in AE units
-	 *
-	 * @param amount is in AE units ( 5 per MJ ), if you return false, the item should be dead and return false for
-	 *               hasPower
-	 * @param is     wireless terminal
-	 * @return true if wireless terminal uses power
-	 */
-	boolean usePower( EntityPlayer player, double amount, ItemStack is );
+    /**
+     * gets the power status of the item.
+     *
+     * @param is wireless terminal
+     * @return returns true if there is any power left.
+     */
+    boolean hasPower(EntityPlayer player, double amount, ItemStack is);
 
-	/**
-	 * gets the power status of the item.
-	 *
-	 * @param is wireless terminal
-	 * @return returns true if there is any power left.
-	 */
-	boolean hasPower( EntityPlayer player, double amount, ItemStack is );
-
-	/**
-	 * Return the config manager for the wireless terminal.
-	 *
-	 * @param is wireless terminal
-	 * @return config manager of wireless terminal
-	 */
-	IConfigManager getConfigManager( ItemStack is );
+    /**
+     * Return the config manager for the wireless terminal.
+     *
+     * @param is wireless terminal
+     * @return config manager of wireless terminal
+     */
+    IConfigManager getConfigManager(ItemStack is);
 }

src/api/java/appeng/api/features/IWirelessTermRegistry.java

@@ -23,41 +23,37 @@
 
 package appeng.api.features;
 
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-
 /**
  * Registration record for a Custom Cell handler.
  */
-public interface IWirelessTermRegistry
-{
+public interface IWirelessTermRegistry {
+    /**
+     * add this handler to the list of other wireless handler.
+     *
+     * @param handler wireless handler
+     */
+    void registerWirelessHandler(IWirelessTermHandler handler);
 
-	/**
-	 * add this handler to the list of other wireless handler.
-	 *
-	 * @param handler wireless handler
-	 */
-	void registerWirelessHandler( IWirelessTermHandler handler );
+    /**
+     * @param is item which might have a handler
+     * @return true if there is a handler for this item
+     */
+    boolean isWirelessTerminal(ItemStack is);
 
-	/**
-	 * @param is item which might have a handler
-	 * @return true if there is a handler for this item
-	 */
-	boolean isWirelessTerminal( ItemStack is );
+    /**
+     * @param is item with handler
+     * @return a register handler for the item in question, or null if there
+     * isn't one
+     */
+    IWirelessTermHandler getWirelessTerminalHandler(ItemStack is);
 
-	/**
-	 * @param is item with handler
-	 * @return a register handler for the item in question, or null if there
-	 * isn't one
-	 */
-	IWirelessTermHandler getWirelessTerminalHandler( ItemStack is );
-
-	/**
-	 * opens the wireless terminal gui, the wireless terminal item, must be in
-	 * the active slot on the tool bar.
-	 */
-	void openWirelessTerminalGui( ItemStack item, World w, EntityPlayer player );
+    /**
+     * opens the wireless terminal gui, the wireless terminal item, must be in
+     * the active slot on the tool bar.
+     */
+    void openWirelessTerminalGui(ItemStack item, World w, EntityPlayer player);
 }

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

@@ -23,24 +23,19 @@
 
 package appeng.api.features;
 
-
 import net.minecraft.world.World;
 import net.minecraft.world.WorldProvider;
 
+public interface IWorldGen {
+    void disableWorldGenForProviderID(
+        WorldGenType type, Class<? extends WorldProvider> provider
+    );
 
-public interface IWorldGen
-{
+    void enableWorldGenForDimension(WorldGenType type, int dimID);
 
-	void disableWorldGenForProviderID( WorldGenType type, Class<? extends WorldProvider> provider );
+    void disableWorldGenForDimension(WorldGenType type, int dimID);
 
-	void enableWorldGenForDimension( WorldGenType type, int dimID );
+    boolean isWorldGenEnabled(WorldGenType type, World w);
 
-	void disableWorldGenForDimension( WorldGenType type, int dimID );
-
-	boolean isWorldGenEnabled( WorldGenType type, World w );
-
-	enum WorldGenType
-	{
-		CertusQuartz, ChargedCertusQuartz, Meteorites
-	}
+    enum WorldGenType { CertusQuartz, ChargedCertusQuartz, Meteorites }
 }

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

@@ -1,15 +1,13 @@
 package appeng.api.features;
 
+public enum InscriberProcessType {
+    /**
+     * uses the optionals as catalyst
+     */
+    Inscribe,
 
-public enum InscriberProcessType
-{
-	/**
-	 * uses the optionals as catalyst
-	 */
-	Inscribe,
-
-	/**
-	 * spends the optionals
-	 */
-	Press
+    /**
+     * spends the optionals
+     */
+    Press
 }

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

@@ -23,25 +23,21 @@
 
 package appeng.api.implementations;
 
-
 import appeng.api.networking.crafting.ICraftingPatternDetails;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-
 /**
  * Implemented on {@link Item}
  */
-public interface ICraftingPatternItem
-{
-
-	/**
-	 * Access Details about a pattern
-	 *
-	 * @param is pattern
-	 * @param w  crafting world
-	 * @return details of pattern
-	 */
-	ICraftingPatternDetails getPatternForItem( ItemStack is, World w );
+public interface ICraftingPatternItem {
+    /**
+     * Access Details about a pattern
+     *
+     * @param is pattern
+     * @param w  crafting world
+     * @return details of pattern
+     */
+    ICraftingPatternDetails getPatternForItem(ItemStack is, World w);
 }

src/api/java/appeng/api/implementations/IPowerChannelState.java

@@ -23,20 +23,17 @@
 
 package appeng.api.implementations;
 
-
 /**
  * This is intended for use on the client side to provide details to WAILA.
  */
-public interface IPowerChannelState
-{
+public interface IPowerChannelState {
+    /**
+     * @return true if the part/tile is powered.
+     */
+    boolean isPowered();
 
-	/**
-	 * @return true if the part/tile is powered.
-	 */
-	boolean isPowered();
-
-	/**
-	 * @return true if the part/tile isActive
-	 */
-	boolean isActive();
+    /**
+     * @return true if the part/tile isActive
+     */
+    boolean isActive();
 }

src/api/java/appeng/api/implementations/IUpgradeableHost.java

@@ -23,25 +23,21 @@
 
 package appeng.api.implementations;
 
-
 import appeng.api.config.Upgrades;
 import appeng.api.implementations.tiles.ISegmentedInventory;
 import appeng.api.util.IConfigurableObject;
 import net.minecraft.tileentity.TileEntity;
 
+public interface IUpgradeableHost extends IConfigurableObject, ISegmentedInventory {
+    /**
+     * determine how many of an upgrade are installed.
+     */
+    int getInstalledUpgrades(Upgrades u);
 
-public interface IUpgradeableHost extends IConfigurableObject, ISegmentedInventory
-{
-
-	/**
-	 * determine how many of an upgrade are installed.
-	 */
-	int getInstalledUpgrades( Upgrades u );
-
-	/**
-	 * the tile...
-	 *
-	 * @return tile entity
-	 */
-	TileEntity getTile();
+    /**
+     * the tile...
+     *
+     * @return tile entity
+     */
+    TileEntity getTile();
 }

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

@@ -23,19 +23,16 @@
 
 package appeng.api.implementations;
 
-
 /**
  * Defines the result of performing a transition from the world into a storage
  * cell, if its possible, and what the energy usage is.
  */
-public class TransitionResult
-{
-	public final boolean success;
-	public final double energyUsage;
+public class TransitionResult {
+    public final boolean success;
+    public final double energyUsage;
 
-	public TransitionResult( final boolean _success, final double power )
-	{
-		this.success = _success;
-		this.energyUsage = power;
-	}
+    public TransitionResult(final boolean _success, final double power) {
+        this.success = _success;
+        this.energyUsage = power;
+    }
 }

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

@@ -23,17 +23,13 @@
 
 package appeng.api.implementations.guiobjects;
 
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-
 /**
  * Implemented on Item objects, to return objects used to manage, and interact
  * with the contents.
  */
-public interface IGuiItem
-{
-
-	IGuiItemObject getGuiObject( ItemStack is, World world, int x, int y, int z );
+public interface IGuiItem {
+    IGuiItemObject getGuiObject(ItemStack is, World world, int x, int y, int z);
 }

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

@@ -23,12 +23,8 @@
 
 package appeng.api.implementations.guiobjects;
 
-
 import net.minecraft.item.ItemStack;
 
-
-public interface IGuiItemObject
-{
-
-	ItemStack getItemStack();
+public interface IGuiItemObject {
+    ItemStack getItemStack();
 }