From b4c23fb1dc5a91472dfd5d2b0ef79bf7e9482457 Mon Sep 17 00:00:00 2001
From: Anairkoen Schno <aaron.cirr.com@gmail.com>
Date: Sat, 17 Aug 2019 19:32:11 -0500
Subject: [PATCH] Fixed a load of me fucking up

---
 BSIPA-Meta/BSIPA-Meta.csproj     | 6 +++++-
 BSIPA-ModList/manifest.json      | 6 +++---
 IPA.Injector/GameVersionEarly.cs | 5 ++++-
 IPA.Loader/Config/SelfConfig.cs  | 4 ++--
 IPA.Loader/Loader/manifest.json  | 2 +-
 IPA/Program.cs                   | 2 +-
 appveyor.yml                     | 2 +-
 7 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/BSIPA-Meta/BSIPA-Meta.csproj b/BSIPA-Meta/BSIPA-Meta.csproj
index b355d8a4..cd9a0d16 100644
--- a/BSIPA-Meta/BSIPA-Meta.csproj
+++ b/BSIPA-Meta/BSIPA-Meta.csproj
@@ -33,6 +33,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <NoVerboseConfig>Debug</NoVerboseConfig>
     <OtherConfig>Debug</OtherConfig>
     <ProxyConfig>Release</ProxyConfig>
   </PropertyGroup>
@@ -43,6 +44,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <NoVerboseConfig>Release</NoVerboseConfig>
     <OtherConfig>Release</OtherConfig>
     <ProxyConfig>Release</ProxyConfig>
   </PropertyGroup>
@@ -54,6 +56,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <NoVerboseConfig>Debug</NoVerboseConfig>
     <OtherConfig>Verbose</OtherConfig>
     <ProxyConfig>Verbose_Release</ProxyConfig>
   </PropertyGroup>
@@ -64,6 +67,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <NoVerboseConfig>Release</NoVerboseConfig>
     <OtherConfig>Verbose_Release</OtherConfig>
     <ProxyConfig>Verbose_Release</ProxyConfig>
   </PropertyGroup>
@@ -85,7 +89,7 @@
     <Message Text="Results will be put in $(OutputPath)" Importance="High" />
     
     <ItemGroup>
-      <InputDlls Include="$(SolutionDir)IPA.Injector\bin\$(NetPlatform)\$(OtherConfig)\**\*" Exclude="$(SolutionDir)IPA.Injector\bin\$(NetPlatform)\$(OtherConfig)\Libraries\**\*" />
+      <InputDlls Include="$(SolutionDir)IPA.Injector\bin\$(NetPlatform)\$(NoVerboseConfig)\**\*" Exclude="$(SolutionDir)IPA.Injector\bin\$(NetPlatform)\$(NoVerboseConfig)\Libraries\**\*" />
       <InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\$(ProxyPlatform)\$(ProxyConfig)\**\*.dll" />
       <InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\$(ProxyPlatform)\$(ProxyConfig)\**\*.pdb" />
       <InputIPAFiles Include="$(SolutionDir)IPA\bin\$(OtherConfig)\**\*" />
diff --git a/BSIPA-ModList/manifest.json b/BSIPA-ModList/manifest.json
index 8246d148..69ca01a1 100644
--- a/BSIPA-ModList/manifest.json
+++ b/BSIPA-ModList/manifest.json
@@ -8,13 +8,13 @@
     "",
     "## An in-game interface client for BSIPA."
   ],
-  "gameVersion": "1.1.0",
+  "gameVersion": "1.2.0",
   "id": "BSIPA Mod List",
   "name": "BSIPA Mod List",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "icon": "BSIPA_ModList.Icons.self.png",
   "dependsOn": {
-    "BSIPA": "^3.12.23",
+    "BSIPA": "^3.13.0",
     "CustomUI": "^1.5.4"
   },
   "features": [],
diff --git a/IPA.Injector/GameVersionEarly.cs b/IPA.Injector/GameVersionEarly.cs
index 78de36c9..94f74f4e 100644
--- a/IPA.Injector/GameVersionEarly.cs
+++ b/IPA.Injector/GameVersionEarly.cs
@@ -15,7 +15,10 @@ namespace IPA.Injector
     internal static class GameVersionEarly
     {
         internal static string ResolveDataPath(string installDir) => 
-            Path.Combine(Directory.EnumerateDirectories(installDir, "*_Data").First(), "globalgamemanagers");
+            Directory.EnumerateDirectories(installDir, "*_Data").First();
+
+        internal static string GlobalGameManagers(string installDir) =>
+            Path.Combine(ResolveDataPath(installDir), "globalgamemanagers");
 
         internal static string GetGameVersion()
         {
diff --git a/IPA.Loader/Config/SelfConfig.cs b/IPA.Loader/Config/SelfConfig.cs
index 6e72030c..90dcee01 100644
--- a/IPA.Loader/Config/SelfConfig.cs
+++ b/IPA.Loader/Config/SelfConfig.cs
@@ -64,7 +64,7 @@ namespace IPA.Config
         }
 
         internal const string IPAName = "Beat Saber IPA";
-        internal const string IPAVersion = "3.12.25";
+        internal const string IPAVersion = "3.13.0";
 
         // uses Updates.AutoUpdate, Updates.AutoCheckUpdates, YeetMods, Debug.ShowCallSource, Debug.ShowDebug, 
         //      Debug.CondenseModLogs
@@ -104,7 +104,7 @@ namespace IPA.Config
             // This option only takes effect after a full game restart, unless new logs are created again
             public bool CondenseModLogs = false;
             // LINE: ignore 2
-            public static bool CondenseModLogs_ => SelfConfigRef.Value.Debug.CondenseModLogs
+            public static bool CondenseModLogs_ => SelfConfigRef?.Value.Debug.CondenseModLogs ?? false
                                                 ||   CommandLineValues.Debug.CondenseModLogs;
 
             public bool ShowHandledErrorStackTraces = false;
diff --git a/IPA.Loader/Loader/manifest.json b/IPA.Loader/Loader/manifest.json
index 2bb8dbfb..0288a583 100644
--- a/IPA.Loader/Loader/manifest.json
+++ b/IPA.Loader/Loader/manifest.json
@@ -8,7 +8,7 @@
   "gameVersion": "1.3.0",
   "id": "BSIPA",
   "name": "Beat Saber IPA",
-  "version": "3.12.25",
+  "version": "3.13.0",
   "icon": "IPA.icon.png",
   "features": [
     "define-feature(print, IPA.Loader.Features.PrintFeature)",
diff --git a/IPA/Program.cs b/IPA/Program.cs
index ff3b10fa..1ea0653c 100644
--- a/IPA/Program.cs
+++ b/IPA/Program.cs
@@ -23,7 +23,7 @@ namespace IPA
             Unknown
         }
 
-        public const string FileVersion = "3.12.25";
+        public const string FileVersion = "3.13.0";
 
         public static Version Version => Assembly.GetEntryAssembly().GetName().Version;
 
diff --git a/appveyor.yml b/appveyor.yml
index c26d4354..9ac4dd88 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 version: 'BSIPA-{branch}-{build}'
 
 environment:
-  bsipa_version: '3.12.25'
+  bsipa_version: '3.13.0'
   gh_token:
     secure: E42gl/yepETuoLSwbJZ1GmEIPK6cCJu6zkd59NA21XiICtEV6COOLW7aehi1tcVU