Err too much.

client/ClientHelper.java

@@ -61,7 +61,7 @@ public class ClientHelper extends ServerHelper
 	public void bindTileEntitySpecialRenderer(Class tile, AEBaseBlock blk)
 	{
 		BaseBlockRender bbr = blk.getRendererInstance().rendererInstance;
-		if ( bbr.hasTESR )
+		if ( bbr.hasTESR && tile != null )
 			ClientRegistry.bindTileEntitySpecialRenderer( tile, new TESRWrapper( bbr ) );
 	}
 

client/gui/implementations/GuiCellWorkbench.java

@@ -0,0 +1,167 @@
+package appeng.client.gui.implementations;
+
+import java.io.IOException;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
+import org.lwjgl.input.Mouse;
+
+import appeng.api.config.ActionItems;
+import appeng.api.config.FuzzyMode;
+import appeng.api.config.Settings;
+import appeng.api.config.Upgrades;
+import appeng.api.implementations.IUpgradeModule;
+import appeng.client.gui.widgets.GuiImgButton;
+import appeng.container.implementations.ContainerCellWorkbench;
+import appeng.core.localization.GuiText;
+import appeng.core.sync.packets.PacketValueConfig;
+import appeng.tile.misc.TileCellWorkbench;
+import appeng.util.Platform;
+import cpw.mods.fml.common.network.PacketDispatcher;
+
+public class GuiCellWorkbench extends GuiUpgradeable
+{
+
+	ContainerCellWorkbench ccwb;
+	TileCellWorkbench tcw;
+
+	GuiImgButton clear;
+	GuiImgButton partition;
+
+	public GuiCellWorkbench(InventoryPlayer inventoryPlayer, TileCellWorkbench te) {
+		super( new ContainerCellWorkbench( inventoryPlayer, te ) );
+		ccwb = (ContainerCellWorkbench) inventorySlots;
+		ySize = 251;
+		tcw = te;
+	}
+
+	@Override
+	protected boolean drawUpgrades()
+	{
+		return ccwb.availableUpgrades() > 0;
+	}
+
+	@Override
+	public void initGui()
+	{
+		super.initGui();
+	}
+
+	@Override
+	public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY)
+	{
+		handleButtonVisiblity();
+
+		bindTexture( getBackground() );
+		this.drawTexturedModalRect( offsetX, offsetY, 0, 0, 211 - 34, ySize );
+		if ( drawUpgrades() )
+		{
+			if ( ccwb.availableUpgrades() <= 8 )
+			{
+				this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 7 + ccwb.availableUpgrades() * 18 );
+				this.drawTexturedModalRect( offsetX + 177, offsetY + (7 + (ccwb.availableUpgrades()) * 18), 177, 151, 35, 7 );
+			}
+			else if ( ccwb.availableUpgrades() <= 16 )
+			{
+				this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 7 + 8 * 18 );
+				this.drawTexturedModalRect( offsetX + 177, offsetY + (7 + (8) * 18), 177, 151, 35, 7 );
+
+				int dx = ccwb.availableUpgrades() - 8;
+				this.drawTexturedModalRect( offsetX + 177 + 27, offsetY, 186, 0, 35 - 8, 7 + dx * 18 );
+				if ( dx == 8 )
+					this.drawTexturedModalRect( offsetX + 177 + 27, offsetY + (7 + (dx) * 18), 186, 151, 35 - 8, 7 );
+				else
+					this.drawTexturedModalRect( offsetX + 177 + 27 + 4, offsetY + (7 + (dx) * 18), 186 + 4, 151, 35 - 8, 7 );
+
+			}
+			else
+			{
+				this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 7 + 8 * 18 );
+				this.drawTexturedModalRect( offsetX + 177, offsetY + (7 + (8) * 18), 177, 151, 35, 7 );
+
+				this.drawTexturedModalRect( offsetX + 177 + 27, offsetY, 186, 0, 35 - 8, 7 + 8 * 18 );
+				this.drawTexturedModalRect( offsetX + 177 + 27, offsetY + (7 + (8) * 18), 186, 151, 35 - 8, 7 );
+
+				int dx = ccwb.availableUpgrades() - 16;
+				this.drawTexturedModalRect( offsetX + 177 + 27 + 18, offsetY, 186, 0, 35 - 8, 7 + dx * 18 );
+				if ( dx == 8 )
+					this.drawTexturedModalRect( offsetX + 177 + 27 + 18, offsetY + (7 + (dx) * 18), 186, 151, 35 - 8, 7 );
+				else
+					this.drawTexturedModalRect( offsetX + 177 + 27 + 18 + 4, offsetY + (7 + (dx) * 18), 186 + 4, 151, 35 - 8, 7 );
+			}
+		}
+		if ( hasToolbox() )
+			this.drawTexturedModalRect( offsetX + 178, offsetY + ySize - 90, 178, 161, 68, 68 );
+	}
+
+	@Override
+	protected void actionPerformed(GuiButton btn)
+	{
+		try
+		{
+			if ( btn == partition )
+			{
+				PacketDispatcher.sendPacketToServer( (new PacketValueConfig( "CellWorkbench.Action", "Partition" )).getPacket() );
+			}
+			else if ( btn == clear )
+			{
+				PacketDispatcher.sendPacketToServer( (new PacketValueConfig( "CellWorkbench.Action", "Clear" )).getPacket() );
+			}
+			else if ( btn == fuzzyMode )
+			{
+				boolean backwards = Mouse.isButtonDown( 1 );
+
+				FuzzyMode fz = (FuzzyMode) fuzzyMode.getCurrentValue();
+				fz = Platform.rotateEnum( fz, backwards, Settings.FUZZY_MODE.getPossibleValues() );
+
+				PacketDispatcher.sendPacketToServer( (new PacketValueConfig( "CellWorkbench.Fuzzy", fz.name() )).getPacket() );
+			}
+			else
+				super.actionPerformed( btn );
+		}
+		catch (IOException err)
+		{
+		}
+	}
+
+	@Override
+	protected void addButtons()
+	{
+		clear = new GuiImgButton( this.guiLeft - 18, guiTop + 8, Settings.ACTIONS, ActionItems.CLOSE );
+		partition = new GuiImgButton( this.guiLeft - 18, guiTop + 28, Settings.ACTIONS, ActionItems.WRENCH );
+		fuzzyMode = new GuiImgButton( this.guiLeft - 18, guiTop + 48, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL );
+
+		buttonList.add( fuzzyMode );
+		buttonList.add( partition );
+		buttonList.add( clear );
+	}
+
+	protected void handleButtonVisiblity()
+	{
+		boolean hasFuzzy = false;
+		IInventory inv = ccwb.getCellUpgradeInventory();
+		for (int x = 0; x < inv.getSizeInventory(); x++)
+		{
+			ItemStack is = inv.getStackInSlot( x );
+			if ( is != null && is.getItem() instanceof IUpgradeModule )
+			{
+				if ( ((IUpgradeModule) is.getItem()).getType( is ) == Upgrades.FUZZY )
+					hasFuzzy = true;
+			}
+		}
+		fuzzyMode.setVisibility( hasFuzzy );
+	}
+
+	protected String getBackground()
+	{
+		return "guis/cellworkbench.png";
+	}
+
+	protected GuiText getName()
+	{
+		return GuiText.CellWorkbench;
+	}
+}

