chore: fix typos in class and field names

source/funkin/audio/visualize/PolygonSpectogram.hx → source/funkin/audio/visualize/PolygonSpectrogram.hx

@@ -8,14 +8,14 @@ import funkin.audio.visualize.VisShit.CurAudioInfo;
 import funkin.graphics.rendering.MeshRender;
 import lime.utils.Int16Array;
 
-class PolygonSpectogram extends MeshRender
+class PolygonSpectrogram extends MeshRender
 {
   var sampleRate:Int;
 
   public var vis:VisShit;
   public var visType:VISTYPE = UPDATED;
   public var daHeight:Float = FlxG.height;
-  public var realtimeVisLenght:Float = 0.2;
+  public var realtimeVisLength:Float = 0.2;
   public var realtimeStartOffset:Float = 0;
 
   var numSamples:Int = 0;
@@ -130,7 +130,7 @@ class PolygonSpectogram extends MeshRender
 
         curTime = vis.snd.time;
 
-        if (vis.snd.time < vis.snd.length - realtimeVisLenght) generateSection(vis.snd.time + realtimeStartOffset, realtimeVisLenght);
+        if (vis.snd.time < vis.snd.length - realtimeVisLength) generateSection(vis.snd.time + realtimeStartOffset, realtimeVisLength);
       }
     }
   }

source/funkin/audio/visualize/PolygonVisGroup.hx

@@ -4,17 +4,17 @@ import flixel.group.FlxGroup.FlxTypedGroup;
 import flixel.sound.FlxSound;
 
 @:nullSafety
-class PolygonVisGroup extends FlxTypedGroup<PolygonSpectogram>
+class PolygonVisGroup extends FlxTypedGroup<PolygonSpectrogram>
 {
-  public var playerVis:Null<PolygonSpectogram>;
-  public var opponentVis:Null<PolygonSpectogram>;
-  public var instVis:Null<PolygonSpectogram>;
+  public var playerVis:Null<PolygonSpectrogram>;
+  public var opponentVis:Null<PolygonSpectrogram>;
+  public var instVis:Null<PolygonSpectrogram>;
 
   public function new()
   {
     super();
-    playerVis = new PolygonSpectogram();
-    opponentVis = new PolygonSpectogram();
+    playerVis = new PolygonSpectrogram();
+    opponentVis = new PolygonSpectrogram();
   }
 
   /**
@@ -23,7 +23,7 @@ class PolygonVisGroup extends FlxTypedGroup<PolygonSpectogram>
    */
   public function addPlayerVis(visSnd:FlxSound):Void
   {
-    var vis:PolygonSpectogram = new PolygonSpectogram(visSnd);
+    var vis:PolygonSpectrogram = new PolygonSpectrogram(visSnd);
     super.add(vis);
     playerVis = vis;
   }
@@ -34,7 +34,7 @@ class PolygonVisGroup extends FlxTypedGroup<PolygonSpectogram>
    */
   public function addOpponentVis(visSnd:FlxSound):Void
   {
-    var vis:PolygonSpectogram = new PolygonSpectogram(visSnd);
+    var vis:PolygonSpectrogram = new PolygonSpectrogram(visSnd);
     super.add(vis);
     opponentVis = vis;
   }
@@ -45,7 +45,7 @@ class PolygonVisGroup extends FlxTypedGroup<PolygonSpectogram>
    */
   public function addInstVis(visSnd:FlxSound):Void
   {
-    var vis:PolygonSpectogram = new PolygonSpectogram(visSnd);
+    var vis:PolygonSpectrogram = new PolygonSpectrogram(visSnd);
     super.add(vis);
     instVis = vis;
   }
@@ -92,9 +92,9 @@ class PolygonVisGroup extends FlxTypedGroup<PolygonSpectogram>
    * @param vis The visualizer to add.
    * @return The added visualizer.
    */
-  override public function add(vis:PolygonSpectogram):PolygonSpectogram
+  override public function add(vis:PolygonSpectrogram):PolygonSpectrogram
   {
-    var result:PolygonSpectogram = super.add(vis);
+    var result:PolygonSpectrogram = super.add(vis);
     return result;
   }
 

source/funkin/audio/visualize/SpectogramSprite.hx

@@ -6,7 +6,7 @@ import flixel.math.FlxMath;
 import flixel.math.FlxPoint;
 import flixel.sound.FlxSound;
 import flixel.util.FlxColor;
-import funkin.audio.visualize.PolygonSpectogram.VISTYPE;
+import funkin.audio.visualize.PolygonSpectrogram.VISTYPE;
 import funkin.audio.visualize.VisShit.CurAudioInfo;
 import lime.utils.Int16Array;
 

source/funkin/mobile/ui/FunkinHitbox.hx

@@ -284,7 +284,7 @@ class FunkinHitbox extends FlxTypedSpriteGroup<FunkinHint>
   /**
    * Creates a new `FunkinHitbox` object.
    */
-  public function new(?schemeOverride:String, ?showGradint:Bool = true, ?directionsOverride:Array<NoteDirection>, ?colorsOverride:Array<FlxColor>):Void
+  public function new(?schemeOverride:String, ?showGradient:Bool = true, ?directionsOverride:Array<NoteDirection>, ?colorsOverride:Array<FlxColor>):Void
   {
     super();
 
@@ -303,7 +303,7 @@ class FunkinHitbox extends FlxTypedSpriteGroup<FunkinHint>
         for (i in 0...hintsNoteDirections.length)
         {
           add(createHintLane(i * hintWidth, 0, hintsNoteDirections[i % hintsNoteDirections.length], hintWidth, hintHeight,
-            hintsColors[i % hintsColors.length], true, showGradint));
+            hintsColors[i % hintsColors.length], true, showGradient));
         }
       case FunkinHitboxControlSchemes.DoubleThumbTriangle:
         final screenHalf:Int = Math.floor(FlxG.width / 2);
