All parameters on one line (for now)

Easier picking of 1.7 changes

src/main/java/appeng/client/ClientHelper.java

@@ -262,8 +262,7 @@ public class ClientHelper extends ServerHelper
 		inst.entityRenderMap.put( EntityFloatingItem.class, new RenderFloatingItem( inst ) );
 
 		final ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
-		final ItemMeshDefinition imd = new ItemMeshDefinition()
-		{
+		final ItemMeshDefinition imd = new ItemMeshDefinition(){
 
 			@Override
 			public ModelResourceLocation getModelLocation( final ItemStack stack )

src/main/java/appeng/client/SmartModel.java

@@ -31,15 +31,13 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
 
 	private final BlockRenderInfo aeRenderer;
 
-	public SmartModel(
-			final BlockRenderInfo rendererInstance )
+	public SmartModel( final BlockRenderInfo rendererInstance )
 	{
 		this.aeRenderer = rendererInstance;
 	}
 
 	@Override
-	public List getFaceQuads(
-			final EnumFacing p_177551_1_ )
+	public List getFaceQuads( final EnumFacing p_177551_1_ )
 	{
 		return Collections.emptyList();
 	}
@@ -81,8 +79,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
 	}
 
 	@Override
-	public IBakedModel handleItemState(
-			final ItemStack stack )
+	public IBakedModel handleItemState( final ItemStack stack )
 	{
 		final ModelGenerator helper = new ModelGenerator();
 		final Block blk = Block.getBlockFromItem( stack.getItem() );
@@ -93,8 +90,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
 	}
 
 	@Override
-	public IBakedModel handleBlockState(
-			final IBlockState state )
+	public IBakedModel handleBlockState( final IBlockState state )
 	{
 		final ModelGenerator helper = new ModelGenerator();
 		final Block blk = state.getBlock();

src/main/java/appeng/client/render/AppEngRenderItem.java

@@ -48,9 +48,7 @@ import appeng.util.ReadableNumberConverter;
  */
 public class AppEngRenderItem extends RenderItem
 {
-	public AppEngRenderItem(
-			final TextureManager textureManager,
-			final ModelManager modelManager )
+	public AppEngRenderItem( final TextureManager textureManager, final ModelManager modelManager )
 	{
 		super( textureManager, modelManager );
 	}
@@ -61,12 +59,7 @@ public class AppEngRenderItem extends RenderItem
 	private IAEItemStack aeStack = null;
 
 	@Override
-	public void renderItemOverlayIntoGUI(
-			final FontRenderer fontRenderer,
-			final ItemStack is,
-			final int xPos,
-			final int yPos,
-			final String text )
+	public void renderItemOverlayIntoGUI( final FontRenderer fontRenderer, final ItemStack is, final int xPos, final int yPos, final String text )
 	{
 		if( is != null )
 		{

src/main/java/appeng/client/render/BaseBlockRender.java

@@ -443,11 +443,11 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
 
 	protected void renderBlockBounds( final ModelGenerator renderer,
 
-			double minX, double minY, double minZ,
+	double minX, double minY, double minZ,
 
-			double maxX, double maxY, double maxZ,
+	double maxX, double maxY, double maxZ,
 
-			final EnumFacing x, final EnumFacing y, final EnumFacing z )
+	final EnumFacing x, final EnumFacing y, final EnumFacing z )
 	{
 		minX /= 16.0;
 		minY /= 16.0;
@@ -557,28 +557,28 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
 		final double layerBX = 0.0;
 		final double layerAY = 0.0;
 		this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
-				// u -> u
-				0, 1.0,
-				// v -> v
-				0, edgeThickness, ico, flip );
+		// u -> u
+		0, 1.0,
+		// v -> v
+		0, edgeThickness, ico, flip );
 
 		this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
-				// u -> u
-				0.0, edgeThickness,
-				// v -> v
-				edgeThickness, 1.0 - edgeThickness, ico, flip );
+		// u -> u
+		0.0, edgeThickness,
+		// v -> v
+		edgeThickness, 1.0 - edgeThickness, ico, flip );
 
 		this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
-				// u -> u
-				1.0 - edgeThickness, 1.0,
-				// v -> v
-				edgeThickness, 1.0 - edgeThickness, ico, flip );
+		// u -> u
+		1.0 - edgeThickness, 1.0,
+		// v -> v
+		edgeThickness, 1.0 - edgeThickness, ico, flip );
 
 		this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
-				// u -> u
-				0, 1.0,
-				// v -> v
-				1.0 - edgeThickness, 1.0, ico, flip );
+		// u -> u
+		0, 1.0,
+		// v -> v
+		1.0 - edgeThickness, 1.0, ico, flip );
 	}
 
 	@SideOnly( Side.CLIENT )

src/main/java/appeng/client/render/BusRenderer.java

@@ -31,8 +31,7 @@ public class BusRenderer
 		return this.mg;
 	}
 
-	public void setRenderer(
-			ModelGenerator renderer )
+	public void setRenderer( ModelGenerator renderer )
 	{
 		this.mg = renderer;
 	}

src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java

@@ -10,17 +10,8 @@ import net.minecraft.world.IBlockAccess;
 public interface ISimpleBlockRenderingHandler
 {
 
-	void renderInventoryBlock(
-			Block block,
-			int metadata,
-			int modelID,
-			ModelGenerator renderer );
+	void renderInventoryBlock( Block block, int metadata, int modelID, ModelGenerator renderer );
 
-	boolean renderWorldBlock(
-			IBlockAccess world,
-			BlockPos pos,
-			Block block,
-			int modelId,
-			ModelGenerator renderer );
+	boolean renderWorldBlock( IBlockAccess world, BlockPos pos, Block block, int modelId, ModelGenerator renderer );
 
 }

src/main/java/appeng/client/render/IconUnwrapper.java

@@ -18,8 +18,7 @@ public class IconUnwrapper extends TextureAtlasSprite
 	private final float min_v;
 	private final float max_v;
 