client/gui/implementations/GuiIOPort.java

@@ -0,0 +1,95 @@
+package appeng.client.gui.implementations;
+
+import java.io.IOException;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.entity.player.InventoryPlayer;
+
+import org.lwjgl.input.Mouse;
+
+import appeng.api.AEApi;
+import appeng.api.config.FullnessMode;
+import appeng.api.config.OperationMode;
+import appeng.api.config.RedstoneMode;
+import appeng.api.config.Settings;
+import appeng.client.gui.widgets.GuiImgButton;
+import appeng.container.implementations.ContainerIOPort;
+import appeng.core.localization.GuiText;
+import appeng.core.sync.packets.PacketConfigButton;
+import appeng.tile.storage.TileIOPort;
+import cpw.mods.fml.common.network.PacketDispatcher;
+
+public class GuiIOPort extends GuiUpgradeable
+{
+
+	GuiImgButton fullMode;
+	GuiImgButton operationMode;
+
+	public GuiIOPort(InventoryPlayer inventoryPlayer, TileIOPort te) {
+		super( new ContainerIOPort( inventoryPlayer, te ) );
+		this.ySize = 166;
+	}
+
+	@Override
+	public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY)
+	{
+		super.drawBG( offsetX, offsetY, mouseX, mouseY );
+		this.drawItem( offsetX + 66 - 8, offsetY + 17, AEApi.instance().items().itemCell1k.stack( 1 ) );
+		this.drawItem( offsetX + 94 + 8, offsetY + 17, AEApi.instance().blocks().blockDrive.stack( 1 ) );
+	}
+
+	@Override
+	public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
+	{
+		fontRenderer.drawString( GuiText.IOPort.getLocal(), 8, 6, 4210752 );
+		fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
+
+		if ( redstoneMode != null )
+			redstoneMode.set( cvb.rsMode );
+
+		if ( operationMode != null )
+			operationMode.set( ((ContainerIOPort) cvb).opMode );
+
+		if ( fullMode != null )
+			fullMode.set( ((ContainerIOPort) cvb).fMode );
+	}
+
+	@Override
+	protected void addButtons()
+	{
+		redstoneMode = new GuiImgButton( this.guiLeft - 18, guiTop + 28, Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE );
+		fullMode = new GuiImgButton( this.guiLeft - 18, guiTop + 8, Settings.FULLNESS_MODE, FullnessMode.EMPTY );
+		operationMode = new GuiImgButton( this.guiLeft + 80, guiTop + 17, Settings.OPERATION_MODE, OperationMode.EMPTY );
+
+		buttonList.add( operationMode );
+		buttonList.add( redstoneMode );
+		buttonList.add( fullMode );
+	}
+
+	@Override
+	protected void actionPerformed(GuiButton btn)
+	{
+		super.actionPerformed( btn );
+
+		boolean backwards = Mouse.isButtonDown( 1 );
+
+		try
+		{
+			if ( btn == fullMode )
+				PacketDispatcher.sendPacketToServer( (new PacketConfigButton( fullMode.getSetting(), backwards )).getPacket() );
+
+			if ( btn == operationMode )
+				PacketDispatcher.sendPacketToServer( (new PacketConfigButton( operationMode.getSetting(), backwards )).getPacket() );
+		}
+		catch (IOException e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+	protected String getBackground()
+	{
+		return "guis/ioport.png";
+	}
+
+}

client/gui/implementations/GuiLevelEmitter.java

@@ -15,7 +15,7 @@ import appeng.core.sync.packets.PacketValueConfig;
 import appeng.parts.automation.PartLevelEmitter;
 import cpw.mods.fml.common.network.PacketDispatcher;
 
-public class GuiLevelEmitter extends GuiBus
+public class GuiLevelEmitter extends GuiUpgradeable
 {
 
 	GuiTextField level;
@@ -28,7 +28,7 @@ public class GuiLevelEmitter extends GuiBus
 	public void initGui()
 	{
 		super.initGui();
-		level = new GuiTextField( this.fontRenderer, this.guiLeft + 10, this.guiTop + 43, 59, this.fontRenderer.FONT_HEIGHT );
+		level = new GuiTextField( this.fontRenderer, this.guiLeft + 44, this.guiTop + 43, 59, this.fontRenderer.FONT_HEIGHT );
 		level.setEnableBackgroundDrawing( false );
 		level.setMaxStringLength( 16 );
 		level.setTextColor( 0xFFFFFF );
@@ -40,8 +40,8 @@ public class GuiLevelEmitter extends GuiBus
 	@Override
 	protected void addButtons()
 	{
-		redstoneMode = new GuiImgButton( 122 + guiLeft, 31 + guiTop, Settings.REDSTONE_EMITTER, RedstoneMode.IGNORE );
-		fuzzyMode = new GuiImgButton( 122 + guiLeft, 49 + guiTop, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL );
+		redstoneMode = new GuiImgButton( this.guiLeft - 18, guiTop + 8, Settings.REDSTONE_EMITTER, RedstoneMode.IGNORE );
+		fuzzyMode = new GuiImgButton( this.guiLeft - 18, guiTop + 28, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL );
 
 		buttonList.add( redstoneMode );
 		buttonList.add( fuzzyMode );

client/gui/implementations/GuiMEMonitorable.java

@@ -18,6 +18,7 @@ import appeng.container.implementations.ContainerMEMonitorable;
 import appeng.container.slot.AppEngSlot;
 import appeng.core.Configuration;
 import appeng.core.localization.GuiText;
+import appeng.helpers.ICellItemViewer;
 import appeng.parts.reporting.PartTerminal;
 import appeng.util.Platform;
 
@@ -29,6 +30,7 @@ public class GuiMEMonitorable extends AEBaseMEGui
 
 	GuiText myName;
 	int rows = 0;
+	int maxRows = Integer.MAX_VALUE;
 
 	public GuiMEMonitorable(InventoryPlayer inventoryPlayer, IStorageMonitorable te) {
 		super( new ContainerMEMonitorable( inventoryPlayer, null ) );
@@ -37,6 +39,8 @@ public class GuiMEMonitorable extends AEBaseMEGui
 		xSize = 195;
 		ySize = 204;
 
+		if ( te instanceof ICellItemViewer )
+			myName = GuiText.PortableCell;
 		if ( te instanceof IMEChest )
 			myName = GuiText.Chest;
 		else if ( te instanceof PartTerminal )
@@ -65,7 +69,14 @@ public class GuiMEMonitorable extends AEBaseMEGui
 		int NEI = 0;
 		int top = 4;
 		int extraSpace = height - 114 - NEI - top;
+		int moveDown = 0;
+
 		rows = (int) Math.floor( extraSpace / 18 );
+		if ( rows > maxRows )
+		{
+			top += (rows - maxRows) * 18 / 2;
+			rows = maxRows;
+		}
 
 		meSlots.clear();
 		for (int y = 0; y < rows; y++)
@@ -101,7 +112,7 @@ public class GuiMEMonitorable extends AEBaseMEGui
 		{
 			if ( s instanceof AppEngSlot )
 			{
-				((AppEngSlot) s).yDisplayPosition = ((AppEngSlot) s).defY + ySize - 78 - guiTop;
+				((AppEngSlot) s).yDisplayPosition = ((AppEngSlot) s).defY + ySize - 78 - 4;
 			}
 		}
 	}

client/gui/implementations/GuiMEPortableCell.java

@@ -0,0 +1,14 @@
+package appeng.client.gui.implementations;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import appeng.helpers.ICellItemViewer;
+
+public class GuiMEPortableCell extends GuiMEMonitorable
+{
+
+	public GuiMEPortableCell(InventoryPlayer inventoryPlayer, ICellItemViewer te) {
+		super( inventoryPlayer, te );
+		maxRows = 3;
+	}
+
+}

client/gui/implementations/GuiNetworkStatus.java

@@ -24,7 +24,7 @@ public class GuiNetworkStatus extends AEBaseGui
 	@Override
 	public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
 	{
-		fontRenderer.drawString( GuiText.NetworkStatus.getLocal(), 8, 6, 4210752 );
+		fontRenderer.drawString( GuiText.NetworkDetails.getLocal(), 8, 6, 4210752 );
 		fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
 	}
 

client/gui/implementations/GuiQNB.java

@@ -0,0 +1,31 @@
+package appeng.client.gui.implementations;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import appeng.client.gui.AEBaseGui;
+import appeng.container.implementations.ContainerQNB;
+import appeng.core.localization.GuiText;
+import appeng.tile.qnb.TileQuantumBridge;
+
+public class GuiQNB extends AEBaseGui
+{
+
+	public GuiQNB(InventoryPlayer inventoryPlayer, TileQuantumBridge te) {
+		super( new ContainerQNB( inventoryPlayer, te ) );
+		this.ySize = 166;
+	}
+
+	@Override
+	public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY)
+	{
+		bindTexture( "guis/chest.png" );
+		this.drawTexturedModalRect( offsetX, offsetY, 0, 0, xSize, ySize );
+	}
+
+	@Override
+	public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
+	{
+		fontRenderer.drawString( GuiText.QuantumLinkChamber.getLocal(), 8, 6, 4210752 );
+		fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
+	}
+
+}

client/gui/implementations/GuiUpgradeable.java

@@ -14,28 +14,28 @@ import appeng.api.config.Upgrades;
 import appeng.api.implementations.IBusCommon;
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiImgButton;
-import appeng.container.implementations.ContainerBus;
+import appeng.container.implementations.ContainerUpgradeable;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.packets.PacketConfigButton;
 import appeng.parts.automation.PartImportBus;
 import cpw.mods.fml.common.network.PacketDispatcher;
 
-public class GuiBus extends AEBaseGui
+public class GuiUpgradeable extends AEBaseGui
 {
 
-	ContainerBus cvb;
+	ContainerUpgradeable cvb;
 	IBusCommon bc;
 
 	GuiImgButton redstoneMode;
 	GuiImgButton fuzzyMode;
 
-	public GuiBus(InventoryPlayer inventoryPlayer, IBusCommon te) {
-		this( new ContainerBus( inventoryPlayer, te ) );
+	public GuiUpgradeable(InventoryPlayer inventoryPlayer, IBusCommon te) {
+		this( new ContainerUpgradeable( inventoryPlayer, te ) );
 	}
 
-	public GuiBus(ContainerBus te) {
+	public GuiUpgradeable(ContainerUpgradeable te) {
 		super( te );
-		cvb = (ContainerBus) te;
+		cvb = (ContainerUpgradeable) te;
 
 		bc = (IBusCommon) te.getTarget();
 		this.xSize = hasToolbox() ? 246 : 211;
@@ -58,12 +58,21 @@ public class GuiBus extends AEBaseGui
 		buttonList.add( fuzzyMode );
 	}
 
-	protected void mouseClicked(int par1, int par2, int par3)
+	protected void mouseClicked(int xCoord, int yCoord, int btn)
 	{
-		if ( par3 == 1 )
-			super.mouseClicked( par1, par2, 0 );
-		else
-			super.mouseClicked( par1, par2, par3 );
+		if ( btn == 1 )
+		{
+			for (Object o : this.buttonList)
+			{
+				GuiButton guibutton = (GuiButton) o;
+				if ( guibutton.mousePressed( this.mc, xCoord, yCoord ) )
+				{
+					super.mouseClicked( xCoord, yCoord, 0 );
+					return;
+				}
+			}
+		}
+		super.mouseClicked( xCoord, yCoord, btn );
 	}
 
 	@Override
@@ -88,9 +97,9 @@ public class GuiBus extends AEBaseGui
 		}
 	}
 
-	private boolean hasToolbox()
+	protected boolean hasToolbox()
 	{
-		return ((ContainerBus) inventorySlots).hasToolbox();
+		return ((ContainerUpgradeable) inventorySlots).hasToolbox();
 	}
 
 	@Override
@@ -99,10 +108,16 @@ public class GuiBus extends AEBaseGui
 		handleButtonVisiblity();
 
 		bindTexture( getBackground() );
-		this.drawTexturedModalRect( offsetX, offsetY, 0, 0, xSize - 34, ySize );
-		this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 86 );
+		this.drawTexturedModalRect( offsetX, offsetY, 0, 0, 211 - 34, ySize );
+		if ( drawUpgrades() )
+			this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 10 + cvb.availableUpgrades() * 18 );
 		if ( hasToolbox() )
-			this.drawTexturedModalRect( offsetX + 178, offsetY + 94, 178, 94, 68, 68 );
+			this.drawTexturedModalRect( offsetX + 178, offsetY + ySize - 90, 178, ySize - 90, 68, 68 );
+	}
+
+	protected boolean drawUpgrades()
+	{
+		return true;
 	}
 
 	protected String getBackground()
@@ -112,8 +127,10 @@ public class GuiBus extends AEBaseGui
 
 	protected void handleButtonVisiblity()
 	{
-		redstoneMode.setVisibility( bc.getInstalledUpgrades( Upgrades.REDSTONE ) > 0 );
-		fuzzyMode.setVisibility( bc.getInstalledUpgrades( Upgrades.FUZZY ) > 0 );
+		if ( redstoneMode != null )
+			redstoneMode.setVisibility( bc.getInstalledUpgrades( Upgrades.REDSTONE ) > 0 );
+		if ( fuzzyMode != null )
+			fuzzyMode.setVisibility( bc.getInstalledUpgrades( Upgrades.FUZZY ) > 0 );
 	}
 
 	@Override

client/gui/widgets/GuiProgressBar.java

@@ -28,6 +28,8 @@ public class GuiProgressBar extends GuiButton implements ITooltip
 
 	public GuiProgressBar(String string, int posX, int posY, int u, int y, int _width, int _height, Direction dir) {
 		super( posX, posY, _width, "" );
+		this.xPosition = posX;
+		this.yPosition = posY;
 		texture = new ResourceLocation( "appliedenergistics2", "textures/" + string );
 		width = _width;
 		height = _height;

client/render/BusRenderer.java

@@ -9,9 +9,9 @@ import net.minecraftforge.common.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
 
-import appeng.api.parts.IPartItem;
-import appeng.api.parts.IPart;
 import appeng.api.parts.IFacadePart;
+import appeng.api.parts.IPart;
+import appeng.api.parts.IPartItem;
 import appeng.client.ClientHelper;
 import appeng.facade.IFacadeItem;
 import appeng.util.Platform;
@@ -69,6 +69,10 @@ public class BusRenderer implements IItemRenderer
 		BusRenderHelper.instance.setInvColor( 0xffffff );
 		renderer.blockAccess = ClientHelper.proxy.getWorld();
 
+		BusRenderHelper.instance.ax = ForgeDirection.EAST;
+		BusRenderHelper.instance.ay = ForgeDirection.UP;
+		BusRenderHelper.instance.az = ForgeDirection.SOUTH;
+
 		if ( item.getItem() instanceof IFacadeItem )
 		{
 			IFacadeItem fi = (IFacadeItem) item.getItem();

client/render/blocks/RenderCable.java

@@ -1,62 +0,0 @@
-package appeng.client.render.blocks;
-
-import java.util.EnumSet;
-
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.util.Icon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.common.ForgeDirection;
-import appeng.block.AEBaseBlock;
-import appeng.client.render.BaseBlockRender;
-
-public class RenderCable extends BaseBlockRender
-{
-
-	public void renderCableAt(double Thickness, IBlockAccess world, int x, int y, int z, AEBaseBlock block, RenderBlocks renderer, Icon texture, double pull,
-			EnumSet<ForgeDirection> connections)
-	{
-
-		if ( connections.contains( ForgeDirection.UNKNOWN ) )
-		{
-			renderer.setRenderBounds( 0.5D - Thickness, 0.5D - Thickness, 0.5D - Thickness, 0.5D + Thickness, 0.5D + Thickness, 0.5D + Thickness );
-			renderer.renderStandardBlock( block, x, y, z );
-		}
-
-		if ( connections.contains( ForgeDirection.WEST ) )
-		{
-			renderer.setRenderBounds( 0.0D, 0.5D - Thickness, 0.5D - Thickness, 0.5D - Thickness - pull, 0.5D + Thickness, 0.5D + Thickness );
-			renderer.renderStandardBlock( block, x, y, z );
-		}
-
-		if ( connections.contains( ForgeDirection.EAST ) )
-		{
-			renderer.setRenderBounds( 0.5D + Thickness + pull, 0.5D - Thickness, 0.5D - Thickness, 1.0D, 0.5D + Thickness, 0.5D + Thickness );
-			renderer.renderStandardBlock( block, x, y, z );
-		}
-
-		if ( connections.contains( ForgeDirection.NORTH ) )
-		{
-			renderer.setRenderBounds( 0.5D - Thickness, 0.5D - Thickness, 0.0D, 0.5D + Thickness, 0.5D + Thickness, 0.5D - Thickness - pull );
-			renderer.renderStandardBlock( block, x, y, z );
-		}
-
-		if ( connections.contains( ForgeDirection.SOUTH ) )
-		{
-			renderer.setRenderBounds( 0.5D - Thickness, 0.5D - Thickness, 0.5D + Thickness + pull, 0.5D + Thickness, 0.5D + Thickness, 1.0D );
-			renderer.renderStandardBlock( block, x, y, z );
-		}
-
-		if ( connections.contains( ForgeDirection.DOWN ) )
-		{
-			renderer.setRenderBounds( 0.5D - Thickness, 0.0D, 0.5D - Thickness, 0.5D + Thickness, 0.5D - Thickness - pull, 0.5D + Thickness );
-			renderer.renderStandardBlock( block, x, y, z );
-		}
-
-		if ( connections.contains( ForgeDirection.UP ) )
-		{
-			renderer.setRenderBounds( 0.5D - Thickness, 0.5D + Thickness + pull, 0.5D - Thickness, 0.5D + Thickness, 1.0D, 0.5D + Thickness );
-			renderer.renderStandardBlock( block, x, y, z );
-		}
-
-	}
-}

client/render/blocks/RenderQNB.java

@@ -4,17 +4,71 @@ import java.util.EnumSet;
 
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.Icon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.ForgeDirection;
 import appeng.api.AEApi;
+import appeng.api.util.AEItemDefinition;
 import appeng.block.AEBaseBlock;
+import appeng.client.render.BaseBlockRender;
 import appeng.client.texture.ExtraTextures;
 import appeng.tile.qnb.TileQuantumBridge;
 
-public class RenderQNB extends RenderCable
+public class RenderQNB extends BaseBlockRender
 {
 
+	public void renderCableAt(double Thickness, IBlockAccess world, int x, int y, int z, AEBaseBlock block, RenderBlocks renderer, Icon texture, double pull,
+			EnumSet<ForgeDirection> connections)
+	{
+		block.getRendererInstance().setTemporaryRenderIcon( texture );
+
+		if ( connections.contains( ForgeDirection.UNKNOWN ) )
+		{
+			renderer.setRenderBounds( 0.5D - Thickness, 0.5D - Thickness, 0.5D - Thickness, 0.5D + Thickness, 0.5D + Thickness, 0.5D + Thickness );
+			renderer.renderStandardBlock( block, x, y, z );
+		}
+
+		if ( connections.contains( ForgeDirection.WEST ) )
+		{
+			renderer.setRenderBounds( 0.0D, 0.5D - Thickness, 0.5D - Thickness, 0.5D - Thickness - pull, 0.5D + Thickness, 0.5D + Thickness );
+			renderer.renderStandardBlock( block, x, y, z );
+		}
+
+		if ( connections.contains( ForgeDirection.EAST ) )
+		{
+			renderer.setRenderBounds( 0.5D + Thickness + pull, 0.5D - Thickness, 0.5D - Thickness, 1.0D, 0.5D + Thickness, 0.5D + Thickness );
+			renderer.renderStandardBlock( block, x, y, z );
+		}
+
+		if ( connections.contains( ForgeDirection.NORTH ) )
+		{
+			renderer.setRenderBounds( 0.5D - Thickness, 0.5D - Thickness, 0.0D, 0.5D + Thickness, 0.5D + Thickness, 0.5D - Thickness - pull );
+			renderer.renderStandardBlock( block, x, y, z );
+		}
+
+		if ( connections.contains( ForgeDirection.SOUTH ) )
+		{
+			renderer.setRenderBounds( 0.5D - Thickness, 0.5D - Thickness, 0.5D + Thickness + pull, 0.5D + Thickness, 0.5D + Thickness, 1.0D );
+			renderer.renderStandardBlock( block, x, y, z );
+		}
+
+		if ( connections.contains( ForgeDirection.DOWN ) )
+		{
+			renderer.setRenderBounds( 0.5D - Thickness, 0.0D, 0.5D - Thickness, 0.5D + Thickness, 0.5D - Thickness - pull, 0.5D + Thickness );
+			renderer.renderStandardBlock( block, x, y, z );
+		}
+
+		if ( connections.contains( ForgeDirection.UP ) )
+		{
+			renderer.setRenderBounds( 0.5D - Thickness, 0.5D + Thickness + pull, 0.5D - Thickness, 0.5D + Thickness, 1.0D, 0.5D + Thickness );
+			renderer.renderStandardBlock( block, x, y, z );
+		}
+
+		block.getRendererInstance().setTemporaryRenderIcon( null );
+	}
+
 	@Override
 	public void renderInventory(AEBaseBlock block, ItemStack item, RenderBlocks renderer)
 	{
@@ -38,10 +92,15 @@ public class RenderQNB extends RenderCable
 		{
 			if ( tqb.isFormed() )
 			{
-				EnumSet<ForgeDirection> sides = EnumSet.allOf( ForgeDirection.class );
-				renderCableAt( 0.11D, world, x, y, z, block, renderer, block.getIcon( 0, 0 ), 0.141D, sides );
-				renderCableAt( 0.188D, world, x, y, z, block, renderer, block.getIcon( 0, 0 ), 0.1875D,
-						EnumSet.complementOf( EnumSet.of( ForgeDirection.UNKNOWN ) ) );
+				AEItemDefinition cabldef = AEApi.instance().parts().partCableGlass;
+				Item cable = cabldef.item();
+
+				AEItemDefinition ccabldef = AEApi.instance().parts().partCableCovered;
+				Item ccable = ccabldef.item();
+
+				EnumSet<ForgeDirection> sides = tqb.getConnections();
+				renderCableAt( 0.11D, world, x, y, z, block, renderer, cable.getIconIndex( cabldef.stack( 1 ) ), 0.141D, sides );
+				renderCableAt( 0.188D, world, x, y, z, block, renderer, ccable.getIconIndex( ccabldef.stack( 1 ) ), 0.1875D, tqb.getConnections() );
 			}
 
 			float px = 2.0f / 16.0f;
@@ -63,8 +122,10 @@ public class RenderQNB extends RenderCable
 			{
 				// renderCableAt(0.11D, world, x, y, z, block, modelId, renderer,
 				// AppEngTextureRegistry.Blocks.MECable.get(), true, 0.0D);
-				renderCableAt( 0.188D, world, x, y, z, block, renderer, ExtraTextures.BlockInterfaceAlternate.getIcon(), 0.05D,
-						EnumSet.complementOf( EnumSet.of( ForgeDirection.UNKNOWN ) ) );
+				AEItemDefinition ccabldef = AEApi.instance().parts().partCableCovered;
+				Item ccable = ccabldef.item();
+
+				renderCableAt( 0.188D, world, x, y, z, block, renderer, ccable.getIconIndex( ccabldef.stack( 1 ) ), 0.05D, tqb.getConnections() );
 
 				float px = 4.0f / 16.0f;
 				float maxpx = 12.0f / 16.0f;
@@ -83,7 +144,7 @@ public class RenderQNB extends RenderCable
 					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, block.getIcon( 0, 0 ), renderer, side );
+						renderFace( x, y, z, block, ExtraTextures.BlockQRingCornerLight.getIcon(), renderer, side );
 
 				}
 			}
@@ -110,7 +171,7 @@ public class RenderQNB extends RenderCable
 					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, block.getIcon( 0, 0 ), renderer, side );
+						renderFace( x, y, z, block, ExtraTextures.BlockQRingEdgeLight.getIcon(), renderer, side );
 				}
 			}
 		}
