From 0c1a97d8d9ce1e3762f579d091516d4cb9a9ea24 Mon Sep 17 00:00:00 2001 From: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com> Date: Wed, 7 Jun 2023 10:32:10 +0000 Subject: [PATCH 1/3] Changing all the references from flash to openfl --- flixel/FlxCamera.hx | 16 ++++----- flixel/FlxG.hx | 12 +++---- flixel/FlxGame.hx | 12 +++---- flixel/FlxObject.hx | 2 +- flixel/FlxSprite.hx | 10 +++--- flixel/effects/particles/FlxEmitter.hx | 2 +- flixel/effects/postprocess/PostProcess.hx | 2 +- flixel/graphics/FlxGraphic.hx | 2 +- flixel/graphics/atlas/FlxAtlas.hx | 4 +-- flixel/graphics/frames/FlxAtlasFrames.hx | 2 +- flixel/graphics/frames/FlxBitmapFont.hx | 6 ++-- flixel/graphics/frames/FlxFilterFrames.hx | 6 ++-- flixel/graphics/frames/FlxFrame.hx | 6 ++-- flixel/graphics/frames/FlxTileFrames.hx | 4 +-- flixel/group/FlxSpriteGroup.hx | 4 +-- flixel/input/FlxAccelerometer.hx | 4 +-- flixel/input/FlxKeyManager.hx | 2 +- flixel/input/gamepad/FlxGamepad.hx | 4 +-- flixel/input/gamepad/FlxGamepadManager.hx | 6 ++-- flixel/input/keyboard/FlxKeyboard.hx | 2 +- flixel/input/mouse/FlxMouse.hx | 26 +++++++------- flixel/input/mouse/FlxMouseEventManager.hx | 2 +- flixel/input/touch/FlxTouch.hx | 2 +- flixel/input/touch/FlxTouchManager.hx | 8 ++--- flixel/math/FlxMath.hx | 2 +- flixel/math/FlxMatrix.hx | 2 +- flixel/math/FlxRect.hx | 2 +- flixel/path/FlxPath.hx | 2 +- flixel/sound/FlxSound.hx | 14 ++++---- flixel/system/FlxAssets.hx | 6 ++-- flixel/system/FlxBasePreloader.hx | 36 +++++++++---------- flixel/system/FlxPreloader.hx | 14 ++++---- flixel/system/FlxSplash.hx | 12 +++---- flixel/system/debug/DebuggerUtil.hx | 12 +++---- flixel/system/debug/FlxDebugger.hx | 16 ++++----- flixel/system/debug/Tooltip.hx | 12 +++---- flixel/system/debug/VCR.hx | 4 +-- flixel/system/debug/Window.hx | 16 ++++----- .../system/debug/interaction/Interaction.hx | 14 ++++---- .../system/debug/interaction/tools/Eraser.hx | 4 +-- .../system/debug/interaction/tools/Mover.hx | 4 +-- .../system/debug/interaction/tools/Pointer.hx | 6 ++-- flixel/system/debug/interaction/tools/Tool.hx | 4 +-- .../debug/interaction/tools/Transform.hx | 8 ++--- flixel/system/debug/log/BitmapLog.hx | 16 ++++----- flixel/system/debug/log/Log.hx | 4 +-- flixel/system/debug/stats/Stats.hx | 6 ++-- flixel/system/debug/stats/StatsGraph.hx | 10 +++--- flixel/system/debug/watch/Tracker.hx | 8 ++--- flixel/system/frontEnds/BitmapFrontEnd.hx | 2 +- flixel/system/frontEnds/BitmapLogFrontEnd.hx | 2 +- flixel/system/frontEnds/CameraFrontEnd.hx | 2 +- flixel/system/frontEnds/DebuggerFrontEnd.hx | 2 +- flixel/system/frontEnds/VCRFrontEnd.hx | 12 +++---- flixel/system/ui/FlxFocusLostScreen.hx | 4 +-- flixel/system/ui/FlxSoundTray.hx | 4 +-- flixel/system/ui/FlxSystemButton.hx | 10 +++--- flixel/text/FlxBitmapText.hx | 2 +- flixel/text/FlxText.hx | 12 +++---- flixel/tile/FlxTilemap.hx | 8 ++--- flixel/tile/FlxTilemapBuffer.hx | 6 ++-- flixel/ui/FlxBar.hx | 6 ++-- flixel/ui/FlxButton.hx | 2 +- flixel/util/FlxBitmapDataPool.hx | 4 +-- flixel/util/FlxBitmapDataUtil.hx | 6 ++-- flixel/util/FlxCollision.hx | 4 +-- flixel/util/FlxDestroyUtil.hx | 6 ++-- flixel/util/FlxGradient.hx | 18 +++++----- flixel/util/FlxSpriteUtil.hx | 26 +++++++------- flixel/util/FlxStringUtil.hx | 4 +-- tests/unit/src/FlxTest.hx | 2 +- tests/unit/src/TestMain.hx | 4 +-- tests/unit/src/flixel/FlxObjectTest.hx | 2 +- tests/unit/src/flixel/FlxSpriteTest.hx | 2 +- .../animation/FlxAnimationControllerTest.hx | 2 +- .../graphics/frames/FlxAtlasFramesTest.hx | 2 +- .../src/flixel/input/mouse/FlxMouseTest.hx | 4 +-- tests/unit/src/flixel/tile/FlxTilemapTest.hx | 4 +-- tests/unit/src/flixel/ui/FlxButtonTest.hx | 2 +- .../unit/src/flixel/util/FlxStringUtilTest.hx | 2 +- 80 files changed, 274 insertions(+), 274 deletions(-) diff --git a/flixel/FlxCamera.hx b/flixel/FlxCamera.hx index 6c0c9bb22c..c1b5afd0af 100644 --- a/flixel/FlxCamera.hx +++ b/flixel/FlxCamera.hx @@ -1,13 +1,13 @@ package flixel; -import flash.display.Bitmap; -import flash.display.BitmapData; -import flash.display.DisplayObject; -import flash.display.Graphics; -import flash.display.Sprite; -import flash.geom.ColorTransform; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.Bitmap; +import openfl.display.BitmapData; +import openfl.display.DisplayObject; +import openfl.display.Graphics; +import openfl.display.Sprite; +import openfl.geom.ColorTransform; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxFrame; import flixel.graphics.tile.FlxDrawBaseItem; diff --git a/flixel/FlxG.hx b/flixel/FlxG.hx index 2ba4e6a704..b3520f4b29 100644 --- a/flixel/FlxG.hx +++ b/flixel/FlxG.hx @@ -1,10 +1,10 @@ package flixel; -import flash.Lib; -import flash.display.DisplayObject; -import flash.display.Stage; -import flash.display.StageDisplayState; -import flash.net.URLRequest; +import openfl.Lib; +import openfl.display.DisplayObject; +import openfl.display.Stage; +import openfl.display.StageDisplayState; +import openfl.net.URLRequest; import flixel.effects.postprocess.PostProcess; import flixel.math.FlxMath; import flixel.math.FlxRandom; @@ -344,7 +344,7 @@ class FlxG stage.resize(Width, Height); #else #if air - var window = flash.desktop.NativeApplication.nativeApplication.activeWindow; + var window = openfl.desktop.NativeApplication.nativeApplication.activeWindow; window.width = Width; window.height = Height; #else diff --git a/flixel/FlxGame.hx b/flixel/FlxGame.hx index 1cfc7d368e..e7630f2a08 100644 --- a/flixel/FlxGame.hx +++ b/flixel/FlxGame.hx @@ -1,17 +1,17 @@ package flixel; -import flash.Lib; -import flash.display.Sprite; -import flash.display.StageAlign; -import flash.display.StageScaleMode; -import flash.events.Event; +import openfl.Lib; +import openfl.display.Sprite; +import openfl.display.StageAlign; +import openfl.display.StageScaleMode; +import openfl.events.Event; import flixel.graphics.tile.FlxDrawBaseItem; import flixel.system.FlxSplash; import flixel.util.FlxArrayUtil; import openfl.Assets; import openfl.filters.BitmapFilter; #if desktop -import flash.events.FocusEvent; +import openfl.events.FocusEvent; #end #if FLX_POST_PROCESS import flixel.effects.postprocess.PostProcess; diff --git a/flixel/FlxObject.hx b/flixel/FlxObject.hx index ea385cb7ca..b84b6e0278 100644 --- a/flixel/FlxObject.hx +++ b/flixel/FlxObject.hx @@ -1,6 +1,6 @@ package flixel; -import flash.display.Graphics; +import openfl.display.Graphics; import flixel.group.FlxGroup.FlxTypedGroup; import flixel.math.FlxPoint; import flixel.math.FlxRect; diff --git a/flixel/FlxSprite.hx b/flixel/FlxSprite.hx index 1690e604f3..c27e4a07cb 100644 --- a/flixel/FlxSprite.hx +++ b/flixel/FlxSprite.hx @@ -1,10 +1,10 @@ package flixel; -import flash.display.BitmapData; -import flash.display.BlendMode; -import flash.geom.ColorTransform; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.BitmapData; +import openfl.display.BlendMode; +import openfl.geom.ColorTransform; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.FlxBasic.IFlxBasic; import flixel.animation.FlxAnimationController; import flixel.graphics.FlxGraphic; diff --git a/flixel/effects/particles/FlxEmitter.hx b/flixel/effects/particles/FlxEmitter.hx index f98d24eb36..53021ab8ab 100644 --- a/flixel/effects/particles/FlxEmitter.hx +++ b/flixel/effects/particles/FlxEmitter.hx @@ -1,6 +1,6 @@ package flixel.effects.particles; -import flash.display.BlendMode; +import openfl.display.BlendMode; import flixel.FlxG; import flixel.FlxObject; import flixel.FlxSprite; diff --git a/flixel/effects/postprocess/PostProcess.hx b/flixel/effects/postprocess/PostProcess.hx index a833e1b766..84238ca55c 100644 --- a/flixel/effects/postprocess/PostProcess.hx +++ b/flixel/effects/postprocess/PostProcess.hx @@ -1,6 +1,6 @@ package flixel.effects.postprocess; -import flash.geom.Rectangle; +import openfl.geom.Rectangle; #if FLX_POST_PROCESS import flixel.FlxG; import openfl.Assets; diff --git a/flixel/graphics/FlxGraphic.hx b/flixel/graphics/FlxGraphic.hx index e9d8a701e1..b88d572ffd 100644 --- a/flixel/graphics/FlxGraphic.hx +++ b/flixel/graphics/FlxGraphic.hx @@ -1,6 +1,6 @@ package flixel.graphics; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.FlxG; import flixel.graphics.frames.FlxAtlasFrames; import flixel.graphics.frames.FlxFrame; diff --git a/flixel/graphics/atlas/FlxAtlas.hx b/flixel/graphics/atlas/FlxAtlas.hx index 49690096da..5f920a94e0 100644 --- a/flixel/graphics/atlas/FlxAtlas.hx +++ b/flixel/graphics/atlas/FlxAtlas.hx @@ -1,7 +1,7 @@ package flixel.graphics.atlas; -import flash.display.BitmapData; -import flash.geom.Point; +import openfl.display.BitmapData; +import openfl.geom.Point; import flixel.FlxG; import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxAtlasFrames; diff --git a/flixel/graphics/frames/FlxAtlasFrames.hx b/flixel/graphics/frames/FlxAtlasFrames.hx index bc0d106b4e..fa45f2923c 100644 --- a/flixel/graphics/frames/FlxAtlasFrames.hx +++ b/flixel/graphics/frames/FlxAtlasFrames.hx @@ -1,6 +1,6 @@ package flixel.graphics.frames; -import flash.geom.Rectangle; +import openfl.geom.Rectangle; import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxAtlasFrames; import flixel.graphics.frames.FlxFrame; diff --git a/flixel/graphics/frames/FlxBitmapFont.hx b/flixel/graphics/frames/FlxBitmapFont.hx index a50395eb06..76cb2316c1 100644 --- a/flixel/graphics/frames/FlxBitmapFont.hx +++ b/flixel/graphics/frames/FlxBitmapFont.hx @@ -1,8 +1,8 @@ package flixel.graphics.frames; -import flash.display.BitmapData; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.BitmapData; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.FlxG; import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxFrame.FlxFrameAngle; diff --git a/flixel/graphics/frames/FlxFilterFrames.hx b/flixel/graphics/frames/FlxFilterFrames.hx index cd71cefbca..c4373a7812 100644 --- a/flixel/graphics/frames/FlxFilterFrames.hx +++ b/flixel/graphics/frames/FlxFilterFrames.hx @@ -1,8 +1,8 @@ package flixel.graphics.frames; -import flash.display.BitmapData; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.BitmapData; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.FlxSprite; import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxFramesCollection.FlxFrameCollectionType; diff --git a/flixel/graphics/frames/FlxFrame.hx b/flixel/graphics/frames/FlxFrame.hx index 1ef5c0b680..5ffcb91b7f 100644 --- a/flixel/graphics/frames/FlxFrame.hx +++ b/flixel/graphics/frames/FlxFrame.hx @@ -1,8 +1,8 @@ package flixel.graphics.frames; -import flash.display.BitmapData; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.BitmapData; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.graphics.FlxGraphic; import flixel.math.FlxMatrix; import flixel.math.FlxPoint; diff --git a/flixel/graphics/frames/FlxTileFrames.hx b/flixel/graphics/frames/FlxTileFrames.hx index d08dcddeb9..d953f64280 100644 --- a/flixel/graphics/frames/FlxTileFrames.hx +++ b/flixel/graphics/frames/FlxTileFrames.hx @@ -1,7 +1,7 @@ package flixel.graphics.frames; -import flash.display.BitmapData; -import flash.geom.Point; +import openfl.display.BitmapData; +import openfl.geom.Point; import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxFramesCollection.FlxFrameCollectionType; import flixel.math.FlxPoint; diff --git a/flixel/group/FlxSpriteGroup.hx b/flixel/group/FlxSpriteGroup.hx index b6fcf43515..d876afb43e 100644 --- a/flixel/group/FlxSpriteGroup.hx +++ b/flixel/group/FlxSpriteGroup.hx @@ -1,7 +1,7 @@ package flixel.group; -import flash.display.BitmapData; -import flash.display.BlendMode; +import openfl.display.BitmapData; +import openfl.display.BlendMode; import flixel.FlxCamera; import flixel.FlxSprite; import flixel.graphics.frames.FlxFrame; diff --git a/flixel/input/FlxAccelerometer.hx b/flixel/input/FlxAccelerometer.hx index a242a1e6d0..4a2ac564cc 100644 --- a/flixel/input/FlxAccelerometer.hx +++ b/flixel/input/FlxAccelerometer.hx @@ -1,8 +1,8 @@ package flixel.input; #if FLX_ACCELEROMETER -import flash.events.AccelerometerEvent; -import flash.sensors.Accelerometer; +import openfl.events.AccelerometerEvent; +import openfl.sensors.Accelerometer; /** * A class providing access to the accelerometer data of the mobile device. diff --git a/flixel/input/FlxKeyManager.hx b/flixel/input/FlxKeyManager.hx index 21024df2c1..73ccc2aa34 100644 --- a/flixel/input/FlxKeyManager.hx +++ b/flixel/input/FlxKeyManager.hx @@ -1,6 +1,6 @@ package flixel.input; -import flash.events.KeyboardEvent; +import openfl.events.KeyboardEvent; import flixel.FlxG; import flixel.input.FlxInput.FlxInputState; import flixel.input.keyboard.FlxKey; diff --git a/flixel/input/gamepad/FlxGamepad.hx b/flixel/input/gamepad/FlxGamepad.hx index 25e8f4344f..a6a0005265 100644 --- a/flixel/input/gamepad/FlxGamepad.hx +++ b/flixel/input/gamepad/FlxGamepad.hx @@ -21,8 +21,8 @@ import flixel.math.FlxPoint; import flixel.util.FlxDestroyUtil; import flixel.util.FlxStringUtil; #if FLX_GAMEINPUT_API -import flash.ui.GameInputControl; -import flash.ui.GameInputDevice; +import openfl.ui.GameInputControl; +import openfl.ui.GameInputDevice; import flixel.math.FlxMath; #elseif FLX_JOYSTICK_API import flixel.math.FlxPoint; diff --git a/flixel/input/gamepad/FlxGamepadManager.hx b/flixel/input/gamepad/FlxGamepadManager.hx index 6067f1ea5b..79d9b8d401 100644 --- a/flixel/input/gamepad/FlxGamepadManager.hx +++ b/flixel/input/gamepad/FlxGamepadManager.hx @@ -9,9 +9,9 @@ import flixel.FlxG; import flixel.math.FlxPoint; import openfl.events.JoystickEvent; #elseif FLX_GAMEINPUT_API -import flash.ui.GameInput; -import flash.ui.GameInputDevice; -import flash.events.GameInputEvent; +import openfl.ui.GameInput; +import openfl.ui.GameInputDevice; +import openfl.events.GameInputEvent; using flixel.util.FlxStringUtil; #end diff --git a/flixel/input/keyboard/FlxKeyboard.hx b/flixel/input/keyboard/FlxKeyboard.hx index 430e199c45..6b5ba69a3f 100644 --- a/flixel/input/keyboard/FlxKeyboard.hx +++ b/flixel/input/keyboard/FlxKeyboard.hx @@ -1,7 +1,7 @@ package flixel.input.keyboard; #if FLX_KEYBOARD -import flash.events.KeyboardEvent; +import openfl.events.KeyboardEvent; import flixel.FlxG; import flixel.input.FlxInput; import flixel.system.replay.CodeValuePair; diff --git a/flixel/input/mouse/FlxMouse.hx b/flixel/input/mouse/FlxMouse.hx index af422c25a1..55b9785097 100644 --- a/flixel/input/mouse/FlxMouse.hx +++ b/flixel/input/mouse/FlxMouse.hx @@ -1,14 +1,14 @@ package flixel.input.mouse; #if FLX_MOUSE -import flash.display.Bitmap; -import flash.display.BitmapData; -import flash.display.Sprite; -import flash.display.Stage; -import flash.events.Event; -import flash.events.MouseEvent; -import flash.Lib; -import flash.ui.Mouse; +import openfl.display.Bitmap; +import openfl.display.BitmapData; +import openfl.display.Sprite; +import openfl.display.Stage; +import openfl.events.Event; +import openfl.events.MouseEvent; +import openfl.Lib; +import openfl.ui.Mouse; import flixel.FlxG; import flixel.input.IFlxInputManager; import flixel.input.FlxInput.FlxInputState; @@ -17,11 +17,11 @@ import flixel.system.FlxAssets; import flixel.system.replay.MouseRecord; import flixel.util.FlxDestroyUtil; #if FLX_NATIVE_CURSOR -import flash.Vector; -import flash.geom.Matrix; -import flash.geom.Point; -import flash.ui.MouseCursor; -import flash.ui.MouseCursorData; +import openfl.Vector; +import openfl.geom.Matrix; +import openfl.geom.Point; +import openfl.ui.MouseCursor; +import openfl.ui.MouseCursorData; #end @:bitmap("assets/images/ui/cursor.png") diff --git a/flixel/input/mouse/FlxMouseEventManager.hx b/flixel/input/mouse/FlxMouseEventManager.hx index 5f7ba387a1..8c10406ad1 100644 --- a/flixel/input/mouse/FlxMouseEventManager.hx +++ b/flixel/input/mouse/FlxMouseEventManager.hx @@ -1,7 +1,7 @@ package flixel.input.mouse; import haxe.ds.ArraySort; -import flash.errors.Error; +import openfl.errors.Error; import flixel.FlxBasic; import flixel.FlxCamera; import flixel.FlxG; diff --git a/flixel/input/touch/FlxTouch.hx b/flixel/input/touch/FlxTouch.hx index 684ec73833..d8f4751ea1 100644 --- a/flixel/input/touch/FlxTouch.hx +++ b/flixel/input/touch/FlxTouch.hx @@ -1,7 +1,7 @@ package flixel.input.touch; #if FLX_TOUCH -import flash.geom.Point; +import openfl.geom.Point; import flixel.FlxG; import flixel.input.FlxInput; import flixel.input.FlxSwipe; diff --git a/flixel/input/touch/FlxTouchManager.hx b/flixel/input/touch/FlxTouchManager.hx index c6b087b5e0..53aaff4c42 100644 --- a/flixel/input/touch/FlxTouchManager.hx +++ b/flixel/input/touch/FlxTouchManager.hx @@ -1,10 +1,10 @@ package flixel.input.touch; #if FLX_TOUCH -import flash.Lib; -import flash.events.TouchEvent; -import flash.ui.Multitouch; -import flash.ui.MultitouchInputMode; +import openfl.Lib; +import openfl.events.TouchEvent; +import openfl.ui.Multitouch; +import openfl.ui.MultitouchInputMode; /** * @author Zaphod diff --git a/flixel/math/FlxMath.hx b/flixel/math/FlxMath.hx index 4822ba172e..e912f1ecc6 100644 --- a/flixel/math/FlxMath.hx +++ b/flixel/math/FlxMath.hx @@ -1,6 +1,6 @@ package flixel.math; -import flash.geom.Rectangle; +import openfl.geom.Rectangle; import flixel.FlxG; import flixel.FlxSprite; #if FLX_TOUCH diff --git a/flixel/math/FlxMatrix.hx b/flixel/math/FlxMatrix.hx index ac391bcc79..26c3b7c881 100644 --- a/flixel/math/FlxMatrix.hx +++ b/flixel/math/FlxMatrix.hx @@ -1,6 +1,6 @@ package flixel.math; -import flash.geom.Matrix; +import openfl.geom.Matrix; /** * Helper class for making fast matrix calculations for rendering. diff --git a/flixel/math/FlxRect.hx b/flixel/math/FlxRect.hx index ceed61bb91..37ec57c3cb 100644 --- a/flixel/math/FlxRect.hx +++ b/flixel/math/FlxRect.hx @@ -1,6 +1,6 @@ package flixel.math; -import flash.geom.Rectangle; +import openfl.geom.Rectangle; import flixel.util.FlxPool; import flixel.util.FlxPool.IFlxPooled; import flixel.util.FlxStringUtil; diff --git a/flixel/path/FlxPath.hx b/flixel/path/FlxPath.hx index 88b74d31dc..5e5575327c 100644 --- a/flixel/path/FlxPath.hx +++ b/flixel/path/FlxPath.hx @@ -1,6 +1,6 @@ package flixel.path; -import flash.display.Graphics; +import openfl.display.Graphics; import flixel.FlxG; import flixel.FlxObject; import flixel.math.FlxPoint; diff --git a/flixel/sound/FlxSound.hx b/flixel/sound/FlxSound.hx index cf23f7142a..0ae17fc948 100644 --- a/flixel/sound/FlxSound.hx +++ b/flixel/sound/FlxSound.hx @@ -1,11 +1,11 @@ package flixel.sound; -import flash.events.IEventDispatcher; -import flash.events.Event; -import flash.media.Sound; -import flash.media.SoundChannel; -import flash.media.SoundTransform; -import flash.net.URLRequest; +import openfl.events.IEventDispatcher; +import openfl.events.Event; +import openfl.media.Sound; +import openfl.media.SoundChannel; +import openfl.media.SoundTransform; +import openfl.net.URLRequest; import flixel.FlxBasic; import flixel.FlxG; import flixel.math.FlxMath; @@ -15,7 +15,7 @@ import flixel.tweens.FlxTween; import flixel.util.FlxStringUtil; import openfl.Assets; #if flash11 -import flash.utils.ByteArray; +import openfl.utils.ByteArray; #end #if (openfl >= "8.0.0") import openfl.utils.AssetType; diff --git a/flixel/system/FlxAssets.hx b/flixel/system/FlxAssets.hx index 6d87503929..75b0fab470 100644 --- a/flixel/system/FlxAssets.hx +++ b/flixel/system/FlxAssets.hx @@ -2,9 +2,9 @@ package flixel.system; import haxe.macro.Expr; #if !macro -import flash.display.BitmapData; -import flash.display.Graphics; -import flash.media.Sound; +import openfl.display.BitmapData; +import openfl.display.Graphics; +import openfl.media.Sound; import flixel.FlxG; import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxAtlasFrames; diff --git a/flixel/system/FlxBasePreloader.hx b/flixel/system/FlxBasePreloader.hx index 8dca6d0e35..e41ca98969 100644 --- a/flixel/system/FlxBasePreloader.hx +++ b/flixel/system/FlxBasePreloader.hx @@ -1,23 +1,23 @@ package flixel.system; -import flash.Lib; -import flash.display.Bitmap; -import flash.display.BitmapData; -import flash.display.GradientType; -import flash.display.GraphicsPathWinding; -import flash.display.Shape; -import flash.display.Sprite; -import flash.display.StageAlign; -import flash.display.StageScaleMode; -import flash.events.Event; -import flash.events.ProgressEvent; -import flash.events.MouseEvent; -import flash.geom.Matrix; -import flash.geom.Rectangle; -import flash.net.URLRequest; -import flash.text.TextField; -import flash.text.TextFormat; -import flash.text.TextFormatAlign; +import openfl.Lib; +import openfl.display.Bitmap; +import openfl.display.BitmapData; +import openfl.display.GradientType; +import openfl.display.GraphicsPathWinding; +import openfl.display.Shape; +import openfl.display.Sprite; +import openfl.display.StageAlign; +import openfl.display.StageScaleMode; +import openfl.events.Event; +import openfl.events.ProgressEvent; +import openfl.events.MouseEvent; +import openfl.geom.Matrix; +import openfl.geom.Rectangle; +import openfl.net.URLRequest; +import openfl.text.TextField; +import openfl.text.TextFormat; +import openfl.text.TextFormatAlign; import flixel.util.FlxColor; import flixel.util.FlxStringUtil; import openfl.Vector; diff --git a/flixel/system/FlxPreloader.hx b/flixel/system/FlxPreloader.hx index 985ad248bb..172ce57ad2 100644 --- a/flixel/system/FlxPreloader.hx +++ b/flixel/system/FlxPreloader.hx @@ -1,12 +1,12 @@ package flixel.system; -import flash.display.Bitmap; -import flash.display.BitmapData; -import flash.display.BlendMode; -import flash.display.Sprite; -import flash.Lib; -import flash.text.TextField; -import flash.text.TextFormat; +import openfl.display.Bitmap; +import openfl.display.BitmapData; +import openfl.display.BlendMode; +import openfl.display.Sprite; +import openfl.Lib; +import openfl.text.TextField; +import openfl.text.TextFormat; import flixel.FlxG; @:keep @:bitmap("assets/images/preloader/light.png") diff --git a/flixel/system/FlxSplash.hx b/flixel/system/FlxSplash.hx index 745645aad6..8ff49d9f10 100644 --- a/flixel/system/FlxSplash.hx +++ b/flixel/system/FlxSplash.hx @@ -1,11 +1,11 @@ package flixel.system; -import flash.display.Graphics; -import flash.display.Sprite; -import flash.Lib; -import flash.text.TextField; -import flash.text.TextFormat; -import flash.text.TextFormatAlign; +import openfl.display.Graphics; +import openfl.display.Sprite; +import openfl.Lib; +import openfl.text.TextField; +import openfl.text.TextFormat; +import openfl.text.TextFormatAlign; import flixel.FlxG; import flixel.FlxState; import flixel.tweens.FlxEase; diff --git a/flixel/system/debug/DebuggerUtil.hx b/flixel/system/debug/DebuggerUtil.hx index 9e7184e90b..323bbc4942 100644 --- a/flixel/system/debug/DebuggerUtil.hx +++ b/flixel/system/debug/DebuggerUtil.hx @@ -1,14 +1,14 @@ package flixel.system.debug; -import flash.display.BitmapData; -import flash.text.TextField; -import flash.text.TextFieldAutoSize; -import flash.text.TextFormat; +import openfl.display.BitmapData; +import openfl.text.TextField; +import openfl.text.TextFieldAutoSize; +import openfl.text.TextFormat; import flixel.system.FlxAssets; import flixel.util.FlxColor; #if flash -import flash.text.AntiAliasType; -import flash.text.GridFitType; +import openfl.text.AntiAliasType; +import openfl.text.GridFitType; #end class DebuggerUtil diff --git a/flixel/system/debug/FlxDebugger.hx b/flixel/system/debug/FlxDebugger.hx index 5e1032f295..7e81462ce4 100644 --- a/flixel/system/debug/FlxDebugger.hx +++ b/flixel/system/debug/FlxDebugger.hx @@ -1,13 +1,13 @@ package flixel.system.debug; -import flash.display.BitmapData; -import flash.display.Sprite; -import flash.events.MouseEvent; -import flash.geom.Point; -import flash.geom.Rectangle; -import flash.text.TextField; -import flash.text.TextFieldAutoSize; -import flash.text.TextFormat; +import openfl.display.BitmapData; +import openfl.display.Sprite; +import openfl.events.MouseEvent; +import openfl.geom.Point; +import openfl.geom.Rectangle; +import openfl.text.TextField; +import openfl.text.TextFieldAutoSize; +import openfl.text.TextFormat; import openfl.display.DisplayObject; import flixel.FlxG; import flixel.system.debug.console.Console; diff --git a/flixel/system/debug/Tooltip.hx b/flixel/system/debug/Tooltip.hx index dece06e923..2090802b90 100644 --- a/flixel/system/debug/Tooltip.hx +++ b/flixel/system/debug/Tooltip.hx @@ -1,11 +1,11 @@ package flixel.system.debug; -import flash.display.Bitmap; -import flash.display.BitmapData; -import flash.display.Sprite; -import flash.events.MouseEvent; -import flash.geom.Point; -import flash.text.TextField; +import openfl.display.Bitmap; +import openfl.display.BitmapData; +import openfl.display.Sprite; +import openfl.events.MouseEvent; +import openfl.geom.Point; +import openfl.text.TextField; import flixel.FlxG; import flixel.util.FlxColor; import flixel.util.FlxDestroyUtil; diff --git a/flixel/system/debug/VCR.hx b/flixel/system/debug/VCR.hx index 236f593969..2b6dbd7e27 100644 --- a/flixel/system/debug/VCR.hx +++ b/flixel/system/debug/VCR.hx @@ -1,8 +1,8 @@ package flixel.system.debug; #if FLX_DEBUG -import flash.display.BitmapData; -import flash.text.TextField; +import openfl.display.BitmapData; +import openfl.text.TextField; import flixel.FlxG; import flixel.system.ui.FlxSystemButton; import flixel.system.debug.FlxDebugger.GraphicArrowRight; diff --git a/flixel/system/debug/Window.hx b/flixel/system/debug/Window.hx index ac181d2f1e..66d1737c04 100644 --- a/flixel/system/debug/Window.hx +++ b/flixel/system/debug/Window.hx @@ -1,13 +1,13 @@ package flixel.system.debug; -import flash.display.Bitmap; -import flash.display.BitmapData; -import flash.display.Sprite; -import flash.events.Event; -import flash.events.MouseEvent; -import flash.geom.Point; -import flash.geom.Rectangle; -import flash.text.TextField; +import openfl.display.Bitmap; +import openfl.display.BitmapData; +import openfl.display.Sprite; +import openfl.events.Event; +import openfl.events.MouseEvent; +import openfl.geom.Point; +import openfl.geom.Rectangle; +import openfl.text.TextField; import flixel.FlxG; import flixel.math.FlxMath; import flixel.system.debug.FlxDebugger.GraphicCloseButton; diff --git a/flixel/system/debug/interaction/Interaction.hx b/flixel/system/debug/interaction/Interaction.hx index 42bb755784..ec80918f94 100644 --- a/flixel/system/debug/interaction/Interaction.hx +++ b/flixel/system/debug/interaction/Interaction.hx @@ -1,12 +1,12 @@ package flixel.system.debug.interaction; -import flash.display.BitmapData; -import flash.display.Graphics; -import flash.display.Sprite; -import flash.display.DisplayObject; -import flash.events.KeyboardEvent; +import openfl.display.BitmapData; +import openfl.display.Graphics; +import openfl.display.Sprite; +import openfl.display.DisplayObject; +import openfl.events.KeyboardEvent; import flixel.FlxObject; -import flash.events.MouseEvent; +import openfl.events.MouseEvent; import flixel.group.FlxGroup.FlxTypedGroup; import flixel.input.FlxPointer; import flixel.math.FlxPoint; @@ -21,7 +21,7 @@ import flixel.system.debug.interaction.tools.Tool; import flixel.util.FlxDestroyUtil; import flixel.util.FlxSpriteUtil; #if !(FLX_NATIVE_CURSOR && FLX_MOUSE) -import flash.display.Bitmap; +import openfl.display.Bitmap; #end /** diff --git a/flixel/system/debug/interaction/tools/Eraser.hx b/flixel/system/debug/interaction/tools/Eraser.hx index 722c1887fa..e639265948 100644 --- a/flixel/system/debug/interaction/tools/Eraser.hx +++ b/flixel/system/debug/interaction/tools/Eraser.hx @@ -1,7 +1,7 @@ package flixel.system.debug.interaction.tools; -import flash.display.BitmapData; -import flash.ui.Keyboard; +import openfl.display.BitmapData; +import openfl.ui.Keyboard; import flixel.FlxBasic; import flixel.FlxG; import flixel.group.FlxGroup; diff --git a/flixel/system/debug/interaction/tools/Mover.hx b/flixel/system/debug/interaction/tools/Mover.hx index e1626f9352..6580d54df4 100644 --- a/flixel/system/debug/interaction/tools/Mover.hx +++ b/flixel/system/debug/interaction/tools/Mover.hx @@ -1,7 +1,7 @@ package flixel.system.debug.interaction.tools; -import flash.display.BitmapData; -import flash.ui.Keyboard; +import openfl.display.BitmapData; +import openfl.ui.Keyboard; import flixel.FlxObject; import flixel.math.FlxPoint; import flixel.system.debug.interaction.Interaction; diff --git a/flixel/system/debug/interaction/tools/Pointer.hx b/flixel/system/debug/interaction/tools/Pointer.hx index 017f353584..355df23cae 100644 --- a/flixel/system/debug/interaction/tools/Pointer.hx +++ b/flixel/system/debug/interaction/tools/Pointer.hx @@ -1,8 +1,8 @@ package flixel.system.debug.interaction.tools; -import flash.display.BitmapData; -import flash.display.Graphics; -import flash.ui.Keyboard; +import openfl.display.BitmapData; +import openfl.display.Graphics; +import openfl.ui.Keyboard; import flixel.FlxBasic; import flixel.math.FlxPoint; import flixel.math.FlxRect; diff --git a/flixel/system/debug/interaction/tools/Tool.hx b/flixel/system/debug/interaction/tools/Tool.hx index 82706af996..3e7a319151 100644 --- a/flixel/system/debug/interaction/tools/Tool.hx +++ b/flixel/system/debug/interaction/tools/Tool.hx @@ -1,7 +1,7 @@ package flixel.system.debug.interaction.tools; -import flash.display.BitmapData; -import flash.display.Sprite; +import openfl.display.BitmapData; +import openfl.display.Sprite; import flixel.system.debug.interaction.Interaction; import flixel.system.ui.FlxSystemButton; import flixel.util.FlxDestroyUtil.IFlxDestroyable; diff --git a/flixel/system/debug/interaction/tools/Transform.hx b/flixel/system/debug/interaction/tools/Transform.hx index fe4bda27b8..55b7c48d76 100644 --- a/flixel/system/debug/interaction/tools/Transform.hx +++ b/flixel/system/debug/interaction/tools/Transform.hx @@ -1,9 +1,9 @@ package flixel.system.debug.interaction.tools; -import flash.display.BitmapData; -import flash.display.Graphics; -import flash.display.LineScaleMode; -import flash.display.CapsStyle; +import openfl.display.BitmapData; +import openfl.display.Graphics; +import openfl.display.LineScaleMode; +import openfl.display.CapsStyle; import flixel.math.FlxPoint; import flixel.math.FlxRect; import flixel.math.FlxAngle; diff --git a/flixel/system/debug/log/BitmapLog.hx b/flixel/system/debug/log/BitmapLog.hx index 906199ab0c..a973d35c06 100644 --- a/flixel/system/debug/log/BitmapLog.hx +++ b/flixel/system/debug/log/BitmapLog.hx @@ -1,14 +1,14 @@ package flixel.system.debug.log; #if FLX_DEBUG -import flash.display.Bitmap; -import flash.display.BitmapData; -import flash.display.Graphics; -import flash.display.LineScaleMode; -import flash.display.Sprite; -import flash.events.MouseEvent; -import flash.geom.Matrix; -import flash.text.TextField; +import openfl.display.Bitmap; +import openfl.display.BitmapData; +import openfl.display.Graphics; +import openfl.display.LineScaleMode; +import openfl.display.Sprite; +import openfl.events.MouseEvent; +import openfl.geom.Matrix; +import openfl.text.TextField; import flixel.math.FlxMath; import flixel.math.FlxPoint; import flixel.system.ui.FlxSystemButton; diff --git a/flixel/system/debug/log/Log.hx b/flixel/system/debug/log/Log.hx index 1e9ba8b1ee..cad862e7f6 100644 --- a/flixel/system/debug/log/Log.hx +++ b/flixel/system/debug/log/Log.hx @@ -1,8 +1,8 @@ package flixel.system.debug.log; #if FLX_DEBUG -import flash.text.TextField; -import flash.text.TextFormat; +import openfl.text.TextField; +import openfl.text.TextFormat; import flixel.system.debug.FlxDebugger.GraphicLog; /** diff --git a/flixel/system/debug/stats/Stats.hx b/flixel/system/debug/stats/Stats.hx index 1f67cc3455..9eb13313c0 100644 --- a/flixel/system/debug/stats/Stats.hx +++ b/flixel/system/debug/stats/Stats.hx @@ -1,8 +1,8 @@ package flixel.system.debug.stats; -import flash.display.BitmapData; -import flash.system.System; -import flash.text.TextField; +import openfl.display.BitmapData; +import openfl.system.System; +import openfl.text.TextField; import flixel.FlxG; import flixel.math.FlxMath; import flixel.system.FlxLinkedList; diff --git a/flixel/system/debug/stats/StatsGraph.hx b/flixel/system/debug/stats/StatsGraph.hx index 63215005d3..8740afd193 100644 --- a/flixel/system/debug/stats/StatsGraph.hx +++ b/flixel/system/debug/stats/StatsGraph.hx @@ -1,10 +1,10 @@ package flixel.system.debug.stats; -import flash.display.Graphics; -import flash.display.Shape; -import flash.display.Sprite; -import flash.text.TextField; -import flash.text.TextFormatAlign; +import openfl.display.Graphics; +import openfl.display.Shape; +import openfl.display.Sprite; +import openfl.text.TextField; +import openfl.text.TextFormatAlign; import flixel.math.FlxMath; import flixel.util.FlxColor; import flixel.util.FlxDestroyUtil; diff --git a/flixel/system/debug/watch/Tracker.hx b/flixel/system/debug/watch/Tracker.hx index 51a521e47b..29c86db1e5 100644 --- a/flixel/system/debug/watch/Tracker.hx +++ b/flixel/system/debug/watch/Tracker.hx @@ -1,10 +1,10 @@ package flixel.system.debug.watch; #if FLX_DEBUG -import flash.display.DisplayObject; -import flash.geom.Matrix; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.DisplayObject; +import openfl.geom.Matrix; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.FlxBasic; import flixel.FlxCamera; import flixel.FlxG; diff --git a/flixel/system/frontEnds/BitmapFrontEnd.hx b/flixel/system/frontEnds/BitmapFrontEnd.hx index 4d82acc183..51fecd7459 100644 --- a/flixel/system/frontEnds/BitmapFrontEnd.hx +++ b/flixel/system/frontEnds/BitmapFrontEnd.hx @@ -1,6 +1,6 @@ package flixel.system.frontEnds; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxFrame; import flixel.math.FlxPoint; diff --git a/flixel/system/frontEnds/BitmapLogFrontEnd.hx b/flixel/system/frontEnds/BitmapLogFrontEnd.hx index 9a49b6bdbf..422278ad9e 100644 --- a/flixel/system/frontEnds/BitmapLogFrontEnd.hx +++ b/flixel/system/frontEnds/BitmapLogFrontEnd.hx @@ -1,6 +1,6 @@ package flixel.system.frontEnds; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.FlxG; /** diff --git a/flixel/system/frontEnds/CameraFrontEnd.hx b/flixel/system/frontEnds/CameraFrontEnd.hx index 32adf02775..82c026014b 100644 --- a/flixel/system/frontEnds/CameraFrontEnd.hx +++ b/flixel/system/frontEnds/CameraFrontEnd.hx @@ -1,6 +1,6 @@ package flixel.system.frontEnds; -import flash.geom.Rectangle; +import openfl.geom.Rectangle; import flixel.FlxCamera; import flixel.FlxG; import flixel.util.FlxAxes; diff --git a/flixel/system/frontEnds/DebuggerFrontEnd.hx b/flixel/system/frontEnds/DebuggerFrontEnd.hx index 964a6e6105..3eaf720b4b 100644 --- a/flixel/system/frontEnds/DebuggerFrontEnd.hx +++ b/flixel/system/frontEnds/DebuggerFrontEnd.hx @@ -1,6 +1,6 @@ package flixel.system.frontEnds; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.FlxG; import flixel.input.keyboard.FlxKey; import flixel.system.debug.FlxDebugger.FlxDebuggerLayout; diff --git a/flixel/system/frontEnds/VCRFrontEnd.hx b/flixel/system/frontEnds/VCRFrontEnd.hx index 9c05243ada..9f910e5b95 100644 --- a/flixel/system/frontEnds/VCRFrontEnd.hx +++ b/flixel/system/frontEnds/VCRFrontEnd.hx @@ -1,17 +1,17 @@ package flixel.system.frontEnds; -import flash.ui.Mouse; +import openfl.ui.Mouse; import flixel.FlxG; #if FLX_RECORD -import flash.events.Event; -import flash.events.IOErrorEvent; -import flash.utils.ByteArray; +import openfl.events.Event; +import openfl.events.IOErrorEvent; +import openfl.utils.ByteArray; import flixel.FlxState; import flixel.input.keyboard.FlxKey; import flixel.math.FlxRandom; #if flash -import flash.net.FileReference; -import flash.net.FileFilter; +import openfl.net.FileReference; +import openfl.net.FileFilter; #end #end diff --git a/flixel/system/ui/FlxFocusLostScreen.hx b/flixel/system/ui/FlxFocusLostScreen.hx index 185403a11a..f9fb2dbb5f 100644 --- a/flixel/system/ui/FlxFocusLostScreen.hx +++ b/flixel/system/ui/FlxFocusLostScreen.hx @@ -1,7 +1,7 @@ package flixel.system.ui; -import flash.display.Graphics; -import flash.display.Sprite; +import openfl.display.Graphics; +import openfl.display.Sprite; import flixel.FlxG; import flixel.system.FlxAssets; diff --git a/flixel/system/ui/FlxSoundTray.hx b/flixel/system/ui/FlxSoundTray.hx index e8cf168ba9..e0108818bd 100644 --- a/flixel/system/ui/FlxSoundTray.hx +++ b/flixel/system/ui/FlxSoundTray.hx @@ -12,8 +12,8 @@ import openfl.text.TextField; import openfl.text.TextFormat; import openfl.text.TextFormatAlign; #if flash -import flash.text.AntiAliasType; -import flash.text.GridFitType; +import openfl.text.AntiAliasType; +import openfl.text.GridFitType; #end /** diff --git a/flixel/system/ui/FlxSystemButton.hx b/flixel/system/ui/FlxSystemButton.hx index a90f4c42ad..ad761bfec7 100644 --- a/flixel/system/ui/FlxSystemButton.hx +++ b/flixel/system/ui/FlxSystemButton.hx @@ -1,14 +1,14 @@ package flixel.system.ui; -import flash.display.Bitmap; -import flash.display.BitmapData; -import flash.display.Sprite; -import flash.events.MouseEvent; +import openfl.display.Bitmap; +import openfl.display.BitmapData; +import openfl.display.Sprite; +import openfl.events.MouseEvent; import flixel.system.debug.DebuggerUtil; import flixel.util.FlxDestroyUtil.IFlxDestroyable; /** - * A basic button for the debugger, extends flash.display.Sprite. + * A basic button for the debugger, extends openfl.display.Sprite. * Cannot be used in a FlxState. */ class FlxSystemButton extends Sprite implements IFlxDestroyable diff --git a/flixel/text/FlxBitmapText.hx b/flixel/text/FlxBitmapText.hx index fc9dd34ecd..7be0dd8d89 100644 --- a/flixel/text/FlxBitmapText.hx +++ b/flixel/text/FlxBitmapText.hx @@ -1,6 +1,6 @@ package flixel.text; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.FlxBasic; import flixel.FlxG; import flixel.FlxSprite; diff --git a/flixel/text/FlxText.hx b/flixel/text/FlxText.hx index ebc64d1b61..80eeac8a2b 100644 --- a/flixel/text/FlxText.hx +++ b/flixel/text/FlxText.hx @@ -1,11 +1,11 @@ package flixel.text; -import flash.display.BitmapData; -import flash.geom.ColorTransform; -import flash.text.TextField; -import flash.text.TextFieldAutoSize; -import flash.text.TextFormat; -import flash.text.TextFormatAlign; +import openfl.display.BitmapData; +import openfl.geom.ColorTransform; +import openfl.text.TextField; +import openfl.text.TextFieldAutoSize; +import openfl.text.TextFormat; +import openfl.text.TextFormatAlign; import flixel.FlxG; import flixel.FlxSprite; import flixel.graphics.FlxGraphic; diff --git a/flixel/tile/FlxTilemap.hx b/flixel/tile/FlxTilemap.hx index 13a4dd2c58..6e4237f082 100644 --- a/flixel/tile/FlxTilemap.hx +++ b/flixel/tile/FlxTilemap.hx @@ -1,9 +1,9 @@ package flixel.tile; -import flash.display.BitmapData; -import flash.display.Graphics; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.BitmapData; +import openfl.display.Graphics; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.FlxBasic; import flixel.FlxCamera; import flixel.FlxG; diff --git a/flixel/tile/FlxTilemapBuffer.hx b/flixel/tile/FlxTilemapBuffer.hx index dcd8a6f5ab..c34c66bb4d 100644 --- a/flixel/tile/FlxTilemapBuffer.hx +++ b/flixel/tile/FlxTilemapBuffer.hx @@ -1,8 +1,8 @@ package flixel.tile; -import flash.display.BitmapData; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.BitmapData; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.FlxCamera; import flixel.FlxG; import flixel.math.FlxMatrix; diff --git a/flixel/ui/FlxBar.hx b/flixel/ui/FlxBar.hx index 6711324a4e..e1f648d3a8 100644 --- a/flixel/ui/FlxBar.hx +++ b/flixel/ui/FlxBar.hx @@ -1,8 +1,8 @@ package flixel.ui; -import flash.display.BitmapData; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.BitmapData; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.FlxG; import flixel.FlxSprite; import flixel.graphics.FlxGraphic; diff --git a/flixel/ui/FlxButton.hx b/flixel/ui/FlxButton.hx index 239ec164a3..d72800f480 100644 --- a/flixel/ui/FlxButton.hx +++ b/flixel/ui/FlxButton.hx @@ -1,6 +1,6 @@ package flixel.ui; -import flash.events.MouseEvent; +import openfl.events.MouseEvent; import flixel.FlxG; import flixel.FlxSprite; import flixel.graphics.atlas.FlxAtlas; diff --git a/flixel/util/FlxBitmapDataPool.hx b/flixel/util/FlxBitmapDataPool.hx index c9cafdf34e..fe864c52be 100644 --- a/flixel/util/FlxBitmapDataPool.hx +++ b/flixel/util/FlxBitmapDataPool.hx @@ -1,7 +1,7 @@ package flixel.util; -import flash.display.BitmapData; -import flash.geom.Rectangle; +import openfl.display.BitmapData; +import openfl.geom.Rectangle; /** * BitmapData pool class. diff --git a/flixel/util/FlxBitmapDataUtil.hx b/flixel/util/FlxBitmapDataUtil.hx index e6a8da2b8e..59c2da0cad 100644 --- a/flixel/util/FlxBitmapDataUtil.hx +++ b/flixel/util/FlxBitmapDataUtil.hx @@ -1,8 +1,8 @@ package flixel.util; -import flash.display.BitmapData; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.BitmapData; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.math.FlxAngle; import flixel.math.FlxMatrix; import flixel.math.FlxPoint; diff --git a/flixel/util/FlxCollision.hx b/flixel/util/FlxCollision.hx index 227d7dc689..e4e7113040 100644 --- a/flixel/util/FlxCollision.hx +++ b/flixel/util/FlxCollision.hx @@ -1,7 +1,7 @@ package flixel.util; -import flash.display.BitmapData; -import flash.geom.Rectangle; +import openfl.display.BitmapData; +import openfl.geom.Rectangle; import flixel.FlxCamera; import flixel.FlxG; import flixel.FlxSprite; diff --git a/flixel/util/FlxDestroyUtil.hx b/flixel/util/FlxDestroyUtil.hx index 6b83a4bca9..039fd15117 100644 --- a/flixel/util/FlxDestroyUtil.hx +++ b/flixel/util/FlxDestroyUtil.hx @@ -1,8 +1,8 @@ package flixel.util; -import flash.display.BitmapData; -import flash.display.DisplayObject; -import flash.display.DisplayObjectContainer; +import openfl.display.BitmapData; +import openfl.display.DisplayObject; +import openfl.display.DisplayObjectContainer; import flixel.util.FlxPool.IFlxPooled; class FlxDestroyUtil diff --git a/flixel/util/FlxGradient.hx b/flixel/util/FlxGradient.hx index 7a50c0fb36..ceac414fe2 100644 --- a/flixel/util/FlxGradient.hx +++ b/flixel/util/FlxGradient.hx @@ -1,14 +1,14 @@ package flixel.util; -import flash.display.Bitmap; -import flash.display.BitmapData; -import flash.display.GradientType; -import flash.display.InterpolationMethod; -import flash.display.Shape; -import flash.display.SpreadMethod; -import flash.geom.Matrix; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.Bitmap; +import openfl.display.BitmapData; +import openfl.display.GradientType; +import openfl.display.InterpolationMethod; +import openfl.display.Shape; +import openfl.display.SpreadMethod; +import openfl.geom.Matrix; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.math.FlxAngle; /** diff --git a/flixel/util/FlxSpriteUtil.hx b/flixel/util/FlxSpriteUtil.hx index 654d2e25f0..89c7c19294 100644 --- a/flixel/util/FlxSpriteUtil.hx +++ b/flixel/util/FlxSpriteUtil.hx @@ -1,17 +1,17 @@ package flixel.util; -import flash.display.BitmapData; -import flash.display.BitmapDataChannel; -import flash.display.BlendMode; -import flash.display.CapsStyle; -import flash.display.Graphics; -import flash.display.JointStyle; -import flash.display.LineScaleMode; -import flash.display.Sprite; -import flash.geom.ColorTransform; -import flash.geom.Matrix; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.BitmapData; +import openfl.display.BitmapDataChannel; +import openfl.display.BlendMode; +import openfl.display.CapsStyle; +import openfl.display.Graphics; +import openfl.display.JointStyle; +import openfl.display.LineScaleMode; +import openfl.display.Sprite; +import openfl.geom.ColorTransform; +import openfl.geom.Matrix; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.FlxG; import flixel.FlxObject; import flixel.FlxSprite; @@ -28,7 +28,7 @@ import flixel.tweens.FlxTween; /** * Some handy functions for FlxSprite (FlxObject) manipulation, mostly drawing-related. * Note that stage quality impacts the results of the draw() functions - - * use FlxG.stage.quality = flash.display.StageQuality.BEST; for best results. + * use FlxG.stage.quality = openfl.display.StageQuality.BEST; for best results. */ class FlxSpriteUtil { diff --git a/flixel/util/FlxStringUtil.hx b/flixel/util/FlxStringUtil.hx index 2f8e774d42..950242f8f2 100644 --- a/flixel/util/FlxStringUtil.hx +++ b/flixel/util/FlxStringUtil.hx @@ -1,6 +1,6 @@ package flixel.util; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.FlxG; import flixel.math.FlxMath; import flixel.system.FlxAssets; @@ -10,7 +10,7 @@ import flixel.util.typeLimit.OneOfTwo; using StringTools; #if flash -import flash.geom.Matrix; +import openfl.geom.Matrix; #end /** diff --git a/tests/unit/src/FlxTest.hx b/tests/unit/src/FlxTest.hx index a49dfe345f..e76c30ce6e 100644 --- a/tests/unit/src/FlxTest.hx +++ b/tests/unit/src/FlxTest.hx @@ -1,6 +1,6 @@ package; -import flash.errors.Error; +import openfl.errors.Error; import flixel.FlxG; import flixel.FlxState; import flixel.tweens.FlxTween; diff --git a/tests/unit/src/TestMain.hx b/tests/unit/src/TestMain.hx index 162e87e618..bc092e7186 100644 --- a/tests/unit/src/TestMain.hx +++ b/tests/unit/src/TestMain.hx @@ -1,6 +1,6 @@ package; -import flash.Lib; +import openfl.Lib; import flixel.FlxGame; import flixel.FlxState; import massive.munit.TestRunner; @@ -50,7 +50,7 @@ class TestMain try { #if flash - flash.external.ExternalInterface.call("testResult", successful); + openfl.external.ExternalInterface.call("testResult", successful); #elseif js js.Lib.eval("testResult(" + successful + ");"); #elseif sys diff --git a/tests/unit/src/flixel/FlxObjectTest.hx b/tests/unit/src/flixel/FlxObjectTest.hx index a73a4506f7..292048bba0 100644 --- a/tests/unit/src/flixel/FlxObjectTest.hx +++ b/tests/unit/src/flixel/FlxObjectTest.hx @@ -1,6 +1,6 @@ package flixel; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.graphics.FlxGraphic; import flixel.math.FlxPoint; import flixel.math.FlxMath; diff --git a/tests/unit/src/flixel/FlxSpriteTest.hx b/tests/unit/src/flixel/FlxSpriteTest.hx index c350539c25..b462763c43 100644 --- a/tests/unit/src/flixel/FlxSpriteTest.hx +++ b/tests/unit/src/flixel/FlxSpriteTest.hx @@ -1,6 +1,6 @@ package flixel; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.animation.FlxAnimation; import flixel.graphics.atlas.FlxAtlas; import flixel.math.FlxRect; diff --git a/tests/unit/src/flixel/animation/FlxAnimationControllerTest.hx b/tests/unit/src/flixel/animation/FlxAnimationControllerTest.hx index 2be3369ec1..e3682dbec8 100644 --- a/tests/unit/src/flixel/animation/FlxAnimationControllerTest.hx +++ b/tests/unit/src/flixel/animation/FlxAnimationControllerTest.hx @@ -1,6 +1,6 @@ package flixel.animation; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.FlxSprite; import massive.munit.Assert; diff --git a/tests/unit/src/flixel/graphics/frames/FlxAtlasFramesTest.hx b/tests/unit/src/flixel/graphics/frames/FlxAtlasFramesTest.hx index fe134c0dd1..77026ee421 100644 --- a/tests/unit/src/flixel/graphics/frames/FlxAtlasFramesTest.hx +++ b/tests/unit/src/flixel/graphics/frames/FlxAtlasFramesTest.hx @@ -1,6 +1,6 @@ package flixel.graphics.frames; -import flash.display.BitmapData; +import openfl.display.BitmapData; import haxe.Json; import massive.munit.Assert; diff --git a/tests/unit/src/flixel/input/mouse/FlxMouseTest.hx b/tests/unit/src/flixel/input/mouse/FlxMouseTest.hx index d9cfcaf732..2544ee0889 100644 --- a/tests/unit/src/flixel/input/mouse/FlxMouseTest.hx +++ b/tests/unit/src/flixel/input/mouse/FlxMouseTest.hx @@ -1,8 +1,8 @@ package flixel.input.mouse; #if FLX_NATIVE_CURSOR -import flash.ui.Mouse; -import flash.ui.MouseCursor; +import openfl.ui.Mouse; +import openfl.ui.MouseCursor; #end import massive.munit.Assert; diff --git a/tests/unit/src/flixel/tile/FlxTilemapTest.hx b/tests/unit/src/flixel/tile/FlxTilemapTest.hx index 86bdcf2857..94a2f3f0e0 100644 --- a/tests/unit/src/flixel/tile/FlxTilemapTest.hx +++ b/tests/unit/src/flixel/tile/FlxTilemapTest.hx @@ -1,7 +1,7 @@ package flixel.tile; -import flash.display.BitmapData; -import flash.errors.ArgumentError; +import openfl.display.BitmapData; +import openfl.errors.ArgumentError; import flixel.math.FlxPoint; import flixel.util.FlxColor; import haxe.PosInfos; diff --git a/tests/unit/src/flixel/ui/FlxButtonTest.hx b/tests/unit/src/flixel/ui/FlxButtonTest.hx index 2cb4d5024f..b00eb88b30 100644 --- a/tests/unit/src/flixel/ui/FlxButtonTest.hx +++ b/tests/unit/src/flixel/ui/FlxButtonTest.hx @@ -1,6 +1,6 @@ package flixel.ui; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.FlxSprite; import massive.munit.Assert; diff --git a/tests/unit/src/flixel/util/FlxStringUtilTest.hx b/tests/unit/src/flixel/util/FlxStringUtilTest.hx index 951e0d5eb4..98fe674d74 100644 --- a/tests/unit/src/flixel/util/FlxStringUtilTest.hx +++ b/tests/unit/src/flixel/util/FlxStringUtilTest.hx @@ -1,6 +1,6 @@ package flixel.util; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.system.debug.FlxDebugger.FlxDebuggerLayout; import massive.munit.Assert; From 110d1ac7688faa7ae5b2474c7a577d4a0da4a3b8 Mon Sep 17 00:00:00 2001 From: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com> Date: Wed, 7 Jun 2023 13:38:05 +0300 Subject: [PATCH 2/3] This should be changed to openfl? Idk --- flixel/FlxG.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flixel/FlxG.hx b/flixel/FlxG.hx index b3520f4b29..54ba022bb1 100644 --- a/flixel/FlxG.hx +++ b/flixel/FlxG.hx @@ -344,7 +344,7 @@ class FlxG stage.resize(Width, Height); #else #if air - var window = openfl.desktop.NativeApplication.nativeApplication.activeWindow; + var window = flash.desktop.NativeApplication.nativeApplication.activeWindow; window.width = Width; window.height = Height; #else From ea5ece7fa2ae602a6f83ea6bce7969ec4df8718c Mon Sep 17 00:00:00 2001 From: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com> Date: Wed, 7 Jun 2023 19:16:36 +0000 Subject: [PATCH 3/3] openfl.ui.MouseCursorData -> flash.ui.MouseCursorData --- flixel/input/mouse/FlxMouse.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flixel/input/mouse/FlxMouse.hx b/flixel/input/mouse/FlxMouse.hx index 55b9785097..b06076c640 100644 --- a/flixel/input/mouse/FlxMouse.hx +++ b/flixel/input/mouse/FlxMouse.hx @@ -21,7 +21,7 @@ import openfl.Vector; import openfl.geom.Matrix; import openfl.geom.Point; import openfl.ui.MouseCursor; -import openfl.ui.MouseCursorData; +import flash.ui.MouseCursorData; #end @:bitmap("assets/images/ui/cursor.png")