zervo/SRMP-Public
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added more to the console

Browse source
This commit is contained in:
Twirlbug 2023-06-29 01:20:50 -05:00
parent f5a0de8126
commit 4747c67882
3 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
SRMP/Console/SRMPConsole.cs
View file

@ -13,8 +13,8 @@ namespace SRMultiplayer
{ {
CLIENT, CLIENT,
SERVER, SERVER,
PLAYERAMMO PLAYERAMMO,
EXCHANGE
} }
@ -48,6 +48,7 @@ namespace SRMultiplayer
//server automatically starts with all active //server automatically starts with all active
List<LogType> blockMessages = new List<LogType>(); //keeps a list of message types that have been disabled List<LogType> blockMessages = new List<LogType>(); //keeps a list of message types that have been disabled
List<LogItems> blockLogs = new List<LogItems>(); //keeps a list of log message types that have been disabled List<LogItems> blockLogs = new List<LogItems>(); //keeps a list of log message types that have been disabled
bool DisplayTrace = false;
private void Application_logMessageReceived(string condition, string stackTrace, LogType type) private void Application_logMessageReceived(string condition, string stackTrace, LogType type)
{ {
// We're half way through typing something, so clear this line .. // We're half way through typing something, so clear this line ..
@ -56,7 +57,7 @@ namespace SRMultiplayer
//construct message //construct message
string message = condition; string message = condition;
if (!string.IsNullOrEmpty(stackTrace)) if (!string.IsNullOrEmpty(stackTrace) && DisplayTrace)
{ {
//add stack strace if included //add stack strace if included
message += Environment.NewLine + stackTrace; message += Environment.NewLine + stackTrace;
@ -96,7 +97,7 @@ namespace SRMultiplayer
string data = condition; string data = condition;
//remove the srmp tag and the time to check inner tags //remove the srmp tag and the time to check inner tags
if (type == LogType.Log) if (type == LogType.Log && data.StartsWith("[SRMP]"))
{ {
data = data.Substring(17); data = data.Substring(17);
@ -104,7 +105,7 @@ namespace SRMultiplayer
if (displayLog) if (displayLog)
{ {
//try to pase the log message //try to pase the log message
if(Enum.TryParse(data.Split("]")[0].Substring(1), true, out LogItems logMessage)) if (Enum.TryParse(data.Split("]"[0])[0].Substring(1), true, out LogItems logMessage))
{ {
if (blockLogs.Contains(logMessage)) displayLog = false; if (blockLogs.Contains(logMessage)) displayLog = false;
} }
@ -126,7 +127,7 @@ namespace SRMultiplayer
{ {
//for testing log disabled display //for testing log disabled display
//Console.ForegroundColor = ConsoleColor.Magenta; //Console.ForegroundColor = ConsoleColor.Magenta;
//Console.WriteLine(type.ToString() + " Dismissed"); Console.WriteLine(type.ToString() + " Dismissed");
//mark dupilcate count to -1 //mark dupilcate count to -1
//prevent duplicate count for supressed messages from displaying //prevent duplicate count for supressed messages from displaying
@ -140,14 +141,6 @@ namespace SRMultiplayer
input.RedrawInputLine(); input.RedrawInputLine();
} }
public static void ClearCurrentConsoleLine()
{
int currentLineCursor = Console.CursorTop;
Console.SetCursorPosition(0, Console.CursorTop);
Console.Write(new string(' ', Console.BufferWidth));
Console.SetCursorPosition(0, currentLineCursor);
}
//create a log call that marks all console sent replys //create a log call that marks all console sent replys
void ConsoleLog(string message) void ConsoleLog(string message)
{ {
@ -352,9 +345,21 @@ namespace SRMultiplayer
else else
{ {
if (blockLogs.Contains(logMessage)) blockLogs.Add(logMessage); if (blockLogs.Contains(logMessage)) blockLogs.Add(logMessage);
ConsoleLog("[Console] " + logMessage.ToString() + " Log Messages Disabled"); ConsoleLog(logMessage.ToString() + " Log Messages Disabled");
}
}else if (args[1].Equals("stacktrace", StringComparison.InvariantCultureIgnoreCase) || args[1].Equals("stack_trace", StringComparison.InvariantCultureIgnoreCase))
{
if (enable)
{
DisplayTrace = true;
ConsoleLog("Stack Trace Information Enabled");
}
else
{
DisplayTrace = false;
ConsoleLog("Stack Trace Information Disabled");
}
} }
}
else else
{ {
ConsoleLog("Invalid Feed back Type"); ConsoleLog("Invalid Feed back Type");

3
SRMP/MultiplayerUI.cs
View file

@ -193,9 +193,8 @@ public class MultiplayerUI : SRSingleton<MultiplayerUI>
canHost = false; canHost = false;
} }
GUI.contentColor = Color.red;
GUILayout.BeginHorizontal(); GUILayout.BeginHorizontal();
GUILayout.Label("Connection Status: Disconnected"); GUILayout.Label("Connection Status: Disconnected", red);
GUILayout.FlexibleSpace(); GUILayout.FlexibleSpace();
if (canHost) if (canHost)

7
SRMP/SRMP.csproj
View file

@ -16,7 +16,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>portable</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>..\Builds\SRMP\</OutputPath> <OutputPath>..\Builds\SRMP\</OutputPath>
<DefineConstants>__CONSTRAINED__;Standalone</DefineConstants> <DefineConstants>__CONSTRAINED__;Standalone</DefineConstants>
@ -94,11 +94,6 @@
<HintPath>..\Libs\Newtonsoft.Json.dll</HintPath> <HintPath>..\Libs\Newtonsoft.Json.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="SRML, Version=0.1.8.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Libs\SRML.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />