push a few more mods

DisableEncryption/DisableEncryption.csproj

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net46</TargetFramework>
+        <LangVersion>latest</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <AssemblyName>Assembly-CSharp.DisableEncryption.mm</AssemblyName>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Reference Include="MonoMod">
+            <HintPath>..\External\MonoMod.exe</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="Assembly-CSharp">
+            <HintPath>..\External\Assembly-CSharp.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="UnityEngine">
+            <HintPath>..\External\UnityEngine.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="UnityEngine.CoreModule">
+            <HintPath>..\External\UnityEngine.CoreModule.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+    </ItemGroup>
+
+</Project>

DisableEncryption/Net/Packet/patch_Packet.cs

@@ -0,0 +1,20 @@
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+using MonoMod;
+
+namespace Net.Packet;
+
+public class patch_Packet : Packet 
+{
+    [MonoModIgnore]
+    public override PacketState Proc()
+    {
+        throw new NotImplementedException();
+    }
+
+    [MonoModReplace]
+    public new static string Obfuscator(string srcStr)
+    {
+        return srcStr;
+    }
+}

DisableEncryption/Net/patch_CipherAES.cs

@@ -0,0 +1,21 @@
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+using MonoMod;
+
+namespace Net;
+
+[MonoModPatch("global::Net.CipherAES")]
+public class patch_CipherAES
+{
+    [MonoModReplace]
+    public static byte[] Encrypt(byte[] data)
+    {
+        return data;
+    }
+
+    [MonoModReplace]
+    public static byte[] Decrypt(byte[] data)
+    {
+        return data;
+    }
+}

DisableEncryption/Net/patch_NetHttpClient.cs

@@ -0,0 +1,17 @@
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
+using MonoMod;
+
+namespace Net;
+
+public class patch_NetHttpClient : NetHttpClient
+{
+    [MonoModReplace]
+    public new static bool CheckServerHash(object sender, X509Certificate certificate, X509Chain chain,
+        SslPolicyErrors sslPolicyErrors)
+    {
+        return true;
+    }
+}

DisableEncryption/System/Net/patch_WebHeaderCollection.cs

@@ -0,0 +1,17 @@
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+namespace System.Net;
+
+public class patch_WebHeaderCollection : WebHeaderCollection
+{
+    public extern void orig_Add(string header, string value);
+    public new void Add(string header, string value)
+    {
+        if (header.ToLowerInvariant() == "mai-encoding")
+        {
+            return;
+        }
+        
+        orig_Add(header, value);
+    }
+}

DisableReboot/DisableReboot.csproj

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net46</TargetFramework>
+        <LangVersion>latest</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <AssemblyName>Assembly-CSharp.DisableReboot.mm</AssemblyName>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Reference Include="MonoMod">
+            <HintPath>..\External\MonoMod.exe</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="Assembly-CSharp">
+            <HintPath>..\External\Assembly-CSharp.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="UnityEngine">
+            <HintPath>..\External\UnityEngine.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="UnityEngine.CoreModule">
+            <HintPath>..\External\UnityEngine.CoreModule.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+    </ItemGroup>
+
+</Project>

DisableReboot/Manager/Operation/patch_MaintenanceTimer.cs

@@ -0,0 +1,21 @@
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+
+using MonoMod;
+
+namespace Manager.Operation;
+
+public class patch_MaintenanceTimer : MaintenanceTimer
+{
+    [MonoModReplace]
+    public new bool IsAutoRebootNeeded()
+    {
+        return false;
+    }
+
+    [MonoModReplace]
+    public new int GetAutoRebootSec()
+    {
+        return 86400;
+    }
+}

DisableReboot/Manager/Operation/patch_SegaBootTimer.cs

@@ -0,0 +1,39 @@
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+
+using MonoMod;
+
+namespace Manager.Operation;
+
+public class patch_SegaBootTimer : SegaBootTimer
+{
+    [MonoModReplace]
+    public new bool IsSegaBootTime()
+    {
+        return false;
+    }
+
+    [MonoModReplace]
+    public new int GetGotoSegaBootSec()
+    {
+        return 86400;
+    }
+
+    [MonoModReplace]
+    public new bool IsSegaBootNeeded()
+    {
+        return false;
+    }
+    
+    [MonoModReplace]
+    public new int GetRemainingMinutes()
+    {
+        return 1440;
+    }
+
+    [MonoModReplace]
+    public new bool IsCoinAcceptable()
+    {
+        return true;
+    }
+}

FixLocaleIssues/FixLocaleIssues.csproj

@@ -1,43 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
-            Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
     <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <TargetFramework>net46</TargetFramework>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProjectGuid>{48B5F480-D749-48E9-9D26-E0E5260D95DE}</ProjectGuid>
