juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert the other arch changes (#21871)

Browse Source
This commit is contained in:
metalgearsloth
2023-11-24 11:19:46 +11:00
committed by GitHub
parent 15052bf7c2
commit d4bed09cdc
32 changed files with 108 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Administration/Commands/ControlMob.cs
View File

@@ -33,15 +33,15 @@ namespace Content.Server.Administration.Commands
return;
}
var targetNet = new NetEntity(targetId);
var target = new EntityUid(targetId);
if (!_entities.TryGetEntity(targetNet, out var target))
if (!target.IsValid() || !_entities.EntityExists(target))
{
shell.WriteLine(Loc.GetString("shell-invalid-entity-id"));
return;
}
_entities.System<MindSystem>().ControlMob(player.UserId, target.Value);
_entities.System<MindSystem>().ControlMob(player.UserId, target);
}
}
}

21
Content.Server/Administration/Commands/OwoifyCommand.cs
View File

@@ -8,8 +8,6 @@ namespace Content.Server.Administration.Commands;
[AdminCommand(AdminFlags.Fun)]
public sealed class OwoifyCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
public string Command => "owoify";
public string Description => "For when you need everything to be cat. Uses OwOAccent's formatting on the name and description of an entity.";
@@ -24,25 +22,22 @@ public sealed class OwoifyCommand : IConsoleCommand
return;
}
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!int.TryParse(args[0], out var targetId))
{
shell.WriteLine(Loc.GetString("shell-argument-must-be-number"));
return;
}
var nent = new NetEntity(targetId);
var eUid = new EntityUid(targetId);
if (!_entManager.TryGetEntity(nent, out var eUid))
{
return;
}
var meta = entityManager.GetComponent<MetaDataComponent>(eUid);
var meta = _entManager.GetComponent<MetaDataComponent>(eUid.Value);
var owoSys = entityManager.System<OwOAccentSystem>();
var metaDataSys = entityManager.System<MetaDataSystem>();
var owoSys = _entManager.System<OwOAccentSystem>();
var metaDataSys = _entManager.System<MetaDataSystem>();
metaDataSys.SetEntityName(eUid.Value, owoSys.Accentuate(meta.EntityName), meta);
metaDataSys.SetEntityDescription(eUid.Value, owoSys.Accentuate(meta.EntityDescription), meta);
metaDataSys.SetEntityName(eUid, owoSys.Accentuate(meta.EntityName), meta);
metaDataSys.SetEntityDescription(eUid, owoSys.Accentuate(meta.EntityDescription), meta);
}
}

15
Content.Server/Administration/Commands/SetMindCommand.cs
View File

@@ -11,7 +11,6 @@ namespace Content.Server.Administration.Commands
[AdminCommand(AdminFlags.Admin)]
sealed class SetMindCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
public string Command => "setmind";
@@ -27,7 +26,7 @@ namespace Content.Server.Administration.Commands
return;
}
if (!int.TryParse(args[0], out var entInt))
if (!int.TryParse(args[0], out var entityUid))
{
shell.WriteLine(Loc.GetString("shell-entity-uid-must-be-number"));
return;
@@ -39,15 +38,17 @@ namespace Content.Server.Administration.Commands
ghostOverride = bool.Parse(args[2]);
}
var nent = new NetEntity(entInt);
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!_entManager.TryGetEntity(nent, out var eUid))
var eUid = new EntityUid(entityUid);
if (!eUid.IsValid() || !entityManager.EntityExists(eUid))
{
shell.WriteLine(Loc.GetString("shell-invalid-entity-id"));
return;
}
if (!_entManager.HasComponent<MindContainerComponent>(eUid))
if (!entityManager.HasComponent<MindContainerComponent>(eUid))
{
shell.WriteLine(Loc.GetString("set-mind-command-target-has-no-mind-message"));
return;
@@ -67,8 +68,8 @@ namespace Content.Server.Administration.Commands
return;
}
var mindSystem = _entManager.System<SharedMindSystem>();
var metadata = _entManager.GetComponent<MetaDataComponent>(eUid.Value);
var mindSystem = entityManager.System<SharedMindSystem>();
var metadata = entityManager.GetComponent<MetaDataComponent>(eUid);
var mind = playerCData.Mind ?? mindSystem.CreateMind(session.UserId, metadata.EntityName);

12
Content.Server/Administration/Commands/SetOutfitCommand.cs
View File

