rename package

src/common/haxe/ru/m/armageddon/z.hx

@@ -1,3 +0,0 @@
-package ru.m.armageddon;
-interface z {
-}

src/common/haxe/ru/m/core/Base64.hx

@@ -1,10 +1,7 @@
-package ru.m.armageddon.core;
+package ru.m.core;
 
-#if haxe3
+import haxe.io.Bytes;
 import haxe.crypto.BaseCode;
-#else
-import haxe.BaseCode;
-#end
 
 class Base64 {
     private inline static var BASE64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -16,7 +13,7 @@ class Base64 {
 
     static function getCodec():BaseCode {
         if (codec == null) {
-            var bytes = haxe.io.Bytes.ofString(BASE64);
+            var bytes = Bytes.ofString(BASE64);
             codec = new BaseCode(bytes);
         }
         return codec;
@@ -44,8 +41,8 @@ class Base64 {
         return s.substr(0, len);
     }
 
-    public static function decodeBase64(content:String):haxe.io.Bytes {
-        var bytes:haxe.io.Bytes = haxe.io.Bytes.ofString(removeNullbits(content));
+    public static function decodeBase64(content:String):Bytes {
+        var bytes:Bytes = Bytes.ofString(removeNullbits(content));
         return getCodec().decodeBytes(bytes);
     }
 

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

@@ -1,9 +1,10 @@
-package ru.m.armageddon.core.connect;
+package ru.m.core.connect;
 
+import haxework.provider.Provider;
 import haxework.net.callback.ICallback;
 import haxe.io.Bytes;
 import protohx.Message;
-import ru.m.armageddon.core.connect.IConnection;
+import ru.m.core.connect.IConnection;
 
 class BaseConnection implements IConnection {
   public var handler(default,default):IConnectionHandler;
@@ -13,7 +14,7 @@ class BaseConnection implements IConnection {
   public var builder(default, null):IPacketBuilder;
 
   public function new(?handler:IConnectionHandler = null, ?packetHandler:IPacketHandler) {
-    this.builder = new PacketBuilder();
+    this.builder = Provider.get(IPacketBuilder);
     this.queue = new PacketQueue(builder);
     this.packetHandler = packetHandler;
     this.handler = handler;

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

@@ -1,4 +1,4 @@
-package ru.m.armageddon.core.connect;
+package ru.m.core.connect;
 
 import haxework.net.callback.ICallback;
 import haxe.io.Bytes;

src/common/haxe/ru/m/core/connect/PacketQueue.hx

@@ -1,6 +1,6 @@
-package ru.m.armageddon.core.connect;
+package ru.m.core.connect;
 
-import ru.m.armageddon.core.connect.IConnection.IPacketBuilder;
+import ru.m.core.connect.IConnection.IPacketBuilder;
 import protohx.Message;
 import haxe.io.BytesInput;
 import haxe.io.BytesBuffer;

src/common/haxe/ru/m/core/connect/WebSocketTools.hx

@@ -1,8 +1,8 @@
-package ru.m.armageddon.core.connect;
+package ru.m.core.connect;
 
 import haxe.io.Bytes;
 import haxe.io.BytesOutput;
-import ru.m.armageddon.core.connect.IConnection;
+import ru.m.core.connect.IConnection;
 import protohx.Message;
 
 class WebSocketTools {

src/common/haxe/ru/m/core/connect/flash/FlashConnection.hx

@@ -1,8 +1,8 @@
-package ru.m.armageddon.core.connect.flash;
+package ru.m.core.connect.flash;
 
 import haxework.net.callback.Callback;
 import haxework.net.callback.ICallback;
-import ru.m.armageddon.core.connect.IConnection.IConnectionHandler;
+import ru.m.core.connect.IConnection.IConnectionHandler;
 import flash.utils.Endian;
 import haxe.io.BytesOutput;
 import protohx.Message;

src/common/haxe/ru/m/core/connect/js/JsConnection.hx

@@ -1,9 +1,9 @@
-package ru.m.armageddon.core.connect.js;
+package ru.m.core.connect.js;
 
-import ru.m.armageddon.core.Base64;
+import ru.m.core.Base64;
 import haxework.net.callback.Callback;
 import haxework.net.callback.ICallback;
-import ru.m.armageddon.core.connect.IConnection.IConnectionHandler;
+import ru.m.core.connect.IConnection.IConnectionHandler;
 import protohx.Message;
 import haxe.io.Bytes;
 

src/common/haxe/ru/m/core/connect/neko/NekoConnection.hx

@@ -1,10 +1,10 @@
-package ru.m.armageddon.core.connect.neko;
+package ru.m.core.connect.neko;
 
 import haxe.io.BytesOutput;
 import protohx.Message;
 import haxe.io.Bytes;
 import sys.net.Socket;
-import ru.m.armageddon.core.connect.IConnection;
+import ru.m.core.connect.IConnection;
 
 class NekoConnection extends BaseConnection {
 

src/common/haxe/ru/m/core/connect/neko/NekoWebConnection.hx

@@ -1,11 +1,11 @@
-package ru.m.armageddon.core.connect.neko;
+package ru.m.core.connect.neko;
 
 import haxe.crypto.BaseCode;
 import haxe.crypto.Sha1;
 import protohx.Message;
 import haxe.io.Bytes;
 import sys.net.Socket;
-import ru.m.armageddon.core.connect.IConnection;
+import ru.m.core.connect.IConnection;
 
 class NekoWebConnection extends NekoConnection {
 

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

@@ -1,12 +1,12 @@
-package ru.m.armageddon.core.connect;
+package ru.m.tankz;
 
-import ru.m.armageddon.core.connect.IConnection;
+import ru.m.core.connect.IConnection;
 import protohx.Message;
-import ru.m.armageddon.proto.LoginRequest;
-import ru.m.armageddon.proto.LoginResponse;
-import ru.m.armageddon.proto.PersonSelectRequest;
-import ru.m.armageddon.proto.PersonSelectResponse;
-import ru.m.armageddon.proto.ErrorResponse;
+import ru.m.tankz.proto.LoginRequest;
+import ru.m.tankz.proto.LoginResponse;
+import ru.m.tankz.proto.PersonSelectRequest;
+import ru.m.tankz.proto.PersonSelectResponse;
+import ru.m.tankz.proto.ErrorResponse;
 
 class PacketBuilder implements IPacketBuilder {