From c1ca4e7601f9d9bf9578b68e6b6cd51890f52794 Mon Sep 17 00:00:00 2001 From: Putro <29204244+Pewtro@users.noreply.github.com> Date: Fri, 12 Apr 2024 22:30:51 +0200 Subject: [PATCH] [Chore] Only export SELECTED_PLAYER and SELECTED_PLAYER_PET from one place --- .../classic/hunter/marksman/modules/spells/Readiness.tsx | 3 +-- src/analysis/classic/mage/shared/ColdSnap.tsx | 3 +-- .../druid/guardian/modules/core/defensives/Barkskin.tsx | 2 +- .../druid/guardian/modules/core/defensives/Pulverize.tsx | 2 +- .../guardian/modules/core/defensives/RageOfTheSleeper.tsx | 2 +- .../guardian/modules/core/defensives/SurvivalInstincts.tsx | 2 +- .../evoker/devastation/modules/talents/Causality.tsx | 3 +-- .../evoker/preservation/modules/talents/GracePeriod.tsx | 4 ++-- .../evoker/preservation/modules/talents/Reversion.tsx | 4 ++-- .../hunter/beastmastery/modules/core/SpellUsable.tsx | 3 +-- .../retail/mage/arcane/core/ArcaneSurgePreReqs.tsx | 3 +-- .../retail/mage/arcane/talents/ArcaneBombardment.tsx | 3 +-- src/analysis/retail/mage/arcane/talents/ArcaneHarmony.tsx | 3 +-- src/analysis/retail/mage/fire/talents/ImprovedScorch.tsx | 3 +-- src/analysis/retail/mage/frost/core/IcyVeins.tsx | 3 +-- src/analysis/retail/mage/frost/talents/BoneChilling.tsx | 3 +-- src/analysis/retail/mage/frost/talents/ColdFront.tsx | 3 +-- src/analysis/retail/mage/frost/talents/ColdSnap.tsx | 3 +-- src/analysis/retail/mage/frost/talents/CometStorm.tsx | 3 +-- src/analysis/retail/mage/frost/talents/Flurry.tsx | 3 +-- src/analysis/retail/mage/frost/talents/FrozenOrb.tsx | 3 +-- src/analysis/retail/mage/frost/talents/IcyPropulsion.tsx | 3 +-- src/analysis/retail/mage/frost/talents/LonelyWinter.tsx | 3 +-- src/analysis/retail/mage/frost/talents/RayOfFrost.tsx | 3 +-- src/analysis/retail/mage/shared/DivertedEnergy.tsx | 3 +-- src/analysis/retail/mage/shared/MasterOfTime.tsx | 3 +-- src/analysis/retail/mage/shared/QuickWitted.tsx | 3 +-- src/analysis/retail/mage/shared/TempestBarrier.tsx | 3 +-- .../brewmaster/modules/problems/PurifyingBrew/analyzer.ts | 4 ++-- .../retail/monk/mistweaver/modules/core/SpellManaCost.ts | 2 +- .../monk/mistweaver/modules/spells/LegacyOfWisdom.tsx | 3 +-- .../retail/monk/windwalker/modules/core/SpellUsable.tsx | 3 +-- .../monk/windwalker/modules/talents/DanceOfChiJi.tsx | 3 +-- .../retail/monk/windwalker/modules/talents/HitCombo.tsx | 3 +-- .../retail/priest/shadow/modules/talents/IdolOfCthun.tsx | 3 +-- .../priest/shadow/modules/talents/IdolOfYoggSaron.tsx | 3 +-- .../priest/shadow/modules/talents/InescapableTorment.tsx | 3 +-- .../retail/priest/shared/TwinsOfTheSunPriestess.tsx | 3 +-- .../outlaw/modules/features/RollTheBonesCastTracker.tsx | 3 +-- .../rogue/shared/shadowlands/conduits/WellPlacedSteel.tsx | 3 +-- src/analysis/retail/rogue/shared/talents/Reverberation.tsx | 3 +-- .../elemental/modules/talents/MasterOfTheElements.tsx | 3 +-- .../shaman/elemental/modules/talents/SurgeOfPower.tsx | 3 +-- .../destruction/modules/soulshards/SoulShardTracker.ts | 4 ++-- .../retail/warrior/fury/modules/spells/Whirlwind.tsx | 3 +-- .../components/MajorDefensives/MajorDefensiveAnalyzer.tsx | 4 ++-- src/parser/core/Analyzer.ts | 5 +++-- src/parser/core/EventFilter.ts | 3 +-- src/parser/core/EventSubscriber.ts | 3 +-- .../modules/items/dragonflight/enchants/SporeTender.tsx | 4 ++-- src/parser/shared/modules/CooldownThroughputTracker.tsx | 4 ++-- src/parser/shared/modules/EventHistory.ts | 7 ++----- src/parser/shared/modules/Haste.ts | 4 ++-- 53 files changed, 64 insertions(+), 104 deletions(-) diff --git a/src/analysis/classic/hunter/marksman/modules/spells/Readiness.tsx b/src/analysis/classic/hunter/marksman/modules/spells/Readiness.tsx index d2d5cbf9431..5cb0aa083d8 100644 --- a/src/analysis/classic/hunter/marksman/modules/spells/Readiness.tsx +++ b/src/analysis/classic/hunter/marksman/modules/spells/Readiness.tsx @@ -1,5 +1,4 @@ -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events from 'parser/core/Events'; import SpellUsable from 'parser/shared/modules/SpellUsable'; diff --git a/src/analysis/classic/mage/shared/ColdSnap.tsx b/src/analysis/classic/mage/shared/ColdSnap.tsx index 3242bd5dce4..d9ad166cb9c 100644 --- a/src/analysis/classic/mage/shared/ColdSnap.tsx +++ b/src/analysis/classic/mage/shared/ColdSnap.tsx @@ -1,5 +1,4 @@ -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events from 'parser/core/Events'; import SpellUsable from 'parser/shared/modules/SpellUsable'; diff --git a/src/analysis/retail/druid/guardian/modules/core/defensives/Barkskin.tsx b/src/analysis/retail/druid/guardian/modules/core/defensives/Barkskin.tsx index 7eab949ba28..cdb991bc173 100644 --- a/src/analysis/retail/druid/guardian/modules/core/defensives/Barkskin.tsx +++ b/src/analysis/retail/druid/guardian/modules/core/defensives/Barkskin.tsx @@ -6,12 +6,12 @@ import { import SPELLS from 'common/SPELLS'; import { Options } from 'parser/core/Module'; import Events, { DamageEvent } from 'parser/core/Events'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; import { TALENTS_DRUID } from 'common/TALENTS'; import { ReactNode } from 'react'; import MajorDefensiveStatistic from 'interface/MajorDefensiveStatistic'; import STATISTIC_CATEGORY from 'parser/ui/STATISTIC_CATEGORY'; import { SpellLink } from 'interface'; +import { SELECTED_PLAYER } from 'parser/core/Analyzer'; const BASE_MITIGATION = 0.2; const REINFORCED_FUR_ADDITIONAL_MITIGATION = 0.1; diff --git a/src/analysis/retail/druid/guardian/modules/core/defensives/Pulverize.tsx b/src/analysis/retail/druid/guardian/modules/core/defensives/Pulverize.tsx index f164a4e8d26..f577c7d61bb 100644 --- a/src/analysis/retail/druid/guardian/modules/core/defensives/Pulverize.tsx +++ b/src/analysis/retail/druid/guardian/modules/core/defensives/Pulverize.tsx @@ -7,11 +7,11 @@ import { TALENTS_DRUID } from 'common/TALENTS'; import { Options } from 'parser/core/Module'; import SPELLS from 'common/SPELLS'; import Events, { DamageEvent } from 'parser/core/Events'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; import { ReactNode } from 'react'; import MajorDefensiveStatistic from 'interface/MajorDefensiveStatistic'; import STATISTIC_CATEGORY from 'parser/ui/STATISTIC_CATEGORY'; import { SpellLink } from 'interface'; +import { SELECTED_PLAYER } from 'parser/core/Analyzer'; const MITIGATION = 0.35; diff --git a/src/analysis/retail/druid/guardian/modules/core/defensives/RageOfTheSleeper.tsx b/src/analysis/retail/druid/guardian/modules/core/defensives/RageOfTheSleeper.tsx index 3fea60703f5..b365842c143 100644 --- a/src/analysis/retail/druid/guardian/modules/core/defensives/RageOfTheSleeper.tsx +++ b/src/analysis/retail/druid/guardian/modules/core/defensives/RageOfTheSleeper.tsx @@ -5,12 +5,12 @@ import { } from 'interface/guide/components/MajorDefensives/MajorDefensiveAnalyzer'; import { Options } from 'parser/core/Module'; import Events, { DamageEvent } from 'parser/core/Events'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; import { ReactNode } from 'react'; import MajorDefensiveStatistic from 'interface/MajorDefensiveStatistic'; import STATISTIC_CATEGORY from 'parser/ui/STATISTIC_CATEGORY'; import { TALENTS_DRUID } from 'common/TALENTS'; import { SpellLink } from 'interface'; +import { SELECTED_PLAYER } from 'parser/core/Analyzer'; const MITIGATION = 0.25; diff --git a/src/analysis/retail/druid/guardian/modules/core/defensives/SurvivalInstincts.tsx b/src/analysis/retail/druid/guardian/modules/core/defensives/SurvivalInstincts.tsx index 070e47334db..89350385907 100644 --- a/src/analysis/retail/druid/guardian/modules/core/defensives/SurvivalInstincts.tsx +++ b/src/analysis/retail/druid/guardian/modules/core/defensives/SurvivalInstincts.tsx @@ -5,12 +5,12 @@ import { } from 'interface/guide/components/MajorDefensives/MajorDefensiveAnalyzer'; import { Options } from 'parser/core/Module'; import Events, { DamageEvent } from 'parser/core/Events'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; import { ReactNode } from 'react'; import MajorDefensiveStatistic from 'interface/MajorDefensiveStatistic'; import STATISTIC_CATEGORY from 'parser/ui/STATISTIC_CATEGORY'; import SPELLS from 'common/SPELLS'; import { SpellLink } from 'interface'; +import { SELECTED_PLAYER } from 'parser/core/Analyzer'; const MITIGATION = 0.5; diff --git a/src/analysis/retail/evoker/devastation/modules/talents/Causality.tsx b/src/analysis/retail/evoker/devastation/modules/talents/Causality.tsx index 3cba31345ad..84301a9ab3f 100644 --- a/src/analysis/retail/evoker/devastation/modules/talents/Causality.tsx +++ b/src/analysis/retail/evoker/devastation/modules/talents/Causality.tsx @@ -1,7 +1,6 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/evoker'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { DamageEvent } from 'parser/core/Events'; import SpellUsable from 'parser/shared/modules/SpellUsable'; diff --git a/src/analysis/retail/evoker/preservation/modules/talents/GracePeriod.tsx b/src/analysis/retail/evoker/preservation/modules/talents/GracePeriod.tsx index 89347a620f2..76508b11e09 100644 --- a/src/analysis/retail/evoker/preservation/modules/talents/GracePeriod.tsx +++ b/src/analysis/retail/evoker/preservation/modules/talents/GracePeriod.tsx @@ -2,10 +2,10 @@ import { formatNumber } from 'common/format'; import SPELLS from 'common/SPELLS'; import { TALENTS_EVOKER } from 'common/TALENTS'; import { SpellLink } from 'interface'; -import Analyzer from 'parser/core/Analyzer'; +import Analyzer, { SELECTED_PLAYER } from 'parser/core/Analyzer'; import { calculateEffectiveHealing, calculateOverhealing } from 'parser/core/EventCalculateLib'; import Events, { HealEvent } from 'parser/core/Events'; -import { Options, SELECTED_PLAYER } from 'parser/core/EventSubscriber'; +import { Options } from 'parser/core/EventSubscriber'; import ItemHealingDone from 'parser/ui/ItemHealingDone'; import Statistic from 'parser/ui/Statistic'; import STATISTIC_CATEGORY from 'parser/ui/STATISTIC_CATEGORY'; diff --git a/src/analysis/retail/evoker/preservation/modules/talents/Reversion.tsx b/src/analysis/retail/evoker/preservation/modules/talents/Reversion.tsx index 843e2553594..793d82ac6dc 100644 --- a/src/analysis/retail/evoker/preservation/modules/talents/Reversion.tsx +++ b/src/analysis/retail/evoker/preservation/modules/talents/Reversion.tsx @@ -1,9 +1,9 @@ import SPELLS from 'common/SPELLS'; import { TALENTS_EVOKER } from 'common/TALENTS'; import HIT_TYPES from 'game/HIT_TYPES'; -import Analyzer from 'parser/core/Analyzer'; +import Analyzer, { SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { ApplyBuffEvent, HealEvent, RefreshBuffEvent } from 'parser/core/Events'; -import { Options, SELECTED_PLAYER } from 'parser/core/EventSubscriber'; +import { Options } from 'parser/core/EventSubscriber'; import Haste from 'parser/shared/modules/Haste'; import HotTrackerPrevoker from '../core/HotTrackerPrevoker'; diff --git a/src/analysis/retail/hunter/beastmastery/modules/core/SpellUsable.tsx b/src/analysis/retail/hunter/beastmastery/modules/core/SpellUsable.tsx index cd9abb5216d..80037f3459a 100644 --- a/src/analysis/retail/hunter/beastmastery/modules/core/SpellUsable.tsx +++ b/src/analysis/retail/hunter/beastmastery/modules/core/SpellUsable.tsx @@ -2,8 +2,7 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/hunter'; import HIT_TYPES from 'game/HIT_TYPES'; import { TIERS } from 'game/TIERS'; -import { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER, SELECTED_PLAYER_PET } from 'parser/core/EventFilter'; +import { Options, SELECTED_PLAYER, SELECTED_PLAYER_PET } from 'parser/core/Analyzer'; import Events, { AbilityEvent, AnyEvent, diff --git a/src/analysis/retail/mage/arcane/core/ArcaneSurgePreReqs.tsx b/src/analysis/retail/mage/arcane/core/ArcaneSurgePreReqs.tsx index bae7d8cbb2a..689040fb168 100644 --- a/src/analysis/retail/mage/arcane/core/ArcaneSurgePreReqs.tsx +++ b/src/analysis/retail/mage/arcane/core/ArcaneSurgePreReqs.tsx @@ -4,8 +4,7 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; import RESOURCE_TYPES from 'game/RESOURCE_TYPES'; import { SpellLink } from 'interface'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { CastEvent, DamageEvent, GetRelatedEvent } from 'parser/core/Events'; import { When, ThresholdStyle } from 'parser/core/ParseResults'; import AbilityTracker from 'parser/shared/modules/AbilityTracker'; diff --git a/src/analysis/retail/mage/arcane/talents/ArcaneBombardment.tsx b/src/analysis/retail/mage/arcane/talents/ArcaneBombardment.tsx index 63448c84fb1..31107f7eb73 100644 --- a/src/analysis/retail/mage/arcane/talents/ArcaneBombardment.tsx +++ b/src/analysis/retail/mage/arcane/talents/ArcaneBombardment.tsx @@ -1,8 +1,7 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; -import Analyzer, { Options } from 'parser/core/Analyzer'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import { calculateEffectiveDamage } from 'parser/core/EventCalculateLib'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; import Events, { DamageEvent } from 'parser/core/Events'; import AbilityTracker from 'parser/shared/modules/AbilityTracker'; import BoringSpellValueText from 'parser/ui/BoringSpellValueText'; diff --git a/src/analysis/retail/mage/arcane/talents/ArcaneHarmony.tsx b/src/analysis/retail/mage/arcane/talents/ArcaneHarmony.tsx index d52274a1935..59cb1d34adc 100644 --- a/src/analysis/retail/mage/arcane/talents/ArcaneHarmony.tsx +++ b/src/analysis/retail/mage/arcane/talents/ArcaneHarmony.tsx @@ -1,8 +1,7 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; -import Analyzer, { Options } from 'parser/core/Analyzer'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import { calculateEffectiveDamage } from 'parser/core/EventCalculateLib'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; import Events, { CastEvent, DamageEvent } from 'parser/core/Events'; import AbilityTracker from 'parser/shared/modules/AbilityTracker'; import BoringSpellValueText from 'parser/ui/BoringSpellValueText'; diff --git a/src/analysis/retail/mage/fire/talents/ImprovedScorch.tsx b/src/analysis/retail/mage/fire/talents/ImprovedScorch.tsx index 245c1fd8f30..07e2013e8eb 100644 --- a/src/analysis/retail/mage/fire/talents/ImprovedScorch.tsx +++ b/src/analysis/retail/mage/fire/talents/ImprovedScorch.tsx @@ -3,8 +3,7 @@ import { formatPercentage } from 'common/format'; import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; import { SpellLink } from 'interface'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { DamageEvent, FightEndEvent } from 'parser/core/Events'; import { When, ThresholdStyle } from 'parser/core/ParseResults'; import Enemies from 'parser/shared/modules/Enemies'; diff --git a/src/analysis/retail/mage/frost/core/IcyVeins.tsx b/src/analysis/retail/mage/frost/core/IcyVeins.tsx index 8ff7899324f..d87a15cf4f9 100644 --- a/src/analysis/retail/mage/frost/core/IcyVeins.tsx +++ b/src/analysis/retail/mage/frost/core/IcyVeins.tsx @@ -1,8 +1,7 @@ import { formatDuration, formatNumber, formatPercentage } from 'common/format'; import TALENTS from 'common/TALENTS/mage'; import { SpellLink } from 'interface'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { EventType, GetRelatedEvent, diff --git a/src/analysis/retail/mage/frost/talents/BoneChilling.tsx b/src/analysis/retail/mage/frost/talents/BoneChilling.tsx index c46e9c6f059..6a480f37a3b 100644 --- a/src/analysis/retail/mage/frost/talents/BoneChilling.tsx +++ b/src/analysis/retail/mage/frost/talents/BoneChilling.tsx @@ -2,9 +2,8 @@ import { formatNumber, formatPercentage } from 'common/format'; import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; import UptimeIcon from 'interface/icons/Uptime'; -import Analyzer, { Options } from 'parser/core/Analyzer'; +import Analyzer, { Options, SELECTED_PLAYER, SELECTED_PLAYER_PET } from 'parser/core/Analyzer'; import { calculateEffectiveDamage } from 'parser/core/EventCalculateLib'; -import { SELECTED_PLAYER, SELECTED_PLAYER_PET } from 'parser/core/EventFilter'; import Events, { DamageEvent } from 'parser/core/Events'; import BoringSpellValueText from 'parser/ui/BoringSpellValueText'; import Statistic from 'parser/ui/Statistic'; diff --git a/src/analysis/retail/mage/frost/talents/ColdFront.tsx b/src/analysis/retail/mage/frost/talents/ColdFront.tsx index 7118b7467cf..a9df483da6e 100644 --- a/src/analysis/retail/mage/frost/talents/ColdFront.tsx +++ b/src/analysis/retail/mage/frost/talents/ColdFront.tsx @@ -2,8 +2,7 @@ import { formatNumber } from 'common/format'; import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; import { SpellIcon } from 'interface'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { GetRelatedEvent, ApplyBuffEvent, RemoveBuffEvent } from 'parser/core/Events'; import BoringSpellValueText from 'parser/ui/BoringSpellValueText'; import Statistic from 'parser/ui/Statistic'; diff --git a/src/analysis/retail/mage/frost/talents/ColdSnap.tsx b/src/analysis/retail/mage/frost/talents/ColdSnap.tsx index a94920acf9a..e075dceb61e 100644 --- a/src/analysis/retail/mage/frost/talents/ColdSnap.tsx +++ b/src/analysis/retail/mage/frost/talents/ColdSnap.tsx @@ -1,7 +1,6 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events from 'parser/core/Events'; import SpellUsable from 'parser/shared/modules/SpellUsable'; diff --git a/src/analysis/retail/mage/frost/talents/CometStorm.tsx b/src/analysis/retail/mage/frost/talents/CometStorm.tsx index 169b3ee3b55..1a479599c06 100644 --- a/src/analysis/retail/mage/frost/talents/CometStorm.tsx +++ b/src/analysis/retail/mage/frost/talents/CometStorm.tsx @@ -4,8 +4,7 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; import { SpellLink } from 'interface'; import { highlightInefficientCast } from 'interface/report/Results/Timeline/Casts'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { CastEvent, DamageEvent, GetRelatedEvents } from 'parser/core/Events'; import { ThresholdStyle, When } from 'parser/core/ParseResults'; import Enemies from 'parser/shared/modules/Enemies'; diff --git a/src/analysis/retail/mage/frost/talents/Flurry.tsx b/src/analysis/retail/mage/frost/talents/Flurry.tsx index 48c43b84a06..cd92010b552 100644 --- a/src/analysis/retail/mage/frost/talents/Flurry.tsx +++ b/src/analysis/retail/mage/frost/talents/Flurry.tsx @@ -1,7 +1,6 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { CastEvent, DamageEvent, GetRelatedEvent } from 'parser/core/Events'; import SpellUsable from 'parser/shared/modules/SpellUsable'; import FlurryEvent from 'analysis/retail/mage/frost/talents/FlurryEvent'; diff --git a/src/analysis/retail/mage/frost/talents/FrozenOrb.tsx b/src/analysis/retail/mage/frost/talents/FrozenOrb.tsx index 4a893597df7..7508b43ab0a 100644 --- a/src/analysis/retail/mage/frost/talents/FrozenOrb.tsx +++ b/src/analysis/retail/mage/frost/talents/FrozenOrb.tsx @@ -1,7 +1,6 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events from 'parser/core/Events'; import SpellUsable from 'parser/shared/modules/SpellUsable'; import { SpellLink } from 'interface'; diff --git a/src/analysis/retail/mage/frost/talents/IcyPropulsion.tsx b/src/analysis/retail/mage/frost/talents/IcyPropulsion.tsx index 88541f0c175..d13ae4d942f 100644 --- a/src/analysis/retail/mage/frost/talents/IcyPropulsion.tsx +++ b/src/analysis/retail/mage/frost/talents/IcyPropulsion.tsx @@ -2,8 +2,7 @@ import { formatNumber } from 'common/format'; import TALENTS from 'common/TALENTS/mage'; import HIT_TYPES from 'game/HIT_TYPES'; import UptimeIcon from 'interface/icons/Uptime'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { DamageEvent } from 'parser/core/Events'; import AbilityTracker from 'parser/shared/modules/AbilityTracker'; import SpellUsable from 'parser/shared/modules/SpellUsable'; diff --git a/src/analysis/retail/mage/frost/talents/LonelyWinter.tsx b/src/analysis/retail/mage/frost/talents/LonelyWinter.tsx index c1f413d07a9..e58fac6e189 100644 --- a/src/analysis/retail/mage/frost/talents/LonelyWinter.tsx +++ b/src/analysis/retail/mage/frost/talents/LonelyWinter.tsx @@ -1,9 +1,8 @@ import { formatNumber } from 'common/format'; import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; -import Analyzer, { Options } from 'parser/core/Analyzer'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import { calculateEffectiveDamage } from 'parser/core/EventCalculateLib'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; import Events, { DamageEvent } from 'parser/core/Events'; import BoringSpellValueText from 'parser/ui/BoringSpellValueText'; import Statistic from 'parser/ui/Statistic'; diff --git a/src/analysis/retail/mage/frost/talents/RayOfFrost.tsx b/src/analysis/retail/mage/frost/talents/RayOfFrost.tsx index 5deac1a579c..903f0544a0c 100644 --- a/src/analysis/retail/mage/frost/talents/RayOfFrost.tsx +++ b/src/analysis/retail/mage/frost/talents/RayOfFrost.tsx @@ -3,8 +3,7 @@ import { formatPercentage } from 'common/format'; import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; import { SpellLink } from 'interface'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { CastEvent, DamageEvent, GetRelatedEvents } from 'parser/core/Events'; import { ThresholdStyle, When } from 'parser/core/ParseResults'; import Enemies from 'parser/shared/modules/Enemies'; diff --git a/src/analysis/retail/mage/shared/DivertedEnergy.tsx b/src/analysis/retail/mage/shared/DivertedEnergy.tsx index 87670a49a4a..00f284ae0ac 100644 --- a/src/analysis/retail/mage/shared/DivertedEnergy.tsx +++ b/src/analysis/retail/mage/shared/DivertedEnergy.tsx @@ -1,8 +1,7 @@ import { formatNumber } from 'common/format'; import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { HealEvent } from 'parser/core/Events'; import ItemHealingDone from 'parser/ui/ItemHealingDone'; import Statistic from 'parser/ui/Statistic'; diff --git a/src/analysis/retail/mage/shared/MasterOfTime.tsx b/src/analysis/retail/mage/shared/MasterOfTime.tsx index 2769ac0e8e7..8b70d345d4f 100644 --- a/src/analysis/retail/mage/shared/MasterOfTime.tsx +++ b/src/analysis/retail/mage/shared/MasterOfTime.tsx @@ -1,7 +1,6 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { RemoveBuffEvent } from 'parser/core/Events'; import SpellUsable from 'parser/shared/modules/SpellUsable'; diff --git a/src/analysis/retail/mage/shared/QuickWitted.tsx b/src/analysis/retail/mage/shared/QuickWitted.tsx index 49b0b3e0195..bef90b5cc56 100644 --- a/src/analysis/retail/mage/shared/QuickWitted.tsx +++ b/src/analysis/retail/mage/shared/QuickWitted.tsx @@ -1,7 +1,6 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { InterruptEvent } from 'parser/core/Events'; import SpellUsable from 'parser/shared/modules/SpellUsable'; diff --git a/src/analysis/retail/mage/shared/TempestBarrier.tsx b/src/analysis/retail/mage/shared/TempestBarrier.tsx index 1f474c40da2..1934eef620e 100644 --- a/src/analysis/retail/mage/shared/TempestBarrier.tsx +++ b/src/analysis/retail/mage/shared/TempestBarrier.tsx @@ -1,8 +1,7 @@ import { formatNumber } from 'common/format'; import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/mage'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { AbsorbedEvent } from 'parser/core/Events'; import Statistic from 'parser/ui/Statistic'; import STATISTIC_CATEGORY from 'parser/ui/STATISTIC_CATEGORY'; diff --git a/src/analysis/retail/monk/brewmaster/modules/problems/PurifyingBrew/analyzer.ts b/src/analysis/retail/monk/brewmaster/modules/problems/PurifyingBrew/analyzer.ts index ecc2ae01edb..1479838b43c 100644 --- a/src/analysis/retail/monk/brewmaster/modules/problems/PurifyingBrew/analyzer.ts +++ b/src/analysis/retail/monk/brewmaster/modules/problems/PurifyingBrew/analyzer.ts @@ -1,8 +1,8 @@ import SPELLS from 'common/SPELLS'; import talents from 'common/TALENTS/monk'; import type { Problem } from 'interface/guide/components/ProblemList'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import EventFilter, { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; +import EventFilter from 'parser/core/EventFilter'; import Events, { AddStaggerEvent, DamageEvent, diff --git a/src/analysis/retail/monk/mistweaver/modules/core/SpellManaCost.ts b/src/analysis/retail/monk/mistweaver/modules/core/SpellManaCost.ts index fa05bca6fad..5e1c14f9ee5 100644 --- a/src/analysis/retail/monk/mistweaver/modules/core/SpellManaCost.ts +++ b/src/analysis/retail/monk/mistweaver/modules/core/SpellManaCost.ts @@ -1,5 +1,4 @@ import SPELLS from 'common/SPELLS'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; import Events, { ApplyBuffEvent, ApplyBuffStackEvent, @@ -15,6 +14,7 @@ import { YULON_REDUCTION, } from '../../constants'; import SpellManaCost from 'parser/shared/modules/SpellManaCost'; +import { SELECTED_PLAYER } from 'parser/core/Analyzer'; const CF_SPELLS: Set = new Set([SPELLS.VIVIFY.id, TALENTS_MONK.ENVELOPING_MIST_TALENT.id]); diff --git a/src/analysis/retail/monk/mistweaver/modules/spells/LegacyOfWisdom.tsx b/src/analysis/retail/monk/mistweaver/modules/spells/LegacyOfWisdom.tsx index 2f2a2d66c41..a53f1ac0efd 100644 --- a/src/analysis/retail/monk/mistweaver/modules/spells/LegacyOfWisdom.tsx +++ b/src/analysis/retail/monk/mistweaver/modules/spells/LegacyOfWisdom.tsx @@ -1,6 +1,5 @@ import { TALENTS_MONK } from 'common/TALENTS/monk'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { CastEvent } from 'parser/core/Events'; import ItemHealingDone from 'parser/ui/ItemHealingDone'; import Statistic from 'parser/ui/Statistic'; diff --git a/src/analysis/retail/monk/windwalker/modules/core/SpellUsable.tsx b/src/analysis/retail/monk/windwalker/modules/core/SpellUsable.tsx index 29eb0965945..aec1a87b1a8 100644 --- a/src/analysis/retail/monk/windwalker/modules/core/SpellUsable.tsx +++ b/src/analysis/retail/monk/windwalker/modules/core/SpellUsable.tsx @@ -1,8 +1,7 @@ import SPELLS from 'common/SPELLS/monk'; import TALENTS from 'common/TALENTS/monk'; import { SpellLink } from 'interface'; -import { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { AbilityEvent, CastEvent, EventType } from 'parser/core/Events'; import CoreSpellUsable from 'parser/shared/modules/SpellUsable'; diff --git a/src/analysis/retail/monk/windwalker/modules/talents/DanceOfChiJi.tsx b/src/analysis/retail/monk/windwalker/modules/talents/DanceOfChiJi.tsx index e5aab252ef1..c5f9ff121a7 100644 --- a/src/analysis/retail/monk/windwalker/modules/talents/DanceOfChiJi.tsx +++ b/src/analysis/retail/monk/windwalker/modules/talents/DanceOfChiJi.tsx @@ -1,9 +1,8 @@ import { formatNumber, formatPercentage } from 'common/format'; import SPELLS from 'common/SPELLS'; import { SpellLink } from 'interface'; -import Analyzer, { Options } from 'parser/core/Analyzer'; +import Analyzer, { Options, SELECTED_PLAYER, SELECTED_PLAYER_PET } from 'parser/core/Analyzer'; import { calculateEffectiveDamage } from 'parser/core/EventCalculateLib'; -import { SELECTED_PLAYER, SELECTED_PLAYER_PET } from 'parser/core/EventFilter'; import Events, { CastEvent, DamageEvent } from 'parser/core/Events'; import BoringSpellValueText from 'parser/ui/BoringSpellValueText'; import Statistic from 'parser/ui/Statistic'; diff --git a/src/analysis/retail/monk/windwalker/modules/talents/HitCombo.tsx b/src/analysis/retail/monk/windwalker/modules/talents/HitCombo.tsx index 946e3ac1276..72c509a600d 100644 --- a/src/analysis/retail/monk/windwalker/modules/talents/HitCombo.tsx +++ b/src/analysis/retail/monk/windwalker/modules/talents/HitCombo.tsx @@ -3,9 +3,8 @@ import { formatNumber, formatPercentage } from 'common/format'; import SPELLS from 'common/SPELLS'; import { SpellLink } from 'interface'; import UptimeIcon from 'interface/icons/Uptime'; -import Analyzer, { Options } from 'parser/core/Analyzer'; +import Analyzer, { Options, SELECTED_PLAYER, SELECTED_PLAYER_PET } from 'parser/core/Analyzer'; import { calculateEffectiveDamage } from 'parser/core/EventCalculateLib'; -import { SELECTED_PLAYER, SELECTED_PLAYER_PET } from 'parser/core/EventFilter'; import Events, { DamageEvent } from 'parser/core/Events'; import { ThresholdStyle, When } from 'parser/core/ParseResults'; import BoringSpellValueText from 'parser/ui/BoringSpellValueText'; diff --git a/src/analysis/retail/priest/shadow/modules/talents/IdolOfCthun.tsx b/src/analysis/retail/priest/shadow/modules/talents/IdolOfCthun.tsx index f6f48141444..366fd52bfb7 100644 --- a/src/analysis/retail/priest/shadow/modules/talents/IdolOfCthun.tsx +++ b/src/analysis/retail/priest/shadow/modules/talents/IdolOfCthun.tsx @@ -1,9 +1,8 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/priest'; import { formatNumber } from 'common/format'; -import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; +import Analyzer, { Options, SELECTED_PLAYER, SELECTED_PLAYER_PET } from 'parser/core/Analyzer'; import Insanity from 'interface/icons/Insanity'; -import { SELECTED_PLAYER_PET } from 'parser/core/EventFilter'; import Events, { DamageEvent, ResourceChangeEvent } from 'parser/core/Events'; import BoringSpellValueText from 'parser/ui/BoringSpellValueText'; import ItemDamageDone from 'parser/ui/ItemDamageDone'; diff --git a/src/analysis/retail/priest/shadow/modules/talents/IdolOfYoggSaron.tsx b/src/analysis/retail/priest/shadow/modules/talents/IdolOfYoggSaron.tsx index a49bac4f94a..dd5d58c6cd1 100644 --- a/src/analysis/retail/priest/shadow/modules/talents/IdolOfYoggSaron.tsx +++ b/src/analysis/retail/priest/shadow/modules/talents/IdolOfYoggSaron.tsx @@ -1,7 +1,6 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/priest'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER_PET } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER_PET } from 'parser/core/Analyzer'; import Events, { DamageEvent } from 'parser/core/Events'; import BoringSpellValueText from 'parser/ui/BoringSpellValueText'; import ItemDamageDone from 'parser/ui/ItemDamageDone'; diff --git a/src/analysis/retail/priest/shadow/modules/talents/InescapableTorment.tsx b/src/analysis/retail/priest/shadow/modules/talents/InescapableTorment.tsx index 97d857100cd..995f1d198c2 100644 --- a/src/analysis/retail/priest/shadow/modules/talents/InescapableTorment.tsx +++ b/src/analysis/retail/priest/shadow/modules/talents/InescapableTorment.tsx @@ -1,8 +1,7 @@ import TALENTS from 'common/TALENTS/priest'; import SPELLS from 'common/SPELLS'; -import Analyzer, { Options } from 'parser/core/Analyzer'; +import Analyzer, { Options, SELECTED_PLAYER, SELECTED_PLAYER_PET } from 'parser/core/Analyzer'; import { TIERS } from 'game/TIERS'; -import { SELECTED_PLAYER, SELECTED_PLAYER_PET } from 'parser/core/EventFilter'; import Events, { CastEvent, DamageEvent, FightEndEvent } from 'parser/core/Events'; import BoringSpellValueText from 'parser/ui/BoringSpellValueText'; import ItemDamageDone from 'parser/ui/ItemDamageDone'; diff --git a/src/analysis/retail/priest/shared/TwinsOfTheSunPriestess.tsx b/src/analysis/retail/priest/shared/TwinsOfTheSunPriestess.tsx index ecd2968d0a1..d7e25f56372 100644 --- a/src/analysis/retail/priest/shared/TwinsOfTheSunPriestess.tsx +++ b/src/analysis/retail/priest/shared/TwinsOfTheSunPriestess.tsx @@ -3,8 +3,7 @@ import { formatNumber } from 'common/format'; import TALENTS from 'common/TALENTS/priest'; import { TALENTS_PRIEST } from 'common/TALENTS'; import { SpellLink } from 'interface'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { CastEvent } from 'parser/core/Events'; import { ThresholdStyle, When } from 'parser/core/ParseResults'; import BoringSpellValueText from 'parser/ui/BoringSpellValueText'; diff --git a/src/analysis/retail/rogue/outlaw/modules/features/RollTheBonesCastTracker.tsx b/src/analysis/retail/rogue/outlaw/modules/features/RollTheBonesCastTracker.tsx index 75608b6e072..14f1de3f80a 100644 --- a/src/analysis/retail/rogue/outlaw/modules/features/RollTheBonesCastTracker.tsx +++ b/src/analysis/retail/rogue/outlaw/modules/features/RollTheBonesCastTracker.tsx @@ -1,7 +1,6 @@ import SPELLS from 'common/SPELLS/rogue'; import Spell from 'common/SPELLS/Spell'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { CastEvent } from 'parser/core/Events'; import { ROLL_THE_BONES_BUFFS, ROLL_THE_BONES_DURATION } from '../../constants'; diff --git a/src/analysis/retail/rogue/shared/shadowlands/conduits/WellPlacedSteel.tsx b/src/analysis/retail/rogue/shared/shadowlands/conduits/WellPlacedSteel.tsx index 75e64060c2b..b8ad3f8669c 100644 --- a/src/analysis/retail/rogue/shared/shadowlands/conduits/WellPlacedSteel.tsx +++ b/src/analysis/retail/rogue/shared/shadowlands/conduits/WellPlacedSteel.tsx @@ -1,8 +1,7 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/rogue'; -import Analyzer, { Options } from 'parser/core/Analyzer'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import { calculateEffectiveDamage } from 'parser/core/EventCalculateLib'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; import Events, { DamageEvent } from 'parser/core/Events'; import Enemies from 'parser/shared/modules/Enemies'; import ItemDamageDone from 'parser/ui/ItemDamageDone'; diff --git a/src/analysis/retail/rogue/shared/talents/Reverberation.tsx b/src/analysis/retail/rogue/shared/talents/Reverberation.tsx index 92907b4071c..d3a0a7a1579 100644 --- a/src/analysis/retail/rogue/shared/talents/Reverberation.tsx +++ b/src/analysis/retail/rogue/shared/talents/Reverberation.tsx @@ -1,7 +1,6 @@ import TALENTS from 'common/TALENTS/rogue'; -import Analyzer, { Options } from 'parser/core/Analyzer'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import { calculateEffectiveDamage } from 'parser/core/EventCalculateLib'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; import Events, { DamageEvent } from 'parser/core/Events'; import ItemDamageDone from 'parser/ui/ItemDamageDone'; import Statistic from 'parser/ui/Statistic'; diff --git a/src/analysis/retail/shaman/elemental/modules/talents/MasterOfTheElements.tsx b/src/analysis/retail/shaman/elemental/modules/talents/MasterOfTheElements.tsx index 0232352d4e7..c42716196e8 100644 --- a/src/analysis/retail/shaman/elemental/modules/talents/MasterOfTheElements.tsx +++ b/src/analysis/retail/shaman/elemental/modules/talents/MasterOfTheElements.tsx @@ -2,9 +2,8 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/shaman'; import { isTalent } from 'common/TALENTS/types'; import { SpellLink } from 'interface'; -import Analyzer, { Options } from 'parser/core/Analyzer'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import { calculateEffectiveDamage } from 'parser/core/EventCalculateLib'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; import Events, { CastEvent, DamageEvent } from 'parser/core/Events'; import ItemDamageDone from 'parser/ui/ItemDamageDone'; import Statistic from 'parser/ui/Statistic'; diff --git a/src/analysis/retail/shaman/elemental/modules/talents/SurgeOfPower.tsx b/src/analysis/retail/shaman/elemental/modules/talents/SurgeOfPower.tsx index 91e4b92687f..2e3353dfca4 100644 --- a/src/analysis/retail/shaman/elemental/modules/talents/SurgeOfPower.tsx +++ b/src/analysis/retail/shaman/elemental/modules/talents/SurgeOfPower.tsx @@ -3,8 +3,7 @@ import { formatPercentage } from 'common/format'; import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/shaman'; import { SpellLink } from 'interface'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { ApplyBuffEvent, CastEvent } from 'parser/core/Events'; import { ThresholdStyle, When } from 'parser/core/ParseResults'; import Statistic from 'parser/ui/Statistic'; diff --git a/src/analysis/retail/warlock/destruction/modules/soulshards/SoulShardTracker.ts b/src/analysis/retail/warlock/destruction/modules/soulshards/SoulShardTracker.ts index 698856112f6..a8b1bf73ffe 100644 --- a/src/analysis/retail/warlock/destruction/modules/soulshards/SoulShardTracker.ts +++ b/src/analysis/retail/warlock/destruction/modules/soulshards/SoulShardTracker.ts @@ -2,8 +2,8 @@ import SPELLS from 'common/SPELLS'; import TALENTS from 'common/TALENTS/warlock'; import HIT_TYPES from 'game/HIT_TYPES'; import RESOURCE_TYPES from 'game/RESOURCE_TYPES'; -import { Options } from 'parser/core/Analyzer'; -import EventFilter, { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; +import EventFilter from 'parser/core/EventFilter'; import Events, { DamageEvent, EventType, diff --git a/src/analysis/retail/warrior/fury/modules/spells/Whirlwind.tsx b/src/analysis/retail/warrior/fury/modules/spells/Whirlwind.tsx index 3e690621279..4216055a051 100644 --- a/src/analysis/retail/warrior/fury/modules/spells/Whirlwind.tsx +++ b/src/analysis/retail/warrior/fury/modules/spells/Whirlwind.tsx @@ -3,8 +3,7 @@ import { formatPercentage } from 'common/format'; import SPELLS from 'common/SPELLS'; import talents from 'common/TALENTS/warrior'; import { SpellLink } from 'interface'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Events, { CastEvent, DamageEvent } from 'parser/core/Events'; import { ThresholdStyle, When } from 'parser/core/ParseResults'; import SpellUsable from 'parser/shared/modules/SpellUsable'; diff --git a/src/interface/guide/components/MajorDefensives/MajorDefensiveAnalyzer.tsx b/src/interface/guide/components/MajorDefensives/MajorDefensiveAnalyzer.tsx index a5e6c378dfe..3ad838a9565 100644 --- a/src/interface/guide/components/MajorDefensives/MajorDefensiveAnalyzer.tsx +++ b/src/interface/guide/components/MajorDefensives/MajorDefensiveAnalyzer.tsx @@ -3,8 +3,8 @@ import { formatDuration, formatNumber } from 'common/format'; import Spell from 'common/SPELLS/Spell'; import MAGIC_SCHOOLS, { color } from 'game/MAGIC_SCHOOLS'; import SpellLink from 'interface/SpellLink'; -import Analyzer, { Options } from 'parser/core/Analyzer'; -import EventFilter, { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; +import EventFilter from 'parser/core/EventFilter'; import Events, { AbilityEvent, HasSource, diff --git a/src/parser/core/Analyzer.ts b/src/parser/core/Analyzer.ts index 33da3d4a0fd..819a2cd70b7 100644 --- a/src/parser/core/Analyzer.ts +++ b/src/parser/core/Analyzer.ts @@ -1,7 +1,7 @@ import * as React from 'react'; import type { Suggestion } from './CombatLogParser'; -import EventFilter, { SELECTED_PLAYER, SELECTED_PLAYER_PET } from './EventFilter'; +import EventFilter from './EventFilter'; import Events, { AnyEvent, EventType } from './Events'; import EventSubscriber, { EventListener, Options as _Options } from './EventSubscriber'; import { Info, Metric } from './metric'; @@ -9,7 +9,8 @@ import Module from './Module'; import { When } from './ParseResults'; import { MessageDescriptor } from '@lingui/core'; -export { SELECTED_PLAYER, SELECTED_PLAYER_PET }; +export const SELECTED_PLAYER = 1; +export const SELECTED_PLAYER_PET = 2; export type Options = _Options; export interface ParseResultsTab { diff --git a/src/parser/core/EventFilter.ts b/src/parser/core/EventFilter.ts index 80be97e6c02..973bca81a81 100644 --- a/src/parser/core/EventFilter.ts +++ b/src/parser/core/EventFilter.ts @@ -1,7 +1,6 @@ import { EventType } from 'parser/core/Events'; +import { SELECTED_PLAYER, SELECTED_PLAYER_PET } from './Analyzer'; -export const SELECTED_PLAYER = 1; -export const SELECTED_PLAYER_PET = 2; const VALID_BY_FLAGS = SELECTED_PLAYER | SELECTED_PLAYER_PET; export type SpellInfo = { diff --git a/src/parser/core/EventSubscriber.ts b/src/parser/core/EventSubscriber.ts index 2327edbaa3e..558c2fe67ca 100644 --- a/src/parser/core/EventSubscriber.ts +++ b/src/parser/core/EventSubscriber.ts @@ -1,8 +1,7 @@ -import EventFilter, { SELECTED_PLAYER, SELECTED_PLAYER_PET } from './EventFilter'; +import EventFilter from './EventFilter'; import { EventType, AnyEvent } from './Events'; import Module, { Options as _Options } from './Module'; -export { SELECTED_PLAYER, SELECTED_PLAYER_PET }; export type Options = _Options; export type EventListener> = (event: E) => void; diff --git a/src/parser/retail/modules/items/dragonflight/enchants/SporeTender.tsx b/src/parser/retail/modules/items/dragonflight/enchants/SporeTender.tsx index 052840b9591..c105f339d26 100644 --- a/src/parser/retail/modules/items/dragonflight/enchants/SporeTender.tsx +++ b/src/parser/retail/modules/items/dragonflight/enchants/SporeTender.tsx @@ -3,9 +3,9 @@ import SPELLS from 'common/SPELLS/dragonflight/enchants'; import { formatDuration } from 'common/format'; import classColor from 'game/classColor'; import RoleIcon from 'interface/RoleIcon'; -import { withDependencies } from 'parser/core/Analyzer'; +import { SELECTED_PLAYER, withDependencies } from 'parser/core/Analyzer'; import Combatant from 'parser/core/Combatant'; -import { Options, SELECTED_PLAYER } from 'parser/core/EventSubscriber'; +import { Options } from 'parser/core/EventSubscriber'; import Events, { ApplyBuffEvent, RefreshBuffEvent, RemoveBuffEvent } from 'parser/core/Events'; import Combatants from 'parser/shared/modules/Combatants'; import WeaponEnchantAnalyzer, { EnchantRank } from './WeaponEnchantAnalyzer'; diff --git a/src/parser/shared/modules/CooldownThroughputTracker.tsx b/src/parser/shared/modules/CooldownThroughputTracker.tsx index ec3dfcf16ed..2dcfe524985 100644 --- a/src/parser/shared/modules/CooldownThroughputTracker.tsx +++ b/src/parser/shared/modules/CooldownThroughputTracker.tsx @@ -4,9 +4,9 @@ import SPELLS from 'common/SPELLS'; import { TALENTS_PRIEST } from 'common/TALENTS'; import { Panel } from 'interface'; import CooldownIcon from 'interface/icons/Cooldown'; -import Analyzer, { SELECTED_PLAYER, Options } from 'parser/core/Analyzer'; +import Analyzer, { SELECTED_PLAYER, Options, SELECTED_PLAYER_PET } from 'parser/core/Analyzer'; import CASTS_THAT_ARENT_CASTS from 'parser/core/CASTS_THAT_ARENT_CASTS'; -import EventFilter, { SELECTED_PLAYER_PET } from 'parser/core/EventFilter'; +import EventFilter from 'parser/core/EventFilter'; import Events, { AnyEvent, AbsorbedEvent, diff --git a/src/parser/shared/modules/EventHistory.ts b/src/parser/shared/modules/EventHistory.ts index 835619de01d..f3f1a46756d 100644 --- a/src/parser/shared/modules/EventHistory.ts +++ b/src/parser/shared/modules/EventHistory.ts @@ -1,9 +1,6 @@ +import { SELECTED_PLAYER, SELECTED_PLAYER_PET } from 'parser/core/Analyzer'; import CASTS_THAT_ARENT_CASTS from 'parser/core/CASTS_THAT_ARENT_CASTS'; -import EventFilter, { - SELECTED_PLAYER, - SELECTED_PLAYER_PET, - SpellInfo, -} from 'parser/core/EventFilter'; +import EventFilter, { SpellInfo } from 'parser/core/EventFilter'; import { HasAbility, AnyEvent, EventType } from 'parser/core/Events'; import Module from 'parser/core/Module'; import EventEmitter from 'parser/core/modules/EventEmitter'; diff --git a/src/parser/shared/modules/Haste.ts b/src/parser/shared/modules/Haste.ts index c1e5a5fe88c..0139e5132fa 100644 --- a/src/parser/shared/modules/Haste.ts +++ b/src/parser/shared/modules/Haste.ts @@ -3,9 +3,9 @@ import SPELLS from 'common/SPELLS'; import CLASSIC_SPELLS from 'common/SPELLS/classic'; import { TALENTS_DEATH_KNIGHT, TALENTS_MAGE, TALENTS_PRIEST } from 'common/TALENTS'; import BLOODLUST_BUFFS from 'game/BLOODLUST_BUFFS'; -import Analyzer, { Options } from 'parser/core/Analyzer'; +import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer'; import Combatant from 'parser/core/Combatant'; -import EventFilter, { SELECTED_PLAYER } from 'parser/core/EventFilter'; +import EventFilter from 'parser/core/EventFilter'; import Events, { Item, AnyEvent,