Conform to BepInEx.x.Loader format

.gitignore

@@ -331,3 +331,4 @@ ASALocalRun/
 
 package/
 source/references/
+lib/*.dll

README.md

@@ -1,17 +1,17 @@
-# BepInEx-Partiality-Wrapper
+# BepInEx.Partiality.Loader
 
 [![Version](https://img.shields.io/badge/BepInEx-5.0-green.svg)](https://github.com/BepInEx/BepInEx)
 [![Version](https://img.shields.io/badge/Partiality-0.1-green.svg)](https://github.com/PartialityModding/Partiality)
 
-Generic **BepInEx** Wrapper for any **Unity games** that rely on **Partiality**.
+Generic **BepInEx** Loader for any **Unity games** that rely on **Partiality**.
 
 ## Installation
 
 Unpack on your game instalation folder, requires **BepInEx +5.0**.
 
 ## Adding Partiality Mods
 
-Drag and drop any **Partiality** mods dlls onto **BepInEx/plugins** folder.
+Drag and drop any **Partiality** mods dlls onto **BepInEx/partiality** folder.
 
 ## Contributing
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.

lib/Readme.md

@@ -0,0 +1,6 @@
+# Place BepInEx.Partiality.Loader dependencies here
+
+* 0Harmony.dll
+* BepInEx.dll
+* Partiality.dll
+* UnityEngine.dll

source/BepInEx.Partiality.Loader.csproj

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Version>2.1.0.0</Version>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net35</TargetFramework>
+    <DebugType>None</DebugType>
+    <OutputPath>..\package\BepInEx\plugins\BepInEx.Partiality.Loader</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="BepInEx">
+      <HintPath>..\lib\BepInEx.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="0Harmony">
+      <HintPath>..\lib\0Harmony.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine">
+      <HintPath>..\lib\UnityEngine.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Partiality">
+      <HintPath>..\lib\Partiality.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Mono.Cecil" Version="0.10.4">
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="MonoMod" Version="19.11.5.1" />
+    <PackageReference Include="MonoMod.RuntimeDetour" Version="19.11.5.1">
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="19.11.5.1" />
+    <PackageReference Include="MonoMod.Utils" Version="19.11.5.1">
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>

source/BepInEx-Partiality-Wrapper.sln → source/BepInEx.Partiality.Loader.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.156
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BepInEx-Partiality-Wrapper", "BepInEx-Partiality-Wrapper.csproj", "{15FFC242-62DB-4C19-91C0-182FCBC5E652}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BepInEx.Partiality.Loader", "BepInEx.Partiality.Loader.csproj", "{15FFC242-62DB-4C19-91C0-182FCBC5E652}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

source/Wrapper.cs → source/PartialityLoader.cs

@@ -5,7 +5,6 @@
 using System.Reflection;
 using System.Text;
 
-using BepInEx;
 using BepInEx.Logging;
 
 using HarmonyLib;
@@ -18,16 +17,16 @@
 using Partiality;
 using Partiality.Modloader;
 
-namespace BepInExPartialityWrapper
+namespace BepInEx.Partiality.Loader
 {
     [BepInPlugin(ID, NAME, VERSION)]
-    public class Wrapper : BaseUnityPlugin
+    public class PartialityLoader : BaseUnityPlugin
     {
-        const string ID = "github.notfood.BepInExPartialityWrapper";
-        const string NAME = "Partiality Wrapper";
-        const string VERSION = "2.0";
+        const string ID = "github.notfood.BepInExPartialityLoader";
+        const string NAME = "Partiality Loader";
+        const string VERSION = "2.1";
 
-        public Wrapper()
+        void Awake()
         {
             GenerateHooks();
             BootstrapPartiality();
@@ -41,7 +40,13 @@ void GenerateHooks()
             string pathOut = Path.Combine(Path.GetDirectoryName(Info.Location), "HOOKS-Assembly-CSharp.dll");
 
             if (File.Exists(pathOut)) {
-                return;
+
+                // Only Regenerate if Managed is newer than HOOKS
+                if (File.GetLastWriteTime(pathOut) > File.GetLastWriteTime(pathIn)) {
+                    return;
+                }
+
+                File.Delete(pathOut);
             }
 
             using (MonoModder mm = new MonoModder {
@@ -69,7 +74,7 @@ void BootstrapPartiality()
             var harmony = new Harmony(ID);
 
             harmony.Patch(AccessTools.Method(typeof(ModManager), nameof(ModManager.LoadAllMods)),
-                prefix: new HarmonyMethod(typeof(Wrapper), nameof(PrefixReturnFalse)));
+                prefix: new HarmonyMethod(typeof(PartialityLoader), nameof(PrefixReturnFalse)));
 
             PartialityManager.CreateInstance();
         }
@@ -79,7 +84,14 @@ void BootstrapPartiality()
         /// <summary>Loads the Partiality Mods after sorting</summary>
         void LoadPartialityMods()
         {
-            var modTypes = LoadTypes<PartialityMod>(Paths.PluginPath);
+            string partialityPath = Path.Combine(Paths.BepInExRootPath, "partiality");
+
+            if (!Directory.Exists(partialityPath)) {
+                Directory.CreateDirectory(partialityPath);
+                return;
+            }
+
+            var modTypes = LoadTypes<PartialityMod>(partialityPath);
 
             var loadedMods = PartialityManager.Instance.modManager.loadedMods;
 
@@ -175,4 +187,4 @@ static string TypeLoadExceptionToString(ReflectionTypeLoadException ex)
             return sb.ToString();
         }
     }
-}
+}