@@ -34,21 +34,21 @@ namespace Content.Server.Administration.Commands
return;
}
if (!int.TryParse(args[0], out var entInt))
if (!int.TryParse(args[0], out var entityUid))
{
shell.WriteLine(Loc.GetString("shell-entity-uid-must-be-number"));
return;
}
var targetNet = new NetEntity(entInt);
var target = new EntityUid(entityUid);
if (!_entities.TryGetEntity(targetNet, out var target))
if (!target.IsValid() || !_entities.EntityExists(target))
{
shell.WriteLine(Loc.GetString("shell-invalid-entity-id"));
return;
}
if (!_entities.HasComponent<InventoryComponent>(target))
if (!_entities.HasComponent<InventoryComponent?>(target))
{
shell.WriteLine(Loc.GetString("shell-target-entity-does-not-have-message", ("missing", "inventory")));
return;
@@ -63,12 +63,12 @@ namespace Content.Server.Administration.Commands
}
var eui = IoCManager.Resolve<EuiManager>();
var ui = new SetOutfitEui(targetNet);
var ui = new SetOutfitEui(target);
eui.OpenEui(ui, player);
return;
}
if (!SetOutfit(target.Value, args[1], _entities))
if (!SetOutfit(target, args[1], _entities))
shell.WriteLine(Loc.GetString("set-outfit-command-invalid-outfit-id-error"));
}

2
Content.Server/Administration/Systems/AdminVerbSystem.cs
View File

@@ -332,7 +332,7 @@ namespace Content.Server.Administration.Systems
Text = Loc.GetString("set-outfit-verb-get-data-text"),
Category = VerbCategory.Debug,
Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/outfit.svg.192dpi.png")),
Act = () => _euiManager.OpenEui(new SetOutfitEui(GetNetEntity(args.Target)), player),
Act = () => _euiManager.OpenEui(new SetOutfitEui(args.Target), player),
Impact = LogImpact.Medium
};
args.Verbs.Add(verb);

7
Content.Server/Administration/UI/SetOutfitEui.cs
View File

@@ -10,9 +10,10 @@ namespace Content.Server.Administration.UI
public sealed class SetOutfitEui : BaseEui
{
[Dependency] private readonly IAdminManager _adminManager = default!;
private readonly NetEntity _target;
[Dependency] private readonly IEntityManager _entManager = default!;
private readonly EntityUid _target;
public SetOutfitEui(NetEntity entity)
public SetOutfitEui(EntityUid entity)
{
_target = entity;
IoCManager.InjectDependencies(this);
@@ -30,7 +31,7 @@ namespace Content.Server.Administration.UI
{
return new SetOutfitEuiState
{
TargetNetEntity = _target,
TargetNetEntity = _entManager.GetNetEntity(_target)
};
}

2
Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs
View File

@@ -52,7 +52,7 @@ public sealed class RandomHumanoidSystem : EntitySystem
{
var comp = (Component) _serialization.CreateCopy(entry.Component, notNullableOverride: true);
comp.Owner = humanoid; // This .owner must survive for now.
EntityManager.AddComponent(humanoid, comp);
EntityManager.AddComponent(humanoid, comp, true);
}
}

2
Content.Server/Jobs/AddComponentSpecial.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Server.Jobs
var temp = (object) component;
serializationManager.CopyTo(data.Component, ref temp);
entityManager.AddComponent(mob, (Component) temp!);
entityManager.AddComponent(mob, (Component) temp!, true);
}
}
}

8
Content.Server/NPC/Commands/AddNPCCommand.cs
View File

@@ -24,11 +24,11 @@ namespace Content.Server.NPC.Commands
return;
}
var nent = new NetEntity(int.Parse(args[0]));
var entId = new EntityUid(int.Parse(args[0]));
if (!_entities.TryGetEntity(nent, out var entId))
if (!_entities.EntityExists(entId))
{
shell.WriteError($"Unable to find entity {nent}");
shell.WriteError($"Unable to find entity with uid {entId}");
return;
}
@@ -38,7 +38,7 @@ namespace Content.Server.NPC.Commands
return;
}
var comp = _entities.AddComponent<HTNComponent>(entId.Value);
var comp = _entities.AddComponent<HTNComponent>(entId);
comp.RootTask = new HTNCompoundTask()
{
Task = args[1]

21
Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
View File

@@ -11,9 +11,6 @@ namespace Content.Server.Sandbox.Commands
[AnyCommand]
public sealed class ColorNetworkCommand : IConsoleCommand
{
[Dependency] private readonly IAdminManager _adminManager = default!;
[Dependency] private readonly IEntityManager _entManager = default!;
public string Command => "colornetwork";
public string Description => Loc.GetString("color-network-command-description");
public string Help => Loc.GetString("color-network-command-help-text", ("command",Command));
@@ -33,21 +30,25 @@ namespace Content.Server.Sandbox.Commands
return;
}
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!int.TryParse(args[0], out var targetId))
{
shell.WriteLine(Loc.GetString("shell-argument-must-be-number"));
return;
}
var nent = new NetEntity(targetId);
var eUid = new EntityUid(targetId);
if (!_entManager.TryGetEntity(nent, out var eUid))
if (!eUid.IsValid() || !entityManager.EntityExists(eUid))
{
shell.WriteLine(Loc.GetString("shell-invalid-entity-id"));
return;
}
if (!_entManager.TryGetComponent(eUid, out NodeContainerComponent? nodeContainerComponent))
if (!entityManager.TryGetComponent(eUid, out NodeContainerComponent? nodeContainerComponent))
{
shell.WriteLine(Loc.GetString("shell-entity-is-not-node-container"));
return;
@@ -73,15 +74,13 @@ namespace Content.Server.Sandbox.Commands
{
var group = nodeContainerComponent.Nodes[nodeGroupId.ToString().ToLower()].NodeGroup;
if (group == null)
return;
if (group == null) return;
foreach (var x in group.Nodes)
{
if (!_entManager.TryGetComponent(x.Owner, out AtmosPipeColorComponent? atmosPipeColorComponent))
continue;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(x.Owner, out AtmosPipeColorComponent? atmosPipeColorComponent)) continue;
_entManager.System<AtmosPipeColorSystem>().SetColor(x.Owner, atmosPipeColorComponent, color);
EntitySystem.Get<AtmosPipeColorSystem>().SetColor(x.Owner, atmosPipeColorComponent, color);
}
}
}

