Renamed ExtraTextures and added ExtraItemTextures.

block/crafting/BlockCraftingMonitor.java

@@ -6,7 +6,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.tile.crafting.TileCraftingMonitorTile;
 
 public class BlockCraftingMonitor extends BlockCraftingUnit
@@ -26,7 +26,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
 		case 0:
 			return super.getIcon( 0, 0 );
 		case 0 | FLAG_FORMED:
-			return ExtraTextures.BlockCraftingMonitorFit.getIcon();
+			return ExtraBlockTextures.BlockCraftingMonitorFit.getIcon();
 		}
 	}
 

block/crafting/BlockCraftingStorage.java

@@ -6,7 +6,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.tile.crafting.TileCraftingStorageTile;
 
 public class BlockCraftingStorage extends BlockCraftingUnit
@@ -42,20 +42,20 @@ public class BlockCraftingStorage extends BlockCraftingUnit
 		case 0:
 			return super.getIcon( 0, 0 );
 		case 1:
-			return ExtraTextures.BlockCraftingStorage4k.getIcon();
+			return ExtraBlockTextures.BlockCraftingStorage4k.getIcon();
 		case 2:
-			return ExtraTextures.BlockCraftingStorage16k.getIcon();
+			return ExtraBlockTextures.BlockCraftingStorage16k.getIcon();
 		case 3:
-			return ExtraTextures.BlockCraftingStorage64k.getIcon();
+			return ExtraBlockTextures.BlockCraftingStorage64k.getIcon();
 
 		case 0 | FLAG_FORMED:
-			return ExtraTextures.BlockCraftingStorage1kFit.getIcon();
+			return ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
 		case 1 | FLAG_FORMED:
-			return ExtraTextures.BlockCraftingStorage4kFit.getIcon();
+			return ExtraBlockTextures.BlockCraftingStorage4kFit.getIcon();
 		case 2 | FLAG_FORMED:
-			return ExtraTextures.BlockCraftingStorage16kFit.getIcon();
+			return ExtraBlockTextures.BlockCraftingStorage16kFit.getIcon();
 		case 3 | FLAG_FORMED:
-			return ExtraTextures.BlockCraftingStorage64kFit.getIcon();
+			return ExtraBlockTextures.BlockCraftingStorage64kFit.getIcon();
 		}
 	}
 

block/crafting/BlockCraftingUnit.java

@@ -13,7 +13,7 @@ import net.minecraft.world.World;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.blocks.RenderBlockCrafting;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.features.AEFeature;
 import appeng.tile.crafting.TileCraftingTile;
 
@@ -64,11 +64,11 @@ public class BlockCraftingUnit extends AEBaseBlock
 		case 0:
 			return super.getIcon( 0, 0 );
 		case 1:
-			return ExtraTextures.BlockCraftingAccelerator.getIcon();
+			return ExtraBlockTextures.BlockCraftingAccelerator.getIcon();
 		case 0 | FLAG_FORMED:
-			return ExtraTextures.BlockCraftingUnitFit.getIcon();
+			return ExtraBlockTextures.BlockCraftingUnitFit.getIcon();
 		case 1 | FLAG_FORMED:
-			return ExtraTextures.BlockCraftingAcceleratorFit.getIcon();
+			return ExtraBlockTextures.BlockCraftingAcceleratorFit.getIcon();
 		}
 	}
 

block/misc/BlockVibrationChamber.java

@@ -10,7 +10,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import appeng.block.AEBaseBlock;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.AEConfig;
 import appeng.core.features.AEFeature;
 import appeng.core.sync.GuiBridge;
@@ -54,7 +54,7 @@ public class BlockVibrationChamber extends AEBaseBlock
 
 		if ( tvc != null && tvc.isOn && ico == getRendererInstance().getTexture( ForgeDirection.SOUTH ) )
 		{
-			return ExtraTextures.BlockVibrationChamberFrontOn.getIcon();
+			return ExtraBlockTextures.BlockVibrationChamberFrontOn.getIcon();
 		}
 
 		return ico;

block/networking/BlockCableBus.java

@@ -26,7 +26,7 @@ import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BusRenderHelper;
 import appeng.client.render.blocks.RendererCableBus;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.AEConfig;
 import appeng.core.Api;
 import appeng.core.AppEng;
@@ -175,7 +175,7 @@ public class BlockCableBus extends AEBaseBlock
 		if ( i != null )
 			return i;
 
-		return ExtraTextures.BlockQuartzGlassB.getIcon();
+		return ExtraBlockTextures.BlockQuartzGlassB.getIcon();
 	}
 
 	@Override

block/networking/BlockDenseEnergyCell.java

@@ -3,7 +3,7 @@ package appeng.block.networking;
 import java.util.EnumSet;
 
 import net.minecraft.util.IIcon;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.features.AEFeature;
 import appeng.tile.networking.TileDenseEnergyCell;
 
@@ -28,21 +28,21 @@ public class BlockDenseEnergyCell extends BlockEnergyCell
 		switch (metadata)
 		{
 		case 0:
-			return ExtraTextures.MEDenseEnergyCell0.getIcon();
+			return ExtraBlockTextures.MEDenseEnergyCell0.getIcon();
 		case 1:
-			return ExtraTextures.MEDenseEnergyCell1.getIcon();
+			return ExtraBlockTextures.MEDenseEnergyCell1.getIcon();
 		case 2:
-			return ExtraTextures.MEDenseEnergyCell2.getIcon();
+			return ExtraBlockTextures.MEDenseEnergyCell2.getIcon();
 		case 3:
-			return ExtraTextures.MEDenseEnergyCell3.getIcon();
+			return ExtraBlockTextures.MEDenseEnergyCell3.getIcon();
 		case 4:
-			return ExtraTextures.MEDenseEnergyCell4.getIcon();
+			return ExtraBlockTextures.MEDenseEnergyCell4.getIcon();
 		case 5:
-			return ExtraTextures.MEDenseEnergyCell5.getIcon();
+			return ExtraBlockTextures.MEDenseEnergyCell5.getIcon();
 		case 6:
-			return ExtraTextures.MEDenseEnergyCell6.getIcon();
+			return ExtraBlockTextures.MEDenseEnergyCell6.getIcon();
 		case 7:
-			return ExtraTextures.MEDenseEnergyCell7.getIcon();
+			return ExtraBlockTextures.MEDenseEnergyCell7.getIcon();
 
 		}
 		return super.getIcon( direction, metadata );

block/networking/BlockEnergyCell.java

@@ -13,7 +13,7 @@ import appeng.block.AEBaseBlock;
 import appeng.block.AEBaseItemBlockChargeable;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.blocks.RenderBlockEnergyCube;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.features.AEFeature;
 import appeng.tile.networking.TileEnergyCell;
 import appeng.util.Platform;
