Merge pull request #1813 from yueh/fix-1481

Fixes #1481: Not using the right itemcount in a few cases

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

@@ -159,6 +159,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
 		GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
 		GL11.glDisable( GL11.GL_LIGHTING );
 		GL11.glDisable( GL12.GL_RESCALE_NORMAL );
+		GL11.glCullFace( GL11.GL_FRONT );
 
 		Minecraft mc = Minecraft.getMinecraft();
 		mc.renderEngine.bindTexture( TextureMap.locationBlocksTexture );
@@ -224,6 +225,9 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
 
 		tess.draw();
 
+		GL11.glCullFace( GL11.GL_BACK );
+		GL11.glEnable( GL11.GL_LIGHTING );
+		GL11.glEnable( GL12.GL_RESCALE_NORMAL );
 		GL11.glPopMatrix();
 
 		int items = 0;

src/main/java/appeng/me/storage/CellInventory.java

@@ -395,6 +395,7 @@ public class CellInventory implements ICellInventory
 		 * if ( tagType instanceof NBTTagShort ) ((NBTTagShort) tagType).data = storedItems = (short) cellItems.size();
 		 * else
 		 */
+		this.storedItems = (short) this.cellItems.size();
 		if( this.cellItems.isEmpty() )
 		{
 			this.tagCompound.removeTag( ITEM_TYPE_TAG );
@@ -403,11 +404,11 @@ public class CellInventory implements ICellInventory
 		{
 			this.tagCompound.setShort( ITEM_TYPE_TAG, this.storedItems );
 		}
-		this.storedItems = (short) this.cellItems.size();
 
 		/*
 		 * if ( tagCount instanceof NBTTagInt ) ((NBTTagInt) tagCount).data = storedItemCount = itemCount; else
 		 */
+		this.storedItemCount = itemCount;
 		if( itemCount == 0 )
 		{
 			this.tagCompound.removeTag( ITEM_COUNT_TAG );
@@ -416,7 +417,6 @@ public class CellInventory implements ICellInventory
 		{
 			this.tagCompound.setInteger( ITEM_COUNT_TAG, itemCount );
 		}
-		this.storedItemCount = itemCount;
 
 		// clean any old crusty stuff...
 		for( ; x < oldStoredItems && x < this.maxItemTypes; x++ )