@rian8337/osu-difficulty-calculator 4.0.0-beta.12 → 4.0.0-beta.14

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rian8337/osu-difficulty-calculator",
-    "version": "4.0.0-beta.12",
+    "version": "4.0.0-beta.14",
     "description": "A module for calculating osu!standard beatmap difficulty and performance value with respect to the current difficulty and performance algorithm.",
     "keywords": [
         "osu",
@@ -33,10 +33,10 @@
         "url": "https://github.com/Rian8337/osu-droid-module/issues"
     },
     "dependencies": {
-        "@rian8337/osu-base": "^4.0.0-beta.12"
+        "@rian8337/osu-base": "^4.0.0-beta.14"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "ca54ddeb2f61ae7aa0f5c4b873adf283703060c2"
+    "gitHead": "e4383e419f26770d389d69848e1743618f5f6f5d"
 }

package/typings/index.d.ts

@@ -1,4 +1,4 @@
-import { MapStats, Mod, PlaceableHitObject, Beatmap, Modes, HitObject, Accuracy } from '@rian8337/osu-base';
+import { Mod, MapStats, PlaceableHitObject, Beatmap, Modes, HitObject, Accuracy } from '@rian8337/osu-base';
 
 /**
  * An evaluator for calculating aim skill.
@@ -20,16 +20,6 @@ declare abstract class AimEvaluator {
     protected static calculateAcuteAngleBonus(angle: number): number;
 }
 
-/**
- * The base of calculation options.
- */
-interface CalculationOptions {
-    /**
-     * Custom map statistics to apply custom speed multiplier as well as old statistics.
-     */
-    stats?: MapStats;
-}
-
 /**
  * Holds data that can be used to calculate performance points.
  */
@@ -98,6 +88,26 @@ interface DifficultyAttributes {
     spinnerCount: number;
 }
 
+/**
+ * Represents difficulty attributes that can be cached.
+ */
+type CacheableDifficultyAttributes<T extends DifficultyAttributes> = Omit<T, "mods"> & {
+    /**
+     * The mods which were applied to the beatmap.
+     */
+    mods: string;
+};
+
+/**
+ * The base of calculation options.
+ */
+interface CalculationOptions {
+    /**
+     * Custom map statistics to apply custom speed multiplier as well as old statistics.
+     */
+    stats?: MapStats;
+}
+
 /**
  * Represents options for difficulty calculation.
  */
@@ -109,9 +119,9 @@ interface DifficultyCalculationOptions extends CalculationOptions {
 }
 
 /**
- * Represents an osu!standard hit object with difficulty calculation values.
+ * Represents a hit object with difficulty calculation values.
  */