@@ -60,21 +60,21 @@ public class BlockEnergyCell extends AEBaseBlock
 		switch (metadata)
 		{
 		case 0:
-			return ExtraTextures.MEEnergyCell0.getIcon();
+			return ExtraBlockTextures.MEEnergyCell0.getIcon();
 		case 1:
-			return ExtraTextures.MEEnergyCell1.getIcon();
+			return ExtraBlockTextures.MEEnergyCell1.getIcon();
 		case 2:
-			return ExtraTextures.MEEnergyCell2.getIcon();
+			return ExtraBlockTextures.MEEnergyCell2.getIcon();
 		case 3:
-			return ExtraTextures.MEEnergyCell3.getIcon();
+			return ExtraBlockTextures.MEEnergyCell3.getIcon();
 		case 4:
-			return ExtraTextures.MEEnergyCell4.getIcon();
+			return ExtraBlockTextures.MEEnergyCell4.getIcon();
 		case 5:
-			return ExtraTextures.MEEnergyCell5.getIcon();
+			return ExtraBlockTextures.MEEnergyCell5.getIcon();
 		case 6:
-			return ExtraTextures.MEEnergyCell6.getIcon();
+			return ExtraBlockTextures.MEEnergyCell6.getIcon();
 		case 7:
-			return ExtraTextures.MEEnergyCell7.getIcon();
+			return ExtraBlockTextures.MEEnergyCell7.getIcon();
 
 		}
 		return super.getIcon( direction, metadata );

client/ClientHelper.java

@@ -38,7 +38,8 @@ import appeng.client.render.effects.EnergyFx;
 import appeng.client.render.effects.LightningEffect;
 import appeng.client.render.effects.VibrantEffect;
 import appeng.client.texture.CableBusTextures;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraItemTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.AEConfig;
 import appeng.core.CommonHelper;
 import appeng.entity.EntityTinyTNTPrimed;
@@ -151,9 +152,15 @@ public class ClientHelper extends ServerHelper
 	@SubscribeEvent
 	public void updateTextureSheet(TextureStitchEvent.Pre ev)
 	{
+		if ( ev.map.getTextureType() == 1 )
+		{
+			for (ExtraItemTextures et : ExtraItemTextures.values())
+				et.registerIcon( ev.map );
+		}
+
 		if ( ev.map.getTextureType() == 0 )
 		{
-			for (ExtraTextures et : ExtraTextures.values())
+			for (ExtraBlockTextures et : ExtraBlockTextures.values())
 				et.registerIcon( ev.map );
 
 			for (CableBusTextures cb : CableBusTextures.values())

client/gui/widgets/GuiImgButton.java

@@ -26,7 +26,7 @@ import appeng.api.config.SortOrder;
 import appeng.api.config.TerminalStyle;
 import appeng.api.config.ViewItems;
 import appeng.api.config.YesNo;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.localization.ButtonToolTips;
 
 public class GuiImgButton extends GuiButton implements ITooltip
@@ -209,7 +209,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
 				GL11.glScalef( 0.5f, 0.5f, 0.5f );
 
 				GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
-				par1Minecraft.renderEngine.bindTexture( ExtraTextures.GuiTexture( "guis/states.png" ) );
+				par1Minecraft.renderEngine.bindTexture( ExtraBlockTextures.GuiTexture( "guis/states.png" ) );
 				this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width
 						&& par3 < this.yPosition + this.height;
 
@@ -225,7 +225,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
 			else
 			{
 				GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
-				par1Minecraft.renderEngine.bindTexture( ExtraTextures.GuiTexture( "guis/states.png" ) );
+				par1Minecraft.renderEngine.bindTexture( ExtraBlockTextures.GuiTexture( "guis/states.png" ) );
 				this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width
 						&& par3 < this.yPosition + this.height;
 

client/gui/widgets/GuiTabButton.java

@@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 
 public class GuiTabButton extends GuiButton implements ITooltip
 {
@@ -62,7 +62,7 @@ public class GuiTabButton extends GuiButton implements ITooltip
 		if ( this.visible )
 		{
 			GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
-			par1Minecraft.renderEngine.bindTexture( ExtraTextures.GuiTexture( "guis/states.png" ) );
+			par1Minecraft.renderEngine.bindTexture( ExtraBlockTextures.GuiTexture( "guis/states.png" ) );
 			this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
 
 			int uv_y = (int) Math.floor( 13 / 16 );

client/gui/widgets/GuiToggleButton.java

@@ -6,7 +6,7 @@ import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 
 public class GuiToggleButton extends GuiButton implements ITooltip
 {
@@ -56,7 +56,7 @@ public class GuiToggleButton extends GuiButton implements ITooltip
 			int iconIndex = getIconIndex();
 
 			GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
-			par1Minecraft.renderEngine.bindTexture( ExtraTextures.GuiTexture( "guis/states.png" ) );
+			par1Minecraft.renderEngine.bindTexture( ExtraBlockTextures.GuiTexture( "guis/states.png" ) );
 			this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
 
 			int uv_y = (int) Math.floor( iconIndex / 16 );

client/render/BaseBlockRender.java

@@ -25,7 +25,7 @@ import org.lwjgl.opengl.GL11;
 import appeng.api.util.IOrientable;
 import appeng.api.util.IOrientableBlock;
 import appeng.block.AEBaseBlock;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.tile.AEBaseTile;
 import appeng.util.Platform;
 import cpw.mods.fml.relauncher.Side;
@@ -254,7 +254,7 @@ public class BaseBlockRender
 		for (IIcon o : s)
 			if ( o != null )
 				return o;
-		return ExtraTextures.getMissing();
+		return ExtraBlockTextures.getMissing();
 	}
 
 	public void renderInvBlock(EnumSet<ForgeDirection> sides, AEBaseBlock block, ItemStack item, Tessellator tess, int color, RenderBlocks renderer)

client/render/blocks/RenderBlockCharger.java

@@ -19,7 +19,7 @@ import appeng.api.util.IOrientable;
 import appeng.block.AEBaseBlock;
 import appeng.block.misc.BlockCharger;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.AELog;
 import appeng.tile.AEBaseTile;
 import appeng.util.Platform;
@@ -40,7 +40,7 @@ public class RenderBlockCharger extends BaseBlockRender
 		setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
 		renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
 
-		blk.getRendererInstance().setTemporaryRenderIcons( ExtraTextures.BlockChargerInside.getIcon(), null, null, null, null, null );
+		blk.getRendererInstance().setTemporaryRenderIcons( ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null, null );
 
 		setInvRenderBounds( renderer, 2, 0, 2, 14, 3, 14 );
 		renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
@@ -50,7 +50,7 @@ public class RenderBlockCharger extends BaseBlockRender
 
 		blk.getRendererInstance().setTemporaryRenderIcon( null );
 
-		blk.getRendererInstance().setTemporaryRenderIcons( null, ExtraTextures.BlockChargerInside.getIcon(), null, null, null, null );
+		blk.getRendererInstance().setTemporaryRenderIcons( null, ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null );
 
 		setInvRenderBounds( renderer, 2, 13, 2, 14, 16, 14 );
 		renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
@@ -80,7 +80,7 @@ public class RenderBlockCharger extends BaseBlockRender
 		renderBlockBounds( renderer, 6, 1, 0, 10, 15, 2, fdx, fdy, fdz );
 		boolean out = renderer.renderStandardBlock( blk, x, y, z );
 
-		blk.getRendererInstance().setTemporaryRenderIcons( ExtraTextures.BlockChargerInside.getIcon(), null, null, null, null, null );
+		blk.getRendererInstance().setTemporaryRenderIcons( ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null, null );
 
 		renderBlockBounds( renderer, 2, 0, 2, 14, 3, 14, fdx, fdy, fdz );
 		out = renderer.renderStandardBlock( blk, x, y, z );
@@ -90,7 +90,7 @@ public class RenderBlockCharger extends BaseBlockRender
 
 		blk.getRendererInstance().setTemporaryRenderIcon( null );
 
-		blk.getRendererInstance().setTemporaryRenderIcons( null, ExtraTextures.BlockChargerInside.getIcon(), null, null, null, null );
+		blk.getRendererInstance().setTemporaryRenderIcons( null, ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null );
 
 		renderBlockBounds( renderer, 2, 13, 2, 14, 16, 14, fdx, fdy, fdz );
 		out = renderer.renderStandardBlock( blk, x, y, z );

client/render/blocks/RenderBlockController.java

@@ -6,7 +6,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.tile.networking.TileController;
 
 public class RenderBlockController extends BaseBlockRender
@@ -28,20 +28,20 @@ public class RenderBlockController extends BaseBlockRender
 		boolean hasPower = meta > 0;
 		boolean isConflict = meta == 2;
 
-		ExtraTextures lights = null;
+		ExtraBlockTextures lights = null;
 
 		if ( xx && !yy && !zz )
 		{
 			if ( hasPower )
 			{
-				blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.BlockControllerColumnPowered.getIcon() );
+				blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumnPowered.getIcon() );
 				if ( isConflict )
-					lights = ExtraTextures.BlockControllerColumnConflict;
+					lights = ExtraBlockTextures.BlockControllerColumnConflict;
 				else
-					lights = ExtraTextures.BlockControllerColumnLights;
+					lights = ExtraBlockTextures.BlockControllerColumnLights;
 			}
 			else
-				blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.BlockControllerColumn.getIcon() );
+				blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumn.getIcon() );
 
 			renderer.uvRotateEast = 1;
 			renderer.uvRotateWest = 1;
@@ -52,14 +52,14 @@ public class RenderBlockController extends BaseBlockRender
 		{
 			if ( hasPower )
 			{
-				blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.BlockControllerColumnPowered.getIcon() );
+				blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumnPowered.getIcon() );
 				if ( isConflict )
-					lights = ExtraTextures.BlockControllerColumnConflict;
+					lights = ExtraBlockTextures.BlockControllerColumnConflict;
 				else
-					lights = ExtraTextures.BlockControllerColumnLights;
+					lights = ExtraBlockTextures.BlockControllerColumnLights;
 			}
 			else
-				blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.BlockControllerColumn.getIcon() );
+				blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumn.getIcon() );
 
 			renderer.uvRotateEast = 0;
 			renderer.uvRotateNorth = 0;
