gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format .hx files

Browse Source 
Co-Authored-By: Eric <4635334+EliteMasterEric@users.noreply.github.com>
This commit is contained in:
Hundrec
2026-04-06 04:18:09 -06:00
co-authored by Eric
parent 71d7d929b4
commit 56dabfd5c9
267 changed files with 2748 additions and 2045 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/ui/debug/charting/dialogs/ChartEditorBaseDialog.hx
-1
View File
@@ -13,7 +13,6 @@ class ChartEditorBaseDialog extends Dialog
{
var chartEditorState:ChartEditorState;
var params:DialogParams;
var locked:Bool = false;
public function new(chartEditorState:ChartEditorState, params:DialogParams)
source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx
+19 -11
View File
@@ -16,8 +16,7 @@ import flixel.tweens.FlxEase;
import haxe.ui.components.Button;
// @:nullSafety // TODO: Fix null safety when used with HaxeUI build macros.
@:access(funkin.ui.debug.charting.ChartEditorState)
@:build(haxe.ui.ComponentBuilder.build("assets/exclude/data/ui/chart-editor/dialogs/character-icon-selector.xml"))
@:access(funkin.ui.debug.charting.ChartEditorState) @:build(haxe.ui.ComponentBuilder.build("assets/exclude/data/ui/chart-editor/dialogs/character-icon-selector.xml"))
class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
{
public var charSelectScroll:ScrollView;
@@ -49,18 +48,25 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
{
currentCharId = switch (charType)
{
case BF: chartEditorState.currentSongMetadata.playData.characters.player;
case GF: chartEditorState.currentSongMetadata.playData.characters.girlfriend;
case DAD: chartEditorState.currentSongMetadata.playData.characters.opponent;
default: throw 'Invalid charType: ' + charType;
case BF:
chartEditorState.currentSongMetadata.playData.characters.player;
case GF:
chartEditorState.currentSongMetadata.playData.characters.girlfriend;
case DAD:
chartEditorState.currentSongMetadata.playData.characters.opponent;
default:
throw 'Invalid charType: ' + charType;
};
// Position this menu.
var targetHealthIcon:Null<HealthIcon> = switch (charType)
{
case BF: chartEditorState.healthIconBF;
case DAD: chartEditorState.healthIconDad;
default: null;
case BF:
chartEditorState.healthIconBF;
case DAD:
chartEditorState.healthIconDad;
default:
null;
};
if (lockPosition && targetHealthIcon != null)
@@ -120,11 +126,13 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
case BF:
chartEditorState.currentSongMetadata.playData.characters.player = charId;
chartEditorState.playerPreviewDirty = true;
case GF: chartEditorState.currentSongMetadata.playData.characters.girlfriend = charId;
case GF:
chartEditorState.currentSongMetadata.playData.characters.girlfriend = charId;
case DAD:
chartEditorState.currentSongMetadata.playData.characters.opponent = charId;
chartEditorState.opponentPreviewDirty = true;
default: throw 'Invalid charType: ' + charType;
default:
throw 'Invalid charType: ' + charType;
};
defaultText = (charId != "") ? '${charData.name} [${charId}]' : 'None';
source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx
+1 -2
View File
@@ -10,8 +10,7 @@ import haxe.ui.containers.dialogs.Dialog.DialogButton;
import haxe.ui.containers.dialogs.Dialog.DialogEvent;
// @:nullSafety // TODO: Fix null safety when used with HaxeUI build macros.
@:build(haxe.ui.ComponentBuilder.build("assets/exclude/data/ui/chart-editor/dialogs/upload-chart.xml"))
@:access(funkin.ui.debug.charting.ChartEditorState)
@:build(haxe.ui.ComponentBuilder.build("assets/exclude/data/ui/chart-editor/dialogs/upload-chart.xml")) @:access(funkin.ui.debug.charting.ChartEditorState)
class ChartEditorUploadChartDialog extends ChartEditorBaseDialog
{
var dropHandlers:Array<DialogDropTarget> = [];
source/funkin/ui/debug/charting/dialogs/ChartEditorUploadVocalsDialog.hx
+1 -4
View File
@@ -17,17 +17,14 @@ import haxe.ui.core.Component;
// @:nullSafety // TODO: Fix null safety when used with HaxeUI build macros.
@:build(haxe.ui.ComponentBuilder.build("assets/exclude/data/ui/chart-editor/dialogs/upload-vocals.xml"))
@:access(funkin.ui.debug.charting.ChartEditorState)
@:build(haxe.ui.ComponentBuilder.build("assets/exclude/data/ui/chart-editor/dialogs/upload-vocals.xml")) @:access(funkin.ui.debug.charting.ChartEditorState)
class ChartEditorUploadVocalsDialog extends ChartEditorBaseDialog
{
var dropHandlers:Array<DialogDropTarget> = [];
var vocalContainer:Component;
var dialogCancel:Button;
var dialogNoVocals:Button;
var dialogContinue:Button;
var charIds:Array<String>;
var instId:String;
var hasClearedVocals:Bool = false;
source/funkin/ui/debug/charting/dialogs/ChartEditorWelcomeDialog.hx
+1 -2
View File
@@ -17,8 +17,7 @@ import haxe.ui.events.MouseEvent;
* Builds and opens a dialog letting the user create a new chart, open a recent chart, or load from a template.
* Opens when the chart editor first opens.
*/
@:build(haxe.ui.ComponentBuilder.build("assets/exclude/data/ui/chart-editor/dialogs/welcome.xml"))
@:access(funkin.ui.debug.charting.ChartEditorState)
@:build(haxe.ui.ComponentBuilder.build("assets/exclude/data/ui/chart-editor/dialogs/welcome.xml")) @:access(funkin.ui.debug.charting.ChartEditorState)
class ChartEditorWelcomeDialog extends ChartEditorBaseDialog
{
/**