ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-15 13:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into AeAstralis/tagging

Browse source
This commit is contained in:
Ottermandias 2024-03-19 18:31:45 +01:00
commit 2e2d3e173e
6 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -16,7 +16,7 @@ jobs:
- name: Setup .NET - name: Setup .NET
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: '7.x.x' dotnet-version: '8.x.x'
- name: Restore dependencies - name: Restore dependencies
run: dotnet restore run: dotnet restore
- name: Download Dalamud - name: Download Dalamud

2
.github/workflows/release.yml vendored
View file

@ -15,7 +15,7 @@ jobs:
- name: Setup .NET - name: Setup .NET
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: '7.x.x' dotnet-version: '8.x.x'
- name: Restore dependencies - name: Restore dependencies
run: dotnet restore run: dotnet restore
- name: Download Dalamud - name: Download Dalamud

2
.github/workflows/test_release.yml vendored
View file

@ -15,7 +15,7 @@ jobs:
- name: Setup .NET - name: Setup .NET
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: '7.x.x' dotnet-version: '8.x.x'
- name: Restore dependencies - name: Restore dependencies
run: dotnet restore run: dotnet restore
- name: Download Dalamud - name: Download Dalamud

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit 33b512746e80b7b1276b644430923eee9bec9fba Subproject commit d53db6a358cedecd3ef18f62f12a07deff4b61ee

2
Penumbra/Penumbra.cs
View file

@ -51,7 +51,7 @@ public class Penumbra : IDalamudPlugin
{ {
try try
{ {
_services = ServiceManagerA.CreateProvider(this, pluginInterface, Log); _services = StaticServiceManager.CreateProvider(this, pluginInterface, Log);
Messager = _services.GetService<MessageService>(); Messager = _services.GetService<MessageService>();
_validityChecker = _services.GetService<ValidityChecker>(); _validityChecker = _services.GetService<ValidityChecker>();
_services.EnsureRequiredServices(); _services.EnsureRequiredServices();

5
Penumbra/Services/ServiceManagerA.cs → Penumbra/Services/StaticServiceManager.cs
View file

@ -6,7 +6,6 @@ using Dalamud.Plugin.Services;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using OtterGui; using OtterGui;
using OtterGui.Classes; using OtterGui.Classes;
using OtterGui.Compression;
using OtterGui.Log; using OtterGui.Log;
using OtterGui.Services; using OtterGui.Services;
using Penumbra.Api; using Penumbra.Api;
@ -14,14 +13,12 @@ using Penumbra.Collections.Cache;
using Penumbra.Collections.Manager; using Penumbra.Collections.Manager;
using Penumbra.GameData.Actors; using Penumbra.GameData.Actors;
using Penumbra.Import.Models; using Penumbra.Import.Models;
using Penumbra.GameData.DataContainers;
using Penumbra.GameData.Structs; using Penumbra.GameData.Structs;
using Penumbra.Import.Textures; using Penumbra.Import.Textures;
using Penumbra.Interop.PathResolving; using Penumbra.Interop.PathResolving;
using Penumbra.Interop.ResourceLoading; using Penumbra.Interop.ResourceLoading;
using Penumbra.Interop.ResourceTree; using Penumbra.Interop.ResourceTree;
using Penumbra.Interop.Services; using Penumbra.Interop.Services;
using Penumbra.Interop.Structs;
using Penumbra.Meta; using Penumbra.Meta;
using Penumbra.Mods; using Penumbra.Mods;
using Penumbra.Mods.Editor; using Penumbra.Mods.Editor;
@ -38,7 +35,7 @@ using ResidentResourceManager = Penumbra.Interop.Services.ResidentResourceManage
namespace Penumbra.Services; namespace Penumbra.Services;
public static class ServiceManagerA public static class StaticServiceManager
{ {
public static ServiceManager CreateProvider(Penumbra penumbra, DalamudPluginInterface pi, Logger log) public static ServiceManager CreateProvider(Penumbra penumbra, DalamudPluginInterface pi, Logger log)
{ {