@@ -68,14 +68,14 @@ public class RenderBlockController extends BaseBlockRender
 		{
 			if ( hasPower )
 			{
-				blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.BlockControllerColumnPowered.getIcon() );
+				blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumnPowered.getIcon() );
 				if ( isConflict )
-					lights = ExtraTextures.BlockControllerColumnConflict;
+					lights = ExtraBlockTextures.BlockControllerColumnConflict;
 				else
-					lights = ExtraTextures.BlockControllerColumnLights;
+					lights = ExtraBlockTextures.BlockControllerColumnLights;
 			}
 			else
-				blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.BlockControllerColumn.getIcon() );
+				blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumn.getIcon() );
 
 			renderer.uvRotateNorth = 1;
 			renderer.uvRotateSouth = 1;
@@ -87,19 +87,19 @@ public class RenderBlockController extends BaseBlockRender
 			renderer.uvRotateEast = renderer.uvRotateBottom = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
 
 			if ( v == 0 )
-				blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.BlockControllerInsideA.getIcon() );
+				blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerInsideA.getIcon() );
 			else
-				blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.BlockControllerInsideB.getIcon() );
+				blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerInsideB.getIcon() );
 		}
 		else
 		{
 			if ( hasPower )
 			{
-				blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.BlockControllerPowered.getIcon() );
+				blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerPowered.getIcon() );
 				if ( isConflict )
-					lights = ExtraTextures.BlockControllerConflict;
+					lights = ExtraBlockTextures.BlockControllerConflict;
 				else
-					lights = ExtraTextures.BlockControllerLights;
+					lights = ExtraBlockTextures.BlockControllerLights;
 			}
 			else
 				blk.getRendererInstance().setTemporaryRenderIcon( null );

client/render/blocks/RenderBlockCrafting.java

@@ -15,7 +15,7 @@ import appeng.block.crafting.BlockCraftingUnit;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BusRenderHelper;
 import appeng.client.render.BusRenderer;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.tile.crafting.TileCraftingTile;
 
 public class RenderBlockCrafting extends BaseBlockRender
@@ -132,7 +132,7 @@ public class RenderBlockCrafting extends BaseBlockRender
 		i.setBounds( gso( east, 3, ForgeDirection.WEST ), gso( up, 3, ForgeDirection.DOWN ), gso( south, 3, ForgeDirection.NORTH ),
 				gso( east, 13, ForgeDirection.EAST ), gso( up, 13, ForgeDirection.UP ), gso( south, 13, ForgeDirection.SOUTH ) );
 		i.prepareBounds( renderer );
-		i.setTexture( ExtraTextures.BlockCraftingUnitRing.getIcon() );
+		i.setTexture( ExtraBlockTextures.BlockCraftingUnitRing.getIcon() );
 		i.renderBlockCurrentBounds( x, y, z, renderer );
 	}
 
@@ -168,15 +168,15 @@ public class RenderBlockCrafting extends BaseBlockRender
 
 		if ( meta == 0 && blk.getClass() == BlockCraftingUnit.class )
 		{
-			i.setTexture( ExtraTextures.BlockCraftingUnitFit.getIcon() );
+			i.setTexture( ExtraBlockTextures.BlockCraftingUnitFit.getIcon() );
 			i.renderBlockCurrentBounds( x, y, z, renderer );
 		}
 		else
 		{
-			if ( color == ExtraTextures.BlockCraftingMonitorFit.getIcon() )
-				i.setTexture( ExtraTextures.BlockCraftingMonitorOuter.getIcon() );
+			if ( color == ExtraBlockTextures.BlockCraftingMonitorFit.getIcon() )
+				i.setTexture( ExtraBlockTextures.BlockCraftingMonitorOuter.getIcon() );
 			else
-				i.setTexture( ExtraTextures.BlockCraftingFitSolid.getIcon() );
+				i.setTexture( ExtraBlockTextures.BlockCraftingFitSolid.getIcon() );
 
 			i.renderBlockCurrentBounds( x, y, z, renderer );
 
@@ -198,7 +198,7 @@ public class RenderBlockCrafting extends BaseBlockRender
 			}
 		}
 
-		i.setTexture( ExtraTextures.BlockCraftingUnitRingLong.getIcon() );
+		i.setTexture( ExtraBlockTextures.BlockCraftingUnitRingLong.getIcon() );
 		for (ForgeDirection a : ForgeDirection.VALID_DIRECTIONS)
 		{
 			if ( a == side || a == side.getOpposite() )

client/render/blocks/RenderBlockInscriber.java

@@ -21,7 +21,7 @@ import appeng.api.util.IOrientable;
 import appeng.block.AEBaseBlock;
 import appeng.block.misc.BlockInscriber;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.AELog;
 import appeng.recipes.handlers.Inscribe.InscriberRecipe;
 import appeng.tile.AEBaseTile;
@@ -60,7 +60,7 @@ public class RenderBlockInscriber extends BaseBlockRender
 		setInvRenderBounds( renderer, 1, 14, 1, 15, 16, 15 );
 		renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
 
-		blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.BlockInscriberInside.getIcon() );
+		blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockInscriberInside.getIcon() );
 
 		// press
 		setInvRenderBounds( renderer, 3, 2, 3, 13, 3, 13 );