-	protected IconUnwrapper(
-			final IAESprite src )
+	protected IconUnwrapper( final IAESprite src )
 	{
 		super( src.getIconName() );
 		this.width = src.getIconWidth();

src/main/java/appeng/client/render/ModelGenerator.java

@@ -90,8 +90,7 @@ public class ModelGenerator
 		}
 
 		@Override
-		public List getFaceQuads(
-				final EnumFacing p_177551_1_ )
+		public List getFaceQuads( final EnumFacing p_177551_1_ )
 		{
 			return this.faces[p_177551_1_.ordinal()];
 		}
@@ -125,16 +124,7 @@ public class ModelGenerator
 	private float tx = 0, ty = 0, tz = 0;
 	private final float[] defUVs = { 0, 0, 1, 1 };
 
-	private final float[] quadsUV = {
-			0,
-			0,
-			1,
-			1,
-			0,
-			0,
-			1,
-			1
-	};
+	private final float[] quadsUV = { 0, 0, 1, 1, 0, 0, 1, 1 };
 	private EnumSet<EnumFacing> renderFaces = EnumSet.allOf( EnumFacing.class );
 	private boolean flipTexture = false;
 	private final List<SMFace> faces = new ArrayList();
@@ -145,8 +135,7 @@ public class ModelGenerator
 	private EnumFacing currentFace = EnumFacing.UP;
 	private int color = -1;
 
-	public void setRenderBoundsFromBlock(
-			final Block block )
+	public void setRenderBoundsFromBlock( final Block block )
 	{
 		if( block == null )
 		{
@@ -161,13 +150,7 @@ public class ModelGenerator
 		this.setRenderMaxZ( block.getBlockBoundsMaxZ() );
 	}
 
-	public void setRenderBounds(
-			final double d,
-			final double e,
-			final double f,
-			final double g,
-			final double h,
-			final double i )
+	public void setRenderBounds( final double d, final double e, final double f, final double g, final double h, final double i )
 	{
 		this.setRenderMinX( d );
 		this.setRenderMinY( e );
@@ -177,74 +160,49 @@ public class ModelGenerator
 		this.setRenderMaxZ( i );
 	}
 
-	public void setBrightness(
-			final int i )
+	public void setBrightness( final int i )
 	{
 		this.brightness = i;
 	}
 
-	public void setColorRGBA_F(
-			final int r,
-			final int g,
-			final int b,
-			final float a )
+	public void setColorRGBA_F( final int r, final int g, final int b, final float a )
 	{
 		final int alpha = (int) ( a * 0xff );
-		this.color = alpha << 24 |
-				r << 16 |
-				b << 8 |
-				b;
+		this.color = alpha << 24 | r << 16 | b << 8 | b;
 	}
 
-	public void setColorOpaque_I(
-			final int whiteVariant )
+	public void setColorOpaque_I( final int whiteVariant )
 	{
 		final int alpha = 0xff;
 		this.color = // alpha << 24 |
 		whiteVariant;
 	}
 
-	public void setColorOpaque(
-			final int r,
-			final int g,
-			final int b )
+	public void setColorOpaque( final int r, final int g, final int b )
 	{
 		final int alpha = 0xff;
 		this.color = // alpha << 24 |
-		r << 16 |
-				g << 8 |
-				b;
+		r << 16 | g << 8 | b;
 	}
 
-	public void setColorOpaque_F(
-			final int r,
-			final int g,
-			final int b )
+	public void setColorOpaque_F( final int r, final int g, final int b )
 	{
 		final int alpha = 0xff;
 		this.color = // alpha << 24 |
-		Math.min( 0xff, Math.max( 0, r ) ) << 16 |
-				Math.min( 0xff, Math.max( 0, g ) ) << 8 |
-				Math.min( 0xff, Math.max( 0, b ) );
+		Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) );
 	}
 
-	public void setColorOpaque_F(
-			final float rf,
-			final float bf,
-			final float gf )
+	public void setColorOpaque_F( final float rf, final float bf, final float gf )
 	{
 		final int r = (int) ( rf * 0xff );
 		final int g = (int) ( gf * 0xff );
 		final int b = (int) ( bf * 0xff );
 		final int alpha = 0xff;
 		this.color = // alpha << 24 |
-		Math.min( 0xff, Math.max( 0, r ) ) << 16 |
-				Math.min( 0xff, Math.max( 0, g ) ) << 8 |
-				Math.min( 0xff, Math.max( 0, b ) );
+		Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) );
 	}
 
-	public IAESprite getIcon(
-			final ItemStack is )
+	public IAESprite getIcon( final ItemStack is )
 	{
 		final Item it = is.getItem();
 
@@ -272,8 +230,7 @@ public class ModelGenerator
 		return new MissingIcon( is );
 	}
 
-	public IAESprite[] getIcon(
-			final IBlockState state )
+	public IAESprite[] getIcon( final IBlockState state )
 	{
 		final IAESprite[] out = new IAESprite[6];
 
@@ -334,52 +291,20 @@ public class ModelGenerator
 		return this.getIcon( state );
 	}
 
