Restructure repository

COM3D2.MeidoPhotoStudio.Converter/.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-    "[xml]": {
-        "editor.insertSpaces": true,
-        "editor.tabSize": 2,
-        "editor.autoIndent": "advanced"
-    }
-}

COM3D2.MeidoPhotoStudio.Converter/.vscode/tasks.json

@@ -1,24 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build",
-            "command": "dotnet",
-            "type": "shell",
-            "args": [
-                "build",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary",
-                "/property:Configuration=Release"
-            ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "presentation": {
-                "reveal": "silent"
-            },
-            "problemMatcher": "$msCompile"
-        }
-    ]
-}

COM3D2.MeidoPhotoStudio.Converter/Converter.csproj

@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net35</TargetFramework>
-    <AssemblyName>COM3D2.MeidoPhotoStudio.Converter</AssemblyName>
-    <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
-    <ProjectGuid>{19D28B0C-3537-4FEE-B7B3-1ABF70B16D5E}</ProjectGuid>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="..\lib\Assembly-CSharp.dll" />
-    <Reference Include="..\lib\Assembly-CSharp-firstpass.dll" />
-    <Reference Include="..\lib\UnityEngine.dll" />
-    <Reference Include="..\lib\Ionic.Zlib.dll" />
-    <Reference Include="..\lib\ExIni.dll" />
-    <Reference Include="..\lib\BepInEx.dll" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\COM3D2.MeidoPhotoStudio.Plugin\COM3D2.MeidoPhotoStudio.Plugin.csproj" />
-  </ItemGroup>
-</Project>

MeidoPhotoStudio.Plugin.sln

@@ -0,0 +1,30 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29806.167
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeidoPhotoStudio.Plugin", "src\MeidoPhotoStudio.Plugin\MeidoPhotoStudio.Plugin.csproj", "{5FA40522-E0AC-459A-A571-DD0051217AB6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeidoPhotoStudio.Converter", "src\MeidoPhotoStudio.Converter\MeidoPhotoStudio.Converter.csproj", "{19D28B0C-3537-4FEE-B7B3-1ABF70B16D5E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5FA40522-E0AC-459A-A571-DD0051217AB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FA40522-E0AC-459A-A571-DD0051217AB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FA40522-E0AC-459A-A571-DD0051217AB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FA40522-E0AC-459A-A571-DD0051217AB6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19D28B0C-3537-4FEE-B7B3-1ABF70B16D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19D28B0C-3537-4FEE-B7B3-1ABF70B16D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19D28B0C-3537-4FEE-B7B3-1ABF70B16D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19D28B0C-3537-4FEE-B7B3-1ABF70B16D5E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0CF8022A-1ECB-4FEB-8A20-6E7E544E3DC4}
+	EndGlobalSection
+EndGlobal

src/MeidoPhotoStudio.Converter/MeidoPhotoStudio.Converter.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net35</TargetFramework>
+    <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
+    <ProjectGuid>{19D28B0C-3537-4FEE-B7B3-1ABF70B16D5E}</ProjectGuid>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="..\..\lib\Assembly-CSharp.dll" />
+    <Reference Include="..\..\lib\Assembly-CSharp-firstpass.dll" />
+    <Reference Include="..\..\lib\UnityEngine.dll" />
+    <Reference Include="..\..\lib\Ionic.Zlib.dll" />
+    <Reference Include="..\..\lib\ExIni.dll" />
+    <Reference Include="..\..\lib\BepInEx.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MeidoPhotoStudio.Plugin\MeidoPhotoStudio.Plugin.csproj" />
+  </ItemGroup>
+</Project>

COM3D2.MeidoPhotoStudio.Converter/Program.cs

@@ -9,7 +9,7 @@ using UnityEngine;
 using UnityEngine.SceneManagement;
 using MyRoomCustom;
 
-namespace COM3D2.MeidoPhotoStudio.Converter
+namespace MeidoPhotoStudio.Converter
 {
     using static Plugin.BinaryExtensions;
 
@@ -262,7 +262,7 @@ namespace COM3D2.MeidoPhotoStudio.Converter
             // MM scene converted to MPS
             binaryWriter.Write(true);
 
-            binaryWriter.Write(Plugin.Meido.meidoDataVersion);
+            // binaryWriter.Write(Plugin.Meido.meidoDataVersion);
 
             int numberOfMaids = strArray2.Length;
 
@@ -430,7 +430,7 @@ namespace COM3D2.MeidoPhotoStudio.Converter
         {
             binaryWriter.Write(Plugin.PropManager.header);
 
-            binaryWriter.Write(Plugin.PropManager.propDataVersion);
+            // binaryWriter.Write(Plugin.PropManager.propDataVersion);
 
             bool hasWProp = strArray3.Length > 37 && !string.IsNullOrEmpty(strArray3[37]);
             int numberOfProps = hasWProp ? 1 : 0;