@@ -160,7 +160,7 @@ public class RenderBlockInscriber extends BaseBlockRender
 			progress = 1.0f - (progress - 1.0f);
 		press -= progress / 5.0f;
 
-		IIcon ic = ExtraTextures.BlockInscriberInside.getIcon();
+		IIcon ic = ExtraBlockTextures.BlockInscriberInside.getIcon();
 		tess.startDrawingQuads();
 
 		middle += 0.02f;

client/render/blocks/RenderBlockInterface.java

@@ -7,7 +7,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BlockRenderInfo;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.tile.misc.TileInterface;
 
 public class RenderBlockInterface extends BaseBlockRender
@@ -26,8 +26,8 @@ public class RenderBlockInterface extends BaseBlockRender
 
 		if ( ti.getForward() != ForgeDirection.UNKNOWN )
 		{
-			IIcon side = ExtraTextures.BlockInterfaceAlternateArrow.getIcon();
-			info.setTemporaryRenderIcons( ExtraTextures.BlockInterfaceAlternate.getIcon(), block.getIcon( 0, 0 ), side, side, side, side );
+			IIcon side = ExtraBlockTextures.BlockInterfaceAlternateArrow.getIcon();
+			info.setTemporaryRenderIcons( ExtraBlockTextures.BlockInterfaceAlternate.getIcon(), block.getIcon( 0, 0 ), side, side, side, side );
 		}
 
 		boolean fz = super.renderInWorld( block, world, x, y, z, renderer );

client/render/blocks/RenderBlockQuartzAccelerator.java

@@ -6,7 +6,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.tile.misc.TileQuartzGrowthAccelerator;
 
 public class RenderBlockQuartzAccelerator extends BaseBlockRender
@@ -24,8 +24,8 @@ public class RenderBlockQuartzAccelerator extends BaseBlockRender
 		{
 			if ( ((TileQuartzGrowthAccelerator) te).hasPower )
 			{
-				IIcon top_Bottom = ExtraTextures.BlockQuartzGrowthAcceleratorOn.getIcon();
-				IIcon side = ExtraTextures.BlockQuartzGrowthAcceleratorSideOn.getIcon();
+				IIcon top_Bottom = ExtraBlockTextures.BlockQuartzGrowthAcceleratorOn.getIcon();
+				IIcon side = ExtraBlockTextures.BlockQuartzGrowthAcceleratorSideOn.getIcon();
 				blk.getRendererInstance().setTemporaryRenderIcons( top_Bottom, top_Bottom, side, side, side, side );
 			}
 		}

client/render/blocks/RenderBlockWireless.java

@@ -14,7 +14,7 @@ import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BlockRenderInfo;
 import appeng.client.texture.CableBusTextures;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.client.texture.OffsetIcon;
 import appeng.tile.networking.TileWireless;
 import appeng.util.Platform;
@@ -46,7 +46,7 @@ public class RenderBlockWireless extends BaseBlockRender
 		renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
 
 		r = CableBusTextures.PartWirelessSides.getIcon();
-		ri.setTemporaryRenderIcons( r, r, ExtraTextures.BlockWirelessInside.getIcon(), ExtraTextures.BlockWirelessInside.getIcon(), r, r );
+		ri.setTemporaryRenderIcons( r, r, ExtraBlockTextures.BlockWirelessInside.getIcon(), ExtraBlockTextures.BlockWirelessInside.getIcon(), r, r );
 		renderBlockBounds( renderer, 5, 5, 1, 11, 11, 2, ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH );
 		renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
 
@@ -56,7 +56,7 @@ public class RenderBlockWireless extends BaseBlockRender
 		super.postRenderInWorld( renderer );
 		tess.draw();
 
-		ri.setTemporaryRenderIcons( r, r, ExtraTextures.BlockWirelessInside.getIcon(), ExtraTextures.BlockWirelessInside.getIcon(), r, r );
+		ri.setTemporaryRenderIcons( r, r, ExtraBlockTextures.BlockWirelessInside.getIcon(), ExtraBlockTextures.BlockWirelessInside.getIcon(), r, r );
 
 		ForgeDirection sides[] = new ForgeDirection[] { ForgeDirection.EAST, ForgeDirection.WEST, ForgeDirection.UP, ForgeDirection.DOWN };
 
@@ -114,7 +114,7 @@ public class RenderBlockWireless extends BaseBlockRender
 			super.renderInWorld( blk, world, x, y, z, renderer );
 
 			r = CableBusTextures.PartWirelessSides.getIcon();
-			ri.setTemporaryRenderIcons( r, r, ExtraTextures.BlockWirelessInside.getIcon(), ExtraTextures.BlockWirelessInside.getIcon(), r, r );
+			ri.setTemporaryRenderIcons( r, r, ExtraBlockTextures.BlockWirelessInside.getIcon(), ExtraBlockTextures.BlockWirelessInside.getIcon(), r, r );
 			renderBlockBounds( renderer, 5, 5, 1, 11, 11, 2, fdx, fdy, fdz );
 			super.renderInWorld( blk, world, x, y, z, renderer );
 
@@ -126,7 +126,7 @@ public class RenderBlockWireless extends BaseBlockRender
 			renderTorchAtAngle( renderer, fdx, fdy, fdz );
 			super.postRenderInWorld( renderer );
 
-			ri.setTemporaryRenderIcons( r, r, ExtraTextures.BlockWirelessInside.getIcon(), ExtraTextures.BlockWirelessInside.getIcon(), r, r );
+			ri.setTemporaryRenderIcons( r, r, ExtraBlockTextures.BlockWirelessInside.getIcon(), ExtraBlockTextures.BlockWirelessInside.getIcon(), r, r );
 
 			ForgeDirection sides[] = new ForgeDirection[] { ForgeDirection.EAST, ForgeDirection.WEST, ForgeDirection.UP, ForgeDirection.DOWN };
 

client/render/blocks/RenderDrive.java

@@ -11,7 +11,7 @@ import net.minecraftforge.client.IItemRenderer.ItemRenderType;
 import net.minecraftforge.common.util.ForgeDirection;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.tile.storage.TileDrive;
 import appeng.util.Platform;
 
