space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some compiler warning fixes.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2022-05-28 13:36:35 +02:00
parent 934f589778
commit 6fc1daf978
14 changed files with 80 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Robust.Client/GameController/GameController.Redialler.cs
View File

@@ -55,10 +55,10 @@ internal partial class GameController
{
_loaderArgs!.RedialApi!.Redial(new Uri(address), text ?? "");
}
catch (Exception ex)
catch (Exception)
{
Interlocked.Decrement(ref _hasRedialled);
throw ex;
throw;
}
Shutdown("Redial");

2
Robust.Client/GameObjects/ClientEntityManager.cs
View File

@@ -37,7 +37,7 @@ namespace Robust.Client.GameObjects
return base.CreateEntity(prototypeName, uid);
}
void IClientEntityManagerInternal.InitializeEntity(EntityUid entity, MetaDataComponent? meta = null)
void IClientEntityManagerInternal.InitializeEntity(EntityUid entity, MetaDataComponent? meta)
{
base.InitializeEntity(entity, meta);
}

1
Robust.Client/UserInterface/FileDialogManager.cs
View File

@@ -26,7 +26,6 @@ namespace Robust.Client.UserInterface
// On Linux, if the kdialog command is found, it will be used instead.
// TODO: Should we maybe try to avoid running kdialog if the DE isn't KDE?
[Dependency] private readonly IClydeInternal _clyde = default!;
[Dependency] private readonly ITaskManager _taskManager = default!;
private bool _kDialogAvailable;
private bool _checkedKDialogAvailable;

6
Robust.Server/GameObjects/ServerEntityManager.cs
View File

@@ -52,7 +52,7 @@ namespace Robust.Server.GameObjects
LoadEntity(entity, context);
}
void IServerEntityManagerInternal.FinishEntityInitialization(EntityUid entity, MetaDataComponent? meta = null)
void IServerEntityManagerInternal.FinishEntityInitialization(EntityUid entity, MetaDataComponent? meta)
{
InitializeEntity(entity, meta);
}
@@ -79,7 +79,9 @@ namespace Robust.Server.GameObjects
// Make sure to ONLY get components that are defined in the prototype.
// Others could be instantiated directly by AddComponent (e.g. ContainerManager).
// And those aren't guaranteed to exist on the client, so don't clear them.
if (prototype.Components.ContainsKey(component.Name)) ((Component) component).ClearTicks();
var compName = ComponentFactory.GetComponentName(component.GetType());
if (prototype.Components.ContainsKey(compName))
component.ClearTicks();
}
}

3
Robust.Server/GameStates/PVSSystem.cs
View File