19
Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs
View File

@@ -12,10 +12,6 @@ namespace Content.Server.Traitor.Uplink.Commands
[AdminCommand(AdminFlags.Admin)]
public sealed class AddUplinkCommand : IConsoleCommand
{
[Dependency] private readonly IConfigurationManager _cfgManager = default!;
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
public string Command => "adduplink";
public string Description => Loc.GetString("add-uplink-command-description");
@@ -45,7 +41,7 @@ namespace Content.Server.Traitor.Uplink.Commands
if (args.Length > 0)
{
// Get player entity
if (!_playerManager.TryGetSessionByUsername(args[0], out session))
if (!IoCManager.Resolve<IPlayerManager>().TryGetSessionByUsername(args[0], out session))
{
shell.WriteLine(Loc.GetString("shell-target-player-does-not-exist"));
return;
@@ -64,6 +60,7 @@ namespace Content.Server.Traitor.Uplink.Commands
// Get target item
EntityUid? uplinkEntity = null;
var entityManager = IoCManager.Resolve<IEntityManager>();
if (args.Length >= 2)
{
if (!int.TryParse(args[1], out var itemID))
@@ -72,9 +69,8 @@ namespace Content.Server.Traitor.Uplink.Commands
return;
}
var eNet = new NetEntity(itemID);
if (!_entManager.TryGetEntity(eNet, out var eUid))
var eUid = new EntityUid(itemID);
if (!eUid.IsValid() || !entityManager.EntityExists(eUid))
{
shell.WriteLine(Loc.GetString("shell-invalid-entity-id"));
return;
@@ -84,10 +80,11 @@ namespace Content.Server.Traitor.Uplink.Commands
}
// Get TC count
var tcCount = _cfgManager.GetCVar(CCVars.TraitorStartingBalance);
Logger.Debug(_entManager.ToPrettyString(user));
var configManager = IoCManager.Resolve<IConfigurationManager>();
var tcCount = configManager.GetCVar(CCVars.TraitorStartingBalance);
Logger.Debug(entityManager.ToPrettyString(user));
// Finally add uplink
var uplinkSys = _entManager.System<UplinkSystem>();
var uplinkSys = entityManager.EntitySysManager.GetEntitySystem<UplinkSystem>();
if (!uplinkSys.AddUplink(user, FixedPoint2.New(tcCount), uplinkEntity: uplinkEntity))
{
shell.WriteLine(Loc.GetString("add-uplink-command-error-2"));

21
Content.Server/Verbs/Commands/InvokeVerbCommand.cs
View File

@@ -9,8 +9,6 @@ namespace Content.Server.Verbs.Commands
[AdminCommand(AdminFlags.Admin)]
public sealed class InvokeVerbCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
public string Command => "invokeverb";
public string Description => Loc.GetString("invoke-verb-command-description");
public string Help => Loc.GetString("invoke-verb-command-help");
@@ -23,7 +21,8 @@ namespace Content.Server.Verbs.Commands
return;
}
var verbSystem = _entManager.System<SharedVerbSystem>();
var entityManager = IoCManager.Resolve<IEntityManager>();
var verbSystem = entityManager.System<SharedVerbSystem>();
// get the 'player' entity (defaulting to command user, otherwise uses a uid)
EntityUid? playerEntity = null;
@@ -39,6 +38,10 @@ namespace Content.Server.Verbs.Commands
return;
}
}
else
{
entityManager.EntityExists(new EntityUid(intPlayerUid));
}
// gets the target entity
if (!int.TryParse(args[1], out var intUid))
@@ -53,16 +56,16 @@ namespace Content.Server.Verbs.Commands
return;
}
var targetNet = new NetEntity(intUid);
if (!_entManager.TryGetEntity(targetNet, out var target))
var target = new EntityUid(intUid);
if (!entityManager.EntityExists(target))
{
shell.WriteError(Loc.GetString("invoke-verb-command-invalid-target-entity"));
return;
}
var verbName = args[2].ToLowerInvariant();
var verbs = verbSystem.GetLocalVerbs(target.Value, playerEntity.Value, Verb.VerbTypes, true);
var verbs = verbSystem.GetLocalVerbs(target, playerEntity.Value, Verb.VerbTypes, true);
// if the "verb name" is actually a verb-type, try run any verb of that type.
var verbType = Verb.VerbTypes.FirstOrDefault(x => x.Name == verbName);
@@ -71,7 +74,7 @@ namespace Content.Server.Verbs.Commands
var verb = verbs.FirstOrDefault(v => v.GetType() == verbType);
if (verb != null)
{
verbSystem.ExecuteVerb(verb, playerEntity.Value, target.Value, forced: true);
verbSystem.ExecuteVerb(verb, playerEntity.Value, target, forced: true);
shell.WriteLine(Loc.GetString("invoke-verb-command-success", ("verb", verbName), ("target", target), ("player", playerEntity)));
return;
}
@@ -81,7 +84,7 @@ namespace Content.Server.Verbs.Commands
{
if (verb.Text.ToLowerInvariant() == verbName)
{
verbSystem.ExecuteVerb(verb, playerEntity.Value, target.Value, forced: true);
verbSystem.ExecuteVerb(verb, playerEntity.Value, target, forced: true);
shell.WriteLine(Loc.GetString("invoke-verb-command-success", ("verb", verb.Text), ("target", target), ("player", playerEntity)));
return;
}

17
Content.Server/Verbs/Commands/ListVerbsCommand.cs
View File

@@ -8,8 +8,6 @@ namespace Content.Server.Verbs.Commands
[AdminCommand(AdminFlags.Admin)]
public sealed class ListVerbsCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
public string Command => "listverbs";
public string Description => Loc.GetString("list-verbs-command-description");
public string Help => Loc.GetString("list-verbs-command-help");
@@ -22,11 +20,11 @@ namespace Content.Server.Verbs.Commands
return;
}
var verbSystem = _entManager.System<SharedVerbSystem>();
var entityManager = IoCManager.Resolve<IEntityManager>();
var verbSystem = EntitySystem.Get<SharedVerbSystem>();
// get the 'player' entity (defaulting to command user, otherwise uses a uid)
EntityUid? playerEntity = null;
if (!int.TryParse(args[0], out var intPlayerUid))
{
if (args[0] == "self" && shell.Player?.AttachedEntity != null)
@@ -39,6 +37,10 @@ namespace Content.Server.Verbs.Commands
return;
}
}
else
{
entityManager.EntityExists(new EntityUid(intPlayerUid));
}
// gets the target entity
if (!int.TryParse(args[1], out var intUid))
@@ -53,15 +55,14 @@ namespace Content.Server.Verbs.Commands
return;
}
var targetNet = new NetEntity(intUid);
if (!_entManager.TryGetEntity(targetNet, out var target))
var target = new EntityUid(intUid);
if (!entityManager.EntityExists(target))
{
shell.WriteError(Loc.GetString("list-verbs-command-invalid-target-entity"));
return;
}
var verbs = verbSystem.GetLocalVerbs(target.Value, playerEntity.Value, Verb.VerbTypes);
var verbs = verbSystem.GetLocalVerbs(target, playerEntity.Value, Verb.VerbTypes);
foreach (var verb in verbs)
{

4
Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
View File

@@ -180,9 +180,7 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem
component.AnalyzerEntity = null;
}
// TODO: Yeah this comp relies upon event ordering so we get this for now.
if (!TerminatingOrDeleted(uid))
UpdateUserInterface(uid, component);
UpdateUserInterface(uid, component);
}
private void UpdateUserInterface(EntityUid uid, AnalysisConsoleComponent? component = null)

4
Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
View File

@@ -204,7 +204,7 @@ public sealed partial class ArtifactSystem
var temp = (object) comp;
_serialization.CopyTo(entry.Component, ref temp);
EntityManager.AddComponent(uid, (Component) temp!);
EntityManager.AddComponent(uid, (Component) temp!, true);
}
node.Discovered = true;
@@ -238,7 +238,7 @@ public sealed partial class ArtifactSystem
comp.Owner = uid;
var temp = (object) comp;
_serialization.CopyTo(entry, ref temp);
EntityManager.AddComponent(uid, (Component) temp!);
EntityManager.AddComponent(uid, (Component) temp!, true);
continue;
}