@@ -25,7 +25,7 @@ public class RenderDrive extends BaseBlockRender
 	@Override
 	public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
 	{
-		renderer.overrideBlockTexture = ExtraTextures.getMissing();
+		renderer.overrideBlockTexture = ExtraBlockTextures.getMissing();
 		this.renderInvBlock( EnumSet.of( ForgeDirection.SOUTH ), block, is, Tessellator.instance, 0x000000, renderer );
 
 		renderer.overrideBlockTexture = null;
@@ -45,7 +45,7 @@ public class RenderDrive extends BaseBlockRender
 		boolean result = super.renderInWorld( imb, world, x, y, z, renderer );
 		Tessellator tess = Tessellator.instance;
 
-		IIcon ico = ExtraTextures.MEStorageCellTextures.getIcon();
+		IIcon ico = ExtraBlockTextures.MEStorageCellTextures.getIcon();
 
 		int b = world.getLightBrightnessForSkyBlocks( x + forward.offsetX, y + forward.offsetY, z + forward.offsetZ, 0 );
 
@@ -237,7 +237,7 @@ public class RenderDrive extends BaseBlockRender
 
 				if ( stat != 0 )
 				{
-					IIcon wico = ExtraTextures.White.getIcon();
+					IIcon wico = ExtraBlockTextures.White.getIcon();
 					u1 = wico.getInterpolatedU( (spin % 4 < 2) ? 1 : 6 );
 					u2 = wico.getInterpolatedU( ((spin + 1) % 4 < 2) ? 1 : 6 );
 					u3 = wico.getInterpolatedU( ((spin + 2) % 4 < 2) ? 1 : 6 );

client/render/blocks/RenderMEChest.java

@@ -13,7 +13,7 @@ import appeng.api.AEApi;
 import appeng.api.storage.ICellHandler;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.client.texture.FlipableIcon;
 import appeng.client.texture.OffsetIcon;
 import appeng.tile.storage.TileChest;
@@ -29,10 +29,10 @@ public class RenderMEChest extends BaseBlockRender
 	@Override
 	public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
 	{
-		renderer.overrideBlockTexture = ExtraTextures.getMissing();
+		renderer.overrideBlockTexture = ExtraBlockTextures.getMissing();
 		this.renderInvBlock( EnumSet.of( ForgeDirection.SOUTH ), block, is, Tessellator.instance, 0x000000, renderer );
 
-		renderer.overrideBlockTexture = ExtraTextures.MEChest.getIcon();
+		renderer.overrideBlockTexture = ExtraBlockTextures.MEChest.getIcon();
 		this.renderInvBlock( EnumSet.of( ForgeDirection.UP ), block, is, Tessellator.instance, 0xffffff, renderer );
 
 		renderer.overrideBlockTexture = null;
@@ -65,7 +65,7 @@ public class RenderMEChest extends BaseBlockRender
 		Tessellator.instance.setBrightness( b );
 		Tessellator.instance.setColorOpaque_I( 0xffffff );
 
-		FlipableIcon fico = new FlipableIcon( new OffsetIcon( ExtraTextures.MEStorageCellTextures.getIcon(), offsetU, offsetV ) );
+		FlipableIcon fico = new FlipableIcon( new OffsetIcon( ExtraBlockTextures.MEStorageCellTextures.getIcon(), offsetU, offsetV ) );
 		if ( forward == ForgeDirection.EAST && (up == ForgeDirection.NORTH || up == ForgeDirection.SOUTH) )
 			fico.setFlip( true, false );
 		else if ( forward == ForgeDirection.NORTH && up == ForgeDirection.EAST )
@@ -99,7 +99,7 @@ public class RenderMEChest extends BaseBlockRender
 			if ( stat == 3 )
 				Tessellator.instance.setColorOpaque_I( 0xff0000 );
 			selectFace( renderer, west, up, forward, 9, 10, 11, 12 );
-			renderFace( x, y, z, imb, ExtraTextures.White.getIcon(), renderer, forward );
+			renderFace( x, y, z, imb, ExtraBlockTextures.White.getIcon(), renderer, forward );
 		}
 
 		b = world.getLightBrightnessForSkyBlocks( x + up.offsetX, y + up.offsetY, z + up.offsetZ, 0 );
@@ -114,7 +114,7 @@ public class RenderMEChest extends BaseBlockRender
 
 		ICellHandler ch = AEApi.instance().registries().cell().getHandler( sp.getStorageType() );
 		IIcon ico = ch == null ? null : ch.getTopTexture();
-		renderFace( x, y, z, imb, ico == null ? ExtraTextures.MEChest.getIcon() : ico, renderer, up );
+		renderFace( x, y, z, imb, ico == null ? ExtraBlockTextures.MEChest.getIcon() : ico, renderer, up );
 
 		renderer.overrideBlockTexture = null;
 		postRenderInWorld( renderer );

client/render/blocks/RenderQNB.java

@@ -15,7 +15,7 @@ import appeng.api.util.AEColor;
 import appeng.api.util.AEColoredItemDefinition;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.tile.qnb.TileQuantumBridge;
 
 public class RenderQNB extends BaseBlockRender
@@ -149,7 +149,7 @@ public class RenderQNB extends BaseBlockRender
 					Tessellator.instance.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
 					Tessellator.instance.setBrightness( bn << 20 | bn << 4 );
 					for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
-						renderFace( x, y, z, block, ExtraTextures.BlockQRingCornerLight.getIcon(), renderer, side );
+						renderFace( x, y, z, block, ExtraBlockTextures.BlockQRingCornerLight.getIcon(), renderer, side );
 
 				}
 			}
@@ -176,7 +176,7 @@ public class RenderQNB extends BaseBlockRender
 					Tessellator.instance.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
 					Tessellator.instance.setBrightness( bn << 20 | bn << 4 );
 					for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
-						renderFace( x, y, z, block, ExtraTextures.BlockQRingEdgeLight.getIcon(), renderer, side );
+						renderFace( x, y, z, block, ExtraBlockTextures.BlockQRingEdgeLight.getIcon(), renderer, side );
 				}
 			}
 		}

client/render/blocks/RenderQuartzGlass.java

@@ -10,7 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import appeng.api.AEApi;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.client.texture.OffsetIcon;
 
 public class RenderQuartzGlass extends BaseBlockRender
@@ -89,22 +89,22 @@ public class RenderQuartzGlass extends BaseBlockRender
 				switch (side)
 				{
 				case WEST:
-					renderer.renderFaceXNeg( imb, x, y, z, ExtraTextures.GlassFrame.getIcon() );
+					renderer.renderFaceXNeg( imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon() );
 					break;
 				case EAST:
-					renderer.renderFaceXPos( imb, x, y, z, ExtraTextures.GlassFrame.getIcon() );
+					renderer.renderFaceXPos( imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon() );
 					break;
 				case NORTH:
-					renderer.renderFaceZNeg( imb, x, y, z, ExtraTextures.GlassFrame.getIcon() );
+					renderer.renderFaceZNeg( imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon() );
 					break;
 				case SOUTH:
-					renderer.renderFaceZPos( imb, x, y, z, ExtraTextures.GlassFrame.getIcon() );
+					renderer.renderFaceZPos( imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon() );
 					break;
 				case DOWN:
-					renderer.renderFaceYNeg( imb, x, y, z, ExtraTextures.GlassFrame.getIcon() );
+					renderer.renderFaceYNeg( imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon() );
 					break;
 				case UP:
-					renderer.renderFaceYPos( imb, x, y, z, ExtraTextures.GlassFrame.getIcon() );
+					renderer.renderFaceYPos( imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon() );
 					break;
 				default:
 					break;
@@ -116,7 +116,7 @@ public class RenderQuartzGlass extends BaseBlockRender
 	@Override
 	public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
 	{
-		renderer.overrideBlockTexture = ExtraTextures.GlassFrame.getIcon();
+		renderer.overrideBlockTexture = ExtraBlockTextures.GlassFrame.getIcon();
 		super.renderInventory( block, is, renderer, type, obj );
 		renderer.overrideBlockTexture = null;
 		super.renderInventory( block, is, renderer, type, obj );
@@ -140,13 +140,13 @@ public class RenderQuartzGlass extends BaseBlockRender
 			renderer.overrideBlockTexture = new OffsetIcon( imb.getIcon( 0, 0 ), u / 2, v / 2 );
 			break;
 		case 1:
-			renderer.overrideBlockTexture = new OffsetIcon( ExtraTextures.BlockQuartzGlassB.getIcon(), u / 2, v / 2 );
+			renderer.overrideBlockTexture = new OffsetIcon( ExtraBlockTextures.BlockQuartzGlassB.getIcon(), u / 2, v / 2 );
 			break;
 		case 2:
-			renderer.overrideBlockTexture = new OffsetIcon( ExtraTextures.BlockQuartzGlassC.getIcon(), u, v );
+			renderer.overrideBlockTexture = new OffsetIcon( ExtraBlockTextures.BlockQuartzGlassC.getIcon(), u, v );
 			break;
 		case 3:
-			renderer.overrideBlockTexture = new OffsetIcon( ExtraTextures.BlockQuartzGlassD.getIcon(), u, v );
+			renderer.overrideBlockTexture = new OffsetIcon( ExtraBlockTextures.BlockQuartzGlassD.getIcon(), u, v );
 			break;
 		}
 

client/render/blocks/RenderQuartzOre.java

@@ -7,7 +7,7 @@ import net.minecraftforge.client.IItemRenderer.ItemRenderType;
 import appeng.block.AEBaseBlock;
 import appeng.block.solids.OreQuartz;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 
 public class RenderQuartzOre extends BaseBlockRender
 {
@@ -20,7 +20,7 @@ public class RenderQuartzOre extends BaseBlockRender
 	public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
 	{
 		super.renderInventory( blk, is, renderer, type, obj );
-		blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.OreQuartzStone.getIcon() );
+		blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.OreQuartzStone.getIcon() );
 		super.renderInventory( blk, is, renderer, type, obj );
 		blk.getRendererInstance().setTemporaryRenderIcon( null );
 	}
