Fixes #2415: Renaming remaining items/blocks.

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

@@ -67,15 +67,15 @@ import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;
 
 
-public final class ItemMultiItem extends AEBaseItem implements IStorageComponent, IUpgradeModule
+public final class ItemMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule
 {
-	public static ItemMultiItem instance;
+	public static ItemMaterial instance;
 
 	private static final int KILO_SCALAR = 1024;
 
 	private final Map<Integer, MaterialType> dmgToMaterial = new HashMap<>();
 
-	public ItemMultiItem()
+	public ItemMaterial()
 	{
 		this.setHasSubtypes( true );
 		instance = this;
@@ -253,7 +253,7 @@ public final class ItemMultiItem extends AEBaseItem implements IStorageComponent
 	@Override
 	public String getUnlocalizedName( final ItemStack is )
 	{
-		return "item.appliedenergistics2.multi_material." + this.nameOf( is );
+		return "item.appliedenergistics2.material." + this.nameOf( is );
 	}
 
 	@Override

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

@@ -59,15 +59,15 @@ import appeng.integration.IntegrationType;
 import appeng.items.AEBaseItem;
 
 
-public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup
+public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup
 {
 	private static final int INITIAL_REGISTERED_CAPACITY = PartType.values().length;
 	private static final Comparator<Entry<Integer, PartTypeWithVariant>> REGISTERED_COMPARATOR = new RegisteredComparator();
 
-	public static ItemMultiPart instance;
+	public static ItemPart instance;
 	private final Map<Integer, PartTypeWithVariant> registered;
 
-	public ItemMultiPart()
+	public ItemPart()
 	{
 		this.registered = new HashMap<>( INITIAL_REGISTERED_CAPACITY );
 

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

@@ -40,14 +40,14 @@ import appeng.parts.automation.PlaneConnections;
 import appeng.parts.automation.PlaneModel;
 
 
-public class ItemMultipartRendering extends ItemRenderingCustomizer
+public class ItemPartRendering extends ItemRenderingCustomizer
 {
 
 	private final PartModels partModels;
 
-	private final ItemMultiPart item;
+	private final ItemPart item;
 
-	public ItemMultipartRendering( PartModels partModels, ItemMultiPart item )
+	public ItemPartRendering( PartModels partModels, ItemPart item )
 	{
 		this.partModels = partModels;
 		this.item = item;

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

@@ -79,10 +79,10 @@ import appeng.util.LookDirection;
 import appeng.util.Platform;
 
 
-public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
+public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell
 {
 
-	public ToolMassCannon()
+	public ToolMatterCannon()
 	{
 		super( AEConfig.instance.matterCannonBattery );
 	}
@@ -371,7 +371,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
 			if( pos != null )
 			{
 				final DamageSource dmgSrc = DamageSource.causePlayerDamage( p );
-				dmgSrc.damageType = "masscannon";
+				dmgSrc.damageType = "matter_cannon";
 
 				if( pos.typeOfHit == RayTraceResult.Type.ENTITY )
 				{