From f9649d3ff216e402c31fc35224a12b526323b2d7 Mon Sep 17 00:00:00 2001 From: NeeEoo Date: Sun, 14 Apr 2024 10:24:25 +0200 Subject: [PATCH] Renamed the folder --- source/funkin/backend/utils/MatrixUtil.hx | 2 +- source/funkin/editors/EditorPicker.hx | 2 +- .../funkin/editors/{stager => stage}/StageCreationScreen.hx | 2 +- source/funkin/editors/{stager => stage}/StageEditor.hx | 6 +++--- source/funkin/editors/{stager => stage}/StageInfoScreen.hx | 2 +- source/funkin/editors/{stager => stage}/StageSelection.hx | 6 +++--- .../{stager => stage}/elements/StageCharacterButton.hx | 2 +- .../{stager => stage}/elements/StageElementButton.hx | 2 +- .../editors/{stager => stage}/elements/StageSolidButton.hx | 2 +- .../editors/{stager => stage}/elements/StageSpriteButton.hx | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) rename source/funkin/editors/{stager => stage}/StageCreationScreen.hx (98%) rename source/funkin/editors/{stager => stage}/StageEditor.hx (99%) rename source/funkin/editors/{stager => stage}/StageInfoScreen.hx (99%) rename source/funkin/editors/{stager => stage}/StageSelection.hx (95%) rename source/funkin/editors/{stager => stage}/elements/StageCharacterButton.hx (97%) rename source/funkin/editors/{stager => stage}/elements/StageElementButton.hx (98%) rename source/funkin/editors/{stager => stage}/elements/StageSolidButton.hx (87%) rename source/funkin/editors/{stager => stage}/elements/StageSpriteButton.hx (96%) diff --git a/source/funkin/backend/utils/MatrixUtil.hx b/source/funkin/backend/utils/MatrixUtil.hx index 25e08124..bd278385 100644 --- a/source/funkin/backend/utils/MatrixUtil.hx +++ b/source/funkin/backend/utils/MatrixUtil.hx @@ -27,7 +27,7 @@ class MatrixUtil { // reset to ingame coords x += camera.scroll.x; y += camera.scroll.y; - + if(isFunkinSprite) { var sprite:FunkinSprite = cast sprite; diff --git a/source/funkin/editors/EditorPicker.hx b/source/funkin/editors/EditorPicker.hx index 534ec538..7b98f0e6 100644 --- a/source/funkin/editors/EditorPicker.hx +++ b/source/funkin/editors/EditorPicker.hx @@ -20,7 +20,7 @@ class EditorPicker extends MusicBeatSubstate { { name: "Stage Editor", iconID: 2, - state: funkin.editors.stager.StageSelection + state: funkin.editors.stage.StageSelection }, { name: "UI Debug State", diff --git a/source/funkin/editors/stager/StageCreationScreen.hx b/source/funkin/editors/stage/StageCreationScreen.hx similarity index 98% rename from source/funkin/editors/stager/StageCreationScreen.hx rename to source/funkin/editors/stage/StageCreationScreen.hx index e17bde86..957ff896 100644 --- a/source/funkin/editors/stager/StageCreationScreen.hx +++ b/source/funkin/editors/stage/StageCreationScreen.hx @@ -1,4 +1,4 @@ -package funkin.editors.stager; +package funkin.editors.stage; typedef StageCreationData = { var name:String; diff --git a/source/funkin/editors/stager/StageEditor.hx b/source/funkin/editors/stage/StageEditor.hx similarity index 99% rename from source/funkin/editors/stager/StageEditor.hx rename to source/funkin/editors/stage/StageEditor.hx index fec13b2a..cf7fe342 100644 --- a/source/funkin/editors/stager/StageEditor.hx +++ b/source/funkin/editors/stage/StageEditor.hx @@ -1,11 +1,11 @@ -package funkin.editors.stager; +package funkin.editors.stage; import flixel.math.FlxAngle; -import flixel.util.FlxColor; import flixel.math.FlxPoint; +import flixel.util.FlxColor; import funkin.backend.system.framerate.Framerate; import funkin.backend.utils.XMLUtil.AnimData; -import funkin.editors.stager.elements.*; +import funkin.editors.stage.elements.*; import funkin.editors.ui.UIContextMenu.UIContextMenuOption; import funkin.game.Character; import funkin.game.Stage; diff --git a/source/funkin/editors/stager/StageInfoScreen.hx b/source/funkin/editors/stage/StageInfoScreen.hx similarity index 99% rename from source/funkin/editors/stager/StageInfoScreen.hx rename to source/funkin/editors/stage/StageInfoScreen.hx index 89b3cedf..10fe046b 100644 --- a/source/funkin/editors/stager/StageInfoScreen.hx +++ b/source/funkin/editors/stage/StageInfoScreen.hx @@ -1,4 +1,4 @@ -package funkin.editors.stager; +package funkin.editors.stage; import flixel.math.FlxPoint; import funkin.editors.extra.PropertyButton; diff --git a/source/funkin/editors/stager/StageSelection.hx b/source/funkin/editors/stage/StageSelection.hx similarity index 95% rename from source/funkin/editors/stager/StageSelection.hx rename to source/funkin/editors/stage/StageSelection.hx index 726849bf..6fa49597 100644 --- a/source/funkin/editors/stager/StageSelection.hx +++ b/source/funkin/editors/stage/StageSelection.hx @@ -1,12 +1,12 @@ -package funkin.editors.stager; +package funkin.editors.stage; -import funkin.options.OptionsScreen; +import funkin.editors.stage.StageCreationScreen.StageCreationData; import funkin.game.Stage; +import funkin.options.OptionsScreen; import funkin.options.type.IconOption; import funkin.options.type.NewOption; import funkin.options.type.OptionType; import funkin.options.type.TextOption; -import funkin.editors.stager.StageCreationScreen.StageCreationData; class StageSelection extends EditorTreeMenu { diff --git a/source/funkin/editors/stager/elements/StageCharacterButton.hx b/source/funkin/editors/stage/elements/StageCharacterButton.hx similarity index 97% rename from source/funkin/editors/stager/elements/StageCharacterButton.hx rename to source/funkin/editors/stage/elements/StageCharacterButton.hx index d133ed29..57dc4e9d 100644 --- a/source/funkin/editors/stager/elements/StageCharacterButton.hx +++ b/source/funkin/editors/stage/elements/StageCharacterButton.hx @@ -1,4 +1,4 @@ -package funkin.editors.stager.elements; +package funkin.editors.stage.elements; import funkin.game.Character; import funkin.game.Stage.StageCharPos; diff --git a/source/funkin/editors/stager/elements/StageElementButton.hx b/source/funkin/editors/stage/elements/StageElementButton.hx similarity index 98% rename from source/funkin/editors/stager/elements/StageElementButton.hx rename to source/funkin/editors/stage/elements/StageElementButton.hx index b1b9a507..a834e653 100644 --- a/source/funkin/editors/stager/elements/StageElementButton.hx +++ b/source/funkin/editors/stage/elements/StageElementButton.hx @@ -1,4 +1,4 @@ -package funkin.editors.stager.elements; +package funkin.editors.stage.elements; import haxe.xml.Access; import flixel.util.FlxColor; diff --git a/source/funkin/editors/stager/elements/StageSolidButton.hx b/source/funkin/editors/stage/elements/StageSolidButton.hx similarity index 87% rename from source/funkin/editors/stager/elements/StageSolidButton.hx rename to source/funkin/editors/stage/elements/StageSolidButton.hx index 96f74c63..31eeba1d 100644 --- a/source/funkin/editors/stager/elements/StageSolidButton.hx +++ b/source/funkin/editors/stage/elements/StageSolidButton.hx @@ -1,4 +1,4 @@ -package funkin.editors.stager.elements; +package funkin.editors.stage.elements; import haxe.xml.Access; import flixel.util.FlxColor; diff --git a/source/funkin/editors/stager/elements/StageSpriteButton.hx b/source/funkin/editors/stage/elements/StageSpriteButton.hx similarity index 96% rename from source/funkin/editors/stager/elements/StageSpriteButton.hx rename to source/funkin/editors/stage/elements/StageSpriteButton.hx index 60405cef..425ffd2d 100644 --- a/source/funkin/editors/stager/elements/StageSpriteButton.hx +++ b/source/funkin/editors/stage/elements/StageSpriteButton.hx @@ -1,4 +1,4 @@ -package funkin.editors.stager.elements; +package funkin.editors.stage.elements; import haxe.xml.Access; import flixel.util.FlxColor;