@@ -33,7 +33,7 @@ public class RenderQuartzOre extends BaseBlockRender
 		super.renderInWorld( block, world, x, y, z, renderer );
 		blk.enhanceBrightness = false;
 
-		blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.OreQuartzStone.getIcon() );
+		blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.OreQuartzStone.getIcon() );
 		boolean out = super.renderInWorld( block, world, x, y, z, renderer );
 		blk.getRendererInstance().setTemporaryRenderIcon( null );
 

client/render/blocks/RenderSpatialPylon.java

@@ -10,7 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BlockRenderInfo;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.tile.spatial.TileSpatialPylon;
 
 public class RenderSpatialPylon extends BaseBlockRender
@@ -23,7 +23,7 @@ public class RenderSpatialPylon extends BaseBlockRender
 	@Override
 	public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
 	{
-		renderer.overrideBlockTexture = ExtraTextures.BlockSpatialPylon_dim.getIcon();
+		renderer.overrideBlockTexture = ExtraBlockTextures.BlockSpatialPylon_dim.getIcon();
 		super.renderInventory( block, is, renderer, type, obj );
 		renderer.overrideBlockTexture = null;
 		super.renderInventory( block, is, renderer, type, obj );
@@ -143,7 +143,7 @@ public class RenderSpatialPylon extends BaseBlockRender
 		renderer.overrideBlockTexture = imb.getIcon( 0, 0 );
 		boolean result = renderer.renderStandardBlock( imb, x, y, z );
 
-		renderer.overrideBlockTexture = ExtraTextures.BlockSpatialPylon_dim.getIcon();
+		renderer.overrideBlockTexture = ExtraBlockTextures.BlockSpatialPylon_dim.getIcon();
 		result = renderer.renderStandardBlock( imb, x, y, z );
 
 		renderer.overrideBlockTexture = null;
@@ -157,13 +157,13 @@ public class RenderSpatialPylon extends BaseBlockRender
 			return blk.getRendererInstance().getTexture( dir );
 
 		if ( (displayBits & sp.DISPLAY_MIDDLE) == sp.DISPLAY_MIDDLE )
-			return ExtraTextures.BlockSpatialPylonC.getIcon();
+			return ExtraBlockTextures.BlockSpatialPylonC.getIcon();
 
 		else if ( (displayBits & sp.DISPLAY_MIDDLE) == sp.DISPLAY_ENDMIN )
-			return ExtraTextures.BlockSpatialPylonE.getIcon();
+			return ExtraBlockTextures.BlockSpatialPylonE.getIcon();
 
 		else if ( (displayBits & sp.DISPLAY_MIDDLE) == sp.DISPLAY_ENDMAX )
-			return ExtraTextures.BlockSpatialPylonE.getIcon();
+			return ExtraBlockTextures.BlockSpatialPylonE.getIcon();
 
 		return blk.getIcon( 0, 0 );
 	}
@@ -173,16 +173,16 @@ public class RenderSpatialPylon extends BaseBlockRender
 		boolean good = (displayBits & sp.DISPLAY_ENABLED) == sp.DISPLAY_ENABLED;
 
 		if ( ori.equals( dir ) || ori.getOpposite().equals( dir ) )
-			return good ? ExtraTextures.BlockSpatialPylon_dim.getIcon() : ExtraTextures.BlockSpatialPylon_red.getIcon();
+			return good ? ExtraBlockTextures.BlockSpatialPylon_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylon_red.getIcon();
 
 		if ( (displayBits & sp.DISPLAY_MIDDLE) == sp.DISPLAY_MIDDLE )
-			return good ? ExtraTextures.BlockSpatialPylonC_dim.getIcon() : ExtraTextures.BlockSpatialPylonC_red.getIcon();
+			return good ? ExtraBlockTextures.BlockSpatialPylonC_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylonC_red.getIcon();
 
 		else if ( (displayBits & sp.DISPLAY_MIDDLE) == sp.DISPLAY_ENDMIN )
-			return good ? ExtraTextures.BlockSpatialPylonE_dim.getIcon() : ExtraTextures.BlockSpatialPylonE_red.getIcon();
+			return good ? ExtraBlockTextures.BlockSpatialPylonE_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylonE_red.getIcon();
 
 		else if ( (displayBits & sp.DISPLAY_MIDDLE) == sp.DISPLAY_ENDMAX )
-			return good ? ExtraTextures.BlockSpatialPylonE_dim.getIcon() : ExtraTextures.BlockSpatialPylonE_red.getIcon();
+			return good ? ExtraBlockTextures.BlockSpatialPylonE_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylonE_red.getIcon();
 
 		return blk.getIcon( 0, 0 );
 	}

client/render/blocks/RendererSecurity.java

@@ -11,7 +11,7 @@ import net.minecraftforge.client.IItemRenderer.ItemRenderType;
 import net.minecraftforge.common.util.ForgeDirection;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.tile.misc.TileSecurity;
 
 public class RendererSecurity extends BaseBlockRender
