From d70851a1b91806bd464880c03937fe7665996f08 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 23 Mar 2016 23:28:23 +1100 Subject: [PATCH] Pure classic mode should not intefere with normal mode settings. (Thanks FabTheZen) --- ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs | 2 +- ClassicalSharp/2D/Screens/Menu/MiscOptionsScreen.cs | 2 +- ClassicalSharp/ClassicalSharp.csproj | 2 +- ClassicalSharp/Entities/EntityList.cs | 2 ++ ClassicalSharp/Entities/LocalPlayer.cs | 6 +++--- ClassicalSharp/Game/Game.cs | 8 +++++--- ClassicalSharp/Network/NetworkProcessor.cs | 1 + ClassicalSharp/Program.cs | 1 + Launcher2/Gui/Screens/MainScreen.cs | 6 ------ Launcher2/Utils/Client.cs | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs b/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs index 8dce4444a..025f04f83 100644 --- a/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs +++ b/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs @@ -115,7 +115,7 @@ namespace ClassicalSharp { MakeKeys( KeyBinding.Respawn, 5, 5, 150 ); widgets[index++] = MakeBack( false, titleFont, - (g, w) => g.SetNewScreen( new OptionsGroupScreen( g ) ) ); + (g, w) => g.SetNewScreen( new ClassicOptionsScreen( g ) ) ); } } diff --git a/ClassicalSharp/2D/Screens/Menu/MiscOptionsScreen.cs b/ClassicalSharp/2D/Screens/Menu/MiscOptionsScreen.cs index 67d6351b9..dc778311b 100644 --- a/ClassicalSharp/2D/Screens/Menu/MiscOptionsScreen.cs +++ b/ClassicalSharp/2D/Screens/Menu/MiscOptionsScreen.cs @@ -47,7 +47,7 @@ namespace ClassicalSharp { }), Make( 140, -50, "Auto close launcher", OnWidgetClick, - g => Options.GetBool( OptionsKey.AutoCloseLauncher, false ) ? "yes" : "no", + g => Options.GetBool( OptionsKey.AutoCloseLauncher, true ) ? "yes" : "no", (g, v) => Options.Set( OptionsKey.AutoCloseLauncher, v == "yes" ) ), Make( 140, 0, "Invert mouse", OnWidgetClick, diff --git a/ClassicalSharp/ClassicalSharp.csproj b/ClassicalSharp/ClassicalSharp.csproj index adbbdae1f..fc7401889 100644 --- a/ClassicalSharp/ClassicalSharp.csproj +++ b/ClassicalSharp/ClassicalSharp.csproj @@ -4,7 +4,7 @@ {BEB1C785-5CAD-48FF-A886-876BF0A318D4} Debug AnyCPU - WinExe + Exe ClassicalSharp ClassicalSharp v2.0 diff --git a/ClassicalSharp/Entities/EntityList.cs b/ClassicalSharp/Entities/EntityList.cs index 52316c838..d975b5f9f 100644 --- a/ClassicalSharp/Entities/EntityList.cs +++ b/ClassicalSharp/Entities/EntityList.cs @@ -27,7 +27,9 @@ namespace ClassicalSharp { this.game = game; game.Events.ChatFontChanged += ChatFontChanged; NamesMode = Options.GetEnum( OptionsKey.NamesMode, NameMode.AllNamesAndHovered ); + if( game.PureClassicMode ) NamesMode = NameMode.HoveredOnly; ShadowMode = Options.GetEnum( OptionsKey.EntityShadow, EntityShadow.None ); + if( game.PureClassicMode ) ShadowMode = EntityShadow.None; } /// Performs a tick call for all player entities contained in this list. diff --git a/ClassicalSharp/Entities/LocalPlayer.cs b/ClassicalSharp/Entities/LocalPlayer.cs index f3ea2b51b..2873fa0cd 100644 --- a/ClassicalSharp/Entities/LocalPlayer.cs +++ b/ClassicalSharp/Entities/LocalPlayer.cs @@ -36,10 +36,10 @@ namespace ClassicalSharp { Hacks = new HacksComponent( game, this ); Hacks.SpeedMultiplier = Options.GetFloat( OptionsKey.Speed, 0.1f, 50, 10 ); - Hacks.PushbackPlacing = Options.GetBool( OptionsKey.PushbackPlacing, false ); + Hacks.PushbackPlacing = !game.PureClassicMode && Options.GetBool( OptionsKey.PushbackPlacing, false ); Hacks.NoclipSlide = Options.GetBool( OptionsKey.NoclipSlide, false ); - Hacks.DoubleJump = Options.GetBool( OptionsKey.DoubleJump, false ); - Hacks.Enabled = Options.GetBool( OptionsKey.HacksEnabled, true ); + Hacks.DoubleJump = !game.PureClassicMode && Options.GetBool( OptionsKey.DoubleJump, false ); + Hacks.Enabled = !game.PureClassicMode && Options.GetBool( OptionsKey.HacksEnabled, true ); InitRenderingData(); } diff --git a/ClassicalSharp/Game/Game.cs b/ClassicalSharp/Game/Game.cs index 15bc1da8e..7489de4a0 100644 --- a/ClassicalSharp/Game/Game.cs +++ b/ClassicalSharp/Game/Game.cs @@ -51,6 +51,7 @@ namespace ClassicalSharp { Graphics.MakeGraphicsInfo(); Options.Load(); + PureClassicMode = Options.GetBool( "mode-classic", false ); Players = new EntityList( this ); AcceptedUrls.Load(); DeniedUrls.Load(); ViewDistance = Options.GetInt( OptionsKey.ViewDist, 16, 4096, 512 ); @@ -66,7 +67,6 @@ namespace ClassicalSharp { UseClassicTabList = Options.GetBool( OptionsKey.UseClassicTabList, false ); UseClassicOptions = Options.GetBool( OptionsKey.UseClassicOptions, false ); AllowCustomBlocks = Options.GetBool( OptionsKey.AllowCustomBlocks, true ); - PureClassicMode = Options.GetBool( "mode-classic", false ); UseCPE = Options.GetBool( OptionsKey.UseCPE, true ); AllowServerTextures = Options.GetBool( OptionsKey.AllowServerTextures, true ); @@ -78,7 +78,7 @@ namespace ClassicalSharp { ModelCache.InitCache(); AsyncDownloader = new AsyncDownloader( skinServer ); Drawer2D = new GdiPlusDrawer2D( Graphics ); - Drawer2D.UseBitmappedChat = !Options.GetBool( OptionsKey.ArialChatFont, false ); + Drawer2D.UseBitmappedChat = PureClassicMode || !Options.GetBool( OptionsKey.ArialChatFont, false ); ViewBobbing = Options.GetBool( OptionsKey.ViewBobbing, false ); ShowBlockInHand = Options.GetBool( OptionsKey.ShowBlockInHand, true ); InvertMouse = Options.GetBool( OptionsKey.InvertMouse, false ); @@ -142,7 +142,7 @@ namespace ClassicalSharp { MapBordersRenderer.Init(); Picking = new PickedPosRenderer( this ); AudioPlayer = new AudioPlayer( this ); - ModifiableLiquids = Options.GetBool( OptionsKey.ModifiableLiquids, false ); + ModifiableLiquids = !PureClassicMode && Options.GetBool( OptionsKey.ModifiableLiquids, false ); AxisLinesRenderer = new AxisLinesRenderer( this ); LoadIcon(); @@ -161,6 +161,8 @@ namespace ClassicalSharp { TabAutocomplete = Options.GetBool( OptionsKey.TabAutocomplete, false ); FontName = Options.Get( OptionsKey.FontName ) ?? "Arial"; + if( PureClassicMode ) FontName = "Arial"; + try { using( Font f = new Font( FontName, 16 ) ) { } } catch( Exception ) { diff --git a/ClassicalSharp/Network/NetworkProcessor.cs b/ClassicalSharp/Network/NetworkProcessor.cs index 7690696a2..8798c25d7 100644 --- a/ClassicalSharp/Network/NetworkProcessor.cs +++ b/ClassicalSharp/Network/NetworkProcessor.cs @@ -137,6 +137,7 @@ namespace ClassicalSharp { lastOpcode = (PacketId)opcode; Action handler = handlers[opcode]; lastPacket = DateTime.UtcNow; + Console.WriteLine( "IN " + lastOpcode ); if( handler == null ) throw new NotImplementedException( "Unsupported packet:" + (PacketId)opcode ); diff --git a/ClassicalSharp/Program.cs b/ClassicalSharp/Program.cs index 16f64aef3..dc77dcdec 100644 --- a/ClassicalSharp/Program.cs +++ b/ClassicalSharp/Program.cs @@ -25,6 +25,7 @@ namespace ClassicalSharp { Utils.LogDebug( "default.zip not found. Cannot start." ); return; } + Console.BufferHeight = short.MaxValue - 10; bool nullContext = true; #if !USE_DX diff --git a/Launcher2/Gui/Screens/MainScreen.cs b/Launcher2/Gui/Screens/MainScreen.cs index 5eeb5e250..913d89bd9 100644 --- a/Launcher2/Gui/Screens/MainScreen.cs +++ b/Launcher2/Gui/Screens/MainScreen.cs @@ -124,10 +124,6 @@ namespace Launcher { game.ClassicMode = !game.ClassicMode; Options.Load(); Options.Set( "mode-classic", game.ClassicMode ); - if( game.ClassicMode ) { - Options.Set( "namesmode", "AllNamesAndHovered" ); - Options.Set( "gui-arialchatfont", "false" ); - } Options.Set( "nostalgia-customblocks", !game.ClassicMode ); Options.Set( "nostalgia-usecpe", !game.ClassicMode ); @@ -135,8 +131,6 @@ namespace Launcher { Options.Set( "nostalgia-classictablist", game.ClassicMode ); Options.Set( "nostalgia-classicoptions", game.ClassicMode ); Options.Set( "nostalgia-classicgui", true ); - Options.Set( "hacksenabled", !game.ClassicMode ); - Options.Set( "doublejump", false ); Options.Save(); game.MakeBackground(); diff --git a/Launcher2/Utils/Client.cs b/Launcher2/Utils/Client.cs index 22df67dd4..3d9873ef9 100644 --- a/Launcher2/Utils/Client.cs +++ b/Launcher2/Utils/Client.cs @@ -58,7 +58,7 @@ namespace Launcher { // Make sure if the client has changed some settings in the meantime, we keep the changes if( !Options.Load() ) return; - shouldExit = Options.GetBool( OptionsKey.AutoCloseLauncher, false ); + shouldExit = Options.GetBool( OptionsKey.AutoCloseLauncher, true ); if( data == null ) return; Options.Set( "launcher-username", data.RealUsername );