@@ -501,7 +501,8 @@ internal sealed partial class PVSSystem : EntitySystem
MapChunkLocation mapChunkLocation => _entityPvsCollection.TryGetChunk(mapChunkLocation.MapId,
mapChunkLocation.ChunkIndices, out var mapChunk)
? mapChunk
: null
: null,
_ => null
};
if (chunk == null)
{

2
Robust.Shared/GameObjects/ComponentFactory.cs
View File

@@ -165,7 +165,9 @@ namespace Robust.Shared.GameObjects
static string CalculateComponentName(Type type)
{
// Backward compatible fallback
#pragma warning disable CS0618
if (type.GetProperty(nameof(Component.Name))!.DeclaringType != typeof(Component))
#pragma warning restore CS0618
{
var instance = (IComponent) Activator.CreateInstance(type)!;
return instance.Name;

28
Robust.Shared/Map/IMapManager.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.Timing;
@@ -10,7 +11,7 @@ namespace Robust.Shared.Map
/// <summary>
/// This manages all of the grids in the world.
/// </summary>
public interface IMapManager : IPauseManager
public interface IMapManager
{
/// <summary>
/// A faster version of <see cref="GetAllGrids"/>
@@ -183,5 +184,30 @@ namespace Robust.Shared.Map
IMapGridComponent GetGridComp(EntityUid euid);
bool TryGetGrid(EntityUid euid, [NotNullWhen(true)] out IMapGrid? grid);
bool GridExists(EntityUid euid);
//
// Pausing functions
//
void SetMapPaused(MapId mapId, bool paused);
void DoMapInitialize(MapId mapId);
void AddUninitializedMap(MapId mapId);
[Pure]
bool IsMapPaused(MapId mapId);
[Pure]
bool IsGridPaused(IMapGrid grid);
[Pure]
bool IsGridPaused(GridId gridId);
[Pure]
bool IsGridPaused(EntityUid gridId);
[Pure]
bool IsMapInitialized(MapId mapId);
}
}

5
Robust.Shared/Serialization/Manager/Definition/DataDefinition.Emitters.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Emit;
@@ -52,7 +52,8 @@ namespace Robust.Shared.Serialization.Manager.Definition
{
ValueDataNode => FieldInterfaceInfos[i].Reader.Value,
SequenceDataNode => FieldInterfaceInfos[i].Reader.Sequence,
MappingDataNode => FieldInterfaceInfos[i].Reader.Mapping
MappingDataNode => FieldInterfaceInfos[i].Reader.Mapping,
_ => throw new InvalidOperationException()
})
{
result = serializationManager.ReadWithTypeSerializer(type,

1
Robust.Shared/SharedIoC.cs
View File

@@ -34,7 +34,6 @@ namespace Robust.Shared
IoCManager.Register<ILocalizationManager, LocalizationManager>();
IoCManager.Register<ILocalizationManagerInternal, LocalizationManager>();
IoCManager.Register<ILogManager, LogManager>();
IoCManager.Register<IPauseManager, NetworkedMapManager>();
IoCManager.Register<IModLoader, ModLoader>();
IoCManager.Register<IModLoaderInternal, ModLoader>();
IoCManager.Register<INetManager, NetManager>();

38
Robust.Shared/Timing/IPauseManager.cs
View File

@@ -1,38 +0,0 @@
using System;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
namespace Robust.Shared.Timing
{
[Obsolete("Use the same functions on IMapManager.")]
public interface IPauseManager
{
void SetMapPaused(MapId mapId, bool paused);
void DoMapInitialize(MapId mapId);
[Obsolete("This function does nothing, per-grid pausing isn't a thing anymore.")]
void DoGridMapInitialize(GridId gridId);
[Obsolete("This function does nothing, per-grid pausing isn't a thing anymore.")]
void DoGridMapInitialize(IMapGrid grid);
void AddUninitializedMap(MapId mapId);
[Pure]
bool IsMapPaused(MapId mapId);
[Pure]
bool IsGridPaused(IMapGrid grid);
[Pure]
bool IsGridPaused(GridId gridId);
[Pure]
bool IsGridPaused(EntityUid gridId);
[Pure]
bool IsMapInitialized(MapId mapId);
}
}

48
Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;
using Robust.Server.Containers;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
@@ -36,10 +37,11 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
public void TestCreation()
{
var sim = SimulationFactory();
var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
var entity = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var container = entity.CreateContainer<Container>("dummy");
var container = containerSys.MakeContainer<Container>(entity, "dummy");
Assert.That(container.ID, Is.EqualTo("dummy"));
Assert.That(container.Owner, Is.EqualTo(entity));
@@ -47,10 +49,10 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
var manager = IoCManager.Resolve<IEntityManager>().GetComponent<IContainerManager>(entity);
Assert.That(container.Manager, Is.EqualTo(manager));
Assert.That(() => entity.CreateContainer<Container>("dummy"), Throws.ArgumentException);
Assert.That(() => containerSys.MakeContainer<Container>(entity, "dummy"), Throws.ArgumentException);
Assert.That(manager.HasContainer("dummy2"), Is.False);
var container2 = entity.CreateContainer<Container>("dummy2");
var container2 = containerSys.MakeContainer<Container>(entity, "dummy2");
Assert.That(container2.Manager, Is.EqualTo(manager));
Assert.That(container2.Owner, Is.EqualTo(entity));
@@ -75,16 +77,17 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
public void TestInsertion()
{
var sim = SimulationFactory();
var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
var owner = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var inserted = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var transform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(inserted);
var container = owner.CreateContainer<Container>("dummy");
var container = containerSys.MakeContainer<Container>(owner, "dummy");
Assert.That(container.Insert(inserted), Is.True);
Assert.That(transform.Parent!.Owner, Is.EqualTo(owner));
var container2 = inserted.CreateContainer<Container>("dummy");
var container2 = containerSys.MakeContainer<Container>(inserted, "dummy");
Assert.That(container2.Insert(owner), Is.False);
var success = container.Remove(inserted);
@@ -103,17 +106,18 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
public void TestNestedRemoval()
{
var sim = SimulationFactory();
var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
var owner = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var inserted = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var transform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(inserted);
var entity = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var container = owner.CreateContainer<Container>("dummy");
var container = containerSys.MakeContainer<Container>(owner, "dummy");
Assert.That(container.Insert(inserted), Is.True);
Assert.That(transform.Parent!.Owner, Is.EqualTo(owner));
var container2 = inserted.CreateContainer<Container>("dummy");
var container2 = containerSys.MakeContainer<Container>(inserted, "dummy");
Assert.That(container2.Insert(entity), Is.True);
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Parent!.Owner, Is.EqualTo(inserted));
@@ -129,6 +133,7 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
public void TestNestedRemovalWithDenial()
{
var sim = SimulationFactory();
var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
var coordinates = new EntityCoordinates(new EntityUid(1), (0, 0));
var entityOne = sim.SpawnEntity("dummy", coordinates);
@@ -136,9 +141,9 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
var entityThree = sim.SpawnEntity("dummy", coordinates);
var entityItem = sim.SpawnEntity("dummy", coordinates);
var container = entityOne.CreateContainer<Container>("dummy");
var container2 = entityTwo.CreateContainer<ContainerOnlyContainer>("dummy");
var container3 = entityThree.CreateContainer<Container>("dummy");
var container = containerSys.MakeContainer<Container>(entityOne, "dummy");
var container2 = containerSys.MakeContainer<ContainerOnlyContainer>(entityTwo, "dummy");
var container3 = containerSys.MakeContainer<Container>(entityThree, "dummy");
var entMan = IoCManager.Resolve<IEntityManager>();
@@ -163,9 +168,10 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
public void BaseContainer_SelfInsert_False()
{
var sim = SimulationFactory();
var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
var entity = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var container = entity.CreateContainer<Container>("dummy");
var container = containerSys.MakeContainer<Container>(entity, "dummy");
Assert.That(container.Insert(entity), Is.False);
Assert.That(container.CanInsert(entity), Is.False);
@@ -175,10 +181,11 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
public void BaseContainer_InsertMap_False()
{
var sim = SimulationFactory();
var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
var mapEnt = new EntityUid(1);
var entity = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var container = entity.CreateContainer<Container>("dummy");
var container = containerSys.MakeContainer<Container>(entity, "dummy");
Assert.That(container.Insert(mapEnt), Is.False);
Assert.That(container.CanInsert(mapEnt), Is.False);
@@ -188,10 +195,11 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
public void BaseContainer_InsertGrid_False()
{
var sim = SimulationFactory();
var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
var grid = sim.Resolve<IMapManager>().CreateGrid(new MapId(1)).GridEntityId;
var entity = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var container = entity.CreateContainer<Container>("dummy");
var container = containerSys.MakeContainer<Container>(entity, "dummy");
Assert.That(container.Insert(grid), Is.False);
Assert.That(container.CanInsert(grid), Is.False);
@@ -201,9 +209,10 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
public void BaseContainer_Insert_True()
{
var sim = SimulationFactory();
var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
var containerEntity = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var container = containerEntity.CreateContainer<Container>("dummy");
var container = containerSys.MakeContainer<Container>(containerEntity, "dummy");
var insertEntity = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var result = container.Insert(insertEntity);
@@ -223,9 +232,10 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
public void BaseContainer_RemoveNotAdded_False()
{
var sim = SimulationFactory();
var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
var containerEntity = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var container = containerEntity.CreateContainer<Container>("dummy");
var container = containerSys.MakeContainer<Container>(containerEntity, "dummy");
var insertEntity = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var result = container.Remove(insertEntity);
@@ -237,11 +247,12 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
public void BaseContainer_Transfer_True()
{
var sim = SimulationFactory();
var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
var entity1 = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var container1 = entity1.CreateContainer<Container>("dummy");
var container1 = containerSys.MakeContainer<Container>(entity1, "dummy");
var entity2 = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var container2 = entity2.CreateContainer<Container>("dummy");
var container2 = containerSys.MakeContainer<Container>(entity2, "dummy");
var transferEntity = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
container1.Insert(transferEntity);
@@ -256,9 +267,10 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
public void Container_Serialize()
{
var sim = SimulationFactory();
var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
var entity = sim.SpawnEntity("dummy", new EntityCoordinates(new EntityUid(1), (0, 0)));
var container = entity.CreateContainer<Container>("dummy");
var container = containerSys.MakeContainer<Container>(entity, "dummy");
var childEnt = sim.SpawnEntity(null, new EntityCoordinates(new EntityUid(1), (0, 0)));
container.OccludesLight = true;

1
Robust.UnitTesting/Server/RobustServerSimulation.cs
View File

@@ -209,7 +209,6 @@ namespace Robust.UnitTesting.Server
container.Register<IIslandManager, IslandManager>();
container.Register<IManifoldManager, CollisionManager>();
container.Register<IMapManagerInternal, MapManager>();
container.Register<IPauseManager, MapManager>();
container.Register<IPhysicsManager, PhysicsManager>();
container.Register<INetManager, NetManager>();
container.Register<IAuthManager, AuthManager>();

12
Robust.UnitTesting/Shared/GameObjects/ContainerTests.cs
View File

@@ -47,13 +47,14 @@ namespace Robust.UnitTesting.Shared.GameObjects
var mapMan = IoCManager.Resolve<IMapManager>();
var entMan = IoCManager.Resolve<IEntityManager>();
var playerMan = IoCManager.Resolve<IPlayerManager>();
var containerSys = EntitySystem.Get<SharedContainerSystem>();
mapId = mapMan.CreateMap();
mapPos = new MapCoordinates((0, 0), mapId);
entityUid = entMan.SpawnEntity(null, mapPos);
entMan.GetComponent<MetaDataComponent>(entityUid).EntityName = "Container";
entityUid.EnsureContainer<Container>("dummy");
containerSys.EnsureContainer<Container>(entityUid, "dummy");
// Setup PVS
entMan.AddComponent<Robust.Server.GameObjects.EyeComponent>(entityUid);
@@ -71,10 +72,11 @@ namespace Robust.UnitTesting.Shared.GameObjects
await server.WaitAssertion(() =>
{
var entMan = IoCManager.Resolve<IEntityManager>();
var containerSys = EntitySystem.Get<SharedContainerSystem>();
itemUid = entMan.SpawnEntity(null, mapPos);
entMan.GetComponent<MetaDataComponent>(itemUid).EntityName = "Item";
var container = entityUid.EnsureContainer<Container>("dummy");
var container = containerSys.EnsureContainer<Container>(entityUid, "dummy");
Assert.That(container.Insert(itemUid));
// Move item out of PVS so that it doesn't get sent to the client
@@ -167,13 +169,14 @@ namespace Robust.UnitTesting.Shared.GameObjects
var mapMan = IoCManager.Resolve<IMapManager>();
var entMan = IoCManager.Resolve<IEntityManager>();
var playerMan = IoCManager.Resolve<IPlayerManager>();
var containerSys = EntitySystem.Get<SharedContainerSystem>();
mapId = mapMan.CreateMap();
mapPos = new MapCoordinates((0, 0), mapId);
entityUid = entMan.SpawnEntity(null, mapPos);
entMan.GetComponent<MetaDataComponent>(entityUid).EntityName = "Container";
entityUid.EnsureContainer<Container>("dummy");
containerSys.EnsureContainer<Container>(entityUid, "dummy");
// Setup PVS
entMan.AddComponent<Robust.Server.GameObjects.EyeComponent>(entityUid);
@@ -191,10 +194,11 @@ namespace Robust.UnitTesting.Shared.GameObjects
await server.WaitAssertion(() =>
{
var entMan = IoCManager.Resolve<IEntityManager>();
var containerSys = EntitySystem.Get<SharedContainerSystem>();
itemUid = entMan.SpawnEntity(null, mapPos);
entMan.GetComponent<MetaDataComponent>(itemUid).EntityName = "Item";
var container = entityUid.EnsureContainer<Container>("dummy");
var container = containerSys.EnsureContainer<Container>(entityUid, "dummy");
container.Insert(itemUid);
// Move item out of PVS so that it doesn't get sent to the client

2
Robust.UnitTesting/Shared/Physics/GridMovement_Test.cs
View File

@@ -10,7 +10,7 @@ using Robust.Shared.Physics.Dynamics;
namespace Robust.UnitTesting.Shared.Physics;
[TestFixture, TestOf(typeof(SharedBroadphaseSystem))]
public class GridMovement_Test : RobustIntegrationTest
public sealed class GridMovement_Test : RobustIntegrationTest
{
[Test]
public async Task TestFindGridContacts()