@@ -24,10 +24,10 @@ public class RendererSecurity extends BaseBlockRender
 	@Override
 	public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
 	{
-		renderer.overrideBlockTexture = ExtraTextures.getMissing();
+		renderer.overrideBlockTexture = ExtraBlockTextures.getMissing();
 		this.renderInvBlock( EnumSet.of( ForgeDirection.SOUTH ), block, is, Tessellator.instance, 0x000000, renderer );
 
-		renderer.overrideBlockTexture = ExtraTextures.MEChest.getIcon();
+		renderer.overrideBlockTexture = ExtraBlockTextures.MEChest.getIcon();
 		this.renderInvBlock( EnumSet.of( ForgeDirection.UP ), block, is, Tessellator.instance, 0xffffff, renderer );
 
 		renderer.overrideBlockTexture = null;
@@ -56,7 +56,7 @@ public class RendererSecurity extends BaseBlockRender
 		Tessellator.instance.setColorOpaque_I( 0xffffff );
 		renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
 
-		IIcon ico = sp.isActive() ? ExtraTextures.BlockMESecurityOn.getIcon() : ExtraTextures.MEChest.getIcon();
+		IIcon ico = sp.isActive() ? ExtraBlockTextures.BlockMESecurityOn.getIcon() : ExtraBlockTextures.MEChest.getIcon();
 		renderFace( x, y, z, imb, ico, renderer, up );
 
 		renderer.overrideBlockTexture = null;

client/render/effects/EnergyFx.java

@@ -7,7 +7,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -34,7 +34,7 @@ public class EnergyFx extends EntityBreakingFX
 		this.particleRed = 255;
 		this.particleAlpha = 1.4f;
 		this.particleScale = 3.5f;
-		this.particleTextureIndex = ExtraTextures.BlockEnergyParticle.getIcon();
+		this.particleTextureIndex = ExtraBlockTextures.BlockEnergyParticle.getIcon();
 
 		startBlkX = MathHelper.floor_double( posX );
 		startBlkY = MathHelper.floor_double( posY );

client/render/effects/MatterCannonEffect.java

@@ -8,7 +8,7 @@ import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 
 public class MatterCannonEffect extends EntityBreakingFX
 {
@@ -26,7 +26,7 @@ public class MatterCannonEffect extends EntityBreakingFX
 		this.motionX = 0.0f;
 		this.motionY = 0.0f;
 		this.motionZ = 0.0f;
-		this.particleTextureIndex = ExtraTextures.BlockMatterCannonParticle.getIcon();
+		this.particleTextureIndex = ExtraBlockTextures.BlockMatterCannonParticle.getIcon();
 	}
 
 	public void fromItem(ForgeDirection d)

client/render/items/ToolBiometricCardRender.java

@@ -2,7 +2,6 @@ package appeng.client.render.items;
 
 import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IIcon;
@@ -11,6 +10,7 @@ import net.minecraftforge.client.IItemRenderer;
 import org.lwjgl.opengl.GL11;
 
 import appeng.api.util.AEColor;
+import appeng.client.texture.ExtraItemTextures;
 import appeng.util.Platform;
 
 public class ToolBiometricCardRender implements IItemRenderer
@@ -71,8 +71,8 @@ public class ToolBiometricCardRender implements IItemRenderer
 			GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
 		}
 
-		float u = Items.snowball.getIconFromDamage( 0 ).getInterpolatedU( 8.1 );
-		float v = Items.snowball.getIconFromDamage( 0 ).getInterpolatedV( 8.1 );
+		float u = ExtraItemTextures.White.getIcon().getInterpolatedU( 8.1 );
+		float v = ExtraItemTextures.White.getIcon().getInterpolatedV( 8.1 );
 
 		NBTTagCompound myTag = Platform.openNbtData( item );
 		String username = myTag.getString( "username" );

client/texture/ExtraBlockTextures.java

