Compare commits

..

No commits in common. "71e24c13c7915e4741fe20fa86cc6dbebf1d2355" and "1e07e434985ce55cd47d783d1e6dc7f48e29c7b9" have entirely different histories.

10 changed files with 16 additions and 53 deletions

@ -1 +1 @@
Subproject commit af41b1787acef9df7dc83619fe81e63a36443ee5
Subproject commit 297941bc22300f4a8368f4d0177f62943eb69727

View file

@ -1,7 +0,0 @@
namespace Penumbra.Api.Api;
public static class IdentityChecker
{
public static bool Check(string identity)
=> true;
}

View file

@ -17,7 +17,7 @@ public class PenumbraApi(
UiApi ui) : IDisposable, IApiService, IPenumbraApi
{
public const int BreakingVersion = 5;
public const int FeatureVersion = 12;
public const int FeatureVersion = 11;
public void Dispose()
{

View file

@ -20,16 +20,8 @@ public class TemporaryApi(
ApiHelpers apiHelpers,
ModManager modManager) : IPenumbraApiTemporary, IApiService
{
public (PenumbraApiEc, Guid) CreateTemporaryCollection(string identity, string name)
{
if (!IdentityChecker.Check(identity))
return (PenumbraApiEc.InvalidCredentials, Guid.Empty);
var collection = tempCollections.CreateTemporaryCollection(name);
if (collection == Guid.Empty)
return (PenumbraApiEc.UnknownError, collection);
return (PenumbraApiEc.Success, collection);
}
public Guid CreateTemporaryCollection(string name)
=> tempCollections.CreateTemporaryCollection(name);
public PenumbraApiEc DeleteTemporaryCollection(Guid collectionId)
=> tempCollections.RemoveTemporaryCollection(collectionId)

View file

@ -38,7 +38,6 @@ public class TemporaryIpcTester(
private string _tempGamePath = "test/game/path.mtrl";
private string _tempFilePath = "test/success.mtrl";
private string _tempManipulation = string.Empty;
private string _identity = string.Empty;
private PenumbraApiEc _lastTempError;
private int _tempActorIndex;
private bool _forceOverwrite;
@ -49,7 +48,6 @@ public class TemporaryIpcTester(
if (!_)
return;
ImGui.InputTextWithHint("##identity", "Identity...", ref _identity, 128);
ImGui.InputTextWithHint("##tempCollection", "Collection Name...", ref _tempCollectionName, 128);
ImGuiUtil.GuidInput("##guid", "Collection GUID...", string.Empty, ref _tempGuid, ref _tempCollectionGuidName);
ImGui.InputInt("##tempActorIndex", ref _tempActorIndex, 0, 0);
@ -75,7 +73,7 @@ public class TemporaryIpcTester(
IpcTester.DrawIntro(CreateTemporaryCollection.Label, "Create Temporary Collection");
if (ImGui.Button("Create##Collection"))
{
_lastTempError = new CreateTemporaryCollection(pi).Invoke(_identity, _tempCollectionName, out LastCreatedCollectionId);
LastCreatedCollectionId = new CreateTemporaryCollection(pi).Invoke(_tempCollectionName);
if (_tempGuid == null)
{
_tempGuid = LastCreatedCollectionId;

View file

@ -440,7 +440,7 @@ internal unsafe partial record ResolveContext(
if (Global.Nodes.TryGetValue((path, (nint)kdbHandle), out var cached))
return cached;
var node = CreateNode(ResourceType.Kdb, 0, kdbHandle, path, false);
var node = CreateNode(ResourceType.Phyb, 0, kdbHandle, path, false);
if (Global.WithUiData)
node.FallbackName = "KineDriver Module";
Global.Nodes.Add((path, (nint)kdbHandle), node);

View file

@ -1,5 +1,5 @@
{
"Author": "Ottermandias, Nylfae, Adam, Wintermute",
"Author": "Ottermandias, Adam, Wintermute",
"Name": "Penumbra",
"Punchline": "Runtime mod loader and manager.",
"Description": "Runtime mod loader and manager.",

View file

@ -99,11 +99,9 @@ public class PcpService : IApiService, IDisposable
{
// First version had collection.json, changed.
var oldFile = Path.Combine(newDirectory.FullName, "collection.json");
Penumbra.Log.Information("[PCPService] Renaming old PCP file from collection.json to character.json.");
if (File.Exists(oldFile))
{
Penumbra.Log.Information("[PCPService] Renaming old PCP file from collection.json to character.json.");
File.Move(oldFile, file, true);
}
else
return;
}

View file

@ -63,27 +63,9 @@ public class PenumbraChangelog : IUiService
Add1_3_6_4(Changelog);
Add1_4_0_0(Changelog);
Add1_5_0_0(Changelog);
Add1_5_1_0(Changelog);
}
#region Changelogs
}
private static void Add1_5_1_0(Changelog log)
=> log.NextVersion("Version 1.5.1.0")
.RegisterHighlight("Added the option to export a characters current data as a .pcp modpack in the On-Screen tab.")
.RegisterEntry("Other plugins can attach to this functionality and package and interpret their own data.", 1)
.RegisterEntry("When a .pcp modpack is installed, it can create and assign collections for the corresponding character it was created for.", 1)
.RegisterEntry("This basically provides an easier way to manually synchronize other players, but does not contain any automation.", 1)
.RegisterEntry("The settings provide some fine control about what happens when a PCP is installed, as well as buttons to cleanup any PCP-created data.", 1)
.RegisterEntry("Added a warning message when the game's integrity is corrupted to the On-Screen tab.")
.RegisterEntry("Added .kdb files to the On-Screen tab and associated functionality (thanks Ny!).")
.RegisterEntry("Updated the creation of temporary collections to require a passed identity.")
.RegisterEntry("Added the option to change the skin material suffix in models using the stockings shader by adding specific attributes (thanks Ny!).")
.RegisterEntry("Added predefined tag utility to the multi-mod selection.")
.RegisterEntry("Fixed an issue with the automatic collection selection on character login when no mods are assigned.")
.RegisterImportant(
"Fixed issue with new deformer data that makes modded deformers not containing this data work implicitly. Updates are still recommended (1.5.0.5).")
.RegisterEntry("Fixed various issues after patch (1.5.0.1 - 1.5.0.4).");
#region Changelogs
private static void Add1_5_0_0(Changelog log)
=> log.NextVersion("Version 1.5.0.0")

View file

@ -1,12 +1,12 @@
[
{
"Author": "Ottermandias, Nylfae, Adam, Wintermute",
"Author": "Ottermandias, Adam, Wintermute",
"Name": "Penumbra",
"Punchline": "Runtime mod loader and manager.",
"Description": "Runtime mod loader and manager.",
"InternalName": "Penumbra",
"AssemblyVersion": "1.5.1.0",
"TestingAssemblyVersion": "1.5.1.0",
"AssemblyVersion": "1.5.0.6",
"TestingAssemblyVersion": "1.5.0.9",
"RepoUrl": "https://github.com/xivdev/Penumbra",
"ApplicableVersion": "any",
"DalamudApiLevel": 13,
@ -18,9 +18,9 @@
"LoadPriority": 69420,
"LoadRequiredState": 2,
"LoadSync": true,
"DownloadLinkInstall": "https://github.com/xivdev/Penumbra/releases/download/1.5.1.0/Penumbra.zip",
"DownloadLinkTesting": "https://github.com/xivdev/Penumbra/releases/download/1.5.1.0/Penumbra.zip",
"DownloadLinkUpdate": "https://github.com/xivdev/Penumbra/releases/download/1.5.1.0/Penumbra.zip",
"DownloadLinkInstall": "https://github.com/xivdev/Penumbra/releases/download/1.5.0.6/Penumbra.zip",
"DownloadLinkTesting": "https://github.com/xivdev/Penumbra/releases/download/testing_1.5.0.9/Penumbra.zip",
"DownloadLinkUpdate": "https://github.com/xivdev/Penumbra/releases/download/1.5.0.6/Penumbra.zip",
"IconUrl": "https://raw.githubusercontent.com/xivdev/Penumbra/master/images/icon.png"
}
]