From d2556e9c13392c536aa9eeb88a49cd10c13d6c3d Mon Sep 17 00:00:00 2001 From: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com> Date: Mon, 7 Aug 2023 18:08:09 +0300 Subject: [PATCH] Switched `flash` imports to `openfl` were is possible. (#400) * Switch `flash` imports to `openfl`. * Some classes that actually require flash --- flixel/addons/api/FlxGameJolt.hx | 14 +++++++------- flixel/addons/display/FlxGridOverlay.hx | 6 +++--- flixel/addons/display/FlxNestedSprite.hx | 2 +- flixel/addons/display/FlxSpriteAniRot.hx | 6 +++--- flixel/addons/display/shapes/FlxShape.hx | 4 ++-- flixel/addons/display/shapes/FlxShapeArrow.hx | 2 +- flixel/addons/display/shapes/FlxShapeBox.hx | 6 +++--- flixel/addons/display/shapes/FlxShapeCircle.hx | 2 +- flixel/addons/display/shapes/FlxShapeCross.hx | 2 +- flixel/addons/display/shapes/FlxShapeDonut.hx | 8 ++++---- .../addons/display/shapes/FlxShapeDoubleCircle.hx | 2 +- flixel/addons/display/shapes/FlxShapeGrid.hx | 2 +- flixel/addons/display/shapes/FlxShapeLightning.hx | 6 +++--- flixel/addons/display/shapes/FlxShapeLine.hx | 2 +- .../addons/display/shapes/FlxShapeSquareDonut.hx | 4 ++-- flixel/addons/editors/tiled/TiledLayer.hx | 2 +- flixel/addons/editors/tiled/TiledTileLayer.hx | 2 +- flixel/addons/editors/tiled/TiledTileSet.hx | 2 +- flixel/addons/effects/FlxClothSprite.hx | 2 +- flixel/addons/effects/FlxSkewedSprite.hx | 2 +- flixel/addons/effects/FlxTrailArea.hx | 12 ++++++------ flixel/addons/nape/FlxNapeSpace.hx | 2 +- flixel/addons/plugin/FlxScrollingText.hx | 6 +++--- flixel/addons/plugin/control/FlxControlHandler.hx | 2 +- flixel/addons/plugin/screengrab/FlxScreenGrab.hx | 14 +++++++------- flixel/addons/text/FlxTextField.hx | 2 +- flixel/addons/text/FlxTypeText.hx | 2 +- flixel/addons/tile/FlxTileSpecial.hx | 6 +++--- flixel/addons/tile/FlxTilemapExt.hx | 2 +- flixel/addons/transition/TransitionFade.hx | 2 +- flixel/addons/transition/TransitionTiles.hx | 2 +- flixel/addons/ui/FlxButtonPlus.hx | 6 +++--- flixel/addons/ui/FlxClickArea.hx | 8 ++++---- flixel/addons/util/PNGEncoder.hx | 6 +++--- 34 files changed, 75 insertions(+), 75 deletions(-) diff --git a/flixel/addons/api/FlxGameJolt.hx b/flixel/addons/api/FlxGameJolt.hx index a480353e..7b5cd9cd 100644 --- a/flixel/addons/api/FlxGameJolt.hx +++ b/flixel/addons/api/FlxGameJolt.hx @@ -1,12 +1,12 @@ package flixel.addons.api; -import flash.display.Loader; -import flash.display.BitmapData; -import flash.events.Event; -import flash.events.IOErrorEvent; -import flash.net.URLLoader; -import flash.net.URLRequest; -import flash.net.URLRequestMethod; +import openfl.display.Loader; +import openfl.display.BitmapData; +import openfl.events.Event; +import openfl.events.IOErrorEvent; +import openfl.net.URLLoader; +import openfl.net.URLRequest; +import openfl.net.URLRequestMethod; import haxe.crypto.Md5; import haxe.crypto.Sha1; import flixel.FlxG; diff --git a/flixel/addons/display/FlxGridOverlay.hx b/flixel/addons/display/FlxGridOverlay.hx index 9bb6dffe..949ea9f9 100644 --- a/flixel/addons/display/FlxGridOverlay.hx +++ b/flixel/addons/display/FlxGridOverlay.hx @@ -1,8 +1,8 @@ package flixel.addons.display; -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.util.FlxColor; diff --git a/flixel/addons/display/FlxNestedSprite.hx b/flixel/addons/display/FlxNestedSprite.hx index fe343738..3aed5722 100644 --- a/flixel/addons/display/FlxNestedSprite.hx +++ b/flixel/addons/display/FlxNestedSprite.hx @@ -1,6 +1,6 @@ package flixel.addons.display; -import flash.geom.ColorTransform; +import openfl.geom.ColorTransform; import flixel.FlxBasic; import flixel.FlxG; import flixel.FlxSprite; diff --git a/flixel/addons/display/FlxSpriteAniRot.hx b/flixel/addons/display/FlxSpriteAniRot.hx index 498b40c7..200dff35 100644 --- a/flixel/addons/display/FlxSpriteAniRot.hx +++ b/flixel/addons/display/FlxSpriteAniRot.hx @@ -1,8 +1,8 @@ package flixel.addons.display; -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.FlxFrame; diff --git a/flixel/addons/display/shapes/FlxShape.hx b/flixel/addons/display/shapes/FlxShape.hx index b2276df3..7f69e273 100644 --- a/flixel/addons/display/shapes/FlxShape.hx +++ b/flixel/addons/display/shapes/FlxShape.hx @@ -1,7 +1,7 @@ package flixel.addons.display.shapes; -import flash.display.BlendMode; -import flash.geom.Matrix; +import openfl.display.BlendMode; +import openfl.geom.Matrix; import flixel.FlxSprite; import flixel.util.FlxColor; import flixel.util.FlxSpriteUtil.DrawStyle; diff --git a/flixel/addons/display/shapes/FlxShapeArrow.hx b/flixel/addons/display/shapes/FlxShapeArrow.hx index c31a2ec5..85913196 100644 --- a/flixel/addons/display/shapes/FlxShapeArrow.hx +++ b/flixel/addons/display/shapes/FlxShapeArrow.hx @@ -1,6 +1,6 @@ package flixel.addons.display.shapes; -import flash.geom.Matrix; +import openfl.geom.Matrix; import flixel.FlxG; import flixel.util.FlxColor; import flixel.util.FlxDestroyUtil; diff --git a/flixel/addons/display/shapes/FlxShapeBox.hx b/flixel/addons/display/shapes/FlxShapeBox.hx index 0ce03638..ea0a27cb 100644 --- a/flixel/addons/display/shapes/FlxShapeBox.hx +++ b/flixel/addons/display/shapes/FlxShapeBox.hx @@ -1,8 +1,8 @@ package flixel.addons.display.shapes; -import flash.display.BitmapData; -import flash.display.Shape; -import flash.geom.Matrix; +import openfl.display.BitmapData; +import openfl.display.Shape; +import openfl.geom.Matrix; import flixel.util.FlxColor; import flixel.util.FlxSpriteUtil; import flixel.util.FlxSpriteUtil.LineStyle; diff --git a/flixel/addons/display/shapes/FlxShapeCircle.hx b/flixel/addons/display/shapes/FlxShapeCircle.hx index 20d4ddfd..060158ee 100644 --- a/flixel/addons/display/shapes/FlxShapeCircle.hx +++ b/flixel/addons/display/shapes/FlxShapeCircle.hx @@ -1,6 +1,6 @@ package flixel.addons.display.shapes; -import flash.geom.Matrix; +import openfl.geom.Matrix; import flixel.util.FlxColor; import flixel.util.FlxSpriteUtil; diff --git a/flixel/addons/display/shapes/FlxShapeCross.hx b/flixel/addons/display/shapes/FlxShapeCross.hx index 22629b77..b46d8fcf 100644 --- a/flixel/addons/display/shapes/FlxShapeCross.hx +++ b/flixel/addons/display/shapes/FlxShapeCross.hx @@ -1,6 +1,6 @@ package flixel.addons.display.shapes; -import flash.geom.Matrix; +import openfl.geom.Matrix; import flixel.util.FlxColor; import flixel.math.FlxPoint; import flixel.util.FlxSpriteUtil; diff --git a/flixel/addons/display/shapes/FlxShapeDonut.hx b/flixel/addons/display/shapes/FlxShapeDonut.hx index dec63dfc..5647f602 100644 --- a/flixel/addons/display/shapes/FlxShapeDonut.hx +++ b/flixel/addons/display/shapes/FlxShapeDonut.hx @@ -1,9 +1,9 @@ package flixel.addons.display.shapes; -import flash.display.BitmapData; -import flash.display.BlendMode; -import flash.display.Shape; -import flash.geom.Matrix; +import openfl.display.BitmapData; +import openfl.display.BlendMode; +import openfl.display.Shape; +import openfl.geom.Matrix; import flixel.FlxSprite; import flixel.util.FlxColor; import flixel.util.FlxSpriteUtil; diff --git a/flixel/addons/display/shapes/FlxShapeDoubleCircle.hx b/flixel/addons/display/shapes/FlxShapeDoubleCircle.hx index 1e99b2ed..3d9967ad 100644 --- a/flixel/addons/display/shapes/FlxShapeDoubleCircle.hx +++ b/flixel/addons/display/shapes/FlxShapeDoubleCircle.hx @@ -1,6 +1,6 @@ package flixel.addons.display.shapes; -import flash.geom.Matrix; +import openfl.geom.Matrix; import flixel.util.FlxColor; import flixel.util.FlxSpriteUtil; diff --git a/flixel/addons/display/shapes/FlxShapeGrid.hx b/flixel/addons/display/shapes/FlxShapeGrid.hx index 4c98f9eb..1b288937 100644 --- a/flixel/addons/display/shapes/FlxShapeGrid.hx +++ b/flixel/addons/display/shapes/FlxShapeGrid.hx @@ -1,6 +1,6 @@ package flixel.addons.display.shapes; -import flash.geom.Matrix; +import openfl.geom.Matrix; import flixel.util.FlxColor; import flixel.util.FlxSpriteUtil; diff --git a/flixel/addons/display/shapes/FlxShapeLightning.hx b/flixel/addons/display/shapes/FlxShapeLightning.hx index d841c2a3..93748b29 100644 --- a/flixel/addons/display/shapes/FlxShapeLightning.hx +++ b/flixel/addons/display/shapes/FlxShapeLightning.hx @@ -1,8 +1,8 @@ package flixel.addons.display.shapes; -import flash.display.BitmapData; -import flash.filters.GlowFilter; -import flash.geom.Matrix; +import openfl.display.BitmapData; +import openfl.filters.GlowFilter; +import openfl.geom.Matrix; import flixel.FlxG; import flixel.util.FlxColor; import flixel.math.FlxPoint; diff --git a/flixel/addons/display/shapes/FlxShapeLine.hx b/flixel/addons/display/shapes/FlxShapeLine.hx index 762d0fa0..cf0bfb38 100644 --- a/flixel/addons/display/shapes/FlxShapeLine.hx +++ b/flixel/addons/display/shapes/FlxShapeLine.hx @@ -1,6 +1,6 @@ package flixel.addons.display.shapes; -import flash.geom.Matrix; +import openfl.geom.Matrix; import flixel.math.FlxPoint; import flixel.util.FlxColor; import flixel.util.FlxDestroyUtil; diff --git a/flixel/addons/display/shapes/FlxShapeSquareDonut.hx b/flixel/addons/display/shapes/FlxShapeSquareDonut.hx index 6db2cdee..bed4ec6a 100644 --- a/flixel/addons/display/shapes/FlxShapeSquareDonut.hx +++ b/flixel/addons/display/shapes/FlxShapeSquareDonut.hx @@ -1,7 +1,7 @@ package flixel.addons.display.shapes; -import flash.display.BlendMode; -import flash.geom.Matrix; +import openfl.display.BlendMode; +import openfl.geom.Matrix; import flixel.util.FlxColor; import flixel.util.FlxSpriteUtil; diff --git a/flixel/addons/editors/tiled/TiledLayer.hx b/flixel/addons/editors/tiled/TiledLayer.hx index 6fc41945..ca39fe80 100644 --- a/flixel/addons/editors/tiled/TiledLayer.hx +++ b/flixel/addons/editors/tiled/TiledLayer.hx @@ -1,6 +1,6 @@ package flixel.addons.editors.tiled; -import flash.utils.ByteArray; +import openfl.utils.ByteArray; import haxe.xml.Access; /** diff --git a/flixel/addons/editors/tiled/TiledTileLayer.hx b/flixel/addons/editors/tiled/TiledTileLayer.hx index 870012bc..101c0ef1 100644 --- a/flixel/addons/editors/tiled/TiledTileLayer.hx +++ b/flixel/addons/editors/tiled/TiledTileLayer.hx @@ -1,6 +1,6 @@ package flixel.addons.editors.tiled; -import flash.utils.Endian; +import openfl.utils.Endian; import flixel.addons.editors.tiled.TiledLayer.TiledLayerType; import openfl.utils.ByteArray; import haxe.xml.Access; diff --git a/flixel/addons/editors/tiled/TiledTileSet.hx b/flixel/addons/editors/tiled/TiledTileSet.hx index 8ad61c65..18c555d8 100644 --- a/flixel/addons/editors/tiled/TiledTileSet.hx +++ b/flixel/addons/editors/tiled/TiledTileSet.hx @@ -1,6 +1,6 @@ package flixel.addons.editors.tiled; -import flash.geom.Rectangle; +import openfl.geom.Rectangle; import flixel.util.typeLimit.OneOfTwo; import openfl.Assets; import openfl.utils.ByteArray; diff --git a/flixel/addons/effects/FlxClothSprite.hx b/flixel/addons/effects/FlxClothSprite.hx index 6cb07bf8..500d1677 100644 --- a/flixel/addons/effects/FlxClothSprite.hx +++ b/flixel/addons/effects/FlxClothSprite.hx @@ -1,6 +1,6 @@ package flixel.addons.effects; -import flash.geom.Rectangle; +import openfl.geom.Rectangle; import flixel.FlxCamera; import flixel.FlxSprite; import flixel.graphics.FlxGraphic; diff --git a/flixel/addons/effects/FlxSkewedSprite.hx b/flixel/addons/effects/FlxSkewedSprite.hx index 7d7d4d9c..9a7e66b3 100644 --- a/flixel/addons/effects/FlxSkewedSprite.hx +++ b/flixel/addons/effects/FlxSkewedSprite.hx @@ -1,6 +1,6 @@ package flixel.addons.effects; -import flash.geom.Matrix; +import openfl.geom.Matrix; import flixel.FlxCamera; import flixel.FlxG; import flixel.FlxSprite; diff --git a/flixel/addons/effects/FlxTrailArea.hx b/flixel/addons/effects/FlxTrailArea.hx index 74679d5b..244cbd6e 100644 --- a/flixel/addons/effects/FlxTrailArea.hx +++ b/flixel/addons/effects/FlxTrailArea.hx @@ -1,11 +1,11 @@ package flixel.addons.effects; -import flash.display.BitmapData; -import flash.display.BlendMode; -import flash.geom.ColorTransform; -import flash.geom.Matrix; -import flash.geom.Point; -import flash.geom.Rectangle; +import openfl.display.BitmapData; +import openfl.display.BlendMode; +import openfl.geom.ColorTransform; +import openfl.geom.Matrix; +import openfl.geom.Point; +import openfl.geom.Rectangle; import flixel.FlxG; import flixel.FlxSprite; import flixel.group.FlxGroup; diff --git a/flixel/addons/nape/FlxNapeSpace.hx b/flixel/addons/nape/FlxNapeSpace.hx index 66ee3d21..9e6330bf 100644 --- a/flixel/addons/nape/FlxNapeSpace.hx +++ b/flixel/addons/nape/FlxNapeSpace.hx @@ -1,6 +1,6 @@ package flixel.addons.nape; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.FlxBasic; import flixel.FlxG; import flixel.system.ui.FlxSystemButton; diff --git a/flixel/addons/plugin/FlxScrollingText.hx b/flixel/addons/plugin/FlxScrollingText.hx index 068c3c79..a5577cee 100644 --- a/flixel/addons/plugin/FlxScrollingText.hx +++ b/flixel/addons/plugin/FlxScrollingText.hx @@ -1,8 +1,8 @@ package flixel.addons.plugin; -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.FlxBasic; import flixel.text.FlxBitmapText; import flixel.util.FlxColor; diff --git a/flixel/addons/plugin/control/FlxControlHandler.hx b/flixel/addons/plugin/control/FlxControlHandler.hx index a932c4f6..8cdb4c42 100644 --- a/flixel/addons/plugin/control/FlxControlHandler.hx +++ b/flixel/addons/plugin/control/FlxControlHandler.hx @@ -1,7 +1,7 @@ package flixel.addons.plugin.control; #if FLX_KEYBOARD -import flash.geom.Rectangle; +import openfl.geom.Rectangle; import flixel.FlxG; import flixel.FlxSprite; import flixel.math.FlxMath; diff --git a/flixel/addons/plugin/screengrab/FlxScreenGrab.hx b/flixel/addons/plugin/screengrab/FlxScreenGrab.hx index 30237337..663d9098 100644 --- a/flixel/addons/plugin/screengrab/FlxScreenGrab.hx +++ b/flixel/addons/plugin/screengrab/FlxScreenGrab.hx @@ -1,11 +1,11 @@ package flixel.addons.plugin.screengrab; #if !js -import flash.display.Bitmap; -import flash.display.BitmapData; -import flash.geom.Matrix; -import flash.geom.Rectangle; -import flash.utils.ByteArray; +import openfl.display.Bitmap; +import openfl.display.BitmapData; +import openfl.geom.Matrix; +import openfl.geom.Rectangle; +import openfl.utils.ByteArray; import flixel.addons.util.PNGEncoder; import flixel.FlxG; import flixel.input.keyboard.FlxKey; @@ -16,7 +16,7 @@ import lime.ui.FileDialogType; import openfl.display.PNGEncoderOptions; #end #else -import flash.net.FileReference; +import openfl.net.FileReference; #end /** @@ -178,7 +178,7 @@ class FlxScreenGrab extends FlxBasic #elseif (!lime_legacy || lime < "2.9.0") var documentsDirectory = ""; #if lime_legacy - documentsDirectory = flash.filesystem.File.documentsDirectory.nativePath; + documentsDirectory = openfl.filesystem.File.documentsDirectory.nativePath; #else documentsDirectory = lime.system.System.documentsDirectory; #end diff --git a/flixel/addons/text/FlxTextField.hx b/flixel/addons/text/FlxTextField.hx index 3fde9433..e4ff0e37 100644 --- a/flixel/addons/text/FlxTextField.hx +++ b/flixel/addons/text/FlxTextField.hx @@ -1,6 +1,6 @@ package flixel.addons.text; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.FlxBasic; import flixel.FlxCamera; import flixel.FlxG; diff --git a/flixel/addons/text/FlxTypeText.hx b/flixel/addons/text/FlxTypeText.hx index 97bb4389..240a82b8 100644 --- a/flixel/addons/text/FlxTypeText.hx +++ b/flixel/addons/text/FlxTypeText.hx @@ -7,7 +7,7 @@ import flixel.system.FlxAssets; import flixel.text.FlxText; import flixel.sound.FlxSound; import flixel.math.FlxRandom; -import flash.media.Sound; +import openfl.media.Sound; #if !flash @:sound("assets/sounds/type.ogg") diff --git a/flixel/addons/tile/FlxTileSpecial.hx b/flixel/addons/tile/FlxTileSpecial.hx index a64925e3..aa241dbd 100644 --- a/flixel/addons/tile/FlxTileSpecial.hx +++ b/flixel/addons/tile/FlxTileSpecial.hx @@ -1,8 +1,8 @@ package flixel.addons.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.animation.FlxAnimation; import flixel.FlxBasic; import flixel.FlxG; diff --git a/flixel/addons/tile/FlxTilemapExt.hx b/flixel/addons/tile/FlxTilemapExt.hx index fb7e9b8d..7973569b 100644 --- a/flixel/addons/tile/FlxTilemapExt.hx +++ b/flixel/addons/tile/FlxTilemapExt.hx @@ -1,6 +1,6 @@ package flixel.addons.tile; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.FlxCamera; import flixel.FlxG; import flixel.FlxObject; diff --git a/flixel/addons/transition/TransitionFade.hx b/flixel/addons/transition/TransitionFade.hx index 37e7b923..1bc57086 100644 --- a/flixel/addons/transition/TransitionFade.hx +++ b/flixel/addons/transition/TransitionFade.hx @@ -1,6 +1,6 @@ package flixel.addons.transition; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.addons.transition.TransitionEffect; import flixel.addons.transition.FlxTransitionSprite.TransitionStatus; import flixel.FlxSprite; diff --git a/flixel/addons/transition/TransitionTiles.hx b/flixel/addons/transition/TransitionTiles.hx index 112835b7..30097007 100644 --- a/flixel/addons/transition/TransitionTiles.hx +++ b/flixel/addons/transition/TransitionTiles.hx @@ -1,6 +1,6 @@ package flixel.addons.transition; -import flash.display.BitmapData; +import openfl.display.BitmapData; import flixel.addons.transition.TransitionEffect; import flixel.addons.transition.FlxTransitionSprite.TransitionStatus; import flixel.group.FlxGroup.FlxTypedGroup; diff --git a/flixel/addons/ui/FlxButtonPlus.hx b/flixel/addons/ui/FlxButtonPlus.hx index 8badd200..2a7816bf 100644 --- a/flixel/addons/ui/FlxButtonPlus.hx +++ b/flixel/addons/ui/FlxButtonPlus.hx @@ -1,9 +1,9 @@ package flixel.addons.ui; #if FLX_MOUSE -import flash.events.MouseEvent; -import flash.geom.Rectangle; -import flash.Lib; +import openfl.events.MouseEvent; +import openfl.geom.Rectangle; +import openfl.Lib; import flixel.addons.display.FlxExtendedSprite; import flixel.FlxCamera; import flixel.FlxG; diff --git a/flixel/addons/ui/FlxClickArea.hx b/flixel/addons/ui/FlxClickArea.hx index d619d8b8..8658b4a3 100644 --- a/flixel/addons/ui/FlxClickArea.hx +++ b/flixel/addons/ui/FlxClickArea.hx @@ -1,9 +1,9 @@ package flixel.addons.ui; -import flash.events.Event; -import flash.events.MouseEvent; -import flash.events.TouchEvent; -import flash.Lib; +import openfl.events.Event; +import openfl.events.MouseEvent; +import openfl.events.TouchEvent; +import openfl.Lib; import flixel.FlxG; import flixel.FlxObject; import flixel.ui.FlxButton; diff --git a/flixel/addons/util/PNGEncoder.hx b/flixel/addons/util/PNGEncoder.hx index 707a7114..d9fd99ed 100644 --- a/flixel/addons/util/PNGEncoder.hx +++ b/flixel/addons/util/PNGEncoder.hx @@ -33,9 +33,9 @@ package flixel.addons.util; #if !js -import flash.display.Bitmap; -import flash.display.BitmapData; -import flash.utils.ByteArray; +import openfl.display.Bitmap; +import openfl.display.BitmapData; +import openfl.utils.ByteArray; /** * Class that converts BitmapData into a valid PNG