Tribufu/ServerManagers
1
0
Fork 0
mirror of https://github.com/Tribufu/ServerManagers synced 2026-08-08 12:11:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rcon Command Changes

Browse source 
- moved the rcon commands to the gamedata files, so they can be extended.
This commit is contained in:
Brett Hewitson 2022-06-14 12:55:58 +10:00
parent f3ff807cd0
commit e7100e6323
18 changed files with 266 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/ConanServerManager/Lib/GameData.cs
View file

@ -10,6 +10,8 @@ namespace ServerManagerTool.Lib
{
public static class GameData
{
public const string RCONINPUTMODE_COMMAND = "Command";
public static string MainDataFolder = Path.Combine(Environment.CurrentDirectory, Config.Default.GameDataRelativePath);
public static string UserDataFolder = Path.Combine(Config.Default.DataPath, Config.Default.GameDataRelativePath);
@ -59,6 +61,17 @@ namespace ServerManagerTool.Lib
serverRegions = allServerRegions.ToArray();
}
// rcon input modes
gameData.RconInputModes.AddRange(userGameData.RconInputModes);
if (gameData.RconInputModes.Count > 0)
{
var modes1 = rconInputModes.ToList();
modes1.AddRange(gameData.RconInputModes.Select(item => new ComboBoxItem { ValueMember = item.Command, DisplayMember = item.Description }));
rconInputModes = modes1.ToArray();
}
}
public static string FriendlyNameForClass(string className, bool returnNullIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? (returnNullIfNotFound ? null : string.Empty) : GlobalizedApplication.Instance.GetResourceString(className) ?? (returnNullIfNotFound ? null : className);
@ -94,5 +107,18 @@ namespace ServerManagerTool.Lib
public static string FriendlyServerRegionName(string regionNumber, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(regionNumber) ? string.Empty : GlobalizedApplication.Instance.GetResourceString($"ServerRegion_{regionNumber}") ?? gameData?.ServerRegions?.FirstOrDefault(i => i.RegionNumber.Equals(regionNumber))?.Description ?? (returnEmptyIfNotFound ? string.Empty : regionNumber);
#endregion
#region Rcon Message Modes
private static ComboBoxItem[] rconInputModes = new[]
{
new ComboBoxItem { ValueMember=RCONINPUTMODE_COMMAND, DisplayMember=FriendlyNameForClass($"InputMode_{RCONINPUTMODE_COMMAND}") },
};
public static IEnumerable<ComboBoxItem> GetAllRconInputModes() => rconInputModes.Select(m => m.Duplicate());
public static IEnumerable<ComboBoxItem> GetMessageRconInputModes() => rconInputModes.Where(m => !m.ValueMember.Equals(RCONINPUTMODE_COMMAND, StringComparison.OrdinalIgnoreCase)).Select(m => m.Duplicate());
public static string FriendlyRconInputModeName(string rconInputMode, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(rconInputMode) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("InputMode_" + rconInputMode) ?? gameData?.RconInputModes?.FirstOrDefault(i => i.Command.Equals(rconInputMode))?.Description ?? (returnEmptyIfNotFound ? string.Empty : rconInputMode);
#endregion
}
}

12
src/ConanServerManager/Lib/ServerApp.cs
View file

@ -2306,17 +2306,7 @@ namespace ServerManagerTool.Lib
private static string GetRconMessageCommand(string commandValue)
{
switch (commandValue.ToLower())
{
case "alert":
return ServerRcon.RCON_COMMAND_ALERT;
case "server":
return ServerRcon.RCON_COMMAND_SERVER;
default:
return ServerRcon.RCON_COMMAND_BROADCAST;
}
return commandValue.ToLower();
}
public static string GetServerBackupFolder(ServerProfile profile)

24
src/ConanServerManager/Lib/ServerRcon.cs
View file

@ -26,9 +26,6 @@ namespace ServerManagerTool.Lib
private const string NoResponseMatch = "Server received, But no response!!";
public const string NoResponseOutput = "NO_RESPONSE";
public const string RCON_COMMAND_BROADCAST = "broadcast";
public const string RCON_COMMAND_ALERT = "alert";
public const string RCON_COMMAND_SERVER = "server";
public const string RCON_COMMAND_LISTPLAYERS = "listplayers";
public event EventHandler PlayersCollectionUpdated;
@ -274,22 +271,13 @@ namespace ServerManagerTool.Lib
command.suppressOutput = command.lines.Count() == 0;
}
if (command?.command?.Equals(RCON_COMMAND_BROADCAST, StringComparison.OrdinalIgnoreCase) ?? false)
foreach (var item in GameData.GetMessageRconInputModes())
{
LogEvent(LogEventType.Chat, command.rawCommand);
command.suppressOutput = true;
}
if (command?.command?.Equals(RCON_COMMAND_ALERT, StringComparison.OrdinalIgnoreCase) ?? false)
{
LogEvent(LogEventType.Chat, command.rawCommand);
command.suppressOutput = true;
}
if (command?.command?.Equals(RCON_COMMAND_SERVER, StringComparison.OrdinalIgnoreCase) ?? false)
{
LogEvent(LogEventType.Chat, command.rawCommand);
command.suppressOutput = true;
if (command?.command?.Equals(item.ValueMember, StringComparison.OrdinalIgnoreCase) ?? false)
{
LogEvent(LogEventType.Chat, command.rawCommand);
command.suppressOutput = true;
}
}
}