@@ -312,12 +312,12 @@ class FunkinHitbox extends FlxTypedSpriteGroup<FunkinHint>
         {
           final xOffset:Int = (i == 1) ? screenHalf : 0;
 
-          add(createHintTriangle(xOffset, 0, hintsNoteDirections[0], Math.floor(FlxG.width / 4), FlxG.height, hintsColors[0], showGradint));
+          add(createHintTriangle(xOffset, 0, hintsNoteDirections[0], Math.floor(FlxG.width / 4), FlxG.height, hintsColors[0], showGradient));
           add(createHintTriangle(xOffset, FlxG.height / 2, hintsNoteDirections[1], Math.floor(FlxG.width / 2), Math.floor(FlxG.height / 2), hintsColors[1],
-            showGradint));
-          add(createHintTriangle(xOffset, 0, hintsNoteDirections[2], Math.floor(FlxG.width / 2), Math.floor(FlxG.height / 2), hintsColors[2], showGradint));
+            showGradient));
+          add(createHintTriangle(xOffset, 0, hintsNoteDirections[2], Math.floor(FlxG.width / 2), Math.floor(FlxG.height / 2), hintsColors[2], showGradient));
           add(createHintTriangle(xOffset + Math.floor(FlxG.width / 4), 0, hintsNoteDirections[3], Math.floor(FlxG.width / 4), FlxG.height, hintsColors[3],
-            showGradint));
+            showGradient));
         }
       case FunkinHitboxControlSchemes.DoubleThumbSquare:
         final screenHalf:Int = Math.floor(FlxG.width / 2);
