Duplicate gos

AssetHelper.slnx

@@ -1,4 +1,5 @@
 <Solution>
   <Project Path="AssetHelper/AssetHelper.csproj" />
   <Project Path="AssetHelperMenu/AssetHelperMenu.csproj" Id="2109f991-85c6-4e05-881e-59bf10836ab0" />
+  <Project Path="AssetHelperTesting/AssetHelperTesting.csproj" Id="eef3b27f-b627-48da-b2bf-45e0eba05226" />
 </Solution>

AssetHelper/AssetHelper.csproj

@@ -14,9 +14,6 @@
     <RootNamespace>Silksong.AssetHelper</RootNamespace>
     <!-- Ignore warning about processor architecture mismatch with PlayMaker ConditionalExpression -->
     <NoWarn>$(NoWarn);MSB3270</NoWarn>
-    <RestorePackagesWithLockFile>True</RestorePackagesWithLockFile>
-    <!-- CI environment variable is automatically set by GitHub actions -->
-    <RestoreLockedMode Condition="'$(CI)' == 'true'">True</RestoreLockedMode>
     <!-- Allow access of private members at runtime -->
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <!-- Shortens and anonymizes paths in debug symbols relative to the project directory. Breakpoints will not work, however. -->
@@ -41,7 +38,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="UnityEngine.Modules" Version="6000.0.50" IncludeAssets="compile" />
-    <PackageReference Include="DataDrivenConstants" Version="1.1.0">
+    <PackageReference Include="DataDrivenConstants" Version="1.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -72,9 +69,32 @@
 
   <ItemGroup>
     <PackageReference Include="AssetsTools.NET" Version="3.0.4" GeneratePathProperty="true" />
-    <PackageReference Include="AssetHelperLib" Version="0.11.0" GeneratePathProperty="true" />
   </ItemGroup>
 
+  <!--AssetHelperLib dependency-->
+  <PropertyGroup>
+    <!--
+    Set this to true to use a local copy of AssetHelperLib for development.
+    This should be false when pushed to main.
+    -->
+    <AssetHelperLibDevelopment>false</AssetHelperLibDevelopment>
+    <AssetHelperLibFolder>../../AssetHelperLib/AssetHelperLib/bin/Debug/netstandard2.1</AssetHelperLibFolder>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(AssetHelperLibDevelopment)' == 'false'">
+    <PackageReference Include="AssetHelperLib" Version="0.12.1" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(AssetHelperLibDevelopment)' == 'true'">
+    <Reference Include="AssetHelperLib">
+      <HintPath>$(AssetHelperLibFolder)/AssetHelperLib.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(AssetHelperLibDevelopment)' == 'false'">
+    <AssetHelperLibFolder>$(PkgAssetHelperLib)/lib/netstandard2.1</AssetHelperLibFolder>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="MonoDetour.HookGen" Version="0.7.*" PrivateAssets="all" />
     <PackageReference Include="MonoDetour" Version="*" />
@@ -101,33 +121,22 @@
       <Binaries Include="$(TargetDir)/$(TargetName).xml" LocalDir="/" PackDir="plugins" />
       <Binaries Include="$(PkgAssetsTools_NET)/lib/netstandard2.0/AssetsTools.NET.dll" PackDir="plugins" />
       <Binaries Include="$(PkgAssetsTools_NET)/lib/netstandard2.0/AssetsTools.NET.xml" PackDir="plugins" />
-      <Binaries Include="$(PkgAssetHelperLib)/lib/netstandard2.1/AssetHelperLib.dll" PackDir="plugins" />
-      <Binaries Include="$(PkgAssetHelperLib)/lib/netstandard2.1/AssetHelperLib.xml" PackDir="plugins" />
+      <Binaries Include="$(AssetHelperLibFolder)/AssetHelperLib.dll" PackDir="plugins" />
+      <Binaries Include="$(AssetHelperLibFolder)/AssetHelperLib.xml" PackDir="plugins" />
       <Binaries Include="languages/*.json" LocalDir="languages" PackDir="plugins/languages" />
     </ItemGroup>
     <PropertyGroup>
       <ThunderstoreDir>$(ProjectDir)/../thunderstore</ThunderstoreDir>
     </PropertyGroup>
 
     <!-- Local install -->
-    <Copy
-      SourceFiles="@(Binaries)"
-      DestinationFolder="$(SilksongPluginsFolder)/silksong_modding-$(AssemblyTitle)/%(Binaries.LocalDir)"
-      Condition="'$(SilksongPluginsFolder)' != '' And Exists('$(SilksongPluginsFolder)')"
-    />
+    <Copy SourceFiles="@(Binaries)" DestinationFolder="$(SilksongPluginsFolder)/silksong_modding-$(AssemblyTitle)/%(Binaries.LocalDir)" Condition="'$(SilksongPluginsFolder)' != '' And Exists('$(SilksongPluginsFolder)')" />
 
     <!-- Thunderstore packaging -->
     <RemoveDir Directories="$(ThunderstoreDir)/temp;$(ThunderstoreDir)/dist" />
     <MakeDir Directories="$(ThunderstoreDir)/temp" />
