fix: remove old project.

ArchiDog1998 · Apr 5, 2023 · afb6b85 · afb6b85
1 parent 31aeed3
commit afb6b85
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 28 deletions.
diff --git a/RotationSolver.Old/Magical/SMN_Old.cs → RotationSolver.Default/Magical/SMN_Old.cs b/RotationSolver.Old/Magical/SMN_Old.cs → RotationSolver.Default/Magical/SMN_Old.cs
@@ -1,7 +1,7 @@
 namespace RotationSolver.Default.Magical;
 
 [RotationDesc(ActionID.SearingLight)]
-[SourceCode("https://github.com/ArchiDog1998/RotationSolver/blob/main/RotationSolver.Old/Magical/SMN_Old.cs")]
+[SourceCode("https://github.com/ArchiDog1998/RotationSolver/blob/main/RotationSolver.Default/Magical/SMN_Old.cs")]
 
 public sealed class SMN_Old : SMN_Base
 {

diff --git a/RotationSolver.Old/Melee/MNK_Old.cs → RotationSolver.Default/Melee/MNK_Old.cs b/RotationSolver.Old/Melee/MNK_Old.cs → RotationSolver.Default/Melee/MNK_Old.cs
@@ -1,7 +1,7 @@
 namespace RotationSolver.Old.Melee;
 
 [RotationDesc(ActionID.RiddleOfFire)]
-[SourceCode("https://github.com/ArchiDog1998/RotationSolver/blob/main/RotationSolver.Old/Melee/MNK_Old.cs")]
+[SourceCode("https://github.com/ArchiDog1998/RotationSolver/blob/main/RotationSolver.Default/Melee/MNK_Old.cs")]
 public sealed class MNK_Old : MNK_Base
 {
     public override string GameVersion => "6.0";

diff --git a/RotationSolver.Old/Melee/NIN_Old.cs → RotationSolver.Default/Melee/NIN_Old.cs b/RotationSolver.Old/Melee/NIN_Old.cs → RotationSolver.Default/Melee/NIN_Old.cs
@@ -1,7 +1,7 @@
 namespace RotationSolver.Old.Melee;
 
 [RotationDesc(ActionID.Mug)]
-[SourceCode("https://github.com/ArchiDog1998/RotationSolver/blob/main/RotationSolver.Old/Melee/NIN_Old.cs")]
+[SourceCode("https://github.com/ArchiDog1998/RotationSolver/blob/main/RotationSolver.Default/Melee/NIN_Old.cs")]
 public sealed class NIN_Old : NIN_Base
 {
     public override string GameVersion => "6.0";

diff --git a/RotationSolver.Old/Ranged/MCH_Old.cs → RotationSolver.Default/Ranged/MCH_Old.cs b/RotationSolver.Old/Ranged/MCH_Old.cs → RotationSolver.Default/Ranged/MCH_Old.cs
@@ -1,6 +1,6 @@
 namespace RotationSolver.Old.Ranged;
 
-[SourceCode("https://github.com/ArchiDog1998/RotationSolver/blob/main/RotationSolver.Old/Ranged/MCH_Old.cs")]
+[SourceCode("https://github.com/ArchiDog1998/RotationSolver/blob/main/RotationSolver.Default/Ranged/MCH_Old.cs")]
 public sealed class MCH_Old : MCH_Base
 {
     public override string GameVersion => "6.28";

diff --git a/RotationSolver.Old/Tank/WAR_Old.cs → RotationSolver.Default/Tank/WAR_Old.cs b/RotationSolver.Old/Tank/WAR_Old.cs → RotationSolver.Default/Tank/WAR_Old.cs
@@ -1,6 +1,6 @@
 namespace RotationSolver.Old.Tank;
 
-[SourceCode("https://github.com/ArchiDog1998/RotationSolver/blob/main/RotationSolver.Old/Tank/WAR_Old.cs")]
+[SourceCode("https://github.com/ArchiDog1998/RotationSolver/blob/main/RotationSolver.Default/Tank/WAR_Old.cs")]
 public sealed class WAR_Old : WAR_Base
 {
     public override string GameVersion => "6.0";

diff --git a/RotationSolver.Old/RotationSolver.Old.csproj b/RotationSolver.Old/RotationSolver.Old.csproj
diff --git a/RotationSolver.sln b/RotationSolver.sln
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RotationSolver.Basic", "Rot
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RotationSolver", "RotationSolver\RotationSolver.csproj", "{99EA3D95-33DC-424F-A9E6-FE6064F11592}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RotationSolver.Old", "RotationSolver.Old\RotationSolver.Old.csproj", "{0F07FDE9-7189-43E9-8651-F1963D829DDA}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RotationSolver.Extra", "RotationSolver.Extra\RotationSolver.Extra.csproj", "{09783AAB-C25E-4DF7-9693-0D47DC6108F2}"
 EndProject
 Global
@@ -37,10 +35,6 @@ Global
 		{99EA3D95-33DC-424F-A9E6-FE6064F11592}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{99EA3D95-33DC-424F-A9E6-FE6064F11592}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{99EA3D95-33DC-424F-A9E6-FE6064F11592}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0F07FDE9-7189-43E9-8651-F1963D829DDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F07FDE9-7189-43E9-8651-F1963D829DDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F07FDE9-7189-43E9-8651-F1963D829DDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0F07FDE9-7189-43E9-8651-F1963D829DDA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{09783AAB-C25E-4DF7-9693-0D47DC6108F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{09783AAB-C25E-4DF7-9693-0D47DC6108F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{09783AAB-C25E-4DF7-9693-0D47DC6108F2}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/RotationSolver/RotationHelper.cs b/RotationSolver/RotationHelper.cs
@@ -9,12 +9,15 @@ internal static class RotationHelper
     static readonly string[] _allowedAssembly = new string[]
     {
         DefaultAssembly,
-        "RotationSolver.Old",
         //"RotationSolver.Extra",
     };
 
     public static bool IsDefault(this ICustomRotation rotation)
-        => DefaultAssembly == rotation.GetType().Assembly.GetName().Name;
+    {
+        var type = rotation.GetType();
+        if (DefaultAssembly != type.Assembly.GetName().Name) return false;
+        return type.Name.Contains("Default", StringComparison.OrdinalIgnoreCase);
+    }
 
     public static bool IsAllowed(this ICustomRotation rotation, out string name)
     {

diff --git a/RotationSolver/RotationSolver.csproj b/RotationSolver/RotationSolver.csproj
@@ -12,7 +12,6 @@
 	<ItemGroup>
 		<ProjectReference Include="..\RotationSolver.Basic\RotationSolver.Basic.csproj" />
 		<ProjectReference Include="..\RotationSolver.Default\RotationSolver.Default.csproj" />
-		<ProjectReference Include="..\RotationSolver.Old\RotationSolver.Old.csproj" />
 
 		<EmbeddedResource Include="Localization\*.json" Exclude="Localization\Localization.json" />
 	</ItemGroup>