-	public void addVertexWithUV(
-			final EnumFacing face,
-			final double x,
-			final double y,
-			final double z,
-			final double u,
-			final double v )
+	public void addVertexWithUV( final EnumFacing face, final double x, final double y, final double z, final double u, final double v )
 	{
 		this.points[this.point++] = new float[] { (float) x + this.tx, (float) y + this.ty, (float) z + this.tz, (float) u, (float) v };
 
 		if( this.point == 4 )
 		{
 			this.brightness = -1;
-			final int[] vertData = {
-					Float.floatToRawIntBits( this.points[0][0] ),
-					Float.floatToRawIntBits( this.points[0][1] ),
-					Float.floatToRawIntBits( this.points[0][2] ),
-					this.brightness,
-					Float.floatToRawIntBits( this.points[0][3] ),
-					Float.floatToRawIntBits( this.points[0][4] ),
-					0,
+			final int[] vertData = { Float.floatToRawIntBits( this.points[0][0] ), Float.floatToRawIntBits( this.points[0][1] ), Float.floatToRawIntBits( this.points[0][2] ), this.brightness, Float.floatToRawIntBits( this.points[0][3] ), Float.floatToRawIntBits( this.points[0][4] ), 0,
 
-					Float.floatToRawIntBits( this.points[1][0] ),
-					Float.floatToRawIntBits( this.points[1][1] ),
-					Float.floatToRawIntBits( this.points[1][2] ),
-					this.brightness,
-					Float.floatToRawIntBits( this.points[1][3] ),
-					Float.floatToRawIntBits( this.points[1][4] ),
-					0,
+			Float.floatToRawIntBits( this.points[1][0] ), Float.floatToRawIntBits( this.points[1][1] ), Float.floatToRawIntBits( this.points[1][2] ), this.brightness, Float.floatToRawIntBits( this.points[1][3] ), Float.floatToRawIntBits( this.points[1][4] ), 0,
 
-					Float.floatToRawIntBits( this.points[2][0] ),
-					Float.floatToRawIntBits( this.points[2][1] ),
-					Float.floatToRawIntBits( this.points[2][2] ),
-					this.brightness,
-					Float.floatToRawIntBits( this.points[2][3] ),
-					Float.floatToRawIntBits( this.points[2][4] ),
-					0,
+			Float.floatToRawIntBits( this.points[2][0] ), Float.floatToRawIntBits( this.points[2][1] ), Float.floatToRawIntBits( this.points[2][2] ), this.brightness, Float.floatToRawIntBits( this.points[2][3] ), Float.floatToRawIntBits( this.points[2][4] ), 0,
 
-					Float.floatToRawIntBits( this.points[3][0] ),
-					Float.floatToRawIntBits( this.points[3][1] ),
-					Float.floatToRawIntBits( this.points[3][2] ),
-					this.brightness,
-					Float.floatToRawIntBits( this.points[3][3] ),
-					Float.floatToRawIntBits( this.points[3][4] ),
-					0,
-			};
+			Float.floatToRawIntBits( this.points[3][0] ), Float.floatToRawIntBits( this.points[3][1] ), Float.floatToRawIntBits( this.points[3][2] ), this.brightness, Float.floatToRawIntBits( this.points[3][3] ), Float.floatToRawIntBits( this.points[3][4] ), 0, };
 
 			this.generatedModel.general.add( new IColoredBakedQuad.ColoredBakedQuad( vertData, this.color, face ) );
 
@@ -387,9 +312,7 @@ public class ModelGenerator
 		}
 	}
 
-	public boolean renderStandardBlock(
-			final Block block,
-			final BlockPos pos )
+	public boolean renderStandardBlock( final Block block, final BlockPos pos )
 	{
 		// setRenderBoundsFromBlock( block );
 
@@ -406,10 +329,7 @@ public class ModelGenerator
 		return false;
 	}
 
-	public void setTranslation(
-			final int x,
-			final int y,
-			final int z )
+	public void setTranslation( final int x, final int y, final int z )
 	{
 		this.tx = x;
 		this.ty = y;
@@ -421,10 +341,7 @@ public class ModelGenerator
 		return MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.TRANSLUCENT;
 	}
 
-	private float[] getFaceUvs(
-			final EnumFacing face,
-			final Vector3f to_16,
-			final Vector3f from_16 )
+	private float[] getFaceUvs( final EnumFacing face, final Vector3f to_16, final Vector3f from_16 )
 	{
 		float from_a = 0;
 		float from_b = 0;
@@ -494,10 +411,7 @@ public class ModelGenerator
 		return afloat;
 	}
 
-	public void renderFaceXNeg(
-			final Block blk,
-			final BlockPos pos,
-			final IAESprite lights )
+	public void renderFaceXNeg( final Block blk, final BlockPos pos, final IAESprite lights )
 	{
 		final boolean isEdge = this.getRenderMinX() < 0.0001;
 		final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
@@ -507,10 +421,7 @@ public class ModelGenerator
 		this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
 	}
 
-	public void renderFaceYNeg(
-			final Block blk,
-			final BlockPos pos,
-			final IAESprite lights )
+	public void renderFaceYNeg( final Block blk, final BlockPos pos, final IAESprite lights )
 	{
 		final boolean isEdge = this.getRenderMinY() < 0.0001;
 		final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
@@ -520,10 +431,7 @@ public class ModelGenerator
 		this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
 	}
 
-	public void renderFaceZNeg(
-			final Block blk,
-			final BlockPos pos,
-			final IAESprite lights )
+	public void renderFaceZNeg( final Block blk, final BlockPos pos, final IAESprite lights )
 	{
 		final boolean isEdge = this.getRenderMinZ() < 0.0001;
 		final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
@@ -533,10 +441,7 @@ public class ModelGenerator
 		this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
 	}
 
-	public void renderFaceYPos(
-			final Block blk,
-			final BlockPos pos,
-			final IAESprite lights )
+	public void renderFaceYPos( final Block blk, final BlockPos pos, final IAESprite lights )
 	{
 		final boolean isEdge = this.getRenderMaxY() > 0.9999;
 		final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMaxY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
@@ -546,10 +451,7 @@ public class ModelGenerator
 		this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
 	}
 
-	public void renderFaceZPos(
-			final Block blk,
-			final BlockPos pos,
-			final IAESprite lights )
+	public void renderFaceZPos( final Block blk, final BlockPos pos, final IAESprite lights )
 	{
 		final boolean isEdge = this.getRenderMaxZ() > 0.9999;
 		final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMaxZ() * 16.0f );
@@ -559,10 +461,7 @@ public class ModelGenerator
 		this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
 	}
 