-    <Copy
-      SourceFiles="@(Binaries)"
-      DestinationFolder="$(ThunderstoreDir)/temp/%(Binaries.PackDir)"
-    />
+    <Copy SourceFiles="@(Binaries)" DestinationFolder="$(ThunderstoreDir)/temp/%(Binaries.PackDir)" />
     <Exec Command="dotnet tool restore" />
-    <Exec
-      Command="dotnet tcli build --config-path &quot;$(ThunderstoreDir)/assethelper.toml&quot; --package-name &quot;$(AssemblyTitle)&quot; --package-version $(Version)"
-      StandardOutputImportance="High"
-      StandardErrorImportance="High"
-    />
+    <Exec Command="dotnet tcli build --config-path &quot;$(ThunderstoreDir)/assethelper.toml&quot; --package-name &quot;$(AssemblyTitle)&quot; --package-version $(Version)" StandardOutputImportance="High" StandardErrorImportance="High" />
   </Target>
 </Project>

AssetHelper/CatalogTools/CatalogEntryUtils.cs

@@ -56,7 +56,7 @@ public static ContentCatalogDataEntry CreateBundleEntry(
         return bundleEntry;
     }
 
-    /// <inheritdoc cref="CreateAssetEntry(string, Type, List{string}, out string)" />
+    /// <inheritdoc cref="CreateAssetEntry(string, Type, List{string}, List{string})" />
     public static ContentCatalogDataEntry CreateAssetEntry(
         string internalId,
         Type assetType,
@@ -66,7 +66,7 @@ out string primaryKey
     {
         primaryKey = internalId;
 
-        return CreateAssetEntry(internalId, assetType, dependencyKeys, primaryKey);
+        return CreateAssetEntry(internalId, assetType, dependencyKeys, [primaryKey]);
     }
 
     /// <summary>
@@ -75,33 +75,28 @@ out string primaryKey
     /// <param name="internalId">The internal ID of the asset. This is the name of the asset within the bundle.</param>
     /// <param name="assetType">Unity type of the asset. Eg: GameObject</param>
     /// <param name="dependencyKeys">Primary keys of the bundle dependencies. These should be in the catalog.</param>
-    /// <param name="primaryKey">The primary key used to access the asset with Addressables.</param>
+    /// <param name="primaryKeys">The primary keys used to access the asset with Addressables.</param>
     public static ContentCatalogDataEntry CreateAssetEntry(
         string internalId,
         Type assetType,
         List<string> dependencyKeys,
-        string primaryKey
+        List<string> primaryKeys
     )
     {
         object[] deps = dependencyKeys.Cast<object>().ToArray();
+        object[] pkeys = primaryKeys.Cast<object>().ToArray(); 
 
         return new ContentCatalogDataEntry(
             assetType,
             internalId,
             "UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider",
-            new object[] { primaryKey },
+            pkeys,
             deps,
             null
         );
     }
 
-    /// <summary>
-    /// Create a catalog entry representing a child gameobject of
-    /// the gameObject loaded by parentPrimaryKey.
-    /// </summary>
-    /// <param name="parentPrimaryKey">The primary key of the parent.</param>
-    /// <param name="relativePath">The path of the child relative to the parent, with no leading slash.</param>
-    /// <param name="primaryKey">The primary key of the added entry.</param>
+    /// <inheritdoc cref="CreateChildGameObjectEntry(string, string, List{string})" />
     public static ContentCatalogDataEntry CreateChildGameObjectEntry(
         string parentPrimaryKey,
         string relativePath,
@@ -128,56 +123,65 @@ out string primaryKey
             primaryKey = $"{parentPrimaryKey}/{relativePath}";
         }
 
-        return CreateChildGameObjectEntry(parentPrimaryKey, relativePath, primaryKey);
+        return CreateChildGameObjectEntry(parentPrimaryKey, relativePath, [primaryKey]);
     }
 