@@ -1,103 +1,103 @@
-package appeng.client.texture;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public enum ExtraTextures
-{
-	BlockVibrationChamberFrontOn("BlockVibrationChamberFrontOn"),
-
-	OreQuartzStone("OreQuartzStone"),
-
-	MEChest("BlockMEChest"), BlockMEChestItems("BlockMEChestItems"),
-
-	BlockControllerPowered("BlockControllerPowered"), BlockControllerColumnPowered("BlockControllerColumnPowered"), BlockControllerColumn(
-			"BlockControllerColumn"), BlockControllerLights("BlockControllerLights"), BlockControllerColumnLights("BlockControllerColumnLights"), BlockControllerColumnConflict(
-			"BlockControllerColumnConflict"), BlockControllerConflict("BlockControllerConflict"), BlockControllerInsideA("BlockControllerInsideA"), BlockControllerInsideB(
-			"BlockControllerInsideB"),
-
-	BlockChargerInside("BlockChargerInside"),
-
-	BlockInterfaceAlternate("BlockInterfaceAlternate"), BlockInterfaceAlternateArrow("BlockInterfaceAlternateArrow"),
-
-	MEStorageCellTextures("MEStorageCellTextures"), White("White"),
-
-	BlockMatterCannonParticle("BlockMatterCannonParticle"), BlockEnergyParticle("BlockEnergyParticle"),
-
-	GlassFrame("BlockQuartzGlassFrame"),
-
-	BlockQRingCornerLight("BlockQRingCornerLight"), BlockQRingEdgeLight("BlockQRingEdgeLight"),
-
-	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"),
-
-	BlockSpatialPylon_dim("BlockSpatialPylon_dim"), BlockSpatialPylon_red("BlockSpatialPylon_red"),
-
-	BlockSpatialPylonC("BlockSpatialPylon_spanned"), BlockSpatialPylonC_dim("BlockSpatialPylon_spanned_dim"), BlockSpatialPylonC_red(
-			"BlockSpatialPylon_spanned_red"),
-
-	BlockQuartzGlassB("BlockQuartzGlassB"), BlockQuartzGlassC("BlockQuartzGlassC"), BlockQuartzGlassD("BlockQuartzGlassD"),
-
-	BlockSpatialPylonE("BlockSpatialPylon_end"), BlockSpatialPylonE_dim("BlockSpatialPylon_end_dim"), BlockSpatialPylonE_red("BlockSpatialPylon_end_red"),
-
-	BlockMESecurityOn("BlockMESecurityOn"), BlockInscriberInside("BlockInscriberInside"),
-
-	BlockQuartzGrowthAcceleratorOn("BlockQuartzGrowthAcceleratorOn"), BlockQuartzGrowthAcceleratorSideOn("BlockQuartzGrowthAcceleratorSideOn"),
-
-	BlockWirelessInside("BlockWirelessInside"),
-
-	BlockCraftingAccelerator("BlockCraftingAccelerator"), BlockCraftingMonitor("BlockCraftingMonitor"),
-
-	BlockCraftingStorage1k("BlockCraftingStorage1k"), BlockCraftingStorage4k("BlockCraftingStorage4k"), BlockCraftingStorage16k("BlockCraftingStorage16k"), BlockCraftingStorage64k(
-			"BlockCraftingStorage64k"),
-
-	BlockCraftingAcceleratorFit("BlockCraftingAcceleratorFit"), BlockCraftingMonitorFit("BlockCraftingMonitorFit"),
-
-	BlockCraftingStorage1kFit("BlockCraftingStorageFit"), BlockCraftingStorage4kFit("BlockCraftingStorage4kFit"), BlockCraftingStorage16kFit(
-			"BlockCraftingStorage16kFit"), BlockCraftingStorage64kFit("BlockCraftingStorage64kFit"),
-
-	BlockCraftingUnitRing("BlockCraftingUnitRing"), BlockCraftingUnitRingLong("BlockCraftingUnitRingLong"), BlockCraftingUnitFit("BlockCraftingUnitFit"),
-
-	BlockCraftingMonitorOuter("BlockCraftingMonitorOuter"), BlockCraftingFitSolid("BlockCraftingFitSolid");
-
-	final private String name;
-	public IIcon IIcon;
-
-	public static ResourceLocation GuiTexture(String string)
-	{
-		return new ResourceLocation( "appliedenergistics2", "textures/" + string );
-	}
-
-	public String getName()
-	{
-		return name;
-	}
-
-	private ExtraTextures(String name) {
-		this.name = name;
-	}
-
-	public IIcon getIcon()
-	{
-		return IIcon;
-	}
-
-	public void registerIcon(TextureMap map)
-	{
-		IIcon = map.registerIcon( "appliedenergistics2:" + name );
-	}
-
-	@SideOnly(Side.CLIENT)
-	public static IIcon getMissing()
-	{
-		return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture )).getAtlasSprite( "missingno" );
-	}
-}
+package appeng.client.texture;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public enum ExtraBlockTextures
+{
+	BlockVibrationChamberFrontOn("BlockVibrationChamberFrontOn"),
+
+	OreQuartzStone("OreQuartzStone"),
+
+	MEChest("BlockMEChest"), BlockMEChestItems("BlockMEChestItems"),
+
+	BlockControllerPowered("BlockControllerPowered"), BlockControllerColumnPowered("BlockControllerColumnPowered"), BlockControllerColumn(
+			"BlockControllerColumn"), BlockControllerLights("BlockControllerLights"), BlockControllerColumnLights("BlockControllerColumnLights"), BlockControllerColumnConflict(
+			"BlockControllerColumnConflict"), BlockControllerConflict("BlockControllerConflict"), BlockControllerInsideA("BlockControllerInsideA"), BlockControllerInsideB(
+			"BlockControllerInsideB"),
+
+	BlockChargerInside("BlockChargerInside"),
+
+	BlockInterfaceAlternate("BlockInterfaceAlternate"), BlockInterfaceAlternateArrow("BlockInterfaceAlternateArrow"),
+
+	MEStorageCellTextures("MEStorageCellTextures"), White("White"),
+
+	BlockMatterCannonParticle("BlockMatterCannonParticle"), BlockEnergyParticle("BlockEnergyParticle"),
+
+	GlassFrame("BlockQuartzGlassFrame"),
+
+	BlockQRingCornerLight("BlockQRingCornerLight"), BlockQRingEdgeLight("BlockQRingEdgeLight"),
+
+	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"),
+
+	BlockSpatialPylon_dim("BlockSpatialPylon_dim"), BlockSpatialPylon_red("BlockSpatialPylon_red"),
+
+	BlockSpatialPylonC("BlockSpatialPylon_spanned"), BlockSpatialPylonC_dim("BlockSpatialPylon_spanned_dim"), BlockSpatialPylonC_red(
+			"BlockSpatialPylon_spanned_red"),
+
+	BlockQuartzGlassB("BlockQuartzGlassB"), BlockQuartzGlassC("BlockQuartzGlassC"), BlockQuartzGlassD("BlockQuartzGlassD"),
+
+	BlockSpatialPylonE("BlockSpatialPylon_end"), BlockSpatialPylonE_dim("BlockSpatialPylon_end_dim"), BlockSpatialPylonE_red("BlockSpatialPylon_end_red"),
+
+	BlockMESecurityOn("BlockMESecurityOn"), BlockInscriberInside("BlockInscriberInside"),
+
+	BlockQuartzGrowthAcceleratorOn("BlockQuartzGrowthAcceleratorOn"), BlockQuartzGrowthAcceleratorSideOn("BlockQuartzGrowthAcceleratorSideOn"),
+
+	BlockWirelessInside("BlockWirelessInside"),
+
+	BlockCraftingAccelerator("BlockCraftingAccelerator"), BlockCraftingMonitor("BlockCraftingMonitor"),
+
+	BlockCraftingStorage1k("BlockCraftingStorage1k"), BlockCraftingStorage4k("BlockCraftingStorage4k"), BlockCraftingStorage16k("BlockCraftingStorage16k"), BlockCraftingStorage64k(
+			"BlockCraftingStorage64k"),
+
+	BlockCraftingAcceleratorFit("BlockCraftingAcceleratorFit"), BlockCraftingMonitorFit("BlockCraftingMonitorFit"),
+
+	BlockCraftingStorage1kFit("BlockCraftingStorageFit"), BlockCraftingStorage4kFit("BlockCraftingStorage4kFit"), BlockCraftingStorage16kFit(
+			"BlockCraftingStorage16kFit"), BlockCraftingStorage64kFit("BlockCraftingStorage64kFit"),
+
+	BlockCraftingUnitRing("BlockCraftingUnitRing"), BlockCraftingUnitRingLong("BlockCraftingUnitRingLong"), BlockCraftingUnitFit("BlockCraftingUnitFit"),
+
+	BlockCraftingMonitorOuter("BlockCraftingMonitorOuter"), BlockCraftingFitSolid("BlockCraftingFitSolid");
+
+	final private String name;
+	public IIcon IIcon;
+
+	public static ResourceLocation GuiTexture(String string)
+	{
+		return new ResourceLocation( "appliedenergistics2", "textures/" + string );
+	}
+
+	public String getName()
+	{
+		return name;
+	}
+
+	private ExtraBlockTextures(String name) {
+		this.name = name;
+	}
+
+	public IIcon getIcon()
+	{
+		return IIcon;
+	}
+
+	public void registerIcon(TextureMap map)
+	{
+		IIcon = map.registerIcon( "appliedenergistics2:" + name );
+	}
+
+	@SideOnly(Side.CLIENT)
+	public static IIcon getMissing()
+	{
+		return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture )).getAtlasSprite( "missingno" );
+	}
+}

client/texture/ExtraItemTextures.java

@@ -0,0 +1,46 @@
+package appeng.client.texture;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public enum ExtraItemTextures
+{
+	White("White"), ItemPaintBallShimmer("ItemPaintBallShimmer");
+
+	final private String name;
+	public IIcon IIcon;
+
+	public static ResourceLocation GuiTexture(String string)
+	{
+		return new ResourceLocation( "appliedenergistics2", "textures/" + string );
+	}
+
+	public String getName()
+	{
+		return name;
+	}
+
+	private ExtraItemTextures(String name) {
+		this.name = name;
+	}
+
+	public IIcon getIcon()
+	{
+		return IIcon;
+	}
+
+	public void registerIcon(TextureMap map)
+	{
+		IIcon = map.registerIcon( "appliedenergistics2:" + name );
+	}
+
+	@SideOnly(Side.CLIENT)
+	public static IIcon getMissing()
+	{
+		return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationItemsTexture )).getAtlasSprite( "missingno" );
+	}
+}

core/features/registries/entries/BasicCellHandler.java

@@ -10,7 +10,7 @@ import appeng.api.storage.ICellInventoryHandler;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.IMEInventoryHandler;
 import appeng.api.storage.StorageChannel;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.sync.GuiBridge;
 import appeng.me.storage.CellInventory;
 import appeng.me.storage.CellInventoryHandler;
@@ -37,7 +37,7 @@ public class BasicCellHandler implements ICellHandler
 	@Override
 	public IIcon getTopTexture()
 	{
-		return ExtraTextures.BlockMEChestItems.getIcon();
+		return ExtraBlockTextures.BlockMEChestItems.getIcon();
 	}
 
 	@Override

core/features/registries/entries/CreativeCellHandler.java

@@ -8,7 +8,7 @@ import appeng.api.storage.ICellHandler;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.IMEInventoryHandler;
 import appeng.api.storage.StorageChannel;
-import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.sync.GuiBridge;
 import appeng.items.storage.ItemCreativeStorageCell;
 import appeng.me.storage.CreativeCellInventory;
@@ -35,7 +35,7 @@ public class CreativeCellHandler implements ICellHandler
 	@Override
 	public IIcon getTopTexture()
 	{
-		return ExtraTextures.BlockMEChestItems.getIcon();
+		return ExtraBlockTextures.BlockMEChestItems.getIcon();
 	}
 
 	@Override