Add mod.cpk support for P3P, update to 1.7.3

Also removed unnecessary .cs files
tge-was-taken · May 19, 2022 · 96050c8 · 96050c8
1 parent d7728bc
commit 96050c8
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 78 deletions.
diff --git a/Source/ModCompendium/Properties/AssemblyInfo.cs b/Source/ModCompendium/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.7.0.2" )]
-[assembly: AssemblyFileVersion( "1.7.0.2" )]
+[assembly: AssemblyVersion( "1.7.0.3" )]
+[assembly: AssemblyFileVersion( "1.7.0.3" )]
diff --git a/Source/ModCompendiumLibrary/Configuration/GameConfigs/CatherineFullBodyGameConfig.cs b/Source/ModCompendiumLibrary/Configuration/GameConfigs/CatherineFullBodyGameConfig.cs
diff --git a/Source/ModCompendiumLibrary/Configuration/GameConfigs/ModCpkGameConfig.cs b/Source/ModCompendiumLibrary/Configuration/GameConfigs/ModCpkGameConfig.cs
@@ -36,6 +36,16 @@ public class Persona3DancingConfig : ModCpkGameConfig
         public override Game Game => Game.Persona3Dancing;
     }
 
+    public class Persona3PortableConfig : ModCpkGameConfig
+    {
+        public override Game Game => Game.Persona3Portable;
+    }
+
+    public class Persona4GoldenGameConfig : ModCpkGameConfig
+    {
+        public override Game Game => Game.Persona4Golden;
+    }
+
     public class Persona5DancingConfig : ModCpkGameConfig
     {
         public override Game Game => Game.Persona5Dancing;
@@ -51,8 +61,13 @@ public class Persona5RoyalGameConfig : ModCpkGameConfig
         public override Game Game => Game.Persona5Royal;
     }
 
-    public class Persona4GoldenGameConfig : ModCpkGameConfig
+    public class PersonaQ2Config : ModCpkGameConfig
     {
-        public override Game Game => Game.Persona4Golden;
+        public override Game Game => Game.PersonaQ2;
+    }
+
+    public class PersonaQConfig : ModCpkGameConfig
+    {
+        public override Game Game => Game.PersonaQ;
     }
 }
diff --git a/Source/ModCompendiumLibrary/Configuration/GameConfigs/Persona34GameConfig.cs b/Source/ModCompendiumLibrary/Configuration/GameConfigs/Persona34GameConfig.cs
@@ -27,5 +27,15 @@ protected override void SerializeCore( XElement element )
             element.AddNameValuePair( nameof( DvdRootOrIsoPath ), DvdRootOrIsoPath );
             element.AddNameValuePair(nameof(HostFS), HostFS);
         }
+
+        public class Persona4GameConfig : Persona34GameConfig
+        {
+            public override Game Game => Game.Persona4;
+        }
+
+        public class Persona3GameConfig : Persona34GameConfig
+        {
+            public override Game Game => Game.Persona3;
+        }
     }
 }
diff --git a/Source/ModCompendiumLibrary/Configuration/GameConfigs/Persona3GameConfig.cs b/Source/ModCompendiumLibrary/Configuration/GameConfigs/Persona3GameConfig.cs
diff --git a/Source/ModCompendiumLibrary/Configuration/GameConfigs/Persona3PortableGameConfig.cs b/Source/ModCompendiumLibrary/Configuration/GameConfigs/Persona3PortableGameConfig.cs
diff --git a/Source/ModCompendiumLibrary/Configuration/GameConfigs/Persona4DancingGameConfig.cs b/Source/ModCompendiumLibrary/Configuration/GameConfigs/Persona4DancingGameConfig.cs
diff --git a/Source/ModCompendiumLibrary/Configuration/GameConfigs/Persona4GameConfig.cs b/Source/ModCompendiumLibrary/Configuration/GameConfigs/Persona4GameConfig.cs
diff --git a/Source/ModCompendiumLibrary/Configuration/GameConfigs/PersonaPortableGameConfig.cs b/Source/ModCompendiumLibrary/Configuration/GameConfigs/PersonaPortableGameConfig.cs
@@ -31,5 +31,15 @@ protected override void SerializeCore( XElement element )
             element.AddNameValuePair(nameof(Compression), Compression);
             element.AddNameValuePair(nameof(Extract), Extract);
         }
+
+        public class Persona4DancingConfig : PersonaPortableGameConfig
+        {
+            public override Game Game => Game.Persona4Dancing;
+        }
+
+        public class CatherineFullBodyGameConfig : PersonaPortableGameConfig
+        {
+            public override Game Game => Game.CatherineFullBody;
+        }
     }
 }
diff --git a/Source/ModCompendiumLibrary/Configuration/GameConfigs/PersonaQ2GameConfig.cs b/Source/ModCompendiumLibrary/Configuration/GameConfigs/PersonaQ2GameConfig.cs
diff --git a/Source/ModCompendiumLibrary/Configuration/GameConfigs/PersonaQGameConfig.cs b/Source/ModCompendiumLibrary/Configuration/GameConfigs/PersonaQGameConfig.cs
diff --git a/Source/ModCompendiumLibrary/ModCompendiumLibrary.csproj b/Source/ModCompendiumLibrary/ModCompendiumLibrary.csproj
@@ -48,21 +48,14 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Configuration\ConfigStore.cs" />
-    <Compile Include="Configuration\GameConfigs\CatherineFullBodyGameConfig.cs" />
     <Compile Include="Configuration\GameConfigs\ModCpkGameConfig.cs" />
-    <Compile Include="Configuration\GameConfigs\PersonaQ2GameConfig.cs" />
-    <Compile Include="Configuration\GameConfigs\PersonaQGameConfig.cs" />
     <Compile Include="Configuration\IConfigurable.cs" />
     <Compile Include="Configuration\ModConfig.cs" />