@@ -118,5 +179,4 @@ public class RenderQNB extends RenderCable
 		renderer.renderAllFaces = false;
 		return true;
 	}
-
 }

client/render/blocks/RenderQuartzGlass.java

@@ -1,5 +1,7 @@
 package appeng.client.render.blocks;
 
+import java.util.Random;
+
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
@@ -8,12 +10,23 @@ import appeng.api.AEApi;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.texture.ExtraTextures;
+import appeng.client.texture.OffsetIcon;
 
 public class RenderQuartzGlass extends BaseBlockRender
 {
 
+	static byte offsets[][][];
+
 	public RenderQuartzGlass() {
 		super( false, 0 );
+		if ( offsets == null )
+		{
+			Random r = new Random( 924 );
+			offsets = new byte[10][10][10];
+			for (int x = 0; x < 10; x++)
+				for (int y = 0; y < 10; y++)
+					r.nextBytes( offsets[x][y] );
+		}
 	}
 
 	boolean isFlush(AEBaseBlock imb, IBlockAccess world, int x, int y, int z)
@@ -113,7 +126,29 @@ public class RenderQuartzGlass extends BaseBlockRender
 	{
 		renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
 
-		renderer.overrideBlockTexture = imb.getIcon( 0, 0 );
+		int cx = Math.abs( x % 10 );
+		int cy = Math.abs( y % 10 );
+		int cz = Math.abs( z % 10 );
+
+		int u = offsets[cx][cy][cz] % 4;
+		int v = offsets[9 - cx][9 - cy][9 - cz] % 4;
+
+		switch (Math.abs( (offsets[cx][cy][cz] + (x + y + z)) % 4 ))
+		{
+		case 0:
+			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 );
+			break;
+		case 2:
+			renderer.overrideBlockTexture = new OffsetIcon( ExtraTextures.BlockQuartzGlassC.getIcon(), u, v );
+			break;
+		case 3:
+			renderer.overrideBlockTexture = new OffsetIcon( ExtraTextures.BlockQuartzGlassD.getIcon(), u, v );
+			break;
+		}
+
 		boolean result = renderer.renderStandardBlock( imb, x, y, z );
 
 		renderer.overrideBlockTexture = null;

client/render/effects/EnergyFx.java

@@ -0,0 +1,88 @@
+package appeng.client.render.effects;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.particle.EntityBreakingFX;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.item.Item;
+import net.minecraft.util.Icon;
+import net.minecraft.world.World;
+import net.minecraftforge.common.ForgeDirection;
+
+import org.lwjgl.opengl.GL11;
+
+import appeng.client.texture.ExtraTextures;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class EnergyFx extends EntityBreakingFX
+{
+
+	private Icon particleTextureIndex;
+
+	public EnergyFx(World par1World, double par2, double par4, double par6, Item par8Item) {
+		super( par1World, par2, par4, par6, par8Item );
+		particleGravity = 0;
+		this.particleBlue = 255;
+		this.particleGreen = 255;
+		this.particleRed = 255;
+		this.particleAlpha = 1.4f;
+		this.particleScale = 3.5f;
+		this.particleTextureIndex = ExtraTextures.BlockEnergyParticle.getIcon();
+	}
+
+	public void fromItem(ForgeDirection d)
+	{
+		this.posX += 0.2 * d.offsetX;
+		this.posY += 0.2 * d.offsetY;
+		this.posZ += 0.2 * d.offsetZ;
+		this.particleScale *= 0.8f;
+	}
+
+	public void onUpdate()
+	{
+		super.onUpdate();
+		this.particleScale *= 0.89f;
+		this.particleAlpha *= 0.89f;
+	}
+
+	public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
+	{
+
+		Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.locationBlocksTexture );
+
+		GL11.glPushMatrix();
+		GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
+		GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
+
+		GL11.glDepthMask( false );
+		GL11.glEnable( GL11.GL_BLEND );
+		GL11.glBlendFunc( GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA );
+		GL11.glAlphaFunc( GL11.GL_GREATER, 0.003921569F );
+
+		float f6 = this.particleTextureIndex.getMinU();
+		float f7 = this.particleTextureIndex.getMaxU();
+		float f8 = this.particleTextureIndex.getMinV();
+		float f9 = this.particleTextureIndex.getMaxV();
+		float f10 = 0.1F * this.particleScale;
+
+		float f11 = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) par2 - interpPosX);
+		float f12 = (float) (this.prevPosY + (this.posY - this.prevPosY) * (double) par2 - interpPosY);
+		float f13 = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) par2 - interpPosZ);
+		float f14 = 1.0F;
+
+		par1Tessellator.setColorRGBA_F( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha );
+		par1Tessellator.addVertexWithUV( (double) (f11 - par3 * f10 - par6 * f10), (double) (f12 - par4 * f10), (double) (f13 - par5 * f10 - par7 * f10),
+				(double) f7, (double) f9 );
+		par1Tessellator.addVertexWithUV( (double) (f11 - par3 * f10 + par6 * f10), (double) (f12 + par4 * f10), (double) (f13 - par5 * f10 + par7 * f10),
+				(double) f7, (double) f8 );
+		par1Tessellator.addVertexWithUV( (double) (f11 + par3 * f10 + par6 * f10), (double) (f12 + par4 * f10), (double) (f13 + par5 * f10 + par7 * f10),
+				(double) f6, (double) f8 );
+		par1Tessellator.addVertexWithUV( (double) (f11 + par3 * f10 - par6 * f10), (double) (f12 - par4 * f10), (double) (f13 + par5 * f10 - par7 * f10),
+				(double) f6, (double) f9 );
+		GL11.glPopAttrib();
+		GL11.glPopMatrix();
+	}
+
+}

client/texture/CableBusTextures.java

@@ -50,6 +50,11 @@ public enum CableBusTextures
 			"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"),
+
 	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(

client/texture/ExtraTextures.java

@@ -32,6 +32,8 @@ public enum ExtraTextures
 
 	GlassFrame("BlockQuartzGlassFrame"),
 
+	BlockQRingCornerLight("BlockQRingCornerLight"), BlockQRingEdgeLight("BlockQRingEdgeLight"),
+
 	MEDenseEnergyCell0("BlockDenseEnergyCell0"), MEDenseEnergyCell1("BlockDenseEnergyCell1"), MEDenseEnergyCell2("BlockDenseEnergyCell2"), MEDenseEnergyCell3(
 			"BlockDenseEnergyCell3"), MEDenseEnergyCell4("BlockDenseEnergyCell4"), MEDenseEnergyCell5("BlockDenseEnergyCell5"), MEDenseEnergyCell6(
 			"BlockDenseEnergyCell6"), MEDenseEnergyCell7("BlockDenseEnergyCell7"),
@@ -44,6 +46,8 @@ public enum ExtraTextures
 	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");
 
 	final private String name;