refactor: update to haxework 2.1.0

package.json

@@ -11,7 +11,7 @@
     "yargs": "^13.2.4"
   },
   "haxeDependencies": {
-    "haxework": "1.3.0",
+    "haxework": "2.1.0",
     "lime": "8.0.0",
     "openfl": "9.2.0",
     "hxcpp": "4.2.1",

src/client/haxe/ru/m/control/ControlBus.hx

@@ -1,6 +1,6 @@
 package ru.m.control;
 
-import haxework.signal.Signal;
+import hw.signal.Signal;
 import ru.m.control.IControlBus;
 
 class ControlBus implements IControlBus {

src/client/haxe/ru/m/control/IControlBus.hx

@@ -1,6 +1,6 @@
 package ru.m.control;
 
-import haxework.signal.Signal;
+import hw.signal.Signal;
 
 interface IControlBus {
     public var devices(default, null):Array<IControlDevice>;

src/client/haxe/ru/m/control/IControlDevice.hx

@@ -1,6 +1,6 @@
 package ru.m.control;
 
-import haxework.signal.Signal;
+import hw.signal.Signal;
 
 interface IControlDevice {
     public var type(default, null):DeviceType;

src/client/haxe/ru/m/control/JoystickDevice.hx

@@ -1,6 +1,6 @@
 package ru.m.control;
 
-import haxework.signal.Signal;
+import hw.signal.Signal;
 import lime.ui.Joystick;
 import ru.m.control.DeviceAction;
 import ru.m.control.DeviceType;

src/client/haxe/ru/m/control/KeyboardDevice.hx

@@ -2,7 +2,7 @@ package ru.m.control;
 
 import flash.display.Stage;
 import flash.events.KeyboardEvent;
-import haxework.signal.Signal;
+import hw.signal.Signal;
 import ru.m.control.DeviceAction;
 
 class KeyboardDevice implements IControlDevice {

src/client/haxe/ru/m/skin/ButtonSVGSkin.hx

@@ -1,12 +1,12 @@
 package ru.m.skin;
 
 import format.SVG;
-import haxework.color.Color;
+import hw.color.Color;
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.skin.ISkin;
+import hw.view.skin.ISkin;
 
 using StringTools;
-using haxework.color.ColorUtil;
+using hw.color.ColorUtil;
 
 @:style class ButtonSVGSkin implements ISkin<ButtonView> {
 

src/client/haxe/ru/m/tankz/AppTheme.hx

@@ -1,18 +1,18 @@
 package ru.m.tankz;
 
 import flash.text.TextFormatAlign;
-import haxework.color.Color;
+import hw.color.Color;
-import haxework.view.geometry.Box;
+import hw.view.geometry.Box;
-import haxework.view.geometry.HAlign;
+import hw.view.geometry.HAlign;
-import haxework.view.geometry.SizeValue;
+import hw.view.geometry.SizeValue;
-import haxework.view.geometry.VAlign;
+import hw.view.geometry.VAlign;
-import haxework.view.theme.ITheme;
+import hw.view.theme.ITheme;
-import haxework.view.theme.Theme;
+import hw.view.theme.Theme;
-import haxework.view.utils.DrawUtil;
+import hw.view.utils.DrawUtil;
 import openfl.Assets;
 import ru.m.skin.ButtonSVGSkin;
 
-using haxework.color.ColorUtil;
+using hw.color.ColorUtil;
 
 class AppTheme extends Theme {
 
@@ -24,7 +24,7 @@ class AppTheme extends Theme {
     }
 
     public function new() {
-        super({embed: true}, COLORS);
+        super({embed: true}, COLORS, {base: "4h"});
     }
 
     override private function reload():Void {
@@ -59,7 +59,7 @@ class AppTheme extends Theme {
         ], ["button"]));
 
         register(new Style("button.small", [
-            "font.size" => 14,
+            "font.size" => SizeValue.fromString("3h"),
             "geometry.padding" => Box.fromArray([8, 2]),
             "skin.round" => 5,
         ], ["button"]));

src/client/haxe/ru/m/tankz/Client.hx

@@ -2,11 +2,11 @@ package ru.m.tankz;
 
 import ru.m.animate.AnimateManager;
 import flash.Lib;
-import haxework.animate.Animate;
+import hw.animate.Animate;
-import haxework.log.TraceLogger;
+import hw.log.TraceLogger;
-import haxework.net.manage.LoaderManager;
+import hw.net.manage.LoaderManager;
-import haxework.view.Root;
+import hw.view.Root;
-import haxework.view.popup.PopupManager;
+import hw.view.popup.PopupManager;
 import ru.m.tankz.storage.GameStorage;
 import ru.m.tankz.storage.SettingsStorage;
 import ru.m.tankz.view.ClientView;
@@ -19,10 +19,10 @@ class Client {
     public static function main() {
         L.push(new TraceLogger());
         #if flash
-        L.push(new haxework.log.JSLogger());
+        L.push(new hw.log.JSLogger());
         #end
         #if debug
-        //L.push(new haxework.log.SocketLogger());
+        //L.push(new hw.log.SocketLogger());
         #end
         // ToDo: fix @:provide macro
         PopupManager;
@@ -32,7 +32,8 @@ class Client {
         //
         Const.init();
         Init.init();
-        Animate.bind(Lib.current.stage);
+        // TODO:
+        // Animate.bind(Lib.current.stage);
         L.d(TAG, 'Debug: ${Const.DEBUG}');
         L.i(TAG, 'Version: ${Const.VERSION}');
         L.i(TAG, 'Build: ${Const.BUILD}');

src/client/haxe/ru/m/tankz/Init.hx

@@ -1,11 +1,11 @@
 package ru.m.tankz;
 
 import flash.Lib;
-import haxework.animate.FadeAnimate;
+import hw.animate.FadeAnimate;
-import haxework.animate.UnFadeAnimate;
+import hw.animate.UnFadeAnimate;
-import haxework.storage.SharedObjectStorage;
+import hw.storage.SharedObjectStorage;
-import haxework.view.popup.PopupManager;
+import hw.view.popup.PopupManager;
-import haxework.view.theme.ITheme;
+import hw.view.theme.ITheme;
 import lime.ui.Gamepad;
 import lime.ui.Joystick;
 import ru.m.connect.IConnection;

src/client/haxe/ru/m/tankz/Preloader.hx

@@ -5,7 +5,7 @@ import flash.display.Sprite;
 import flash.events.Event;
 import flash.events.ProgressEvent;
 import flash.Lib;
-import haxework.view.geometry.Size;
+import hw.view.geometry.Size;
 import ru.m.tankz.AppTheme;
 
 class Progress extends Sprite {

src/client/haxe/ru/m/tankz/network/NetworkManager.hx

@@ -1,7 +1,7 @@
 package ru.m.tankz.network;
 
 import haxe.Serializer;
-import haxework.signal.Signal;
+import hw.signal.Signal;
 import ru.m.connect.IConnection;
 import ru.m.tankz.control.Control;
 import ru.m.tankz.game.GameEvent;

src/client/haxe/ru/m/tankz/render/IRender.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.render;
 
-import haxework.view.IView;
+import hw.view.IView;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.game.IGame;
 

src/client/haxe/ru/m/tankz/render/Render.hx

@@ -5,8 +5,8 @@ import flash.display.Graphics;
 import flash.display.Sprite;
 import flash.events.Event;
 import haxe.Timer;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.SpriteView;
+import hw.view.SpriteView;
 import promhx.Promise;
 import ru.m.animate.Animate;
 import ru.m.animate.AnimateManager;

src/client/haxe/ru/m/tankz/render/item/BulletRenderItem.hx

@@ -1,7 +1,7 @@
 package ru.m.tankz.render.item;
 
-import haxework.color.Color;
+import hw.color.Color;
-import haxework.view.utils.BitmapUtil;
+import hw.view.utils.BitmapUtil;
 import ru.m.geom.Rectangle;
 
 class BulletRenderItem extends BitmapRenderItem {

src/client/haxe/ru/m/tankz/render/item/EagleRenderItem.hx

@@ -2,8 +2,8 @@ package ru.m.tankz.render.item;
 
 import flash.display.DisplayObject;
 import flash.display.Sprite;
-import haxework.color.Color;
+import hw.color.Color;
-import haxework.view.utils.BitmapUtil;
+import hw.view.utils.BitmapUtil;
 import ru.m.animate.Animate;
 import ru.m.geom.Rectangle;
 

src/client/haxe/ru/m/tankz/render/item/TankRenderItem.hx

@@ -7,10 +7,10 @@ import flash.display.Sprite;
 import flash.text.TextField;
 import flash.text.TextFieldAutoSize;
 import flash.text.TextFormat;
-import haxework.color.Color;
+import hw.color.Color;
-import haxework.text.BitmapTextField;
+import hw.text.BitmapTextField;
-import haxework.view.theme.ITheme;
+import hw.view.theme.ITheme;
-import haxework.view.utils.BitmapUtil;
+import hw.view.utils.BitmapUtil;
 import ru.m.animate.Animate;
 import ru.m.geom.Rectangle;
 

src/client/haxe/ru/m/tankz/storage/GameStorage.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.storage;
 
-import haxework.storage.SharedObjectStorage;
+import hw.storage.SharedObjectStorage;
 import ru.m.tankz.game.PackProgress;
 import ru.m.tankz.Type;
 

src/client/haxe/ru/m/tankz/storage/NetworkStorage.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.storage;
 
-import haxework.storage.SharedObjectStorage;
+import hw.storage.SharedObjectStorage;
 
 @:provide class NetworkStorage extends SharedObjectStorage {
 

src/client/haxe/ru/m/tankz/storage/RecordStorage.hx

@@ -1,7 +1,7 @@
 package ru.m.tankz.storage;
 
 import haxe.DynamicAccess;
-import haxework.storage.SharedObjectStorage;
+import hw.storage.SharedObjectStorage;
 import ru.m.tankz.game.record.GameRecord;
 
 @:provide class RecordStorage extends SharedObjectStorage  {

src/client/haxe/ru/m/tankz/storage/SettingsStorage.hx

@@ -1,9 +1,9 @@
 package ru.m.tankz.storage;
 
 import flash.ui.Keyboard;
-import haxework.signal.Signal;
+import hw.signal.Signal;
-import haxework.storage.SharedObjectStorage;
+import hw.storage.SharedObjectStorage;
-import haxework.utils.ObjectUtil;
+import hw.utils.ObjectUtil;
 import ru.m.control.DeviceAction;
 import ru.m.control.DeviceType;
 import ru.m.geom.Direction;

src/client/haxe/ru/m/tankz/view/ClientView.hx

@@ -1,9 +1,9 @@
 package ru.m.tankz.view;
 
 import flash.ui.Keyboard;
-import haxework.resources.IResources;
+import hw.resources.IResources;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.group.VGroupView;
+import hw.view.group.VGroupView;
 import ru.m.control.DeviceAction;
 import ru.m.control.DeviceType;
 import ru.m.control.IControlBus;

src/client/haxe/ru/m/tankz/view/ClientView.yaml

@@ -1,6 +1,6 @@
 ---
 views:
-  - $type: haxework.view.frame.FrameSwitcher
+  - $type: hw.view.frame.FrameSwitcher
     id: switcher
     geometry.stretch: true
     style: dark

src/client/haxe/ru/m/tankz/view/GameFrame.hx

@@ -3,10 +3,10 @@ package ru.m.tankz.view;
 import ru.m.tankz.view.popup.PausePopup;
 import flash.ui.Keyboard;
 import ru.m.control.DeviceAction;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
-import haxework.view.group.GroupView;
+import hw.view.group.GroupView;
-import haxework.view.layout.DefaultLayout;
+import hw.view.layout.DefaultLayout;
 import ru.m.control.DeviceType;
 import ru.m.control.IControlBus;
 import ru.m.tankz.control.HumanControl;

src/client/haxe/ru/m/tankz/view/GameFrame.yaml

@@ -12,7 +12,7 @@ views:
     geometry.position: absolute
     geometry.stretch: true
     visible: false
-  - $type: haxework.view.form.ButtonView
+  - $type: hw.view.form.ButtonView
     style: button.bars
     geometry.position: absolute
     geometry.hAlign: left

src/client/haxe/ru/m/tankz/view/LevelFrame.hx

@@ -1,10 +1,10 @@
 package ru.m.tankz.view;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
 import ru.m.tankz.bundle.IConfigBundle;
 import ru.m.tankz.bundle.ILevelBundle;
 import ru.m.tankz.config.Config;

src/client/haxe/ru/m/tankz/view/LevelFrame.yaml

@@ -1,29 +1,29 @@
 ---
 views:
-  - $type: haxework.view.group.VGroupView
+  - $type: hw.view.group.VGroupView
     style: container
     views:
       - id: header
-        $type: haxework.view.form.LabelView
+        $type: hw.view.form.LabelView
         style: text.header
       - id: levels
-        $type: haxework.view.data.DataView
+        $type: hw.view.data.DataView
         geometry.width: 100%
         geometry.height: 100%
         overflow.y: scroll
         layout:
-          $type: haxework.view.layout.TailLayout
+          $type: hw.view.layout.TailLayout
           rowSize: 10
           margin: 5
         factory: ~levelViewFactory
         +onItemSelect: ~onLevelSelect
         geometry.padding: 10
-  - $type: haxework.view.group.HGroupView
+  - $type: hw.view.group.HGroupView
     style: panel
     layout.margin: 10
     views:
-      - $type: haxework.view.SpriteView
+      - $type: hw.view.SpriteView
         geometry.width: 100%
-      - $type: haxework.view.form.ButtonView
+      - $type: hw.view.form.ButtonView
         style: button.prev
         +onPress: ~switcher.change("menu")

src/client/haxe/ru/m/tankz/view/MenuFrame.hx

@@ -1,9 +1,9 @@
 package ru.m.tankz.view;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
 import ru.m.tankz.bundle.ILevelBundle;
 import ru.m.tankz.game.GameInit;
 import ru.m.tankz.game.GameState;

src/client/haxe/ru/m/tankz/view/MenuFrame.yaml

@@ -1,62 +1,62 @@
 ---
 views:
-  - $type: haxework.view.group.VGroupView
+  - $type: hw.view.group.VGroupView
     style: container
     overflow.y: scroll
     views:
-      - $type: haxework.view.group.VGroupView
+      - $type: hw.view.group.VGroupView
         geometry.width: 100%
         layout.margin: 10
         layout.hAlign: center
         views:
-          - $type: haxework.view.form.LabelView
+          - $type: hw.view.form.LabelView
             text: $r:text:name
             style: font
             font.size: 100
             geometry.margin.bottom: 30
           - id: packs
-            $type: haxework.view.data.DataView
+            $type: hw.view.data.DataView
             geometry.width: 100%
             layout:
-              $type: haxework.view.layout.TailLayout
+              $type: hw.view.layout.TailLayout
               rowSize: 2
               margin: 10
             factory: ~ru.m.tankz.view.common.PackView.factory
             +onDataSelect: ~startGame
-          - $type: haxework.view.SpriteView
+          - $type: hw.view.SpriteView
             style: line
             geometry.width: 250
             geometry.margin: [0, 10]
             visible: false
-          - $type: haxework.view.form.ButtonView
+          - $type: hw.view.form.ButtonView
             style: button.menu
             +onPress: ~switcher.change('record')
             text: Records
             visible: false
           - id: network
-            $type: haxework.view.form.ButtonView
+            $type: hw.view.form.ButtonView
             +onPress: ~startNetwork()
             text: Network (alpha)
             visible: false
-  - $type: haxework.view.form.LabelView
+  - $type: hw.view.form.LabelView
     geometry.hAlign: right
     geometry.vAlign: top
     geometry.position: absolute
     geometry.margin: [0, 20, 20, 0]
     style: text.box
     text: $r:text:version
-  - $type: haxework.view.group.HGroupView
+  - $type: hw.view.group.HGroupView
     style: panel
     layout.margin: 10
     views:
       - id: settings
-        $type: haxework.view.form.ButtonView
+        $type: hw.view.form.ButtonView
         style: button.settings
         +onPress: ~switcher.change('settings')
-      - $type: haxework.view.SpriteView
+      - $type: hw.view.SpriteView
         geometry.width: 100%
       - id: update
-        $type: haxework.view.form.ButtonView
+        $type: hw.view.form.ButtonView
         style: button.active
         +onPress: ~appUpdate()
         visible: false

src/client/haxe/ru/m/tankz/view/RecordFrame.hx

@@ -1,8 +1,8 @@
 package ru.m.tankz.view;
 
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
-import haxework.view.list.VListView;
+import hw.view.list.VListView;
 import ru.m.tankz.game.record.GameRecord;
 import ru.m.tankz.storage.RecordStorage;
 

src/client/haxe/ru/m/tankz/view/RecordFrame.yaml

@@ -1,24 +1,24 @@
 ---
 views:
-  - $type: haxework.view.group.VGroupView
+  - $type: hw.view.group.VGroupView
     style: container
     views:
-      - $type: haxework.view.form.LabelView
+      - $type: hw.view.form.LabelView
         style: text.header
         text: Records
       - id: data
-        $type: haxework.view.list.VListView
+        $type: hw.view.list.VListView
         factory: ~function() return new ru.m.tankz.view.common.RecordView()
         geometry.margin.top: 20
         geometry.stretch: true
         scroll:
-          $type: haxework.view.list.VScrollBarView
+          $type: hw.view.list.VScrollBarView
-  - $type: haxework.view.group.HGroupView
+  - $type: hw.view.group.HGroupView
     style: panel
     layout.margin: 10
     views:
-      - $type: haxework.view.SpriteView
+      - $type: hw.view.SpriteView
         geometry.width: 100%
-      - $type: haxework.view.form.ButtonView
+      - $type: hw.view.form.ButtonView
         style: button.prev
         +onPress: ~switcher.change("menu")

src/client/haxe/ru/m/tankz/view/ResultFrame.hx

@@ -1,10 +1,10 @@
 package ru.m.tankz.view;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
 import ru.m.tankz.bundle.ILevelBundle;
 import ru.m.tankz.game.GameEvent;
 import ru.m.tankz.game.GameInit;

src/client/haxe/ru/m/tankz/view/ResultFrame.yaml

@@ -1,16 +1,16 @@
 ---
 views:
-  - $type: haxework.view.group.VGroupView
+  - $type: hw.view.group.VGroupView
     style: container
     views:
       - id: level
-        $type: haxework.view.form.LabelView
+        $type: hw.view.form.LabelView
         style: text.header
         font.align: center
       - id: result
-        $type: haxework.view.data.DataView
+        $type: hw.view.data.DataView
         layout:
-          $type: haxework.view.layout.TailLayout
+          $type: hw.view.layout.TailLayout
         factory: ~ru.m.tankz.view.result.ResultPlayerView.factory
         geometry.width: 100%
         geometry.height: 100%
@@ -18,23 +18,23 @@ views:
         geometry.margin.top: 20
         layout.margin: 5
         layout.hAlign: center
-  - $type: haxework.view.group.HGroupView
+  - $type: hw.view.group.HGroupView
     style: panel
     layout.margin: 10
     views:
-      - $type: haxework.view.SpriteView
+      - $type: hw.view.SpriteView
         geometry.width: 50%
       - id: levels
-        $type: haxework.view.form.ButtonView
+        $type: hw.view.form.ButtonView
         text: Levels
         +onPress: ~levels()
       - id: restart
-        $type: haxework.view.form.ButtonView
+        $type: hw.view.form.ButtonView
         text: Restart
         +onPress: ~restart()
       - id: next
-        $type: haxework.view.form.ButtonView
+        $type: hw.view.form.ButtonView
         text: Next
         +onPress: ~next()
-      - $type: haxework.view.SpriteView
+      - $type: hw.view.SpriteView
         geometry.width: 50%

src/client/haxe/ru/m/tankz/view/SettingsFrame.hx

@@ -1,8 +1,8 @@
 package ru.m.tankz.view;
 
-import haxework.view.form.ToggleButtonView;
+import hw.view.form.ToggleButtonView;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
 import ru.m.tankz.storage.SettingsStorage;
 
 @:template class SettingsFrame extends FrameView<Dynamic> {

src/client/haxe/ru/m/tankz/view/SettingsFrame.yaml

@@ -1,20 +1,20 @@
 ---
 views:
-  - $type: haxework.view.group.VGroupView
+  - $type: hw.view.group.VGroupView
     style: container
     views:
-      - $type: haxework.view.form.LabelView
+      - $type: hw.view.form.LabelView
         style: text.header
         text: Settings
-      - $type: haxework.view.group.VGroupView
+      - $type: hw.view.group.VGroupView
         geometry.stretch: true
         layout.hAlign: center
         overflow.y: scroll
         views:
-          - $type: haxework.view.group.GroupView
+          - $type: hw.view.group.GroupView
             geometry.width: 100%
             layout:
-              $type: haxework.view.layout.TailLayout
+              $type: hw.view.layout.TailLayout
               vAlign: top
               margin: 20
             views:
@@ -24,29 +24,29 @@ views:
               - id: settings1
                 $type: ru.m.tankz.view.settings.SettingsEditor
                 controlIndex: 1
-          - $type: haxework.view.group.GroupView
+          - $type: hw.view.group.GroupView
             geometry.width: 100%
             geometry.margin.top: 20
             layout:
-              $type: haxework.view.layout.TailLayout
+              $type: hw.view.layout.TailLayout
               hAlign: center
               margin: 20
             views:
               - id: fps
-                $type: haxework.view.form.ToggleButtonView
+                $type: hw.view.form.ToggleButtonView
                 text: Display FPS
                 +onPress: ~function(button) settings.displayFPS = !cast(button,ToggleButtonView).on
               - id: network
-                $type: haxework.view.form.ToggleButtonView
+                $type: hw.view.form.ToggleButtonView
                 geometry.margin.top: 20
                 text: Enable Network
                 +onPress: ~function(button) settings.enableNetwork = !cast(button,ToggleButtonView).on
-  - $type: haxework.view.group.HGroupView
+  - $type: hw.view.group.HGroupView
     style: panel
     layout.margin: 10
     views:
-      - $type: haxework.view.SpriteView
+      - $type: hw.view.SpriteView
         geometry.width: 100%
-      - $type: haxework.view.form.ButtonView
+      - $type: hw.view.form.ButtonView
         style: button.prev
         +onPress: ~switcher.change("menu")

src/client/haxe/ru/m/tankz/view/StartFrame.hx

@@ -1,10 +1,10 @@
 package ru.m.tankz.view;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.control.Controller;
 import ru.m.tankz.control.PlayerControl;

src/client/haxe/ru/m/tankz/view/StartFrame.yaml

@@ -1,13 +1,13 @@
 ---
 views:
-  - $type: haxework.view.group.VGroupView
+  - $type: hw.view.group.VGroupView
     style: container
     views:
       - id: header
-        $type: haxework.view.form.LabelView
+        $type: hw.view.form.LabelView
         style: text.header
       - id: teams
-        $type: haxework.view.data.DataView
+        $type: hw.view.data.DataView
         geometry.padding: 10
         geometry.width: 100%
         geometry.height: 100%
@@ -15,25 +15,25 @@ views:
         overflow.y: scroll
         factory: ~teamViewFactory
         layout:
-          $type: haxework.view.layout.TailLayout
+          $type: hw.view.layout.TailLayout
           margin: 5
           rowSize: 2
-  - $type: haxework.view.group.HGroupView
+  - $type: hw.view.group.HGroupView
     style: panel
     layout.margin: 10
     views:
-      - $type: haxework.view.SpriteView
+      - $type: hw.view.SpriteView
         geometry.width: 50%
       - id: presets
-        $type: haxework.view.data.DataView
+        $type: hw.view.data.DataView
         factory: ~presetViewFactory
         +onDataSelect: ~onPresetSelect
         layout:
-          $type: haxework.view.layout.HorizontalLayout
+          $type: hw.view.layout.HorizontalLayout
           hAlign: center
           margin: 5
-      - $type: haxework.view.SpriteView
+      - $type: hw.view.SpriteView
         geometry.width: 50%
-      - $type: haxework.view.form.ButtonView
+      - $type: hw.view.form.ButtonView
         style: button.prev
         +onPress: ~switcher.change("level", start.level.packId)

src/client/haxe/ru/m/tankz/view/common/NetworkStateView.hx

@@ -1,10 +1,10 @@
 package ru.m.tankz.view.common;
 
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.group.HGroupView;
+import hw.view.group.HGroupView;
-import haxework.view.skin.SpriteSkin;
+import hw.view.skin.SpriteSkin;
-import haxework.view.SpriteView;
+import hw.view.SpriteView;
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.view.popup.LoginPopup;
 

src/client/haxe/ru/m/tankz/view/common/NetworkStateView.yaml

@@ -3,31 +3,31 @@ geometry.padding: [5, 2]
 layout.vAlign: middle
 visible: false
 skin:
-  $type: haxework.view.skin.SpriteSkin
+  $type: hw.view.skin.SpriteSkin
   border.color: 0x95937D
   round: 10
 views:
   - id: state
-    $type: haxework.view.SpriteView
+    $type: hw.view.SpriteView
     geometry.width: 20
     geometry.height: 20
     visible: false
     skin:
-      $type: haxework.view.skin.SpriteSkin
+      $type: hw.view.skin.SpriteSkin
       background.color: black
       border.color: 0xE7E0BB
       round: 20
   - id: user
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     font.size: 14
   - id: login
-    $type: haxework.view.form.ButtonView
+    $type: hw.view.form.ButtonView
     style: button.small
     text: login
     +onPress: ~login()
     visible: false
   - id: logout
-    $type: haxework.view.form.ButtonView
+    $type: hw.view.form.ButtonView
     style: button.small
     text: logout
     +onPress: ~logout()

src/client/haxe/ru/m/tankz/view/common/PackView.hx

@@ -1,7 +1,7 @@
 package ru.m.tankz.view.common;
 
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.group.VGroupView;
+import hw.view.group.VGroupView;
 import ru.m.tankz.bundle.ILevelBundle;
 import ru.m.tankz.storage.GameStorage;
 import ru.m.tankz.Type;

src/client/haxe/ru/m/tankz/view/common/PackView.yaml

@@ -9,7 +9,7 @@ content.buttonMode: true
 content.mouseChildren: false
 views:
   - id: label
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     font.size: 22
   - id: state
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView

src/client/haxe/ru/m/tankz/view/common/RecordView.hx

@@ -1,9 +1,9 @@
 package ru.m.tankz.view.common;
 
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.group.HGroupView;
+import hw.view.group.HGroupView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.list.ListView;
+import hw.view.list.ListView;
 import ru.m.tankz.game.GameInit;
 import ru.m.tankz.game.record.GameRecord;
 import ru.m.tankz.storage.RecordStorage;

src/client/haxe/ru/m/tankz/view/common/RecordView.yaml

@@ -4,26 +4,26 @@ layout.margin: 5
 layout.vAlign: middle
 views:
   - id: play
-    $type: haxework.view.form.ButtonView
+    $type: hw.view.form.ButtonView
     style: button.start.small
     +onPress: ~play()
   - id: date
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text.box
     geometry.width: 200
   - id: type
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text.box
     geometry.width: 200
   - id: level
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text.box
     geometry.width: 100
   - id: preset
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text.box
     geometry.width: 100
   - id: delete
-    $type: haxework.view.form.ButtonView
+    $type: hw.view.form.ButtonView
     style: button.close.small
     +onPress: ~delete()

src/client/haxe/ru/m/tankz/view/common/SlotView.hx

@@ -1,11 +1,11 @@
 package ru.m.tankz.view.common;
 
 import openfl.Assets;
-import haxework.view.ImageView;
+import hw.view.ImageView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.form.SelectView;
+import hw.view.form.SelectView;
-import haxework.view.group.HGroupView;
+import hw.view.group.HGroupView;
-import haxework.view.skin.SpriteSkin;
+import hw.view.skin.SpriteSkin;
 import ru.m.tankz.control.Controller;
 import ru.m.tankz.control.PlayerControl;
 

src/client/haxe/ru/m/tankz/view/common/SlotView.yaml

@@ -4,14 +4,14 @@ layout.margin: 10
 layout.vAlign: middle
 views:
   - id: tank
-    $type: haxework.view.ImageView
+    $type: hw.view.ImageView
     style: icon.tank
   - id: slot
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text.box
     geometry.width: 150
   - id: select
-    $type: haxework.view.form.SelectView<ru.m.tankz.control.Controller>
+    $type: hw.view.form.SelectView<ru.m.tankz.control.Controller>
     geometry.width: 150
     labelBuilder: |
       ~function(controller) {

src/client/haxe/ru/m/tankz/view/common/TankView.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.view.common;
 
-import haxework.view.ImageView;
+import hw.view.ImageView;
 import ru.m.tankz.render.RenderUtil;
 import ru.m.tankz.Type.TankInfo;
 

src/client/haxe/ru/m/tankz/view/game/GameViewA.hx

@@ -1,8 +1,8 @@
 package ru.m.tankz.view.game;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.group.HGroupView;
+import hw.view.group.HGroupView;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.game.GameEvent;
 import ru.m.tankz.game.GameState;

src/client/haxe/ru/m/tankz/view/game/GameViewA.yaml

@@ -1,14 +1,14 @@
 ---
 views:
   - id: left
-    $type: haxework.view.group.GroupView
+    $type: hw.view.group.GroupView
     layout.vAlign: middle
     geometry.height: 100%
     geometry.width: 50%
   - id: render
     $type: ru.m.tankz.render.Render
   - id: right
-    $type: haxework.view.group.VGroupView
+    $type: hw.view.group.VGroupView
     geometry.height: 100%
     geometry.width: 50%
     geometry.padding: 5
@@ -16,12 +16,12 @@ views:
     layout.margin: 5
     views:
       - id: level
-        $type: haxework.view.form.LabelView
+        $type: hw.view.form.LabelView
         style: text.box
         geometry.width: 100%
-      - $type: haxework.view.SpriteView
+      - $type: hw.view.SpriteView
         geometry.height: 30%
       - id: teams
-        $type: haxework.view.data.DataView
+        $type: hw.view.data.DataView
         layout.margin: 3
         factory: ~TeamView.viewFactory

src/client/haxe/ru/m/tankz/view/game/GameViewB.hx

@@ -1,8 +1,8 @@
 package ru.m.tankz.view.game;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.group.VGroupView;
+import hw.view.group.VGroupView;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.game.GameEvent;
 import ru.m.tankz.game.GameState;

src/client/haxe/ru/m/tankz/view/game/GameViewB.yaml

@@ -1,19 +1,19 @@
 ---
 views:
   - id: top
-    $type: haxework.view.group.HGroupView
+    $type: hw.view.group.HGroupView
     layout.vAlign: middle
     geometry.width: 100%
     views:
       - id: level
-        $type: haxework.view.form.LabelView
+        $type: hw.view.form.LabelView
         style: text.box
-      - $type: haxework.view.SpriteView
+      - $type: hw.view.SpriteView
         geometry.width: 100%
       - id: teams
-        $type: haxework.view.data.DataView
+        $type: hw.view.data.DataView
         layout:
-          $type: haxework.view.layout.HorizontalLayout
+          $type: hw.view.layout.HorizontalLayout
           margin: 5
         factory: ~TeamView.viewFactory
   - id: render

src/client/haxe/ru/m/tankz/view/game/GameViewContainer.hx

@@ -1,8 +1,8 @@
 package ru.m.tankz.view.game;
 
-import haxework.view.geometry.HAlign;
+import hw.view.geometry.HAlign;
-import haxework.view.geometry.VAlign;
+import hw.view.geometry.VAlign;
-import haxework.view.group.GroupView;
+import hw.view.group.GroupView;
 
 class GameViewContainer extends GroupView {
 

src/client/haxe/ru/m/tankz/view/game/IGameView.hx

@@ -1,8 +1,8 @@
 package ru.m.tankz.view.game;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.IView;
+import hw.view.IView;
 import ru.m.tankz.game.GameState;
 import ru.m.tankz.game.IGame;
 import ru.m.tankz.render.IRender;

src/client/haxe/ru/m/tankz/view/game/PlayerView.hx

@@ -1,7 +1,7 @@
 package ru.m.tankz.view.game;
 
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.group.VGroupView;
+import hw.view.group.VGroupView;
 import ru.m.tankz.game.GameState;
 import ru.m.tankz.Type;
 import ru.m.tankz.view.common.TankView;

src/client/haxe/ru/m/tankz/view/game/PlayerView.yaml

@@ -1,19 +1,19 @@
 ---
 views:
   - id: title
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     visible: false
-  - $type: haxework.view.group.HGroupView
+  - $type: hw.view.group.HGroupView
     layout.margin: 5
     layout.vAlign: middle
     views:
       - id: tank
         $type: ru.m.tankz.view.common.TankView
       - id: life
-        $type: haxework.view.form.LabelView
+        $type: hw.view.form.LabelView
         style: text.box
         geometry.width: 55
       - id: score
-        $type: haxework.view.form.LabelView
+        $type: hw.view.form.LabelView
         style: text.box
         geometry.width: 100

src/client/haxe/ru/m/tankz/view/game/TeamView.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.view.game;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
 import ru.m.tankz.game.GameState;
 import ru.m.tankz.Type;
 

src/client/haxe/ru/m/tankz/view/gamepad/GamepadSkin.hx

@@ -1,8 +1,8 @@
 package ru.m.tankz.view.gamepad;
 
 import flash.display.Graphics;
-import haxework.color.Color;
+import hw.color.Color;
-import haxework.view.skin.ISkin;
+import hw.view.skin.ISkin;
 import ru.m.control.DeviceAction;
 
 @:style class GamepadSkin implements ISkin<GamepadView> {

src/client/haxe/ru/m/tankz/view/gamepad/GamepadView.hx

@@ -3,8 +3,8 @@ package ru.m.tankz.view.gamepad;
 import flash.display.Sprite;
 import flash.events.MouseEvent;
 import flash.events.TouchEvent;
-import haxework.signal.Signal;
+import hw.signal.Signal;
-import haxework.view.SpriteView;
+import hw.view.SpriteView;
 import ru.m.control.DeviceAction;
 import ru.m.control.DeviceType;
 import ru.m.control.IControlDevice;

src/client/haxe/ru/m/tankz/view/gamepad/SmartActionAreaBuilder.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.view.gamepad;
 
-import haxework.view.geometry.Box;
+import hw.view.geometry.Box;
 import ru.m.control.DeviceAction;
 import ru.m.geom.Circle;
 import ru.m.geom.Direction;

src/client/haxe/ru/m/tankz/view/network/RoomFrame.hx

@@ -1,10 +1,10 @@
 package ru.m.tankz.view.network;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
-import haxework.view.text.TextView;
+import hw.view.text.TextView;
 import ru.m.tankz.game.GameInit;
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.proto.room.RoomProto;

src/client/haxe/ru/m/tankz/view/network/RoomFrame.yaml

@@ -1,40 +1,40 @@
 ---
 geometry.stretch: true
 layout:
-    $type: haxework.view.layout.VerticalLayout
+    $type: hw.view.layout.VerticalLayout
 views:
-  - $type: haxework.view.group.VGroupView
+  - $type: hw.view.group.VGroupView
     style: container
     geometry.padding: 20
     layout.margin: 10
     views:
       - id: header
-        $type: haxework.view.form.LabelView
+        $type: hw.view.form.LabelView
         geometry.margin.bottom: 20
         style: text.header
         text: Game Room
-      - $type: haxework.view.group.HGroupView
+      - $type: hw.view.group.HGroupView
         layout.margin: 10
         views:
           - id: info
-            $type: haxework.view.form.LabelView
+            $type: hw.view.form.LabelView
             geometry.padding: [30, 10]
             style: text.box
           - id: start
-            $type: haxework.view.form.ButtonView
+            $type: hw.view.form.ButtonView
             text: Start
             +onPress: ~network.startGame()
             visible: false
           - id: leave
-            $type: haxework.view.form.ButtonView
+            $type: hw.view.form.ButtonView
             text: Leave
             +onPress: ~network.leaveGame()
-      - $type: haxework.view.SpriteView
+      - $type: hw.view.SpriteView
         geometry.width: 100%
         geometry.height: 3
         style: line
       - id: slots
-        $type: haxework.view.data.DataView
+        $type: hw.view.data.DataView
         layout.hAlign: center
         geometry.stretch: true
         overflow.y: scroll

src/client/haxe/ru/m/tankz/view/network/RoomItemView.hx

@@ -2,10 +2,10 @@ package ru.m.tankz.view.network;
 
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.proto.room.RoomSlotProto;
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.group.HGroupView;
+import hw.view.group.HGroupView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.list.ListView;
+import hw.view.list.ListView;
 import ru.m.tankz.proto.room.RoomProto;
 
 @:template class RoomItemView extends HGroupView implements IListItemView<RoomProto> {

src/client/haxe/ru/m/tankz/view/network/RoomItemView.yaml

@@ -3,18 +3,18 @@ layout.margin: 10
 layout.hAlign: center
 views:
   - id: creator
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     geometry.width: 200
     style: text.box
   - id: type
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     geometry.width: 200
     style: text.box
   - id: users
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     geometry.width: 150
     style: text.box
   - id: join
-    $type: haxework.view.form.ButtonView
+    $type: hw.view.form.ButtonView
     text: Join
     +onPress: ~join()

src/client/haxe/ru/m/tankz/view/network/RoomListFrame.hx

@@ -1,8 +1,8 @@
 package ru.m.tankz.view.network;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.proto.room.RoomProto;
 import ru.m.tankz.view.popup.CreateGamePopup;

src/client/haxe/ru/m/tankz/view/network/RoomListFrame.yaml

@@ -1,22 +1,22 @@
 ---
 geometry.stretch: true
 layout:
-    $type: haxework.view.layout.VerticalLayout
+    $type: hw.view.layout.VerticalLayout
 views:
-    - $type: haxework.view.group.VGroupView
+    - $type: hw.view.group.VGroupView
       style: container
       geometry.padding: 20
       views:
           - id: header
-            $type: haxework.view.form.LabelView
+            $type: hw.view.form.LabelView
             geometry.margin.bottom: 20
             style: text.header
             text: Games List
-          - $type: haxework.view.form.ButtonView
+          - $type: hw.view.form.ButtonView
             text: Create
             +onPress: ~create()
           - id: games
-            $type: haxework.view.data.DataView
+            $type: hw.view.data.DataView
             geometry.stretch: true
             factory: ~ru.m.tankz.view.network.RoomItemView.factory
             geometry.margin: 10

src/client/haxe/ru/m/tankz/view/network/SlotItemView.hx

@@ -1,9 +1,9 @@
 package ru.m.tankz.view.network;
 
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.group.HGroupView;
+import hw.view.group.HGroupView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.list.ListView;
+import hw.view.list.ListView;
 import ru.m.tankz.bundle.IConfigBundle;
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.proto.room.RoomSlotProto;

src/client/haxe/ru/m/tankz/view/network/SlotItemView.yaml

@@ -3,19 +3,19 @@ geometry.padding: 2
 layout.margin: 10
 views:
   - id: type
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text.box
     geometry.width: 150
-  - $type: haxework.view.group.HGroupView
+  - $type: hw.view.group.HGroupView
     layout.hAlign: center
     layout.vAlign: middle
     geometry.width: 300
     views:
     - id: user
-      $type: haxework.view.form.LabelView
+      $type: hw.view.form.LabelView
       geometry.stretch: true
       style: text.box
     - id: select
-      $type: haxework.view.form.ButtonView
+      $type: hw.view.form.ButtonView
       text: Select
       +onPress: ~select()

src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.hx

@@ -1,8 +1,8 @@
 package ru.m.tankz.view.popup;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.popup.PopupView;
+import hw.view.popup.PopupView;
-import haxework.view.form.ToggleButtonView;
+import hw.view.form.ToggleButtonView;
 import ru.m.tankz.bundle.IConfigBundle;
 import ru.m.tankz.bundle.ILevelBundle;
 import ru.m.tankz.config.Config;

src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.yaml

@@ -2,42 +2,42 @@
 layout.hAlign: center
 layout.vAlign: middle
 view:
-    $type: haxework.view.group.VGroupView
+    $type: hw.view.group.VGroupView
     layout.hAlign: center
     geometry.stretch: true
     geometry.margin: 10
     style: window
     views:
-        -   $type: haxework.view.group.HGroupView
+        -   $type: hw.view.group.HGroupView
             geometry.width: 100%
             geometry.padding: 10
             layout.vAlign: middle
             views:
                 -   id: name
-                    $type: haxework.view.form.LabelView
+                    $type: hw.view.form.LabelView
                     geometry.width: 100%
                     geometry.margin.left: 10
                     layout.hAlign: left
                     style: text
                     text: New game
-                -   $type: haxework.view.form.ButtonView
+                -   $type: hw.view.form.ButtonView
                     style: window.close
                     +onPress: ~reject('close')
-        -   $type: haxework.view.group.VGroupView
+        -   $type: hw.view.group.VGroupView
             geometry.stretch: true
             geometry.padding: [5, 20]
             layout.margin: 5
             layout.hAlign: center
             views:
-                -   $type: haxework.view.form.LabelView
+                -   $type: hw.view.form.LabelView
                     geometry.width: 100%
                     style: text
                     text: Type
                 -   id: type
-                    $type: haxework.view.data.DataView
+                    $type: hw.view.data.DataView
                     geometry.width: 100%
                     layout:
-                        $type: haxework.view.layout.TailLayout
+                        $type: hw.view.layout.TailLayout
                         margin: 10
                     factory: ~gameTypeViewFactory
                     +onItemSelect: ~onGameTypeSelect
@@ -45,27 +45,27 @@ view:
                         - "classic"
                         - "dota"
                         - "death"
-                -   $type: haxework.view.form.LabelView
+                -   $type: hw.view.form.LabelView
                     geometry.width: 100%
                     style: text
                     text: Level
                 -   id: level
-                    $type: haxework.view.data.DataView
+                    $type: hw.view.data.DataView
                     geometry.width: 100%
                     geometry.height: 100%
                     overflow.y: scroll
                     layout:
-                        $type: haxework.view.layout.TailLayout
+                        $type: hw.view.layout.TailLayout
                         rowSize: 10
                         margin: 5
                     factory: ~levelViewFactory
                     +onItemSelect: ~onLevelSelect
                     geometry.padding: 10
-        -   $type: haxework.view.group.HGroupView
+        -   $type: hw.view.group.HGroupView
             layout.hAlign: center
             layout.margin: 5
             style: panel
             views:
-                -   $type: haxework.view.form.ButtonView
+                -   $type: hw.view.form.ButtonView
                     text: Create
                     +onPress: ~submit()

src/client/haxe/ru/m/tankz/view/popup/LoginPopup.hx

@@ -1,9 +1,9 @@
 package ru.m.tankz.view.popup;
 
-import haxework.log.BaseLogger.LoggerUtil;
+import hw.log.BaseLogger.LoggerUtil;
-import haxework.view.form.InputView;
+import hw.view.form.InputView;
-import haxework.view.popup.PopupView;
+import hw.view.popup.PopupView;
-import haxework.view.text.TextView;
+import hw.view.text.TextView;
 import ru.m.tankz.network.NetworkManager;
 
 @:singleton @:template class LoginPopup extends PopupView<User> {

src/client/haxe/ru/m/tankz/view/popup/LoginPopup.yaml

@@ -2,62 +2,62 @@
 layout.hAlign: center
 layout.vAlign: middle
 view:
-    $type: haxework.view.group.VGroupView
+    $type: hw.view.group.VGroupView
     layout.hAlign: center
     geometry.width: 400
     # geometry.height: 400
     style: window
     views:
-        - $type: haxework.view.group.HGroupView
+        - $type: hw.view.group.HGroupView
           geometry.width: 100%
           geometry.padding: 10
           layout.vAlign: middle
           views:
               - id: name
-                $type: haxework.view.form.LabelView
+                $type: hw.view.form.LabelView
                 geometry.width: 100%
                 geometry.margin.left: 10
                 layout.hAlign: left
                 style: text
                 text: Login
-              - $type: haxework.view.form.ButtonView
+              - $type: hw.view.form.ButtonView
                 style: window.close
                 +onPress: ~reject('close')
-        - $type: haxework.view.group.VGroupView
+        - $type: hw.view.group.VGroupView
           geometry.width: 100%
           # geometry.stretch: true
           geometry.padding: 20
           layout.margin: 5
           views:
-              - $type: haxework.view.form.LabelView
+              - $type: hw.view.form.LabelView
                 geometry.width: 100%
                 style: text
                 text: Username
               - id: username
-                $type: haxework.view.form.InputView
+                $type: hw.view.form.InputView
                 geometry.width: 100%
                 style: text.box
-              - $type: haxework.view.form.LabelView
+              - $type: hw.view.form.LabelView
                 geometry.width: 100%
                 style: text
                 text: Password
                 visible: false
               - id: password
-                $type: haxework.view.form.InputView
+                $type: hw.view.form.InputView
                 textField.displayAsPassword: true
                 geometry.width: 100%
                 style: text.box
                 visible: false
               - id: error
-                $type: haxework.view.text.TextView
+                $type: hw.view.text.TextView
                 geometry.width: 100%
                 style: text
                 fill: false
-        - $type: haxework.view.group.HGroupView
+        - $type: hw.view.group.HGroupView
           layout.hAlign: center
           layout.margin: 5
           style: panel
           views:
-            - $type: haxework.view.form.ButtonView
+            - $type: hw.view.form.ButtonView
               text: Submit
               +onPress: ~submit()

src/client/haxe/ru/m/tankz/view/popup/PausePopup.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.view.popup;
 
-import haxework.view.popup.PopupView;
+import hw.view.popup.PopupView;
 
 enum Action {
     RESUME;

src/client/haxe/ru/m/tankz/view/popup/PausePopup.yaml

@@ -2,38 +2,38 @@
 layout.hAlign: center
 layout.vAlign: middle
 view:
-  $type: haxework.view.group.VGroupView
+  $type: hw.view.group.VGroupView
   layout.hAlign: center
   geometry.width: 400
   # geometry.height: 400
   style: window
   views:
-    - $type: haxework.view.group.HGroupView
+    - $type: hw.view.group.HGroupView
       geometry.width: 100%
       geometry.padding: 10
       layout.vAlign: middle
       views:
         - id: name
-          $type: haxework.view.form.LabelView
+          $type: hw.view.form.LabelView
           geometry.width: 100%
           geometry.margin.left: 10
           layout.hAlign: left
           style: text
           text: Pause
-        - $type: haxework.view.form.ButtonView
+        - $type: hw.view.form.ButtonView
           style: window.close
           +onPress: ~reject('close')
-    - $type: haxework.view.group.VGroupView
+    - $type: hw.view.group.VGroupView
       geometry.width: 100%
       # geometry.stretch: true
       geometry.padding: 20
       layout.margin: 5
       views:
-        - $type: haxework.view.form.ButtonView
+        - $type: hw.view.form.ButtonView
           geometry.width: 100%
           text: Resume
           +onPress: ~close(RESUME)
-        - $type: haxework.view.form.ButtonView
+        - $type: hw.view.form.ButtonView
           geometry.width: 100%
           text: Exit
           +onPress: ~close(EXIT)

src/client/haxe/ru/m/tankz/view/result/FragView.hx

@@ -1,7 +1,7 @@
 package ru.m.tankz.view.result;
 
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.group.HGroupView;
+import hw.view.group.HGroupView;
 import ru.m.tankz.game.GameState;
 import ru.m.tankz.render.RenderUtil;
 import ru.m.tankz.view.common.TankView;

src/client/haxe/ru/m/tankz/view/result/FragView.yaml

@@ -5,10 +5,10 @@ views:
   - id: tank
     $type: ru.m.tankz.view.common.TankView
   - id: title
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
-  - $type: haxework.view.SpriteView
+  - $type: hw.view.SpriteView
     geometry.width: 100%
   - id: score
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text.box
     geometry.width: 100

src/client/haxe/ru/m/tankz/view/result/ResultPlayerView.hx

@@ -1,9 +1,9 @@
 package ru.m.tankz.view.result;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.group.HGroupView;
+import hw.view.group.HGroupView;
-import haxework.view.group.VGroupView;
+import hw.view.group.VGroupView;
 import ru.m.tankz.game.GameState;
 import ru.m.tankz.view.common.TankView;
 

src/client/haxe/ru/m/tankz/view/result/ResultPlayerView.yaml

@@ -7,24 +7,24 @@ geometry.height: 100%
 layout.hAlign: center
 views:
   - id: player
-    $type: haxework.view.group.HGroupView
+    $type: hw.view.group.HGroupView
     geometry.width: 100%
     layout.vAlign: middle
     views:
     - id: tank
       $type: ru.m.tankz.view.common.TankView
     - id: title
-      $type: haxework.view.form.LabelView
+      $type: hw.view.form.LabelView
-    - $type: haxework.view.SpriteView
+    - $type: hw.view.SpriteView
       geometry.width: 100%
     - id: score
-      $type: haxework.view.form.LabelView
+      $type: hw.view.form.LabelView
       style: text.box
       geometry.width: 100
-  - $type: haxework.view.SpriteView
+  - $type: hw.view.SpriteView
     style: line
   - id: frags
-    $type: haxework.view.data.DataView
+    $type: hw.view.data.DataView
     factory: ~ru.m.tankz.view.result.FragView.factory
     geometry.stretch: true
     overflow.y: scroll

src/client/haxe/ru/m/tankz/view/settings/ActionView.hx

@@ -1,8 +1,8 @@
 package ru.m.tankz.view.settings;
 
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.group.HGroupView;
+import hw.view.group.HGroupView;
-import haxework.view.list.ListView;
+import hw.view.list.ListView;
 import ru.m.tankz.control.Binding;
 import ru.m.tankz.control.Control;
 

src/client/haxe/ru/m/tankz/view/settings/ActionView.yaml

@@ -2,10 +2,10 @@
 layout.margin: 5
 views:
   - id: action
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     geometry.width: 180
     style: text.box
   - id: key
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     geometry.width: 250
     style: text.box

src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.hx

@@ -1,9 +1,9 @@
 package ru.m.tankz.view.settings;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.group.GroupView;
+import hw.view.group.GroupView;
-import haxework.view.group.VGroupView;
+import hw.view.group.VGroupView;
 import promhx.Deferred;
 import promhx.Promise;
 import ru.m.control.DeviceAction;

src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.yaml

@@ -3,28 +3,28 @@ layout.hAlign: center
 geometry.width: 400
 views:
   - id: label
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text
   - id: panel
-    $type: haxework.view.group.GroupView
+    $type: hw.view.group.GroupView
     layout:
-        $type: haxework.view.layout.TailLayout
+        $type: hw.view.layout.TailLayout
         margin: 10
     geometry.width: 100%
     views:
-      - $type: haxework.view.form.ButtonView
+      - $type: hw.view.form.ButtonView
         +onPress: ~screen()
         text: Screen
-      - $type: haxework.view.form.ButtonView
+      - $type: hw.view.form.ButtonView
         +onPress: ~change()
         text: Change
-      - $type: haxework.view.form.ButtonView
+      - $type: hw.view.form.ButtonView
         +onPress: ~default_()
         text: Default
   - id: list
-    $type: haxework.view.data.DataView
+    $type: hw.view.data.DataView
     layout:
-      $type: haxework.view.layout.VerticalLayout
+      $type: hw.view.layout.VerticalLayout
       margin: 5
     factory: ~viewFactory
     +onItemSelect: ~onItemSelect

src/client/haxe/ru/m/update/Updater.hx

@@ -1,6 +1,6 @@
 package ru.m.update;
 
-import haxework.net.JsonLoader;
+import hw.net.JsonLoader;
 import openfl.Lib;
 import openfl.net.URLRequest;
 import promhx.Promise;

src/common/haxe/ru/m/Timer.hx

@@ -20,7 +20,7 @@ class Timer {
                 try {
                     run();
                 } catch (error:Dynamic) {
-                    trace(haxework.log.BaseLogger.LoggerUtil.printError(error));
+                    trace(hw.log.BaseLogger.LoggerUtil.printError(error));
                 }
             }
         });

src/common/haxe/ru/m/connect/BaseConnection.hx

@@ -1,6 +1,6 @@
 package ru.m.connect;
 
-import haxework.signal.Signal;
+import hw.signal.Signal;
 import haxe.io.Bytes;
 import promhx.Deferred;
 import promhx.Promise;

src/common/haxe/ru/m/connect/IConnection.hx

@@ -1,6 +1,6 @@
 package ru.m.connect;
 
-import haxework.signal.Signal;
+import hw.signal.Signal;
 import haxe.io.Bytes;
 import promhx.Promise;
 import protohx.Message;

src/common/haxe/ru/m/tankz/Type.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz;
 
-import haxework.color.Color;
+import hw.color.Color;
 
 typedef GameType = String;
 

src/common/haxe/ru/m/tankz/bundle/CachedLevelBundle.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.bundle;
 
-import haxework.storage.IStorage;
+import hw.storage.IStorage;
 import ru.m.tankz.bundle.ILevelBundle;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.Type;

src/common/haxe/ru/m/tankz/config/Config.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.config;
 
-import haxework.color.Color;
+import hw.color.Color;
 import ru.m.tankz.control.Controller;
 import ru.m.tankz.Type;
 

src/common/haxe/ru/m/tankz/control/PlayerControl.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.control;
 
-import haxework.color.Color;
+import hw.color.Color;
 import ru.m.tankz.Type;
 
 typedef PlayerControl = {

src/common/haxe/ru/m/tankz/core/Bullet.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.core;
 
-import haxework.color.Color;
+import hw.color.Color;
 import ru.m.geom.Direction;
 import ru.m.geom.Rectangle;
 import ru.m.tankz.config.Config;

src/common/haxe/ru/m/tankz/core/Eagle.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.core;
 
-import haxework.color.Color;
+import hw.color.Color;
 import ru.m.geom.Rectangle;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.Type;

src/common/haxe/ru/m/tankz/core/Tank.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.core;
 
-import haxework.color.Color;
+import hw.color.Color;
 import ru.m.geom.Direction;
 import ru.m.geom.Rectangle;
 import ru.m.tankz.config.Config;

src/common/haxe/ru/m/tankz/engine/IEngine.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.engine;
 
-import haxework.signal.Signal;
+import hw.signal.Signal;
 import ru.m.geom.Direction;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.core.Entity;

src/common/haxe/ru/m/tankz/game/EntityBuilder.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.game;
 
-import haxework.color.Color;
+import hw.color.Color;
 import ru.m.geom.Direction;
 import ru.m.geom.Point;
 import ru.m.geom.Rectangle;

src/common/haxe/ru/m/tankz/game/GameEvent.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.game;
 
-import haxework.color.Color;
+import hw.color.Color;
 import ru.m.geom.Position;
 import ru.m.geom.Rectangle;
 import ru.m.tankz.config.Config;

src/common/haxe/ru/m/tankz/game/GameState.hx

@@ -1,6 +1,6 @@
 package ru.m.tankz.game;
 
-import haxework.color.Color;
+import hw.color.Color;
 import ru.m.tankz.bundle.IConfigBundle;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.control.Controller;

src/common/haxe/ru/m/tankz/game/IGame.hx

@@ -1,7 +1,7 @@
 package ru.m.tankz.game;
 
 import ru.m.tankz.engine.ITicker;
-import haxework.signal.Signal;
+import hw.signal.Signal;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.control.Control;
 import ru.m.tankz.control.IControlFactory;

src/editor/haxe/ru/m/tankz/editor/ColorView.hx

@@ -1,9 +1,9 @@
 package ru.m.tankz.editor;
 
 import flash.events.MouseEvent;
-import haxework.color.Color;
+import hw.color.Color;
-import haxework.view.ImageView;
+import hw.view.ImageView;
-import haxework.signal.Signal;
+import hw.signal.Signal;
 import openfl.Assets;
 
 class ColorView extends ImageView {

src/editor/haxe/ru/m/tankz/editor/Editor.hx

@@ -1,11 +1,11 @@
 package ru.m.tankz.editor;
 
-import haxework.net.manage.LoaderManager;
+import hw.net.manage.LoaderManager;
-import haxework.resources.IResources;
+import hw.resources.IResources;
-import haxework.view.Root;
+import hw.view.Root;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.popup.PopupManager;
+import hw.view.popup.PopupManager;
-import haxework.view.theme.ITheme;
+import hw.view.theme.ITheme;
 import ru.m.animate.AnimateManager;
 import ru.m.tankz.bundle.CachedLevelBundle;
 import ru.m.tankz.bundle.ClientLevelSource;
@@ -26,12 +26,12 @@ class Editor {
     @:provide static var levelBundle:ILevelBundle;
 
     public static function main() {
-        L.push(new haxework.log.TraceLogger());
+        L.push(new hw.log.TraceLogger());
         #if flash
-        L.push(new haxework.log.JSLogger());
+        L.push(new hw.log.JSLogger());
         #end
         #if debug
-        //L.push(new haxework.log.SocketLogger());
+        //L.push(new hw.log.SocketLogger());
         #end
         // ToDo: fix @:provide macro
         PopupManager;

src/editor/haxe/ru/m/tankz/editor/EditorStorage.hx

@@ -1,7 +1,7 @@
 package ru.m.tankz.editor;
 
 import haxe.DynamicAccess;
-import haxework.storage.SharedObjectStorage;
+import hw.storage.SharedObjectStorage;
 import ru.m.tankz.config.Config;
 
 @:provide class EditorStorage extends SharedObjectStorage {

src/editor/haxe/ru/m/tankz/editor/view/EditorView.hx

@@ -1,7 +1,7 @@
 package ru.m.tankz.editor.view;
 
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.group.VGroupView;
+import hw.view.group.VGroupView;
 
 @:template class EditorView extends VGroupView {
     @:view public var switcher(default, null):FrameSwitcher;