Revert "Update submodule to 175.0.0 (#21318)" (#21319)

This commit is contained in:
metalgearsloth
2023-10-29 15:29:30 +11:00
committed by GitHub
parent 4f6ea2aef6
commit 5b8f3c48c4
327 changed files with 437 additions and 891 deletions

View File

@@ -4,7 +4,6 @@ using System.IO;
using Content.Shared.Decals;
using Robust.Client.ResourceManagement;
using Robust.Client.Utility;
using Robust.Shared.ContentPack;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
@@ -17,7 +16,7 @@ namespace Content.MapRenderer.Painters;
public sealed class DecalPainter
{
private readonly IResourceManager _resManager;
private readonly IResourceCache _cResourceCache;
private readonly IPrototypeManager _sPrototypeManager;
@@ -25,7 +24,7 @@ public sealed class DecalPainter
public DecalPainter(ClientIntegrationInstance client, ServerIntegrationInstance server)
{
_resManager = client.ResolveDependency<IResourceManager>();
_cResourceCache = client.ResolveDependency<IResourceCache>();
_sPrototypeManager = server.ResolveDependency<IPrototypeManager>();
}
@@ -64,7 +63,7 @@ public sealed class DecalPainter
Stream stream;
if (sprite is SpriteSpecifier.Texture texture)
{
stream = _resManager.ContentFileRead(texture.TexturePath);
stream = _cResourceCache.ContentFileRead(texture.TexturePath);
}
else if (sprite is SpriteSpecifier.Rsi rsi)
{
@@ -74,7 +73,7 @@ public sealed class DecalPainter
path = $"/Textures/{path}";
}
stream = _resManager.ContentFileRead(path);
stream = _cResourceCache.ContentFileRead(path);
}
else
{