From c9fb6bc51f4bb64513243ea6a4136aaf26656a54 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Fri, 2 Jun 2023 15:25:13 -0400 Subject: [PATCH] Further typo fixes --- source/funkin/InitState.hx | 2 +- .../charting/ChartEditorToolboxHandler.hx | 79 +++++++------------ .../ui/stageBuildShit/StageEditorCommand.hx | 1 + .../ui/stageBuildShit/StageOffsetSubstate.hx | 2 +- 4 files changed, 30 insertions(+), 54 deletions(-) diff --git a/source/funkin/InitState.hx b/source/funkin/InitState.hx index 21e0b4156..76e85befd 100644 --- a/source/funkin/InitState.hx +++ b/source/funkin/InitState.hx @@ -12,7 +12,7 @@ import flixel.util.FlxColor; import funkin.modding.module.ModuleHandler; import funkin.play.PlayState; import funkin.play.character.CharacterData.CharacterDataParser; -import funkin.play.event.SongEvent.SongEventParser; +import funkin.play.event.SongEventData.SongEventParser; import funkin.play.song.SongData.SongDataParser; import funkin.ui.PreferencesMenu; import funkin.util.WindowUtil; diff --git a/source/funkin/ui/debug/charting/ChartEditorToolboxHandler.hx b/source/funkin/ui/debug/charting/ChartEditorToolboxHandler.hx index 8e21b3aeb..5a903481e 100644 --- a/source/funkin/ui/debug/charting/ChartEditorToolboxHandler.hx +++ b/source/funkin/ui/debug/charting/ChartEditorToolboxHandler.hx @@ -3,6 +3,7 @@ package funkin.ui.debug.charting; import haxe.ui.data.ArrayDataSource; import funkin.play.character.BaseCharacter.CharacterType; import funkin.play.event.SongEvent; +import funkin.play.event.SongEventData; import funkin.play.song.SongData.SongTimeChange; import funkin.play.song.SongSerializer; import funkin.ui.haxeui.components.CharacterPlayer; @@ -133,8 +134,7 @@ class ChartEditorToolboxHandler toolbox.x = 50; toolbox.y = 50; - toolbox.onDialogClosed = (event:DialogEvent) -> - { + toolbox.onDialogClosed = (event:DialogEvent) -> { state.setUICheckboxSelected('menubarItemToggleToolboxTools', false); } @@ -142,8 +142,7 @@ class ChartEditorToolboxHandler if (toolsGroup == null) return null; - toolsGroup.onChange = (event:UIEvent) -> - { + toolsGroup.onChange = (event:UIEvent) -> { switch (event.target.id) { case 'toolboxToolsGroupSelect': @@ -168,8 +167,7 @@ class ChartEditorToolboxHandler toolbox.x = 75; toolbox.y = 100; - toolbox.onDialogClosed = (event:DialogEvent) -> - { + toolbox.onDialogClosed = (event:DialogEvent) -> { state.setUICheckboxSelected('menubarItemToggleToolboxNotes', false); } @@ -177,8 +175,7 @@ class ChartEditorToolboxHandler var toolboxNotesCustomKindLabel:Label = toolbox.findComponent("toolboxNotesCustomKindLabel", Label); var toolboxNotesCustomKind:TextField = toolbox.findComponent("toolboxNotesCustomKind", TextField); - toolboxNotesNoteKind.onChange = (event:UIEvent) -> - { + toolboxNotesNoteKind.onChange = (event:UIEvent) -> { var isCustom = (event.data.id == '~CUSTOM~'); if (isCustom) @@ -197,8 +194,7 @@ class ChartEditorToolboxHandler } } - toolboxNotesCustomKind.onChange = (event:UIEvent) -> - { + toolboxNotesCustomKind.onChange = (event:UIEvent) -> { state.selectedNoteKind = toolboxNotesCustomKind.text; } @@ -215,8 +211,7 @@ class ChartEditorToolboxHandler toolbox.x = 100; toolbox.y = 150; - toolbox.onDialogClosed = (event:DialogEvent) -> - { + toolbox.onDialogClosed = (event:DialogEvent) -> { state.setUICheckboxSelected('menubarItemToggleToolboxEvents', false); } @@ -232,8 +227,7 @@ class ChartEditorToolboxHandler toolboxEventsEventKind.dataSource.add({text: event.getTitle(), value: event.id}); } - toolboxEventsEventKind.onChange = (event:UIEvent) -> - { + toolboxEventsEventKind.onChange = (event:UIEvent) -> { var eventType:String = event.data.value; trace('ChartEditorToolboxHandler.buildToolboxEventDataLayout() - Event type changed: $eventType'); @@ -320,8 +314,7 @@ class ChartEditorToolboxHandler target.addComponent(input); - input.onChange = (event:UIEvent) -> - { + input.onChange = (event:UIEvent) -> { trace('ChartEditorToolboxHandler.buildEventDataFormFromSchema() - ${event.target.id} = ${event.target.value}'); if (event.target.value == null) state.selectedEventData.remove(event.target.id); @@ -341,8 +334,7 @@ class ChartEditorToolboxHandler toolbox.x = 125; toolbox.y = 200; - toolbox.onDialogClosed = (event:DialogEvent) -> - { + toolbox.onDialogClosed = (event:DialogEvent) -> { state.setUICheckboxSelected('menubarItemToggleToolboxDifficulty', false); } @@ -352,35 +344,28 @@ class ChartEditorToolboxHandler var difficultyToolboxLoadMetadata:Button = toolbox.findComponent("difficultyToolboxLoadMetadata", Button); var difficultyToolboxLoadChart:Button = toolbox.findComponent("difficultyToolboxLoadChart", Button); - difficultyToolboxSaveMetadata.onClick = (event:UIEvent) -> - { + difficultyToolboxSaveMetadata.onClick = (event:UIEvent) -> { SongSerializer.exportSongMetadata(state.currentSongMetadata); }; - difficultyToolboxSaveChart.onClick = (event:UIEvent) -> - { + difficultyToolboxSaveChart.onClick = (event:UIEvent) -> { SongSerializer.exportSongChartData(state.currentSongChartData); }; - difficultyToolboxSaveAll.onClick = (event:UIEvent) -> - { + difficultyToolboxSaveAll.onClick = (event:UIEvent) -> { state.exportAllSongData(); }; - difficultyToolboxLoadMetadata.onClick = (event:UIEvent) -> - { + difficultyToolboxLoadMetadata.onClick = (event:UIEvent) -> { // Replace metadata for current variation. - SongSerializer.importSongMetadataAsync(function(songMetadata) - { + SongSerializer.importSongMetadataAsync(function(songMetadata) { state.currentSongMetadata = songMetadata; }); }; - difficultyToolboxLoadChart.onClick = (event:UIEvent) -> - { + difficultyToolboxLoadChart.onClick = (event:UIEvent) -> { // Replace chart data for current variation. - SongSerializer.importSongChartDataAsync(function(songChartData) - { + SongSerializer.importSongChartDataAsync(function(songChartData) { state.currentSongChartData = songChartData; state.noteDisplayDirty = true; }); @@ -401,14 +386,12 @@ class ChartEditorToolboxHandler toolbox.x = 150; toolbox.y = 250; - toolbox.onDialogClosed = (event:DialogEvent) -> - { + toolbox.onDialogClosed = (event:DialogEvent) -> { state.setUICheckboxSelected('menubarItemToggleToolboxMetadata', false); } var inputSongName:TextField = toolbox.findComponent('inputSongName', TextField); - inputSongName.onChange = (event:UIEvent) -> - { + inputSongName.onChange = (event:UIEvent) -> { var valid = event.target.text != null && event.target.text != ""; if (valid) @@ -423,8 +406,7 @@ class ChartEditorToolboxHandler }; var inputSongArtist:TextField = toolbox.findComponent('inputSongArtist', TextField); - inputSongArtist.onChange = (event:UIEvent) -> - { + inputSongArtist.onChange = (event:UIEvent) -> { var valid = event.target.text != null && event.target.text != ""; if (valid) @@ -439,8 +421,7 @@ class ChartEditorToolboxHandler }; var inputStage:DropDown = toolbox.findComponent('inputStage', DropDown); - inputStage.onChange = (event:UIEvent) -> - { + inputStage.onChange = (event:UIEvent) -> { var valid = event.data != null && event.data.id != null; if (valid) @@ -450,15 +431,13 @@ class ChartEditorToolboxHandler }; var inputNoteSkin:DropDown = toolbox.findComponent('inputNoteSkin', DropDown); - inputNoteSkin.onChange = (event:UIEvent) -> - { + inputNoteSkin.onChange = (event:UIEvent) -> { if (event.data.id == null) return; state.currentSongMetadata.playData.noteSkin = event.data.id; }; var inputBPM:NumberStepper = toolbox.findComponent('inputBPM', NumberStepper); - inputBPM.onChange = (event:UIEvent) -> - { + inputBPM.onChange = (event:UIEvent) -> { if (event.value == null || event.value <= 0) return; var timeChanges = state.currentSongMetadata.timeChanges; @@ -477,8 +456,7 @@ class ChartEditorToolboxHandler }; var inputScrollSpeed:Slider = toolbox.findComponent('inputScrollSpeed', Slider); - inputScrollSpeed.onChange = (event:UIEvent) -> - { + inputScrollSpeed.onChange = (event:UIEvent) -> { var valid = event.target.value != null && event.target.value > 0; if (valid) @@ -505,8 +483,7 @@ class ChartEditorToolboxHandler toolbox.x = 175; toolbox.y = 300; - toolbox.onDialogClosed = (event:DialogEvent) -> - { + toolbox.onDialogClosed = (event:DialogEvent) -> { state.setUICheckboxSelected('menubarItemToggleToolboxCharacters', false); } @@ -523,8 +500,7 @@ class ChartEditorToolboxHandler toolbox.x = 200; toolbox.y = 350; - toolbox.onDialogClosed = (event:DialogEvent) -> - { + toolbox.onDialogClosed = (event:DialogEvent) -> { state.setUICheckboxSelected('menubarItemToggleToolboxPlayerPreview', false); } @@ -548,8 +524,7 @@ class ChartEditorToolboxHandler toolbox.x = 200; toolbox.y = 350; - toolbox.onDialogClosed = (event:DialogEvent) -> - { + toolbox.onDialogClosed = (event:DialogEvent) -> { state.setUICheckboxSelected('menubarItemToggleToolboxOpponentPreview', false); } diff --git a/source/funkin/ui/stageBuildShit/StageEditorCommand.hx b/source/funkin/ui/stageBuildShit/StageEditorCommand.hx index 1e19914da..3248d16d8 100644 --- a/source/funkin/ui/stageBuildShit/StageEditorCommand.hx +++ b/source/funkin/ui/stageBuildShit/StageEditorCommand.hx @@ -1,5 +1,6 @@ package funkin.ui.stageBuildShit; +import funkin.ui.stageBuildShit.StageOffsetSubState; import flixel.FlxSprite; /** diff --git a/source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx b/source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx index f6fd261c8..f6b9cae3d 100644 --- a/source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx +++ b/source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx @@ -28,7 +28,7 @@ import openfl.net.FileReference; */ // Give other classes access to private instance fields @:allow(funkin.ui.stageBuildShit.StageEditorCommand) -class StageOffsetSubstate extends HaxeUISubState +class StageOffsetSubState extends HaxeUISubState { var uiStuff:Component;