Skip to content

Prototype manager clean up #6567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheShuEd wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Prototype manager clean up #6567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
273d747
file-scoping
TheShuEd May 12, 2026
bb758c9
server readonly
TheShuEd May 12, 2026
6ad2910
shared file scoped
TheShuEd May 12, 2026
af670c2
readonly + clean up
TheShuEd May 12, 2026
161780b
primary constructor for PrototypeValidationData
TheShuEd May 12, 2026
77e8428
Update PrototypeInheritanceTree.cs
TheShuEd May 12, 2026
265e7f9
Update MultiRootInheritanceGraph.cs
TheShuEd May 12, 2026
58ebc23
Update IPrototypeManager.cs
TheShuEd May 12, 2026
0afafdb
file scoped IPrototype
TheShuEd May 12, 2026
cad187e
primary constructors
TheShuEd May 12, 2026
847e6bf
Update Exceptions.cs
TheShuEd May 12, 2026
f6fbdfd
file scoped EntityPrototype
TheShuEd May 12, 2026
a28ce77
Update EntityPrototype.cs
TheShuEd May 12, 2026
bf6f38c
remove readonly dependency
TheShuEd May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 34 additions & 36 deletions Robust.Server/Prototypes/ServerPrototypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,58 +4,56 @@
using Robust.Server.Console;
using Robust.Server.Player;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Network;
using Robust.Shared.Network.Messages;
using Robust.Shared.Prototypes;

namespace Robust.Server.Prototypes
namespace Robust.Server.Prototypes;

public sealed partial class ServerPrototypeManager : PrototypeManager
{
public sealed partial class ServerPrototypeManager : PrototypeManager
{
#if TOOLS
[Dependency] private IPlayerManager _playerManager = default!;
[Dependency] private IConGroupController _conGroups = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;

@slarticodefast slarticodefast May 12, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dependencies should no longer be readonly, see #6549
So revert this

[Dependency] private readonly IConGroupController _conGroups = default!;
#endif
[Dependency] private INetManager _netManager = default!;
[Dependency] private IBaseServerInternal _server = default!;
[Dependency] private readonly INetManager _netManager = default!;
[Dependency] private readonly IBaseServerInternal _server = default!;

public ServerPrototypeManager()
{
RegisterIgnore("shader");
RegisterIgnore("uiTheme");
RegisterIgnore("font");
}
public ServerPrototypeManager()
{
RegisterIgnore("shader");
RegisterIgnore("uiTheme");
RegisterIgnore("font");
}

public override void Initialize()
{
base.Initialize();
public override void Initialize()
{
base.Initialize();

_netManager.RegisterNetMessage<MsgReloadPrototypes>(HandleReloadPrototypes, NetMessageAccept.Server);
}
_netManager.RegisterNetMessage<MsgReloadPrototypes>(HandleReloadPrototypes, NetMessageAccept.Server);
}

private void HandleReloadPrototypes(MsgReloadPrototypes msg)
{
private void HandleReloadPrototypes(MsgReloadPrototypes msg)
{
#if TOOLS
if (!_playerManager.TryGetSessionByChannel(msg.MsgChannel, out var player) ||
!_conGroups.CanAdminReloadPrototypes(player))
{
return;
}
if (!_playerManager.TryGetSessionByChannel(msg.MsgChannel, out var player) ||
!_conGroups.CanAdminReloadPrototypes(player))
{
return;
}

var sw = Stopwatch.StartNew();
var sw = Stopwatch.StartNew();

ReloadPrototypes(msg.Paths);
ReloadPrototypes(msg.Paths);

Sawmill.Info($"Reloaded prototypes in {sw.ElapsedMilliseconds} ms");
Sawmill.Info($"Reloaded prototypes in {sw.ElapsedMilliseconds} ms");
#endif
}
}

public override void LoadDefaultPrototypes(Dictionary<Type, HashSet<string>>? changed = null)
{
LoadDirectory(new("/EnginePrototypes/"), changed: changed);
LoadDirectory(_server.Options.PrototypeDirectory, changed: changed);
ResolveResults();
}
public override void LoadDefaultPrototypes(Dictionary<Type, HashSet<string>>? changed = null)
{
LoadDirectory(new("/EnginePrototypes/"), changed: changed);
LoadDirectory(_server.Options.PrototypeDirectory, changed: changed);
ResolveResults();
}
}
Loading
Loading