From cca2c5deccce9ec00fa6cb8772377fa8f971a6e9 Mon Sep 17 00:00:00 2001 From: Raymond Date: Tue, 24 Aug 2021 10:22:31 -0400 Subject: [PATCH 1/4] Fix PartyFinder class names --- Dalamud.Boot/Dalamud.Boot.vcxproj | 4 ++-- .../Dalamud.Injector.Boot.vcxproj | 4 ++-- ...derConditionFlags.cs => ConditionFlags.cs} | 6 ++--- ...{DutyFinderCategory.cs => DutyCategory.cs} | 4 ++-- .../Types/DutyFinderSettingsFlags.cs | 2 +- .../Game/Gui/PartyFinder/Types/DutyType.cs | 4 ++-- ...inderLootRuleFlags.cs => LootRuleFlags.cs} | 4 ++-- ...derObjectiveFlags.cs => ObjectiveFlags.cs} | 4 ++-- .../PartyFinder/Types/PartyFinderListing.cs | 24 +++++++++---------- ...rSearchAreaFlags.cs => SearchAreaFlags.cs} | 2 +- 10 files changed, 29 insertions(+), 29 deletions(-) rename Dalamud/Game/Gui/PartyFinder/Types/{DutyFinderConditionFlags.cs => ConditionFlags.cs} (77%) rename Dalamud/Game/Gui/PartyFinder/Types/{DutyFinderCategory.cs => DutyCategory.cs} (90%) rename Dalamud/Game/Gui/PartyFinder/Types/{DutyFinderLootRuleFlags.cs => LootRuleFlags.cs} (78%) rename Dalamud/Game/Gui/PartyFinder/Types/{DutyFinderObjectiveFlags.cs => ObjectiveFlags.cs} (82%) rename Dalamud/Game/Gui/PartyFinder/Types/{DutyFinderSearchAreaFlags.cs => SearchAreaFlags.cs} (90%) diff --git a/Dalamud.Boot/Dalamud.Boot.vcxproj b/Dalamud.Boot/Dalamud.Boot.vcxproj index 95eb9d12c..638a78605 100644 --- a/Dalamud.Boot/Dalamud.Boot.vcxproj +++ b/Dalamud.Boot/Dalamud.Boot.vcxproj @@ -25,7 +25,7 @@ DynamicLibrary true - v142 + v143 false Unicode ..\bin\$(Configuration)\ @@ -103,4 +103,4 @@ - + \ No newline at end of file diff --git a/Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj b/Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj index 8257d42aa..f6e32e62b 100644 --- a/Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj +++ b/Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj @@ -26,7 +26,7 @@ Application true - v142 + v143 false Unicode ..\bin\$(Configuration)\ @@ -110,4 +110,4 @@ - + \ No newline at end of file diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderConditionFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs similarity index 77% rename from Dalamud/Game/Gui/PartyFinder/Types/DutyFinderConditionFlags.cs rename to Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs index 2abd371ab..27537fbc4 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderConditionFlags.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs @@ -1,12 +1,12 @@ -using System; +using System; namespace Dalamud.Game.Gui.PartyFinder.Types { /// - /// Condition flags for the class. + /// Condition flags for the class. /// [Flags] - public enum DutyFinderConditionFlags : uint + public enum DutyConditionFlags : uint { /// /// No duty condition. diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderCategory.cs b/Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs similarity index 90% rename from Dalamud/Game/Gui/PartyFinder/Types/DutyFinderCategory.cs rename to Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs index d7ffe568b..920325d64 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderCategory.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs @@ -1,9 +1,9 @@ namespace Dalamud.Game.Gui.PartyFinder.Types { /// - /// Category flags for the class. + /// Category flags for the class. /// - public enum DutyFinderCategory + public enum DutyCategory { /// /// The duty category. diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs index 6dfe10c69..03335dbaf 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs @@ -3,7 +3,7 @@ using System; namespace Dalamud.Game.Gui.PartyFinder.Types { /// - /// Duty finder settings flags for the class. + /// Duty finder settings flags for the class. /// [Flags] public enum DutyFinderSettingsFlags : uint diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs b/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs index 3e3342938..12711329b 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs @@ -1,9 +1,9 @@ namespace Dalamud.Game.Gui.PartyFinder.Types { /// - /// Duty type flags for the class. + /// Duty type flags for the class. /// - public enum DutyType + public enum PartyFinderDutyType { /// /// No duty type. diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderLootRuleFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/LootRuleFlags.cs similarity index 78% rename from Dalamud/Game/Gui/PartyFinder/Types/DutyFinderLootRuleFlags.cs rename to Dalamud/Game/Gui/PartyFinder/Types/LootRuleFlags.cs index aa75807fd..a1a29ceb8 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderLootRuleFlags.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/LootRuleFlags.cs @@ -3,10 +3,10 @@ using System; namespace Dalamud.Game.Gui.PartyFinder.Types { /// - /// Loot rule flags for the class. + /// Loot rule flags for the class. /// [Flags] - public enum DutyFinderLootRuleFlags : uint + public enum LootRuleFlags : uint { /// /// No loot rules. diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderObjectiveFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/ObjectiveFlags.cs similarity index 82% rename from Dalamud/Game/Gui/PartyFinder/Types/DutyFinderObjectiveFlags.cs rename to Dalamud/Game/Gui/PartyFinder/Types/ObjectiveFlags.cs index 40e34c1fc..de3b8fc6b 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderObjectiveFlags.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/ObjectiveFlags.cs @@ -3,10 +3,10 @@ using System; namespace Dalamud.Game.Gui.PartyFinder.Types { /// - /// Objective flags for the class. + /// Objective flags for the class. /// [Flags] - public enum DutyFinderObjectiveFlags : uint + public enum ObjectiveFlags : uint { /// /// No objective. diff --git a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs index 4ee89bb80..bd6eb550a 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs @@ -46,10 +46,10 @@ namespace Dalamud.Game.Gui.PartyFinder.Types this.World = new Lazy(() => dataManager.GetExcelSheet().GetRow(listing.World)); this.HomeWorld = new Lazy(() => dataManager.GetExcelSheet().GetRow(listing.HomeWorld)); this.CurrentWorld = new Lazy(() => dataManager.GetExcelSheet().GetRow(listing.CurrentWorld)); - this.Category = (DutyFinderCategory)listing.Category; + this.Category = (DutyCategory)listing.Category; this.RawDuty = listing.Duty; this.Duty = new Lazy(() => dataManager.GetExcelSheet().GetRow(listing.Duty)); - this.DutyType = (DutyType)listing.DutyType; + this.DutyType = (PartyFinderDutyType)listing.DutyType; this.BeginnersWelcome = listing.BeginnersWelcome == 1; this.SecondsRemaining = listing.SecondsRemaining; this.MinimumItemLevel = listing.MinimumItemLevel; @@ -101,7 +101,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types /// /// Gets the Party Finder category this listing is listed under. /// - public DutyFinderCategory Category { get; } + public DutyCategory Category { get; } /// /// Gets the row ID of the duty this listing is for. May be 0 for non-duty listings. @@ -116,7 +116,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types /// /// Gets the type of duty this listing is for. /// - public DutyType DutyType { get; } + public PartyFinderDutyType DutyType { get; } /// /// Gets a value indicating whether if this listing is beginner-friendly. Shown with a sprout icon in-game. @@ -152,12 +152,12 @@ namespace Dalamud.Game.Gui.PartyFinder.Types /// /// Gets the objective of this listing. /// - public DutyFinderObjectiveFlags Objective => (DutyFinderObjectiveFlags)this.objective; + public ObjectiveFlags Objective => (ObjectiveFlags)this.objective; /// /// Gets the conditions of this listing. /// - public DutyFinderConditionFlags Conditions => (DutyFinderConditionFlags)this.conditions; + public PartyFinderConditionFlags Conditions => (PartyFinderConditionFlags)this.conditions; /// /// Gets the Duty Finder settings that will be used for this listing. @@ -167,13 +167,13 @@ namespace Dalamud.Game.Gui.PartyFinder.Types /// /// Gets the loot rules that will be used for this listing. /// - public DutyFinderLootRuleFlags LootRules => (DutyFinderLootRuleFlags)this.lootRules; + public LootRuleFlags LootRules => (LootRuleFlags)this.lootRules; /// /// Gets where this listing is searching. Note that this is also used for denoting alliance raid listings and one /// player per job. /// - public DutyFinderSearchAreaFlags SearchArea => (DutyFinderSearchAreaFlags)this.searchArea; + public SearchAreaFlags SearchArea => (SearchAreaFlags)this.searchArea; /// /// Gets a list of the class/job IDs that are currently present in the party. @@ -192,14 +192,14 @@ namespace Dalamud.Game.Gui.PartyFinder.Types /// /// The flag to check for. /// A value indicating whether the flag is present. - public bool this[DutyFinderObjectiveFlags flag] => this.objective == 0 || (this.objective & (uint)flag) > 0; + public bool this[ObjectiveFlags flag] => this.objective == 0 || (this.objective & (uint)flag) > 0; /// /// Check if the given flag is present. /// /// The flag to check for. /// A value indicating whether the flag is present. - public bool this[DutyFinderConditionFlags flag] => this.conditions == 0 || (this.conditions & (uint)flag) > 0; + public bool this[PartyFinderConditionFlags flag] => this.conditions == 0 || (this.conditions & (uint)flag) > 0; /// /// Check if the given flag is present. @@ -213,14 +213,14 @@ namespace Dalamud.Game.Gui.PartyFinder.Types /// /// The flag to check for. /// A value indicating whether the flag is present. - public bool this[DutyFinderLootRuleFlags flag] => this.lootRules == 0 || (this.lootRules & (uint)flag) > 0; + public bool this[LootRuleFlags flag] => this.lootRules == 0 || (this.lootRules & (uint)flag) > 0; /// /// Check if the given flag is present. /// /// The flag to check for. /// A value indicating whether the flag is present. - public bool this[DutyFinderSearchAreaFlags flag] => this.searchArea == 0 || (this.searchArea & (uint)flag) > 0; + public bool this[SearchAreaFlags flag] => this.searchArea == 0 || (this.searchArea & (uint)flag) > 0; #endregion diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSearchAreaFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs similarity index 90% rename from Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSearchAreaFlags.cs rename to Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs index c9c238e48..4690a8679 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSearchAreaFlags.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs @@ -3,7 +3,7 @@ using System; namespace Dalamud.Game.Gui.PartyFinder.Types { /// - /// Search area flags for the class. + /// Search area flags for the class. /// [Flags] public enum DutyFinderSearchAreaFlags : uint From 3562c1dda6cd9bf161a04fb652d317e592b2a552 Mon Sep 17 00:00:00 2001 From: Raymond Date: Tue, 24 Aug 2021 10:24:00 -0400 Subject: [PATCH 2/4] Commit files that didnt save --- Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs | 4 ++-- Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs | 2 +- Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs | 4 ++-- Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs index 27537fbc4..3eb5ec1b6 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace Dalamud.Game.Gui.PartyFinder.Types { @@ -6,7 +6,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types /// Condition flags for the class. /// [Flags] - public enum DutyConditionFlags : uint + public enum ConditionFlags : uint { /// /// No duty condition. diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs b/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs index 12711329b..589d0b91b 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs @@ -3,7 +3,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types /// /// Duty type flags for the class. /// - public enum PartyFinderDutyType + public enum DutyType { /// /// No duty type. diff --git a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs index bd6eb550a..a02f63ed6 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs @@ -49,7 +49,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types this.Category = (DutyCategory)listing.Category; this.RawDuty = listing.Duty; this.Duty = new Lazy(() => dataManager.GetExcelSheet().GetRow(listing.Duty)); - this.DutyType = (PartyFinderDutyType)listing.DutyType; + this.DutyType = (DutyType)listing.DutyType; this.BeginnersWelcome = listing.BeginnersWelcome == 1; this.SecondsRemaining = listing.SecondsRemaining; this.MinimumItemLevel = listing.MinimumItemLevel; @@ -116,7 +116,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types /// /// Gets the type of duty this listing is for. /// - public PartyFinderDutyType DutyType { get; } + public DutyType DutyType { get; } /// /// Gets a value indicating whether if this listing is beginner-friendly. Shown with a sprout icon in-game. diff --git a/Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs index 4690a8679..85308c8d1 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs @@ -6,7 +6,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types /// Search area flags for the class. /// [Flags] - public enum DutyFinderSearchAreaFlags : uint + public enum SearchAreaFlags : uint { /// /// Datacenter. From 151ca5cc858a3007dde292a4fbd1bf6f35b20126 Mon Sep 17 00:00:00 2001 From: Raymond Date: Tue, 24 Aug 2021 10:26:50 -0400 Subject: [PATCH 3/4] Make things compile --- Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs index a02f63ed6..c03a2dfcd 100644 --- a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs +++ b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs @@ -157,7 +157,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types /// /// Gets the conditions of this listing. /// - public PartyFinderConditionFlags Conditions => (PartyFinderConditionFlags)this.conditions; + public ConditionFlags Conditions => (ConditionFlags)this.conditions; /// /// Gets the Duty Finder settings that will be used for this listing. @@ -199,7 +199,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types /// /// The flag to check for. /// A value indicating whether the flag is present. - public bool this[PartyFinderConditionFlags flag] => this.conditions == 0 || (this.conditions & (uint)flag) > 0; + public bool this[ConditionFlags flag] => this.conditions == 0 || (this.conditions & (uint)flag) > 0; /// /// Check if the given flag is present. From e8eabef525c4fbf964367d2f7d2cf2035a7d0565 Mon Sep 17 00:00:00 2001 From: Raymond Date: Tue, 24 Aug 2021 10:33:36 -0400 Subject: [PATCH 4/4] Make things compile --- Dalamud.Boot/Dalamud.Boot.vcxproj | 2 +- Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dalamud.Boot/Dalamud.Boot.vcxproj b/Dalamud.Boot/Dalamud.Boot.vcxproj index 638a78605..00d8b4575 100644 --- a/Dalamud.Boot/Dalamud.Boot.vcxproj +++ b/Dalamud.Boot/Dalamud.Boot.vcxproj @@ -25,7 +25,7 @@ DynamicLibrary true - v143 + v142 false Unicode ..\bin\$(Configuration)\ diff --git a/Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj b/Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj index f6e32e62b..9470c83e0 100644 --- a/Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj +++ b/Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj @@ -26,7 +26,7 @@ Application true - v143 + v142 false Unicode ..\bin\$(Configuration)\