Add support for EnvMapApperance v2 packets, other various cleanup.

ClassicalSharp/2D/Screens/BlockSelectScreen.cs

@@ -7,7 +7,7 @@ namespace ClassicalSharp {
 	
 	public class BlockSelectScreen : Screen {
 		
-		public BlockSelectScreen( Game window ) : base( window ) {
+		public BlockSelectScreen( Game game ) : base( game ) {
 			font = new Font( "Arial", 13 );
 		}
 		

ClassicalSharp/2D/Screens/ChatScreen.cs

@@ -7,7 +7,7 @@ namespace ClassicalSharp {
 	
 	public class ChatScreen : Screen {
 		
-		public ChatScreen( Game window ) : base( window ) {
+		public ChatScreen( Game game ) : base( game ) {
 		}
 		
 		public int ChatInputYOffset, ChatLogYOffset;

ClassicalSharp/2D/Screens/ErrorScreen.cs

@@ -9,7 +9,7 @@ namespace ClassicalSharp {
 		readonly Font titleFont, messageFont;
 		TextWidget titleWidget, messageWidget;
 		
-		public ErrorScreen( Game window, string title, string message ) : base( window ) {
+		public ErrorScreen( Game game, string title, string message ) : base( game ) {
 			this.title = title;
 			this.message = message;
 			titleFont = new Font( "Arial", 16, FontStyle.Bold );

ClassicalSharp/2D/Screens/FpsScreen.cs

@@ -7,7 +7,7 @@ namespace ClassicalSharp {
 		
 		readonly Font font;
 		StringBuffer text;
-		public FpsScreen( Game window ) : base( window ) {
+		public FpsScreen( Game game ) : base( game ) {
 			font = new Font( "Arial", 13 );
 			text = new StringBuffer( 96 );
 		}

ClassicalSharp/2D/Screens/LoadingMapScreen.cs

@@ -6,7 +6,7 @@ namespace ClassicalSharp {
 	public class LoadingMapScreen : Screen {
 		
 		readonly Font font;
-		public LoadingMapScreen( Game window, string name, string motd ) : base( window ) {
+		public LoadingMapScreen( Game game, string name, string motd ) : base( game ) {
 			serverName = name;
 			serverMotd = motd;
 			font = new Font( "Arial", 14 );

ClassicalSharp/2D/Screens/NormalScreen.cs

@@ -6,7 +6,7 @@ namespace ClassicalSharp {
 	
 	public class NormalScreen : Screen {
 		
-		public NormalScreen( Game window ) : base( window ) {
+		public NormalScreen( Game game ) : base( game ) {
 		}
 		
 		ChatScreen chat;

ClassicalSharp/2D/Screens/PauseScreen.cs

@@ -6,7 +6,7 @@ namespace ClassicalSharp {
 	
 	public class PauseScreen : Screen {
 		
-		public PauseScreen( Game window ) : base( window ) {
+		public PauseScreen( Game game ) : base( game ) {
 		}
 		
 		TextWidget controlsWidget, gameWidget, exitWidget, keyStatusWidget;

ClassicalSharp/2D/Widgets/BlockHotbarWidget.cs

@@ -6,10 +6,10 @@ namespace ClassicalSharp {
 	
 	public sealed class BlockHotbarWidget : Widget {
 		
-		public BlockHotbarWidget( Game window ) : base( window ) {
+		public BlockHotbarWidget( Game game ) : base( game ) {
 			HorizontalDocking = Docking.Centre;
 			VerticalDocking = Docking.BottomOrRight;
-			window.HeldBlockChanged += HeldBlockChanged;
+			game.HeldBlockChanged += HeldBlockChanged;
 		}
 		
 		Texture[] barTextures = new Texture[9];

ClassicalSharp/2D/Widgets/ExtPlayerListWidget.cs

@@ -6,7 +6,7 @@ namespace ClassicalSharp {
 	
 	public class ExtPlayerListWidget : PlayerListWidget {
 		
-		public ExtPlayerListWidget( Game window, Font font ) : base( window, font ) {
+		public ExtPlayerListWidget( Game game, Font font ) : base( game, font ) {
 		}
 		
 		PlayerInfo[] info = new PlayerInfo[256];

ClassicalSharp/2D/Widgets/NormalPlayerListWidget.cs

@@ -6,7 +6,7 @@ namespace ClassicalSharp {
 	
 	public sealed class NormalPlayerListWidget : PlayerListWidget {
 		
-		public NormalPlayerListWidget( Game window, Font font ) : base( window, font ) {
+		public NormalPlayerListWidget( Game game, Font font ) : base( game, font ) {
 		}
 		
 		PlayerInfo[] info = new PlayerInfo[256];		

ClassicalSharp/2D/Widgets/PlayerListWidget.cs

@@ -7,7 +7,7 @@ namespace ClassicalSharp {
 	public abstract class PlayerListWidget : Widget {
 		
 		protected readonly Font font;
-		public PlayerListWidget( Game window, Font font ) : base( window ) {
+		public PlayerListWidget( Game game, Font font ) : base( game ) {
 			HorizontalDocking = Docking.Centre;
 			VerticalDocking = Docking.Centre;
 			this.font = font;

ClassicalSharp/2D/Widgets/TextGroupWidget.cs

@@ -6,7 +6,7 @@ namespace ClassicalSharp {
 	
 	public sealed class TextGroupWidget : Widget {
 		
-		public TextGroupWidget( Game window, int elementsCount, Font font ) : base( window ) {
+		public TextGroupWidget( Game game, int elementsCount, Font font ) : base( game ) {
 			ElementsCount = elementsCount;
 			this.font = font;
 		}

ClassicalSharp/2D/Widgets/TextInputWidget.cs

@@ -7,7 +7,7 @@ namespace ClassicalSharp {
 	
 	public sealed class TextInputWidget : Widget {
 		
-		public TextInputWidget( Game window, Font font, Font boldFont ) : base( window ) {
+		public TextInputWidget( Game game, Font font, Font boldFont ) : base( game ) {
 			HorizontalDocking = Docking.LeftOrTop;
 			VerticalDocking = Docking.BottomOrRight;
 			handlers[0] = new InputHandler( BackspaceKey, Key.BackSpace, 10 );
@@ -131,10 +131,10 @@ namespace ClassicalSharp {
 				return true;
 			}
 			
-			public void KeyTick( Game window ) {
+			public void KeyTick( Game game ) {
 				if( LastDown == DateTime.MinValue ) return;
-				if( window.IsKeyDown( AssociatedKey ) &&
+				if( game.IsKeyDown( AssociatedKey ) &&
-				   ( DateTime.UtcNow - LastDown ).TotalSeconds >= period ) {
+				   (DateTime.UtcNow - LastDown).TotalSeconds >= period ) {
 					KeyFunction();
 				}
 			}

ClassicalSharp/2D/Widgets/TextWidget.cs

@@ -6,7 +6,7 @@ namespace ClassicalSharp {
 	
 	public sealed class TextWidget : Widget {
 		
-		public TextWidget( Game window, Font font ) : base( window ) {
+		public TextWidget( Game game, Font font ) : base( game ) {
 			this.font = font;
 		}
 		

ClassicalSharp/Blocks/BlockInfo.Culling.cs

@@ -21,7 +21,7 @@ namespace ClassicalSharp {
 					}
 				}
 			}
-			
+			// Leaves should show faces with their neighbours (matches Classic)
 			for( int i = 0; i < TileSide.Sides; i++ ) {
 				SetHidden( (byte)Block.Leaves, (byte)Block.Leaves, i, false );
 			}

ClassicalSharp/Entities/NetPlayer.cs

@@ -7,7 +7,7 @@ namespace ClassicalSharp {
 	public class NetPlayer : Player {
 		
 		int tickCount;		
-		public NetPlayer( string displayName, string skinName, Game window ) : base( window ) {
+		public NetPlayer( string displayName, string skinName, Game game ) : base( game ) {
 			DisplayName = displayName;
 			SkinName = Utils.StripColours( skinName );
 			InitRenderingData();

ClassicalSharp/Entities/Particles/Particle.cs

@@ -16,8 +16,8 @@ namespace ClassicalSharp.Particles {
 		
 		public abstract void Dispose();
 		
-		public Particle( Game window, Vector3 pos, Vector3 velocity, double lifetime, TextureRectangle rec ) {
+		public Particle( Game game, Vector3 pos, Vector3 velocity, double lifetime, TextureRectangle rec ) {
-			game = window;
+			this.game = game;
 			Position = lastPos = nextPos = pos;
 			Velocity = velocity;
 			Lifetime = (float)lifetime;

ClassicalSharp/Entities/Player.cs

@@ -88,8 +88,8 @@ namespace ClassicalSharp {
 		protected void CheckSkin() {
 			DownloadedItem item;
 			game.AsyncDownloader.TryGetItem( "skin_" + SkinName, out item );
-			if( item != null && item.Bmp != null ) {
+			if( item != null && item.Data != null ) {
-				Bitmap bmp = item.Bmp;
+				Bitmap bmp = (Bitmap)item.Data;
 				game.Graphics.DeleteTexture( ref PlayerTextureId );
 				
 				try {

ClassicalSharp/Game/Game.cs

@@ -226,25 +226,8 @@ namespace ClassicalSharp {
 				SetNewScreen( new PauseScreen( this ) );
 			}
 			
-			if( imageCheckAccumulator > imageCheckPeriod ) {
-				imageCheckAccumulator -= imageCheckPeriod;
-				AsyncDownloader.PurgeOldEntries( 10 );
-			}
 			base.OnRenderFrame( e );
-			
+			CheckScheduledTasks();
-			int ticksThisFrame = 0;
-			while( ticksAccumulator >= ticksPeriod ) {
-				Network.Tick( ticksPeriod );
-				Players.Tick( ticksPeriod );
-				Camera.Tick( ticksPeriod );
-				ParticleManager.Tick( ticksPeriod );
-				Animations.Tick( ticksPeriod );
-				ticksThisFrame++;
-				ticksAccumulator -= ticksPeriod;
-			}
-			if( ticksThisFrame > ticksFrequency / 3 ) {
-				Utils.LogWarning( "Falling behind (did {0} ticks this frame)", ticksThisFrame );
-			}
 			float t = (float)( ticksAccumulator / ticksPeriod );
 			LocalPlayer.SetInterpPosition( t );
 			
@@ -281,7 +264,34 @@ namespace ClassicalSharp {
 			}
 			Graphics.Mode3D();
 			
-			if( screenshotRequested ) {
+			if( screenshotRequested )
+				TakeScreenshot();
+			Graphics.EndFrame( this );
+		}
+		
+		void CheckScheduledTasks() {
+			if( imageCheckAccumulator > imageCheckPeriod ) {
+				imageCheckAccumulator -= imageCheckPeriod;
+				AsyncDownloader.PurgeOldEntries( 10 );
+			}
+			
+			int ticksThisFrame = 0;
+			while( ticksAccumulator >= ticksPeriod ) {
+				Network.Tick( ticksPeriod );
+				Players.Tick( ticksPeriod );
+				Camera.Tick( ticksPeriod );
+				ParticleManager.Tick( ticksPeriod );
+				Animations.Tick( ticksPeriod );
+				ticksThisFrame++;
+				ticksAccumulator -= ticksPeriod;
+			}
+			
+			if( ticksThisFrame > ticksFrequency / 3 ) {
+				Utils.LogWarning( "Falling behind (did {0} ticks this frame)", ticksThisFrame );
+			}
+		}
+		
+		void TakeScreenshot() {
 			if( !Directory.Exists( "screenshots" ) ) {
 				Directory.CreateDirectory( "screenshots" );
 			}
@@ -290,39 +300,6 @@ namespace ClassicalSharp {
 			Graphics.TakeScreenshot( path, ClientSize );
 			screenshotRequested = false;
 		}
-			Graphics.EndFrame( this );
-		}
-		
-		public override void Dispose() {
-			MapRenderer.Dispose();
-			MapEnvRenderer.Dispose();
-			EnvRenderer.Dispose();
-			WeatherRenderer.Dispose();
-			SetNewScreen( null );
-			fpsScreen.Dispose();
-			SelectionManager.Dispose();
-			TerrainAtlas.Dispose();
-			TerrainAtlas1D.Dispose();
-			ModelCache.Dispose();
-			Picking.Dispose();
-			ParticleManager.Dispose();
-			Players.Dispose();
-			AsyncDownloader.Dispose();
-			if( writer != null ) {
-				writer.Close();
-			}
-			if( activeScreen != null ) {
-				activeScreen.Dispose();
-			}
-			Graphics.DeleteIb( defaultIb );
-			Graphics.Dispose();
-			Utils2D.Dispose();
-			Animations.Dispose();
-			Graphics.DeleteTexture( ref CloudsTextureId );
-			Graphics.DeleteTexture( ref RainTextureId );
-			Graphics.DeleteTexture( ref SnowTextureId );
-			base.Dispose();
-		}
 		
 		public void UpdateProjection() {
 			Matrix4 projection = Camera.GetProjection();
@@ -387,6 +364,37 @@ namespace ClassicalSharp {
 			int newHeight = Map.GetLightHeight( x, z );
 			MapRenderer.RedrawBlock( x, y, z, block, oldHeight, newHeight );
 		}
+		
+		public override void Dispose() {
+			MapRenderer.Dispose();
+			MapEnvRenderer.Dispose();
+			EnvRenderer.Dispose();
+			WeatherRenderer.Dispose();
+			SetNewScreen( null );
+			fpsScreen.Dispose();
+			SelectionManager.Dispose();
+			TerrainAtlas.Dispose();
+			TerrainAtlas1D.Dispose();
+			ModelCache.Dispose();
+			Picking.Dispose();
+			ParticleManager.Dispose();
+			Players.Dispose();
+			AsyncDownloader.Dispose();
+			if( writer != null ) {
+				writer.Close();
+			}
+			if( activeScreen != null ) {
+				activeScreen.Dispose();
+			}
+			Graphics.DeleteIb( defaultIb );
+			Graphics.Dispose();
+			Utils2D.Dispose();
+			Animations.Dispose();
+			Graphics.DeleteTexture( ref CloudsTextureId );
+			Graphics.DeleteTexture( ref RainTextureId );
+			Graphics.DeleteTexture( ref SnowTextureId );
+			base.Dispose();
+		}
 	}
 	
 	public sealed class CpeListInfo {

ClassicalSharp/Network/NetworkProcessor.cs

@@ -31,6 +31,7 @@ namespace ClassicalSharp {
 		bool sendHeldBlock;
 		bool useMessageTypes;
 		bool useBlockPermissions;
+		bool usingTexturePack;
 		bool receivedFirstPosition;
 		
 		public override void Connect( IPAddress address, int port ) {
@@ -83,8 +84,13 @@ namespace ClassicalSharp {
 		void CheckForNewTerrainAtlas() {
 			DownloadedItem item;
 			game.AsyncDownloader.TryGetItem( "terrain", out item );
-			if( item != null && item.Bmp != null ) {
+			if( item != null && item.Data != null ) {
-				game.ChangeTerrainAtlas( item.Bmp );
+				game.ChangeTerrainAtlas( (Bitmap)item.Data );
+			}
+			game.AsyncDownloader.TryGetItem( "texturePack", out item );
+			if( item != null && item.Data != null ) {
+				TexturePackExtractor extractor = new TexturePackExtractor();
+				extractor.Extract( (byte[])item.Data, game );
 			}
 		}
 		
@@ -425,27 +431,31 @@ namespace ClassicalSharp {
 					
 				case PacketId.CpeExtEntry:
 					{
-						string extensionName = reader.ReadAsciiString();
+						string extName = reader.ReadAsciiString();
-						int extensionVersion = reader.ReadInt32();
+						int extVersion = reader.ReadInt32();
-						Utils.LogDebug( "cpe ext: " + extensionName + "," + extensionVersion );
+						Utils.LogDebug( "cpe ext: " + extName + " , " + extVersion );
-						if( extensionName == "HeldBlock" ) {
+						if( extName == "HeldBlock" ) {
 							sendHeldBlock = true;
-						} else if( extensionName == "MessageTypes" ) {
+						} else if( extName == "MessageTypes" ) {
 							useMessageTypes = true;
-						} else if( extensionName == "ExtPlayerList" ) {
+						} else if( extName == "ExtPlayerList" ) {
 							UsingExtPlayerList = true;
-						} else if( extensionName == "BlockPermissions" ) {
+						} else if( extName == "BlockPermissions" ) {
 							useBlockPermissions = true;
-						} else if( extensionName == "PlayerClick" ) {
+						} else if( extName == "PlayerClick" ) {
 							UsingPlayerClick = true;
+						} else if( extName == "EnvMapAppearance" && extVersion == 2 ) {
+							usingTexturePack = true;
 						}
 						cpeServerExtensionsCount--;
+						
 						if( cpeServerExtensionsCount == 0 ) {
 							MakeExtInfo( Utils.AppName, clientExtensions.Length );
 							SendPacket();
 							for( int i = 0; i < clientExtensions.Length; i++ ) {
-								string extName = clientExtensions[i];
+								string name = clientExtensions[i];
-								MakeExtEntry( extName, extName == "ExtPlayerList" ? 2 : 1 );
+								int version = (name == "ExtPlayerList" || name == "EnvMapApperance") ? 2 : 1;
+								MakeExtEntry( name, version );
 								SendPacket();
 							}
 						}
@@ -611,7 +621,11 @@ namespace ClassicalSharp {
 							extractor.Extract( game.defaultTexPack, game );
 						} else {
 							game.Animations.Dispose();
+							if( usingTexturePack )
+								game.AsyncDownloader.DownloadData( url, true, "texturePack" );
+							else
 								game.AsyncDownloader.DownloadImage( url, true, "terrain" );
+							
 						}
 						Utils.LogDebug( "Image url: " + url );
 					} break;

ClassicalSharp/Network/Utils/AsyncDownloader.cs

@@ -33,20 +33,24 @@ namespace ClassicalSharp.Network {
 			string strippedSkinName = Utils.StripColours( skinName );
 			string url = Utils.IsUrl( skinName ) ? skinName :
 				skinServer + strippedSkinName + ".png";
-			AddRequestToQueue( url, true, "skin_" + strippedSkinName, true );
+			AddRequest( url, true, "skin_" + strippedSkinName, 0 );
 		}
 		
 		public void DownloadImage( string url, bool priority, string identifier ) {
-			AddRequestToQueue( url, priority, identifier, true );
+			AddRequest( url, priority, identifier, 0 );
 		}
 		
 		public void DownloadPage( string url, bool priority, string identifier ) {
-			AddRequestToQueue( url, priority, identifier, false );
+			AddRequest( url, priority, identifier, 1 );
 		}
 		
-		void AddRequestToQueue( string url, bool priority, string identifier, bool image ) {
+		public void DownloadData( string url, bool priority, string identifier ) {
+			AddRequest( url, priority, identifier, 2 );
+		}
+		
+		void AddRequest( string url, bool priority, string identifier, byte type ) {
 			lock( requestLocker )  {
-				DownloadRequest request = new DownloadRequest( url, identifier, image );
+				DownloadRequest request = new DownloadRequest( url, identifier, type );
 				if( priority ) {
 					requests.Insert( 0, request );
 				} else {
@@ -74,7 +78,7 @@ namespace ClassicalSharp.Network {
 				
 				foreach( var item in downloaded ) {
 					DateTime timestamp = item.Value.TimeDownloaded;
-					if( ( now - timestamp ).TotalSeconds > seconds ) {
+					if( (now - timestamp).TotalSeconds > seconds ) {
 						itemsToRemove.Add( item.Key );
 					}
 				}
@@ -84,9 +88,9 @@ namespace ClassicalSharp.Network {
 					DownloadedItem item;
 					downloaded.TryGetValue( key, out item );
 					downloaded.Remove( key );
-					if( item.Bmp != null ) {
+					Bitmap bmp = item.Data as Bitmap;
-						item.Bmp.Dispose();
+					if( bmp != null )
-					}
+						bmp.Dispose();
 				}
 			}
 		}
@@ -124,29 +128,30 @@ namespace ClassicalSharp.Network {
 		
 		void DownloadItem( DownloadRequest request ) {
 			string url = request.Url;
-			bool isImage = request.IsImage;
+			byte type = request.Type;
-			Utils.LogDebug( "Downloading " + ( isImage ? "image" : "page" ) + " from: " + url );
+			string dataType = type == 0 ? "image" : (type == 1 ? "string" : "raw");
-			Bitmap bmp = null;
+			Utils.LogDebug( "Downloading " + dataType + " from: " + url );
-			string page = null;
+			object value = null;
 			
 			try {
-				if( isImage ) {
+				if( type == 0 ) {
 					byte[] data = client.DownloadData( url );
-					using( MemoryStream stream = new MemoryStream( data ) ) {
+					using( MemoryStream stream = new MemoryStream( data ) )
-						bmp = new Bitmap( stream );
+						value = new Bitmap( stream );
+				} else if( type == 1 ) {
+					value = client.DownloadString( url );
+				} else if( type == 2 ) {
+					value = client.DownloadData( url );
 				}
-				} else {
+				Utils.LogDebug( "Downloaded from: " + url );
-					page = client.DownloadString( url );
-				}
-				Utils.LogDebug( "Downloaded from: " + request.Url );
 			} catch( Exception ex ) {
 				if( !( ex is WebException || ex is ArgumentException ) ) throw;
-				Utils.LogDebug( "Failed to download from: " + request.Url );
+				Utils.LogDebug( "Failed to download from: " + url );
 			}
 
 			lock( downloadedLocker ) {
 				DownloadedItem oldItem;
-				DownloadedItem newItem = new DownloadedItem( bmp, page, request.TimeAdded, request.Url );
+				DownloadedItem newItem = new DownloadedItem( value, request.TimeAdded, url );
 				
 				if( downloaded.TryGetValue( request.Identifier, out oldItem ) ) {
 					if( oldItem.TimeAdded > newItem.TimeAdded ) {
@@ -155,8 +160,9 @@ namespace ClassicalSharp.Network {
 						newItem = old;
 					}
 
-					if( oldItem.Bmp != null )
+					Bitmap oldBmp = oldItem.Data as Bitmap;
-						oldItem.Bmp.Dispose();
+					if( oldBmp != null )
+						oldBmp.Dispose();
 				}
 				downloaded[request.Identifier] = newItem;
 			}
@@ -166,13 +172,13 @@ namespace ClassicalSharp.Network {
 			
 			public string Url;
 			public string Identifier;
-			public bool IsImage;
+			public byte Type; // 0 = bitmap, 1 = string, 2 = byte[]
 			public DateTime TimeAdded;
 			
-			public DownloadRequest( string url, string identifier, bool isImage ) {
+			public DownloadRequest( string url, string identifier, byte type ) {
 				Url = url;
 				Identifier = identifier;
-				IsImage = isImage;
+				Type = type;
 				TimeAdded = DateTime.UtcNow;
 			}
 		}
@@ -180,14 +186,12 @@ namespace ClassicalSharp.Network {
 	
 	public class DownloadedItem {
 		
-		public Bitmap Bmp;
+		public object Data;
-		public string Page;
 		public DateTime TimeAdded, TimeDownloaded;
 		public string Url;
 		
-		public DownloadedItem( Bitmap bmp, string page, DateTime timeAdded, string url ) {
+		public DownloadedItem( object data, DateTime timeAdded, string url ) {
-			Bmp = bmp;
+			Data = data;
-			Page = page;
 			TimeAdded = timeAdded;
 			TimeDownloaded = DateTime.UtcNow;
 			Url = url;

ClassicalSharp/Network/WomConfigHandler.cs

@@ -1,5 +1,6 @@
 // This class was partially based on information from http://files.worldofminecraft.com/texturing/
 using System;
+using System.Drawing;
 using System.IO;
 using ClassicalSharp.Network;
 
@@ -13,13 +14,13 @@ namespace ClassicalSharp {
 		void CheckForWomEnvironment() {
 			DownloadedItem item;
 			game.AsyncDownloader.TryGetItem( womEnvIdentifier, out item );
-			if( item != null && item.Page != null ) {
+			if( item != null && item.Data != null ) {
-				ParseWomConfig( item.Page );
+				ParseWomConfig( (string)item.Data );
 			}
 			
 			game.AsyncDownloader.TryGetItem( womTerrainIdentifier, out item );
-			if( item != null && item.Bmp != null ) {
+			if( item != null && item.Data != null ) {
-				game.ChangeTerrainAtlas( item.Bmp );
+				game.ChangeTerrainAtlas( (Bitmap)item.Data );
 			}
 		}
 		

ClassicalSharp/TexturePack/TexturePackExtractor.cs

@@ -10,14 +10,22 @@ namespace ClassicalSharp.TexturePack {
 		
 		Game game;
 		public void Extract( string path, Game game ) {
+			using( Stream fs = new FileStream( path, FileMode.Open, FileAccess.Read, FileShare.Read ) )
+				Extract( fs, game );
+		}
+		
+		public void Extract( byte[] data, Game game ) {
+			using( Stream fs = new MemoryStream( data ) )
+				Extract( fs, game );
+		}
+		
+		void Extract( Stream stream, Game game ) {
 			this.game = game;
 			game.Animations.Dispose();
-			using( FileStream fs = new FileStream( path, FileMode.Open, FileAccess.Read, FileShare.Read ) ) {
 			ZipReader reader = new ZipReader();
 			reader.ShouldProcessZipEntry = ShouldProcessZipEntry;
 			reader.ProcessZipEntry = ProcessZipEntry;
-				reader.Extract( fs );
+			reader.Extract( stream );
-			}
 		}
 		
 		bool ShouldProcessZipEntry( string filename ) {