-declare class DifficultyHitObject {
+declare abstract class DifficultyHitObject {
     /**
      * The underlying hitobject.
      */
@@ -142,41 +152,10 @@ declare class DifficultyHitObject {
      * The aim strain generated by the hitobject if sliders are not considered.
      */
     aimStrainWithoutSliders: number;
-    /**
-     * The tap strain generated by the hitobject.
-     *
-     * This is also used for osu!standard as opposed to "speed strain".
-     */
-    tapStrain: number;
-    /**
-     * The tap strain generated by the hitobject if `strainTime` isn't modified by
-     * OD. This is used in three-finger detection.
-     */
-    originalTapStrain: number;
     /**
      * The rhythm multiplier generated by the hitobject. This is used to alter tap strain.
      */
     rhythmMultiplier: number;
-    /**
-     * The rhythm strain generated by the hitobject.
-     */
-    rhythmStrain: number;
-    /**
-     * The flashlight strain generated by the hitobject if sliders are considered.
-     */
-    flashlightStrainWithSliders: number;
-    /**
-     * The flashlight strain generated by the hitobject if sliders are not considered.
-     */
-    flashlightStrainWithoutSliders: number;
-    /**
-     * The visual strain generated by the hitobject if sliders are considered.
-     */
-    visualStrainWithSliders: number;
-    /**
-     * The visual strain generated by the hitobject if sliders are not considered.
-     */
-    visualStrainWithoutSliders: number;
     /**
      * The normalized distance from the "lazy" end position of the previous hitobject to the start position of this hitobject.
      *
@@ -230,29 +209,15 @@ declare class DifficultyHitObject {
      * Adjusted end time of the hitobject, taking speed multiplier into account.
      */
     endTime: number;
-    /**
-     * The note density of the hitobject.
-     */
-    noteDensity: number;
-    /**
-     * The overlapping factor of the hitobject.
-     *
-     * This is used to scale visual skill.
-     */
-    overlappingFactor: number;
-    /**
-     * Adjusted velocity of the hitobject, taking speed multiplier into account.
-     */
-    velocity: number;
     /**
      * Other hitobjects in the beatmap, including this hitobject.
      */
-    private readonly hitObjects;
+    protected readonly hitObjects: DifficultyHitObject[];
     /**
      * @param object The underlying hitobject.
      * @param hitObjects All difficulty hitobjects in the processed beatmap.
      */
-    constructor(object: PlaceableHitObject, hitObjects: DifficultyHitObject[]);
+    protected constructor(object: PlaceableHitObject, hitObjects: DifficultyHitObject[]);
     /**
      * Gets the difficulty hitobject at a specific index with respect to the current
      * difficulty hitobject's index.
@@ -263,7 +228,7 @@ declare class DifficultyHitObject {
      * @returns The difficulty hitobject at the index with respect to the current
      * difficulty hitobject's index, `null` if the index is out of range.
      */
-    previous(backwardsIndex: number): DifficultyHitObject | null;
+    previous(backwardsIndex: number): this | null;
     /**
      * Gets the difficulty hitobject at a specific index with respect to the current
      * difficulty hitobject's index.
@@ -274,7 +239,7 @@ declare class DifficultyHitObject {
      * @returns The difficulty hitobject at the index with respect to the current
      * difficulty hitobject's index, `null` if the index is out of range.
      */
-    next(forwardsIndex: number): DifficultyHitObject | null;
+    next(forwardsIndex: number): this | null;
     /**
      * Calculates the opacity of the hitobject at a given time.
      *
@@ -343,7 +308,7 @@ declare abstract class Skill {
 /**
  * The base of a difficulty calculator.
  */
-declare abstract class DifficultyCalculator {
+declare abstract class DifficultyCalculator<THitObject extends DifficultyHitObject, TAttributes extends DifficultyAttributes> {
     /**
      * The calculated beatmap.
      */
@@ -351,7 +316,7 @@ declare abstract class DifficultyCalculator {
     /**
      * The difficulty objects of the beatmap.
      */
-    readonly objects: DifficultyHitObject[];
+    readonly objects: THitObject[];
     /**
      * The modifications applied.
      */
@@ -369,9 +334,13 @@ declare abstract class DifficultyCalculator {
      */
     readonly strainPeaks: StrainPeaks;
     /**
-     * Holds data that can be used to calculate performance points.
+     * The difficulty attributes that can be used to calculate performance points.
      */
-    abstract readonly attributes: DifficultyAttributes;
+    abstract readonly attributes: TAttributes;
+    /**
+     * The difficulty attributes that can be cached. It can also be used to calculate performance points.
+     */
+    abstract get cacheableAttributes(): CacheableDifficultyAttributes<TAttributes>;
     protected abstract readonly difficultyMultiplier: number;
     protected abstract readonly mode: Modes;
     /**
@@ -444,6 +413,75 @@ declare abstract class DifficultyCalculator {
     protected basePerformanceValue(rating: number): number;
 }
 
+/**
+ * Represents an osu!droid hit object with difficulty calculation values.
+ */
+declare class DroidDifficultyHitObject extends DifficultyHitObject {
+    /**
+     * The tap strain generated by the hitobject.
+     */
+    tapStrain: number;
+    /**
+     * The tap strain generated by the hitobject if `strainTime` isn't modified by
+     * OD. This is used in three-finger detection.
+     */
+    originalTapStrain: number;
+    /**
+     * The rhythm strain generated by the hitobject.
+     */
+    rhythmStrain: number;
+    /**
+     * The flashlight strain generated by the hitobject if sliders are considered.
+     */
+    flashlightStrainWithSliders: number;
+    /**
+     * The flashlight strain generated by the hitobject if sliders are not considered.
+     */
+    flashlightStrainWithoutSliders: number;
+    /**
+     * The visual strain generated by the hitobject if sliders are considered.
+     */
+    visualStrainWithSliders: number;
+    /**
+     * The visual strain generated by the hitobject if sliders are not considered.
+     */
+    visualStrainWithoutSliders: number;
+    /**
+     * The note density of the hitobject.
+     */
+    noteDensity: number;
+    /**
+     * The overlapping factor of the hitobject.
+     *
+     * This is used to scale visual skill.
+     */
+    overlappingFactor: number;
+    /**
+     * @param object The underlying hitobject.
+     * @param hitObjects All difficulty hitobjects in the processed beatmap.
+     */
+    constructor(object: PlaceableHitObject, hitObjects: DroidDifficultyHitObject[]);
+}
+
+/**
+ * Represents an osu!standard hit object with difficulty calculation values.
+ */
+declare class OsuDifficultyHitObject extends DifficultyHitObject {
+    /**
+     * The speed strain generated by the hitobject.
+     */
+    speedStrain: number;
+    /**
+     * The flashlight strain generated by this hitobject.
+     */
+    flashlightStrain: number;
+    /**
+     * @param object The underlying hitobject.
+     * @param hitObjects All difficulty hitobjects in the processed beatmap.
+     */
+    constructor(object: PlaceableHitObject, hitObjects: OsuDifficultyHitObject[]);
+}
+
 /**
  * A converter used to convert normal hitobjects into difficulty hitobjects.
  */
@@ -467,6 +505,28 @@ declare class DifficultyHitObjectCreator {
     private maximumSliderRadius;
     private readonly assumedSliderRadius;
     private readonly minDeltaTime;
+    /**
+     * Generates difficulty hitobjects for difficulty calculation.
+     */
+    generateDifficultyObjects(params: {
+        objects: readonly HitObject[];
+        circleSize: number;
+        mods: Mod[];
+        speedMultiplier: number;
+        mode: Modes.droid;
+        preempt?: number;
+    }): DroidDifficultyHitObject[];
+    /**
+     * Generates difficulty hitobjects for difficulty calculation.
+     */
+    generateDifficultyObjects(params: {
+        objects: readonly HitObject[];
+        circleSize: number;
+        mods: Mod[];
+        speedMultiplier: number;
+        mode: Modes.osu;
+        preempt?: number;
+    }): OsuDifficultyHitObject[];
     /**
      * Generates difficulty hitobjects for difficulty calculation.
      */
@@ -605,12 +665,12 @@ declare class DroidAim extends DroidSkill {
     private readonly withSliders;
     private currentAimStrain;
     constructor(mods: Mod[], withSliders: boolean);
-    protected strainValueAt(current: DifficultyHitObject): number;
-    protected calculateInitialStrain(time: number, current: DifficultyHitObject): number;
+    protected strainValueAt(current: DroidDifficultyHitObject): number;
+    protected calculateInitialStrain(time: number, current: DroidDifficultyHitObject): number;
     /**
      * @param current The hitobject to save to.
      */
-    protected saveToHitObject(current: DifficultyHitObject): void;
+    protected saveToHitObject(current: DroidDifficultyHitObject): void;
 }
 
 /**
@@ -633,7 +693,7 @@ declare abstract class DroidAimEvaluator extends AimEvaluator {
      * @param current The current object.
      * @param withSliders Whether to take slider difficulty into account.
      */
-    static evaluateDifficultyOf(current: DifficultyHitObject, withSliders: boolean): number;
+    static evaluateDifficultyOf(current: DroidDifficultyHitObject, withSliders: boolean): number;
     /**
      * Calculates the snap aim strain of a hitobject.
      */
@@ -740,7 +800,7 @@ interface ExtendedDroidDifficultyAttributes extends DroidDifficultyAttributes {
 /**
  * A difficulty calculator for osu!droid gamemode.
  */
-declare class DroidDifficultyCalculator extends DifficultyCalculator {
+declare class DroidDifficultyCalculator extends DifficultyCalculator<DroidDifficultyHitObject, DroidDifficultyAttributes> {
     /**
      * The aim star rating of the beatmap.
      */
@@ -768,6 +828,7 @@ declare class DroidDifficultyCalculator extends DifficultyCalculator {
      */
     static readonly threeFingerStrainThreshold: number;
     readonly attributes: ExtendedDroidDifficultyAttributes;
+    get cacheableAttributes(): CacheableDifficultyAttributes<DroidDifficultyAttributes>;
     protected readonly difficultyMultiplier: number;
     protected readonly mode: Modes;
     /**
@@ -859,9 +920,9 @@ declare class DroidFlashlight extends DroidSkill {
     private readonly withSliders;
     private currentFlashlightStrain;
     constructor(mods: Mod[], withSliders: boolean);
-    protected strainValueAt(current: DifficultyHitObject): number;
+    protected strainValueAt(current: DroidDifficultyHitObject): number;
     protected calculateInitialStrain(time: number, current: DifficultyHitObject): number;
-    protected saveToHitObject(current: DifficultyHitObject): void;
+    protected saveToHitObject(current: DroidDifficultyHitObject): void;
     difficultyValue(): number;
 }
 
@@ -895,7 +956,7 @@ declare abstract class DroidFlashlightEvaluator extends FlashlightEvaluator {
      * @param isHiddenMod Whether the Hidden mod is enabled.
      * @param withSliders Whether to take slider difficulty into account.
      */
-    static evaluateDifficultyOf(current: DifficultyHitObject, isHiddenMod: boolean, withSliders: boolean): number;
+    static evaluateDifficultyOf(current: DroidDifficultyHitObject, isHiddenMod: boolean, withSliders: boolean): number;
 }
 
 /**
@@ -935,7 +996,7 @@ interface PerformanceCalculationOptions {
 /**
  * The base class of performance calculators.
  */
-declare abstract class PerformanceCalculator {
+declare abstract class PerformanceCalculator<T extends DifficultyAttributes> {
     /**
      * The overall performance value.
      */
@@ -947,7 +1008,7 @@ declare abstract class PerformanceCalculator {
     /**
      * The difficulty attributes that is being calculated.
      */
-    abstract readonly difficultyAttributes: DifficultyAttributes;
+    readonly difficultyAttributes: T;
     /**
      * Penalty for combo breaks.
      */
@@ -970,6 +1031,10 @@ declare abstract class PerformanceCalculator {
      * Nerf factor used for nerfing beatmaps with very likely dropped sliderends.
      */
     protected sliderNerfFactor: number;
+    /**
+     * @param difficultyAttributes The difficulty attributes to calculate.
+     */
+    constructor(difficultyAttributes: T | CacheableDifficultyAttributes<T>);
     /**
      * Calculates the performance points of the beatmap.
      *
@@ -1012,12 +1077,19 @@ declare abstract class PerformanceCalculator {
      * Calculates the amount of misses + sliderbreaks from combo.
      */
     private calculateEffectiveMissCount;
+    /**
+     * Determines whether an attribute is a cacheable attribute.
+     *
+     * @param attributes The attributes to check.
+     * @returns Whether the attributes are cacheable.
+     */
+    private isCacheableAttribute;
 }
 
 /**
  * A performance points calculator that calculates performance points for osu!droid gamemode.
  */
-declare class DroidPerformanceCalculator extends PerformanceCalculator {
+declare class DroidPerformanceCalculator extends PerformanceCalculator<DroidDifficultyAttributes> {
     /**
      * The aim performance value.
      */
@@ -1070,7 +1142,6 @@ declare class DroidPerformanceCalculator extends PerformanceCalculator {
      * Can be properly obtained by analyzing the replay associated with the score.
      */
     get visualSliderCheesePenalty(): number;
-    readonly difficultyAttributes: DroidDifficultyAttributes;
     protected finalMultiplier: number;
     protected readonly mode: Modes;
     private _aimSliderCheesePenalty;
@@ -1079,10 +1150,6 @@ declare class DroidPerformanceCalculator extends PerformanceCalculator {
     private _tapPenalty;
     private _deviation;
     private _tapDeviation;
-    /**
-     * @param difficultyAttributes The difficulty attributes to calculate.
-     */
-    constructor(difficultyAttributes: DroidDifficultyAttributes);
     /**
      * Applies a tap penalty value to this calculator.
      *
@@ -1196,9 +1263,9 @@ declare class DroidRhythm extends DroidSkill {
     private currentRhythmMultiplier;
     private readonly hitWindow;
     constructor(mods: Mod[], overallDifficulty: number);
-    protected strainValueAt(current: DifficultyHitObject): number;
-    protected calculateInitialStrain(time: number, current: DifficultyHitObject): number;
-    protected saveToHitObject(current: DifficultyHitObject): void;
+    protected strainValueAt(current: DroidDifficultyHitObject): number;
+    protected calculateInitialStrain(time: number, current: DroidDifficultyHitObject): number;
+    protected saveToHitObject(current: DroidDifficultyHitObject): void;
 }
 
 /**
@@ -1222,7 +1289,7 @@ declare abstract class DroidRhythmEvaluator extends RhythmEvaluator {
      * @param current The current object.
      * @param greatWindow The great hit window of the current object.
      */
-    static evaluateDifficultyOf(current: DifficultyHitObject, greatWindow: number): number;
+    static evaluateDifficultyOf(current: DroidDifficultyHitObject, greatWindow: number): number;
 }
 
 /**
@@ -1239,12 +1306,12 @@ declare class DroidTap extends DroidSkill {
     private readonly greatWindow;
     private readonly considerCheesability;
     constructor(mods: Mod[], overallDifficulty: number, considerCheesability: boolean);
-    protected strainValueAt(current: DifficultyHitObject): number;
-    protected calculateInitialStrain(time: number, current: DifficultyHitObject): number;
+    protected strainValueAt(current: DroidDifficultyHitObject): number;
+    protected calculateInitialStrain(time: number, current: DroidDifficultyHitObject): number;
     /**
      * @param current The hitobject to save to.
      */
-    protected saveToHitObject(current: DifficultyHitObject): void;
+    protected saveToHitObject(current: DroidDifficultyHitObject): void;
 }
 
 /**
@@ -1271,7 +1338,7 @@ declare abstract class DroidTapEvaluator extends SpeedEvaluator {
      * @param greatWindow The great hit window of the current object.
      * @param considerCheesability Whether to consider cheesability.
      */
-    static evaluateDifficultyOf(current: DifficultyHitObject, greatWindow: number, considerCheesability: boolean): number;
+    static evaluateDifficultyOf(current: DroidDifficultyHitObject, greatWindow: number, considerCheesability: boolean): number;
 }
 
 /**
@@ -1288,9 +1355,9 @@ declare class DroidVisual extends DroidSkill {
     private currentRhythmMultiplier;
     private readonly skillMultiplier;
     constructor(mods: Mod[], withSliders: boolean);
-    protected strainValueAt(current: DifficultyHitObject): number;
-    protected calculateInitialStrain(time: number, current: DifficultyHitObject): number;
-    protected saveToHitObject(current: DifficultyHitObject): void;
+    protected strainValueAt(current: DroidDifficultyHitObject): number;
+    protected calculateInitialStrain(time: number, current: DroidDifficultyHitObject): number;
+    protected saveToHitObject(current: DroidDifficultyHitObject): void;
 }
 
 /**
@@ -1312,7 +1379,7 @@ declare abstract class DroidVisualEvaluator {
      * @param isHiddenMod Whether the Hidden mod is enabled.
      * @param withSliders Whether to take slider difficulty into account.
      */
-    static evaluateDifficultyOf(current: DifficultyHitObject, isHiddenMod: boolean, withSliders: boolean): number;
+    static evaluateDifficultyOf(current: DroidDifficultyHitObject, isHiddenMod: boolean, withSliders: boolean): number;
 }
 
 /**
@@ -1350,7 +1417,7 @@ interface OsuDifficultyAttributes extends DifficultyAttributes {
 /**
  * A difficulty calculator for osu!standard gamemode.
  */
-declare class OsuDifficultyCalculator extends DifficultyCalculator {
+declare class OsuDifficultyCalculator extends DifficultyCalculator<OsuDifficultyHitObject, OsuDifficultyAttributes> {
     /**
      * The aim star rating of the beatmap.
      */
@@ -1364,6 +1431,7 @@ declare class OsuDifficultyCalculator extends DifficultyCalculator {
      */
     flashlight: number;
     readonly attributes: OsuDifficultyAttributes;
+    get cacheableAttributes(): CacheableDifficultyAttributes<OsuDifficultyAttributes>;
     protected readonly difficultyMultiplier: number;
     protected readonly mode: Modes;
     /**
@@ -1445,12 +1513,12 @@ declare class OsuAim extends OsuSkill {
     private readonly skillMultiplier;
     private readonly withSliders;
     constructor(mods: Mod[], withSliders: boolean);
-    protected strainValueAt(current: DifficultyHitObject): number;
-    protected calculateInitialStrain(time: number, current: DifficultyHitObject): number;
+    protected strainValueAt(current: OsuDifficultyHitObject): number;
+    protected calculateInitialStrain(time: number, current: OsuDifficultyHitObject): number;
     /**
      * @param current The hitobject to save to.
      */
-    protected saveToHitObject(current: DifficultyHitObject): void;
+    protected saveToHitObject(current: OsuDifficultyHitObject): void;
 }
 
 /**
@@ -1468,7 +1536,7 @@ declare abstract class OsuAimEvaluator extends AimEvaluator {
      * @param current The current object.
      * @param withSliders Whether to take slider difficulty into account.
      */
-    static evaluateDifficultyOf(current: DifficultyHitObject, withSliders: boolean): number;
+    static evaluateDifficultyOf(current: OsuDifficultyHitObject, withSliders: boolean): number;
 }
 
 /**
@@ -1483,9 +1551,9 @@ declare class OsuFlashlight extends OsuSkill {
     private readonly skillMultiplier;
     private readonly isHidden;
     constructor(mods: Mod[]);
-    protected strainValueAt(current: DifficultyHitObject): number;
-    protected calculateInitialStrain(time: number, current: DifficultyHitObject): number;
-    protected saveToHitObject(current: DifficultyHitObject): void;
+    protected strainValueAt(current: OsuDifficultyHitObject): number;
+    protected calculateInitialStrain(time: number, current: OsuDifficultyHitObject): number;
+    protected saveToHitObject(current: OsuDifficultyHitObject): void;
 }
 
 /**
@@ -1504,13 +1572,13 @@ declare abstract class OsuFlashlightEvaluator extends FlashlightEvaluator {
      * @param current The current object.
      * @param isHiddenMod Whether the Hidden mod is enabled.
      */
-    static evaluateDifficultyOf(current: DifficultyHitObject, isHiddenMod: boolean): number;
+    static evaluateDifficultyOf(current: OsuDifficultyHitObject, isHiddenMod: boolean): number;
 }
 
 /**
  * A performance points calculator that calculates performance points for osu!standard gamemode.
  */
-declare class OsuPerformanceCalculator extends PerformanceCalculator {
+declare class OsuPerformanceCalculator extends PerformanceCalculator<OsuDifficultyAttributes> {
     /**
      * The aim performance value.
      */
@@ -1527,15 +1595,10 @@ declare class OsuPerformanceCalculator extends PerformanceCalculator {
      * The flashlight performance value.
      */
     flashlight: number;
-    readonly difficultyAttributes: OsuDifficultyAttributes;
     protected finalMultiplier: number;
     protected readonly mode: Modes;
     protected calculateValues(): void;
     protected calculateTotalValue(): number;
-    /**
-     * @param difficultyAttributes The difficulty attributes to calculate.
-     */
-    constructor(difficultyAttributes: OsuDifficultyAttributes);
     /**
      * Calculates the aim performance value of the beatmap.
      */
@@ -1566,7 +1629,7 @@ declare abstract class OsuRhythmEvaluator extends RhythmEvaluator {
      * @param current The current object.
      * @param greatWindow The great hit window of the current object.
      */
-    static evaluateDifficultyOf(current: DifficultyHitObject, greatWindow: number): number;
+    static evaluateDifficultyOf(current: OsuDifficultyHitObject, greatWindow: number): number;
 }
 
 /**
@@ -1586,12 +1649,12 @@ declare class OsuSpeed extends OsuSkill {
     /**
      * @param current The hitobject to calculate.
      */
-    protected strainValueAt(current: DifficultyHitObject): number;
-    protected calculateInitialStrain(time: number, current: DifficultyHitObject): number;
+    protected strainValueAt(current: OsuDifficultyHitObject): number;
+    protected calculateInitialStrain(time: number, current: OsuDifficultyHitObject): number;
     /**
      * @param current The hitobject to save to.
      */
-    protected saveToHitObject(current: DifficultyHitObject): void;
+    protected saveToHitObject(current: OsuDifficultyHitObject): void;
 }
 
 /**
@@ -1612,7 +1675,7 @@ declare abstract class OsuSpeedEvaluator extends SpeedEvaluator {
      * @param current The current object.
      * @param greatWindow The great hit window of the current object.
      */
-    static evaluateDifficultyOf(current: DifficultyHitObject, greatWindow: number): number;
+    static evaluateDifficultyOf(current: OsuDifficultyHitObject, greatWindow: number): number;
 }
 
-export { AimEvaluator, type CalculationOptions, type DifficultSlider, type DifficultyAttributes, type DifficultyCalculationOptions, DifficultyCalculator, DifficultyHitObject, DifficultyHitObjectCreator, DroidAim, DroidAimEvaluator, type DroidDifficultyAttributes, DroidDifficultyCalculator, DroidFlashlight, DroidFlashlightEvaluator, DroidPerformanceCalculator, DroidRhythm, DroidRhythmEvaluator, DroidTap, DroidTapEvaluator, DroidVisual, DroidVisualEvaluator, type ExtendedDroidDifficultyAttributes, FlashlightEvaluator, type HighStrainSection, MapStars, OsuAim, OsuAimEvaluator, type OsuDifficultyAttributes, OsuDifficultyCalculator, OsuFlashlight, OsuFlashlightEvaluator, OsuPerformanceCalculator, OsuRhythmEvaluator, OsuSpeed, OsuSpeedEvaluator, type PerformanceCalculationOptions, PerformanceCalculator, RhythmEvaluator, SpeedEvaluator, type StrainPeaks };
+export { AimEvaluator, type CacheableDifficultyAttributes, type CalculationOptions, type DifficultSlider, type DifficultyAttributes, type DifficultyCalculationOptions, DifficultyCalculator, DifficultyHitObject, DifficultyHitObjectCreator, DroidAim, DroidAimEvaluator, type DroidDifficultyAttributes, DroidDifficultyCalculator, DroidDifficultyHitObject, DroidFlashlight, DroidFlashlightEvaluator, DroidPerformanceCalculator, DroidRhythm, DroidRhythmEvaluator, DroidTap, DroidTapEvaluator, DroidVisual, DroidVisualEvaluator, type ExtendedDroidDifficultyAttributes, FlashlightEvaluator, type HighStrainSection, MapStars, OsuAim, OsuAimEvaluator, type OsuDifficultyAttributes, OsuDifficultyCalculator, OsuDifficultyHitObject, OsuFlashlight, OsuFlashlightEvaluator, OsuPerformanceCalculator, OsuRhythmEvaluator, OsuSpeed, OsuSpeedEvaluator, type PerformanceCalculationOptions, PerformanceCalculator, RhythmEvaluator, SpeedEvaluator, type StrainPeaks };