Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

client/gui/implementations/GuiMEMonitorable.java

@@ -265,6 +265,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 			searchField.setText( "" );
 			repo.searchString = "";
 			repo.updateView();
+			setScrollBar();
 		}
 
 		super.mouseClicked( xCoord, yCoord, btn );

client/render/effects/EnergyFx.java

@@ -1,17 +1,12 @@
 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.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-
-import org.lwjgl.opengl.GL11;
-
 import appeng.client.texture.ExtraTextures;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -26,6 +21,11 @@ public class EnergyFx extends EntityBreakingFX
 	private int startBlkY;
 	private int startBlkZ;
 
+	public int getFXLayer()
+	{
+		return 1;
+	}
+
 	public EnergyFx(World par1World, double par2, double par4, double par6, Item par8Item) {
 		super( par1World, par2, par4, par6, par8Item );
 		particleGravity = 0;
@@ -58,16 +58,14 @@ public class EnergyFx extends EntityBreakingFX
 
 	public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
 	{
-		Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.locationBlocksTexture );
+		/*
-
+		 * Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.locationBlocksTexture );
-		GL11.glPushMatrix();
+		 * 
-		GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
+		 * GL11.glPushMatrix(); GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
-		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.glDepthMask( false );
+		 * GL11.GL_ONE_MINUS_SRC_ALPHA ); GL11.glAlphaFunc( GL11.GL_GREATER, 0.003921569F );
-		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();
@@ -97,8 +95,8 @@ public class EnergyFx extends EntityBreakingFX
 					(double) f6, (double) f9 );
 		}
 
-		GL11.glPopAttrib();
+		// GL11.glPopAttrib();
-		GL11.glPopMatrix();
+		// GL11.glPopMatrix();
 	}
 
 }

parts/reporting/PartMonitor.java

@@ -151,6 +151,8 @@ public class PartMonitor extends AEBasePart implements IPartMonitor, IPowerChann
 	@SideOnly(Side.CLIENT)
 	public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer)
 	{
+		renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache );
+
 		rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(),
 				is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
 

parts/reporting/PartStorageMonitor.java

@@ -6,6 +6,7 @@ import java.io.IOException;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
@@ -112,6 +113,8 @@ public class PartStorageMonitor extends PartMonitor implements IPartStorageMonit
 		else
 			configuredItem = null;
 
+		updateList = true;
+
 		return stuff;
 	}
 
@@ -150,11 +153,11 @@ public class PartStorageMonitor extends PartMonitor implements IPartStorageMonit
 	}
 
 	protected PartStorageMonitor(Class myClass, ItemStack is) {
-		super( myClass, is,true );
+		super( myClass, is, true );
 	}
 
 	public PartStorageMonitor(ItemStack is) {
-		super( PartStorageMonitor.class, is,true );
+		super( PartStorageMonitor.class, is, true );
 		frontBright = CableBusTextures.PartStorageMonitor_Bright;
 		frontColored = CableBusTextures.PartStorageMonitor_Colored;
 		frontDark = CableBusTextures.PartStorageMonitor_Dark;
@@ -167,10 +170,28 @@ public class PartStorageMonitor extends PartMonitor implements IPartStorageMonit
 		return true;
 	}
 
+	@SideOnly(Side.CLIENT)
+	private boolean updateList;
+
+	@SideOnly(Side.CLIENT)
+	private Integer dspList;
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	protected void finalize() throws Throwable
+	{
+		super.finalize();
+		if ( dspList != null )
+			GLAllocation.deleteDisplayLists( dspList );
+	}
+
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void renderDynamic(double x, double y, double z, IPartRenderHelper rh, RenderBlocks renderer)
 	{
+		if ( dspList == null )
+			dspList = GLAllocation.generateDisplayLists( 1 );
+
 		Tessellator tess = Tessellator.instance;
 		if ( Platform.isDrawing( tess ) )
 			return;
@@ -182,9 +203,26 @@ public class PartStorageMonitor extends PartMonitor implements IPartStorageMonit
 		if ( ais != null )
 		{
 			GL11.glPushMatrix();
+			GL11.glTranslated( x + 0.5, y + 0.5, z + 0.5 );
+
+			if ( updateList )
+			{
+				updateList = false;
+				GL11.glNewList( dspList, GL11.GL_COMPILE_AND_EXECUTE );
+				tesrRenderScreen( tess, ais );
+				GL11.glEndList();
+			}
+			else
+				GL11.glCallList( dspList );
+
+			GL11.glPopMatrix();
+		}
+	}
+
+	private void tesrRenderScreen(Tessellator tess, IAEItemStack ais)
+	{
 		GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
 		ForgeDirection d = side;
-			GL11.glTranslated( x + 0.5, y + 0.5, z + 0.5 );
 		GL11.glTranslated( d.offsetX * 0.76, d.offsetY * 0.76, d.offsetZ * 0.76 );
 
 		if ( d == ForgeDirection.UP )
@@ -273,8 +311,6 @@ public class PartStorageMonitor extends PartMonitor implements IPartStorageMonit
 		fr.drawString( msg, 0, 0, 0 );
 
 		GL11.glPopAttrib();
-			GL11.glPopMatrix();
-		}
 	}
 
 	@Override