-    <Compile Include="Configuration\GameConfigs\Persona3PortableGameConfig.cs" />
-    <Compile Include="Configuration\GameConfigs\Persona4DancingGameConfig.cs" />
     <Compile Include="Configuration\GameConfigs\PersonaPortableGameConfig.cs" />
     <Compile Include="Configuration\XElementExtensions.cs" />
     <Compile Include="Configuration\GameConfig.cs" />
     <Compile Include="Configuration\GlobalConfig.cs" />
     <Compile Include="Configuration\GameConfigs\Persona34GameConfig.cs" />
-    <Compile Include="Configuration\GameConfigs\Persona3GameConfig.cs" />
-    <Compile Include="Configuration\GameConfigs\Persona4GameConfig.cs" />
     <Compile Include="IO\FileHelper.cs" />
     <Compile Include="IO\StreamView.cs" />
     <Compile Include="IO\UncloseableStream.cs" />

diff --git a/Source/ModCompendiumLibrary/ModSystem/Builders/CatherineFullBodyModBuilder.cs b/Source/ModCompendiumLibrary/ModSystem/Builders/CatherineFullBodyModBuilder.cs
@@ -26,7 +26,7 @@ public VirtualFileSystemEntry Build(VirtualDirectory root, List<Mod> enabledMods
             }
 
             // Get game config
-            var config = ConfigStore.Get(Game) as CatherineFullBodyGameConfig;
+            var config = ConfigStore.Get(Game) as PersonaPortableGameConfig;
             if (config == null)
             {
                 // Unlikely

diff --git a/Source/ModCompendiumLibrary/ModSystem/Builders/ModCpkModBuilder.cs b/Source/ModCompendiumLibrary/ModSystem/Builders/ModCpkModBuilder.cs
@@ -132,10 +132,10 @@ private void LogModFilesInDirectory(VirtualDirectory directory)
         }
     }
 
-    [ModBuilder("P5D Mod Builder", Game = Game.Persona5Dancing)]
-    public class P5DModCpkBuilder : ModCpkModBuilder
+    [ModBuilder("P3P Mod Builder", Game = Game.Persona3Portable)]
+    public class P3PModCpkBuilder : ModCpkModBuilder
     {
-        protected override Game Game => Game.Persona5Dancing;
+        protected override Game Game => Game.Persona3Portable;
     }
 
     [ModBuilder("P3D Mod Builder", Game = Game.Persona3Dancing)]
@@ -144,6 +144,12 @@ public class P3DModCpkBuilder : ModCpkModBuilder
         protected override Game Game => Game.Persona3Dancing;
     }
 
+    [ModBuilder("P4G Mod Builder", Game = Game.Persona4Golden)]
+    public class P4GModCpkBuilder : ModCpkModBuilder
+    {
+        protected override Game Game => Game.Persona4Golden;
+    }
+
     [ModBuilder("P5 Mod Builder", Game = Game.Persona5)]
     public class P5ModCpkBuilder : ModCpkModBuilder
     {
@@ -156,10 +162,10 @@ public class P5RModCpkBuilder : ModCpkModBuilder
         protected override Game Game => Game.Persona5Royal;
     }
 
-    [ModBuilder("P4G Mod Builder", Game = Game.Persona4Golden)]
-    public class P4GModCpkBuilder : ModCpkModBuilder
+    [ModBuilder("P5D Mod Builder", Game = Game.Persona5Dancing)]
+    public class P5DModCpkBuilder : ModCpkModBuilder
     {
-        protected override Game Game => Game.Persona4Golden;
+        protected override Game Game => Game.Persona5Dancing;
     }
 
     [ModBuilder("Persona Q Mod Builder", Game = Game.PersonaQ)]

diff --git a/Source/ModCompendiumLibrary/ModSystem/Builders/Persona34IsoModBuilder.cs b/Source/ModCompendiumLibrary/ModSystem/Builders/Persona34IsoModBuilder.cs
@@ -56,14 +56,14 @@ public class Persona3IsoModBuilder : Persona34IsoModBuilder
     {
         protected override Persona34FileModBuilder CreateFileModBuilder() => new Persona3FileModBuilder();
 
-        protected override Persona34GameConfig GetConfig() => ConfigStore.Get<Persona3GameConfig>();
+        protected override Persona34GameConfig GetConfig() => ConfigStore.Get<Persona34GameConfig>();
     }
 
     //[ModBuilder( "Persona 4 ISO Mod Builder", Game = Game.Persona4 )]
     public class Persona4IsoModBuilder : Persona34IsoModBuilder
     {
         protected override Persona34FileModBuilder CreateFileModBuilder() => new Persona4FileModBuilder();
 
-        protected override Persona34GameConfig GetConfig() => ConfigStore.Get<Persona4GameConfig>();
+        protected override Persona34GameConfig GetConfig() => ConfigStore.Get<Persona34GameConfig>();
     }
 }
diff --git a/Source/ModCompendiumLibrary/ModSystem/Builders/PersonaPortableModBuilder.cs b/Source/ModCompendiumLibrary/ModSystem/Builders/PersonaPortableModBuilder.cs
@@ -154,12 +154,6 @@ private void LogModFilesInDirectory(VirtualDirectory directory)
         }
     }
 
-    [ModBuilder("Persona 3 Portable Mod Builder", Game = Game.Persona3Portable)]
-    public class Persona3PortableModBuilder : PersonaPortableModBuilder
-    {
-        protected override Game Game => Game.Persona3Portable;
-    }
-
     [ModBuilder("Persona 4 Dancing Mod Builder", Game = Game.Persona4Dancing)]
     public class Persona4DancingModBuilder : PersonaPortableModBuilder
     {