Switched flash imports to openfl were is possible. (#400)

* Switch `flash` imports to `openfl`. * Some classes that actually require flash
HaxeFlixel · Aug 7, 2023 · d2556e9 · d2556e9
1 parent f0b2b4f
commit d2556e9
Show file tree

Hide file tree

Showing 34 changed files with 75 additions and 75 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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