Backport dupe fix (#3196)

Backported from 1.12

README.md

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

build.gradle

@@ -68,7 +68,7 @@ jar {
 }
 
 minecraft {
-    coreMod = "appeng.coremod.AppEngCore"
+    coreMod = "appeng.coremod.AppEngLoadingPlugin"
 
     version = minecraft_version + "-" + forge_version
 

src/main/java/appeng/core/AELog.java

@@ -307,7 +307,7 @@ public final class AELog
 	{
 		if( AEConfig.instance().isFeatureEnabled( AEFeature.INTEGRATION_LOGGING ) )
 		{
-			debug( exception );
+			error( exception );
 		}
 	}
 

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

@@ -205,7 +205,15 @@ public class PacketJEIRecipe extends AppEngPacket
 												if( filter == null || filter.isListed( request ) )
 												{
 													request.setStackSize( 1 );
-													final IAEItemStack out = Platform.poweredExtraction( energy, storage, request, cct.getActionSource() );
+													IAEItemStack out;
+													if ( realForFake == Actionable.SIMULATE )
+													{
+														out = storage.extractItems( request, Actionable.SIMULATE, cct.getActionSource() );
+													}
+													else
+													{
+														out = Platform.poweredExtraction( energy, storage, request, cct.getActionSource() );
+													}
 													if( out != null )
 													{
 														whichItem = out.getItemStack();

src/main/java/appeng/coremod/AppEngCoreContainer.java

@@ -19,10 +19,6 @@
 package appeng.coremod;
 
 
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
 import com.google.common.eventbus.EventBus;
 
 import net.minecraftforge.fml.common.DummyModContainer;
@@ -31,18 +27,15 @@ import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.ModMetadata;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.relauncher.FMLRelaunchLog;
-import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
-import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 
 import appeng.core.AEConfig;
 
 
-@MCVersion( "1.10.2" )
-public final class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin
+public final class AppEngCoreContainer extends DummyModContainer
 {
 	private final ModMetadata metadata = new ModMetadata();
 
-	public AppEngCore()
+	public AppEngCoreContainer()
 	{
 		FMLRelaunchLog.info( "[AppEng] Core Init" );
 		this.metadata.autogenerated = false;
@@ -61,37 +54,6 @@ public final class AppEngCore extends DummyModContainer implements IFMLLoadingPl
 	{
 	}
 
-	@Override
-	public String[] getASMTransformerClass()
-	{
-		return new String[] { "appeng.coremod.asm.ASMIntegration" };
-	}
-
-	@Override
-	public String getModContainerClass()
-	{
-		return "appeng.coremod.AppEngCore";
-	}
-
-	@Nullable
-	@Override
-	public String getSetupClass()
-	{
-		return null;
-	}
-
-	@Override
-	public void injectData( final Map<String, Object> data )
-	{
-
-	}
-
-	@Override
-	public String getAccessTransformerClass()
-	{
-		return null;
-	}
-
 	@Override
 	public ModMetadata getMetadata()
 	{

src/main/java/appeng/coremod/AppEngLoadingPlugin.java

@@ -0,0 +1,64 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.coremod;
+
+
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
+
+
+@IFMLLoadingPlugin.MCVersion( "1.10.2" )
+@IFMLLoadingPlugin.TransformerExclusions( { "appeng.coremod." } )
+public class AppEngLoadingPlugin implements IFMLLoadingPlugin
+{
+
+	@Override
+	public String[] getASMTransformerClass()
+	{
+		return new String[] { "appeng.coremod.transformer.IntegrationTransformer" };
+	}
+
+	@Override
+	public String getModContainerClass()
+	{
+		return "appeng.coremod.AppEngCoreContainer";
+	}
+
+	@Nullable
+	@Override
+	public String getSetupClass()
+	{
+		return null;
+	}
+
+	@Override
+	public void injectData( final Map<String, Object> data )
+	{
+
+	}
+
+	@Override
+	public String getAccessTransformerClass()
+	{
+		return null;
+	}
+}

src/main/java/appeng/coremod/MissingCoreMod.java

@@ -68,7 +68,7 @@ public final class MissingCoreMod extends CustomModLoadingErrorDisplayException
 			this.drawCenteredString( fontRenderer, "In a developer environment add the following too your args,", errorScreen.width / 2, offset, COLOR_WHITE );
 
 			offset += SCREEN_OFFSET;
-			this.drawCenteredString( fontRenderer, "-Dfml.coreMods.load=appeng.coremod.AppEngCore", errorScreen.width / 2, offset, SHADOW_WHITE );
+			this.drawCenteredString( fontRenderer, "-Dfml.coreMods.load=appeng.coremod.AppEngCoreContainer", errorScreen.width / 2, offset, SHADOW_WHITE );
 		}
 		else
 		{

src/main/java/appeng/coremod/transformer/IntegrationTransformer.java

@@ -41,37 +41,22 @@ import appeng.integration.IntegrationType;
 
 
 @Reflected
-public final class ASMIntegration implements IClassTransformer
+public final class IntegrationTransformer implements IClassTransformer
 {
 	@Reflected
-	public ASMIntegration()
+	public IntegrationTransformer()
 	{
-
-		/**
-		 * Side, Display Name, ModID ClassPostFix
-		 */
-
 		for( final IntegrationType type : IntegrationType.values() )
 		{
 			IntegrationRegistry.INSTANCE.add( type );
 		}
-
-		// integrationModules.add( IntegrationSide.BOTH, "Thermal Expansion", "ThermalExpansion", IntegrationType.TE );
-		// integrationModules.add( IntegrationSide.BOTH, "Mystcraft", "Mystcraft", IntegrationType.Mystcraft );
-		// integrationModules.add( IntegrationSide.BOTH, "Greg Tech", "gregtech_addon", IntegrationType.GT );
-		// integrationModules.add( IntegrationSide.BOTH, "Universal Electricity", null, IntegrationType.UE );
-		// integrationModules.add( IntegrationSide.BOTH, "Logistics Pipes", "LogisticsPipes|Main", IntegrationType.LP );
-		// integrationModules.add( IntegrationSide.BOTH, "Better Storage", IntegrationType.betterstorage );
-		// integrationModules.add( IntegrationSide.BOTH, "Forestry", "Forestry", IntegrationType.Forestry );
-		// integrationModules.add( IntegrationSide.BOTH, "Mekanism", "Mekanism", IntegrationType.Mekanism );
-
 	}
 
 	@Nullable
 	@Override
 	public byte[] transform( final String name, final String transformedName, final byte[] basicClass )
 	{
-		if( basicClass == null || transformedName.startsWith( "appeng.coremod" ) )
+		if( basicClass == null )
 		{
 			return basicClass;
 		}

src/main/java/appeng/helpers/NonNullArrayIterator.java

@@ -21,8 +21,6 @@ package appeng.helpers;
 
 import java.util.Iterator;
 
-import scala.NotImplementedError;
-
 
 public class NonNullArrayIterator<E> implements Iterator<E>
 {
@@ -58,6 +56,6 @@ public class NonNullArrayIterator<E> implements Iterator<E>
 	@Override
 	public void remove()
 	{
-		throw new NotImplementedError();
+		throw new UnsupportedOperationException();
 	}
 }

src/main/java/appeng/integration/IntegrationNode.java

@@ -25,9 +25,6 @@ import net.minecraftforge.fml.common.ModAPIManager;
 import appeng.api.exceptions.ModNotInstalled;
 import appeng.core.AEConfig;
 import appeng.core.AELog;
-import appeng.integration.modules.ic2.IC2Module;
-import appeng.integration.modules.jei.JEIModule;
-import appeng.integration.modules.waila.WailaModule;
 
 
 final class IntegrationNode
@@ -80,7 +77,8 @@ final class IntegrationNode
 						final ModAPIManager apiManager = ModAPIManager.INSTANCE;
 						boolean enabled = this.modID == null || Loader.isModLoaded( this.modID ) || apiManager.hasAPI( this.modID );
 
-						AEConfig.instance().addCustomCategoryComment( "ModIntegration", "Valid Values are 'AUTO', 'ON', or 'OFF' - defaults to 'AUTO' ; Suggested that you leave this alone unless your experiencing an issue, or wish to disable the integration for a reason." );
+						AEConfig.instance().addCustomCategoryComment( "ModIntegration",
+								"Valid Values are 'AUTO', 'ON', or 'OFF' - defaults to 'AUTO' ; Suggested that you leave this alone unless your experiencing an issue, or wish to disable the integration for a reason." );
 						final String mode = AEConfig.instance().get( "ModIntegration", this.displayName.replace( " ", "" ), "AUTO" ).getString();
 
 						if( mode.toUpperCase().equals( "ON" ) )

src/main/java/appeng/integration/IntegrationType.java

@@ -21,6 +21,8 @@ package appeng.integration;
 
 import appeng.integration.modules.ic2.IC2Module;
 import appeng.integration.modules.jei.JEIModule;
+import appeng.integration.modules.rf.RFItemModule;
+import appeng.integration.modules.rf.RFTileModule;
 import appeng.integration.modules.theoneprobe.TheOneProbeModule;
 import appeng.integration.modules.waila.WailaModule;
 
@@ -36,13 +38,25 @@ public enum IntegrationType
 		}
 	},
 
-	RC( IntegrationSide.BOTH, "Railcraft", "Railcraft" ),
+	RF( IntegrationSide.BOTH, "RedstoneFlux Power - Tiles", "CoFHAPI" )
+	{
 
-	RF( IntegrationSide.BOTH, "RedstoneFlux Power - Tiles", "CoFHAPI" ),
+		@Override
+		public IIntegrationModule createInstance()
+		{
+			return new RFTileModule();
+		}
+	},
 
-	RFItem( IntegrationSide.BOTH, "RedstoneFlux Power - Items", "CoFHAPI" ),
+	RFItem( IntegrationSide.BOTH, "RedstoneFlux Power - Items", "CoFHAPI" )
+	{
 
-	MFR( IntegrationSide.BOTH, "Mine Factory Reloaded", "MineFactoryReloaded" ),
+		@Override
+		public IIntegrationModule createInstance()
+		{
+			return new RFItemModule();
+		}
+	},
 
 	Waila( IntegrationSide.BOTH, "Waila", "Waila" )
 	{
@@ -53,8 +67,6 @@ public enum IntegrationType
 		}
 	},
 
-	InvTweaks( IntegrationSide.CLIENT, "Inventory Tweaks", "inventorytweaks" ),
-
 	JEI( IntegrationSide.CLIENT, "Just Enough Items", "JEI" )
 	{
 		@Override
@@ -64,10 +76,6 @@ public enum IntegrationType
 		}
 	},
 
-	Mekanism( IntegrationSide.BOTH, "Mekanism", "Mekanism" ),
-
-	OpenComputers( IntegrationSide.BOTH, "OpenComputers", "OpenComputers" ),
-
 	THE_ONE_PROBE( IntegrationSide.BOTH, "TheOneProbe", "theoneprobe" )
 	{
 		@Override
@@ -90,7 +98,7 @@ public enum IntegrationType
 
 	public IIntegrationModule createInstance()
 	{
-		throw new UnsupportedOperationException();
+		throw new MissingIntegrationModuleException( this.name() );
 	}
 
 }

src/main/java/appeng/integration/MissingIntegrationModuleException.java

@@ -0,0 +1,32 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.integration;
+
+
+public class MissingIntegrationModuleException extends RuntimeException
+{
+
+	private static final long serialVersionUID = 1927357647297008228L;
+
+	public MissingIntegrationModuleException( String name )
+	{
+		super( "Missing integration module for type '" + name + "'." );
+	}
+
+}

src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java

@@ -20,6 +20,7 @@ package appeng.integration.modules.jei;
 
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -28,7 +29,6 @@ import net.minecraft.item.ItemStack;
 import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.BlankRecipeWrapper;
 import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper;
-import scala.actors.threadpool.Arrays;
 
 import appeng.api.exceptions.MissingIngredientError;
 import appeng.api.exceptions.RegistrationError;

src/main/java/appeng/integration/modules/rf/RFItemModule.java

@@ -0,0 +1,32 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.integration.modules.rf;
+
+
+import appeng.integration.IIntegrationModule;
+import appeng.integration.IntegrationHelper;
+
+
+public class RFItemModule implements IIntegrationModule
+{
+	public RFItemModule()
+	{
+		IntegrationHelper.testClassExistence( this, cofh.api.energy.IEnergyContainerItem.class );
+	}
+}

src/main/java/appeng/integration/modules/rf/RFTileModule.java

@@ -0,0 +1,32 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.integration.modules.rf;
+
+
+import appeng.integration.IIntegrationModule;
+import appeng.integration.IntegrationHelper;
+
+
+public class RFTileModule implements IIntegrationModule
+{
+	public RFTileModule()
+	{
+		IntegrationHelper.testClassExistence( this, cofh.api.energy.IEnergyReceiver.class );
+	}
+}

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

@@ -64,9 +64,7 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage
 	@Override
 	public boolean hasCapability( Capability<?> capability, @Nullable EnumFacing facing )
 	{
-		return capability == CapabilityEnergy.ENERGY
-				|| capability == Capabilities.TESLA_CONSUMER
-				|| capability == Capabilities.TESLA_HOLDER;
+		return capability == CapabilityEnergy.ENERGY || capability == Capabilities.TESLA_CONSUMER || capability == Capabilities.TESLA_HOLDER;
 	}
 
 	@SuppressWarnings( "unchecked" )
@@ -87,10 +85,10 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage
 	@Override
 	public int receiveEnergy( int maxReceive, boolean simulate )
 	{
-
 		if( simulate )
 		{
 			final int required = (int) PowerUnits.AE.convertTo( PowerUnits.RF, item.getAEMaxPower( is ) - item.getAECurrentPower( is ) );
+
 			if( maxReceive < required )
 			{
 				return 0;
@@ -100,7 +98,7 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage
 		else
 		{
 			final double powerRemainder = item.injectAEPower( is, PowerUnits.RF.convertTo( PowerUnits.AE, maxReceive ) );
-			return (int) PowerUnits.AE.convertTo( PowerUnits.RF, powerRemainder );
+			return maxReceive - (int) PowerUnits.AE.convertTo( PowerUnits.RF, powerRemainder );
 		}
 	}
 

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

@@ -136,10 +136,12 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 						extracted.stackSize = remainingCurrentSlot;
 					}
 
-					// We're just gonna use the first stack we get our hands on as the template for the rest
+					// We're just gonna use the first stack we get our hands on as the template for the rest.
+					// In case some stupid itemhandler (aka forge) returns an internal state we have to do a second
+					// expensive copy again.
 					if( gathered == null )
 					{
-						gathered = extracted;
+						gathered = extracted.copy();
 					}
 					else
 					{

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

@@ -199,7 +199,7 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui
 		i = list.iterator();
 		int used = 0;
 
-		while( i.hasNext() )
+		while( i.hasNext() && available > 0 )
 		{
 			final PartP2PFluids l = i.next();
 
@@ -221,7 +221,7 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui
 			}
 
 			available -= insert.amount;
-			used += insert.amount;
+			used += l.tmpUsed;
 		}
 
 		if( stack.pop() != this )

src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java

@@ -169,6 +169,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
 			if( this.te != null && Platform.isServer() )
 			{
 				this.te.onChangeInventory( this, slot, InvOperation.decreaseStackSize, ns, null );
+				this.te.saveChanges();
 			}
 
 			return ns;
@@ -215,6 +216,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
 			}
 
 			this.te.onChangeInventory( this, slot, InvOperation.setInventorySlotContents, removed, added );
+			this.te.saveChanges();
 		}
 	}
 
@@ -242,6 +244,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
 		if( this.te != null && Platform.isServer() )
 		{
 			this.te.onChangeInventory( this, -1, InvOperation.markDirty, null, null );
+			this.te.saveChanges();
 		}
 	}
 

src/main/java/appeng/tile/inventory/AppEngInternalInventory.java

@@ -174,6 +174,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
 		if( this.getTileEntity() != null && this.eventsEnabled() )
 		{
 			this.getTileEntity().onChangeInventory( this, -1, InvOperation.markDirty, null, null );
+			this.getTileEntity().saveChanges();
 		}
 	}
 
@@ -200,6 +201,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
 		if( this.getTileEntity() != null && this.eventsEnabled() )
 		{
 			this.getTileEntity().onChangeInventory( this, slotIndex, InvOperation.markDirty, null, null );
+			this.getTileEntity().saveChanges();
 		}
 	}
 

src/main/java/appeng/util/Platform.java

@@ -1423,7 +1423,7 @@ public class Platform
 
 		if( target.hasCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, null ) )
 		{
-			return 0;
+			return target.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, null ).hashCode();
 		}
 		else if( target instanceof TileEntityChest )
 		{

src/test/java/appeng/client/render/UVLightmapJsonTest.java

@@ -1,3 +1,20 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
 
 package appeng.client.render;
 
@@ -35,7 +52,8 @@ public class UVLightmapJsonTest
 	@EventHandler
 	public void preInit( FMLPreInitializationEvent event )
 	{
-		GameRegistry.register( uvlblock = new Block( Material.IRON ){
+		GameRegistry.register( uvlblock = new Block( Material.IRON )
+		{
 
 			final AxisAlignedBB box = new AxisAlignedBB( 0.25, 0, 7 / 16d, 0.75, 1, 9 / 16d );
 

src/test/java/appeng/coremod/AppEngCoreTest.java

@@ -0,0 +1,65 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.coremod;
+
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class AppEngCoreTest
+{
+	private final static String EXPECTED_CONTAINER_CLASS_NAME = appeng.coremod.AppEngCoreContainer.class.getName();
+	private final static String EXPECTED_CONTAINER_MOD_ID = "appliedenergistics2-core";
+	private final static String[] EXPECTED_TRANSFORMERS = new String[] {
+			appeng.coremod.transformer.IntegrationTransformer.class.getName()
+	};
+
+	private AppEngCoreContainer coreModContainer;
+	private AppEngLoadingPlugin loadingPlugin;
+
+	@Before
+	public void setup()
+	{
+		this.coreModContainer = new AppEngCoreContainer();
+		this.loadingPlugin = new AppEngLoadingPlugin();
+	}
+
+	@Test
+	public void testTransformerStringsMatchActualClasses()
+	{
+		assertArrayEquals( EXPECTED_TRANSFORMERS, loadingPlugin.getASMTransformerClass() );
+	}
+
+	@Test
+	public void testContainerClassExists()
+	{
+		assertEquals( EXPECTED_CONTAINER_CLASS_NAME, loadingPlugin.getModContainerClass() );
+	}
+
+	@Test
+	public void testContainerModId()
+	{
+		assertEquals( EXPECTED_CONTAINER_MOD_ID, coreModContainer.getModId() );
+	}
+
+}

src/test/java/appeng/integration/IntegrationTypeTest.java

@@ -0,0 +1,52 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.integration;
+
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+
+public class IntegrationTypeTest
+{
+
+	@Test
+	public void testCreateInstanceWithoutExceptions()
+	{
+		for( IntegrationType type : IntegrationType.values() )
+		{
+			try
+			{
+				assertNotNull( type.createInstance() );
+			}
+			// We actually only care about this specific type not being thrown.
+			catch( MissingIntegrationModuleException e )
+			{
+				throw e;
+			}
+			// Throw everything else away as these might be caused due to missing dependencies during testing.
+			catch( Throwable e )
+			{
+				// ignore
+			}
+		}
+	}
+
+}

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

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

src/test/java/appeng/util/SlimReadableNumberConverterTest.java

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

src/test/java/appeng/util/WideReadableNumberConverterTest.java

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