tribufu/ServerManagers
1
0
Fork 0
mirror of https://github.com/tribufu/ServerManagers synced 2026-06-01 09:42:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removal of ToList()

Browse source
This commit is contained in:
Brett Hewitson 2021-12-16 00:57:01 +10:00
parent 9f5cf132f0
commit 7af5f90e30
10 changed files with 48 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/ARKServerManager/Lib/GameData.cs
View file

@ -52,7 +52,7 @@ namespace ServerManagerTool.Lib
items = gameData.Items.ConvertAll(item => new PrimalItem { ClassName = item.ClassName, Mod = item.Mod, KnownItem = true, Category = item.Category }).ToArray(); items = gameData.Items.ConvertAll(item => new PrimalItem { ClassName = item.ClassName, Mod = item.Mod, KnownItem = true, Category = item.Category }).ToArray();
// resources // resources
resourceMultipliers = gameData.Items.Where(item => item.IsHarvestable).ToList().ConvertAll(item => new ResourceClassMultiplier { ClassName = item.ClassName, Mod = item.Mod, KnownResource = true }).ToArray(); resourceMultipliers = gameData.Items.Where(item => item.IsHarvestable).Select(item => new ResourceClassMultiplier { ClassName = item.ClassName, Mod = item.Mod, KnownResource = true }).ToArray();
// map spawners // map spawners
gameData.MapSpawners.AddRange(userGameData.MapSpawners); gameData.MapSpawners.AddRange(userGameData.MapSpawners);
@ -77,9 +77,9 @@ namespace ServerManagerTool.Lib
if (gameData.GameMaps.Count > 0) if (gameData.GameMaps.Count > 0)
{ {
var maps1 = gameMaps.ToList(); var maps1 = gameMaps.ToList();
maps1.AddRange(gameData.GameMaps.Where(item => !item.IsSotF).ToList().ConvertAll(item => new ComboBoxItem { ValueMember = item.ClassName, DisplayMember = item.Description })); maps1.AddRange(gameData.GameMaps.Where(item => !item.IsSotF).Select(item => new ComboBoxItem { ValueMember = item.ClassName, DisplayMember = item.Description }));
var maps2 = gameMapsSotF.ToList(); var maps2 = gameMapsSotF.ToList();
maps2.AddRange(gameData.GameMaps.Where(item => item.IsSotF).ToList().ConvertAll(item => new ComboBoxItem { ValueMember = item.ClassName, DisplayMember = item.Description })); maps2.AddRange(gameData.GameMaps.Where(item => item.IsSotF).Select(item => new ComboBoxItem { ValueMember = item.ClassName, DisplayMember = item.Description }));
gameMaps = maps1.ToArray(); gameMaps = maps1.ToArray();
gameMapsSotF = maps2.ToArray(); gameMapsSotF = maps2.ToArray();
@ -91,9 +91,9 @@ namespace ServerManagerTool.Lib
if (gameData.TotalConversions.Count > 0) if (gameData.TotalConversions.Count > 0)
{ {
var mods1 = totalConversions.ToList(); var mods1 = totalConversions.ToList();
mods1.AddRange(gameData.TotalConversions.Where(item => !item.IsSotF).ToList().ConvertAll(item => new ComboBoxItem { ValueMember = item.ClassName, DisplayMember = item.Description })); mods1.AddRange(gameData.TotalConversions.Where(item => !item.IsSotF).Select(item => new ComboBoxItem { ValueMember = item.ClassName, DisplayMember = item.Description }));
var mods2 = totalConversionsSotF.ToList(); var mods2 = totalConversionsSotF.ToList();
mods2.AddRange(gameData.TotalConversions.Where(item => item.IsSotF).ToList().ConvertAll(item => new ComboBoxItem { ValueMember = item.ClassName, DisplayMember = item.Description })); mods2.AddRange(gameData.TotalConversions.Where(item => item.IsSotF).Select(item => new ComboBoxItem { ValueMember = item.ClassName, DisplayMember = item.Description }));
totalConversions = mods1.ToArray(); totalConversions = mods1.ToArray();
totalConversionsSotF = mods2.ToArray(); totalConversionsSotF = mods2.ToArray();
@ -130,9 +130,9 @@ namespace ServerManagerTool.Lib
if (gameData.Branches.Count > 0) if (gameData.Branches.Count > 0)
{ {
var branches1 = branches.ToList(); var branches1 = branches.ToList();
branches1.AddRange(gameData.Branches.Where(item => !item.IsSotF).ToList().ConvertAll(item => new ComboBoxItem { ValueMember = item.BranchName, DisplayMember = item.Description })); branches1.AddRange(gameData.Branches.Where(item => !item.IsSotF).Select(item => new ComboBoxItem { ValueMember = item.BranchName, DisplayMember = item.Description }));
var branches2 = branchesSotF.ToList(); var branches2 = branchesSotF.ToList();
branches2.AddRange(gameData.Branches.Where(item => item.IsSotF).ToList().ConvertAll(item => new ComboBoxItem { ValueMember = item.BranchName, DisplayMember = item.Description })); branches2.AddRange(gameData.Branches.Where(item => item.IsSotF).Select(item => new ComboBoxItem { ValueMember = item.BranchName, DisplayMember = item.Description }));
branches = branches1.ToArray(); branches = branches1.ToArray();
branchesSotF = branches2.ToArray(); branchesSotF = branches2.ToArray();
@ -144,9 +144,9 @@ namespace ServerManagerTool.Lib
if (gameData.Events.Count > 0) if (gameData.Events.Count > 0)
{ {
var events1 = events.ToList(); var events1 = events.ToList();
events1.AddRange(gameData.Events.Where(item => !item.IsSotF).ToList().ConvertAll(item => new ComboBoxItem { ValueMember = item.EventName, DisplayMember = item.Description })); events1.AddRange(gameData.Events.Where(item => !item.IsSotF).Select(item => new ComboBoxItem { ValueMember = item.EventName, DisplayMember = item.Description }));
var events2 = eventsSotF.ToList(); var events2 = eventsSotF.ToList();
events2.AddRange(gameData.Events.Where(item => item.IsSotF).ToList().ConvertAll(item => new ComboBoxItem { ValueMember = item.EventName, DisplayMember = item.Description })); events2.AddRange(gameData.Events.Where(item => item.IsSotF).Select(item => new ComboBoxItem { ValueMember = item.EventName, DisplayMember = item.Description }));
events = events1.ToArray(); events = events1.ToArray();
eventsSotF = events2.ToArray(); eventsSotF = events2.ToArray();
@ -157,7 +157,7 @@ namespace ServerManagerTool.Lib
if (gameData.OfficialMods.Count > 0) if (gameData.OfficialMods.Count > 0)
{ {
ModUtils.AddOfficialMods(gameData.OfficialMods.Where(m => !string.IsNullOrWhiteSpace(m.ModId)).Select(m => m.ModId)); ModUtils.AddOfficialMods(gameData.OfficialMods.Where(m => !string.IsNullOrWhiteSpace(m.ModId)).Select(m => m.ModId).ToList());
} }
} }

1
src/ARKServerManager/Lib/Model/NPCSpawner.cs
View file

@ -6,7 +6,6 @@ using ServerManagerTool.Enums;
using ServerManagerTool.Interface; using ServerManagerTool.Interface;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.Text; using System.Text;

4
src/ARKServerManager/Lib/ServerApp.cs
View file

@ -452,8 +452,8 @@ namespace ServerManagerTool.Lib
{ {
try try
{ {
var playerInfo = gameServer?.GetPlayers()?.Where(p => !string.IsNullOrWhiteSpace(p.Name?.Trim())).ToList(); var playerInfo = gameServer?.GetPlayers()?.Where(p => !string.IsNullOrWhiteSpace(p.Name?.Trim()));
var playerCount = playerInfo?.Count ?? -1; var playerCount = playerInfo?.Count() ?? -1;
// check if anyone is logged into the server // check if anyone is logged into the server
if (playerCount <= 0) if (playerCount <= 0)

4
src/ARKServerManager/Lib/ServerProfile.cs
View file

@ -4978,7 +4978,7 @@ namespace ServerManagerTool.Lib
var csvMapper = new CsvDinoLevelMapping(); var csvMapper = new CsvDinoLevelMapping();
var csvParser = new CsvParser<ImportLevel>(csvParserOptions, csvMapper); var csvParser = new CsvParser<ImportLevel>(csvParserOptions, csvMapper);
var result = csvParser.ReadFromFile(fileName, Encoding.ASCII).ToList(); var result = csvParser.ReadFromFile(fileName, Encoding.ASCII);
if (result.Any(r => !r.IsValid)) if (result.Any(r => !r.IsValid))
{ {
var error = result.First(r => r.Error != null); var error = result.First(r => r.Error != null);
@ -5005,7 +5005,7 @@ namespace ServerManagerTool.Lib
var csvMapper = new CsvPlayerLevelMapping(); var csvMapper = new CsvPlayerLevelMapping();
var csvParser = new CsvParser<ImportLevel>(csvParserOptions, csvMapper); var csvParser = new CsvParser<ImportLevel>(csvParserOptions, csvMapper);
var result = csvParser.ReadFromFile(fileName, Encoding.ASCII).ToList(); var result = csvParser.ReadFromFile(fileName, Encoding.ASCII);
if (result.Any(r => !r.IsValid)) if (result.Any(r => !r.IsValid))
{ {
var error = result.First(r => r.Error != null); var error = result.First(r => r.Error != null);

2
src/ARKServerManager/Lib/ServerProfileSnapshot.cs
View file

@ -29,7 +29,7 @@ namespace ServerManagerTool.Lib
public string ServerMap; public string ServerMap;
public string ServerMapModId; public string ServerMapModId;
public string TotalConversionModId; public string TotalConversionModId;
public List<string> ServerModIds; public IEnumerable<string> ServerModIds;
public string MOTD; public string MOTD;
public int MotDDuration; public int MotDDuration;
public bool MOTDIntervalEnabled; public bool MOTDIntervalEnabled;

29
src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
View file

@ -1406,7 +1406,8 @@ namespace ServerManagerTool
{ {
Settings.DinoSettings.RenderToModel(); Settings.DinoSettings.RenderToModel();
var iniValues = Settings.DinoSpawnWeightMultipliers.ToIniValues().ToList(); var iniValues = new List<string>();
iniValues.AddRange(Settings.DinoSpawnWeightMultipliers.ToIniValues());
iniValues.AddRange(Settings.PreventDinoTameClassNames.ToIniValues()); iniValues.AddRange(Settings.PreventDinoTameClassNames.ToIniValues());
iniValues.AddRange(Settings.NPCReplacements.ToIniValues()); iniValues.AddRange(Settings.NPCReplacements.ToIniValues());
iniValues.AddRange(Settings.DinoClassDamageMultipliers.ToIniValues()); iniValues.AddRange(Settings.DinoClassDamageMultipliers.ToIniValues());
@ -1487,7 +1488,7 @@ namespace ServerManagerTool
private void SaveCustomResources_Click(object sender, RoutedEventArgs e) private void SaveCustomResources_Click(object sender, RoutedEventArgs e)
{ {
var iniValues = Settings.HarvestResourceItemAmountClassMultipliers.ToIniValues().ToList(); var iniValues = Settings.HarvestResourceItemAmountClassMultipliers.ToIniValues();
var iniValue = string.Join("\r\n", iniValues); var iniValue = string.Join("\r\n", iniValues);
var window = new CommandLineWindow(iniValue); var window = new CommandLineWindow(iniValue);
@ -1716,7 +1717,8 @@ namespace ServerManagerTool
Settings.EngramSettings.OnlyAllowSpecifiedEngrams = Settings.OnlyAllowSpecifiedEngrams; Settings.EngramSettings.OnlyAllowSpecifiedEngrams = Settings.OnlyAllowSpecifiedEngrams;
Settings.EngramSettings.RenderToModel(); Settings.EngramSettings.RenderToModel();
var iniValues = Settings.OverrideNamedEngramEntries.ToIniValues().ToList(); var iniValues = new List<string>();
iniValues.AddRange(Settings.OverrideNamedEngramEntries.ToIniValues());
iniValues.AddRange(Settings.EngramEntryAutoUnlocks.ToIniValues()); iniValues.AddRange(Settings.EngramEntryAutoUnlocks.ToIniValues());
var iniValue = string.Join("\r\n", iniValues); var iniValue = string.Join("\r\n", iniValues);
@ -1822,7 +1824,8 @@ namespace ServerManagerTool
private void SaveCraftingOverride_Click(object sender, RoutedEventArgs e) private void SaveCraftingOverride_Click(object sender, RoutedEventArgs e)
{ {
var iniValues = Settings.ConfigOverrideItemCraftingCosts.ToIniValues().ToList(); var iniValues = new List<string>();
iniValues.AddRange(Settings.ConfigOverrideItemCraftingCosts.ToIniValues());
var iniValue = string.Join("\r\n", iniValues); var iniValue = string.Join("\r\n", iniValues);
var window = new CommandLineWindow(iniValue); var window = new CommandLineWindow(iniValue);
@ -2966,7 +2969,8 @@ namespace ServerManagerTool
{ {
Settings.NPCSpawnSettings.RenderToModel(); Settings.NPCSpawnSettings.RenderToModel();
var iniValues = Settings.ConfigAddNPCSpawnEntriesContainer.ToIniValues().ToList(); var iniValues = new List<string>();
iniValues.AddRange(Settings.ConfigAddNPCSpawnEntriesContainer.ToIniValues());
iniValues.AddRange(Settings.ConfigSubtractNPCSpawnEntriesContainer.ToIniValues()); iniValues.AddRange(Settings.ConfigSubtractNPCSpawnEntriesContainer.ToIniValues());
iniValues.AddRange(Settings.ConfigOverrideNPCSpawnEntriesContainer.ToIniValues()); iniValues.AddRange(Settings.ConfigOverrideNPCSpawnEntriesContainer.ToIniValues());
var iniValue = string.Join("\r\n", iniValues); var iniValue = string.Join("\r\n", iniValues);
@ -3199,7 +3203,8 @@ namespace ServerManagerTool
{ {
Settings.ConfigOverrideSupplyCrateItems.RenderToModel(); Settings.ConfigOverrideSupplyCrateItems.RenderToModel();
var iniValues = Settings.ConfigOverrideSupplyCrateItems.ToIniValues().ToList(); var iniValues = new List<string>();
iniValues.AddRange(Settings.ConfigOverrideSupplyCrateItems.ToIniValues());
var iniValue = string.Join("\r\n", iniValues); var iniValue = string.Join("\r\n", iniValues);
var window = new CommandLineWindow(iniValue); var window = new CommandLineWindow(iniValue);
@ -3301,7 +3306,8 @@ namespace ServerManagerTool
{ {
Settings.ConfigOverrideItemMaxQuantity.RenderToModel(); Settings.ConfigOverrideItemMaxQuantity.RenderToModel();
var iniValues = Settings.ConfigOverrideItemMaxQuantity.ToIniValues().ToList(); var iniValues = new List<string>();
iniValues.AddRange(Settings.ConfigOverrideItemMaxQuantity.ToIniValues());
var iniValue = string.Join("\r\n", iniValues); var iniValue = string.Join("\r\n", iniValues);
var window = new CommandLineWindow(iniValue); var window = new CommandLineWindow(iniValue);
@ -3401,7 +3407,8 @@ namespace ServerManagerTool
{ {
Settings.PreventTransferForClassNames.RenderToModel(); Settings.PreventTransferForClassNames.RenderToModel();
var iniValues = Settings.PreventTransferForClassNames.ToIniValues().ToList(); var iniValues = new List<string>();
iniValues.AddRange(Settings.PreventTransferForClassNames.ToIniValues());
var iniValue = string.Join("\r\n", iniValues); var iniValue = string.Join("\r\n", iniValues);
var window = new CommandLineWindow(iniValue); var window = new CommandLineWindow(iniValue);
@ -3442,7 +3449,7 @@ namespace ServerManagerTool
var name = _globalizer.GetResourceString($"Mod_{value}"); var name = _globalizer.GetResourceString($"Mod_{value}");
newList.Add(new Common.Model.ComboBoxItem(value, name)); newList.Add(new Common.Model.ComboBoxItem(value, name));
var values = GameData.GetDinoSpawns().GroupBy(d => d.Mod).OrderBy(g => g.Key).Select(g => g.Key).ToList(); var values = GameData.GetDinoSpawns().GroupBy(d => d.Mod).OrderBy(g => g.Key).Select(g => g.Key);
foreach (var modValue in values) foreach (var modValue in values)
{ {
if (string.IsNullOrWhiteSpace(modValue)) if (string.IsNullOrWhiteSpace(modValue))
@ -3472,7 +3479,7 @@ namespace ServerManagerTool
var name = _globalizer.GetResourceString($"Mod_{value}"); var name = _globalizer.GetResourceString($"Mod_{value}");
newList.Add(new Common.Model.ComboBoxItem(value, name)); newList.Add(new Common.Model.ComboBoxItem(value, name));
var values = GameData.GetEngrams().GroupBy(d => d.Mod).OrderBy(g => g.Key).Select(g => g.Key).ToList(); var values = GameData.GetEngrams().GroupBy(d => d.Mod).OrderBy(g => g.Key).Select(g => g.Key);
foreach (var modValue in values) foreach (var modValue in values)
{ {
if (string.IsNullOrWhiteSpace(modValue)) if (string.IsNullOrWhiteSpace(modValue))
@ -3502,7 +3509,7 @@ namespace ServerManagerTool
var name = _globalizer.GetResourceString($"Mod_{value}"); var name = _globalizer.GetResourceString($"Mod_{value}");
newList.Add(new Common.Model.ComboBoxItem(value, name)); newList.Add(new Common.Model.ComboBoxItem(value, name));
var values = GameData.GetResourceMultipliers().GroupBy(d => d.Mod).OrderBy(g => g.Key).Select(g => g.Key).ToList(); var values = GameData.GetResourceMultipliers().GroupBy(d => d.Mod).OrderBy(g => g.Key).Select(g => g.Key);
foreach (var modValue in values) foreach (var modValue in values)
{ {
if (string.IsNullOrWhiteSpace(modValue)) if (string.IsNullOrWhiteSpace(modValue))

22
src/ARKServerManager/Utils/ModUtils.cs
View file

@ -46,15 +46,15 @@ namespace ServerManagerTool.Utils
} }
} }
public static void AddOfficialMods(IEnumerable<string> modIds) public static void AddOfficialMods(List<string> modIds)
{ {
if (OfficialMods == null) if (OfficialMods == null)
OfficialMods = new List<string>(); OfficialMods = new List<string>();
if (modIds != null) if (modIds != null)
{ {
var modIdsToAdd = modIds.Where(m => !string.IsNullOrWhiteSpace(m) && !OfficialMods.Contains(m)).Distinct().ToList(); var modIdsToAdd = modIds.Where(m => !string.IsNullOrWhiteSpace(m) && !OfficialMods.Contains(m)).Distinct();
if (modIdsToAdd != null && modIdsToAdd.Count > 0) if (modIdsToAdd.Any())
{ {
OfficialMods.AddRange(modIdsToAdd); OfficialMods.AddRange(modIdsToAdd);
} }
@ -170,14 +170,14 @@ namespace ServerManagerTool.Utils
return string.Empty; return string.Empty;
// split the map string into parts, using the '/' separator. // split the map string into parts, using the '/' separator.
var parts = serverMap.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries).ToList(); var parts = serverMap.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
long mapModId; long mapModId;
if (parts.Count == 1 && long.TryParse(parts[0], out mapModId)) if (parts.Length == 1 && long.TryParse(parts[0], out mapModId))
return mapModId.ToString(); return mapModId.ToString();
// check if any parts were returned. // check if any parts were returned.
if (parts.Count != 4) if (parts.Length != 4)
return string.Empty; return string.Empty;
// check if the first two parts match what is expected. // check if the first two parts match what is expected.
@ -194,12 +194,12 @@ namespace ServerManagerTool.Utils
return string.Empty; return string.Empty;
// split the map string into parts, using the '/' separator. // split the map string into parts, using the '/' separator.
var parts = serverMap.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries).ToList(); var parts = serverMap.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
// check if any parts were returned. // check if any parts were returned.
if (parts.Count == 1) if (parts.Length == 1)
return serverMap; return serverMap;
if (parts.Count != 4) if (parts.Length != 4)
return string.Empty; return string.Empty;
// check if the first two parts match what is expected. // check if the first two parts match what is expected.
@ -496,9 +496,9 @@ namespace ServerManagerTool.Utils
return new List<string>(); return new List<string>();
// remove all null, empty, duplicate and Official mod ids. // remove all null, empty, duplicate and Official mod ids.
var newModIdList = modIdList.Where(m => !string.IsNullOrWhiteSpace(m) && !IsOfficialMod(m)).Distinct().ToList(); var newModIdList = modIdList.Where(m => !string.IsNullOrWhiteSpace(m) && !IsOfficialMod(m)).Distinct();
return newModIdList; return newModIdList.ToList();
} }
public static void WriteModFile(string fileName, string modId, Dictionary<string, string> metaInformation, List<string> mapNames) public static void WriteModFile(string fileName, string modId, Dictionary<string, string> metaInformation, List<string> mapNames)

2
src/ArkData/DataContainerBase.cs
View file

@ -45,7 +45,7 @@ namespace ArkData
{ {
try try
{ {
var online = Enumerable.OfType<PlayerInfo>(new SSQL().Players(new IPEndPoint(IPAddress.Parse(ipString), port))).ToList(); var online = Enumerable.OfType<PlayerInfo>(new SSQL().Players(new IPEndPoint(IPAddress.Parse(ipString), port)));
for (var i = 0; i < Players.Count; i++) for (var i = 0; i < Players.Count; i++)
{ {

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

@ -456,8 +456,8 @@ namespace ServerManagerTool.Lib
// BH - commented out until Funcom fix the Online player status column in the world save database // BH - commented out until Funcom fix the Online player status column in the world save database
//var gameFile = GetServerWorldFile(); //var gameFile = GetServerWorldFile();
//var playerCount = DataContainer.GetOnlinePlayerCount(gameFile); //var playerCount = DataContainer.GetOnlinePlayerCount(gameFile);
var playerInfo = gameServer?.GetPlayers()?.Where(p => !string.IsNullOrWhiteSpace(p.Name?.Trim())).ToList(); var playerInfo = gameServer?.GetPlayers()?.Where(p => !string.IsNullOrWhiteSpace(p.Name?.Trim()));
var playerCount = playerInfo?.Count ?? -1; var playerCount = playerInfo?.Count() ?? -1;
// check if anyone is logged into the server // check if anyone is logged into the server
if (playerCount <= 0) if (playerCount <= 0)

2
src/ServerManager.Common/Model/PlayerUserList.cs
View file

@ -23,7 +23,7 @@ namespace ServerManagerTool.Common.Model
} }
} }
public static PlayerUserList GetList(SteamUserDetailResponse response, string[] ids) public static PlayerUserList GetList(SteamUserDetailResponse response, IEnumerable<string> ids)
{ {
var result = new PlayerUserList(); var result = new PlayerUserList();
if (ids != null) if (ids != null)