Merge pull request #1083 from thatsIch/b-1076-nei-crash

Fixes #1076 Crash on shift clicking a recipe from NEI

build.gradle

@@ -79,6 +79,7 @@ jar {
 minecraft {
     version = config.minecraft_version + "-" + config.forge_version
 
+    replaceIn "AEConfig.java"
     replace "@version@", project.version
     replace "@aechannel@", config.aechannel
 

build.properties

@@ -14,12 +14,12 @@ forge_version=10.13.2.1291
 # APIs used for development                             #
 #########################################################
 cb_minecraft_version=1.7.10
-fmp_version=1.1.1.321
-code_chicken_lib_version=1.1.1.110
+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
-waila_version=1.5.9_1.7.10
-bc_version=6.4.2
+waila_version=1.5.10_1.7.10
+bc_version=6.4.3
 
 #########################################################
 # API Stubs                                             #

src/api/java/appeng/api/storage/IMEInventory.java

@@ -49,7 +49,7 @@ public interface IMEInventory<StackType extends IAEStack>
 	 * @param src action source
 	 * @return returns the number of items not added.
 	 */
-	public StackType injectItems(StackType input, Actionable type, BaseActionSource src);
+	StackType injectItems( StackType input, Actionable type, BaseActionSource src );
 
 	/**
 	 * Extract the specified item from the ME Inventory
@@ -60,7 +60,7 @@ public interface IMEInventory<StackType extends IAEStack>
 	 *            simulate, or perform action?
 	 * @return returns the number of items extracted, null
 	 */
-	public StackType extractItems(StackType request, Actionable mode, BaseActionSource src);
+	StackType extractItems( StackType request, Actionable mode, BaseActionSource src );
 
 	/**
 	 * request a full report of all available items, storage.
@@ -69,11 +69,11 @@ public interface IMEInventory<StackType extends IAEStack>
 	 *            the IItemList the results will be written too
 	 * @return returns same list that was passed in, is passed out
 	 */
-	public IItemList<StackType> getAvailableItems(IItemList<StackType> out);
+	IItemList<StackType> getAvailableItems( IItemList<StackType> out );
 
 	/**
 	 * @return the type of channel your handler should be part of
 	 */
-	public StorageChannel getChannel();
+	StorageChannel getChannel();
 
 }

src/api/java/appeng/api/storage/IMEMonitor.java

@@ -30,12 +30,12 @@ import appeng.api.storage.data.IItemList;
 public interface IMEMonitor<T extends IAEStack> extends IMEInventoryHandler<T>, IBaseMonitor<T>
 {
 
-	@Override
-	@Deprecated
 	/**
 	 * This method is discouraged when accessing data via a IMEMonitor
 	 */
-	public IItemList<T> getAvailableItems(IItemList out);
+	@Override
+	@Deprecated
+	IItemList<T> getAvailableItems( IItemList out );
 
 	/**
 	 * Get access to the full item list of the network, preferred over {@link IMEInventory} .getAvailableItems(...)

src/main/java/appeng/block/networking/BlockCableBus.java

@@ -70,8 +70,8 @@ import appeng.parts.NullCableBusContainer;
 import appeng.tile.AEBaseTile;
 import appeng.tile.networking.TileCableBus;
 import appeng.tile.networking.TileCableBusTESR;
-import appeng.transformer.annotations.integration.Interface;
-import appeng.transformer.annotations.integration.Method;
+import appeng.transformer.annotations.Integration.Interface;
+import appeng.transformer.annotations.Integration.Method;
 import appeng.util.Platform;
 
 @Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = "MFR")

src/main/java/appeng/block/solids/BlockSkyStone.java

@@ -25,6 +25,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -163,10 +164,11 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
 	}
 
 	@Override
-	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
+	public ItemStack getPickBlock( MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player )
 	{
-		ItemStack is = super.getPickBlock( target, world, x, y, z );
+		final ItemStack is = super.getPickBlock( target, world, x, y, z, player );
 		is.setItemDamage( world.getBlockMetadata( x, y, z ) );
+
 		return is;
 	}
 

src/main/java/appeng/block/storage/BlockSkyChest.java

@@ -87,10 +87,11 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision
 	}
 
 	@Override
-	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
+	public ItemStack getPickBlock( MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player )
 	{
-		ItemStack is = super.getPickBlock( target, world, x, y, z );
+		final ItemStack is = super.getPickBlock( target, world, x, y, z, player );
 		is.setItemDamage( world.getBlockMetadata( x, y, z ) );
+
 		return is;
 	}
 

src/main/java/appeng/core/AEConfig.java

@@ -55,9 +55,6 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon
 
 	public static final double TUNNEL_POWER_LOSS = 0.05;
 
-	public String latestVersion = VERSION;
-	public long latestTimeStamp = 0;
-
 	public static final String VERSION = "@version@";
 	public static final String CHANNEL = "@aechannel@";
 
@@ -128,7 +125,7 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon
 			// AE
 			"CertusQuartz", "Wheat", "Fluix",
 			// Other Mod Ores
-			"Brass", "Platinum", "Nickel", "Invar", "Aluminium", "Electrum", "Osmium" };
+			"Brass", "Platinum", "Nickel", "Invar", "Aluminium", "Electrum", "Osmium", "Zinc" };
 
 	public double oreDoublePercentage = 90.0;
 
@@ -149,7 +146,7 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon
 	public boolean disableColoredCableRecipesInNEI = true;
 
 	public boolean updatable = false;
-	final private File myPath;
+	final private File configFile;
 
 	public double meteoriteClusterChance = 0.1;
 	public double meteoriteSpawnChance = 0.3;
@@ -224,22 +221,20 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon
 
 	public String getFilePath()
 	{
-		return this.myPath.toString();
+		return this.configFile.toString();
 	}
 
-	public AEConfig(String path) {
-		super( new File( path + "AppliedEnergistics2.cfg" ) );
-		this.myPath = new File( path + "AppliedEnergistics2.cfg" );
+	public AEConfig( File configFile ) {
+		super( configFile );
+		this.configFile = configFile;
 
 		FMLCommonHandler.instance().bus().register( this );
 
-		final double DEFAULT_BC_EXCHANGE = 5.0;
 		final double DEFAULT_IC2_EXCHANGE = 2.0;
 		final double DEFAULT_RTC_EXCHANGE = 1.0 / 11256.0;
 		final double DEFAULT_RF_EXCHANGE = 0.5;
 		final double DEFAULT_MEKANISM_EXCHANGE = 0.2;
 
-		PowerUnits.MJ.conversionRatio = this.get( "PowerRatios", "BuildCraft", DEFAULT_BC_EXCHANGE ).getDouble( DEFAULT_BC_EXCHANGE );
 		PowerUnits.MK.conversionRatio = this.get( "PowerRatios", "Mekanism", DEFAULT_MEKANISM_EXCHANGE ).getDouble( DEFAULT_MEKANISM_EXCHANGE );
 		PowerUnits.EU.conversionRatio = this.get( "PowerRatios", "IC2", DEFAULT_IC2_EXCHANGE ).getDouble( DEFAULT_IC2_EXCHANGE );
 		PowerUnits.WA.conversionRatio = this.get( "PowerRatios", "RotaryCraft", DEFAULT_RTC_EXCHANGE ).getDouble( DEFAULT_RTC_EXCHANGE );
@@ -340,19 +335,6 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon
 					this.craftingCalculationTimePerTick );
 		}
 
-		if ( this.isFeatureEnabled( AEFeature.VersionChecker ) )
-		{
-			try
-			{
-				this.latestVersion = this.get( "VersionChecker", "LatestVersion", "" ).getString();
-				this.latestTimeStamp = Long.parseLong( this.get( "VersionChecker", "LatestTimeStamp", "" ).getString() );
-			}
-			catch (NumberFormatException err)
-			{
-				this.latestTimeStamp = 0;
-			}
-		}
-
 		this.updatable = true;
 	}
 
@@ -411,12 +393,6 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon
 	@Override
 	public void save()
 	{
-		if ( this.isFeatureEnabled( AEFeature.VersionChecker ) )
-		{
-			this.get( "VersionChecker", "LatestVersion", this.latestVersion ).set( this.latestVersion );
-			this.get( "VersionChecker", "LatestTimeStamp", "" ).set( Long.toString( this.latestTimeStamp ) );
-		}
-
 		if ( this.isFeatureEnabled( AEFeature.SpatialIO ) )
 		{
 			this.get( "spatialio", "storageBiomeID", this.storageBiomeID ).set( this.storageBiomeID );

src/main/java/appeng/core/AppEng.java

@@ -22,8 +22,6 @@ package appeng.core;
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
-import com.google.common.base.Stopwatch;
-
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
@@ -37,6 +35,8 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 
+import com.google.common.base.Stopwatch;
+
 import appeng.core.crash.CrashEnhancement;
 import appeng.core.crash.CrashInfo;
 import appeng.core.features.AEFeature;
@@ -47,6 +47,7 @@ import appeng.integration.IntegrationRegistry;
 import appeng.integration.IntegrationType;
 import appeng.server.AECommand;
 import appeng.services.VersionChecker;
+import appeng.services.version.VersionCheckerConfig;
 import appeng.util.Platform;
 
 
@@ -70,7 +71,7 @@ public class AppEng
 
 	private final IMCHandler imcHandler;
 
-	private String configPath;
+	private File configDirectory;
 
 	public AppEng()
 	{
@@ -81,9 +82,9 @@ public class AppEng
 		FMLCommonHandler.instance().registerCrashCallable( new CrashEnhancement( CrashInfo.MOD_VERSION ) );
 	}
 
-	public String getConfigPath()
+	public final File getConfigDirectory()
 	{
-		return this.configPath;
+		return this.configDirectory;
 	}
 
 	public boolean isIntegrationEnabled( IntegrationType integrationName )
@@ -104,11 +105,16 @@ public class AppEng
 			CommonHelper.proxy.missingCoreMod();
 		}
 
-		Stopwatch star = Stopwatch.createStarted();
-		this.configPath = event.getModConfigurationDirectory().getPath() + File.separator + "AppliedEnergistics2" + File.separator;
+		Stopwatch watch = Stopwatch.createStarted();
+		this.configDirectory = new File(event.getModConfigurationDirectory().getPath(), "AppliedEnergistics2");
 
-		AEConfig.instance = new AEConfig( this.configPath );
-		FacadeConfig.instance = new FacadeConfig( this.configPath );
+		final File configFile = new File( this.configDirectory, "AppliedEnergistics2.cfg");
+		final File facadeFile = new File( this.configDirectory, "Facades.cfg" );
+		final File versionFile = new File( this.configDirectory, "VersionChecker.cfg" );
+
+		AEConfig.instance = new AEConfig( configFile );
+		FacadeConfig.instance = new FacadeConfig( facadeFile );
+		final VersionCheckerConfig versionCheckerConfig = new VersionCheckerConfig( versionFile );
 
 		AELog.info( "Pre Initialization ( started )" );
 
@@ -121,19 +127,23 @@ public class AppEng
 
 		Registration.INSTANCE.preInitialize( event );
 
-		if ( AEConfig.instance.isFeatureEnabled( AEFeature.VersionChecker ) )
+		if ( versionCheckerConfig.isEnabled() )
 		{
-			AELog.info( "Starting VersionChecker" );
-			this.startService( "AE2 VersionChecker", new Thread( new VersionChecker() ) );
+			final VersionChecker versionChecker = new VersionChecker( versionCheckerConfig );
+			final Thread versionCheckerThread = new Thread( versionChecker );
+
+			this.startService( "AE2 VersionChecker", versionCheckerThread );
 		}
 
-		AELog.info( "Pre Initialization ( ended after " + star.elapsed( TimeUnit.MILLISECONDS ) + "ms )" );
+		AELog.info( "Pre Initialization ( ended after " + watch.elapsed( TimeUnit.MILLISECONDS ) + "ms )" );
 	}
 
 	private void startService( String serviceName, Thread thread )
 	{
 		thread.setName( serviceName );
 		thread.setPriority( Thread.MIN_PRIORITY );
+
+		AELog.info( "Starting " + serviceName );
 		thread.start();
 	}
 

src/main/java/appeng/core/FacadeConfig.java

@@ -35,8 +35,8 @@ public class FacadeConfig extends Configuration
 	public static FacadeConfig instance;
 	final Pattern replacementPattern;
 
-	public FacadeConfig(String path) {
-		super( new File( path + "Facades.cfg" ) );
+	public FacadeConfig( File facadeFile ) {
+		super( facadeFile );
 		this.replacementPattern = Pattern.compile( "[^a-zA-Z0-9]" );
 	}
 

src/main/java/appeng/core/Registration.java

@@ -21,10 +21,6 @@ package appeng.core;
 
 import java.lang.reflect.Field;
 
-import com.google.common.base.Optional;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
-
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.biome.BiomeGenBase;
@@ -41,6 +37,10 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.VillagerRegistry;
 
+import com.google.common.base.Optional;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
 import appeng.api.AEApi;
 import appeng.api.IAppEngApi;
 import appeng.api.config.Upgrades;
@@ -546,7 +546,7 @@ public final class Registration
 		ItemMultiMaterial.instance.makeUnique();
 
 		if ( AEConfig.instance.isFeatureEnabled( AEFeature.CustomRecipes ) )
-			this.recipeHandler.parseRecipes( new ConfigLoader( AppEng.instance.getConfigPath() ), "index.recipe" );
+			this.recipeHandler.parseRecipes( new ConfigLoader( AppEng.instance.getConfigDirectory() ), "index.recipe" );
 		else
 			this.recipeHandler.parseRecipes( new JarLoader( "/assets/appliedenergistics2/recipes/" ), "index.recipe" );
 

src/main/java/appeng/core/features/AEFeature.java

@@ -62,7 +62,7 @@ public enum AEFeature
 
 	MassCannonBlockDamage("BlockFeatures"), TinyTNTBlockDamage("BlockFeatures"), Facades("Facades"),
 
-	VersionChecker("Services"), UnsupportedDeveloperTools("Misc", false), Creative("Misc"),
+	UnsupportedDeveloperTools("Misc", false), Creative("Misc"),
 
 	GrinderLogging("Misc", false), Logging("Misc"), IntegrationLogging("Misc", false), CustomRecipes("Crafting", false), WebsiteRecipes("Misc", false),
 

src/main/java/appeng/core/features/registries/GrinderRecipeManager.java

@@ -18,6 +18,7 @@
 
 package appeng.core.features.registries;
 
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -37,20 +38,20 @@ import appeng.recipes.ores.IOreListener;
 import appeng.recipes.ores.OreDictionaryHandler;
 import appeng.util.Platform;
 
-public class GrinderRecipeManager implements IGrinderRegistry, IOreListener
+
+public final class GrinderRecipeManager implements IGrinderRegistry, IOreListener
 {
+	private final List<IGrinderEntry> recipes;
+	private final Map<ItemStack, String> ores;
+	private final Map<ItemStack, String> ingots;
+	private final Map<String, ItemStack> dusts;
 
-	public final List<IGrinderEntry> RecipeList;
-
-	private ItemStack copy(ItemStack is)
+	public GrinderRecipeManager()
 	{
-		if ( is != null )
-			return is.copy();
-		return null;
-	}
-
-	public GrinderRecipeManager() {
-		this.RecipeList = new ArrayList<IGrinderEntry>();
+		this.recipes = new ArrayList<IGrinderEntry>();
+		this.ores = new HashMap<ItemStack, String>();
+		this.ingots = new HashMap<ItemStack, String>();
+		this.dusts = new HashMap<String, ItemStack>();
 
 		this.addOre( "Coal", new ItemStack( Items.coal ) );
 		this.addOre( "Charcoal", new ItemStack( Items.coal, 1, 1 ) );
@@ -78,20 +79,11 @@ public class GrinderRecipeManager implements IGrinderRegistry, IOreListener
 	public List<IGrinderEntry> getRecipes()
 	{
 		this.log( "API - getRecipes" );
-		return this.RecipeList;
-	}
-
-	private void injectRecipe(AppEngGrinderRecipe appEngGrinderRecipe)
-	{
-		for (IGrinderEntry gr : this.RecipeList)
-			if ( Platform.isSameItemPrecise( gr.getInput(), appEngGrinderRecipe.getInput() ) )
-				return;
-
-		this.RecipeList.add( appEngGrinderRecipe );
+		return this.recipes;
 	}
 
 	@Override
-	public void addRecipe(ItemStack in, ItemStack out, int cost)
+	public void addRecipe( ItemStack in, ItemStack out, int cost )
 	{
 		if ( in == null || out == null )
 		{
@@ -104,40 +96,54 @@ public class GrinderRecipeManager implements IGrinderRegistry, IOreListener
 	}
 
 	@Override
-	public void addRecipe(ItemStack in, ItemStack out, ItemStack optional, float chance, int cost)
+	public void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, int cost )
 	{
-		if ( in == null || (optional == null && out == null) )
+		if ( in == null || ( optional == null && out == null ) )
 		{
 			this.log( "Invalid Grinder Recipe Specified." );
 			return;
 		}
 
-		this.log( "Allow Grinding of " + Platform.getItemDisplayName( in ) + " to " + Platform.getItemDisplayName( out ) + " with optional "
-				+ Platform.getItemDisplayName( optional ) + " for " + cost );
+		this.log( "Allow Grinding of " + Platform.getItemDisplayName( in ) + " to " + Platform.getItemDisplayName( out ) + " with optional " + Platform.getItemDisplayName( optional ) + " for " + cost );
 		this.injectRecipe( new AppEngGrinderRecipe( this.copy( in ), this.copy( out ), this.copy( optional ), chance, cost ) );
 	}
 
 	@Override
-	public void addRecipe(ItemStack in, ItemStack out, ItemStack optional, float chance, ItemStack optional2, float chance2, int cost)
+	public void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, ItemStack optional2, float chance2, int cost )
 	{
-		if ( in == null || (optional == null && out == null && optional2 == null) )
+		if ( in == null || ( optional == null && out == null && optional2 == null ) )
 		{
 			this.log( "Invalid Grinder Recipe Specified." );
 			return;
 		}
 
-		this.log( "Allow Grinding of " + Platform.getItemDisplayName( in ) + " to " + Platform.getItemDisplayName( out ) + " with optional "
-				+ Platform.getItemDisplayName( optional ) + " for " + cost );
+		this.log( "Allow Grinding of " + Platform.getItemDisplayName( in ) + " to " + Platform.getItemDisplayName( out ) + " with optional " + Platform.getItemDisplayName( optional ) + " for " + cost );
 		this.injectRecipe( new AppEngGrinderRecipe( this.copy( in ), this.copy( out ), this.copy( optional ), chance, cost ) );
 	}
 
+	private void injectRecipe( AppEngGrinderRecipe appEngGrinderRecipe )
+	{
+		for ( IGrinderEntry gr : this.recipes )
+			if ( Platform.isSameItemPrecise( gr.getInput(), appEngGrinderRecipe.getInput() ) )
+				return;
+
+		this.recipes.add( appEngGrinderRecipe );
+	}
+
+	private ItemStack copy( ItemStack is )
+	{
+		if ( is != null )
+			return is.copy();
+		return null;
+	}
+
 	@Override
-	public IGrinderEntry getRecipeForInput(ItemStack input)
+	public IGrinderEntry getRecipeForInput( ItemStack input )
 	{
 		this.log( "Looking up recipe for " + Platform.getItemDisplayName( input ) );
 		if ( input != null )
 		{
-			for (IGrinderEntry r : this.RecipeList)
+			for ( IGrinderEntry r : this.recipes )
 			{
 				if ( Platform.isSameItem( input, r.getInput() ) )
 				{
@@ -152,12 +158,12 @@ public class GrinderRecipeManager implements IGrinderRegistry, IOreListener
 		return null;
 	}
 
-	public void log(String o)
+	public void log( String o )
 	{
 		AELog.grinder( o );
 	}
 
-	private int getDustToOreRatio(String name)
+	private int getDustToOreRatio( String name )
 	{
 		if ( name.equals( "Obsidian" ) )
 			return 1;
@@ -168,52 +174,48 @@ public class GrinderRecipeManager implements IGrinderRegistry, IOreListener
 		return 2;
 	}
 
-	public final Map<ItemStack, String> Ores = new HashMap<ItemStack, String>();
-	public final Map<ItemStack, String> Ingots = new HashMap<ItemStack, String>();
-	public final Map<String, ItemStack> Dusts = new HashMap<String, ItemStack>();
-
-	private void addOre(String name, ItemStack item)
+	private void addOre( String name, ItemStack item )
 	{
 		if ( item == null )
 			return;
 		this.log( "Adding Ore - " + name + " : " + Platform.getItemDisplayName( item ) );
 
-		this.Ores.put( item, name );
+		this.ores.put( item, name );
 
-		if ( this.Dusts.containsKey( name ) )
+		if ( this.dusts.containsKey( name ) )
 		{
-			ItemStack is = this.Dusts.get( name ).copy();
+			ItemStack is = this.dusts.get( name ).copy();
 			int ratio = this.getDustToOreRatio( name );
 			if ( ratio > 1 )
 			{
 				ItemStack extra = is.copy();
 				extra.stackSize = ratio - 1;
-				this.addRecipe( item, is, extra, (float) (AEConfig.instance.oreDoublePercentage / 100.0), 8 );
+				this.addRecipe( item, is, extra, (float) ( AEConfig.instance.oreDoublePercentage / 100.0 ), 8 );
 			}
 			else
 				this.addRecipe( item, is, 8 );
 		}
 	}
 
-	private void addIngot(String name, ItemStack item)
+	private void addIngot( String name, ItemStack item )
 	{
 		if ( item == null )
 			return;
 		this.log( "Adding Ingot - " + name + " : " + Platform.getItemDisplayName( item ) );
 
-		this.Ingots.put( item, name );
+		this.ingots.put( item, name );
 
-		if ( this.Dusts.containsKey( name ) )
+		if ( this.dusts.containsKey( name ) )
 		{
-			this.addRecipe( item, this.Dusts.get( name ), 4 );
+			this.addRecipe( item, this.dusts.get( name ), 4 );
 		}
 	}
 
-	private void addDust(String name, ItemStack item)
+	private void addDust( String name, ItemStack item )
 	{
 		if ( item == null )
 			return;
-		if ( this.Dusts.containsKey( name ) )
+		if ( this.dusts.containsKey( name ) )
 		{
 			this.log( "Rejecting Dust - " + name + " : " + Platform.getItemDisplayName( item ) );
 			return;
@@ -221,9 +223,9 @@ public class GrinderRecipeManager implements IGrinderRegistry, IOreListener
 
 		this.log( "Adding Dust - " + name + " : " + Platform.getItemDisplayName( item ) );
 
-		this.Dusts.put( name, item );
+		this.dusts.put( name, item );
 
-		for (Entry<ItemStack, String> d : this.Ores.entrySet())
+		for ( Entry<ItemStack, String> d : this.ores.entrySet() )
 			if ( name.equals( d.getValue() ) )
 			{
 				ItemStack is = item.copy();
@@ -233,23 +235,23 @@ public class GrinderRecipeManager implements IGrinderRegistry, IOreListener
 				{
 					ItemStack extra = is.copy();
 					extra.stackSize = ratio - 1;
-					this.addRecipe( d.getKey(), is, extra, (float) (AEConfig.instance.oreDoublePercentage / 100.0), 8 );
+					this.addRecipe( d.getKey(), is, extra, (float) ( AEConfig.instance.oreDoublePercentage / 100.0 ), 8 );
 				}
 				else
 					this.addRecipe( d.getKey(), is, 8 );
 			}
 
-		for (Entry<ItemStack, String> d : this.Ingots.entrySet())
+		for ( Entry<ItemStack, String> d : this.ingots.entrySet() )
 			if ( name.equals( d.getValue() ) )
 				this.addRecipe( d.getKey(), item, 4 );
 	}
 
 	@Override
-	public void oreRegistered(String name, ItemStack item)
+	public void oreRegistered( String name, ItemStack item )
 	{
 		if ( name.startsWith( "ore" ) || name.startsWith( "crystal" ) || name.startsWith( "gem" ) || name.startsWith( "ingot" ) || name.startsWith( "dust" ) )
 		{
-			for (String ore : AEConfig.instance.grinderOres)
+			for ( String ore : AEConfig.instance.grinderOres )
 			{
 				if ( name.equals( "ore" + ore ) )
 				{

src/main/java/appeng/core/features/registries/LocatableRegistry.java

@@ -63,6 +63,7 @@ public final class LocatableRegistry implements ILocatableRegistry
 	 * Find a locate-able object by its serial.
 	 */
 	@Override
+	@Deprecated
 	public Object findLocatableBySerial( long ser )
 	{
 		return this.set.get( ser );

src/main/java/appeng/core/sync/packets/PacketCompassRequest.java

@@ -29,7 +29,7 @@ import appeng.core.WorldSettings;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.core.sync.network.NetworkHandler;
-import appeng.services.helpers.ICompassCallback;
+import appeng.services.compass.ICompassCallback;
 
 public class PacketCompassRequest extends AppEngPacket implements ICompassCallback
 {

src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java

@@ -195,23 +195,26 @@ public class PacketNEIRecipe extends AppEngPacket
 									// If that doesn't work, grab from the player's inventory
 									if ( whichItem == null && playerInventory != null )
 									{
-										ItemStack playerItemStack = null;
-										for ( int y = 0; y < playerInventory.getSizeInventory(); y++ )
+										for ( int y = 0; y < this.recipe[x].length; y++ )
 										{
-											// check if the item in slot y matches the required item.
-											playerItemStack = playerInventory.getStackInSlot( y );
-											if ( playerItemStack != null && playerItemStack.getItem() == this.recipe[x][y].getItem() )
+											ItemStack playerItemStack = null;
+											for ( int i = 0; i < playerInventory.getSizeInventory(); i++ )
 											{
-												if ( realForFake == Actionable.SIMULATE )
+												// check if the item in slot y matches the required item.
+												playerItemStack = playerInventory.getStackInSlot( i );
+												if ( playerItemStack != null && this.recipe[x][y] != null && playerItemStack.getItem() == this.recipe[x][y].getItem() )
 												{
-													whichItem = playerInventory.getStackInSlot( y ).copy();
-													whichItem.stackSize = 1;
+													if ( realForFake == Actionable.SIMULATE )
+													{
+														whichItem = playerInventory.getStackInSlot( i ).copy();
+														whichItem.stackSize = 1;
+													}
+													else
+													{
+														whichItem = playerInventory.decrStackSize( i, 1 );
+													}
+													break;
 												}
-												else
-												{
-													whichItem = playerInventory.decrStackSize( y, 1 );
-												}
-												break;
 											}
 										}
 									}

src/main/java/appeng/helpers/DualityInterface.java

@@ -1080,7 +1080,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 					{
 						if ( mop.blockX == te.xCoord && mop.blockY == te.yCoord && mop.blockZ == te.zCoord )
 						{
-							ItemStack g = blk.getPickBlock( mop, w, te.xCoord, te.yCoord, te.zCoord );
+							ItemStack g = blk.getPickBlock( mop, w, te.xCoord, te.yCoord, te.zCoord, null );
 							if ( g != null )
 								what = g;
 						}

src/main/java/appeng/helpers/WirelessTerminalGuiObject.java

@@ -27,6 +27,7 @@ import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
+import appeng.api.features.ILocatable;
 import appeng.api.features.IWirelessTermHandler;
 import appeng.api.implementations.guiobjects.IPortableCell;
 import appeng.api.implementations.tiles.IWirelessAccessPoint;
@@ -76,12 +77,12 @@ public class WirelessTerminalGuiObject implements IPortableCell, IActionHost
 		this.myPlayer = ep;
 		this.wth = wh;
 
-		Object obj = null;
+		ILocatable obj = null;
 
 		try
 		{
 			long encKey = Long.parseLong( this.encryptionKey );
-			obj = AEApi.instance().registries().locatable().findLocatableBySerial( encKey );
+			obj = AEApi.instance().registries().locatable().getLocatableBy( encKey );
 		}
 		catch (NumberFormatException err)
 		{

src/main/java/appeng/hooks/MeteoriteWorldGen.java

@@ -33,7 +33,7 @@ import appeng.core.AEConfig;
 import appeng.core.WorldSettings;
 import appeng.core.features.registries.WorldGenRegistry;
 import appeng.helpers.MeteoritePlacer;
-import appeng.services.helpers.ICompassCallback;
+import appeng.services.compass.ICompassCallback;
 import appeng.util.Platform;
 
 final public class MeteoriteWorldGen implements IWorldGenerator

src/main/java/appeng/items/tools/ToolNetworkTool.java

@@ -50,7 +50,7 @@ import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketClick;
 import appeng.items.AEBaseItem;
 import appeng.items.contents.NetworkToolViewer;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
 import appeng.util.Platform;
 
 

src/main/java/appeng/items/tools/powered/powersink/IC2.java

@@ -29,9 +29,9 @@ import ic2.api.item.IElectricItemManager;
 import ic2.api.item.ISpecialElectricItem;
 
 import appeng.api.config.PowerUnits;
-import appeng.transformer.annotations.integration.Interface;
-import appeng.transformer.annotations.integration.InterfaceList;
-import appeng.transformer.annotations.integration.Method;
+import appeng.transformer.annotations.Integration.Interface;
+import appeng.transformer.annotations.Integration.InterfaceList;
+import appeng.transformer.annotations.Integration.Method;
 
 
 @InterfaceList( value = { @Interface( iface = "ic2.api.item.ISpecialElectricItem", iname = "IC2" ),

src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java

@@ -26,7 +26,7 @@ import net.minecraft.item.ItemStack;
 import cofh.api.energy.IEnergyContainerItem;
 
 import appeng.api.config.PowerUnits;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
 
 
 @Interface( iface = "cofh.api.energy.IEnergyContainerItem", iname = "RFItem" )

src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java

@@ -35,7 +35,7 @@ import appeng.api.implementations.items.IAEWrench;
 import appeng.api.util.DimensionalCoord;
 import appeng.core.features.AEFeature;
 import appeng.items.AEBaseItem;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
 import appeng.util.Platform;
 
 

src/main/java/appeng/me/GridConnection.java

@@ -77,8 +77,12 @@ public class GridConnection implements IGridConnection, IPathItem
 			throw new GridException( "Connection Forged Between null entities." );
 
 		if ( a.hasConnection( b ) || b.hasConnection( a ) )
-			throw new GridException( "Connection already exists." );
+		{
+			final String aCoords = a.getGridBlock().getLocation().toString();
+			final String bCoords = b.getGridBlock().getLocation().toString();
 
+			throw new GridException( String.format( "Connection already exists between node at [%s] and node at [%s].", aCoords, bCoords ) );
+		}
 		this.sideA = a;
 		this.fromAtoB = fromAtoB;
 		this.sideB = b;

src/main/java/appeng/me/cluster/implementations/QuantumCluster.java

@@ -81,7 +81,7 @@ public class QuantumCluster implements ILocatable, IAECluster
 
 	public boolean canUseNode(long qe)
 	{
-		QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().findLocatableBySerial( qe );
+		QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().getLocatableBy( qe );
 		if ( qc != null )
 		{
 			World theWorld = qc.getCenter().getWorldObj();
@@ -147,7 +147,7 @@ public class QuantumCluster implements ILocatable, IAECluster
 			}
 		}
 
-		Object myOtherSide = this.otherSide == 0 ? null : AEApi.instance().registries().locatable().findLocatableBySerial( this.otherSide );
+		ILocatable myOtherSide = this.otherSide == 0 ? null : AEApi.instance().registries().locatable().getLocatableBy( this.otherSide );
 
 		boolean shutdown = false;
 

src/main/java/appeng/me/storage/CellInventoryHandler.java

@@ -101,14 +101,14 @@ public class CellInventoryHandler extends MEInventoryHandler<IAEItemStack> imple
 					priorityList.add( AEItemStack.create( is ) );
 			}
 
-			this.myWhitelist = hasInverter ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST;
+			this.setWhitelist( hasInverter ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST );
 
 			if ( !priorityList.isEmpty() )
 			{
 				if ( hasFuzzy )
-					this.myPartitionList = new FuzzyPriorityList<IAEItemStack>( priorityList, fzMode );
+					this.setPartitionList( new FuzzyPriorityList<IAEItemStack>( priorityList, fzMode ) );
 				else
-					this.myPartitionList = new PrecisePriorityList<IAEItemStack>( priorityList );
+					this.setPartitionList( new PrecisePriorityList<IAEItemStack>( priorityList ) );
 			}
 		}
 	}
@@ -116,19 +116,19 @@ public class CellInventoryHandler extends MEInventoryHandler<IAEItemStack> imple
 	@Override
 	public boolean isPreformatted()
 	{
-		return ! this.myPartitionList.isEmpty();
+		return ! this.getPartitionList().isEmpty();
 	}
 
 	@Override
 	public boolean isFuzzy()
 	{
-		return this.myPartitionList instanceof FuzzyPriorityList;
+		return this.getPartitionList() instanceof FuzzyPriorityList;
 	}
 
 	@Override
 	public IncludeExclude getIncludeExcludeMode()
 	{
-		return this.myWhitelist;
+		return this.getWhitelist();
 	}
 
 	public int getStatusForCell()

src/main/java/appeng/me/storage/MEInventoryHandler.java

@@ -18,6 +18,7 @@
 
 package appeng.me.storage;
 
+
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.config.IncludeExclude;
@@ -31,6 +32,7 @@ import appeng.api.storage.data.IItemList;
 import appeng.util.prioitylist.DefaultPriorityList;
 import appeng.util.prioitylist.IPartitionList;
 
+
 public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHandler<T>
 {
 
@@ -38,24 +40,78 @@ public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHa
 	final protected IMEMonitor<T> monitor;
 	final protected IMEInventoryHandler<T> internal;
 
-	public int myPriority = 0;
-	public IncludeExclude myWhitelist = IncludeExclude.WHITELIST;
-	public AccessRestriction myAccess = AccessRestriction.READ_WRITE;
-	public IPartitionList<T> myPartitionList = new DefaultPriorityList<T>();
+	private int myPriority;
+	private IncludeExclude myWhitelist;
+	private AccessRestriction myAccess;
+	private IPartitionList<T> myPartitionList;
 
-	public MEInventoryHandler(IMEInventory<T> i, StorageChannel channel) {
+	private AccessRestriction cachedAccessRestriction;
+	private boolean hasReadAccess;
+	private boolean hasWriteAccess;
+
+	public MEInventoryHandler( IMEInventory<T> i, StorageChannel channel )
+	{
 		this.channel = channel;
 
 		if ( i instanceof IMEInventoryHandler )
-			this.internal = (IMEInventoryHandler<T>) i;
+			this.internal = ( IMEInventoryHandler<T> ) i;
 		else
 			this.internal = new MEPassThrough<T>( i, channel );
 
-		this.monitor = this.internal instanceof IMEMonitor ? (IMEMonitor<T>) this.internal : null;
+		this.monitor = this.internal instanceof IMEMonitor ? ( IMEMonitor<T> ) this.internal : null;
+
+		this.setPriority( 0 );
+		this.setWhitelist( IncludeExclude.WHITELIST );
+		this.setBaseAccess( AccessRestriction.READ_WRITE );
+		this.setPartitionList( new DefaultPriorityList<T>() );
 	}
 
 	@Override
-	public T injectItems(T input, Actionable type, BaseActionSource src)
+	public int getPriority()
+	{
+		return this.myPriority;
+	}
+
+	public void setPriority( int myPriority )
+	{
+		this.myPriority = myPriority;
+	}
+
+	public IncludeExclude getWhitelist()
+	{
+		return this.myWhitelist;
+	}
+
+	public void setWhitelist( IncludeExclude myWhitelist )
+	{
+		this.myWhitelist = myWhitelist;
+	}
+
+	public AccessRestriction getBaseAccess()
+	{
+		return this.myAccess;
+	}
+
+	public void setBaseAccess( AccessRestriction myAccess )
+	{
+		this.myAccess = myAccess;
+		this.cachedAccessRestriction = this.myAccess.restrictPermissions( this.internal.getAccess() );
+		this.hasReadAccess = this.getAccess().hasPermission( AccessRestriction.READ );
+		this.hasWriteAccess = this.getAccess().hasPermission( AccessRestriction.WRITE );
+	}
+
+	public IPartitionList<T> getPartitionList()
+	{
+		return this.myPartitionList;
+	}
+
+	public void setPartitionList( IPartitionList<T> myPartitionList )
+	{
+		this.myPartitionList = myPartitionList;
+	}
+
+	@Override
+	public T injectItems( T input, Actionable type, BaseActionSource src )
 	{
 		if ( !this.canAccept( input ) )
 			return input;
@@ -64,18 +120,18 @@ public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHa
 	}
 
 	@Override
-	public T extractItems(T request, Actionable type, BaseActionSource src)
+	public T extractItems( T request, Actionable type, BaseActionSource src )
 	{
-		if ( !this.getAccess().hasPermission( AccessRestriction.READ ) )
+		if ( !hasReadAccess )
 			return null;
 
 		return this.internal.extractItems( request, type, src );
 	}
 
 	@Override
-	public IItemList<T> getAvailableItems(IItemList<T> out)
+	public IItemList<T> getAvailableItems( IItemList<T> out )
 	{
-		if ( !this.getAccess().hasPermission( AccessRestriction.READ ) )
+		if ( !hasReadAccess )
 			return out;
 
 		return this.internal.getAvailableItems( out );
@@ -90,11 +146,11 @@ public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHa
 	@Override
 	public AccessRestriction getAccess()
 	{
-		return this.myAccess.restrictPermissions( this.internal.getAccess() );
+		return this.cachedAccessRestriction;
 	}
 
 	@Override
-	public boolean isPrioritized(T input)
+	public boolean isPrioritized( T input )
 	{
 		if ( this.myWhitelist == IncludeExclude.WHITELIST )
 			return this.myPartitionList.isListed( input ) || this.internal.isPrioritized( input );
@@ -102,9 +158,9 @@ public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHa
 	}
 
 	@Override
-	public boolean canAccept(T input)
+	public boolean canAccept( T input )
 	{
-		if ( !this.getAccess().hasPermission( AccessRestriction.WRITE ) )
+		if ( !hasWriteAccess )
 			return false;
 
 		if ( this.myWhitelist == IncludeExclude.BLACKLIST && this.myPartitionList.isListed( input ) )
@@ -114,12 +170,6 @@ public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHa
 		return this.myPartitionList.isListed( input ) && this.internal.canAccept( input );
 	}
 
-	@Override
-	public int getPriority()
-	{
-		return this.myPriority;
-	}
-
 	@Override
 	public int getSlot()
 	{
@@ -132,7 +182,7 @@ public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHa
 	}
 
 	@Override
-	public boolean validForPass(int i)
+	public boolean validForPass( int i )
 	{
 		return true;
 	}

src/main/java/appeng/me/storage/NetworkInventoryHandler.java

@@ -24,6 +24,7 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.NavigableMap;
+import java.util.TreeMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 
 import appeng.api.config.AccessRestriction;
@@ -64,7 +65,7 @@ public class NetworkInventoryHandler<T extends IAEStack<T>> implements IMEInvent
 	public NetworkInventoryHandler(StorageChannel chan, SecurityCache security) {
 		this.myChannel = chan;
 		this.security = security;
-		this.priorityInventory = new ConcurrentSkipListMap<Integer, List<IMEInventoryHandler<T>>>( PRIORITY_SORTER ); // TreeMultimap.create( prioritySorter, hashSorter );
+		this.priorityInventory = new TreeMap<Integer, List<IMEInventoryHandler<T>>>( PRIORITY_SORTER ); // TreeMultimap.create( prioritySorter, hashSorter );
 	}
 
 	public void addNewStorage(IMEInventoryHandler<T> h)

src/main/java/appeng/parts/automation/PartFormationPlane.java

@@ -313,9 +313,10 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
 
 	private void updateHandler()
 	{
-		this.myHandler.myAccess = AccessRestriction.WRITE;
-		this.myHandler.myWhitelist = this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST;
-		this.myHandler.myPriority = this.priority;
+		this.myHandler.setBaseAccess( AccessRestriction.WRITE );
+		;
+		this.myHandler.setWhitelist( this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST );
+		this.myHandler.setPriority( this.priority );
 
 		IItemList<IAEItemStack> priorityList = AEApi.instance().storage().createItemList();
 
@@ -328,9 +329,9 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
 		}
 
 		if ( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
-			this.myHandler.myPartitionList = new FuzzyPriorityList( priorityList, ( FuzzyMode ) this.getConfigManager().getSetting( Settings.FUZZY_MODE ) );
+			this.myHandler.setPartitionList( new FuzzyPriorityList( priorityList, ( FuzzyMode ) this.getConfigManager().getSetting( Settings.FUZZY_MODE ) ) );
 		else
-			this.myHandler.myPartitionList = new PrecisePriorityList( priorityList );
+			this.myHandler.setPartitionList( new PrecisePriorityList( priorityList ) );
 
 		try
 		{

src/main/java/appeng/parts/misc/PartStorageBus.java

@@ -82,8 +82,8 @@ import appeng.me.storage.MEMonitorIInventory;
 import appeng.parts.automation.PartUpgradeable;
 import appeng.tile.inventory.AppEngInternalAEInventory;
 import appeng.tile.inventory.InvOperation;
-import appeng.transformer.annotations.integration.Interface;
-import appeng.transformer.annotations.integration.Method;
+import appeng.transformer.annotations.Integration.Interface;
+import appeng.transformer.annotations.Integration.Method;
 import appeng.util.Platform;
 import appeng.util.prioitylist.FuzzyPriorityList;
 import appeng.util.prioitylist.PrecisePriorityList;
@@ -319,9 +319,9 @@ public class PartStorageBus
 
 					this.handler = new MEInventoryHandler( inv, StorageChannel.ITEMS );
 
-					this.handler.myAccess = ( AccessRestriction ) this.getConfigManager().getSetting( Settings.ACCESS );
-					this.handler.myWhitelist = this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST;
-					this.handler.myPriority = this.priority;
+					this.handler.setBaseAccess( ( AccessRestriction ) this.getConfigManager().getSetting( Settings.ACCESS ) );;
+					this.handler.setWhitelist( this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST );
+					this.handler.setPriority( this.priority );
 
 					IItemList<IAEItemStack> priorityList = AEApi.instance().storage().createItemList();
 
@@ -334,9 +334,9 @@ public class PartStorageBus
 					}
 
 					if ( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
-						this.handler.myPartitionList = new FuzzyPriorityList( priorityList, ( FuzzyMode ) this.getConfigManager().getSetting( Settings.FUZZY_MODE ) );
+						this.handler.setPartitionList( new FuzzyPriorityList( priorityList, ( FuzzyMode ) this.getConfigManager().getSetting( Settings.FUZZY_MODE ) ) );
 					else
-						this.handler.myPartitionList = new PrecisePriorityList( priorityList );
+						this.handler.setPartitionList ( new PrecisePriorityList( priorityList ));
 
 					if ( inv instanceof IMEMonitor )
 						( ( IMEMonitor ) inv ).addListener( this, this.handler );

src/main/java/appeng/parts/p2p/PartP2PIC2Power.java

@@ -36,8 +36,8 @@ import appeng.core.AppEng;
 import appeng.integration.IntegrationType;
 import appeng.me.GridAccessException;
 import appeng.me.cache.helpers.TunnelCollection;
-import appeng.transformer.annotations.integration.Interface;
-import appeng.transformer.annotations.integration.InterfaceList;
+import appeng.transformer.annotations.Integration.Interface;
+import appeng.transformer.annotations.Integration.InterfaceList;
 import appeng.util.Platform;
 
 @InterfaceList(value = { @Interface(iface = "ic2.api.energy.tile.IEnergySink", iname = "IC2"),

src/main/java/appeng/parts/p2p/PartP2PItems.java

@@ -53,8 +53,8 @@ import appeng.integration.abstraction.IBC;
 import appeng.me.GridAccessException;
 import appeng.me.cache.helpers.TunnelCollection;
 import appeng.tile.inventory.AppEngNullInventory;
-import appeng.transformer.annotations.integration.Interface;
-import appeng.transformer.annotations.integration.Method;
+import appeng.transformer.annotations.Integration.Interface;
+import appeng.transformer.annotations.Integration.Method;
 import appeng.util.Platform;
 import appeng.util.inv.WrapperBCPipe;
 import appeng.util.inv.WrapperChainedInventory;

src/main/java/appeng/parts/p2p/PartP2PRFPower.java

@@ -38,8 +38,8 @@ import appeng.core.AppEng;
 import appeng.integration.IntegrationType;
 import appeng.integration.modules.helpers.NullRFHandler;
 import appeng.me.GridAccessException;
-import appeng.transformer.annotations.integration.Interface;
-import appeng.transformer.annotations.integration.InterfaceList;
+import appeng.transformer.annotations.Integration.Interface;
+import appeng.transformer.annotations.Integration.InterfaceList;
 import appeng.util.Platform;
 
 

src/main/java/appeng/recipes/loader/ConfigLoader.java

@@ -18,6 +18,7 @@
 
 package appeng.recipes.loader;
 
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,19 +26,21 @@ import java.io.InputStreamReader;
 
 import appeng.api.recipes.IRecipeLoader;
 
-public class ConfigLoader implements IRecipeLoader
+
+public final class ConfigLoader implements IRecipeLoader
 {
+	private final File rootDirectory;
 
-	private final String rootPath;
-
-	public ConfigLoader(String s) {
-		this.rootPath = s;
+	public ConfigLoader( File rootDirectory )
+	{
+		this.rootDirectory = rootDirectory;
 	}
 
 	@Override
-	public BufferedReader getFile(String s) throws Exception
+	public BufferedReader getFile( String s ) throws Exception
 	{
-		File f = new File( this.rootPath + s );
+		final File f = new File( this.rootDirectory, s );
+
 		return new BufferedReader( new InputStreamReader( new FileInputStream( f ), "UTF-8" ) );
 	}
 }

src/main/java/appeng/services/CompassService.java

@@ -32,8 +32,8 @@ import net.minecraft.world.chunk.Chunk;
 
 import appeng.api.AEApi;
 import appeng.api.util.DimensionalCoord;
-import appeng.services.helpers.CompassReader;
-import appeng.services.helpers.ICompassCallback;
+import appeng.services.compass.CompassReader;
+import appeng.services.compass.ICompassCallback;
 
 public class CompassService implements ThreadFactory
 {

src/main/java/appeng/services/VersionChecker.java

@@ -19,133 +19,167 @@
 package appeng.services;
 
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
 import java.util.Date;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
 import net.minecraft.nbt.NBTTagCompound;
 
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.event.FMLInterModComms;
 
 import appeng.core.AEConfig;
 import appeng.core.AELog;
 import appeng.core.AppEng;
+import appeng.services.version.github.FormattedRelease;
+import appeng.services.version.github.ReleaseFetcher;
+import appeng.services.version.ModVersionFetcher;
+import appeng.services.version.Version;
+import appeng.services.version.VersionCheckerConfig;
+import appeng.services.version.VersionFetcher;
+import appeng.services.version.VersionParser;
 
-public class VersionChecker implements Runnable
+
+/**
+ * Tries to connect to GitHub to retrieve the most current build.
+ * After comparison with the local version, several path can be chosen.
+ *
+ * If the local version is invalid, somebody might have build that version themselves
+ * or it is run in a developer environment, then nothing needs to be done.
+ *
+ * If GitHub can not be reached, then either is GitHub down
+ * or the connection to GitHub disturbed, then nothing needs to be done,
+ * since no comparison can be reached
+ *
+ * If the version was just recently checked, then no need to poll again.
+ * Nobody wants to bother to update several times a day.
+ *
+ * Config enables to fine-tune when a version is considered newer
+ *
+ * If the local version is newer or equal to the GitHub version,
+ * then no update needs to be posted
+ *
+ * Only after all that cases, if the external version is higher than the local,
+ * use Version Checker Mod and post several information needed for it to update the mod.
+ */
+public final class VersionChecker implements Runnable
 {
-	private static final int FOUR_HOURS = 1000 * 3600 * 4;
+	private static final int SEC_TO_HOUR = 3600;
+	private static final int MS_TO_SEC = 1000;
+	private final VersionCheckerConfig config;
 
-	private final long delay;
-
-	public VersionChecker()
+	public VersionChecker( VersionCheckerConfig config )
 	{
-		final long now = new Date().getTime();
-		final long timeDiff = now - AEConfig.instance.latestTimeStamp;
-
-		this.delay = Math.max( 1, FOUR_HOURS - timeDiff);
+		this.config = config;
 	}
 
 	@Override
 	public void run()
 	{
-		try
+		Thread.yield();
+
+		final String rawLastCheck = this.config.lastCheck();
+		final long lastCheck = Long.parseLong( rawLastCheck );
+		final Date now = new Date();
+		final long nowInMs = now.getTime();
+		final long intervalInMs = this.config.interval() * SEC_TO_HOUR * MS_TO_SEC;
+		final long lastAfterInterval = lastCheck + intervalInMs;
+
+		this.processInterval( nowInMs, lastAfterInterval );
+
+		AELog.info( "Stopping AE2 VersionChecker" );
+	}
+
+	/**
+	 * checks if enough time since last check has expired
+	 *
+	 * @param nowInMs now in milli seconds
+	 * @param lastAfterInterval last version check including the interval defined in the config
+	 */
+	private void processInterval( long nowInMs, long lastAfterInterval )
+	{
+		if ( nowInMs > lastAfterInterval )
 		{
-			this.sleep( this.delay );
+			final String rawModVersion = AEConfig.VERSION;
+			final VersionParser parser = new VersionParser();
+			final VersionFetcher modFetcher = new ModVersionFetcher( rawModVersion, parser );
+			final ReleaseFetcher githubFetcher = new ReleaseFetcher( this.config, parser );
+
+			final Version modVersion = modFetcher.get();
+			final FormattedRelease githubRelease = githubFetcher.get();
+
+			this.processVersions( modVersion, githubRelease );
 		}
-		catch (InterruptedException e)
+		else
 		{
-			// :(
-		}
-
-		while (true)
-		{
-			Thread.yield();
-
-			try
-			{
-				String MCVersion = cpw.mods.fml.common.Loader.instance().getMCVersionString().replace( "Minecraft ", "" );
-				URL url = new URL( "http://feeds.ae-mod.info/latest.json?VersionMC=" + MCVersion + "&Channel=" + AEConfig.CHANNEL + "&CurrentVersion="
-						+ AEConfig.VERSION );
-
-				URLConnection yc = url.openConnection();
-				yc.setRequestProperty( "User-Agent", "AE2/" + AEConfig.VERSION + " (Channel:" + AEConfig.CHANNEL + ',' + MCVersion.replace( " ", ":" ) + ')' );
-				BufferedReader in = new BufferedReader( new InputStreamReader( yc.getInputStream() ) );
-
-				StringBuilder Version = new StringBuilder();
-				String inputLine;
-
-				while ((inputLine = in.readLine()) != null)
-					Version.append( inputLine );
-
-				in.close();
-
-				if ( Version.length() > 2 )
-				{
-					JsonElement element = (new JsonParser()).parse( Version.toString() );
-
-					int version = element.getAsJsonObject().get( "FormatVersion" ).getAsInt();
-					if ( version == 1 )
-					{
-						JsonObject Meta = element.getAsJsonObject().get( "Meta" ).getAsJsonObject();
-						JsonArray Versions = element.getAsJsonObject().get( "Versions" ).getAsJsonArray();
-						if ( Versions.size() > 0 )
-						{
-							JsonObject Latest = Versions.get( 0 ).getAsJsonObject();
-
-							AEConfig.instance.latestVersion = Latest.get( "Version" ).getAsString();
-							AEConfig.instance.latestTimeStamp = (new Date()).getTime();
-							AEConfig.instance.save();
-
-							if ( !AEConfig.VERSION.equals( AEConfig.instance.latestVersion ) )
-							{
-								NBTTagCompound versionInf = new NBTTagCompound();
-								versionInf.setString( "modDisplayName", "Applied Energistics 2" );
-								versionInf.setString( "oldVersion", AEConfig.VERSION );
-								versionInf.setString( "newVersion", AEConfig.instance.latestVersion );
-								versionInf.setString( "updateUrl", Latest.get( "UserBuild" ).getAsString() );
-								versionInf.setBoolean( "isDirectLink", true );
-
-								JsonElement changeLog = Latest.get( "ChangeLog" );
-								if ( changeLog == null )
-									versionInf.setString( "changeLog", "For full change log please see: " + Meta.get( "DownloadLink" ).getAsString() );
-								else
-									versionInf.setString( "changeLog", changeLog.getAsString() );
-
-								versionInf.setString( "newFileName", "appliedenergistics2-" + AEConfig.instance.latestVersion + ".jar" );
-								FMLInterModComms.sendRuntimeMessage( AppEng.instance, "VersionChecker", "addUpdate", versionInf );
-
-								AELog.info( "Stopping VersionChecker" );
-								return;
-							}
-						}
-					}
-				}
-
-				this.sleep( FOUR_HOURS );
-			}
-			catch (Exception e)
-			{
-				try
-				{
-					this.sleep( FOUR_HOURS );
-				}
-				catch (InterruptedException e1)
-				{
-					AELog.error( e );
-				}
-			}
+			AELog.info( "Last check was just recently." );
 		}
 	}
 
-	private void sleep(long i) throws InterruptedException
+	/**
+	 * Checks if the retrieved version is newer as the current mod version.
+	 * Will notify player if config is enabled.
+	 *
+	 * @param modVersion version of mod
+	 * @param githubRelease release retrieved through github
+	 */
+	private void processVersions( Version modVersion, FormattedRelease githubRelease )
 	{
-		Thread.sleep( i );
+		final Version githubVersion = githubRelease.version();
+		final String modFormatted = modVersion.formatted();
+		final String ghFormatted = githubVersion.formatted();
+
+		if ( githubVersion.isNewerAs( modVersion ) )
+		{
+			final String changelog = githubRelease.changelog();
+
+			if ( this.config.shouldNotifyPlayer() )
+			{
+				AELog.info( "Newer version is available: " + ghFormatted + " (found) > " + modFormatted + " (current)" );
+
+				if ( this.config.shouldPostChangelog() )
+				{
+					AELog.info( "Changelog: " + changelog );
+				}
+			}
+
+			this.interactWithVersionCheckerMod( modFormatted, ghFormatted, changelog );
+		}
+		else
+		{
+			AELog.info( "No newer version is available: " + ghFormatted + "(found) < " + modFormatted + " (current)");
+		}
+	}
+
+	/**
+	 * Checks if the version checker mod is installed and handles it depending on that information
+	 *
+	 * @param modFormatted mod version formatted as rv2-beta-8
+	 * @param ghFormatted retrieved github version formatted as rv2-beta-8
+	 * @param changelog retrieved github changelog
+	 */
+	private void interactWithVersionCheckerMod( String modFormatted, String ghFormatted, String changelog )
+	{
+		if ( Loader.isModLoaded( "VersionChecker" ) )
+		{
+			final NBTTagCompound versionInf = new NBTTagCompound();
+			versionInf.setString( "modDisplayName", AppEng.MOD_NAME );
+			versionInf.setString( "oldVersion", modFormatted );
+			versionInf.setString( "newVersion", ghFormatted );
+			versionInf.setString( "updateUrl", "http://ae-mod.info/builds/appliedenergistics2-" + ghFormatted + ".jar" );
+			versionInf.setBoolean( "isDirectLink", true );
+
+			if ( !changelog.isEmpty() )
+			{
+				versionInf.setString( "changeLog", changelog );
+			}
+
+			versionInf.setString( "newFileName", "appliedenergistics2-" + ghFormatted + ".jar" );
+			FMLInterModComms.sendRuntimeMessage( AppEng.instance, "VersionChecker", "addUpdate", versionInf );
+
+			AELog.info( "Reported new version to VersionChecker mod." );
+		}
+		else
+		{
+			AELog.info( "VersionChecker mod is not installed; Proceeding." );
+		}
 	}
 }

src/main/java/appeng/services/compass/CompassException.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.services.helpers;
+package appeng.services.compass;
 
 public class CompassException extends RuntimeException
 {

src/main/java/appeng/services/compass/CompassReader.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.services.helpers;
+package appeng.services.compass;
 
 import java.io.File;
 import java.util.HashMap;

src/main/java/appeng/services/compass/CompassRegion.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.services.helpers;
+package appeng.services.compass;
 
 
 import java.io.File;

src/main/java/appeng/services/compass/ICompassCallback.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.services.helpers;
+package appeng.services.compass;
 
 public interface ICompassCallback
 {

src/main/java/appeng/services/version/BaseVersion.java

@@ -0,0 +1,91 @@
+package appeng.services.version;
+
+
+/**
+ * Base version of {@link Version}.
+ *
+ * Provides a unified way to test for equality and print a formatted string
+ */
+public abstract class BaseVersion implements Version
+{
+	private final int revision;
+	private final Channel channel;
+	private final int build;
+
+	/**
+	 * @param revision revision in natural number
+	 * @param channel channel
+	 * @param build build in natural number
+	 *
+	 * @throws AssertionError if assertion are enabled and revision or build are not natural numbers
+	 */
+	public BaseVersion( int revision, Channel channel, int build )
+	{
+		assert revision >= 0;
+		assert build >= 0;
+
+		this.revision = revision;
+		this.channel = channel;
+		this.build = build;
+	}
+
+	@Override
+	public final int revision()
+	{
+		return this.revision;
+	}
+
+	@Override
+	public final Channel channel()
+	{
+		return this.channel;
+	}
+
+	@Override
+	public final int build()
+	{
+		return this.build;
+	}
+
+	@Override
+	public String formatted()
+	{
+		return "rv" + this.revision + '-' + this.channel.name().toLowerCase() + '-' + this.build;
+	}
+
+	@Override
+	public final int hashCode()
+	{
+		int result = this.revision;
+		result = 31 * result + ( this.channel != null ? this.channel.hashCode() : 0 );
+		result = 31 * result + this.build;
+		return result;
+	}
+
+	@Override
+	public final boolean equals( Object o )
+	{
+		if ( this == o )
+			return true;
+		if ( !( o instanceof Version ) )
+			return false;
+
+		Version that = (Version) o;
+
+		if ( this.revision != that.revision() )
+			return false;
+		if ( this.build != that.build() )
+			return false;
+		return this.channel == that.channel();
+	}
+
+	@Override
+	public final String toString()
+	{
+		return "Version{" +
+				"revision=" + this.revision +
+				", channel=" + this.channel +
+				", build=" + this.build +
+				'}';
+	}
+}

src/main/java/appeng/services/version/Channel.java

@@ -0,0 +1,13 @@
+package appeng.services.version;
+
+
+/**
+ * Represents the release channel of Applied Energistics. The mod is either in Alpha, Beta or Release channel.
+ * Any more might be confusing to the end-user
+ */
+public enum Channel
+{
+	Alpha,
+	Beta,
+	Release
+}

src/main/java/appeng/services/version/DefaultVersion.java

@@ -0,0 +1,35 @@
+package appeng.services.version;
+
+
+/**
+ * AE prints version like rv2-beta-8
+ * GitHub prints version like rv2.beta.8
+ */
+public final class DefaultVersion extends BaseVersion
+{
+	/**
+	 * @param revision natural number
+	 * @param channel  either alpha, beta or release
+	 * @param build    natural number
+	 */
+	public DefaultVersion( int revision, Channel channel, int build )
+	{
+		super( revision, channel, build );
+	}
+
+	@Override
+	public boolean isNewerAs( Version maybeOlder )
+	{
+		if ( this.revision() > maybeOlder.revision() )
+		{
+			return true;
+		}
+
+		if ( this.channel().compareTo( maybeOlder.channel() ) > 0 )
+		{
+			return true;
+		}
+
+		return this.build() > maybeOlder.build();
+	}
+}

src/main/java/appeng/services/version/DoNotCheckVersion.java

@@ -0,0 +1,25 @@
+package appeng.services.version;
+
+
+/**
+ * Exceptional template for {@link Version}, when the mod does not want a check
+ */
+public final class DoNotCheckVersion extends BaseVersion
+{
+	public DoNotCheckVersion()
+	{
+		super( Integer.MAX_VALUE, Channel.Release, Integer.MAX_VALUE );
+	}
+
+	@Override
+	public boolean isNewerAs( Version maybeOlder )
+	{
+		return true;
+	}
+
+	@Override
+	public String formatted()
+	{
+		return "dev build";
+	}
+}

src/main/java/appeng/services/version/MissingVersion.java

@@ -0,0 +1,30 @@
+package appeng.services.version;
+
+
+/**
+ * Exceptional template when the {@link Version} could not be retrieved
+ */
+public final class MissingVersion extends BaseVersion
+{
+	public MissingVersion()
+	{
+		super( 0, Channel.Alpha, 0 );
+	}
+
+	/**
+	 * @param maybeOlder ignored
+	 *
+	 * @return false
+	 */
+	@Override
+	public boolean isNewerAs( Version maybeOlder )
+	{
+		return false;
+	}
+
+	@Override
+	public String formatted()
+	{
+		return "missing";
+	}
+}

src/main/java/appeng/services/version/ModVersionFetcher.java

@@ -0,0 +1,39 @@
+package appeng.services.version;
+
+
+/**
+ * Wrapper for {@link VersionParser} to check if the check is happening in developer environment or in a pull request.
+ *
+ * In that case ignore the check.
+ */
+public final class ModVersionFetcher implements VersionFetcher
+{
+	private final String rawModVersion;
+	private final VersionParser parser;
+
+	public ModVersionFetcher( String rawModVersion, VersionParser parser )
+	{
+		this.rawModVersion = rawModVersion;
+		this.parser = parser;
+	}
+
+	/**
+	 * Parses only, if not checked in developer environment or in a pull request
+	 *
+	 * @return {@link DoNotCheckVersion} if in developer environment or pull request, else the parsed {@link Version}
+	 */
+	@Override
+	public Version get()
+	{
+		if ( this.rawModVersion.equals( "@version@" ) || this.rawModVersion.contains( "pr" ) )
+		{
+			return new DoNotCheckVersion();
+		}
+		else
+		{
+			final Version version = this.parser.parse( this.rawModVersion );
+
+			return version;
+		}
+	}
+}

src/main/java/appeng/services/version/Version.java

@@ -0,0 +1,42 @@
+package appeng.services.version;
+
+
+/**
+ * Stores version information, which are easily compared
+ */
+public interface Version
+{
+	/**
+	 * @return revision of this version
+	 */
+	int revision();
+
+	/**
+	 * @return channel of this version
+	 */
+	Channel channel();
+
+	/**
+	 * @return build of this version
+	 */
+	int build();
+
+	/**
+	 * A version is never if these criteria are met:
+	 * if the current revision is higher than the compared revision OR
+	 * if revision are equal and the current channel is higher than the compared channel (Release > Beta > Alpha) OR
+	 * if revision, channel are equal and the build is higher than the compared build
+	 *
+	 * @return true if criteria are met
+	 */
+	boolean isNewerAs( Version maybeOlder );
+
+	/**
+	 * Prints the revision, channel and build into a common displayed way
+	 *
+	 * rv2-beta-8
+	 *
+	 * @return formatted version
+	 */
+	String formatted();
+}

src/main/java/appeng/services/version/VersionCheckerConfig.java

@@ -0,0 +1,94 @@
+package appeng.services.version;
+
+
+import java.io.File;
+import java.util.Date;
+
+import net.minecraftforge.common.config.Configuration;
+
+
+/**
+ * Seperate config file to handle the version checker
+ */
+public final class VersionCheckerConfig
+{
+	private static final int DEFAULT_INTERVAL_HOURS = 24;
+	private static final int MIN_INTERVAL_HOURS = 0;
+	private static final int MAX_INTERVAL_HOURS = 7 * 24;
+
+	private final Configuration config;
+
+	private final boolean isEnabled;
+
+	private final String lastCheck;
+	private final int interval;
+
+	private final String level;
+
+	private final boolean shouldNotifyPlayer;
+	private final boolean shouldPostChangelog;
+
+	/**
+	 * @param file requires fully qualified file in which the config is saved
+	 */
+	public VersionCheckerConfig( File file )
+	{
+		this.config = new Configuration( file );
+
+		// initializes default values by caching
+		this.isEnabled = this.config.getBoolean( "enabled", "general", true, "If true, the version checker is enabled. Acts as a master switch." );
+
+		this.lastCheck = this.config.getString( "lastCheck", "cache", "0", "The number of milliseconds since January 1, 1970, 00:00:00 GMT of the last successful check." );
+		this.interval = this.config.getInt( "interval", "cache", DEFAULT_INTERVAL_HOURS, MIN_INTERVAL_HOURS, MAX_INTERVAL_HOURS, "Waits as many hours, until it checks again." );
+
+		this.level = this.config.getString( "level", "channel", "Beta", "Determines the channel level which should be checked for updates. Can be either Release, Beta or Alpha." );
+
+		this.shouldNotifyPlayer = this.config.getBoolean( "notify", "client", true, "If true, the player is getting a notification, that a new version is available." );
+		this.shouldPostChangelog = this.config.getBoolean( "changelog", "client", true, "If true, the player is getting a notification including changelog. Only happens if notification are enabled." );
+	}
+
+	public boolean isEnabled()
+	{
+		return this.isEnabled;
+	}
+
+	public String lastCheck()
+	{
+		return this.lastCheck;
+	}
+
+	/**
+	 * Stores the current date in milli seconds into the "lastCheck" field of the config
+	 * and makes it persistent.
+	 */
+	public void updateLastCheck()
+	{
+		final Date now = new Date();
+		final long nowInMs = now.getTime();
+		final String nowAsString = Long.toString( nowInMs );
+
+		this.config.get( "cache", "lastCheck", "0" ).set( nowAsString );
+
+		this.config.save();
+	}
+
+	public int interval()
+	{
+		return this.interval;
+	}
+
+	public String level()
+	{
+		return this.level;
+	}
+
+	public boolean shouldNotifyPlayer()
+	{
+		return this.shouldNotifyPlayer;
+	}
+
+	public boolean shouldPostChangelog()
+	{
+		return this.shouldPostChangelog;
+	}
+}

src/main/java/appeng/services/version/VersionFetcher.java

@@ -0,0 +1,10 @@
+package appeng.services.version;
+
+
+/**
+ * Processes base information to retrieve a {@link Version}
+ */
+public interface VersionFetcher
+{
+	Version get();
+}

src/main/java/appeng/services/version/VersionParser.java

@@ -0,0 +1,132 @@
+package appeng.services.version;
+
+
+import java.security.InvalidParameterException;
+import java.util.Scanner;
+import java.util.regex.Pattern;
+
+
+/**
+ * can parse a version in form of rv2-beta-8 or rv2.beta.8
+ */
+public final class VersionParser
+{
+	private static final Pattern PATTERN_DOT = Pattern.compile( "\\." );
+	private static final Pattern PATTERN_DASH = Pattern.compile( "-" );
+	private static final Pattern PATTERN_REVISION = Pattern.compile( "[^0-9]+" );
+	private static final Pattern PATTERN_BUILD = Pattern.compile( "[^0-9]+" );
+	private static final Pattern PATTERN_NATURAL = Pattern.compile( "[0-9]+" );
+	private static final Pattern PATTERN_VALID_REVISION = Pattern.compile( "^rv\\d+$" );
+
+	/**
+	 * Parses the {@link Version} out of a String
+	 *
+	 * @param raw String in form of rv2-beta-8 or rv2.beta.8
+	 *
+	 * @return {@link Version} encoded in the raw String
+	 *
+	 * @throws AssertionError if raw String does not match pattern of a {@link Version}
+	 */
+	public Version parse( String raw )
+	{
+		final String transformed = this.transformDelimiter( raw );
+		final String[] split = transformed.split( "_" );
+
+		return this.parseVersion( split );
+	}
+
+	/**
+	 * Replaces all "." and "-" into "_" to make them uniform
+	 *
+	 * @param raw raw version string containing "." or "-"
+	 *
+	 * @return transformed raw, where "." and "-" are replaced by "_"
+	 */
+	private String transformDelimiter( String raw )
+	{
+		assert raw.contains( "." ) || raw.contains( "-" );
+
+		final String withoutDot = PATTERN_DOT.matcher( raw ).replaceAll( "_" );
+		final String withoutDash = PATTERN_DASH.matcher( withoutDot ).replaceAll( "_" );
+
+		return withoutDash;
+	}
+
+	/**
+	 * parses the {@link Version} out of the split.
+	 * The split must have a length of 3,
+	 * representing revision, channel and build.
+	 *
+	 * @param splitRaw raw version split with length of 3
+	 *
+	 * @return {@link Version} represented by the splitRaw
+	 */
+	private Version parseVersion( String[] splitRaw )
+	{
+		assert splitRaw.length == 3;
+
+		final String rawRevision = splitRaw[0];
+		final String rawChannel = splitRaw[1];
+		final String rawBuild = splitRaw[2];
+
+		final int revision = this.parseRevision( rawRevision );
+		final Channel channel = this.parseChannel( rawChannel );
+		final int build = this.parseBuild( rawBuild );
+
+		return new DefaultVersion( revision, channel, build );
+	}
+
+	/**
+	 * A revision starts with the keyword "rv", followed by a natural number
+	 *
+	 * @param rawRevision String containing the revision number
+	 *
+	 * @return revision number
+	 */
+	private int parseRevision( String rawRevision )
+	{
+		assert PATTERN_VALID_REVISION.matcher( rawRevision ).matches();
+
+		final int revision = new Scanner( rawRevision ).useDelimiter( PATTERN_REVISION ).nextInt();
+
+		return revision;
+	}
+
+	/**
+	 * A channel is atm either one of {@link Channel#Alpha}, {@link Channel#Beta} or {@link Channel#Release}
+	 *
+	 * @param rawChannel String containing the channel
+	 *
+	 * @return matching {@link Channel} to the String
+	 */
+	private Channel parseChannel( String rawChannel )
+	{
+		assert rawChannel.equalsIgnoreCase( Channel.Alpha.name() ) || rawChannel.equalsIgnoreCase( Channel.Beta.name() ) || rawChannel.equalsIgnoreCase( Channel.Release.name() );
+
+		for ( Channel channel : Channel.values() )
+		{
+			if ( channel.name().equalsIgnoreCase( rawChannel ) )
+			{
+				return channel;
+			}
+		}
+
+		throw new InvalidParameterException( "Raw channel did not contain any of the pre-programmed types." );
+	}
+
+	/**
+	 * A build is just a natural number
+	 *
+	 * @param rawBuild String containing the build number
+	 *
+	 * @return build number
+	 */
+	private int parseBuild( String rawBuild )
+	{
+		assert PATTERN_NATURAL.matcher( rawBuild ).matches();
+
+		final int build = new Scanner( rawBuild ).useDelimiter( PATTERN_BUILD ).nextInt();
+
+		return build;
+	}
+}

src/main/java/appeng/services/version/github/DefaultFormattedRelease.java

@@ -0,0 +1,32 @@
+package appeng.services.version.github;
+
+
+import appeng.services.version.Version;
+
+
+/**
+ * Default template when a {@link FormattedRelease} is needed.
+ */
+public final class DefaultFormattedRelease implements FormattedRelease
+{
+	private final Version version;
+	private final String changelog;
+
+	public DefaultFormattedRelease( Version version, String changelog )
+	{
+		this.version = version;
+		this.changelog = changelog;
+	}
+
+	@Override
+	public String changelog()
+	{
+		return this.changelog;
+	}
+
+	@Override
+	public Version version()
+	{
+		return this.version;
+	}
+}

src/main/java/appeng/services/version/github/FormattedRelease.java

@@ -0,0 +1,21 @@
+package appeng.services.version.github;
+
+
+import appeng.services.version.Version;
+
+
+/**
+ * Represents the acquired, processed information through github about a release of Applied Energistics 2
+ */
+public interface FormattedRelease
+{
+	/**
+	 * @return changelog
+	 */
+	String changelog();
+
+	/**
+	 * @return processed version
+	 */
+	Version version();
+}

src/main/java/appeng/services/version/github/MissingFormattedRelease.java

@@ -0,0 +1,37 @@
+package appeng.services.version.github;
+
+
+import appeng.services.version.MissingVersion;
+import appeng.services.version.Version;
+
+
+/**
+ * Exceptional template, when no meaningful {@link FormattedRelease} could be obtained
+ */
+public final class MissingFormattedRelease implements FormattedRelease
+{
+	private final Version version;
+
+	public MissingFormattedRelease()
+	{
+		this.version = new MissingVersion();
+	}
+
+	/**
+	 * @return empty string
+	 */
+	@Override
+	public String changelog()
+	{
+		return "";
+	}
+
+	/**
+	 * @return {@link MissingVersion}
+	 */
+	@Override
+	public Version version()
+	{
+		return this.version;
+	}
+}

src/main/java/appeng/services/version/github/Release.java

@@ -0,0 +1,19 @@
+package appeng.services.version.github;
+
+
+/**
+ * Template class for Gson to write values from the Json Object into an actual class
+ */
+@SuppressWarnings( "ALL" )
+public class Release
+{
+	/**
+	 * name of the tag it is saved
+	 */
+	public String tag_name;
+
+	/**
+	 * Contains the changelog
+	 */
+	public String body;
+}

src/main/java/appeng/services/version/github/ReleaseFetcher.java

@@ -0,0 +1,90 @@
+package appeng.services.version.github;
+
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.net.URL;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import appeng.core.AELog;
+import appeng.services.version.Channel;
+import appeng.services.version.Version;
+import appeng.services.version.VersionCheckerConfig;
+import appeng.services.version.VersionParser;
+
+
+public final class ReleaseFetcher
+{
+	private static final String GITHUB_RELEASES_URL = "https://api.github.com/repos/AppliedEnergistics/Applied-Energistics-2/releases";
+	private static final FormattedRelease EXCEPTIONAL_RELEASE = new MissingFormattedRelease();
+
+	private final VersionCheckerConfig config;
+	private final VersionParser parser;
+
+	public ReleaseFetcher( VersionCheckerConfig config, VersionParser parser )
+	{
+		this.config = config;
+		this.parser = parser;
+	}
+
+	public FormattedRelease get()
+	{
+		final Gson gson = new Gson();
+		final Type type = new ReleasesTypeToken().getType();
+
+		try
+		{
+			final URL releasesURL = new URL( GITHUB_RELEASES_URL );
+			final String rawReleases = this.getRawReleases( releasesURL );
+
+			this.config.updateLastCheck();
+
+			final List<Release> releases = gson.fromJson( rawReleases, type );
+			final FormattedRelease latestFitRelease = this.getLatestFitRelease( releases );
+
+			return latestFitRelease;
+		}
+		catch ( Exception e )
+		{
+			AELog.error( e );
+
+			return EXCEPTIONAL_RELEASE;
+		}
+	}
+
+	private String getRawReleases( URL url ) throws IOException
+	{
+		return IOUtils.toString( url );
+	}
+
+	private FormattedRelease getLatestFitRelease( Iterable<Release> releases )
+	{
+		final String levelInConfig = this.config.level();
+		final Channel level = Channel.valueOf( levelInConfig );
+		final int levelOrdinal = level.ordinal();
+
+		for ( Release release : releases )
+		{
+			final String rawVersion = release.tag_name;
+			final String changelog = release.body;
+
+			final Version version = this.parser.parse( rawVersion );
+
+			if ( version.channel().ordinal() >= levelOrdinal )
+			{
+				return new DefaultFormattedRelease( version, changelog );
+			}
+		}
+
+		return EXCEPTIONAL_RELEASE;
+	}
+
+	private static final class ReleasesTypeToken extends TypeToken<List<Release>>
+	{
+	}
+}

src/main/java/appeng/tile/powersink/IC2.java

@@ -29,7 +29,7 @@ import appeng.api.config.PowerUnits;
 import appeng.core.AppEng;
 import appeng.integration.IntegrationType;
 import appeng.integration.abstraction.IIC2;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
 import appeng.util.Platform;
 
 @Interface(iname = "IC2", iface = "ic2.api.energy.tile.IEnergySink")

src/main/java/appeng/tile/powersink/MekJoules.java

@@ -23,7 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import mekanism.api.energy.IStrictEnergyAcceptor;
 
 import appeng.api.config.PowerUnits;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
 
 @Interface(iname = "Mekanism", iface = "mekanism.api.energy.IStrictEnergyAcceptor")
 public abstract class MekJoules extends RedstoneFlux implements IStrictEnergyAcceptor   {

src/main/java/appeng/tile/powersink/RedstoneFlux.java

@@ -24,7 +24,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cofh.api.energy.IEnergyReceiver;
 
 import appeng.api.config.PowerUnits;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
 
 
 @Interface( iname = "RF", iface = "cofh.api.energy.IEnergyReceiver" )

src/main/java/appeng/tile/powersink/RotaryCraft.java

@@ -25,8 +25,8 @@ import Reika.RotaryCraft.API.ShaftPowerReceiver;
 import appeng.api.config.PowerUnits;
 import appeng.tile.TileEvent;
 import appeng.tile.events.TileEventType;
-import appeng.transformer.annotations.integration.Interface;
-import appeng.transformer.annotations.integration.Method;
+import appeng.transformer.annotations.Integration.Interface;
+import appeng.transformer.annotations.Integration.Method;
 import appeng.util.Platform;
 
 @Interface(iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.ShaftPowerReceiver")

src/main/java/appeng/tile/storage/TileChest.java

@@ -427,7 +427,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
 			return null;
 
 		MEInventoryHandler ih = new MEInventoryHandler( h, h.getChannel() );
-		ih.myPriority = this.priority;
+		ih.setPriority( this.priority );
 
 		MEMonitorHandler<StackType> g = new ChestMonitorHandler<StackType>( ih );
 		g.addListener( new ChestNetNotifier( h.getChannel() ), g );

src/main/java/appeng/tile/storage/TileDrive.java

@@ -245,7 +245,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
 							power += this.handlersBySlot[x].cellIdleDrain( is, cell );
 
 							DriveWatcher<IAEItemStack> ih = new DriveWatcher( cell, is, this.handlersBySlot[x], this );
-							ih.myPriority = this.priority;
+							ih.setPriority( this.priority );
 							this.invBySlot[x] = ih;
 							this.items.add( ih );
 						}
@@ -258,7 +258,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
 								power += this.handlersBySlot[x].cellIdleDrain( is, cell );
 
 								DriveWatcher<IAEItemStack> ih = new DriveWatcher( cell, is, this.handlersBySlot[x], this );
-								ih.myPriority = this.priority;
+								ih.setPriority( this.priority );
 								this.invBySlot[x] = ih;
 								this.fluids.add( ih );
 							}

src/main/java/appeng/transformer/annotations/Integration.java

@@ -18,36 +18,35 @@
 
 package appeng.transformer.annotations;
 
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-public @interface integration {
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.TYPE)
-	public @interface InterfaceList {
-
-		public Interface[] value();
 
+public @interface Integration
+{
+	@Retention( RetentionPolicy.RUNTIME )
+	@Target( ElementType.TYPE )
+	@interface InterfaceList
+	{
+		Interface[] value();
 	}
 
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.TYPE)
-	public @interface Interface {
-
-		public String iface();
-
-		public String iname();
+	@Retention( RetentionPolicy.RUNTIME )
+	@Target( ElementType.TYPE )
+	@interface Interface
+	{
+		String iface();
 
+		String iname();
 	}
 
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.METHOD)
-	public @interface Method {
-
-		public String iname();
-
+	@Retention( RetentionPolicy.RUNTIME )
+	@Target( ElementType.METHOD )
+	@interface Method
+	{
+		String iname();
 	}
 }

src/main/java/appeng/transformer/asm/ASMIntegration.java

@@ -36,7 +36,7 @@ import cpw.mods.fml.relauncher.FMLRelaunchLog;
 
 import appeng.integration.IntegrationRegistry;
 import appeng.integration.IntegrationType;
-import appeng.transformer.annotations.integration;
+import appeng.transformer.annotations.Integration;
 
 
 public class ASMIntegration implements IClassTransformer
@@ -105,16 +105,16 @@ public class ASMIntegration implements IClassTransformer
 		{
 			for ( AnnotationNode an : classNode.visibleAnnotations )
 			{
-				if ( this.hasAnnotation( an, integration.Interface.class ) )
+				if ( this.hasAnnotation( an, Integration.Interface.class ) )
 				{
-					if ( this.stripInterface( classNode, integration.Interface.class, an ) )
+					if ( this.stripInterface( classNode, Integration.Interface.class, an ) )
 						changed = true;
 				}
-				else if ( this.hasAnnotation( an, integration.InterfaceList.class ) )
+				else if ( this.hasAnnotation( an, Integration.InterfaceList.class ) )
 				{
 					for ( Object o : ( ( List ) an.values.get( 1 ) ) )
 					{
-						if ( this.stripInterface( classNode, integration.InterfaceList.class, ( AnnotationNode ) o ) )
+						if ( this.stripInterface( classNode, Integration.InterfaceList.class, ( AnnotationNode ) o ) )
 							changed = true;
 					}
 				}
@@ -130,9 +130,9 @@ public class ASMIntegration implements IClassTransformer
 			{
 				for ( AnnotationNode an : mn.visibleAnnotations )
 				{
-					if ( this.hasAnnotation( an, integration.Method.class ) )
+					if ( this.hasAnnotation( an, Integration.Method.class ) )
 					{
-						if ( this.stripMethod( classNode, mn, i, integration.Method.class, an ) )
+						if ( this.stripMethod( classNode, mn, i, Integration.Method.class, an ) )
 							changed = true;
 					}
 				}

src/main/resources/assets/appliedenergistics2/lang/en_US.lang

@@ -467,6 +467,7 @@ commands.ae2.ChunkLoggerOn=Chunk Logging is now on
 commands.ae2.ChunkLoggerOff=Chunk Logging is now off
 commands.ae2.Supporters=Displays a list of AE2 Supporters
 
+// Achievements
 achievement.ae2.Compass=Meteorite Hunter
 achievement.ae2.Compass.desc=Craft a Meteorite Compass
 achievement.ae2.Presses=Unknown Technology
@@ -494,13 +495,13 @@ achievement.ae2.CrystalGrowthAccelerator.desc=Craft a Crystal Growth Accelerator
 achievement.ae2.GlassCable=Fluix Energy Connection
 achievement.ae2.GlassCable.desc=Craft ME Glass Cable
 achievement.ae2.Networking1=Network Apprentice
-achievement.ae2.Networking1.desc=Reach 8 channel using devices on a network.
+achievement.ae2.Networking1.desc=Reach 8 channels using devices on a network.
 achievement.ae2.Controller=Networking Switchboard
 achievement.ae2.Controller.desc=Craft a Controller
 achievement.ae2.Networking2=Network Engineer
-achievement.ae2.Networking2.desc=Reach 128 channel using devices on a network.
+achievement.ae2.Networking2.desc=Reach 128 channels using devices on a network.
 achievement.ae2.Networking3=Network Administrator
-achievement.ae2.Networking3.desc=Reach 2048 channel using devices on a network.
+achievement.ae2.Networking3.desc=Reach 2048 channels using devices on a network.
 achievement.ae2.P2P=Point to Point Networking
 achievement.ae2.P2P.desc=Craft a P2P Tunnel
 achievement.ae2.Recursive=Recursive Networking

src/main/resources/assets/appliedenergistics2/lang/it_IT.lang

@@ -50,12 +50,25 @@ tile.appliedenergistics2.BlockCraftingAccelerator.name=Unità co-processore per
 tile.appliedenergistics2.BlockCraftingUnit.name=Unità di fabbricazione
 tile.appliedenergistics2.BlockMolecularAssembler.name=Assemblatore moleculare
 
+// Stairs
+tile.appliedenergistics2.ChiseledQuartzStairBlock.name=Scalini di quarzo certus intagliato
+tile.appliedenergistics2.FluixStairBlock.name=Scalini di fluix
+tile.appliedenergistics2.QuartzPillarStairBlock.name=Scalini di pilastro di quarzo certus
+tile.appliedenergistics2.QuartzStairBlock.name=Scalini di quarzo certus
+tile.appliedenergistics2.SkyStoneBlockStairBlock.name=Scalini di blocco di roccia del cielo
+tile.appliedenergistics2.SkyStoneBrickStairBlock.name=Scalini di roccia del cielo concia
+tile.appliedenergistics2.SkyStoneSmallBrickStairBlock.name=Scalini di mattoni di roccia del cielo
+tile.appliedenergistics2.SkyStoneStairBlock.name=Scalini di roccia del cielo
+
 chat.appliedenergistics2.ChestCannotReadStorageCell=Baule ME non riesce a leggere cella di immagazzinaggio.
 chat.appliedenergistics2.SettingCleared=Impostazioni cancellate.
 chat.appliedenergistics2.OutOfRange=Wireless fuori portata.
 chat.appliedenergistics2.InvalidMachine=Macchina invalida.
 chat.appliedenergistics2.LoadedSettings=Impostazioni caricate con successo.
 chat.appliedenergistics2.DeviceNotPowered=Dispositivo a corto di energia.
+chat.appliedenergistics2.DeviceNotWirelessTerminal=Dispositivo non è un terminale wireless.
+chat.appliedenergistics2.DeviceNotLinked=Dispositivo non è collegato is not linked.
+chat.appliedenergistics2.StationCanNotBeLocated=Emittente non può essere trovato.
 chat.appliedenergistics2.MachineNotPowered=Macchina non alimentata.
 chat.appliedenergistics2.CommunicationError=Errore nel communicare col Sistema.
 chat.appliedenergistics2.SavedSettings=Impostazioni salvate con successo.
@@ -278,6 +291,9 @@ gui.tooltips.appliedenergistics2.EmitWhenCrafting=Emette pietrarossa mentre fabb
 gui.tooltips.appliedenergistics2.ReportInaccessibleItems=Riporta oggetti inaccessibili
 gui.tooltips.appliedenergistics2.ReportInaccessibleItemsYes=Si: gli oggetti che non possono essere estratti sono visibili.
 gui.tooltips.appliedenergistics2.ReportInaccessibleItemsNo=No: Solo oggetti estrabili sono visibili.
+gui.tooltips.appliedenergistics2.BlockPlacement=Piazzamento di blocco
+gui.tooltips.appliedenergistics2.BlockPlacementYes=I blocchi saranno piazzati come blocco.
+gui.tooltips.appliedenergistics2.BlockPlacementNo=I blocchi saranno fatti cadere come oggetti.
 
 gui.appliedenergistics2.units.appliedenergstics=AE
 gui.appliedenergistics2.units.buildcraft=Minecraft Joules
@@ -304,6 +320,7 @@ gui.appliedenergistics2.Red=Rosso
 gui.appliedenergistics2.Black=Nero
 gui.appliedenergistics2.Fluix=Fluix
 
+waila.appliedenergistics2.Crafting=Fabbricazione
 waila.appliedenergistics2.DeviceOnline=Dispositivo online
 waila.appliedenergistics2.DeviceOffline=Dispositivo offline
 waila.appliedenergistics2.DeviceMissingChannel=Al dispositivo manca il canale

src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang

@@ -66,6 +66,9 @@ chat.appliedenergistics2.OutOfRange=超出无线信号范围.
 chat.appliedenergistics2.InvalidMachine=无效机器.
 chat.appliedenergistics2.LoadedSettings=成功载入设定.
 chat.appliedenergistics2.DeviceNotPowered=设备供能不足.
+chat.appliedenergistics2.DeviceNotWirelessTerminal=设备不是无线终端.
+chat.appliedenergistics2.DeviceNotLinked=设备未连接.
+chat.appliedenergistics2.StationCanNotBeLocated=无法定位安全终端.
 chat.appliedenergistics2.MachineNotPowered=机器未供能.
 chat.appliedenergistics2.CommunicationError=网络交互错误.
 chat.appliedenergistics2.SavedSettings=成功保存设定.
@@ -194,7 +197,7 @@ gui.appliedenergistics2.NoCraftingCPUs=没有可用的合成CPU...
 gui.appliedenergistics2.CalculatingWait=正在计算,请等待...
 gui.appliedenergistics2.Clean=清空
 gui.appliedenergistics2.InvalidPattern=无效样板
-gui.appliedenergistics2.Range=Range
+gui.appliedenergistics2.Range=范围
 gui.appliedenergistics2.TransparentFacades=透明的伪装板
 gui.appliedenergistics2.TransparentFacadesHint=控制当网络工具放在快捷栏时,伪装板显示的透明度.
 gui.appliedenergistics2.CPUs=CPU
@@ -288,6 +291,9 @@ gui.tooltips.appliedenergistics2.EmitWhenCrafting=在物品合成时发射红石
 gui.tooltips.appliedenergistics2.ReportInaccessibleItems=报告不可交互的物品
 gui.tooltips.appliedenergistics2.ReportInaccessibleItemsYes=是: 显示无法取出的物品.
 gui.tooltips.appliedenergistics2.ReportInaccessibleItemsNo=否: 只显示可以取出的物品.
+gui.tooltips.appliedenergistics2.BlockPlacement=方块放置方式
+gui.tooltips.appliedenergistics2.BlockPlacementYes=方块将被放置.
+gui.tooltips.appliedenergistics2.BlockPlacementNo=方块将以物品形式掉落.
 
 gui.appliedenergistics2.units.appliedenergstics=AE
 gui.appliedenergistics2.units.buildcraft=MJ
@@ -322,6 +328,7 @@ waila.appliedenergistics2.Unlocked=未锁定
 waila.appliedenergistics2.Showing=显示
 waila.appliedenergistics2.Contains=容纳
 waila.appliedenergistics2.Channels=频道
+waila.appliedenergistics2.Crafting=合成中
 
 item.appliedenergistics2.ItemBasicStorageCell.1k.name=1k-ME存储元件
 item.appliedenergistics2.ItemBasicStorageCell.4k.name=4k-ME存储元件

src/test/java/appeng/services/version/VersionParserTest.java

@@ -0,0 +1,80 @@
+package appeng.services.version;
+
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+
+/**
+ * Tests for {@link VersionParser}
+ */
+public final class VersionParserTest
+{
+	private static final String GITHUB_VERSION = "rv2.beta.8";
+	private static final String GITHUB_INVALID_REVISION = "2.beta.8";
+	private static final String GITHUB_INVALID_CHANNEL = "rv2.gamma.8";
+	private static final String GITHUB_INVALID_BUILD = "rv2.beta.b8";
+	private static final String MOD_VERSION = "rv2-beta-8";
+	private static final String MOD_INVALID_REVISION = "2-beta-8";
+	private static final String MOD_INVALID_CHANNEL = "rv2-gamma-8";
+	private static final String MOD_INVALID_BUILD = "rv2-beta-b8";
+
+	private static final DefaultVersion VERSION = new DefaultVersion( 2, Channel.Beta, 8 );
+
+	private final VersionParser parser;
+
+	public VersionParserTest()
+	{
+		this.parser = new VersionParser();
+	}
+
+	@Test
+	public void testParseGitHub_shouldPass()
+	{
+		assertTrue( this.parser.parse( GITHUB_VERSION ).equals( VERSION ) );
+	}
+
+	@Test( expected = AssertionError.class )
+	public void parseGH_InvalidRevision_NotPass()
+	{
+		assertFalse( this.parser.parse( GITHUB_INVALID_REVISION ).equals( VERSION ) );
+	}
+
+	@Test( expected = AssertionError.class )
+	public void parseGH_InvalidChannel_NotPass()
+	{
+		assertFalse( this.parser.parse( GITHUB_INVALID_CHANNEL ).equals( VERSION ) );
+	}
+
+	@Test( expected = AssertionError.class )
+	public void parseGH_InvalidBuild_NotPass()
+	{
+		assertFalse( this.parser.parse( GITHUB_INVALID_BUILD ).equals( VERSION ) );
+	}
+
+	@Test
+	public void testParseMod_shouldPass()
+	{
+		assertTrue( this.parser.parse( MOD_VERSION ).equals( VERSION ) );
+	}
+
+	@Test( expected = AssertionError.class )
+	public void parseMod_InvalidRevision_NotPass()
+	{
+		assertFalse( this.parser.parse( MOD_INVALID_REVISION ).equals( VERSION ) );
+	}
+
+	@Test( expected = AssertionError.class )
+	public void parseMod_InvalidChannel_NotPass()
+	{
+		assertFalse( this.parser.parse( MOD_INVALID_CHANNEL ).equals( VERSION ) );
+	}
+
+	@Test( expected = AssertionError.class )
+	public void parseMod_InvalidBuild_NotPass()
+	{
+		assertFalse( this.parser.parse( MOD_INVALID_BUILD ).equals( VERSION ) );
+	}
+}

src/test/java/appeng/util/UUIDMatcherTest.java

@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * Tests for {@link UUIDMatcher}
  */
-public class UUIDMatcherTest
+public final class UUIDMatcherTest
 {
 	private static final String IS_UUID = "03ba29a1-d6bd-32ba-90b2-375e4d65abc9";
 	private static final String NO_UUID = "no";