-        <OutputType>Library</OutputType>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
-        <RootNamespace>FixLocaleIssues</RootNamespace>
-        <AssemblyName>Assembly-CSharp.FixLocaleIssues.mm</AssemblyName>
-        <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-        <FileAlignment>512</FileAlignment>
         <LangVersion>latest</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <AssemblyName>Assembly-CSharp.FixLocaleIssues.mm</AssemblyName>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    
-        <PlatformTarget>AnyCPU</PlatformTarget>
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <PlatformTarget>AnyCPU</PlatformTarget>
-        <DebugType>pdbonly</DebugType>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <DefineConstants>TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
     <ItemGroup>
-        <Reference Include="System"/>
-        <Reference Include="System.Core"/>
-        <Reference Include="System.Data"/>
-        <Reference Include="System.Xml"/>
         <Reference Include="MonoMod">
             <HintPath>..\External\MonoMod.exe</HintPath>
             <Private>False</Private>
@@ -55,19 +26,5 @@
             <Private>False</Private>
         </Reference>
     </ItemGroup>
-    <ItemGroup>
-        <Compile Include="MAI2System\patch_IniSection.cs" />
-        <Compile Include="Manager\patch_MA2Record.cs" />
-        <Compile Include="Manager\patch_SlideManager.cs" />
-        <Compile Include="Properties\AssemblyInfo.cs"/>
-    </ItemGroup>
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-    <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-         Other similar extension points exist, see Microsoft.Common.targets.
-    <Target Name="BeforeBuild">
-    </Target>
-    <Target Name="AfterBuild">
-    </Target>
-    -->
 
 </Project>

FixLocaleIssues/MAI2System/patch_IniSection.cs

@@ -18,4 +18,4 @@ class patch_IniSection : IniSection
     {
         return float.TryParse(_variableValue, NumberStyles.Float, CultureInfo.InvariantCulture, out value);
     }
-}
+}

FixLocaleIssues/Manager/patch_MA2Record.cs

@@ -6,7 +6,7 @@ using MonoMod;
 
 namespace Manager;
 
