Merge pull request #1206 from yueh/fix-1068

Stops AEBaseItemBlock from modifying the metadata before placing.

build.gradle

@@ -103,6 +103,9 @@ sourceSets {
                     "assets/appliedenergistics2/textures/models/*",
                     "assets/appliedenergistics2/textures/items/*"
         }
+
+        // IntelliJ and Gradle interaction bug
+        output.resourcesDir = output.classesDir
     }
 }
 

src/main/java/appeng/block/AEBaseItemBlock.java

@@ -162,8 +162,6 @@ public class AEBaseItemBlock extends ItemBlock
 			forward = ForgeDirection.SOUTH;
 			if( up.offsetY == 0 )
 				forward = ForgeDirection.UP;
-
-			ori.setOrientation( forward, up );
 		}
 
 		if( !this.blockType.isValidOrientation( w, x, y, z, forward, up ) )

src/main/java/appeng/items/parts/ItemMultiPart.java

@@ -301,19 +301,22 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup
 			if( stack.getItem() == this )
 			{
 				PartType pt = this.getTypeByStack( stack );
-				switch( pt )
+				if ( pt != null )
 				{
-					case ImportBus:
+					switch( pt )
-						importBus = true;
+					{
-						if( u == pt )
+						case ImportBus:
-							group = true;
+							importBus = true;
-						break;
+							if( u == pt )
-					case ExportBus:
+								group = true;
-						exportBus = true;
+							break;
-						if( u == pt )
+						case ExportBus:
-							group = true;
+							exportBus = true;
-						break;
+							if( u == pt )
-					default:
+								group = true;
+							break;
+						default:
+					}
 				}
 			}
 		}

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

@@ -116,7 +116,7 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow
 	{
 		NBTTagCompound data = Platform.openNbtData( is );
 
-		double currentStorage = data.getDouble( this.POWER_NBT_KEY );
+		double currentStorage = data.getDouble( POWER_NBT_KEY );
 		double maxStorage = this.getAEMaxPower( is );
 
 		switch( op )
@@ -126,19 +126,19 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow
 				if( currentStorage > maxStorage )
 				{
 					double diff = currentStorage - maxStorage;
-					data.setDouble( this.POWER_NBT_KEY, maxStorage );
+					data.setDouble( POWER_NBT_KEY, maxStorage );
 					return diff;
 				}
-				data.setDouble( this.POWER_NBT_KEY, currentStorage );
+				data.setDouble( POWER_NBT_KEY, currentStorage );
 				return 0;
 			case EXTRACT:
 				if( currentStorage > adjustment )
 				{
 					currentStorage -= adjustment;
-					data.setDouble( this.POWER_NBT_KEY, currentStorage );
+					data.setDouble( POWER_NBT_KEY, currentStorage );
 					return adjustment;
 				}
-				data.setDouble( this.POWER_NBT_KEY, 0 );
+				data.setDouble( POWER_NBT_KEY, 0 );
 				return currentStorage;
 			default:
 				break;

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

@@ -103,7 +103,6 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
 	private void updateHandler()
 	{
 		this.myHandler.setBaseAccess( AccessRestriction.WRITE );
-		;
 		this.myHandler.setWhitelist( this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST );
 		this.myHandler.setPriority( this.priority );
 

src/main/java/appeng/worldgen/MeteoritePlacer.java

@@ -508,6 +508,4 @@ public final class MeteoritePlacer
 	{
 		return this.settings;
 	}
-
-	;
 }

src/main/java/appeng/worldgen/meteorite/ChunkOnly.java

@@ -12,7 +12,8 @@ public class ChunkOnly extends StandardWorld
 {
 
 	final Chunk target;
-	final int cx, cz;
+	final int cx;
+	final int cz;
 	int verticalBits = 0;
 
 	public ChunkOnly( World w, int cx, int cz )