Merge pull request #96 from Kalobi/assetconflicts

Add non-conflict asset types for mod root files
EverestAPI · Jan 25, 2024 · 39707b4 · 39707b4
2 parents 951412c + 0a39c0e
commit 39707b4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/AssetTypes.cs b/AssetTypes.cs
@@ -0,0 +1,4 @@
+namespace Celeste.Mod.CollabUtils2;
+
+public sealed class AssetTypeCollabID : AssetTypeNonConflict { private AssetTypeCollabID() { } }
+public sealed class AssetTypeLazyLoadingYaml : AssetTypeNonConflict { private AssetTypeLazyLoadingYaml() { } }
diff --git a/CollabModule.cs b/CollabModule.cs
@@ -50,6 +50,7 @@ public override void Load() {
             OuiJournalCoverWithStickers.Load();
 
             Everest.Content.OnUpdate += onModAssetUpdate;
+            Everest.Content.OnGuessType += onGuessType;
 
             hookOrigSessionCtor = new Hook(typeof(Session).GetMethod("orig_ctor"), typeof(CollabModule).GetMethod(nameof(onNewSession), BindingFlags.NonPublic | BindingFlags.Static));
         }
@@ -74,6 +75,7 @@ public override void Unload() {
             OuiJournalCoverWithStickers.Unload();
 
             Everest.Content.OnUpdate -= onModAssetUpdate;
+            Everest.Content.OnGuessType -= onGuessType;
 
             hookOrigSessionCtor?.Dispose();
             hookOrigSessionCtor = null;
@@ -94,6 +96,23 @@ private void onModAssetUpdate(ModAsset oldAsset, ModAsset newAsset) {
                 reloadCrystalHeartSwapSpriteBanks();
             }
         }
+
+        private static string onGuessType(string file, out Type type, out string format) {
+            switch (file) {
+                case "CollabUtils2CollabID.txt":
+                    type = typeof(AssetTypeCollabID);
+                    format = "txt";
+                    return "CollabUtils2CollabID";
+                case "CollabUtils2LazyLoading.yaml" or "CollabUtils2LazyLoading.yml":
+                    type = typeof(AssetTypeLazyLoadingYaml);
+                    format = "yml";
+                    return "CollabUtils2LazyLoading";
+                default:
+                    type = null;
+                    format = null;
+                    return null;
+            }
+        }
 
         public override void LoadContent(bool firstLoad) {
             reloadCrystalHeartSwapSpriteBanks();

diff --git a/CollabUtils2.csproj b/CollabUtils2.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net452</TargetFrameworks>
+    <LangVersion>11</LangVersion>
     <AssemblyName>CollabUtils2</AssemblyName>
     <RootNamespace>Celeste.Mod.CollabUtils2</RootNamespace>
   </PropertyGroup>
@@ -15,15 +16,15 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="CelesteNet.Client">
-      <HintPath>lib-stripped\CelesteNet.Client.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="CelesteNet.Shared">
-      <HintPath>lib-stripped\CelesteNet.Shared.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
+  <ItemGroup>
+    <Reference Include="CelesteNet.Client">
+      <HintPath>lib-stripped\CelesteNet.Client.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="CelesteNet.Shared">
+      <HintPath>lib-stripped\CelesteNet.Shared.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
   </ItemGroup>
 
   <Choose>