@@ -337,12 +337,12 @@ class FunkinHitbox extends FlxTypedSpriteGroup<FunkinHint>
             if (j == 1 || j == 2)
             {
               add(createHintLane(xOffset + hintWidth, (j == 1) ? boxHeight : 0, hintsNoteDirections[j], boxWidth, boxHeight,
-                hintsColors[j % hintsColors.length], false, showGradint));
+                hintsColors[j % hintsColors.length], false, showGradient));
             }
             else
             {
               add(createHintLane(xOffset + (j == 0 ? 0 : hintWidth + boxWidth), 0, hintsNoteDirections[j], hintWidth, hintHeight,
-                hintsColors[j % hintsColors.length], false, showGradint));
+                hintsColors[j % hintsColors.length], false, showGradient));
             }
           }
         }

source/funkin/play/ResultState.hx

@@ -204,9 +204,9 @@ class ResultState extends MusicBeatSubState
 
     trace('Got playable character: ${playerCharacter?.getName()}');
     // Query JSON data based on the rank, then use that to build the animation(s) the player sees.
-    var playerAnimationDatas:Array<PlayerResultsAnimationData> = playerCharacter != null ? playerCharacter.getResultsAnimationDatas(rank) : [];
+    var playerAnimationData:Array<PlayerResultsAnimationData> = playerCharacter != null ? playerCharacter.getResultsAnimationData(rank) : [];
 
