From c32b8ddf2f6e46ffa252949d847a7c78df44aa0f Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 14 Feb 2016 22:29:04 +1100 Subject: [PATCH] Now show whether there is a new release in the launcher. --- ClassicalSharp.sln | 2 +- Launcher2/Gui/Drawer2DExt.cs | 2 +- Launcher2/Gui/PlatformDrawer.cs | 3 +- .../Gui/Screens/ClassiCubeServersScreen.cs | 2 +- Launcher2/Gui/Screens/ColoursScreen.cs | 2 +- Launcher2/Gui/Screens/DirectConnectScreen.cs | 2 +- Launcher2/Gui/Screens/LauncherInputScreen.cs | 2 +- Launcher2/Gui/Screens/LauncherScreen.cs | 2 +- .../Gui/Screens/MainScreen.Classicube.cs | 7 ++- Launcher2/Gui/Screens/MainScreen.cs | 16 ++++-- Launcher2/Gui/Screens/ResourcesScreen.cs | 2 +- Launcher2/Gui/Screens/UpdatesScreen.cs | 50 ++++++++----------- .../LauncherTableWidget.Comparers.cs | 2 +- .../TableWidget/LauncherTableWidget.Input.cs | 2 +- .../Gui/TableWidget/LauncherTableWidget.cs | 2 +- .../Gui/Widgets/LauncherBooleanWidget.cs | 2 +- Launcher2/Gui/Widgets/LauncherButtonWidget.cs | 2 +- Launcher2/Gui/Widgets/LauncherInputWidget.cs | 2 +- Launcher2/Gui/Widgets/LauncherLabelWidget.cs | 2 +- Launcher2/Gui/Widgets/LauncherWidget.cs | 2 +- .../{Launcher2.csproj => Launcher.csproj} | 6 +-- Launcher2/LauncherWindow.Background.cs | 2 +- Launcher2/LauncherWindow.cs | 3 +- Launcher2/Patcher/Animations.cs | 2 +- Launcher2/Patcher/ResourceFetcher.cs | 2 +- Launcher2/Patcher/ResourcePatcher.cs | 2 +- Launcher2/Patcher/SoundPatcher.cs | 2 +- Launcher2/Patcher/ZipWriter.cs | 2 +- Launcher2/Program.cs | 2 +- Launcher2/Updater/Patcher.cs | 2 +- Launcher2/Updater/Scripts.cs | 2 +- Launcher2/Utils/Client.cs | 2 +- Launcher2/Utils/ClientStartData.cs | 2 +- Launcher2/Utils/JSON.cs | 2 +- Launcher2/Utils/LauncherSkin.cs | 2 +- Launcher2/Utils/Secure.cs | 2 +- Launcher2/WebService/ClassiCubeSession.cs | 2 +- Launcher2/WebService/IWebTask.cs | 2 +- Launcher2/WebService/ServerListEntry.cs | 2 +- Launcher2/WebService/UpdateCheckTask.cs | 5 +- 40 files changed, 76 insertions(+), 80 deletions(-) rename Launcher2/{Launcher2.csproj => Launcher.csproj} (95%) diff --git a/ClassicalSharp.sln b/ClassicalSharp.sln index abe46e1aa..ce6e719de 100644 --- a/ClassicalSharp.sln +++ b/ClassicalSharp.sln @@ -8,7 +8,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK", "OpenTK\OpenTK.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteropPatcher", "InteropPatcher\InteropPatcher.csproj", "{4A4110EE-21CA-4715-AF67-0C8B7CE0642F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launcher2", "Launcher2\Launcher2.csproj", "{3E84ACC1-27B4-401B-A359-6AAE4DF6C9B5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launcher", "Launcher2\Launcher.csproj", "{3E84ACC1-27B4-401B-A359-6AAE4DF6C9B5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Launcher2/Gui/Drawer2DExt.cs b/Launcher2/Gui/Drawer2DExt.cs index 6f7d72e94..43d68f275 100644 --- a/Launcher2/Gui/Drawer2DExt.cs +++ b/Launcher2/Gui/Drawer2DExt.cs @@ -2,7 +2,7 @@ using System.Drawing; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { public static class Drawer2DExt { diff --git a/Launcher2/Gui/PlatformDrawer.cs b/Launcher2/Gui/PlatformDrawer.cs index 0a9f47207..9de258def 100644 --- a/Launcher2/Gui/PlatformDrawer.cs +++ b/Launcher2/Gui/PlatformDrawer.cs @@ -6,7 +6,7 @@ using OpenTK.Platform.X11; using OSX = OpenTK.Platform.MacOS.Carbon; using OSStatus = OpenTK.Platform.MacOS.OSStatus; -namespace Launcher2 { +namespace Launcher { /// Platform specific class used to transfer a bitmap directly to the screen. public abstract class PlatformDrawer { @@ -36,7 +36,6 @@ namespace Launcher2 { } } - // TODO: broken public sealed class OSXPlatformDrawer : PlatformDrawer { IntPtr windowPort; diff --git a/Launcher2/Gui/Screens/ClassiCubeServersScreen.cs b/Launcher2/Gui/Screens/ClassiCubeServersScreen.cs index d5d633123..074a4f103 100644 --- a/Launcher2/Gui/Screens/ClassiCubeServersScreen.cs +++ b/Launcher2/Gui/Screens/ClassiCubeServersScreen.cs @@ -3,7 +3,7 @@ using System.Drawing; using ClassicalSharp; using OpenTK.Input; -namespace Launcher2 { +namespace Launcher { public sealed class ClassiCubeServersScreen : LauncherInputScreen { diff --git a/Launcher2/Gui/Screens/ColoursScreen.cs b/Launcher2/Gui/Screens/ColoursScreen.cs index ad20c4a0f..d90704c5b 100644 --- a/Launcher2/Gui/Screens/ColoursScreen.cs +++ b/Launcher2/Gui/Screens/ColoursScreen.cs @@ -3,7 +3,7 @@ using System.Drawing; using ClassicalSharp; using OpenTK.Input; -namespace Launcher2 { +namespace Launcher { public sealed class ColoursScreen : LauncherInputScreen { diff --git a/Launcher2/Gui/Screens/DirectConnectScreen.cs b/Launcher2/Gui/Screens/DirectConnectScreen.cs index e1cc6bba8..6ea3b4deb 100644 --- a/Launcher2/Gui/Screens/DirectConnectScreen.cs +++ b/Launcher2/Gui/Screens/DirectConnectScreen.cs @@ -5,7 +5,7 @@ using System.IO; using System.Net; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { public sealed class DirectConnectScreen : LauncherInputScreen { diff --git a/Launcher2/Gui/Screens/LauncherInputScreen.cs b/Launcher2/Gui/Screens/LauncherInputScreen.cs index 316cca632..50cc27377 100644 --- a/Launcher2/Gui/Screens/LauncherInputScreen.cs +++ b/Launcher2/Gui/Screens/LauncherInputScreen.cs @@ -4,7 +4,7 @@ using ClassicalSharp; using OpenTK; using OpenTK.Input; -namespace Launcher2 { +namespace Launcher { public abstract class LauncherInputScreen : LauncherScreen { diff --git a/Launcher2/Gui/Screens/LauncherScreen.cs b/Launcher2/Gui/Screens/LauncherScreen.cs index 06b1bc725..e1e747c62 100644 --- a/Launcher2/Gui/Screens/LauncherScreen.cs +++ b/Launcher2/Gui/Screens/LauncherScreen.cs @@ -3,7 +3,7 @@ using System.Drawing; using ClassicalSharp; using OpenTK.Input; -namespace Launcher2 { +namespace Launcher { public abstract class LauncherScreen { protected internal LauncherWindow game; diff --git a/Launcher2/Gui/Screens/MainScreen.Classicube.cs b/Launcher2/Gui/Screens/MainScreen.Classicube.cs index ab325d07d..5db78db29 100644 --- a/Launcher2/Gui/Screens/MainScreen.Classicube.cs +++ b/Launcher2/Gui/Screens/MainScreen.Classicube.cs @@ -5,7 +5,7 @@ using System.IO; using System.Net; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { public sealed partial class MainScreen : LauncherInputScreen { @@ -13,9 +13,8 @@ namespace Launcher2 { public override void Tick() { base.Tick(); - // TODO: Why is this broken? - //if( game.checkTask != null ) - // game.checkTask.TaskTick( SuccessfulUpdateCheck, this ); + if( game.checkTask != null ) + game.checkTask.TaskTick( SuccessfulUpdateCheck, this ); if( !signingIn ) return; ClassicubeSession session = game.Session; diff --git a/Launcher2/Gui/Screens/MainScreen.cs b/Launcher2/Gui/Screens/MainScreen.cs index b62a41052..13c97c31a 100644 --- a/Launcher2/Gui/Screens/MainScreen.cs +++ b/Launcher2/Gui/Screens/MainScreen.cs @@ -1,9 +1,10 @@ using System; using System.Drawing; +using System.IO; using System.Net; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { public sealed partial class MainScreen : LauncherInputScreen { @@ -40,9 +41,16 @@ namespace Launcher2 { string updateText = "&eChecking for updates.."; bool updateDone; void SuccessfulUpdateCheck( UpdateCheckTask task ) { - //if( updateDone ) return; TODO: Why is this broken? - //updateText = "&aNew release available"; - //updateDone = true; + if( updateDone ) return; + string exePath = Path.Combine( Program.AppDirectory, "ClassicalSharp.exe" ); + DateTime lastTime = File.GetLastWriteTime( exePath ); + DateTime lastRelease = game.checkTask.LatestStable.TimeBuilt; + + updateText = lastTime >= lastRelease ? "&eUp to date " : "&aNew release available"; + updateDone = true; + game.MakeBackground(); + Resize(); + SelectWidget( selectedWidget ); } void MakeWidgets() { diff --git a/Launcher2/Gui/Screens/ResourcesScreen.cs b/Launcher2/Gui/Screens/ResourcesScreen.cs index 5f012773a..0bb0d60cc 100644 --- a/Launcher2/Gui/Screens/ResourcesScreen.cs +++ b/Launcher2/Gui/Screens/ResourcesScreen.cs @@ -3,7 +3,7 @@ using System.Drawing; using ClassicalSharp; using ClassicalSharp.Network; -namespace Launcher2 { +namespace Launcher { public sealed class ResourcesScreen : LauncherScreen { diff --git a/Launcher2/Gui/Screens/UpdatesScreen.cs b/Launcher2/Gui/Screens/UpdatesScreen.cs index 15f06e801..9b2619513 100644 --- a/Launcher2/Gui/Screens/UpdatesScreen.cs +++ b/Launcher2/Gui/Screens/UpdatesScreen.cs @@ -2,10 +2,10 @@ using System.Drawing; using System.IO; using ClassicalSharp; -using Launcher2.Updater; +using Launcher.Updater; using OpenTK.Input; -namespace Launcher2 { +namespace Launcher { // TODO: Download asynchronously public sealed class UpdatesScreen : LauncherScreen { @@ -23,7 +23,7 @@ namespace Launcher2 { UpdateCheckTask checkTask; public override void Init() { - if( game.checkTask.Done ) + if( game.checkTask != null && game.checkTask.Done ) SuccessfulUpdateCheck( game.checkTask ); checkTask = new UpdateCheckTask(); checkTask.CheckForUpdatesAsync(); @@ -55,14 +55,8 @@ namespace Launcher2 { } void SuccessfulUpdateCheck( UpdateCheckTask task ) { - dev = task.LatestDev; - lastDev = dev.TimeBuilt; - validDev = dev.DirectXSize > 50000 && dev.OpenGLSize > 50000; - - stable = task.LatestStable; - lastStable = stable.TimeBuilt; - validStable = stable.DirectXSize > 50000 && stable.OpenGLSize > 50000; - game.checkTask = checkTask; + dev = task.LatestDev; lastDev = dev.TimeBuilt; + stable = task.LatestStable; lastStable = stable.TimeBuilt; } public override void Resize() { @@ -82,7 +76,6 @@ namespace Launcher2 { const string dateFormat = "dd-MM-yyyy HH:mm"; DateTime lastStable, lastDev; - bool validStable = true, validDev = true; bool updateCheckFailed; void MakeWidgets() { @@ -93,21 +86,21 @@ namespace Launcher2 { string yourBuild = File.GetLastWriteTime( exePath ).ToString( dateFormat ); MakeLabelAt( yourBuild, infoFont, Anchor.Centre, Anchor.Centre, 70, -120 ); - MakeLabelAt( "Latest stable:", infoFont, Anchor.Centre, Anchor.Centre, -70, -75 ); - string latestStable = GetDateString( lastStable, validStable ); + MakeLabelAt( "Latest release:", infoFont, Anchor.Centre, Anchor.Centre, -70, -75 ); + string latestStable = GetDateString( lastStable ); MakeLabelAt( latestStable, infoFont, Anchor.Centre, Anchor.Centre, 70, -75 ); MakeButtonAt( "Direct3D 9", 130, 30, titleFont, Anchor.Centre, -80, -40, - (x, y) => UpdateBuild( lastStable, validStable, true, true ) ); + (x, y) => UpdateBuild( lastStable, true, true ) ); MakeButtonAt( "OpenGL", 130, 30, titleFont, Anchor.Centre, 80, -40, - (x, y) => UpdateBuild( lastStable, validStable, true, false ) ); + (x, y) => UpdateBuild( lastStable, true, false ) ); MakeLabelAt( "Latest dev build:", infoFont, Anchor.Centre, Anchor.Centre, -80, 15 ); - string latestDev = GetDateString( lastDev, validDev ); + string latestDev = GetDateString( lastDev ); MakeLabelAt( latestDev, infoFont, Anchor.Centre, Anchor.Centre, 70, 15 ); MakeButtonAt( "Direct3D 9", 130, 30, titleFont, Anchor.Centre, -80, 50, - (x, y) => UpdateBuild( lastDev, validDev, false, true ) ); + (x, y) => UpdateBuild( lastDev, false, true ) ); MakeButtonAt( "OpenGL", 130, 30, titleFont, Anchor.Centre, 80, 50, - (x, y) => UpdateBuild( lastDev, validDev, false, false ) ); + (x, y) => UpdateBuild( lastDev, false, false ) ); MakeLabelAt( "&eDirect3D 9 is recommended for Windows.", infoFont, Anchor.Centre, Anchor.Centre, 0, 105 ); @@ -118,21 +111,20 @@ namespace Launcher2 { 0, 170, (x, y) => game.SetScreen( new MainScreen( game ) ) ); } - string GetDateString( DateTime last, bool valid ) { + string GetDateString( DateTime last ) { if( updateCheckFailed ) return "Update check failed"; - if( !valid ) return "Build corrupted"; - if( last == DateTime.MinValue ) return "Checking.."; - + if( last == DateTime.MinValue ) return "Checking.."; return last.ToString( dateFormat ); } - void UpdateBuild( DateTime last, bool valid, bool release, bool dx ) { - if( last == DateTime.MinValue || !valid ) return; - + void UpdateBuild( DateTime last, bool release, bool dx ) { Build build = release ? stable : dev; - string dir = dx ? build.DirectXPath : build.OpenGLPath; - Console.WriteLine( "FETCH! " + dir ); - Patcher.Update( dir ); + if( last == DateTime.MinValue || build.DirectXSize < 50000 + || build.OpenGLSize < 50000 ) return; + + string path = dx ? build.DirectXPath : build.OpenGLPath; + Utils.LogDebug( "Updating to: " + path ); + Patcher.Update( path ); } public override void Dispose() { diff --git a/Launcher2/Gui/TableWidget/LauncherTableWidget.Comparers.cs b/Launcher2/Gui/TableWidget/LauncherTableWidget.Comparers.cs index e8e0c030f..46c49ec1d 100644 --- a/Launcher2/Gui/TableWidget/LauncherTableWidget.Comparers.cs +++ b/Launcher2/Gui/TableWidget/LauncherTableWidget.Comparers.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Launcher2 { +namespace Launcher { public partial class LauncherTableWidget : LauncherWidget { diff --git a/Launcher2/Gui/TableWidget/LauncherTableWidget.Input.cs b/Launcher2/Gui/TableWidget/LauncherTableWidget.Input.cs index 38e8fcc5f..b5abe394c 100644 --- a/Launcher2/Gui/TableWidget/LauncherTableWidget.Input.cs +++ b/Launcher2/Gui/TableWidget/LauncherTableWidget.Input.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { public partial class LauncherTableWidget : LauncherWidget { diff --git a/Launcher2/Gui/TableWidget/LauncherTableWidget.cs b/Launcher2/Gui/TableWidget/LauncherTableWidget.cs index 5fbd9e9fc..7bd3480b7 100644 --- a/Launcher2/Gui/TableWidget/LauncherTableWidget.cs +++ b/Launcher2/Gui/TableWidget/LauncherTableWidget.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Drawing; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { public partial class LauncherTableWidget : LauncherWidget { diff --git a/Launcher2/Gui/Widgets/LauncherBooleanWidget.cs b/Launcher2/Gui/Widgets/LauncherBooleanWidget.cs index 61fc1d8b2..ea16cb576 100644 --- a/Launcher2/Gui/Widgets/LauncherBooleanWidget.cs +++ b/Launcher2/Gui/Widgets/LauncherBooleanWidget.cs @@ -2,7 +2,7 @@ using System.Drawing; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { /// Widget that represents text can have modified by the user. public sealed class LauncherBooleanWidget : LauncherWidget { diff --git a/Launcher2/Gui/Widgets/LauncherButtonWidget.cs b/Launcher2/Gui/Widgets/LauncherButtonWidget.cs index ebeb20844..78f815d01 100644 --- a/Launcher2/Gui/Widgets/LauncherButtonWidget.cs +++ b/Launcher2/Gui/Widgets/LauncherButtonWidget.cs @@ -2,7 +2,7 @@ using System.Drawing; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { public sealed class LauncherButtonWidget : LauncherWidget { diff --git a/Launcher2/Gui/Widgets/LauncherInputWidget.cs b/Launcher2/Gui/Widgets/LauncherInputWidget.cs index 19c10ab5f..d9c87a520 100644 --- a/Launcher2/Gui/Widgets/LauncherInputWidget.cs +++ b/Launcher2/Gui/Widgets/LauncherInputWidget.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Windows.Forms; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { /// Widget that represents text can have modified by the user. public sealed class LauncherInputWidget : LauncherWidget { diff --git a/Launcher2/Gui/Widgets/LauncherLabelWidget.cs b/Launcher2/Gui/Widgets/LauncherLabelWidget.cs index a78f71e9f..1669514c6 100644 --- a/Launcher2/Gui/Widgets/LauncherLabelWidget.cs +++ b/Launcher2/Gui/Widgets/LauncherLabelWidget.cs @@ -2,7 +2,7 @@ using System.Drawing; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { /// Widget that represents text that cannot be modified by the user. public sealed class LauncherLabelWidget : LauncherWidget { diff --git a/Launcher2/Gui/Widgets/LauncherWidget.cs b/Launcher2/Gui/Widgets/LauncherWidget.cs index e7c4e6683..f49655896 100644 --- a/Launcher2/Gui/Widgets/LauncherWidget.cs +++ b/Launcher2/Gui/Widgets/LauncherWidget.cs @@ -1,7 +1,7 @@ using System; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { public abstract class LauncherWidget { diff --git a/Launcher2/Launcher2.csproj b/Launcher2/Launcher.csproj similarity index 95% rename from Launcher2/Launcher2.csproj rename to Launcher2/Launcher.csproj index a53314fd2..1c513c446 100644 --- a/Launcher2/Launcher2.csproj +++ b/Launcher2/Launcher.csproj @@ -5,8 +5,8 @@ Debug AnyCPU WinExe - Launcher2 - Launcher2 + Launcher + Launcher v2.0 @@ -21,7 +21,7 @@ OnBuildSuccess - AnyCPU + x86 4194304 False Auto diff --git a/Launcher2/LauncherWindow.Background.cs b/Launcher2/LauncherWindow.Background.cs index 024a7d02e..521581d6f 100644 --- a/Launcher2/LauncherWindow.Background.cs +++ b/Launcher2/LauncherWindow.Background.cs @@ -4,7 +4,7 @@ using System.IO; using ClassicalSharp; using ClassicalSharp.TexturePack; -namespace Launcher2 { +namespace Launcher { public sealed partial class LauncherWindow { diff --git a/Launcher2/LauncherWindow.cs b/Launcher2/LauncherWindow.cs index 8ffbb948a..e6e0064e5 100644 --- a/Launcher2/LauncherWindow.cs +++ b/Launcher2/LauncherWindow.cs @@ -9,7 +9,7 @@ using ClassicalSharp.Network; using OpenTK; using OpenTK.Graphics; -namespace Launcher2 { +namespace Launcher { public sealed partial class LauncherWindow { @@ -179,6 +179,7 @@ namespace Launcher2 { void Display() { Dirty = false; Screen.Dirty = false; + Console.WriteLine( "~~redraw~~" ); platformDrawer.Draw( Window.WindowInfo, Framebuffer ); } diff --git a/Launcher2/Patcher/Animations.cs b/Launcher2/Patcher/Animations.cs index 605f8a3b5..e02b6e4a6 100644 --- a/Launcher2/Patcher/Animations.cs +++ b/Launcher2/Patcher/Animations.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.IO; -namespace Launcher2 { +namespace Launcher { public partial class ResourcePatcher { diff --git a/Launcher2/Patcher/ResourceFetcher.cs b/Launcher2/Patcher/ResourceFetcher.cs index 825293355..f22935e65 100644 --- a/Launcher2/Patcher/ResourceFetcher.cs +++ b/Launcher2/Patcher/ResourceFetcher.cs @@ -3,7 +3,7 @@ using System.IO; using ClassicalSharp.Network; using ClassicalSharp.TexturePack; -namespace Launcher2 { +namespace Launcher { public sealed class ResourceFetcher { diff --git a/Launcher2/Patcher/ResourcePatcher.cs b/Launcher2/Patcher/ResourcePatcher.cs index 55c73b774..b7775b6b6 100644 --- a/Launcher2/Patcher/ResourcePatcher.cs +++ b/Launcher2/Patcher/ResourcePatcher.cs @@ -5,7 +5,7 @@ using System.IO; using ClassicalSharp; using ClassicalSharp.TexturePack; -namespace Launcher2 { +namespace Launcher { public partial class ResourcePatcher { diff --git a/Launcher2/Patcher/SoundPatcher.cs b/Launcher2/Patcher/SoundPatcher.cs index fe7d70e15..53b6eb7dc 100644 --- a/Launcher2/Patcher/SoundPatcher.cs +++ b/Launcher2/Patcher/SoundPatcher.cs @@ -4,7 +4,7 @@ using ClassicalSharp.Network; using SharpWave; using SharpWave.Codecs.Vorbis; -namespace Launcher2 { +namespace Launcher { public sealed class SoundPatcher { diff --git a/Launcher2/Patcher/ZipWriter.cs b/Launcher2/Patcher/ZipWriter.cs index 8b603815c..a5c4d7e23 100644 --- a/Launcher2/Patcher/ZipWriter.cs +++ b/Launcher2/Patcher/ZipWriter.cs @@ -5,7 +5,7 @@ using System.IO; using System.Text; using ClassicalSharp.TexturePack; -namespace Launcher2 { +namespace Launcher { public sealed class ZipWriter { diff --git a/Launcher2/Program.cs b/Launcher2/Program.cs index 533c4a8c7..72cef8978 100644 --- a/Launcher2/Program.cs +++ b/Launcher2/Program.cs @@ -2,7 +2,7 @@ using System.IO; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { internal static class Program { diff --git a/Launcher2/Updater/Patcher.cs b/Launcher2/Updater/Patcher.cs index 450c96947..28ac87bf1 100644 --- a/Launcher2/Updater/Patcher.cs +++ b/Launcher2/Updater/Patcher.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; using System.Threading; using ClassicalSharp.TexturePack; -namespace Launcher2.Updater { +namespace Launcher.Updater { public static class Patcher { diff --git a/Launcher2/Updater/Scripts.cs b/Launcher2/Updater/Scripts.cs index d9085314a..49871052f 100644 --- a/Launcher2/Updater/Scripts.cs +++ b/Launcher2/Updater/Scripts.cs @@ -1,6 +1,6 @@ using System; -namespace Launcher2.Updater { +namespace Launcher.Updater { public static class Scripts { diff --git a/Launcher2/Utils/Client.cs b/Launcher2/Utils/Client.cs index c010c9786..22df67dd4 100644 --- a/Launcher2/Utils/Client.cs +++ b/Launcher2/Utils/Client.cs @@ -5,7 +5,7 @@ using System.IO; using ClassicalSharp; using OpenTK; -namespace Launcher2 { +namespace Launcher { public static class Client { diff --git a/Launcher2/Utils/ClientStartData.cs b/Launcher2/Utils/ClientStartData.cs index 0abd80d43..1113780da 100644 --- a/Launcher2/Utils/ClientStartData.cs +++ b/Launcher2/Utils/ClientStartData.cs @@ -1,6 +1,6 @@ using System; -namespace Launcher2 { +namespace Launcher { public class ClientStartData { diff --git a/Launcher2/Utils/JSON.cs b/Launcher2/Utils/JSON.cs index 1efd78af8..da7ccd05e 100644 --- a/Launcher2/Utils/JSON.cs +++ b/Launcher2/Utils/JSON.cs @@ -23,7 +23,7 @@ using System.Collections.Generic; using System.Globalization; using System.Text; -namespace Launcher2 { +namespace Launcher { public static class Json { const int TOKEN_NONE = 0, TOKEN_CURLY_OPEN = 1, TOKEN_CURLY_CLOSE = 2; diff --git a/Launcher2/Utils/LauncherSkin.cs b/Launcher2/Utils/LauncherSkin.cs index 7922e2dc5..1d81ffb9f 100644 --- a/Launcher2/Utils/LauncherSkin.cs +++ b/Launcher2/Utils/LauncherSkin.cs @@ -2,7 +2,7 @@ using System.Drawing; using ClassicalSharp; -namespace Launcher2 { +namespace Launcher { public static class LauncherSkin { diff --git a/Launcher2/Utils/Secure.cs b/Launcher2/Utils/Secure.cs index 77fb5b408..4737cd1d1 100644 --- a/Launcher2/Utils/Secure.cs +++ b/Launcher2/Utils/Secure.cs @@ -1,7 +1,7 @@ using System; using System.Security.Cryptography; -namespace Launcher2 { +namespace Launcher { public static class Secure { diff --git a/Launcher2/WebService/ClassiCubeSession.cs b/Launcher2/WebService/ClassiCubeSession.cs index efe34d654..50ce2f1f2 100644 --- a/Launcher2/WebService/ClassiCubeSession.cs +++ b/Launcher2/WebService/ClassiCubeSession.cs @@ -4,7 +4,7 @@ using System.Net; using System.Threading; using JsonObject = System.Collections.Generic.Dictionary; -namespace Launcher2 { +namespace Launcher { public sealed class ClassicubeSession : IWebTask { diff --git a/Launcher2/WebService/IWebTask.cs b/Launcher2/WebService/IWebTask.cs index fa78d44dd..cfc072680 100644 --- a/Launcher2/WebService/IWebTask.cs +++ b/Launcher2/WebService/IWebTask.cs @@ -4,7 +4,7 @@ using System.IO; using System.Net; using System.Text; -namespace Launcher2 { +namespace Launcher { /// Represents a task that performs a series of GET or POST requests asynchronously. public abstract class IWebTask { diff --git a/Launcher2/WebService/ServerListEntry.cs b/Launcher2/WebService/ServerListEntry.cs index 96957648f..9e794b563 100644 --- a/Launcher2/WebService/ServerListEntry.cs +++ b/Launcher2/WebService/ServerListEntry.cs @@ -1,6 +1,6 @@ using System; -namespace Launcher2 { +namespace Launcher { public class ServerListEntry { diff --git a/Launcher2/WebService/UpdateCheckTask.cs b/Launcher2/WebService/UpdateCheckTask.cs index d2f4a0ca0..19fbd90b1 100644 --- a/Launcher2/WebService/UpdateCheckTask.cs +++ b/Launcher2/WebService/UpdateCheckTask.cs @@ -6,7 +6,7 @@ using System.Net; using System.Threading; using JsonObject = System.Collections.Generic.Dictionary; -namespace Launcher2 { +namespace Launcher { public class Build { public DateTime TimeBuilt; @@ -79,9 +79,6 @@ namespace Launcher2 { return false; else taskSuccess( this ); - - screen.game.MakeBackground(); - screen.Resize(); return true; } }