-    /// <inheritdoc cref="CreateChildGameObjectEntry(string, string, out string)" />
+    /// <summary>
+    /// Create a catalog entry representing a child gameobject of
+    /// the gameObject loaded by parentPrimaryKey.
+    /// </summary>
+    /// <param name="parentPrimaryKey">The primary key of the parent.</param>
+    /// <param name="relativePath">The path of the child relative to the parent, with no leading slash.</param>
+    /// <param name="primaryKeys">The primary keys of the added entry.</param>
     public static ContentCatalogDataEntry CreateChildGameObjectEntry(
         string parentPrimaryKey,
         string relativePath,
-        string primaryKey
+        List<string> primaryKeys
     )
     {
         object[] deps = new object[] { parentPrimaryKey };
+        object[] pkeys = primaryKeys.Cast<object>().ToArray();
 
         return new ContentCatalogDataEntry(
             typeof(GameObject),
             // Put the parent primary key to ensure the internal ID is unique
             $"{relativePath}/{ChildGameObjectProvider.InternalIdSeparator}/{parentPrimaryKey}",
             ChildGameObjectProvider.ClassProviderId,
-            new object[] { primaryKey },
+            pkeys,
             deps,
             null
         );
     }
 
-    /// <inheritdoc cref="CreateEntryFromLocation(IResourceLocation, string)" />
+    /// <inheritdoc cref="CreateEntryFromLocation(IResourceLocation, List{string})" />
     public static ContentCatalogDataEntry CreateEntryFromLocation(
         IResourceLocation location,
         out string primaryKey
     )
     {
         primaryKey = $"{nameof(AssetHelper)}:{location.PrimaryKey}";
 
-        return CreateEntryFromLocation(location, primaryKey);
+        return CreateEntryFromLocation(location, [primaryKey]);
     }
 
     /// <summary>
     /// Create a catalog entry based on the given location.
     /// </summary>
     /// <param name="location">The location.</param>
-    /// <param name="primaryKey">The primary key for the new catalog entry.</param>
+    /// <param name="primaryKeys">The primary keys for the new catalog entry.</param>
     /// <returns></returns>
     public static ContentCatalogDataEntry CreateEntryFromLocation(
         IResourceLocation location,
-        string primaryKey
+        List<string> primaryKeys
     )
     {
+        object[] pkeys = primaryKeys.Cast<object>().ToArray();
+
         return new ContentCatalogDataEntry(
             location.ResourceType,
             location.InternalId,
             location.ProviderId,
-            new object[] { primaryKey },
+            pkeys,
             null,
             location.Data
         );

AssetHelper/Core/AddressablesData.cs

@@ -145,7 +145,7 @@ internal static bool TryLoadBundleKeys()
     }
 
     /// <summary>
-    /// Convert a name to an asset bundle key.
+    /// Convert a name to an asset bundle (addressables) key.
     /// </summary>
     public static string ToBundleKey(string name)
     {

AssetHelper/Internal/CachedFileMetadata.cs

@@ -0,0 +1,24 @@
+using Silksong.AssetHelper.Core;
+
+namespace Silksong.AssetHelper.Internal;
+
+internal class CachedFileMetadata
+{
+    public required string SilksongVersion { get; init; }
+
+    public required string PluginVersion { get; init; }
+
+    public required string OSFolderName { get; init; }
+
+    public static CachedFileMetadata CreateNew()
+    {
+        CachedFileMetadata data = new()
+        {
+            SilksongVersion = VersionData.SilksongVersion,
+            PluginVersion = AssetHelperPlugin.Version,
+            OSFolderName = AssetPaths.OSFolderName,
+        };
+
+        return data;
+    }
+}

AssetHelper/Internal/CachedObject.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.IO;
 using Newtonsoft.Json;
 using Silksong.AssetHelper.Core;
@@ -15,28 +16,31 @@ internal class CachedObject<T>
 {
     private CachedObject() { }
 
-    [JsonProperty]
-    public required string SilksongVersion { get; init; }
-
-    [JsonProperty]
-    public required string PluginVersion { get; init; }
+    [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+    [DefaultValue(null)]
+    public required CachedFileMetadata Metadata { get; init; }
 
     [JsonProperty]
     public required T Value { get; set; }
 
     private bool IsValid()
     {
-        if (SilksongVersion == null || PluginVersion == null)
+        if (Metadata == null || Metadata.SilksongVersion == null || Metadata.PluginVersion == null)
+        {
+            return false;
+        }
+
+        if (Metadata.OSFolderName != AssetPaths.OSFolderName)
         {
             return false;
         }
 
-        if (VersionData.SilksongVersion != SilksongVersion)
+        if (VersionData.SilksongVersion != Metadata.SilksongVersion)
         {
             return false;
         }
 
-        if (!VersionData.EarliestAcceptableGeneralVersion.AllowCachedData(this.PluginVersion))
+        if (!VersionData.EarliestAcceptableGeneralVersion.AllowCachedData(Metadata.PluginVersion))
         {
             return false;
         }
@@ -85,8 +89,7 @@ out CachedObject<T>? fromCache
 
         CachedObject<T> created = new()
         {
-            SilksongVersion = VersionData.SilksongVersion,
-            PluginVersion = AssetHelperPlugin.Version,
+            Metadata = CachedFileMetadata.CreateNew(),
             Value = createDefault(),
         };
         created.SerializeToFile(filePath);