Paint Ball Translations

src/main/java/appeng/items/misc/ItemPaintBall.java

@@ -43,26 +43,9 @@ public class ItemPaintBall extends AEBaseItem
 		this.lumen = lumen;
 	}
 
-	@Override
-	public ITextComponent getDisplayName(final ItemStack is )
+	public AEColor getColor()
 	{
-		// FIXME: in the new system, we should have different items for the colors,
-		// FIXME: Making this function fully redundant
-		return super.getDisplayName( is ).shallowCopy().appendText(" - ").appendSibling(this.getExtraName( is ));
-	}
-
-	private ITextComponent getExtraName( final ItemStack is )
-	{
-		return new TranslationTextComponent(this.getColor(is).translationKey);
-	}
-
-	public AEColor getColor( final ItemStack is )
-	{
-		Item item = is.getItem();
-		if (item instanceof ItemPaintBall) {
-			return ((ItemPaintBall) item).color;
-		}
-		return AEColor.TRANSPARENT;
+		return color;
 	}
 
 	public boolean isLumen()

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

@@ -232,7 +232,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
 		if( paintBall.getItem() instanceof ItemPaintBall )
 		{
 			final ItemPaintBall ipb = (ItemPaintBall) paintBall.getItem();
-			return ipb.getColor( paintBall );
+			return ipb.getColor();
 		}
 		else
 		{

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

@@ -243,7 +243,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell<
 		{
 			final ItemPaintBall ipb = (ItemPaintBall) type.getItem();
 
-			final AEColor col = ipb.getColor( type );
+			final AEColor col = ipb.getColor();
 			// boolean lit = ipb.isLumen( type );
 
 			if( pos instanceof EntityRayTraceResult )

src/main/java/appeng/tile/misc/TilePaint.java

@@ -257,7 +257,7 @@ public class TilePaint extends AEBaseTile
 		{
 			final ItemPaintBall ipb = (ItemPaintBall) type.getItem();
 
-			final AEColor col = ipb.getColor( type );
+			final AEColor col = ipb.getColor();
 			final boolean lit = ipb.isLumen();
 
 			if( this.dots == null )