-    for (animData in playerAnimationDatas)
+    for (animData in playerAnimationData)
     {
       if (animData == null) continue;
 

source/funkin/play/components/ClearPercentCounter.hx

@@ -60,25 +60,25 @@ class ClearPercentCounter extends FlxTypedSpriteGroup<FlxSprite>
 
   function drawNumbers():Void
   {
-    var seperatedScore:Array<Int> = [];
+    var separatedScore:Array<Int> = [];
     var tempCombo:Int = Math.round(curNumber);
 
     while (tempCombo > 0 && tempCombo != 0)
     {
-      seperatedScore.push(tempCombo % 10);
+      separatedScore.push(tempCombo % 10);
       tempCombo = Math.floor(tempCombo / 10);
     }
 
-    if (seperatedScore.length == 0) seperatedScore.push(0);
+    if (separatedScore.length == 0) separatedScore.push(0);
 
-    seperatedScore.reverse();
+    separatedScore.reverse();
 
-    for (ind => num in seperatedScore)
+    for (ind => num in separatedScore)
     {
       var digitIndex:Int = ind + 1;
       // If there's only one digit, move it to the right
       // If there's three digits, move them all to the left
-      var digitOffset = (seperatedScore.length == 1) ? 1 : (seperatedScore.length == 3) ? -1 : 0;
+      var digitOffset = (separatedScore.length == 1) ? 1 : (separatedScore.length == 3) ? -1 : 0;
       var digitSize = small ? 32 : 72;
       var digitHeightOffset = small ? -4 : 0;
 
@@ -90,7 +90,7 @@ class ClearPercentCounter extends FlxTypedSpriteGroup<FlxSprite>
       if (digitIndex >= members.length)
       {
         // Three digits = LLR because the 1 and 0 won't be the same anyway.
-        var variant:Bool = (seperatedScore.length == 3) ? (digitIndex >= 2) : (digitIndex >= 1);
+        var variant:Bool = (separatedScore.length == 3) ? (digitIndex >= 2) : (digitIndex >= 1);
         // var variant:Bool = (seperatedScore.length % 2 != 0) ? (digitIndex % 2 == 0) : (digitIndex % 2 == 1);
         var numb:ClearPercentNumber = new ClearPercentNumber(xPos, yPos, num, variant, this.small);
         numb.scale.set(this.scale.x, this.scale.y);
@@ -107,7 +107,7 @@ class ClearPercentCounter extends FlxTypedSpriteGroup<FlxSprite>
         members[digitIndex].visible = true;
       }
     }
-    for (ind in (seperatedScore.length + 1)...(members.length))
+    for (ind in (separatedScore.length + 1)...(members.length))
     {
       members[ind].visible = false;
     }

source/funkin/play/components/PopUpStuff.hx

@@ -71,21 +71,21 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
 
   public function displayCombo(combo:Int = 0):Void
   {
-    var seperatedScore:Array<Int> = [];
+    var separatedScore:Array<Int> = [];
     var tempCombo:Int = combo;
 
     while (tempCombo != 0)
     {
-      seperatedScore.push(tempCombo % 10);
+      separatedScore.push(tempCombo % 10);
       tempCombo = Std.int(tempCombo / 10);
     }
-    while (seperatedScore.length < 3)
-      seperatedScore.push(0);
+    while (separatedScore.length < 3)
+      separatedScore.push(0);
 
     // seperatedScore.reverse();
 
     var daLoop:Int = 1;
-    for (digit in seperatedScore)
+    for (digit in separatedScore)
     {
       var numScore:Null<FunkinSprite> = noteStyle.buildComboNumSprite(digit);
       if (numScore == null) continue;

source/funkin/play/components/TallyCounter.hx

@@ -38,22 +38,22 @@ class TallyCounter extends FlxTypedSpriteGroup<FlxSprite>
 
   function drawNumbers()
   {
-    var seperatedScore:Array<Int> = [];
+    var separatedScore:Array<Int> = [];
     var tempCombo:Int = Math.round(curNumber);
 
     var fullNumberDigits:Int = Std.int(Math.max(1, Math.ceil(MathUtil.logBase(10, neededNumber))));
 
     while (tempCombo != 0)
     {
-      seperatedScore.push(tempCombo % 10);
+      separatedScore.push(tempCombo % 10);
       tempCombo = Math.floor(tempCombo / 10);
     }
 
-    if (seperatedScore.length == 0) seperatedScore.push(0);
+    if (separatedScore.length == 0) separatedScore.push(0);
 
-    seperatedScore.reverse();
+    separatedScore.reverse();
 
-    for (ind => num in seperatedScore)
+    for (ind => num in separatedScore)
     {
       if (ind >= members.length)
       {

source/funkin/play/notes/notekind/NoteKindManager.hx

@@ -159,15 +159,15 @@ class NoteKindManager
   /**
    * Get a list of all the note styles used by the given notes.
    * Great for preloading.
-   * @param songNoteDatas The notes to query for note styles.
+   * @param songNoteData The notes to query for note styles.
    * @return The note styles to load.
    */
-  public static function listNoteStylesByNoteData(songNoteDatas:Array<SongNoteData>):Array<NoteStyle>
+  public static function listNoteStylesByNoteData(songNoteData:Array<SongNoteData>):Array<NoteStyle>
   {
     var results:Array<NoteStyle> = [];
-    for (songNoteData in songNoteDatas)
+    for (noteData in songNoteData)
     {
-      var noteStyle:NoteStyle = getNoteStyle(songNoteData.kind, null);
+      var noteStyle:NoteStyle = getNoteStyle(noteData.kind, null);
       if (noteStyle != null && !results.contains(noteStyle))
       {
         results.push(noteStyle);

source/funkin/ui/debug/charting/ChartEditorState.hx

@@ -21,7 +21,7 @@ import flixel.util.FlxSort;
 import flixel.util.FlxStringUtil;
 import flixel.util.FlxTimer;
 import funkin.audio.FunkinSound;
-import funkin.audio.visualize.PolygonSpectogram;
+import funkin.audio.visualize.PolygonSpectrogram;
 import funkin.audio.VoicesGroup;
 import funkin.audio.waveform.WaveformSprite;
 import funkin.data.notestyle.NoteStyleRegistry;
@@ -3863,8 +3863,8 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     {
       var currentMeasureTime:Float = Conductor.instance.getMeasureTimeInMs(Conductor.instance.currentMeasure);
       var currentStepTime:Float = Conductor.instance.getStepTimeInMs(Conductor.instance.currentStep);
-      final msTreshold:Float = 10.0;
-      playMetronomeTick(currentMeasureTime >= currentStepTime - msTreshold && currentMeasureTime <= currentStepTime + msTreshold);
+      final msThreshold:Float = 10.0;
+      playMetronomeTick(currentMeasureTime >= currentStepTime - msThreshold && currentMeasureTime <= currentStepTime + msThreshold);
     }
 
     // Show the mouse cursor.

source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx

@@ -269,17 +269,17 @@ class ChartEditorImportExportHandler
     var baseMetadata:SongMetadata = SongRegistry.instance.parseEntryMetadataRawWithMigration(baseMetadataString, baseMetadataPath,
       baseMetadataVersion) ?? throw 'Could not read metadata (default).';
 
-    var songMetadatas:Map<String, SongMetadata> = [];
-    songMetadatas.set(Constants.DEFAULT_VARIATION, baseMetadata);
+    var songMetadata:Map<String, SongMetadata> = [];
+    songMetadata.set(Constants.DEFAULT_VARIATION, baseMetadata);
 
     var baseChartDataPath:String = manifest.getChartDataFileName();
     var baseChartDataString:String = mappedFileEntries.get(baseChartDataPath)?.data?.toString() ?? throw 'Could not locate chart data (default).';
     var baseChartDataVersion:SemverVersion = VersionUtil.getVersionFromJSON(baseChartDataString) ?? throw 'Could not read chart data version (default).';
     var baseChartData:SongChartData = SongRegistry.instance.parseEntryChartDataRawWithMigration(baseChartDataString, baseChartDataPath,
       baseChartDataVersion) ?? throw 'Could not read chart data (default).';
 
-    var songChartDatas:Map<String, SongChartData> = [];
-    songChartDatas.set(Constants.DEFAULT_VARIATION, baseChartData);
+    var songChartData:Map<String, SongChartData> = [];
+    songChartData.set(Constants.DEFAULT_VARIATION, baseChartData);
 
     var variationList:Array<String> = baseMetadata.playData.songVariations;
 
@@ -291,16 +291,16 @@ class ChartEditorImportExportHandler
       var variMetadata:SongMetadata = SongRegistry.instance.parseEntryMetadataRawWithMigration(variMetadataString, variMetadataPath, variMetadataVersion,
         variation) ?? throw 'Could not read metadata ($variation).';
 
-      songMetadatas.set(variation, variMetadata);
+      songMetadata.set(variation, variMetadata);
 
       var variChartDataPath:String = manifest.getChartDataFileName(variation);
       var variChartDataString:String = mappedFileEntries.get(variChartDataPath)?.data?.toString() ?? throw 'Could not locate chart data ($variation).';
       var variChartDataVersion:SemverVersion = VersionUtil.getVersionFromJSON(variChartDataString) ?? throw 'Could not read chart data version ($variation).';
       var variChartData:SongChartData = SongRegistry.instance.parseEntryChartDataRawWithMigration(variChartDataString, variChartDataPath,
         variChartDataVersion, variation) ?? throw 'Could not read chart data ($variation).';
-      songChartDatas.set(variation, variChartData);
+      songChartData.set(variation, variChartData);
     }
-    loadSong(state, songMetadatas, songChartDatas, manifest);
+    loadSong(state, songMetadata, songChartData, manifest);
 
     state.sortChartData();
 
@@ -310,7 +310,7 @@ class ChartEditorImportExportHandler
     // Load instrumentals
     for (variation in state.availableVariations)
     {
-      var variMetadata:Null<SongMetadata> = songMetadatas.get(variation);
+      var variMetadata:Null<SongMetadata> = songMetadata.get(variation);
       if (variMetadata == null) continue;
 
       var instId:String = variMetadata?.playData?.characters?.instrumental ?? '';
@@ -355,8 +355,8 @@ class ChartEditorImportExportHandler
     }
 
     // Apply chart data.
-    trace(songMetadatas);
-    trace(songChartDatas);
+    trace(songMetadata);
+    trace(songChartData);
 
     state.switchToCurrentInstrumental();
     state.postLoadInstrumental();