-	public void renderFaceXPos(
-			final Block blk,
-			final BlockPos pos,
-			final IAESprite lights )
+	public void renderFaceXPos( final Block blk, final BlockPos pos, final IAESprite lights )
 	{
 		final boolean isEdge = this.getRenderMaxX() > 0.9999;
 		final Vector3f to = new Vector3f( (float) this.getRenderMaxX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
@@ -572,12 +471,7 @@ public class ModelGenerator
 		this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
 	}
 
-	private void addFace(
-			final EnumFacing face, final boolean isEdge,
-			final Vector3f to,
-			final Vector3f from,
-			final float[] defUVs2,
-			IAESprite texture )
+	private void addFace( final EnumFacing face, final boolean isEdge, final Vector3f to, final Vector3f from, final float[] defUVs2, IAESprite texture )
 	{
 		if( this.getOverrideBlockTexture() != null )
 		{
@@ -587,10 +481,7 @@ public class ModelGenerator
 		this.faces.add( new SMFace( face, isEdge, this.color, to, from, defUVs2, new IconUnwrapper( texture ) ) );
 	}
 
-	public void setNormal(
-			final float x,
-			final float y,
-			final float z )
+	public void setNormal( final float x, final float y, final float z )
 	{
 		if( x > 0.5 )
 		{
@@ -618,8 +509,7 @@ public class ModelGenerator
 		}
 	}
 
-	public void setOverrideBlockTexture(
-			final IAESprite object )
+	public void setOverrideBlockTexture( final IAESprite object )
 	{
 		this.overrideBlockTexture = object;
 	}

src/main/java/appeng/client/render/RenderBlocksWorkaround.java

@@ -36,8 +36,7 @@ public class RenderBlocksWorkaround extends ModelGenerator
 	private EnumSet<EnumFacing> renderFaces;
 	private float opacity;
 
-	public void setTexture(
-			final Object object )
+	public void setTexture( final Object object )
 	{
 		// TODO Auto-generated method stub
 	}

src/main/java/appeng/client/render/SMFace.java

@@ -23,13 +23,7 @@ public class SMFace
 
 	private final int color;
 
-	public SMFace(
-			final EnumFacing face, final boolean isEdge,
-			final int color,
-			final Vector3f to,
-			final Vector3f from,
-			final float[] defUVs2,
-			final TextureAtlasSprite iconUnwrapper )
+	public SMFace( final EnumFacing face, final boolean isEdge, final int color, final Vector3f to, final Vector3f from, final float[] defUVs2, final TextureAtlasSprite iconUnwrapper )
 	{
 		this.color = color;
 		this.face = face;

src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java

@@ -44,10 +44,7 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
 
 	private static final ResourceLocation SKY_STONE_CHEST = new ResourceLocation( "appliedenergistics2", "textures/models/skychest.png" );
 	private static final ResourceLocation SKY_BLOCK_CHEST = new ResourceLocation( "appliedenergistics2", "textures/models/skyblockchest.png" );
-	private static final ResourceLocation[] METADATA_TO_TEXTURE = {
-			SKY_STONE_CHEST,
-			SKY_BLOCK_CHEST
-	};
+	private static final ResourceLocation[] METADATA_TO_TEXTURE = { SKY_STONE_CHEST, SKY_BLOCK_CHEST };
 
 	private final ModelChest model = new ModelChest();
 

src/main/java/appeng/client/texture/BaseIcon.java

@@ -33,8 +33,7 @@ public class BaseIcon implements IAESprite
 	}
 
 	@Override
-	public float getInterpolatedU(
-			final double px )
+	public float getInterpolatedU( final double px )
 	{
 		return this.spite.getInterpolatedU( px );
 	}
@@ -58,8 +57,7 @@ public class BaseIcon implements IAESprite
 	}
 
 	@Override
-	public float getInterpolatedV(
-			final double px )
+	public float getInterpolatedV( final double px )
 	{
 		return this.spite.getInterpolatedV( px );
 	}

src/main/java/appeng/client/texture/CableBusTextures.java

@@ -32,39 +32,128 @@ import appeng.core.AppEng;
 public enum CableBusTextures
 {
 
-	Channels00( "MECableSmart00" ), Channels01( "MECableSmart01" ), Channels02( "MECableSmart02" ), Channels03( "MECableSmart03" ), Channels10( "MECableSmart10" ), Channels11( "MECableSmart11" ), Channels12( "MECableSmart12" ), Channels13( "MECableSmart13" ), Channels14( "MECableSmart14" ), Channels04( "MECableSmart04" ),
+	Channels00( "MECableSmart00" ),
+	Channels01( "MECableSmart01" ),
+	Channels02( "MECableSmart02" ),
+	Channels03( "MECableSmart03" ),
+	Channels10( "MECableSmart10" ),
+	Channels11( "MECableSmart11" ),
+	Channels12( "MECableSmart12" ),
+	Channels13( "MECableSmart13" ),
+	Channels14( "MECableSmart14" ),
+	Channels04( "MECableSmart04" ),
 
-	LevelEmitterTorchOn( "ItemPart.LevelEmitterOn" ), BlockWirelessOn( "BlockWirelessOn" ),
+	LevelEmitterTorchOn( "ItemPart.LevelEmitterOn" ),
+	BlockWirelessOn( "BlockWirelessOn" ),
 
-	BlockP2PTunnel2( "ItemPart.P2PTunnel2" ), BlockP2PTunnel3( "ItemPart.P2PTunnel3" ),
+	BlockP2PTunnel2( "ItemPart.P2PTunnel2" ),
+	BlockP2PTunnel3( "ItemPart.P2PTunnel3" ),
 
 	// MEWaiting("MEWaiting"),
 
-	PartMonitorSides( "PartMonitorSides" ), PartMonitorBack( "PartMonitorBack" ),
+	PartMonitorSides( "PartMonitorSides" ),
+	PartMonitorBack( "PartMonitorBack" ),
 
-	Transparent( "Transparent" ), PartMonitorSidesStatus( "PartMonitorSidesStatus" ), PartMonitorSidesStatusLights( "PartMonitorSidesStatusLights" ),
+	Transparent( "Transparent" ),
+	PartMonitorSidesStatus( "PartMonitorSidesStatus" ),
+	PartMonitorSidesStatusLights( "PartMonitorSidesStatusLights" ),
 
-	PartMonitor_Colored( "PartMonitor_Colored" ), PartMonitor_Bright( "PartMonitor_Bright" ),
+	PartMonitor_Colored( "PartMonitor_Colored" ),
+	PartMonitor_Bright( "PartMonitor_Bright" ),
 
-	PartPatternTerm_Bright( "PartPatternTerm_Bright" ), PartPatternTerm_Colored( "PartPatternTerm_Colored" ), PartPatternTerm_Dark( "PartPatternTerm_Dark" ),
+	PartPatternTerm_Bright( "PartPatternTerm_Bright" ),
+	PartPatternTerm_Colored( "PartPatternTerm_Colored" ),
+	PartPatternTerm_Dark( "PartPatternTerm_Dark" ),
 
-	PartConversionMonitor_Bright( "PartConversionMonitor_Bright" ), PartConversionMonitor_Colored( "PartConversionMonitor_Colored" ), PartConversionMonitor_Dark( "PartConversionMonitor_Dark" ), PartConversionMonitor_Dark_Locked( "PartConversionMonitor_Dark_Locked" ),
+	PartConversionMonitor_Bright( "PartConversionMonitor_Bright" ),
+	PartConversionMonitor_Colored( "PartConversionMonitor_Colored" ),
+	PartConversionMonitor_Dark( "PartConversionMonitor_Dark" ),
+	PartConversionMonitor_Dark_Locked( "PartConversionMonitor_Dark_Locked" ),
 
-	PartInterfaceTerm_Bright( "PartInterfaceTerm_Bright" ), PartInterfaceTerm_Colored( "PartInterfaceTerm_Colored" ), PartInterfaceTerm_Dark( "PartInterfaceTerm_Dark" ),
+	PartInterfaceTerm_Bright( "PartInterfaceTerm_Bright" ),
+	PartInterfaceTerm_Colored( "PartInterfaceTerm_Colored" ),
+	PartInterfaceTerm_Dark( "PartInterfaceTerm_Dark" ),
 
-	PartCraftingTerm_Bright( "PartCraftingTerm_Bright" ), PartCraftingTerm_Colored( "PartCraftingTerm_Colored" ), PartCraftingTerm_Dark( "PartCraftingTerm_Dark" ), //
+	PartCraftingTerm_Bright( "PartCraftingTerm_Bright" ),
+	PartCraftingTerm_Colored( "PartCraftingTerm_Colored" ),
+	PartCraftingTerm_Dark( "PartCraftingTerm_Dark" ), //
 
-	PartStorageMonitor_Bright( "PartStorageMonitor_Bright" ), PartStorageMonitor_Colored( "PartStorageMonitor_Colored" ), PartStorageMonitor_Dark( "PartStorageMonitor_Dark" ), PartStorageMonitor_Colored_Locked( "PartStorageMonitor_Colored_Locked" ),
+	PartStorageMonitor_Bright( "PartStorageMonitor_Bright" ),
+	PartStorageMonitor_Colored( "PartStorageMonitor_Colored" ),
+	PartStorageMonitor_Dark( "PartStorageMonitor_Dark" ),
+	PartStorageMonitor_Colored_Locked( "PartStorageMonitor_Colored_Locked" ),
 
-	PartTerminal_Bright( "PartTerminal_Bright" ), PartTerminal_Colored( "PartTerminal_Colored" ), PartTerminal_Dark( "PartTerminal_Dark" ),
+	PartTerminal_Bright( "PartTerminal_Bright" ),
+	PartTerminal_Colored( "PartTerminal_Colored" ),
+	PartTerminal_Dark( "PartTerminal_Dark" ),
 
-	MECable_Green( "MECable_Green" ), MECable_Grey( "MECable_Grey" ), MECable_LightBlue( "MECable_LightBlue" ), MECable_LightGrey( "MECable_LightGrey" ), MECable_Lime( "MECable_Lime" ), MECable_Magenta( "MECable_Magenta" ), MECable_Orange( "MECable_Orange" ), MECable_Pink( "MECable_Pink" ), MECable_Purple( "MECable_Purple" ), MECable_Red( "MECable_Red" ), MECable_White( "MECable_White" ), MECable_Yellow( "MECable_Yellow" ), MECable_Black( "MECable_Black" ), MECable_Blue( "MECable_Blue" ), MECable_Brown( "MECable_Brown" ), MECable_Cyan( "MECable_Cyan" ),
+	MECable_Green( "MECable_Green" ),
+	MECable_Grey( "MECable_Grey" ),
+	MECable_LightBlue( "MECable_LightBlue" ),
+	MECable_LightGrey( "MECable_LightGrey" ),
+	MECable_Lime( "MECable_Lime" ),
+	MECable_Magenta( "MECable_Magenta" ),
+	MECable_Orange( "MECable_Orange" ),
+	MECable_Pink( "MECable_Pink" ),
+	MECable_Purple( "MECable_Purple" ),
+	MECable_Red( "MECable_Red" ),
+	MECable_White( "MECable_White" ),
+	MECable_Yellow( "MECable_Yellow" ),
+	MECable_Black( "MECable_Black" ),
+	MECable_Blue( "MECable_Blue" ),
+	MECable_Brown( "MECable_Brown" ),
+	MECable_Cyan( "MECable_Cyan" ),
 
-	MEDense_Black( "MEDense_Black" ), MEDense_Blue( "MEDense_Blue" ), MEDense_Brown( "MEDense_Brown" ), MEDense_Cyan( "MEDense_Cyan" ), MEDense_Gray( "MEDense_Gray" ), MEDense_Green( "MEDense_Green" ), MEDense_LightBlue( "MEDense_LightBlue" ), MEDense_LightGrey( "MEDense_LightGrey" ), MEDense_Lime( "MEDense_Lime" ), MEDense_Magenta( "MEDense_Magenta" ), MEDense_Orange( "MEDense_Orange" ), MEDense_Pink( "MEDense_Pink" ), MEDense_Purple( "MEDense_Purple" ), MEDense_Red( "MEDense_Red" ), MEDense_White( "MEDense_White" ), MEDense_Yellow( "MEDense_Yellow" ),
+	MEDense_Black( "MEDense_Black" ),
+	MEDense_Blue( "MEDense_Blue" ),
+	MEDense_Brown( "MEDense_Brown" ),
+	MEDense_Cyan( "MEDense_Cyan" ),
+	MEDense_Gray( "MEDense_Gray" ),
+	MEDense_Green( "MEDense_Green" ),
+	MEDense_LightBlue( "MEDense_LightBlue" ),
+	MEDense_LightGrey( "MEDense_LightGrey" ),
+	MEDense_Lime( "MEDense_Lime" ),
+	MEDense_Magenta( "MEDense_Magenta" ),
+	MEDense_Orange( "MEDense_Orange" ),
+	MEDense_Pink( "MEDense_Pink" ),
+	MEDense_Purple( "MEDense_Purple" ),
+	MEDense_Red( "MEDense_Red" ),
+	MEDense_White( "MEDense_White" ),
+	MEDense_Yellow( "MEDense_Yellow" ),
 
-	MESmart_Black( "MESmart_Black" ), MESmart_Blue( "MESmart_Blue" ), MESmart_Brown( "MESmart_Brown" ), MESmart_Cyan( "MESmart_Cyan" ), MESmart_Gray( "MESmart_Gray" ), MESmart_Green( "MESmart_Green" ), MESmart_LightBlue( "MESmart_LightBlue" ), MESmart_LightGrey( "MESmart_LightGrey" ), MESmart_Lime( "MESmart_Lime" ), MESmart_Magenta( "MESmart_Magenta" ), MESmart_Orange( "MESmart_Orange" ), MESmart_Pink( "MESmart_Pink" ), MESmart_Purple( "MESmart_Purple" ), MESmart_Red( "MESmart_Red" ), MESmart_White( "MESmart_White" ), MESmart_Yellow( "MESmart_Yellow" ),
+	MESmart_Black( "MESmart_Black" ),
+	MESmart_Blue( "MESmart_Blue" ),
+	MESmart_Brown( "MESmart_Brown" ),
+	MESmart_Cyan( "MESmart_Cyan" ),
+	MESmart_Gray( "MESmart_Gray" ),
+	MESmart_Green( "MESmart_Green" ),
+	MESmart_LightBlue( "MESmart_LightBlue" ),
+	MESmart_LightGrey( "MESmart_LightGrey" ),
+	MESmart_Lime( "MESmart_Lime" ),
+	MESmart_Magenta( "MESmart_Magenta" ),
+	MESmart_Orange( "MESmart_Orange" ),
+	MESmart_Pink( "MESmart_Pink" ),
+	MESmart_Purple( "MESmart_Purple" ),
+	MESmart_Red( "MESmart_Red" ),
+	MESmart_White( "MESmart_White" ),
+	MESmart_Yellow( "MESmart_Yellow" ),
 
-	MECovered_Black( "MECovered_Black" ), MECovered_Blue( "MECovered_Blue" ), MECovered_Brown( "MECovered_Brown" ), MECovered_Cyan( "MECovered_Cyan" ), MECovered_Gray( "MECovered_Gray" ), MECovered_Green( "MECovered_Green" ), MECovered_LightBlue( "MECovered_LightBlue" ), MECovered_LightGrey( "MECovered_LightGrey" ), MECovered_Lime( "MECovered_Lime" ), MECovered_Magenta( "MECovered_Magenta" ), MECovered_Orange( "MECovered_Orange" ), MECovered_Pink( "MECovered_Pink" ), MECovered_Purple( "MECovered_Purple" ), MECovered_Red( "MECovered_Red" ), MECovered_White( "MECovered_White" ), MECovered_Yellow( "MECovered_Yellow" ),
+	MECovered_Black( "MECovered_Black" ),
+	MECovered_Blue( "MECovered_Blue" ),
+	MECovered_Brown( "MECovered_Brown" ),
+	MECovered_Cyan( "MECovered_Cyan" ),
+	MECovered_Gray( "MECovered_Gray" ),
+	MECovered_Green( "MECovered_Green" ),
+	MECovered_LightBlue( "MECovered_LightBlue" ),
+	MECovered_LightGrey( "MECovered_LightGrey" ),
+	MECovered_Lime( "MECovered_Lime" ),
+	MECovered_Magenta( "MECovered_Magenta" ),
+	MECovered_Orange( "MECovered_Orange" ),
+	MECovered_Pink( "MECovered_Pink" ),
+	MECovered_Purple( "MECovered_Purple" ),
+	MECovered_Red( "MECovered_Red" ),
+	MECovered_White( "MECovered_White" ),
+	MECovered_Yellow( "MECovered_Yellow" ),
 
 	BlockAnnihilationPlaneOn( "BlockAnnihilationPlaneOn" ),
 
@@ -72,11 +161,17 @@ public enum CableBusTextures
 
 	BlockIdentityAnnihilationPlaneOn( "BlockIdentityAnnihilationPlaneOn" ),
 
-	ItemPartLevelEmitterOn( "ItemPart.LevelEmitterOn" ), PartTransitionPlaneBack( "PartTransitionPlaneBack" ),
+	ItemPartLevelEmitterOn( "ItemPart.LevelEmitterOn" ),
+	PartTransitionPlaneBack( "PartTransitionPlaneBack" ),
 
-	PartTunnelSides( "PartTunnelSides" ), PartPlaneSides( "PartPlaneSides" ), PartExportSides( "PartExportSides" ), PartImportSides( "PartImportSides" ),
+	PartTunnelSides( "PartTunnelSides" ),
+	PartPlaneSides( "PartPlaneSides" ),
+	PartExportSides( "PartExportSides" ),
+	PartImportSides( "PartImportSides" ),
 
-	PartWirelessSides( "PartWirelessSides" ), PartStorageSides( "PartStorageSides" ), PartStorageBack( "PartStorageBack" );
+	PartWirelessSides( "PartWirelessSides" ),
+	PartStorageSides( "PartStorageSides" ),
+	PartStorageBack( "PartStorageBack" );
 
 	private final String name;
 	public IAESprite IIcon;

src/main/java/appeng/client/texture/ExtraBlockTextures.java

@@ -36,57 +36,110 @@ public enum ExtraBlockTextures
 
 	MEChest( "BlockMEChest" ),
 
-	BlockMEChestItems_Light( "BlockMEChestItems_Light" ), BlockMEChestItems_Dark( "BlockMEChestItems_Dark" ), BlockMEChestItems_Medium( "BlockMEChestItems_Medium" ),
+	BlockMEChestItems_Light( "BlockMEChestItems_Light" ),
+	BlockMEChestItems_Dark( "BlockMEChestItems_Dark" ),
+	BlockMEChestItems_Medium( "BlockMEChestItems_Medium" ),
 
-	BlockControllerPowered( "BlockControllerPowered" ), BlockControllerColumnPowered( "BlockControllerColumnPowered" ), BlockControllerColumn( "BlockControllerColumn" ), BlockControllerLights( "BlockControllerLights" ), BlockControllerColumnLights( "BlockControllerColumnLights" ), BlockControllerColumnConflict( "BlockControllerColumnConflict" ), BlockControllerConflict( "BlockControllerConflict" ), BlockControllerInsideA( "BlockControllerInsideA" ), BlockControllerInsideB( "BlockControllerInsideB" ),
+	BlockControllerPowered( "BlockControllerPowered" ),
+	BlockControllerColumnPowered( "BlockControllerColumnPowered" ),
+	BlockControllerColumn( "BlockControllerColumn" ),
+	BlockControllerLights( "BlockControllerLights" ),
+	BlockControllerColumnLights( "BlockControllerColumnLights" ),
+	BlockControllerColumnConflict( "BlockControllerColumnConflict" ),
+	BlockControllerConflict( "BlockControllerConflict" ),
+	BlockControllerInsideA( "BlockControllerInsideA" ),
+	BlockControllerInsideB( "BlockControllerInsideB" ),
 
 	BlockMolecularAssemblerLights( "BlockMolecularAssemblerLights" ),
 
 	BlockChargerInside( "BlockChargerInside" ),
 
-	BlockInterfaceAlternate( "BlockInterfaceAlternate" ), BlockInterfaceAlternateArrow( "BlockInterfaceAlternateArrow" ),
+	BlockInterfaceAlternate( "BlockInterfaceAlternate" ),
+	BlockInterfaceAlternateArrow( "BlockInterfaceAlternateArrow" ),
 
-	MEStorageCellTextures( "MEStorageCellTextures" ), White( "White" ),
+	MEStorageCellTextures( "MEStorageCellTextures" ),
+	White( "White" ),
 
-	BlockMatterCannonParticle( "BlockMatterCannonParticle" ), BlockEnergyParticle( "BlockEnergyParticle" ),
+	BlockMatterCannonParticle( "BlockMatterCannonParticle" ),
+	BlockEnergyParticle( "BlockEnergyParticle" ),
 
 	GlassFrame( "BlockQuartzGlassFrame" ),
 
-	BlockQRingCornerLight( "BlockQRingCornerLight" ), BlockQRingEdgeLight( "BlockQRingEdgeLight" ),
+	BlockQRingCornerLight( "BlockQRingCornerLight" ),
+	BlockQRingEdgeLight( "BlockQRingEdgeLight" ),
 
-	MEDenseEnergyCell0( "BlockDenseEnergyCell0" ), MEDenseEnergyCell1( "BlockDenseEnergyCell1" ), MEDenseEnergyCell2( "BlockDenseEnergyCell2" ), MEDenseEnergyCell3( "BlockDenseEnergyCell3" ), MEDenseEnergyCell4( "BlockDenseEnergyCell4" ), MEDenseEnergyCell5( "BlockDenseEnergyCell5" ), MEDenseEnergyCell6( "BlockDenseEnergyCell6" ), MEDenseEnergyCell7( "BlockDenseEnergyCell7" ),
+	MEDenseEnergyCell0( "BlockDenseEnergyCell0" ),
+	MEDenseEnergyCell1( "BlockDenseEnergyCell1" ),
+	MEDenseEnergyCell2( "BlockDenseEnergyCell2" ),
+	MEDenseEnergyCell3( "BlockDenseEnergyCell3" ),
+	MEDenseEnergyCell4( "BlockDenseEnergyCell4" ),
+	MEDenseEnergyCell5( "BlockDenseEnergyCell5" ),
+	MEDenseEnergyCell6( "BlockDenseEnergyCell6" ),
+	MEDenseEnergyCell7( "BlockDenseEnergyCell7" ),
 
-	MEEnergyCell0( "BlockEnergyCell0" ), MEEnergyCell1( "BlockEnergyCell1" ), MEEnergyCell2( "BlockEnergyCell2" ), MEEnergyCell3( "BlockEnergyCell3" ), MEEnergyCell4( "BlockEnergyCell4" ), MEEnergyCell5( "BlockEnergyCell5" ), MEEnergyCell6( "BlockEnergyCell6" ), MEEnergyCell7( "BlockEnergyCell7" ),
+	MEEnergyCell0( "BlockEnergyCell0" ),
+	MEEnergyCell1( "BlockEnergyCell1" ),
+	MEEnergyCell2( "BlockEnergyCell2" ),
+	MEEnergyCell3( "BlockEnergyCell3" ),
+	MEEnergyCell4( "BlockEnergyCell4" ),
+	MEEnergyCell5( "BlockEnergyCell5" ),
+	MEEnergyCell6( "BlockEnergyCell6" ),
+	MEEnergyCell7( "BlockEnergyCell7" ),
 
-	BlockSpatialPylon_dim( "BlockSpatialPylon_dim" ), BlockSpatialPylon_red( "BlockSpatialPylon_red" ),
+	BlockSpatialPylon_dim( "BlockSpatialPylon_dim" ),
+	BlockSpatialPylon_red( "BlockSpatialPylon_red" ),
 
-	BlockSpatialPylonC( "BlockSpatialPylon_spanned" ), BlockSpatialPylonC_dim( "BlockSpatialPylon_spanned_dim" ), BlockSpatialPylonC_red( "BlockSpatialPylon_spanned_red" ),
+	BlockSpatialPylonC( "BlockSpatialPylon_spanned" ),
+	BlockSpatialPylonC_dim( "BlockSpatialPylon_spanned_dim" ),
+	BlockSpatialPylonC_red( "BlockSpatialPylon_spanned_red" ),
 
-	BlockQuartzGlassB( "BlockQuartzGlassB" ), BlockQuartzGlassC( "BlockQuartzGlassC" ), BlockQuartzGlassD( "BlockQuartzGlassD" ),
+	BlockQuartzGlassB( "BlockQuartzGlassB" ),
+	BlockQuartzGlassC( "BlockQuartzGlassC" ),
+	BlockQuartzGlassD( "BlockQuartzGlassD" ),
 
-	BlockSpatialPylonE( "BlockSpatialPylon_end" ), BlockSpatialPylonE_dim( "BlockSpatialPylon_end_dim" ), BlockSpatialPylonE_red( "BlockSpatialPylon_end_red" ),
+	BlockSpatialPylonE( "BlockSpatialPylon_end" ),
+	BlockSpatialPylonE_dim( "BlockSpatialPylon_end_dim" ),
+	BlockSpatialPylonE_red( "BlockSpatialPylon_end_red" ),
 
-	BlockMESecurityOn_Light( "BlockMESecurityOn_Light" ), BlockMESecurityOn_Medium( "BlockMESecurityOn_Medium" ), BlockMESecurityOn_Dark( "BlockMESecurityOn_Dark" ), BlockInscriberInside( "BlockInscriberInside" ),
+	BlockMESecurityOn_Light( "BlockMESecurityOn_Light" ),
+	BlockMESecurityOn_Medium( "BlockMESecurityOn_Medium" ),
+	BlockMESecurityOn_Dark( "BlockMESecurityOn_Dark" ),
+	BlockInscriberInside( "BlockInscriberInside" ),
 
-	BlockQuartzGrowthAcceleratorOn( "BlockQuartzGrowthAcceleratorOn" ), BlockQuartzGrowthAcceleratorSideOn( "BlockQuartzGrowthAcceleratorSideOn" ),
+	BlockQuartzGrowthAcceleratorOn( "BlockQuartzGrowthAcceleratorOn" ),
+	BlockQuartzGrowthAcceleratorSideOn( "BlockQuartzGrowthAcceleratorSideOn" ),
 
 	BlockWirelessInside( "BlockWirelessInside" ),
 
-	BlockCraftingAccelerator( "BlockCraftingAccelerator" ), BlockCraftingMonitor( "BlockCraftingMonitor" ),
+	BlockCraftingAccelerator( "BlockCraftingAccelerator" ),
+	BlockCraftingMonitor( "BlockCraftingMonitor" ),
 
-	BlockCraftingStorage1k( "BlockCraftingStorage" ), BlockCraftingStorage4k( "BlockCraftingStorage4k" ), BlockCraftingStorage16k( "BlockCraftingStorage16k" ), BlockCraftingStorage64k( "BlockCraftingStorage64k" ),
+	BlockCraftingStorage1k( "BlockCraftingStorage" ),
+	BlockCraftingStorage4k( "BlockCraftingStorage4k" ),
+	BlockCraftingStorage16k( "BlockCraftingStorage16k" ),
+	BlockCraftingStorage64k( "BlockCraftingStorage64k" ),
 
 	BlockCraftingAcceleratorFit( "BlockCraftingAcceleratorFit" ),
 
-	BlockCraftingMonitorFit_Light( "BlockCraftingMonitorFit_Light" ), BlockCraftingMonitorFit_Dark( "BlockCraftingMonitorFit_Dark" ), BlockCraftingMonitorFit_Medium( "BlockCraftingMonitorFit_Medium" ),
+	BlockCraftingMonitorFit_Light( "BlockCraftingMonitorFit_Light" ),
+	BlockCraftingMonitorFit_Dark( "BlockCraftingMonitorFit_Dark" ),
+	BlockCraftingMonitorFit_Medium( "BlockCraftingMonitorFit_Medium" ),
 
-	BlockCraftingStorage1kFit( "BlockCraftingStorageFit" ), BlockCraftingStorage4kFit( "BlockCraftingStorage4kFit" ), BlockCraftingStorage16kFit( "BlockCraftingStorage16kFit" ), BlockCraftingStorage64kFit( "BlockCraftingStorage64kFit" ),
+	BlockCraftingStorage1kFit( "BlockCraftingStorageFit" ),
+	BlockCraftingStorage4kFit( "BlockCraftingStorage4kFit" ),
+	BlockCraftingStorage16kFit( "BlockCraftingStorage16kFit" ),
+	BlockCraftingStorage64kFit( "BlockCraftingStorage64kFit" ),
 
-	BlockCraftingUnitRing( "BlockCraftingUnitRing" ), BlockCraftingUnitRingLongRotated( "BlockCraftingUnitRingLongRotated" ), BlockCraftingUnitRingLong( "BlockCraftingUnitRingLong" ), BlockCraftingUnitFit( "BlockCraftingUnitFit" ),
+	BlockCraftingUnitRing( "BlockCraftingUnitRing" ),
+	BlockCraftingUnitRingLongRotated( "BlockCraftingUnitRingLongRotated" ),
+	BlockCraftingUnitRingLong( "BlockCraftingUnitRingLong" ),
+	BlockCraftingUnitFit( "BlockCraftingUnitFit" ),
 
-	BlockCraftingMonitorOuter( "BlockCraftingMonitorOuter" ), BlockCraftingFitSolid( "BlockCraftingFitSolid" ),
+	BlockCraftingMonitorOuter( "BlockCraftingMonitorOuter" ),
+	BlockCraftingFitSolid( "BlockCraftingFitSolid" ),
 
-	BlockPaint2( "BlockPaint2" ), BlockPaint3( "BlockPaint3" );
+	BlockPaint2( "BlockPaint2" ),
+	BlockPaint3( "BlockPaint3" );
 
 	private final String name;
 	private IAESprite IIcon;

src/main/java/appeng/client/texture/IAESprite.java

@@ -14,8 +14,7 @@ public interface IAESprite
 
 	float getMaxU();
 
-	float getInterpolatedU(
-			double px );
+	float getInterpolatedU( double px );
 
 	float getMinV();
 
@@ -23,8 +22,7 @@ public interface IAESprite
 
 	String getIconName();
 
-	float getInterpolatedV(
-			double px );
+	float getInterpolatedV( double px );
 
 	float getMinU();