fix: Codegens spawners (#1678)
This commit is contained in:
Kamron Batman
GitHub
parent
48e47f9352
commit
5ada7a4e50
19 changed files with 1494 additions and 1604 deletions
|
|
@ -11,194 +11,193 @@ using Server.Logging;
|
|||
using Server.Network;
|
||||
using Server.Utilities;
|
||||
|
||||
namespace Server.Engines.Spawners
|
||||
namespace Server.Engines.Spawners;
|
||||
|
||||
public static class GenerateSpawnersCommand
|
||||
{
|
||||
public static class GenerateSpawnersCommand
|
||||
private static readonly ILogger logger = LogFactory.GetLogger(typeof(GenerateSpawnersCommand));
|
||||
|
||||
public static void Configure()
|
||||
{
|
||||
private static readonly ILogger logger = LogFactory.GetLogger(typeof(GenerateSpawnersCommand));
|
||||
CommandSystem.Register("GenerateSpawners", AccessLevel.Developer, GenerateSpawners_OnCommand);
|
||||
}
|
||||
|
||||
public static void Configure()
|
||||
[Usage("GenerateSpawners <relative search pattern to distribution>")]
|
||||
[Aliases("ImportSpawners", "GenSpawners", "GenSpawns")]
|
||||
[Description("Generates spawners from JSON files. Supports basic globbing.")]
|
||||
private static void GenerateSpawners_OnCommand(CommandEventArgs e)
|
||||
{
|
||||
var from = e.Mobile;
|
||||
|
||||
if (e.Arguments.Length == 0)
|
||||
{
|
||||
CommandSystem.Register("GenerateSpawners", AccessLevel.Developer, GenerateSpawners_OnCommand);
|
||||
from.SendMessage("Usage: [GenerateSpawners <relative search pattern to distribution>");
|
||||
return;
|
||||
}
|
||||
|
||||
[Usage("GenerateSpawners <relative search pattern to distribution>")]
|
||||
[Aliases("ImportSpawners", "GenSpawners", "GenSpawns")]
|
||||
[Description("Generates spawners from JSON files. Supports basic globbing.")]
|
||||
private static void GenerateSpawners_OnCommand(CommandEventArgs e)
|
||||
var di = new DirectoryInfo(Core.BaseDirectory);
|
||||
|
||||
var patternMatches = new Matcher()
|
||||
.AddInclude(e.Arguments[0])
|
||||
.Execute(new DirectoryInfoWrapper(di))
|
||||
.Files;
|
||||
|
||||
List<FileInfo> files = [];
|
||||
foreach (var match in patternMatches)
|
||||
{
|
||||
var from = e.Mobile;
|
||||
|
||||
if (e.Arguments.Length == 0)
|
||||
{
|
||||
from.SendMessage("Usage: [GenerateSpawners <relative search pattern to distribution>");
|
||||
return;
|
||||
}
|
||||
|
||||
var di = new DirectoryInfo(Core.BaseDirectory);
|
||||
|
||||
var patternMatches = new Matcher()
|
||||
.AddInclude(e.Arguments[0])
|
||||
.Execute(new DirectoryInfoWrapper(di))
|
||||
.Files;
|
||||
|
||||
List<FileInfo> files = new List<FileInfo>();
|
||||
foreach (var match in patternMatches)
|
||||
{
|
||||
files.Add(new FileInfo(match.Path));
|
||||
}
|
||||
|
||||
if (files.Count == 0)
|
||||
{
|
||||
from.SendMessage("GenerateSpawners: No files found matching the pattern");
|
||||
return;
|
||||
}
|
||||
|
||||
var watch = Stopwatch.StartNew();
|
||||
|
||||
var allSpawners = new Dictionary<Guid, ISpawner>();
|
||||
foreach (var item in World.Items.Values)
|
||||
{
|
||||
if (item is ISpawner spawner)
|
||||
{
|
||||
allSpawners[spawner.Guid] = spawner;
|
||||
}
|
||||
}
|
||||
|
||||
var options = JsonConfig.GetOptions(new TextDefinitionConverterFactory());
|
||||
var totalGenerated = 0;
|
||||
var totalFailures = 0;
|
||||
|
||||
for (var i = 0; i < files.Count; i++)
|
||||
{
|
||||
var file = files[i];
|
||||
from.SendMessage($"GenerateSpawners: Generating spawners from {file.Name}...");
|
||||
logger.Information("{User} is generating spawners from {File}", from, file.FullName);
|
||||
|
||||
NetState.FlushAll();
|
||||
|
||||
try
|
||||
{
|
||||
var spawners = JsonConfig.Deserialize<List<DynamicJson>>(file.FullName);
|
||||
ParseSpawnerList(spawners, options, allSpawners, out var generated, out var failed);
|
||||
totalGenerated += generated;
|
||||
totalFailures += failed;
|
||||
}
|
||||
catch (JsonException)
|
||||
{
|
||||
from.SendMessage(
|
||||
$"GenerateSpawners: Exception parsing {file.FullName}, file may not be in the correct format."
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
watch.Stop();
|
||||
|
||||
logger.Information(
|
||||
"Generated {Count} spawners ({Duration:F2} seconds, {Failures} failures)",
|
||||
totalGenerated,
|
||||
watch.Elapsed.TotalSeconds,
|
||||
totalFailures
|
||||
);
|
||||
|
||||
from.SendMessage(
|
||||
$"GenerateSpawners: Generated {totalGenerated} spawners ({watch.Elapsed.TotalSeconds:F2} seconds, {totalFailures} failures)"
|
||||
);
|
||||
files.Add(new FileInfo(match.Path));
|
||||
}
|
||||
|
||||
private static void ParseSpawnerList(
|
||||
List<DynamicJson> spawners,
|
||||
JsonSerializerOptions options,
|
||||
Dictionary<Guid, ISpawner> allSpawners,
|
||||
out int totalGenerated,
|
||||
out int failureCount
|
||||
)
|
||||
if (files.Count == 0)
|
||||
{
|
||||
failureCount = 0;
|
||||
totalGenerated = 0;
|
||||
from.SendMessage("GenerateSpawners: No files found matching the pattern");
|
||||
return;
|
||||
}
|
||||
|
||||
using var queue = PooledRefQueue<Item>.Create();
|
||||
for (var i = 0; i < spawners.Count; i++)
|
||||
var watch = Stopwatch.StartNew();
|
||||
|
||||
var allSpawners = new Dictionary<Guid, ISpawner>();
|
||||
foreach (var item in World.Items.Values)
|
||||
{
|
||||
if (item is ISpawner spawner)
|
||||
{
|
||||
var json = spawners[i];
|
||||
var type = AssemblyHandler.FindTypeByName(json.Type);
|
||||
|
||||
if (type == null || !typeof(BaseSpawner).IsAssignableFrom(type))
|
||||
{
|
||||
logger.Error($"Invalid spawner type {json.Type ?? "(-null-)"} ({i}).");
|
||||
failureCount++;
|
||||
continue;
|
||||
}
|
||||
|
||||
json.GetProperty("location", options, out Point3D location);
|
||||
json.GetProperty("map", options, out Map map);
|
||||
|
||||
// Delete all spawners at this location.
|
||||
// Probably shouldn't do this outside of migrations? Is there a better way to find/fix spawners?
|
||||
foreach (var spawner in map.GetItemsAt<BaseSpawner>(location))
|
||||
{
|
||||
if (spawner.GetType() == type)
|
||||
{
|
||||
queue.Enqueue(spawner);
|
||||
allSpawners.Remove(spawner.Guid);
|
||||
}
|
||||
}
|
||||
|
||||
while (queue.Count > 0)
|
||||
{
|
||||
queue.Dequeue().Delete();
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
var spawner = type.CreateInstance<ISpawner>(json, options);
|
||||
|
||||
spawner!.MoveToWorld(location, map);
|
||||
spawner!.Respawn();
|
||||
|
||||
if (allSpawners.Remove(spawner.Guid, out var oldSpawner))
|
||||
{
|
||||
oldSpawner.Delete();
|
||||
}
|
||||
|
||||
allSpawners.Add(spawner.Guid, spawner);
|
||||
totalGenerated++;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
json.GetProperty("guid", options, out Guid guid);
|
||||
TraceException(ex, $"Failed to generate spawner {guid}.");
|
||||
|
||||
failureCount++;
|
||||
}
|
||||
allSpawners[spawner.Guid] = spawner;
|
||||
}
|
||||
}
|
||||
|
||||
private static void TraceException(Exception ex, string message = "")
|
||||
var options = JsonConfig.GetOptions(new TextDefinitionConverterFactory());
|
||||
var totalGenerated = 0;
|
||||
var totalFailures = 0;
|
||||
|
||||
for (var i = 0; i < files.Count; i++)
|
||||
{
|
||||
var file = files[i];
|
||||
from.SendMessage($"GenerateSpawners: Generating spawners from {file.Name}...");
|
||||
logger.Information("{User} is generating spawners from {File}", from, file.FullName);
|
||||
|
||||
NetState.FlushAll();
|
||||
|
||||
try
|
||||
{
|
||||
using var op = new StreamWriter("spawner-errors.log", true);
|
||||
op.WriteLine("# {0}", Core.Now);
|
||||
var spawners = JsonConfig.Deserialize<List<DynamicJson>>(file.FullName);
|
||||
ParseSpawnerList(spawners, options, allSpawners, out var generated, out var failed);
|
||||
totalGenerated += generated;
|
||||
totalFailures += failed;
|
||||
}
|
||||
catch (JsonException)
|
||||
{
|
||||
from.SendMessage(
|
||||
$"GenerateSpawners: Exception parsing {file.FullName}, file may not be in the correct format."
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(message))
|
||||
watch.Stop();
|
||||
|
||||
logger.Information(
|
||||
"Generated {Count} spawners ({Duration:F2} seconds, {Failures} failures)",
|
||||
totalGenerated,
|
||||
watch.Elapsed.TotalSeconds,
|
||||
totalFailures
|
||||
);
|
||||
|
||||
from.SendMessage(
|
||||
$"GenerateSpawners: Generated {totalGenerated} spawners ({watch.Elapsed.TotalSeconds:F2} seconds, {totalFailures} failures)"
|
||||
);
|
||||
}
|
||||
|
||||
private static void ParseSpawnerList(
|
||||
List<DynamicJson> spawners,
|
||||
JsonSerializerOptions options,
|
||||
Dictionary<Guid, ISpawner> allSpawners,
|
||||
out int totalGenerated,
|
||||
out int failureCount
|
||||
)
|
||||
{
|
||||
failureCount = 0;
|
||||
totalGenerated = 0;
|
||||
|
||||
using var queue = PooledRefQueue<Item>.Create();
|
||||
for (var i = 0; i < spawners.Count; i++)
|
||||
{
|
||||
var json = spawners[i];
|
||||
var type = AssemblyHandler.FindTypeByName(json.Type);
|
||||
|
||||
if (type == null || !typeof(BaseSpawner).IsAssignableFrom(type))
|
||||
{
|
||||
logger.Error($"Invalid spawner type {json.Type ?? "(-null-)"} ({i}).");
|
||||
failureCount++;
|
||||
continue;
|
||||
}
|
||||
|
||||
json.GetProperty("location", options, out Point3D location);
|
||||
json.GetProperty("map", options, out Map map);
|
||||
|
||||
// Delete all spawners at this location.
|
||||
// Probably shouldn't do this outside of migrations? Is there a better way to find/fix spawners?
|
||||
foreach (var spawner in map.GetItemsAt<BaseSpawner>(location))
|
||||
{
|
||||
if (spawner.GetType() == type)
|
||||
{
|
||||
op.WriteLine(message);
|
||||
queue.Enqueue(spawner);
|
||||
allSpawners.Remove(spawner.Guid);
|
||||
}
|
||||
}
|
||||
|
||||
while (queue.Count > 0)
|
||||
{
|
||||
queue.Dequeue().Delete();
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
var spawner = type.CreateInstance<ISpawner>(json, options);
|
||||
|
||||
spawner!.MoveToWorld(location, map);
|
||||
spawner!.Respawn();
|
||||
|
||||
if (allSpawners.Remove(spawner.Guid, out var oldSpawner))
|
||||
{
|
||||
oldSpawner.Delete();
|
||||
}
|
||||
|
||||
op.WriteLine(ex);
|
||||
|
||||
op.WriteLine();
|
||||
op.WriteLine();
|
||||
allSpawners.Add(spawner.Guid, spawner);
|
||||
totalGenerated++;
|
||||
}
|
||||
catch
|
||||
catch (Exception ex)
|
||||
{
|
||||
// ignored
|
||||
}
|
||||
json.GetProperty("guid", options, out Guid guid);
|
||||
TraceException(ex, $"Failed to generate spawner {guid}.");
|
||||
|
||||
#if DEBUG
|
||||
logger.Error(ex, message);
|
||||
#endif
|
||||
failureCount++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void TraceException(Exception ex, string message = "")
|
||||
{
|
||||
try
|
||||
{
|
||||
using var op = new StreamWriter("spawner-errors.log", true);
|
||||
op.WriteLine("# {0}", Core.Now);
|
||||
|
||||
if (!string.IsNullOrEmpty(message))
|
||||
{
|
||||
op.WriteLine(message);
|
||||
}
|
||||
|
||||
op.WriteLine(ex);
|
||||
|
||||
op.WriteLine();
|
||||
op.WriteLine();
|
||||
}
|
||||
catch
|
||||
{
|
||||
// ignored
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
logger.Error(ex, message);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue