From 75f0a7384122c65fe338a242ed146071aa64fd33 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Fri, 2 Dec 2016 15:31:34 +1100 Subject: [PATCH] Style: Indent catch and switch properly. --- ClassicalSharp/2D/Screens/ChatScreen.cs | 2 +- ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs | 2 +- ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs | 2 +- ClassicalSharp/2D/Utils/FastColour.cs | 2 +- ClassicalSharp/2D/Widgets/InputWidget.cs | 4 ++-- ClassicalSharp/Audio/AudioPlayer.Sounds.cs | 2 +- ClassicalSharp/Audio/AudioPlayer.cs | 4 ++-- ClassicalSharp/Blocks/BlockInfo.Atlas.cs | 2 +- ClassicalSharp/Game/ChatLog.cs | 2 +- ClassicalSharp/Game/Game.Init.cs | 2 +- ClassicalSharp/Generator/IMapGenerator.cs | 2 +- ClassicalSharp/GraphicsAPI/Direct3D9Api.cs | 2 +- ClassicalSharp/Ionic.Zlib/Inflate.cs | 2 +- ClassicalSharp/Map/Formats/MapDat.Importer.cs | 2 +- ClassicalSharp/Map/Formats/NbtFile.cs | 2 +- ClassicalSharp/MeshBuilder/Builder.cs | 2 +- ClassicalSharp/Network/NetworkProcessor.cs | 6 +++--- ClassicalSharp/Network/Protocols/BlockDefs.cs | 2 +- ClassicalSharp/Network/Protocols/CPE.cs | 2 +- ClassicalSharp/Network/Utils/AsyncDownloader.cs | 4 ++-- ClassicalSharp/Network/Utils/GZipHeaderReader.cs | 2 +- ClassicalSharp/Program.cs | 2 +- ClassicalSharp/TexturePack/EntryList.cs | 4 ++-- ClassicalSharp/TexturePack/TextureCache.cs | 6 +++--- ClassicalSharp/TexturePack/TexturePack.cs | 4 ++-- ClassicalSharp/Utils/ErrorHandler.cs | 4 ++-- ClassicalSharp/Utils/Options.cs | 6 +++--- ClassicalSharp/Utils/Utils.cs | 4 ++-- 28 files changed, 41 insertions(+), 41 deletions(-) diff --git a/ClassicalSharp/2D/Screens/ChatScreen.cs b/ClassicalSharp/2D/Screens/ChatScreen.cs index b296d733b..605875cd1 100644 --- a/ClassicalSharp/2D/Screens/ChatScreen.cs +++ b/ClassicalSharp/2D/Screens/ChatScreen.cs @@ -424,7 +424,7 @@ namespace ClassicalSharp.Gui.Screens { void OpenUrl(WarningScreen screen) { try { Process.Start((string)screen.Metadata); - } catch(Exception ex) { + } catch (Exception ex) { ErrorHandler.LogError("ChatScreen.OpenUrl", ex); } } diff --git a/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs b/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs index 7e4b9a90c..c7a414664 100644 --- a/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs +++ b/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs @@ -76,7 +76,7 @@ namespace ClassicalSharp.Gui.Screens { LocationUpdate update = LocationUpdate.MakePosAndOri(p.Spawn, p.SpawnYaw, p.SpawnPitch, false); p.SetLocation(update, false); } - } catch(Exception ex) { + } catch (Exception ex) { ErrorHandler.LogError("loading map", ex); string file = Path.GetFileName(path); game.Chat.Add("&e/client loadmap: Failed to load map \"" + file + "\""); diff --git a/ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs b/ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs index 09f5cd9b8..3d54b5cde 100644 --- a/ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs +++ b/ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs @@ -140,7 +140,7 @@ namespace ClassicalSharp.Gui.Screens { else exporter = new MapSchematicExporter(); exporter.Save(fs, game); } - } catch(Exception ex) { + } catch (Exception ex) { ErrorHandler.LogError("saving map", ex); MakeDescWidget("&cError while trying to save map"); return; diff --git a/ClassicalSharp/2D/Utils/FastColour.cs b/ClassicalSharp/2D/Utils/FastColour.cs index 50712937a..0ba22e754 100644 --- a/ClassicalSharp/2D/Utils/FastColour.cs +++ b/ClassicalSharp/2D/Utils/FastColour.cs @@ -190,7 +190,7 @@ namespace ClassicalSharp { int b = Utils.ParseHex(input[i + 4]) * 16 + Utils.ParseHex(input[i + 5]); value = new FastColour(r, g, b); return true; - } catch(FormatException) { + } catch (FormatException) { return false; } } diff --git a/ClassicalSharp/2D/Widgets/InputWidget.cs b/ClassicalSharp/2D/Widgets/InputWidget.cs index 5133d265c..bab959f25 100644 --- a/ClassicalSharp/2D/Widgets/InputWidget.cs +++ b/ClassicalSharp/2D/Widgets/InputWidget.cs @@ -414,7 +414,7 @@ namespace ClassicalSharp.Gui.Widgets { string text = null; try { text = game.window.ClipboardText.Trim(trimChars); - } catch(Exception ex) { + } catch (Exception ex) { ErrorHandler.LogError("Paste from clipboard", ex); const string warning = "&cError while trying to paste from clipboard."; game.Chat.Add(warning, MessageType.ClientStatus4); @@ -428,7 +428,7 @@ namespace ClassicalSharp.Gui.Widgets { if (Text.Empty) return true; try { game.window.ClipboardText = Text.ToString(); - } catch(Exception ex) { + } catch (Exception ex) { ErrorHandler.LogError("Copy to clipboard", ex); const string warning = "&cError while trying to copy to clipboard."; game.Chat.Add(warning, MessageType.ClientStatus4); diff --git a/ClassicalSharp/Audio/AudioPlayer.Sounds.cs b/ClassicalSharp/Audio/AudioPlayer.Sounds.cs index 93a7eb653..b840ebce6 100644 --- a/ClassicalSharp/Audio/AudioPlayer.Sounds.cs +++ b/ClassicalSharp/Audio/AudioPlayer.Sounds.cs @@ -79,7 +79,7 @@ namespace ClassicalSharp.Audio { try { output.PlayRawAsync(chunk); - } catch(InvalidOperationException ex) { + } catch (InvalidOperationException ex) { HandleSoundError(ex); } return; diff --git a/ClassicalSharp/Audio/AudioPlayer.cs b/ClassicalSharp/Audio/AudioPlayer.cs index 00c87bec6..cb6adb24e 100644 --- a/ClassicalSharp/Audio/AudioPlayer.cs +++ b/ClassicalSharp/Audio/AudioPlayer.cs @@ -73,10 +73,10 @@ namespace ClassicalSharp.Audio { OggContainer container = new OggContainer(fs); try { musicOut.PlayStreaming(container); - } catch(InvalidOperationException ex) { + } catch (InvalidOperationException ex) { HandleMusicError(ex); return; - } catch(Exception ex) { + } catch (Exception ex) { ErrorHandler.LogError("AudioPlayer.DoMusicThread()", ex); game.Chat.Add("&cError while trying to play music file " + Path.GetFileName(file)); } diff --git a/ClassicalSharp/Blocks/BlockInfo.Atlas.cs b/ClassicalSharp/Blocks/BlockInfo.Atlas.cs index eb283e4c1..a0927f5ae 100644 --- a/ClassicalSharp/Blocks/BlockInfo.Atlas.cs +++ b/ClassicalSharp/Blocks/BlockInfo.Atlas.cs @@ -28,7 +28,7 @@ namespace ClassicalSharp { void GetTextureRegion(byte block, int side, out Vector2 min, out Vector2 max) { min = Vector2.Zero; max = Vector2.One; Vector3 bbMin = MinBB[block], bbMax = MaxBB[block]; - switch(side) { + switch (side) { case Side.Left: case Side.Right: min = new Vector2(bbMin.Z, bbMin.Y); diff --git a/ClassicalSharp/Game/ChatLog.cs b/ClassicalSharp/Game/ChatLog.cs index 77c6c5834..4eb1555f8 100644 --- a/ClassicalSharp/Game/ChatLog.cs +++ b/ClassicalSharp/Game/ChatLog.cs @@ -141,7 +141,7 @@ namespace ClassicalSharp { FileStream stream = null; try { stream = File.Open(path, FileMode.Append, FileAccess.Write, FileShare.Read); - } catch(IOException ex) { + } catch (IOException ex) { int hresult = Marshal.GetHRForException(ex); uint errorCode = (uint)hresult & 0xFFFF; if (errorCode != 32) // ERROR_SHARING_VIOLATION diff --git a/ClassicalSharp/Game/Game.Init.cs b/ClassicalSharp/Game/Game.Init.cs index 9a4e9f69a..7024fd330 100644 --- a/ClassicalSharp/Game/Game.Init.cs +++ b/ClassicalSharp/Game/Game.Init.cs @@ -192,7 +192,7 @@ namespace ClassicalSharp { try { using (Font f = new Font(FontName, 16)) { } - } catch(Exception) { + } catch (Exception) { FontName = "Arial"; Options.Set(OptionsKey.FontName, "Arial"); } diff --git a/ClassicalSharp/Generator/IMapGenerator.cs b/ClassicalSharp/Generator/IMapGenerator.cs index 716ecc5a0..b9ad692cf 100644 --- a/ClassicalSharp/Generator/IMapGenerator.cs +++ b/ClassicalSharp/Generator/IMapGenerator.cs @@ -26,7 +26,7 @@ namespace ClassicalSharp.Generator { SinglePlayerServer server = (SinglePlayerServer)game.Server; try { server.generatedMap = Generate(width, height, length, seed); - } catch(Exception ex) { + } catch (Exception ex) { ErrorHandler.LogError("IMapGenerator.RunAsync", ex); } Done = true; diff --git a/ClassicalSharp/GraphicsAPI/Direct3D9Api.cs b/ClassicalSharp/GraphicsAPI/Direct3D9Api.cs index 9da922f86..dcff75ee9 100644 --- a/ClassicalSharp/GraphicsAPI/Direct3D9Api.cs +++ b/ClassicalSharp/GraphicsAPI/Direct3D9Api.cs @@ -41,7 +41,7 @@ namespace ClassicalSharp.GraphicsAPI { PresentParameters args = GetPresentArgs(640, 480); try { device = d3d.CreateDevice(adapter, DeviceType.Hardware, windowHandle, createFlags, args); - } catch(SharpDXException) { + } catch (SharpDXException) { createFlags = CreateFlags.MixedVertexProcessing; try { device = d3d.CreateDevice(adapter, DeviceType.Hardware, windowHandle, createFlags, args); diff --git a/ClassicalSharp/Ionic.Zlib/Inflate.cs b/ClassicalSharp/Ionic.Zlib/Inflate.cs index bb47e459e..1ea98e9b7 100644 --- a/ClassicalSharp/Ionic.Zlib/Inflate.cs +++ b/ClassicalSharp/Ionic.Zlib/Inflate.cs @@ -95,7 +95,7 @@ namespace Ionic.Zlib } last = bits & 0x1; - switch((bits & 0x7) >> 1) { + switch ((bits & 0x7) >> 1) { case 0: // stored bits >>= 3; bitsNum -= 3; t = bitsNum & 7; // go to byte boundary diff --git a/ClassicalSharp/Map/Formats/MapDat.Importer.cs b/ClassicalSharp/Map/Formats/MapDat.Importer.cs index 10d42822b..a3f78db2c 100644 --- a/ClassicalSharp/Map/Formats/MapDat.Importer.cs +++ b/ClassicalSharp/Map/Formats/MapDat.Importer.cs @@ -72,7 +72,7 @@ namespace ClassicalSharp.Map { void ReadClassData(FieldDescription[] fields) { for (int i = 0; i < fields.Length; i++) { - switch(fields[i].Type) { + switch (fields[i].Type) { case FieldType.Byte: fields[i].Value = reader.ReadByte(); break; case FieldType.Float: diff --git a/ClassicalSharp/Map/Formats/NbtFile.cs b/ClassicalSharp/Map/Formats/NbtFile.cs index f26fbfd52..ffde0ca12 100644 --- a/ClassicalSharp/Map/Formats/NbtFile.cs +++ b/ClassicalSharp/Map/Formats/NbtFile.cs @@ -92,7 +92,7 @@ namespace ClassicalSharp.Map { tag.Name = readTagName ? ReadString() : null; tag.TagId = (NbtTagType)typeId; - switch((NbtTagType)typeId) { + switch ((NbtTagType)typeId) { case NbtTagType.Int8: tag.Value = reader.ReadByte(); break; case NbtTagType.Int16: diff --git a/ClassicalSharp/MeshBuilder/Builder.cs b/ClassicalSharp/MeshBuilder/Builder.cs index 337838e45..65b33c849 100644 --- a/ClassicalSharp/MeshBuilder/Builder.cs +++ b/ClassicalSharp/MeshBuilder/Builder.cs @@ -282,7 +282,7 @@ namespace ClassicalSharp { protected bool IsLit(int x, int y, int z, int face, byte type) { int offset = (info.LightOffset[type] >> face) & 1; - switch(face) { + switch (face) { case Side.Left: return x < offset || y > lighting.heightmap[(z * width) + (x - offset)]; case Side.Right: diff --git a/ClassicalSharp/Network/NetworkProcessor.cs b/ClassicalSharp/Network/NetworkProcessor.cs index 8341ecf03..355346ac8 100644 --- a/ClassicalSharp/Network/NetworkProcessor.cs +++ b/ClassicalSharp/Network/NetworkProcessor.cs @@ -42,7 +42,7 @@ namespace ClassicalSharp.Network { socket = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp); try { socket.Connect(address, port); - } catch(SocketException ex) { + } catch (SocketException ex) { ErrorHandler.LogError("connecting to server", ex); game.Disconnect("&eUnable to reach " + address + ":" + port, "Unable to establish an underlying connection"); @@ -91,7 +91,7 @@ namespace ClassicalSharp.Network { try { reader.ReadPendingData(); - } catch(SocketException ex) { + } catch (SocketException ex) { ErrorHandler.LogError("reading packets", ex); game.Disconnect("&eLost connection to the server", "I/O error when reading packets"); Dispose(); @@ -142,7 +142,7 @@ namespace ClassicalSharp.Network { } try { writer.Send(); - } catch(SocketException) { + } catch (SocketException) { // NOTE: Not immediately disconnecting, as otherwise we sometimes miss out on kick messages writer.index = 0; } diff --git a/ClassicalSharp/Network/Protocols/BlockDefs.cs b/ClassicalSharp/Network/Protocols/BlockDefs.cs index 4e9630cde..e2007c854 100644 --- a/ClassicalSharp/Network/Protocols/BlockDefs.cs +++ b/ClassicalSharp/Network/Protocols/BlockDefs.cs @@ -117,7 +117,7 @@ namespace ClassicalSharp.Network.Protocols { byte id = reader.ReadUInt8(); CustomModel model = null; - switch(reader.ReadUInt8()) { + switch (reader.ReadUInt8()) { case 0: model = new CustomModel(game); model.ReadSetupPacket(reader); diff --git a/ClassicalSharp/Network/Protocols/CPE.cs b/ClassicalSharp/Network/Protocols/CPE.cs index 9222b1d8b..996ab2128 100644 --- a/ClassicalSharp/Network/Protocols/CPE.cs +++ b/ClassicalSharp/Network/Protocols/CPE.cs @@ -325,7 +325,7 @@ namespace ClassicalSharp.Network.Protocols { WorldEnv env = game.World.Env; Utils.Clamp(ref value, short.MinValue, short.MaxValue); - switch(type) { + switch (type) { case 0: Utils.Clamp(ref value, byte.MinValue, byte.MaxValue); env.SetSidesBlock((byte)value); break; diff --git a/ClassicalSharp/Network/Utils/AsyncDownloader.cs b/ClassicalSharp/Network/Utils/AsyncDownloader.cs index a06cdd9d4..16c67f398 100644 --- a/ClassicalSharp/Network/Utils/AsyncDownloader.cs +++ b/ClassicalSharp/Network/Utils/AsyncDownloader.cs @@ -207,7 +207,7 @@ namespace ClassicalSharp.Network { lastModified = response.LastModified; value = DownloadContent(request, response); } - } catch(Exception ex) { + } catch (Exception ex) { if (!(ex is WebException || ex is ArgumentException || ex is UriFormatException || ex is IOException)) throw; if (ex is WebException) { @@ -271,7 +271,7 @@ namespace ClassicalSharp.Network { int height = bmp.Height; } return value; - } catch(ArgumentException) { + } catch (ArgumentException) { Utils.LogDebug("Failed to download from: " + url); return null; } diff --git a/ClassicalSharp/Network/Utils/GZipHeaderReader.cs b/ClassicalSharp/Network/Utils/GZipHeaderReader.cs index 41d80d776..b15c7a353 100644 --- a/ClassicalSharp/Network/Utils/GZipHeaderReader.cs +++ b/ClassicalSharp/Network/Utils/GZipHeaderReader.cs @@ -18,7 +18,7 @@ namespace ClassicalSharp.Network { int partsRead; public bool ReadHeader(Stream s) { - switch(state) { + switch (state) { case State.Header1: if (!ReadAndCheckHeaderByte(s, 0x1F)) diff --git a/ClassicalSharp/Program.cs b/ClassicalSharp/Program.cs index 595c32a00..22a8aa7a2 100644 --- a/ClassicalSharp/Program.cs +++ b/ClassicalSharp/Program.cs @@ -104,7 +104,7 @@ namespace ClassicalSharp { try { File.Copy(files[i], dst); File.Delete(files[i]); - } catch(IOException ex) { + } catch (IOException ex) { ErrorHandler.LogError("Program.CopyFiles()", ex); } } diff --git a/ClassicalSharp/TexturePack/EntryList.cs b/ClassicalSharp/TexturePack/EntryList.cs index 42f54bca0..245eaf39b 100644 --- a/ClassicalSharp/TexturePack/EntryList.cs +++ b/ClassicalSharp/TexturePack/EntryList.cs @@ -42,7 +42,7 @@ namespace ClassicalSharp.Textures { } } return true; - } catch(IOException ex) { + } catch (IOException ex) { ErrorHandler.LogError("loading " + file, ex); return false; } @@ -61,7 +61,7 @@ namespace ClassicalSharp.Textures { writer.WriteLine(Entries[i]); } return true; - } catch(IOException ex) { + } catch (IOException ex) { ErrorHandler.LogError("saving " + file, ex); return false; } diff --git a/ClassicalSharp/TexturePack/TextureCache.cs b/ClassicalSharp/TexturePack/TextureCache.cs index 2dcc337f4..177ede671 100644 --- a/ClassicalSharp/TexturePack/TextureCache.cs +++ b/ClassicalSharp/TexturePack/TextureCache.cs @@ -26,7 +26,7 @@ namespace ClassicalSharp.Textures { try { return File.OpenRead(path); - } catch(IOException ex) { + } catch (IOException ex) { ErrorHandler.LogError("Cache.GetData", ex); return null; } @@ -74,7 +74,7 @@ namespace ClassicalSharp.Textures { using (FileStream fs = File.Create(path)) Platform.WriteBmp(bmp, fs); - } catch(IOException ex) { + } catch (IOException ex) { ErrorHandler.LogError("Cache.AddToCache", ex); } } @@ -88,7 +88,7 @@ namespace ClassicalSharp.Textures { Directory.CreateDirectory(basePath); File.WriteAllBytes(path, data); - } catch(IOException ex) { + } catch (IOException ex) { ErrorHandler.LogError("Cache.AddToCache", ex); } } diff --git a/ClassicalSharp/TexturePack/TexturePack.cs b/ClassicalSharp/TexturePack/TexturePack.cs index 765ed7988..760e55d0b 100644 --- a/ClassicalSharp/TexturePack/TexturePack.cs +++ b/ClassicalSharp/TexturePack/TexturePack.cs @@ -114,10 +114,10 @@ namespace ClassicalSharp.Textures { static Bitmap GetBitmap(FileStream fs) { try { return Platform.ReadBmp(fs); - } catch(ArgumentException ex) { + } catch (ArgumentException ex) { ErrorHandler.LogError("Cache.GetBitmap", ex); return null; - } catch(IOException ex) { + } catch (IOException ex) { ErrorHandler.LogError("Cache.GetBitmap", ex); return null; } diff --git a/ClassicalSharp/Utils/ErrorHandler.cs b/ClassicalSharp/Utils/ErrorHandler.cs index fe2adfd7c..48435340e 100644 --- a/ClassicalSharp/Utils/ErrorHandler.cs +++ b/ClassicalSharp/Utils/ErrorHandler.cs @@ -62,7 +62,7 @@ namespace ClassicalSharp { w.WriteLine(); } } - } catch(Exception) { + } catch (Exception) { wroteToCrashLog = false; } @@ -95,7 +95,7 @@ namespace ClassicalSharp { writer.WriteLine(text); writer.WriteLine(); } - } catch(Exception) { + } catch (Exception) { return false; } return true; diff --git a/ClassicalSharp/Utils/Options.cs b/ClassicalSharp/Utils/Options.cs index 816ade57f..07e1ca20c 100644 --- a/ClassicalSharp/Utils/Options.cs +++ b/ClassicalSharp/Utils/Options.cs @@ -157,9 +157,9 @@ namespace ClassicalSharp { using (StreamReader reader = new StreamReader(fs, false)) LoadFrom(reader); return true; - } catch(FileNotFoundException) { + } catch (FileNotFoundException) { return true; - } catch(IOException ex) { + } catch (IOException ex) { ErrorHandler.LogError("loading options", ex); return false; } @@ -202,7 +202,7 @@ namespace ClassicalSharp { OptionsChanged.Clear(); return true; - } catch(IOException ex) { + } catch (IOException ex) { ErrorHandler.LogError("saving options", ex); return false; } diff --git a/ClassicalSharp/Utils/Utils.cs b/ClassicalSharp/Utils/Utils.cs index 4eef624c4..3da246062 100644 --- a/ClassicalSharp/Utils/Utils.cs +++ b/ClassicalSharp/Utils/Utils.cs @@ -110,7 +110,7 @@ namespace ClassicalSharp { T mapping; try { mapping = (T)Enum.Parse(typeof(T), value, true); - } catch(ArgumentException) { + } catch (ArgumentException) { result = defValue; return false; } @@ -137,7 +137,7 @@ namespace ClassicalSharp { internal static byte FastByte(string s) { int sum = 0; - switch(s.Length) { + switch (s.Length) { case 1: sum = (s[0] - '0'); break; case 2: sum = (s[0] - '0') * 10 + (s[1] - '0'); break; case 3: sum = (s[0] - '0') * 100 + (s[1] - '0') * 10 + (s[2] - '0'); break;