Fixes #1559: Level Emitter with P:R alloy wire does not crash anymore

Required to implement a more advanced interface, if not done that way, the parts will update themselves recursively

.gitignore

@@ -7,7 +7,7 @@
 !gradlew
 !gradlew.bat
 !build.gradle
-!build.properties
+!gradle.properties
 
 # include markdowns
 !README.md

README.md

@@ -1,6 +1,9 @@
+<!--[![Latest Release](https://img.shields.io/github/tag/AppliedEnergistics/Applied-Energistics-2.svg?label=Latest Release)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases) -->
+[![Latest Build](https://img.shields.io/teamcity/http/ci.tsr.me/s/AppliedEnergistics_AutoHeadBuild.svg?label=Latest Build)](http://ci.tsr.me/viewType.html?buildTypeId=AppliedEnergistics_AutoHeadBuild&tab=buildTypeStatusDiv)
+
 # Applied Energistics 2
 
-## Table of Content
+## Table of Contents
 
 * [About](#about)
 * [Contacts](#contacts)
@@ -26,12 +29,17 @@ A Mod about Matter, Energy and using them to conquer the world..
 
 ## License
 
-Applied Energistics 2 API is (c) 2013 - 2014 AlgorithmX2 and licensed under MIT.
+* Applied Energistics 2 API
-
+  - (c) 2013 - 2015 AlgorithmX2 et al
-Applied Energistics 2 is (c) 2013 - 2014 AlgorithmX2 and licensed under LGPL v3.
+  - ![License](https://img.shields.io/badge/License-MIT-red.svg?style=flat)
-See the LICENSE.txt for details or go to http://www.gnu.org/licenses/lgpl-3.0.txt for more information.
+* Applied Energistics 2
-
+  - (c) 2013 - 2015 AlgorithmX2 et al
-Textures and Models are licensed under Creative Commons 3.
+  - [![License](https://img.shields.io/badge/License-LGPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/AppliedEnergistics/Applied-Energistics-2/rv2/LICENSE)
+* Textures and Models
+  - (c) 2013 - 2015 AlgorithmX2 et al
+  - [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%203.0-yellow.svg?style=flat)](https://creativecommons.org/licenses/by-nc-sa/3.0/)
+* Text and Translations
+  - ![License](https://img.shields.io/badge/License-No%20Restriction-green.svg?style=flat)
 
 ## Downloads
 
@@ -103,7 +111,7 @@ Getting Started
 6. Push to your fork `git push`
 7. Create a Pull-Request on GitHub
 8. Wait for review
-9. Suqash commits for cleaner history
+9. Squash commits for cleaner history
 
 If you are only doing single file pull requests, GitHub supports using a quick way without the need of cloning your fork. Also read up about [synching](https://help.github.com/articles/syncing-a-fork) if you plan to contribute on regular basis.
 
@@ -137,10 +145,6 @@ An example string would be `appeng:appliedenergistics2:rv2-alpha-30:dev`
 
 Files must be encoded as UTF-8.
 
-### License
-
-All Text and Translations submitted here can be used for any purpose, and may be re-distributed or used without any limitations.
-
 ### New Translations
 
 You can provide any additional languages by creating a new file with the [appropriate language code](http://download1.parallels.com/SiteBuilder/Windows/docs/3.2/en_US/sitebulder-3.2-win-sdk-localization-pack-creation-guide/30801.htm).

build.gradle

@@ -18,13 +18,15 @@
 
 apply plugin: 'forge'
 
-apply from: 'gradle/scripts/propertyloader.gradle'
 apply from: 'gradle/scripts/dependencies.gradle'
 apply from: 'gradle/scripts/artifacts.gradle'
 apply from: 'gradle/scripts/autoinstallruntime.gradle'
+apply from: 'gradle/scripts/integration.gradle'
+apply from: 'gradle/scripts/optional.gradle'
 
 buildscript {
     repositories {
+        mavenLocal()
         mavenCentral()
 
         maven {
@@ -50,9 +52,9 @@ configurations.all {
 sourceCompatibility = JavaVersion.VERSION_1_6
 targetCompatibility = JavaVersion.VERSION_1_6
 
-version = config.version + "-" + config.aechannel + "-" + config.build
+version = aeversion + "-" + aechannel + "-" + aebuild
-group = config.group
+group = aegroup
-archivesBaseName = config.archivesBaseName
+archivesBaseName = aebasename
 
 // If TeamCity is running this build, lets set the version info
 if (hasProperty("teamcity")) {
@@ -77,10 +79,11 @@ jar {
 }
 
 minecraft {
-    version = config.minecraft_version + "-" + config.forge_version
+    version = minecraft_version + "-" + forge_version
 
+    replaceIn "AEConfig.java"
     replace "@version@", project.version
-    replace "@aechannel@", config.aechannel
+    replace "@aechannel@", aechannel
 
     // used when launching minecraft in dev env
     runDir = "run"
@@ -109,6 +112,7 @@ processResources {
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
-        expand 'version': project.version, 'mcversion': config.minecraft_version
+        expand 'version': project.version, 'mcversion': minecraft_version
+        include 'pack.mcmeta'
     }
 }

build.properties

@@ -1,41 +0,0 @@
-version=rv2
-aechannel=beta
-build=0
-group=appeng
-archivesBaseName=appliedenergistics2
-
-#########################################################
-# Versions                                              #
-#########################################################
-minecraft_version=1.7.10
-forge_version=10.13.2.1230
-
-#########################################################
-# APIs used for development                             #
-#########################################################
-cb_minecraft_version=1.7.10
-fmp_version=1.1.0.311
-code_chicken_lib_version=1.1.1.105
-code_chicken_core_version=1.0.4.29
-nei_version=1.0.3.66
-waila_version=1.5.5_1.7.10
-
-#########################################################
-# API Stubs                                             #
-# Note: Do not edit these version numbers as they are   #
-# not the version of the mod, but stub code for AE2 to  #
-# compile                                               #
-#########################################################
-api_betterstorage_version=1
-api_coloredlightscore_version=1
-api_craftguide_version=1
-api_ic2_version=1
-api_immibis_version=1
-api_invtweaks_version=1
-api_mekansim_version=1
-api_mfr_version=1
-api_railcraft_version=1
-api_rblocks_version=1
-api_rf_version=2
-api_rotarycraft_version=1
-dev_buildcraft_version=1

gradle.properties

@@ -0,0 +1,57 @@
+aeversion=rv2
+aechannel=stable
+aebuild=0
+aegroup=appeng
+aebasename=appliedenergistics2
+
+#########################################################
+# Versions                                              #
+#########################################################
+minecraft_version=1.7.10
+forge_version=10.13.2.1291
+
+#########################################################
+# Installable                                           #
+#########################################################
+waila_version=1.5.10
+jabba_version=1.2.1a
+enderstorage_version=1.4.7.33
+translocator_version=1.1.1.14
+ic2_version=2.2.717
+enderio_version=2.3.0.375_beta
+#cofhlib_version=1.0.1-157
+#cofhcore_version=3.0.2-270
+#texpansion_version=4.0.0-176
+#tfoundation_version=1.0.0-82
+betterstorage_version=0.11.3.123.20
+invtweaks_version=1.58
+
+#########################################################
+# Provided APIs                                         #
+#########################################################
+fmp_version=1.1.1.324
+code_chicken_lib_version=1.1.3.127
+code_chicken_core_version=1.0.4.35
+nei_version=1.0.4.90
+bc_version=6.4.6
+
+#########################################################
+# Self Compiled APIs                                    #
+#########################################################
+mekansim_version=8.0.1.198
+rotarycraft_version=V6e
+
+
+#########################################################
+# Self Compiled API Stubs                               #
+# Note: Do not edit these version numbers as they are   #
+# not the version of the mod, but stub code for AE2 to  #
+# compile                                               #
+#########################################################
+api_coloredlightscore_version=1
+api_craftguide_version=1
+api_immibis_version=1
+api_mfr_version=1
+api_railcraft_version=1
+api_rblocks_version=1
+api_rf_version=2

gradle/scripts/artifacts.gradle

@@ -27,13 +27,13 @@ task devJar(type: Jar) {
 }
 
 task apiJar(type: Jar) {
+    from sourceSets.api.java
+    include "appeng/api/**"
 
-    from(sourceSets.api.java) {
+    from sourceSets.main.output
-        include "appeng/api/**"
+    include "appeng/api/**"
-    }
 
     classifier = 'api'
-
 }
 
 artifacts {

gradle/scripts/autoinstallruntime.gradle

@@ -9,26 +9,4 @@ task copyChicken(type: Copy, dependsOn: "extractUserDev") {
     mustRunAfter "repackMinecraft"
 }
 tasks.setupDevWorkspace.dependsOn copyChicken
-tasks.setupDecompWorkspace.dependsOn copyChicken
+tasks.setupDecompWorkspace.dependsOn copyChicken
-
-// same for BC hacked file
-task copyBuildcraft(type: Copy, dependsOn: "extractUserDev") {
-    from { configurations.compile }
-    include "**/*buildcraft*.jar"
-    into file(minecraft.runDir + "/mods")
-    mustRunAfter "deobfBinJar"
-    mustRunAfter "repackMinecraft"
-}
-tasks.setupDevWorkspace.dependsOn copyBuildcraft
-tasks.setupDecompWorkspace.dependsOn copyBuildcraft
-
-// and for IC2 because it needs its EMLJ jar
-task copyIndustrialcraft(type: Copy, dependsOn: "extractUserDev") {
-    from { configurations.compile }
-    include "**/*industrialcraft*.jar"
-    into file(minecraft.runDir + "/mods")
-    mustRunAfter "deobfBinJar"
-    mustRunAfter "repackMinecraft"
-}
-tasks.setupDevWorkspace.dependsOn copyIndustrialcraft
-tasks.setupDecompWorkspace.dependsOn copyIndustrialcraft

gradle/scripts/dependencies.gradle

@@ -19,14 +19,14 @@
 
 
 repositories {
-
+    mavenLocal()
     maven {
-        name 'CB Maven FS'
+        name "ChickenBones"
         url "http://chickenbones.net/maven/"
     }
 
     maven {
-        name "Waila Mobius Repo"
+        name "Mobius"
         url "http://mobiusstrip.eu/maven"
     }
 
@@ -34,33 +34,86 @@ repositories {
         name "FireBall API Depot"
         url "http://dl.tsr.me/artifactory/libs-release-local"
     }
+
+    maven {
+        name = "Player"
+        url = "http://maven.ic2.player.to/"
+    }
+
+    maven {
+        name = "Tterrag"
+        url = "http://maven.tterrag.com/"
+    }
+
+    maven  {
+        name = "RX14 Proxy"
+        url = "http://mvn.rx14.co.uk/repo/"
+    }
+//  CurseForge DNS for TE is not available or I am just being unlucky, code part can stay since this is applicable to any other curseforge mod though
+//    ivy {
+//        name = "CoFHLib"
+//        artifactPattern "http://addons.cursecdn.com/files/2212/893/[module]-[revision].[ext]"
+//    }
+//
+//    ivy {
+//        name = "CoFHCore"
+//        artifactPattern "http://addons.cursecdn.com/files/2212/895/[module]-[revision].[ext]"
+//    }
+
+//    ivy {
+//        name = "ThermalExpansion"
+//        artifactPattern "http://addons.curse.cursecdn.com/files/2212/446/[module]-[revision].[ext]"
+//    }
+
+//    ivy {
+//        name = "ThermalFoundation"
+//        artifactPattern "http://addons.curse.cursecdn.com/files/2212/444/[module]-[revision].[ext]"
+//    }
+}
+
+configurations {
+    mods
 }
 
 dependencies {
+    // installable
+    mods "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev"
+    mods "mcp.mobius.jabba:Jabba:${jabba_version}_${minecraft_version}:dev"
+    mods "codechicken:EnderStorage:${minecraft_version}-${enderstorage_version}:dev"
+    mods "codechicken:Translocator:${minecraft_version}-${translocator_version}:dev"
+    mods "net.industrial-craft:industrialcraft-2:${ic2_version}-experimental:dev"
+    mods "com.enderio:EnderIO:${minecraft_version}-${enderio_version}:dev"
+    mods "net.mcft.copy.betterstorage:BetterStorage:${minecraft_version}-${betterstorage_version}:deobf"
+    mods "inventorytweaks:InventoryTweaks:${invtweaks_version}:deobf"
+//    mods name: 'CoFHLib', version: "[${minecraft_version}]${cofhlib_version}-dev", ext: 'jar'
+//    mods name: 'CoFHCore', version: "[${minecraft_version}]${cofhcore_version}-dev", ext: 'jar'
+//    mods name: 'ThermalExpansion', version: "[${minecraft_version}]${texpansion_version}-dev", ext: 'jar'
+//    mods name: 'ThermalFoundation', version: "[${minecraft_version}]${tfoundation_version}-dev", ext: 'jar'
 
-    compile "codechicken:ForgeMultipart:${config.cb_minecraft_version}-${config.fmp_version}:dev"
+    compile "codechicken:ForgeMultipart:${minecraft_version}-${fmp_version}:dev"
-    compile "codechicken:CodeChickenLib:${config.cb_minecraft_version}-${config.code_chicken_lib_version}:dev"
+    compile "codechicken:CodeChickenLib:${minecraft_version}-${code_chicken_lib_version}:dev"
-    compile "codechicken:CodeChickenCore:${config.cb_minecraft_version}-${config.code_chicken_core_version}:dev"
+    compile "codechicken:CodeChickenCore:${minecraft_version}-${code_chicken_core_version}:dev"
-    compile "codechicken:NotEnoughItems:${config.cb_minecraft_version}-${config.nei_version}:dev"
+    compile "codechicken:NotEnoughItems:${minecraft_version}-${nei_version}:dev"
+    compile "com.mod-buildcraft:buildcraft:${bc_version}:dev"
 
-    compile "mcp.mobius.waila:Waila:${config.waila_version}:dev"
+    // provided APIs
-	
+    compile "net.industrial-craft:industrialcraft-2:${ic2_version}-experimental:api"
-    compile(group: 'api', name: 'betterstorage', version: "${config.api_betterstorage_version}")
+    compile "net.mcft.copy.betterstorage:BetterStorage:${minecraft_version}-${betterstorage_version}:api"
-    compile(group: 'api', name: 'coloredlightscore', version: "${config.api_coloredlightscore_version}")
-    compile(group: 'api', name: 'craftguide', version: "${config.api_craftguide_version}")
-    compile(group: 'api', name: 'ic2', version: "${config.api_ic2_version}")
-    compile(group: 'api', name: 'immibis', version: "${config.api_immibis_version}")
-    compile(group: 'api', name: 'invtweaks', version: "${config.api_invtweaks_version}")
-    compile(group: 'api', name: 'mekansim', version: "${config.api_mekansim_version}")
-    compile(group: 'api', name: 'mfr', version: "${config.api_mfr_version}")
-    compile(group: 'api', name: 'railcraft', version: "${config.api_railcraft_version}")
-    compile(group: 'api', name: 'rblocks', version: "${config.api_rblocks_version}")
-    compile(group: 'api', name: 'rf', version: "${config.api_rf_version}")
-    compile(group: 'api', name: 'rotarycraft', version: "${config.api_rotarycraft_version}")
-    compile(group: 'dev', name: 'buildcraft', version: "${config.dev_buildcraft_version}")
 
-    // add hacked buildcraft jar to compile time (for facades)
+    // self compiled APIs
-    compile fileTree(dir: 'libs', include: '*.jar')
+    compile "appeng:Waila:${waila_version}_${minecraft_version}:api"
+    compile "appeng:RotaryCraft:${rotarycraft_version}:api"
+    compile "appeng:mekanism:${minecraft_version}-${mekansim_version}:api"
+    compile "appeng:InventoryTweaks:${invtweaks_version}:api"
+
+    // self compiled stubs
+    compile(group: 'api', name: 'coloredlightscore', version: "${api_coloredlightscore_version}")
+    compile(group: 'api', name: 'craftguide', version: "${api_craftguide_version}")
+    compile(group: 'api', name: 'immibis', version: "${api_immibis_version}")
+    compile(group: 'api', name: 'mfr', version: "${api_mfr_version}")
+    compile(group: 'api', name: 'railcraft', version: "${api_railcraft_version}")
+    compile(group: 'api', name: 'rblocks', version: "${api_rblocks_version}")
+    compile(group: 'api', name: 'rf', version: "${api_rf_version}")
 
     testCompile "junit:junit:4.11"
 }

gradle/scripts/integration.gradle

@@ -0,0 +1,7 @@
+apply plugin: 'idea'
+
+idea {
+    module {
+        inheritOutputDirs = true
+    }
+}

gradle/scripts/optional.gradle

@@ -0,0 +1,106 @@
+task wrapper(type: Wrapper) {
+    gradleVersion = "2.3"
+}
+
+// WAILA
+task installWaila(type: Copy, dependsOn: "deinstallWaila") {
+    from { configurations.mods }
+    include "**/*Waila*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallWaila(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Waila*.jar")
+}
+
+// JABBA
+task installJabba(type: Copy, dependsOn: "deinstallJabba") {
+    from { configurations.mods }
+    include "**/*Jabba*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallJabba(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Jabba*.jar")
+}
+
+// ENDER STORAGE
+task installEnderStorage(type: Copy, dependsOn: "deinstallEnderStorage") {
+    from { configurations.mods }
+    include "**/*EnderStorage*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallEnderStorage(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*EnderStorage*.jar")
+}
+
+// TRANSLOCATOR
+task installTranslocator(type: Copy, dependsOn: "deinstallTranslocator") {
+    from { configurations.mods }
+    include "**/*Translocator*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallTranslocator(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Translocator*.jar")
+}
+
+// INDUSTRIALCRAFT
+task installIC2(type: Copy, dependsOn: "deinstallIC2") {
+    from { configurations.mods }
+    include "**/*industrialcraft*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallIC2(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*industrialcraft*.jar")
+}
+
+// ENDER IO
+task installEnderIO(type: Copy, dependsOn: "deinstallEnderIO") {
+    from { configurations.mods }
+    include "**/*EnderIO*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallEnderIO(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*EnderIO*.jar")
+}
+
+// TE
+//task installTE(type: Copy, dependsOn: "deinstallTE") {
+//    from { configurations.mods }
+//    include "**/*CoFHLib*.jar"
+//    include "**/*CoFHCore*.jar"
+//    include "**/*ThermalFoundation*.jar"
+//    include "**/*ThermalExpansion*.jar"
+//
+//    into file(minecraft.runDir + "/mods")
+//}
+//
+//task deinstallTE(type: Delete) {
+//    delete fileTree(dir: minecraft.runDir + "/mods", includes: ["*CoFHLib*.jar", "*CoFHCore*.jar", "*ThermalFoundation*.jar", "*ThermalExpansion*.jar"])
+//}
+
+// INV TWEAKS
+task installInvTweaks(type: Copy, dependsOn: "deinstallInvTweaks") {
+    from { configurations.mods }
+    include "**/*InventoryTweaks*dev*.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallInvTweaks(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*InventoryTweaks*.jar")
+}
+
+// BETTER STORAGE
+task installBetterStorage(type: Copy, dependsOn: "deinstallBetterStorage") {
+    from { configurations.mods }
+    include "**/*BetterStorage*deobf*.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallBetterStorage(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*BetterStorage*.jar")
+}

gradle/scripts/propertyloader.gradle

@@ -1,9 +0,0 @@
-// define the properties file
-ext.configFile = file "build.properties"
-
-configFile.withReader {
-    // read config.  it shall from now on be referenced as simply config or as project.config
-    def prop = new Properties()
-    prop.load(it)
-    project.ext.config = new ConfigSlurper().parse prop
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Sep 13 21:58:22 CEST 2014
+#Sat May 02 19:28:20 CEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,7 +23,9 @@
 
 package appeng.api;
 
+
 import appeng.api.definitions.Blocks;
+import appeng.api.definitions.IDefinitions;
 import appeng.api.definitions.Items;
 import appeng.api.definitions.Materials;
 import appeng.api.definitions.Parts;
@@ -31,11 +33,11 @@ import appeng.api.exceptions.FailedConnection;
 import appeng.api.features.IRegistryContainer;
 import appeng.api.networking.IGridBlock;
 import appeng.api.networking.IGridConnection;
-import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
 import appeng.api.parts.IPartHelper;
 import appeng.api.storage.IStorageHelper;
 
+
 public interface IAppEngApi
 {
 
@@ -56,39 +58,57 @@ public interface IAppEngApi
 
 	/**
 	 * @return an accessible list of all of AE's Items
+	 *
+	 * @deprecated use {@link appeng.api.definitions.IDefinitions#items()}
 	 */
+	@Deprecated
 	Items items();
 
 	/**
 	 * @return an accessible list of all of AE's materials; materials are items
+	 *
+	 * @deprecated use {@link appeng.api.definitions.IDefinitions#materials()}
 	 */
+	@Deprecated
 	Materials materials();
 
 	/**
 	 * @return an accessible list of all of AE's blocks
+	 *
+	 * @deprecated use {@link appeng.api.definitions.IDefinitions#blocks()}
 	 */
+	@Deprecated
 	Blocks blocks();
 
 	/**
 	 * @return an accessible list of all of AE's parts, parts are items
+	 *
+	 * @deprecated use {@link appeng.api.definitions.IDefinitions#parts()}
 	 */
+	@Deprecated
 	Parts parts();
 
 	/**
-	 * create a grid node for your {@link IGridHost}
+	 * @return an accessible list of all AE definitions
-	 * 
-	 * @param block grid block
-	 * @return grid node of block
 	 */
-	IGridNode createGridNode(IGridBlock block);
+	IDefinitions definitions();
 
 	/**
-	 * create a connection between two {@link IGridNode}
+	 * 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 FailedConnection
+	 *
+	 * @throws appeng.api.exceptions.FailedConnection
 	 */
-	IGridConnection createGridConnection(IGridNode a, IGridNode b) throws FailedConnection;
+	IGridConnection createGridConnection( IGridNode a, IGridNode b ) throws FailedConnection;
-
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,22 +23,24 @@
 
 package appeng.api.config;
 
+
 public enum FuzzyMode
 {
 	// Note that percentage damaged, is the inverse of percentage durability.
-	IGNORE_ALL(-1), PERCENT_99(0), PERCENT_75(25), PERCENT_50(50), PERCENT_25(75);
+	IGNORE_ALL( -1 ), PERCENT_99( 0 ), PERCENT_75( 25 ), PERCENT_50( 50 ), PERCENT_25( 75 );
 
-	final public float breakPoint;
+	public final float breakPoint;
-	final public float percentage;
+	public final float percentage;
 
-	private FuzzyMode(float p) {
+	FuzzyMode( float p )
-		percentage = p;
+	{
-		breakPoint = p / 100.0f;
+		this.percentage = p;
+		this.breakPoint = p / 100.0f;
 	}
 
-	public int calculateBreakPoint(int maxDamage)
+	public int calculateBreakPoint( int maxDamage )
 	{
-		return (int) ((percentage * maxDamage) / 100.0f);
+		return (int) ( ( this.percentage * maxDamage ) / 100.0f );
 	}
 
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,47 +23,54 @@
 
 package appeng.api.config;
 
+
 import java.util.EnumSet;
+import javax.annotation.Nonnull;
+
 
 public enum Settings
 {
-	LEVEL_EMITTER_MODE(EnumSet.allOf( LevelEmitterMode.class )),
+	LEVEL_EMITTER_MODE( EnumSet.allOf( LevelEmitterMode.class ) ),
 
-	REDSTONE_EMITTER(EnumSet.of( RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL )), REDSTONE_CONTROLLED(EnumSet.allOf( RedstoneMode.class )),
+	REDSTONE_EMITTER( EnumSet.of( RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL ) ), 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 ));
+	STORAGE_FILTER( EnumSet.allOf( StorageFilter.class ) ), PLACE_BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) );
 
-	private EnumSet values;
+	private final EnumSet<? extends Enum<?>> values;
 
-	public EnumSet getPossibleValues()
+	Settings( @Nonnull EnumSet<? extends Enum<?>> possibleOptions )
 	{
-		return values;
+		if ( possibleOptions.isEmpty() )
+		{
+			throw new IllegalArgumentException( "Tried to instantiate an empty setting." );
+		}
+
+		this.values = possibleOptions;
 	}
 
-	private Settings(EnumSet set) {
+	public EnumSet<? extends Enum<?>> getPossibleValues()
-		if ( set == null || set.isEmpty() )
+	{
-			throw new RuntimeException( "Invalid configuration." );
+		return this.values;
-		values = set;
 	}
 
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,34 @@
+package appeng.api.definitions;
+
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.world.IBlockAccess;
+
+import com.google.common.base.Optional;
+
+
+public interface IBlockDefinition extends IItemDefinition
+{
+	/**
+	 * @return the {@link Block} implementation if applicable
+	 */
+	Optional<Block> maybeBlock();
+
+	/**
+	 * @return the {@link ItemBlock} implementation if applicable
+	 */
+	Optional<ItemBlock> maybeItemBlock();
+
+	/**
+	 * Compare Block with world.
+	 *
+	 * @param world world of block
+	 * @param 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

@@ -0,0 +1,165 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 AlgorithmX2
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.definitions;
+
+
+/**
+ * A list of all blocks in AE
+ */
+public interface IBlocks
+{
+	/*
+	 * world gen
+	 */
+	IBlockDefinition quartzOre();
+
+	IBlockDefinition quartzOreCharged();
+
+	IBlockDefinition matrixFrame();
+
+	/*
+	 * decorative
+	 */
+	IBlockDefinition quartz();
+
+	IBlockDefinition quartzPillar();
+
+	IBlockDefinition quartzChiseled();
+
+	IBlockDefinition quartzGlass();
+
+	IBlockDefinition quartzVibrantGlass();
+
+	IBlockDefinition quartzTorch();
+
+	IBlockDefinition fluix();
+
+	IBlockDefinition skyStone();
+
+	IBlockDefinition skyChest();
+
+	IBlockDefinition skyCompass();
+
+	IBlockDefinition skyStoneStair();
+
+	IBlockDefinition skyStoneBlockStair();
+
+	IBlockDefinition skyStoneBrickStair();
+
+	IBlockDefinition skyStoneSmallBrickStair();
+
+	IBlockDefinition fluixStair();
+
+	IBlockDefinition quartzStair();
+
+	IBlockDefinition chiseledQuartzStair();
+
+	IBlockDefinition quartzPillarStair();
+
+	/*
+	 * misc
+	 */
+	ITileDefinition grindStone();
+
+	ITileDefinition crankHandle();
+
+	ITileDefinition inscriber();
+
+	ITileDefinition wireless();
+
+	ITileDefinition charger();
+
+	ITileDefinition tinyTNT();
+
+	ITileDefinition security();
+
+	/*
+	 * quantum Network Bridge
+	 */
+	ITileDefinition quantumRing();
+
+	ITileDefinition quantumLink();
+
+	/*
+	 * spatial iO
+	 */
+	ITileDefinition spatialPylon();
+
+	ITileDefinition spatialIOPort();
+
+	/*
+	 * Bus / cables
+	 */
+	ITileDefinition multiPart();
+
+	/*
+	 * machines
+	 */
+	ITileDefinition controller();
+
+	ITileDefinition drive();
+
+	ITileDefinition chest();
+
+	ITileDefinition iface();
+
+	ITileDefinition cellWorkbench();
+
+	ITileDefinition iOPort();
+
+	ITileDefinition condenser();
+
+	ITileDefinition energyAcceptor();
+
+	ITileDefinition vibrationChamber();
+
+	ITileDefinition quartzGrowthAccelerator();
+
+	ITileDefinition energyCell();
+
+	ITileDefinition energyCellDense();
+
+	ITileDefinition energyCellCreative();
+
+	// rv1
+	ITileDefinition craftingUnit();
+
+	ITileDefinition craftingAccelerator();
+
+	ITileDefinition craftingStorage1k();
+
+	ITileDefinition craftingStorage4k();
+
+	ITileDefinition craftingStorage16k();
+
+	ITileDefinition craftingStorage64k();
+
+	ITileDefinition craftingMonitor();
+
+	ITileDefinition molecularAssembler();
+
+	ITileDefinition lightDetector();
+
+	ITileDefinition paint();
+}

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

@@ -0,0 +1,40 @@
+package appeng.api.definitions;
+
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.IBlockAccess;
+
+
+/**
+ * Interface to compare a definition with an itemstack or a block
+ *
+ * @author thatsIch
+ * @version rv2
+ * @since rv2
+ */
+public interface IComparableDefinition
+{
+	/**
+	 * 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 );
+}

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

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

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

@@ -0,0 +1,21 @@
+package appeng.api.definitions;
+
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+import com.google.common.base.Optional;
+
+
+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 );
+}

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

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

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

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

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

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

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

@@ -0,0 +1,15 @@
+package appeng.api.definitions;
+
+
+import net.minecraft.tileentity.TileEntity;
+
+import com.google.common.base.Optional;
+
+
+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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,10 +23,12 @@
 
 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.
  */
@@ -35,50 +37,50 @@ public interface IGrinderRegistry
 
 	/**
 	 * Current list of registered recipes, you can modify this if you want too.
-	 * 
+	 *
 	 * @return currentlyRegisteredRecipes
 	 */
-	public List<IGrinderEntry> getRecipes();
+	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 in    input
-	 * @param out output
+	 * @param out   output
 	 * @param turns amount of turns to turn the input into the output
 	 */
-	public void addRecipe(ItemStack in, ItemStack out, int turns);
+	void addRecipe( ItemStack in, ItemStack out, int turns );
 
 	/**
 	 * add a new recipe with optional outputs, duplicates will not be added.
-	 * 
+	 *
-	 * @param in input
+	 * @param in       input
-	 * @param out output
+	 * @param out      output
 	 * @param optional optional output
-	 * @param chance chance to get the optional output within 0.0 - 1.0
+	 * @param chance   chance to get the optional output within 0.0 - 1.0
-	 * @param turns amount of turns to turn the input into the outputs
+	 * @param turns    amount of turns to turn the input into the outputs
 	 */
-	void addRecipe(ItemStack in, ItemStack out, ItemStack optional, float chance, int turns);
+	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 in        input
-	 * @param out output
+	 * @param out       output
-	 * @param optional optional output
+	 * @param optional  optional output
-	 * @param chance chance to get the optional output within 0.0 - 1.0
+	 * @param chance    chance to get the optional output within 0.0 - 1.0
 	 * @param optional2 second optional output
-	 * @param chance2 chance to get the second optional output within 0.0 - 1.0
+	 * @param chance2   chance to get the second optional output within 0.0 - 1.0
-	 * @param turns amount of turns to turn the input into the outputs
+	 * @param turns     amount of turns to turn the input into the outputs
 	 */
-	void addRecipe(ItemStack in, ItemStack out, ItemStack optional, float chance, ItemStack optional2, float chance2, int turns);
+	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
 	 */
-	public IGrinderEntry getRecipeForInput(ItemStack input);
+	IGrinderEntry getRecipeForInput( ItemStack input );
-
 }

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

@@ -0,0 +1,65 @@
+package appeng.api.features;
+
+
+import java.util.List;
+import javax.annotation.Nonnull;
+
+import net.minecraft.item.ItemStack;
+
+import com.google.common.base.Optional;
+
+
+/**
+ * Registration Records for {@link IInscriberRegistry}
+ *
+ * You have to pay attention though, that recipes are not mirrored,
+ * where the top and bottom slots are switching places.
+ *
+ * This is applied on runtime.
+ *
+ * @author thatsIch
+ * @version rv2
+ * @since rv2
+ */
+public interface IInscriberRecipe
+{
+	/**
+	 * the current inputs
+	 *
+	 * @return inputs the inscriber will accept
+	 */
+	@Nonnull
+	List<ItemStack> getInputs();
+
+	/**
+	 * gets the current output
+	 *
+	 * @return output that the recipe will produce
+	 */
+	@Nonnull
+	ItemStack getOutput();
+
+	/**
+	 * gets the top optional
+	 *
+	 * @return item which is used top
+	 */
+	@Nonnull
+	Optional<ItemStack> getTopOptional();
+
+	/**
+	 * gets the bottom optional
+	 *
+	 * @return item which is used bottom
+	 */
+	@Nonnull
+	Optional<ItemStack> getBottomOptional();
+
+	/**
+	 * type of inscriber process
+	 *
+	 * @return type of process the inscriber is doing
+	 */
+	@Nonnull
+	InscriberProcessType getProcessType();
+}

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

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

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

@@ -0,0 +1,69 @@
+package appeng.api.features;
+
+
+import java.util.List;
+import java.util.Set;
+import javax.annotation.Nonnull;
+
+import net.minecraft.item.ItemStack;
+
+
+/**
+ * Lets you manipulate Inscriber Recipes, by adding or editing existing ones.
+ *
+ * @author thatsIch
+ * @version rv2
+ * @since rv2
+ */
+public interface IInscriberRegistry
+{
+	/**
+	 * Current list of registered recipes, you can modify this if you want too.
+	 * Will never contain a null recipe
+	 *
+	 * @return currentlyRegisteredRecipes
+	 */
+	@Nonnull
+	List<IInscriberRecipe> getRecipes();
+
+	/**
+	 * Optional items which are used in the top or bottom slot
+	 *
+	 * @return set of all optional items
+	 */
+	@Nonnull
+	Set<ItemStack> getOptionals();
+
+	/**
+	 * Get all registered items which are valid inputs
+	 *
+	 * @return set of all input items
+	 */
+	@Nonnull
+	Set<ItemStack> getInputs();
+
+	/**
+	 * Extensible way to create an inscriber recipe
+	 *
+	 * @return builder for inscriber recipes
+	 */
+	@Nonnull
+	IInscriberRecipeBuilder builder();
+
+	/**
+	 * add a new recipe the easy way, duplicates will not be added.
+	 * Added recipes will be automatically added to the optionals and inputs.
+	 *
+	 * @param recipe new recipe
+	 *
+	 * @throws IllegalArgumentException if null is added
+	 */
+	void addRecipe( IInscriberRecipe recipe );
+
+	/**
+	 * Removes a recipe 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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,9 +23,12 @@
 
 package appeng.api.features;
 
+
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.TunnelType;
 
+
 /**
  * A Registry for how p2p Tunnels are attuned
  */
@@ -35,20 +38,18 @@ public interface IP2PTunnelRegistry
 	/**
 	 * Allows third parties to register items from their mod as potential
 	 * attunements for AE's P2P Tunnels
-	 * 
+	 *
-	 * @param trigger
+	 * @param trigger - the item which triggers attunement
-	 *            - the item which triggers attunement
+	 * @param type    - the type of tunnel
-	 * @param type
-	 *            - the type of tunnel
 	 */
-	public abstract void addNewAttunement(ItemStack trigger, TunnelType type);
+	void addNewAttunement( ItemStack trigger, TunnelType type );
 
 	/**
 	 * returns null if no attunement can be found.
-	 * 
+	 *
 	 * @param trigger attunement trigger
+	 *
 	 * @return null if no attunement can be found or attunement
 	 */
-	TunnelType getTunnelTypeByItem(ItemStack trigger);
+	TunnelType getTunnelTypeByItem( ItemStack trigger );
-
 }

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

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

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,11 +23,19 @@
 
 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
 {
 
@@ -67,6 +75,11 @@ public interface IRegistryContainer
 	 */
 	IGrinderRegistry grinder();
 
+	/**
+	 * Manage inscriber recipes via API
+	 */
+	IInscriberRegistry inscriber();
+
 	/**
 	 * get access to the locatable registry
 	 */

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,28 +23,29 @@
 
 package appeng.api.features;
 
+
 import net.minecraft.item.ItemStack;
 
+
 /**
  * A Registry of any special comparison handlers for AE To use.
- * 
  */
 public interface ISpecialComparisonRegistry
 {
 
 	/**
 	 * return TheHandler or null.
-	 * 
+	 *
 	 * @param stack item
+	 *
 	 * @return a handler it found for a specific item
 	 */
-	IItemComparison getSpecialComparison(ItemStack stack);
+	IItemComparison getSpecialComparison( ItemStack stack );
 
 	/**
 	 * Register a new special comparison function with AE.
-	 * 
+	 *
 	 * @param prov comparison provider
 	 */
-	public void addComparisonProvider(IItemComparisonProvider prov);
+	void addComparisonProvider( IItemComparisonProvider prov );
-
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,10 +23,13 @@
 
 package appeng.api.features;
 
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.util.IConfigManager;
 
+
 /**
  * A handler for a wireless terminal.
  */
@@ -35,35 +38,37 @@ 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);
+	boolean canHandle( ItemStack is );
 
 	/**
 	 * use an amount of power, in AE units
-	 * 
+	 *
-	 * @param amount
+	 * @param amount is in AE units ( 5 per MJ ), if you return false, the item should be dead and return false for
-	 *            is in AE units ( 5 per MJ ), if you return false, the item should be dead and return false for
+	 *               hasPower
-	 *            hasPower
+	 * @param is     wireless terminal
-	 * @param is wireless terminal
+	 *
 	 * @return true if wireless terminal uses power
 	 */
-	boolean usePower(EntityPlayer player, double amount, ItemStack is);
+	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);
+	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);
+	IConfigManager getConfigManager( ItemStack is );
-	
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,10 +23,12 @@
 
 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.
  */
@@ -35,28 +37,29 @@ public interface IWirelessTermRegistry
 
 	/**
 	 * add this handler to the list of other wireless handler.
-	 * 
+	 *
 	 * @param handler wireless handler
 	 */
-	void registerWirelessHandler(IWirelessTermHandler 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);
+	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
+	 * isn't one
 	 */
-	IWirelessTermHandler getWirelessTerminalHandler(ItemStack is);
+	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);
+	void openWirelessTerminalGui( ItemStack item, World w, EntityPlayer player );
-
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,23 +23,24 @@
 
 package appeng.api.features;
 
+
 import net.minecraft.world.World;
 import net.minecraft.world.WorldProvider;
 
+
 public interface IWorldGen
 {
 
-	public enum WorldGenType
+	void disableWorldGenForProviderID( WorldGenType type, Class<? extends WorldProvider> provider );
+
+	void enableWorldGenForDimension( WorldGenType type, int dimID );
+
+	void disableWorldGenForDimension( WorldGenType type, int dimID );
+
+	boolean isWorldGenEnabled( WorldGenType type, World w );
+
+	enum WorldGenType
 	{
 		CertusQuartz, ChargedCertusQuartz, Meteorites
 	}
-
-	public void disableWorldGenForProviderID(WorldGenType type, Class<? extends WorldProvider> provider);
-
-	public void enableWorldGenForDimension(WorldGenType type, int dimID);
-
-	public void disableWorldGenForDimension(WorldGenType type, int dimID);
-
-	boolean isWorldGenEnabled(WorldGenType type, World w);
-
 }

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,11 +23,14 @@
 
 package appeng.api.implementations;
 
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+
 import appeng.api.networking.crafting.ICraftingPatternDetails;
 
+
 /**
  * Implemented on {@link Item}
  */
@@ -36,10 +39,11 @@ public interface ICraftingPatternItem
 
 	/**
 	 * Access Details about a pattern
-	 * 
+	 *
 	 * @param is pattern
-	 * @param w crafting world
+	 * @param w  crafting world
+	 *
 	 * @return details of pattern
 	 */
-	ICraftingPatternDetails getPatternForItem(ItemStack is, World w);
+	ICraftingPatternDetails getPatternForItem( ItemStack is, World w );
 }

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,10 +23,13 @@
 
 package appeng.api.implementations;
 
-import appeng.api.util.IConfigurableObject;
+
 import net.minecraft.tileentity.TileEntity;
+
 import appeng.api.config.Upgrades;
 import appeng.api.implementations.tiles.ISegmentedInventory;
+import appeng.api.util.IConfigurableObject;
+
 
 public interface IUpgradeableHost extends IConfigurableObject, ISegmentedInventory
 {
@@ -34,13 +37,12 @@ public interface IUpgradeableHost extends IConfigurableObject, ISegmentedInvento
 	/**
 	 * determine how many of an upgrade are installed.
 	 */
-	int getInstalledUpgrades(Upgrades u);
+	int getInstalledUpgrades( Upgrades u );
 
 	/**
 	 * the tile...
-	 * 
+	 *
 	 * @return tile entity
 	 */
 	TileEntity getTile();
-
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,6 +23,7 @@
 
 package appeng.api.implementations;
 
+
 /**
  * Defines the result of performing a transition from the world into a storage
  * cell, if its possible, and what the energy usage is.
@@ -32,8 +33,9 @@ public class TransitionResult
 	public final boolean success;
 	public final double energyUsage;
 
-	public TransitionResult(boolean _success, double power) {
+	public TransitionResult( boolean _success, double power )
-		success = _success;
+	{
-		energyUsage = power;
+		this.success = _success;
+		this.energyUsage = power;
 	}
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,9 +23,11 @@
 
 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.
@@ -33,6 +35,5 @@ import net.minecraft.world.World;
 public interface IGuiItem
 {
 
-	IGuiItemObject getGuiObject(ItemStack is, World world, int x, int y, int z);
+	IGuiItemObject getGuiObject( ItemStack is, World world, int x, int y, int z );
-
 }

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,9 +23,12 @@
 
 package appeng.api.implementations.guiobjects;
 
+
 import net.minecraft.inventory.IInventory;
+
 import appeng.api.networking.IGridHost;
 
+
 /**
  * Obtained via {@link IGuiItem} getGuiObject
  */
@@ -33,5 +36,4 @@ public interface INetworkTool extends IInventory, IGuiItemObject
 {
 
 	IGridHost getGridHost(); // null for most purposes.
-
 }

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,10 +23,13 @@
 
 package appeng.api.implementations.items;
 
+
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.AccessRestriction;
 import appeng.api.networking.energy.IAEPowerStorage;
 
+
 /**
  * Basically the same as {@link IAEPowerStorage}, but for items.
  */
@@ -36,36 +39,36 @@ public interface IAEItemPowerStorage
 	/**
 	 * Inject amt, power into the device, it will store what it can, and return
 	 * the amount unable to be stored.
-	 * 
+	 *
 	 * @return amount unable to be stored
 	 */
-	public double injectAEPower(ItemStack is, double amt);
+	double injectAEPower( ItemStack is, double amt );
 
 	/**
 	 * Attempt to extract power from the device, it will extract what it can and
 	 * return it.
-	 * 
+	 *
 	 * @param amt to be extracted power from device
+	 *
 	 * @return what it could extract
 	 */
-	public double extractAEPower(ItemStack is, double amt);
+	double extractAEPower( ItemStack is, double amt );
 
 	/**
 	 * @return the current maximum power ( this can change :P )
 	 */
-	public double getAEMaxPower(ItemStack is);
+	double getAEMaxPower( ItemStack is );
 
 	/**
 	 * @return the current AE Power Level, this may exceed getMEMaxPower()
 	 */
-	public double getAECurrentPower(ItemStack is);
+	double getAECurrentPower( ItemStack is );
 
 	/**
 	 * Control the power flow by telling what the network can do, either add? or
 	 * subtract? or both!
-	 * 
+	 *
 	 * @return access restriction of network
 	 */
-	public AccessRestriction getPowerFlow(ItemStack is);
+	AccessRestriction getPowerFlow( ItemStack is );
-
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,9 +23,11 @@
 
 package appeng.api.implementations.items;
 
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
+
 /**
  * Implemented on AE's wrench(s) as a substitute for if BC's API is not
  * available.
@@ -35,14 +37,13 @@ public interface IAEWrench
 
 	/**
 	 * Check if the wrench can be used.
-	 * 
+	 *
 	 * @param player wrenching player
-	 * @param x x pos of wrenched block
+	 * @param x      x pos of wrenched block
-	 * @param y y pos of wrenched block
+	 * @param y      y pos of wrenched block
-	 * @param z z pos of wrenched block
+	 * @param z      z pos of wrenched block
 	 *
 	 * @return true if wrench can be used
 	 */
-	boolean canWrench(ItemStack wrench, EntityPlayer player, int x, int y, int z);
+	boolean canWrench( ItemStack wrench, EntityPlayer player, int x, int y, int z );
-
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,13 +23,17 @@
 
 package appeng.api.implementations.items;
 
+
+import java.util.EnumSet;
+
+import net.minecraft.item.ItemStack;
+
+import com.mojang.authlib.GameProfile;
+
 import appeng.api.config.SecurityPermissions;
 import appeng.api.features.IPlayerRegistry;
 import appeng.api.networking.security.ISecurityRegistry;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.item.ItemStack;
 
-import java.util.EnumSet;
 
 public interface IBiometricCard
 {
@@ -37,50 +41,51 @@ public interface IBiometricCard
 	/**
 	 * Set the  {@link GameProfile} to null, to clear it.
 	 */
-	void setProfile(ItemStack itemStack, GameProfile username);
+	void setProfile( ItemStack itemStack, GameProfile username );
 
 	/**
 	 * @return {@link GameProfile} of the player encoded on this card, or a blank string.
 	 */
-	GameProfile getProfile(ItemStack is);
+	GameProfile getProfile( ItemStack is );
 
 	/**
 	 * @param itemStack card
+	 *
 	 * @return the full list of permissions encoded on the card.
 	 */
-	EnumSet<SecurityPermissions> getPermissions(ItemStack itemStack);
+	EnumSet<SecurityPermissions> getPermissions( ItemStack itemStack );
 
 	/**
 	 * Check if a permission is encoded on the card.
-	 * 
+	 *
 	 * @param permission card
+	 *
 	 * @return true if this permission is set on the card.
 	 */
-	boolean hasPermission(ItemStack is, SecurityPermissions permission);
+	boolean hasPermission( ItemStack is, SecurityPermissions permission );
 
 	/**
 	 * remove a permission from the item stack.
-	 * 
+	 *
-	 * @param itemStack card
+	 * @param itemStack  card
 	 * @param permission to be removed permission
 	 */
-	void removePermission(ItemStack itemStack, SecurityPermissions permission);
+	void removePermission( ItemStack itemStack, SecurityPermissions permission );
 
 	/**
 	 * add a permission to the item stack.
-	 * 
+	 *
-	 * @param itemStack card
+	 * @param itemStack  card
 	 * @param permission to be added permission
 	 */
-	void addPermission(ItemStack itemStack, SecurityPermissions permission);
+	void addPermission( ItemStack itemStack, SecurityPermissions permission );
 
 	/**
 	 * lets you handle submission of security values on the card for custom behavior.
-	 * 
+	 *
 	 * @param registry security registry
-	 * @param pr player registry
+	 * @param pr       player registry
-	 * @param is card
+	 * @param is       card
 	 */
-	void registerPermissions(ISecurityRegistry registry, IPlayerRegistry pr, ItemStack is);
+	void registerPermissions( ISecurityRegistry registry, IPlayerRegistry pr, ItemStack is );
-
 }

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

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

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,10 +23,12 @@
 
 package appeng.api.implementations.items;
 
-import net.minecraft.item.ItemStack;
 
 import java.util.Set;
 
+import net.minecraft.item.ItemStack;
+
+
 /**
  * Lets you specify the name of the group of items this falls under.
  */
@@ -35,10 +37,10 @@ public interface IItemGroup
 
 	/**
 	 * returning null, is the same as not implementing the interface at all.
-	 * 
+	 *
 	 * @param is item
+	 *
 	 * @return an unlocalized string to use for the items group name.
 	 */
-	String getUnlocalizedGroupName(Set<ItemStack> otherItems, ItemStack is);
+	String getUnlocalizedGroupName( Set<ItemStack> otherItems, ItemStack is );
-
 }

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

@@ -1,18 +1,18 @@
 /*
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013 AlgorithmX2
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -23,13 +23,15 @@
 
 package appeng.api.implementations.items;
 
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+
 /**
  * Memory Card API
- * 
+ *
  * AE's Memory Card Item Class implements this interface.
  */
 public interface IMemoryCard
@@ -38,42 +40,39 @@ public interface IMemoryCard
 	/**
 	 * Configures the data stored on the memory card, the SettingsName, will be
 	 * localized when displayed.
-	 * 
+	 *
-	 * @param is item
+	 * @param is           item
-	 * @param SettingsName
+	 * @param SettingsName unlocalized string that represents the tile entity.
-	 *            unlocalized string that represents the tile entity.
+	 * @param data         may contain a String called "tooltip" which is is a
-	 * @param data
+	 *                     unlocalized string displayed after the settings name, optional
-	 *            may contain a String called "tooltip" which is is a
+	 *                     but can be used to add details to the card for later.
-	 *            unlocalized string displayed after the settings name, optional
-	 *            but can be used to add details to the card for later.
 	 */
-	void setMemoryCardContents(ItemStack is, String SettingsName, NBTTagCompound data);
+	void setMemoryCardContents( ItemStack is, String SettingsName, NBTTagCompound data );
 
 	/**
 	 * returns the settings name provided by a previous call to
 	 * setMemoryCardContents, or "AppEng.GuiITooltip.Blank" if there was no
 	 * previous call to setMemoryCardContents.
-	 * 
+	 *
 	 * @param is item
+	 *
 	 * @return setting name
 	 */
-	String getSettingsName(ItemStack is);
+	String getSettingsName( ItemStack is );
 
 	/**
 	 * @param is item
+	 *
 	 * @return the NBT Data previously saved by setMemoryCardContents, or an
-	 *         empty NBTCompound
+	 * empty NBTCompound
 	 */
-	NBTTagCompound getData(ItemStack is);
+	NBTTagCompound getData( ItemStack is );
 
 	/**
 	 * notify the user of a outcome related to the memory card.
-	 * 
+	 *
-	 * @param player
+	 * @param player that used the card.
-	 *            that used the card.
+	 * @param msg    which message to send.
-	 * @param msg
-	 *            which message to send.
 	 */
-	void notifyUser(EntityPlayer player, MemoryCardMessages msg);
+	void notifyUser( EntityPlayer player, MemoryCardMessages msg );
-
 }