Fixed stairs

src/main/java/appeng/items/contents/NetworkToolViewer.java

@@ -78,9 +78,9 @@ public class NetworkToolViewer implements INetworkTool
 	}
 
 	@Override
-	public String getName()
+	public String getCommandSenderName()
 	{
-		return this.inv.getName();
+		return this.inv.getCommandSenderName();
 	}
 
 	@Override

src/main/java/appeng/items/materials/MultiItem.java

@@ -69,14 +69,14 @@ import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;
 
 
-public final class ItemMultiMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule
+public final class MultiItem extends AEBaseItem implements IStorageComponent, IUpgradeModule
 {
 	public static final int KILO_SCALAR = 1024;
-	public static ItemMultiMaterial instance;
+	public static MultiItem instance;
 
 	private final Map<Integer, MaterialType> dmgToMaterial = new HashMap<Integer, MaterialType>();
 
-	public ItemMultiMaterial()
+	public MultiItem()
 	{
 		this.setFeature( EnumSet.of( AEFeature.Core ) );
 		this.setHasSubtypes( true );

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

@@ -45,7 +45,7 @@ import appeng.api.AEApi;
 import appeng.api.exceptions.MissingDefinition;
 import appeng.api.parts.IAlphaPassItem;
 import appeng.api.util.AEPartLocation;
-import appeng.block.solids.OreQuartz;
+import appeng.decorative.solid.QuartzOreBlock;
 import appeng.client.texture.BaseIcon;
 import appeng.core.AppEng;
 import appeng.core.FacadeConfig;
@@ -159,7 +159,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
 
 		boolean hasTile = b.hasTileEntity( b.getStateFromMeta( metadata ) );
 		boolean enableGlass = b instanceof BlockGlass || b instanceof BlockStainedGlass;
-		boolean disableOre = b instanceof OreQuartz;
+		boolean disableOre = b instanceof QuartzOreBlock;
 
 		boolean defaultValue = ( b.isOpaqueCube() && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass;
 		if( FacadeConfig.instance.checkEnabled( b, metadata, defaultValue ) )

src/main/java/appeng/items/tools/powered/ToolChargedStaff.java

@@ -21,9 +21,13 @@ package appeng.items.tools.powered;
 
 import java.util.EnumSet;
 
+import com.google.common.base.Optional;
+
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
+
 import appeng.core.AEConfig;
 import appeng.core.features.AEFeature;
 import appeng.core.sync.packets.PacketLightning;
@@ -31,8 +35,6 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem;
 import appeng.server.ServerHelper;
 import appeng.util.Platform;
 
-import com.google.common.base.Optional;
-
 
 public class ToolChargedStaff extends AEBasePoweredItem
 {
@@ -53,9 +55,10 @@ public class ToolChargedStaff extends AEBasePoweredItem
 			{
 				for( int x = 0; x < 2; x++ )
 				{
-					float dx = (float) ( Platform.getRandomFloat() * target.width + target.getBoundingBox().minX );
-					float dy = (float) ( Platform.getRandomFloat() * target.height + target.getBoundingBox().minY );
-					float dz = (float) ( Platform.getRandomFloat() * target.width + target.getBoundingBox().minZ );
+					final AxisAlignedBB entityBoundingBox = target.getEntityBoundingBox();
+					float dx = (float) ( Platform.getRandomFloat() * target.width + entityBoundingBox.minX );
+					float dy = (float) ( Platform.getRandomFloat() * target.height + entityBoundingBox.minY );
+					float dz = (float) ( Platform.getRandomFloat() * target.width + entityBoundingBox.minZ );
 					ServerHelper.proxy.sendToAllNearExcept( null, dx, dy, dz, 32.0, target.worldObj, new PacketLightning( dx, dy, dz ) );
 				}
 			}

src/main/java/appeng/items/tools/powered/ToolMassCannon.java

@@ -222,7 +222,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
 
 					float f1 = 0.3F;
 
-					AxisAlignedBB boundingBox = entity1.getBoundingBox().expand( f1, f1, f1 );
+					AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 );
 					MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 );
 
 					if( movingObjectPosition != null )
@@ -341,7 +341,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
 
 						float f1 = 0.3F;
 
-						AxisAlignedBB boundingBox = entity1.getBoundingBox().expand( f1, f1, f1 );
+						AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 );
 						MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 );
 
 						if( movingObjectPosition != null )