From f2d60c70e382039daef6a0034aacb6822496fc06 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Fri, 23 Oct 2015 18:33:51 +1100
Subject: [PATCH] Remove TexturePack command as it was replaced by gui long
 ago.

---
 ClassicalSharp/Commands/CommandManager.cs  |  1 -
 ClassicalSharp/Commands/DefaultCommands.cs | 40 +++++-----------------
 readme.md                                  |  5 ++-
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/ClassicalSharp/Commands/CommandManager.cs b/ClassicalSharp/Commands/CommandManager.cs
index f084d62bf..e410ee36e 100644
--- a/ClassicalSharp/Commands/CommandManager.cs
+++ b/ClassicalSharp/Commands/CommandManager.cs
@@ -17,7 +17,6 @@ namespace ClassicalSharp.Commands {
 			RegisterCommand( new HelpCommand() );
 			RegisterCommand( new InfoCommand() );
 			RegisterCommand( new RenderTypeCommand() );
-			RegisterCommand( new TexturePackCommand() );
 		}
 		
 		public void RegisterCommand( Command command ) {
diff --git a/ClassicalSharp/Commands/DefaultCommands.cs b/ClassicalSharp/Commands/DefaultCommands.cs
index 1ee855296..376540962 100644
--- a/ClassicalSharp/Commands/DefaultCommands.cs
+++ b/ClassicalSharp/Commands/DefaultCommands.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text;
-using ClassicalSharp.TexturePack;
 using ClassicalSharp.Renderers;
 
 namespace ClassicalSharp.Commands {
@@ -111,6 +109,7 @@ namespace ClassicalSharp.Commands {
 				"&bnormal: &eDefault renderer, with all environmental effects enabled.",
 				"&blegacy: &eMay be slightly slower than normal, but produces the same environmental effects.",
 				"&blegacyfast: &eSacrifices clouds, fog and overhead sky for faster performance.",
+				"&bnormalfast: &eSacrifices clouds, fog and overhead sky for faster performance.",
 			};
 		}
 		
@@ -119,18 +118,21 @@ namespace ClassicalSharp.Commands {
 			if( property == null ) {
 				game.Chat.Add( "&e/client rendertype: &cYou didn't specify a new render type." );
 			} else if( Utils.CaselessEquals( property, "legacyfast" ) ) {
-				SetNewRenderType( true, true, true );
+				SetNewRenderType( true, true );
 				game.Chat.Add( "&e/client rendertype: &fRender type is now fast legacy." );
 			} else if( Utils.CaselessEquals( property, "legacy" ) ) {
-				SetNewRenderType( true, false, true );
+				SetNewRenderType( true, false );
 				game.Chat.Add( "&e/client rendertype: &fRender type is now legacy." );
 			} else if( Utils.CaselessEquals( property, "normal" ) ) {
-				SetNewRenderType( false, false, false );
+				SetNewRenderType( false, false );
 				game.Chat.Add( "&e/client rendertype: &fRender type is now normal." );
+			} else if( Utils.CaselessEquals( property, "normalfast" ) ) {
+				SetNewRenderType( false, true );
+				game.Chat.Add( "&e/client rendertype: &fRender type is now normalfast." );
 			}
 		}
 		
-		void SetNewRenderType( bool legacy, bool minimal, bool legacyEnv ) {
+		void SetNewRenderType( bool legacy, bool minimal ) {
 			game.MapEnvRenderer.SetUseLegacyMode( legacy );
 			if( minimal ) {
 				game.EnvRenderer.Dispose();
@@ -142,31 +144,7 @@ namespace ClassicalSharp.Commands {
 					game.EnvRenderer = new StandardEnvRenderer( game );
 					game.EnvRenderer.Init();
 				}
-				((StandardEnvRenderer)game.EnvRenderer).SetUseLegacyMode( legacyEnv );
-			}
-		}
-	}
-	
-	/// <summary> Command that changes the client's texture pack. </summary>
-	public sealed class TexturePackCommand : Command {
-		
-		public TexturePackCommand() {
-			Name = "TexturePack";
-			Help = new [] {
-				"&a/client texturepack [path]",
-				"&bpath: &eLoads a texture pack from the specified path.",
-			};
-		}
-		
-		public override void Execute( CommandReader reader ) {
-			string path = reader.NextAll();
-			if( String.IsNullOrEmpty( path ) ) return;
-			
-			try {
-				TexturePackExtractor extractor = new TexturePackExtractor();
-				extractor.Extract( path, game );
-			} catch( FileNotFoundException ) {
-				game.Chat.Add( "&e/client texturepack: Couldn't find file \"" + path + "\"" );
+				((StandardEnvRenderer)game.EnvRenderer).SetUseLegacyMode( legacy );
 			}
 		}
 	}
diff --git a/readme.md b/readme.md
index 80058d5b9..9dd41a348 100644
--- a/readme.md
+++ b/readme.md
@@ -35,13 +35,12 @@ Alternatively, you can use [CSLauncher](https://github.com/umby24/CSLauncher/rel
 this launcher is very similar to ClassiCube's launcher and is simpler to use. (Thanks Umby24 for making this launcher)
 
 ###### *Mono specific*
-*You must use either build using Mono compiler or define `__MonoCS__` when building, otherwise you will get runtime errors when decompressing the map using Mono.*
+*You must use either build using the Mono compiler or define `__MonoCS__` when building, otherwise you will get runtime errors when decompressing the map using Mono.*
 
 *Also when using older mono versions, you may need to run `mozroots --import --sync` to import trusted root certificates, otherwise you will get an 'Error writing headers' exception.*
 
-#### Important notes
+#### Tips
 * Press escape (after joining a world) to switch to the pause menu.
-
 * Pause menu -> Options -> Key mappings lists all of the key combinations used by the client. 
 * Note that toggling 'vsync' to off will minimise CPU usage, while on will maximimise chunk loading speed.
 * Press F to cycle view distance. A smaller number of visible chunks can improve performance.