-class patch_MA2Record : MA2Record
+public class patch_MA2Record : MA2Record
 {
     [MonoModIgnore]
     private static extern Ma2fileParamID.Def getParamIDFromRec(Ma2fileRecordID.Def rec, int index);

FixLocaleIssues/Manager/patch_SlideManager.cs

@@ -1,9 +1,7 @@
 // ReSharper disable CheckNamespace
 // ReSharper disable InconsistentNaming
 
-using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Text.RegularExpressions;
 using System.Xml;
 using MonoMod;
@@ -16,7 +14,9 @@ public class patch_SlideManager : SlideManager
     [MonoModIgnore]
     private struct SlidePath
     {
+#pragma warning disable CS0649
         public List<ControlPoint> Points;
+#pragma warning restore CS0649
     }
     
     [MonoModIgnore]

ImproveLoadTimes/ImproveLoadTimes.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net46</TargetFramework>
+        <LangVersion>latest</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <AssemblyName>Assembly-CSharp.ImproveLoadTimes.mm</AssemblyName>
+        <NoWarn>CS0626</NoWarn>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Reference Include="MonoMod">
+            <HintPath>..\External\MonoMod.exe</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="Assembly-CSharp">
+            <HintPath>..\External\Assembly-CSharp.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="UnityEngine">
+            <HintPath>..\External\UnityEngine.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="UnityEngine.CoreModule">
+            <HintPath>..\External\UnityEngine.CoreModule.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+    </ItemGroup>
+
+</Project>

ImproveLoadTimes/Manager/MaiStudio/Serialize/SerializeBase.cs

@@ -0,0 +1,12 @@
+// ReSharper disable CheckNamespace
+
+using MonoMod;
+
+namespace Manager.MaiStudio.Serialize;
+
+[MonoModReplace]
+[Serializable]
+public class SerializeBase
+{
+    public virtual void AddPath(string parentPath) { }
+}

ImproveLoadTimes/Manager/MaiStudio/Serialize/patch_FilePath.cs

@@ -0,0 +1,20 @@
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+
+using MonoMod;
+
+namespace Manager.MaiStudio.Serialize;
+
+public class patch_FilePath : FilePath
+{
+    [MonoModReplace]
+    public override void AddPath(string parentPath)
+    {
+        if (string.IsNullOrEmpty(path) || path.StartsWith(parentPath))
+        {
+            return;
+        }
+
+        path = parentPath + path;
+    }
+}

ImproveLoadTimes/Manager/patch_DataManager.cs

@@ -0,0 +1,99 @@
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+using System.Runtime.Serialization.Formatters.Binary;
+
+namespace Manager;
+
+public class patch_DataManager : DataManager
+{
+    private const string _cacheFilename = "data_cache.bin";
+    private static Dictionary<string, object>? _cache;
+    private static bool _cacheBusted;
+    
+    private static extern bool orig_Deserialize<T>(string filePath, out T dsr) where T : new();
+    private static bool Deserialize<T>(string filePath, out T dsr) where T : new()
+    {
+	    try
+	    {
+		    _cache ??= LoadCache(_cacheFilename);
+	    }
+	    catch (Exception e)
+	    {
+		    System.Console.WriteLine("[ImproveLoadTimes] Could not load data cache: {0}", e);
+		    _cache ??= new Dictionary<string, object>();
+	    }
+
+        try
+        {
+	        if (_cache.TryGetValue(filePath, out var dsrObject))
+	        {
+		        dsr = (T)dsrObject;
+		        return true;
+	        }
+
+	        if (!orig_Deserialize(filePath, out dsr))
+	        {
+		        return false;
+	        }
+
+	        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
+	        if (filePath == null || dsr == null)
+	        {
+		        return true;
+	        }
+	        
+	        _cache.Add(filePath, dsr);
+	        _cacheBusted = true;
+
+	        return true;
+        }
+        catch (Exception e)
+        {
+	        System.Console.WriteLine("[ImproveLoadTimes] [ERROR] Could not load from cache: {0}", e);
+	        return orig_Deserialize(filePath, out dsr);
+        }
+    }
+
+    private extern bool orig_IsLoaded();
+    public new bool IsLoaded()
+    {
+        var loaded = orig_IsLoaded();
+
+        if (!loaded || !_cacheBusted || _cache == null)
+        {
+            return loaded;
+        }
+        
+        try
+        {
+	        SaveCache(_cacheFilename, _cache);
+        }
+        catch (Exception e)
+        {
+	        System.Console.WriteLine("[ImproveLoadTimes] [ERROR] Could not save to cache: {0}", e);
+        }
+        
+        _cacheBusted = false;
+
+        return true;
+    }
+
+    private static Dictionary<string, object> LoadCache(string fileName)
+    {
+	    if (!File.Exists(fileName))
+	    {
+		    return new Dictionary<string, object>();
+	    }
+	    
+	    System.Console.WriteLine("[ImproveLoadTimes] Loading data cache...");
+	    
+	    using var fs = File.OpenRead(fileName);
+	    return (Dictionary<string, object>)new BinaryFormatter().Deserialize(fs);
+    }
+    
+    private static void SaveCache(string fileName, Dictionary<string, object> cache)
+    {
+	    using var fs = File.Open(fileName, FileMode.Create, FileAccess.Write);
+	    new BinaryFormatter().Serialize(fs, cache);
+    }
+}

ImproveLoadTimes/Manager/patch_PowerOnProcess.cs

@@ -0,0 +1,21 @@
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+
+using MonoMod;
+using Process;
+
+namespace Manager;
+
+public class patch_PowerOnProcess : PowerOnProcess
+{
+#pragma warning disable CS0414 // Field is assigned but its value is never used
+    [MonoModIgnore]
+    private float _waitTime;
+#pragma warning restore CS0414 // Field is assigned but its value is never used
+    
+    [MonoModConstructor]
+    public patch_PowerOnProcess(ProcessDataContainer dataContainer) : base(dataContainer)
+    {
+        _waitTime = 0f;
+    }
+}

LooseDBTables/LooseDBTables.csproj

@@ -1,43 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
-            Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
     <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <TargetFramework>net46</TargetFramework>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProjectGuid>{F15988CC-BDF0-4F86-811B-BAE18EEA6519}</ProjectGuid>
-        <OutputType>Library</OutputType>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
-        <RootNamespace>LooseDBTables</RootNamespace>
-        <AssemblyName>Assembly-CSharp.LooseDBTables.mm</AssemblyName>
-        <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-        <FileAlignment>512</FileAlignment>
         <LangVersion>latest</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <AssemblyName>Assembly-CSharp.LooseDBTables.mm</AssemblyName>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+
-        <PlatformTarget>AnyCPU</PlatformTarget>
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <PlatformTarget>AnyCPU</PlatformTarget>
-        <DebugType>pdbonly</DebugType>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <DefineConstants>TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
     <ItemGroup>
-        <Reference Include="System"/>
-        <Reference Include="System.Core"/>
-        <Reference Include="System.Data"/>
-        <Reference Include="System.Xml"/>
         <Reference Include="MonoMod">
             <HintPath>..\External\MonoMod.exe</HintPath>
             <Private>False</Private>
@@ -59,19 +30,5 @@
             <Private>False</Private>
         </Reference>
     </ItemGroup>
-    <ItemGroup>
-        <Compile Include="DB\*.cs" />
-        <Compile Include="Process\patch_PowerOnProcess.cs" />
-        <Compile Include="Properties\AssemblyInfo.cs"/>
-        <Compile Include="Table.cs" />
-    </ItemGroup>
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-    <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-         Other similar extension points exist, see Microsoft.Common.targets.
-    <Target Name="BeforeBuild">
-    </Target>
-    <Target Name="AfterBuild">
-    </Target>
-    -->
 
 </Project>

MoreChartFormats/MoreChartFormats.csproj

@@ -1,43 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
-            Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
     <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <TargetFramework>net46</TargetFramework>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProjectGuid>{A375F626-7238-4227-95C9-2BB1E5E099F6}</ProjectGuid>
-        <OutputType>Library</OutputType>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
-        <RootNamespace>MoreChartFormats</RootNamespace>
-        <AssemblyName>Assembly-CSharp.MoreChartFormats.mm</AssemblyName>
-        <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-        <FileAlignment>512</FileAlignment>
         <LangVersion>latest</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <AssemblyName>Assembly-CSharp.MoreChartFormats.mm</AssemblyName>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+
-        <PlatformTarget>AnyCPU</PlatformTarget>
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <PlatformTarget>AnyCPU</PlatformTarget>
-        <DebugType>pdbonly</DebugType>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <DefineConstants>TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
     <ItemGroup>
-        <Reference Include="System"/>
-        <Reference Include="System.Core"/>
-        <Reference Include="System.Data"/>
-        <Reference Include="System.Xml"/>
         <Reference Include="MonoMod">
             <HintPath>..\External\MonoMod.exe</HintPath>
             <Private>False</Private>
@@ -55,37 +26,5 @@
             <Private>False</Private>
         </Reference>
     </ItemGroup>
-    <ItemGroup>
-        <Compile Include="MaiSxt\SrtReader.cs" />
-        <Compile Include="MaiSxt\Structures\SxtRow.cs" />
-        <Compile Include="MaiSxt\SxtReader.cs" />
-        <Compile Include="MaiSxt\SxtReaderBase.cs" />
-        <Compile Include="NotesReferences.cs" />
-        <Compile Include="ParserUtilities.cs" />
-        <Compile Include="patch_NotesReader.cs" />
-        <Compile Include="Properties\AssemblyInfo.cs"/>
-        <Compile Include="Simai\BpmChangeDataExtensions.cs" />
-        <Compile Include="Simai\SimaiReader.cs" />
-        <Compile Include="Simai\LexicalAnalysis\Token.cs" />
-        <Compile Include="Simai\LexicalAnalysis\Tokenizer.cs" />
-        <Compile Include="Simai\LexicalAnalysis\TokenType.cs" />
-        <Compile Include="Simai\Errors\*.cs" />
-        <Compile Include="Simai\Structures\SlideSegment.cs" />
-        <Compile Include="Simai\Structures\SlideTiming.cs" />
-        <Compile Include="Simai\SyntacticAnalysis\Deserializer.cs" />
-        <Compile Include="Simai\SyntacticAnalysis\States\NoteReader.cs" />
-        <Compile Include="Simai\SyntacticAnalysis\States\SlideReader.cs" />
-    </ItemGroup>
-    <ItemGroup>
-      <Folder Include="Simai\LexicalAnalysis\" />
-    </ItemGroup>
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-    <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-         Other similar extension points exist, see Microsoft.Common.targets.
-    <Target Name="BeforeBuild">
-    </Target>
-    <Target Name="AfterBuild">
-    </Target>
-    -->
 
 </Project>

MoreChartFormats/patch_NotesReader.cs

@@ -1,8 +1,6 @@
 // ReSharper disable CheckNamespace
 // ReSharper disable InconsistentNaming
 
-using System;
-using System.IO;
 using System.Xml.Serialization;
 using Manager.MaiStudio.Serialize;
 using MonoMod;
@@ -133,7 +131,15 @@ class patch_NotesReader : NotesReader
             {
                 note.time.calcMsec(this);
                 note.end.calcMsec(this);
-                note.startButtonPos = ConvertMirrorPosition(note.startButtonPos);
+                
+                if (note.type.isTouch() && note.touchArea is TouchSensorType.D or TouchSensorType.E)
+                {
+                    note.startButtonPos = ConvertMirrorTouchEPosition(note.startButtonPos);
+                }
+                else
+                {
+                    note.startButtonPos = ConvertMirrorPosition(note.startButtonPos);    
+                }
 
                 if (note.type.isSlide() || note.type == NotesTypeID.Def.ConnectSlide)
                 {
@@ -142,14 +148,11 @@ class patch_NotesReader : NotesReader
                     note.slideData.targetNote = ConvertMirrorPosition(note.slideData.targetNote);
                     note.slideData.type = ConvertMirrorSlide(note.slideData.type);
                 }
-
-                if (note.type.isTouch() && note.touchArea is TouchSensorType.D or TouchSensorType.E)
-                {
-                    note.startButtonPos = ConvertMirrorTouchEPosition(note.startButtonPos);
-                }
             }
 
+#if DEBUG
             System.Console.WriteLine("[MoreChartFormats] [Simai] Calculating chart data");
+#endif
             calcAll();
 #if DEBUG            
             System.Console.WriteLine("[MoreChartFormats] [Simai] Loaded {0} notes", _total.GetAllNoteNum());

README.md

@@ -1,68 +1,50 @@
 ## sinmai-mods
 
-Miscellaneous mods for maimai DX. Mods are MonoMod unless specified otherwise.
+Mods for maimai DX. Patch with MonoMod except specified
+otherwise.
 
-### CachedDataManager
+## Mod list
-Speeds up game reboots by caching loaded data. Cache is stored in the `dataCache` folder
+
-and should be deleted if any issues arise.
+### DisableEncryption
+Disables title server encryption.
+
+### DisableReboot
+Disables automatic reboots.
 
 ### FixLocaleIssues
-Attempts to fix charts not loading on some system locales.
+Attempt to fix charts not loading on regions where the system's
+decimal separator is not the dot (`.`).
 
-Adds `CultureInfo.InvariantCulture` to all instances of `float.Parse` and `float.TryParse`
+### ImproveLoadTimes
-so charts will still load on locales where the comma is the decimal separator.
+Speed up game reboots by caching game data. Cache data is stored
+in `data_cache.bin` and can be safely deleted if issues arise.
 
-### LooseDBTables
+### Singleplayer
-Enables loading tables from loose `.json` files in `Sinmai_Data/StreamingAssets/DB`.
+Show only the left monitor at the center of the screen.
-Useful for string edits (a.k.a. english patch).
 
-Tables are automatically generated if `Sinmai_Data/StreamingAssets/DB` doesn't exist.
+### TouchPanel
+Set touch panel sensitivity for individual regions, or introduce
+delay on the touch panel. It is configured by adding a section
+to `mai2.ini`:
 
-### MoreChartFormats
+```ini
+[TouchPanel]
+; Introduce delay to touch inputs to make it line up with
+; button inputs
+DelayMs=0
 
-Loads charts written in various known formats:
+; Customize the activation threshold for specific touch
-- [simai](https://w.atwiki.jp/simai) (powered by a custom fork of [SimaiSharp](https://github.com/reflektone-games/SimaiSharp))
+; sensors. The touch sensor values can be found by going
-- srt/szt/sct/sdt (maimai classic chart format)
+; into input test in the game test menu.
-
+SensitivityA1=90
-To use, edit Music.xml to point the chart file path to your chart file:
+SensitivityA2=90
-```xml
+...
-<Notes>
-  <file>
-    <path>{filename}.sdt</path>
-  </file>
-  <!-- snip -->
-</Notes>
 ```
 
-The chart loader used depends on the file extension:
-- simai chart files must end with `.simai`
-- srt chart files must end with `.srt`
-- szt/sct/sdt files can use `.szt`/`.sct`/`.sdt` interchangeably, since they only
-differ by two ending columns. [details](https://listed.to/@donmai/18173/the-four-chart-formats-of-maimai-classic)
-
-#### Simai caveats
-- **`maidata.txt` is not supported. If you have one, paste the content of each
-`inote_x` into their own `.simai` file.** 
-- Both `?` and `!` will create a slide without a star note, but both of them will
-make the slide fade in (`!` makes the slide suddenly appear in standard simai).
-- `$` cannot be used to create a tapless slide (maiPad PLUS syntax).
-- `$$` is ignored, as star notes only spin when there's an associated slide.
-- `[BPM#a:b]` is not supported for specifying hold time.
-- `` ` `` (fake EACH) makes taps 1/384 measures apart.
-
-#### SXT caveats
-- Encrypted chart files (`.srb`/`.szb`/`.scb`/`.sdb`) are not supported. Decrypt 
-them before loading into the game.
-- Since this chart format does not contain timing data, the song's BPM is retrieved
-by loading the `Music.xml` associated with the chart, **and it is assumed that the
-chart and `Music.xml` is in the same folder**. The SXT loader will not work if the
-chart file is somehow in a different folder from `Music.xml`.
-
 ### UnlockFrameRate
-Change the target FPS. Also comes with an FPS counter.
+**BepInEx mod.**
 
-Unlike other mods in this collection, this is a **BepInEx** mod. You will need to
+Change the target FPS. Also comes with an FPS counter. The
-install BepInEx and drop this into `BepInEx/plugins` to enable the mod.
+configuration file for changing the FPS is at
-
+`BepInEx/config/io.github.beerpsi.sinmai.framerate.cfg` and is
-The configuration file for changing the FPS is at `BepInEx/config/io.github.beerpsi.sinmai.framerate.cfg`
+already documented. 
-and is already documented.

Singleplayer/Main/patch_GameMainObject.cs

@@ -0,0 +1,30 @@
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+
+using MonoMod;
+using UnityEngine;
+
+namespace Main;
+
+public class patch_GameMainObject : GameMainObject
+{
+    [MonoModIgnore]
+    private Transform rightMonitor;
+    
+    private extern void orig_Start();
+    private void Start()
+    {
+        orig_Start();
+
+        var mainCamera = Camera.main;
+
+        if (mainCamera == null)
+        {
+            return;
+        }
+
+        var position = mainCamera.gameObject.transform.position;
+        mainCamera.gameObject.transform.position = new Vector3(-540f, position.y, position.z);
+        rightMonitor.transform.localScale = Vector3.zero;
+    }
+}

Singleplayer/Singleplayer.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net46</TargetFramework>
+        <LangVersion>latest</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <AssemblyName>Assembly-CSharp.Singleplayer.mm</AssemblyName>
+        <NoWarn>CS0626,CS0649,CS8618</NoWarn>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Reference Include="MonoMod">
+            <HintPath>..\External\MonoMod.exe</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="Assembly-CSharp">
+            <HintPath>..\External\Assembly-CSharp.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="UnityEngine">
+            <HintPath>..\External\UnityEngine.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="UnityEngine.CoreModule">
+            <HintPath>..\External\UnityEngine.CoreModule.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+    </ItemGroup>
+
+</Project>

TouchPanel/IO/patch_NewTouchPanel.cs

@@ -0,0 +1,61 @@
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+
+using System.Globalization;
+using MAI2System;
+using Manager;
+
+namespace IO;
+
+class patch_NewTouchPanel : NewTouchPanel
+{
+    private int _touchPanelDelayMsec;
+    private Dictionary<InputManager.TouchPanelArea, byte> _sensitivityOverrides = new();
+
+    public extern void orig_Initialize(uint index);
+    public new void Initialize(uint index)
+    {
+        orig_Initialize(index);
+
+        using var ini = new IniFile("mai2.ini");
+        
+        _touchPanelDelayMsec = ini.getIntValue("TouchPanel", "DelayMs", 0);
+        foreach (InputManager.TouchPanelArea sensor in Enum.GetValues(typeof(InputManager.TouchPanelArea)))
+        {
+            var sensitivityStr = ini.getValue("TouchPanel", $"Sensitivity{sensor}", null);
+
+            if (sensitivityStr == null)
+            {
+                continue;
+            }
+
+            if (byte.TryParse(sensitivityStr, NumberStyles.Integer, CultureInfo.InvariantCulture, out var sensitivity))
+            {
+                System.Console.WriteLine($"[TouchPanel] [WARN] Invalid value for TouchPanel.Sensitivity{sensor}: {sensitivityStr}");
+                continue;
+            }
+
+            _sensitivityOverrides[sensor] = sensitivity;
+        }
+        
+    }
+
+    private extern void orig_Recv();
+    private void Recv()
+    {
+        Thread.Sleep(_touchPanelDelayMsec);
+        orig_Recv();
+    }
+
+    private extern void orig_SetTouchPanelSensitivity(List<byte> sensitivity);
+    private void SetTouchPanelSensitivity(List<byte> sensitivity)
+    {
+        foreach (var s in _sensitivityOverrides)
+        {
+            System.Console.WriteLine($"[TouchPanel] Overriding sensitivity for panel {s.Key}: {s.Value}");
+            sensitivity[(int)s.Key] = s.Value;
+        }
+
+        orig_SetTouchPanelSensitivity(sensitivity);
+    }
+}

TouchPanel/TouchPanel.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net46</TargetFramework>
+        <LangVersion>latest</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <AssemblyName>Assembly-CSharp.TouchPanel.mm</AssemblyName>
+        <NoWarn>CS0626</NoWarn>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Reference Include="MonoMod">
+            <HintPath>..\External\MonoMod.exe</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="Assembly-CSharp">
+            <HintPath>..\External\Assembly-CSharp.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="UnityEngine">
+            <HintPath>..\External\UnityEngine.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="UnityEngine.CoreModule">
+            <HintPath>..\External\UnityEngine.CoreModule.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+    </ItemGroup>
+
+</Project>

UnlockFrameRate/UnlockFrameRate.csproj

@@ -1,77 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net45</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <LangVersion>latest</LangVersion>
-    <ProjectGuid>{03F046DF-EE3C-4596-87F3-F5AA131EF401}</ProjectGuid>
+    <AssemblyName>UnlockFrameRate</AssemblyName>
-    <OutputType>Library</OutputType>
+    <Version>1.0.0</Version>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RootNamespace>UnlockFrameRate</RootNamespace>
-    <AssemblyName>UnlockFrameRate</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
     <LangVersion>latest</LangVersion>
-    <RestoreAdditionalProjectSources>
-        https://api.nuget.org/v3/index.json;
-        https://nuget.bepinex.dev/v3/index.json;
-        https://nuget.samboy.dev/v3/index.json
-    </RestoreAdditionalProjectSources>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+
   <ItemGroup>
+    <PackageReference Include="BepInEx.Analyzers" Version="1.*" PrivateAssets="all"/>
+    <PackageReference Include="BepInEx.Core" Version="5.*"/>
+    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*"/>
+    <PackageReference Include="UnityEngine.Modules" Version="5.6.0" IncludeAssets="compile"/>
+    <Reference Include="MonoMod">
+      <HintPath>..\External\MonoMod.exe</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\External\Assembly-CSharp.dll</HintPath>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <PackageReference Include="BepInEx.Analyzers" Version="1.*" PrivateAssets="all" />
-    <PackageReference Include="BepInEx.Core" Version="5.*" PrivateAssets="all" />
-    <PackageReference Include="HarmonyX" Version="2.12.0" />
     <Reference Include="UnityEngine">
       <HintPath>..\External\UnityEngine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.CoreModule">
       <HintPath>..\External\UnityEngine.CoreModule.dll</HintPath>
-    </Reference>
+      <Private>False</Private>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" />
-    <Reference Include="UnityEngine.IMGUIModule">
-      <HintPath>..\External\UnityEngine.IMGUIModule.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
+
-    <Compile Include="FrameRatePlugin.cs" />
+  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
-    <Compile Include="ManualLogSourceExtensions.cs" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all"/>
-    <Compile Include="PatchFrameTime.cs" />
-    <Compile Include="PatchGetMaiBugAdjustMSec.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-         Other similar extension points exist, see Microsoft.Common.targets.
-    <Target Name="BeforeBuild">
-    </Target>
-    <Target Name="AfterBuild">
-    </Target>
-    -->
 </Project>

sinmai-mods.sln

@@ -1,55 +1,70 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.9.34728.123
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CachedDataManager", "CachedDataManager\CachedDataManager.csproj", "{F1C1B6BF-626C-4F10-8672-2F9596706CA6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FixLocaleIssues", "FixLocaleIssues\FixLocaleIssues.csproj", "{C1D1272C-5BC5-4EFD-A9DA-BB8BE8B16280}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FixLocaleIssues", "FixLocaleIssues\FixLocaleIssues.csproj", "{48B5F480-D749-48E9-9D26-E0E5260D95DE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImproveLoadTimes", "ImproveLoadTimes\ImproveLoadTimes.csproj", "{B18FA6C6-79C3-4851-A88E-161D273CBC0F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LooseDBTables", "LooseDBTables\LooseDBTables.csproj", "{F15988CC-BDF0-4F86-811B-BAE18EEA6519}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TouchPanel", "TouchPanel\TouchPanel.csproj", "{B8E4A429-DE84-4565-AD51-87ECCBD629C5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LooseDBTables.GeneratePatches", "LooseDBTables.GeneratePatches\LooseDBTables.GeneratePatches.csproj", "{7DF53594-C7B2-44D1-ADF7-CCE4BC9E7625}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Singleplayer", "Singleplayer\Singleplayer.csproj", "{0A9D8A7E-984F-4406-B497-E45CFF1073E6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoreChartFormats", "MoreChartFormats\MoreChartFormats.csproj", "{A375F626-7238-4227-95C9-2BB1E5E099F6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DisableEncryption", "DisableEncryption\DisableEncryption.csproj", "{FCBAB1FC-A47F-4939-B17B-F07F1A9DF4F7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnlockFrameRate", "UnlockFrameRate\UnlockFrameRate.csproj", "{03F046DF-EE3C-4596-87F3-F5AA131EF401}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DisableReboot", "DisableReboot\DisableReboot.csproj", "{B645EB54-CC74-437F-9255-2D9BFED87DF2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoreChartFormats", "MoreChartFormats\MoreChartFormats.csproj", "{1966AAE3-19E7-4BA0-862A-A3C54DB51B3F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LooseDBTables", "LooseDBTables\LooseDBTables.csproj", "{10E43267-ADB6-44AC-BABA-80D4CF4C7BC8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnlockFrameRate", "UnlockFrameRate\UnlockFrameRate.csproj", "{54622F97-9187-482C-A9DC-06E1855EF2D7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F1C1B6BF-626C-4F10-8672-2F9596706CA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1C1B6BF-626C-4F10-8672-2F9596706CA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1C1B6BF-626C-4F10-8672-2F9596706CA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1C1B6BF-626C-4F10-8672-2F9596706CA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48B5F480-D749-48E9-9D26-E0E5260D95DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48B5F480-D749-48E9-9D26-E0E5260D95DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48B5F480-D749-48E9-9D26-E0E5260D95DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48B5F480-D749-48E9-9D26-E0E5260D95DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F15988CC-BDF0-4F86-811B-BAE18EEA6519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F15988CC-BDF0-4F86-811B-BAE18EEA6519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F15988CC-BDF0-4F86-811B-BAE18EEA6519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F15988CC-BDF0-4F86-811B-BAE18EEA6519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DF53594-C7B2-44D1-ADF7-CCE4BC9E7625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DF53594-C7B2-44D1-ADF7-CCE4BC9E7625}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DF53594-C7B2-44D1-ADF7-CCE4BC9E7625}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DF53594-C7B2-44D1-ADF7-CCE4BC9E7625}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A375F626-7238-4227-95C9-2BB1E5E099F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A375F626-7238-4227-95C9-2BB1E5E099F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A375F626-7238-4227-95C9-2BB1E5E099F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A375F626-7238-4227-95C9-2BB1E5E099F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{03F046DF-EE3C-4596-87F3-F5AA131EF401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03F046DF-EE3C-4596-87F3-F5AA131EF401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03F046DF-EE3C-4596-87F3-F5AA131EF401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{03F046DF-EE3C-4596-87F3-F5AA131EF401}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		SolutionGuid = {DDE68F38-1E1E-40F9-AD55-2F5F6C804758}
+		{C1D1272C-5BC5-4EFD-A9DA-BB8BE8B16280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1D1272C-5BC5-4EFD-A9DA-BB8BE8B16280}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1D1272C-5BC5-4EFD-A9DA-BB8BE8B16280}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1D1272C-5BC5-4EFD-A9DA-BB8BE8B16280}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B18FA6C6-79C3-4851-A88E-161D273CBC0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B18FA6C6-79C3-4851-A88E-161D273CBC0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B18FA6C6-79C3-4851-A88E-161D273CBC0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B18FA6C6-79C3-4851-A88E-161D273CBC0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8E4A429-DE84-4565-AD51-87ECCBD629C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8E4A429-DE84-4565-AD51-87ECCBD629C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8E4A429-DE84-4565-AD51-87ECCBD629C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8E4A429-DE84-4565-AD51-87ECCBD629C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A9D8A7E-984F-4406-B497-E45CFF1073E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A9D8A7E-984F-4406-B497-E45CFF1073E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A9D8A7E-984F-4406-B497-E45CFF1073E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A9D8A7E-984F-4406-B497-E45CFF1073E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FCBAB1FC-A47F-4939-B17B-F07F1A9DF4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCBAB1FC-A47F-4939-B17B-F07F1A9DF4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FCBAB1FC-A47F-4939-B17B-F07F1A9DF4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FCBAB1FC-A47F-4939-B17B-F07F1A9DF4F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B645EB54-CC74-437F-9255-2D9BFED87DF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B645EB54-CC74-437F-9255-2D9BFED87DF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B645EB54-CC74-437F-9255-2D9BFED87DF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B645EB54-CC74-437F-9255-2D9BFED87DF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1966AAE3-19E7-4BA0-862A-A3C54DB51B3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1966AAE3-19E7-4BA0-862A-A3C54DB51B3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1966AAE3-19E7-4BA0-862A-A3C54DB51B3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1966AAE3-19E7-4BA0-862A-A3C54DB51B3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10E43267-ADB6-44AC-BABA-80D4CF4C7BC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10E43267-ADB6-44AC-BABA-80D4CF4C7BC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10E43267-ADB6-44AC-BABA-80D4CF4C7BC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10E43267-ADB6-44AC-BABA-80D4CF4C7BC8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54622F97-9187-482C-A9DC-06E1855EF2D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54622F97-9187-482C-A9DC-06E1855EF2D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54622F97-9187-482C-A9DC-06E1855EF2D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54622F97-9187-482C-A9DC-06E1855EF2D7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal