rename package

project.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
-  <meta title="Armageddon" package="ru.m.armageddon" version="0.0.0" company="m"/>
-  <app main="ru.m.armageddon.client.Client" path="target" file="armageddon"/>
+  <meta title="Armageddon" package="ru.m.tankz" version="0.0.0" company="m"/>
+  <app main="ru.m.tankz.Client" path="target" file="armageddon"/>
   <source path="src/common/haxe"/>
   <source path="src/client/haxe"/>
   <source path="src-gen/haxe"/>

proto/base.proto

@@ -1,4 +1,4 @@
-package ru.m.armageddon.proto;
+package ru.m.tankz.proto;
 
 message Person {
   required int32 id = 1;

res/layout/main.json

@@ -3,7 +3,7 @@
   "skin":{"type":"haxework.gui.skin.ColorSkin", "color":"0x000000"},
   "views":[
     {
-      "id":"auth", "type":"ru.m.armageddon.client.frames.AuthFrame",
+      "id":"auth", "type":"ru.m.tankz.view.frames.AuthFrame",
       "skin":{"type":"haxework.gui.skin.ColorSkin", "color":"0xa0a0a0"},
       "pWidth":100, "pHeight":100, "layoutMargin":3,
       "views":[
@@ -51,14 +51,14 @@
 
 
     {
-      "id":"person", "type":"ru.m.armageddon.client.frames.PersonFrame",
+      "id":"person", "type":"ru.m.tankz.view.frames.PersonFrame",
       "skin":{"type":"haxework.gui.skin.ColorSkin", "color":"0xa0a0a0"},
       "pWidth":100, "pHeight":100, "layoutMargin":3, "paddings":10,
       "views":[
         {
           "id":"list", "type":"haxework.gui.list.VListView",
           "factory":{
-            "type":"~ru.m.armageddon.client.frames.person.PersonView"
+            "type":"~ru.m.tankz.view.frames.person.PersonView"
           },
           "scroll":{
             "type":"haxework.gui.list.VScrollView",
@@ -70,7 +70,7 @@
     },
 
     {
-      "id":"game", "type":"ru.m.armageddon.client.frames.GameFrame",
+      "id":"game", "type":"ru.m.tankz.view.frames.GameFrame",
       "skin":{"type":"haxework.gui.skin.ColorSkin", "color":"0xa0a0a0"},
       "pWidth":100, "pHeight":100,
       "views":[

server.hxml

@@ -1,4 +1,4 @@
--main ru.m.armageddon.server.Server
+-main ru.m.tankz.server.Server
 -lib protohx
 -lib haxework
 -cp src/common/haxe

src/client/haxe/ru/m/armageddon/client/data/GameData.hx

@@ -1,9 +0,0 @@
-package ru.m.armageddon.client.data;
-
-import ru.m.armageddon.proto.Person;
-import ru.m.armageddon.proto.Account;
-
-class GameData {
-  public var account:Account;
-  public var person:Person;
-}

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

@@ -1,19 +1,20 @@
-package ru.m.armageddon.client;
+package ru.m.tankz;
 
+import ru.m.tankz.PacketBuilder;
 import flash.text.TextFieldType;
 import flash.Lib;
 import flash.text.TextField;
 import haxework.log.JSLogger;
-import ru.m.armageddon.client.data.GameData;
+import ru.m.tankz.data.GameData;
 import haxework.frame.IFrameSwitcher;
 import haxework.provider.Provider;
-import ru.m.armageddon.client.frames.AuthFrame;
+import ru.m.tankz.view.frames.AuthFrame;
 import haxework.frame.FrameSwitcher;
 import haxework.gui.Root;
 import haxework.gui.GuiBuilder;
 import haxe.Json;
 import openfl.Assets;
-import ru.m.armageddon.core.connect.IConnection;
+import ru.m.core.connect.IConnection;
 import haxework.log.TraceLogger;
 
 class Client implements IConnectionHandler {
@@ -38,10 +39,11 @@ class Client implements IConnectionHandler {
 
     Provider.setFactory(GameData, GameData);
     Provider.set(IFrameSwitcher, switcher);
+    Provider.set(IPacketBuilder, new PacketBuilder());
     #if flash
-    Provider.set(IConnection, new ru.m.armageddon.core.connect.flash.FlashConnection("localhost", 5001, this));
+    Provider.set(IConnection, new ru.m.core.connect.flash.FlashConnection("localhost", 5001, this));
     #elseif html5
-    Provider.set(IConnection, new ru.m.armageddon.core.connect.js.JsConnection("localhost", 5001, this));
+    Provider.set(IConnection, new ru.m.core.connect.js.JsConnection("localhost", 5001, this));
     #end
 
     switcher.change(AuthFrame.ID);

src/client/haxe/ru/m/tankz/data/GameData.hx

@@ -0,0 +1,9 @@
+package ru.m.tankz.data;
+
+import ru.m.tankz.proto.Person;
+import ru.m.tankz.proto.Account;
+
+class GameData {
+  public var account:Account;
+  public var person:Person;
+}

src/client/haxe/ru/m/tankz/view/frames/AuthFrame.hx

@@ -1,13 +1,14 @@
-package ru.m.armageddon.client.frames;
+package ru.m.tankz.view.frames;
 
-import ru.m.armageddon.client.data.GameData;
+import ru.m.core.connect.IConnection;
+import ru.m.tankz.data.GameData;
 import flash.net.SharedObject;
-import ru.m.armageddon.proto.ErrorResponse;
+import ru.m.tankz.proto.ErrorResponse;
 import protohx.Message;
 import haxework.frame.IFrameSwitcher;
-import ru.m.armageddon.proto.LoginRequest;
-import ru.m.armageddon.proto.LoginResponse;
-import ru.m.armageddon.core.connect.IConnection;
+import ru.m.tankz.proto.LoginRequest;
+import ru.m.tankz.proto.LoginResponse;
+import ru.m.core.connect.IConnection;
 import haxework.provider.Provider;
 import haxe.crypto.Md5;
 import haxework.gui.InputView;

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

@@ -1,14 +1,14 @@
-package ru.m.armageddon.client.frames;
+package ru.m.tankz.view.frames;
 
 import ru.m.tankz.render.IRender;
 import flash.events.Event;
 import ru.m.tankz.game.Tankz;
 import ru.m.tankz.game.ITankz;
-import ru.m.armageddon.core.connect.IConnection;
+import ru.m.core.connect.IConnection;
 import haxework.gui.LabelView;
 import haxework.gui.ButtonView;
 import haxework.provider.Provider;
-import ru.m.armageddon.client.data.GameData;
+import ru.m.tankz.data.GameData;
 import haxework.gui.VGroupView;
 import ru.m.tankz.render.Render;
 

src/client/haxe/ru/m/tankz/view/frames/PersonFrame.hx

@@ -1,15 +1,15 @@
-package ru.m.armageddon.client.frames;
+package ru.m.tankz.view.frames;
 
 import haxework.frame.IFrameSwitcher;
-import ru.m.armageddon.proto.PersonSelectResponse;
-import ru.m.armageddon.proto.PersonSelectRequest;
+import ru.m.tankz.proto.PersonSelectResponse;
+import ru.m.tankz.proto.PersonSelectRequest;
 import haxework.gui.list.ListView;
 import protohx.Message;
-import ru.m.armageddon.core.connect.IConnection;
-import ru.m.armageddon.client.frames.person.PersonView;
-import ru.m.armageddon.client.data.GameData;
+import ru.m.core.connect.IConnection;
+import ru.m.tankz.view.frames.person.PersonView;
+import ru.m.tankz.data.GameData;
 import haxework.provider.Provider;
-import ru.m.armageddon.proto.Person;
+import ru.m.tankz.proto.Person;
 import haxework.gui.list.VListView;
 import haxework.gui.HGroupView;
 

src/client/haxe/ru/m/tankz/view/frames/person/PersonView.hx

@@ -1,8 +1,8 @@
-package ru.m.armageddon.client.frames.person;
+package ru.m.tankz.view.frames.person;
 
 import haxework.gui.list.ListView.IListItemView;
 import haxework.gui.LabelView;
-import ru.m.armageddon.proto.Person;
+import ru.m.tankz.proto.Person;
 import haxework.gui.skin.ColorSkin;
 import haxework.gui.HGroupView;
 

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 {
 

src/server/haxe/ru/m/armageddon/server/ServerTest.hx

@@ -1,12 +0,0 @@
-package ru.m.armageddon.server;
-
-class ServerTest {
-
-  public static function main() {
-
-  }
-
-  public function new() {
-
-  }
-}

src/server/haxe/ru/m/tankz/server/Server.hx

@@ -1,9 +1,11 @@
-package ru.m.armageddon.server;
+package ru.m.tankz.server;
 
-import ru.m.armageddon.core.connect.neko.NekoWebConnection;
-import ru.m.armageddon.core.connect.neko.NekoConnection;
+import ru.m.core.connect.IConnection.IPacketBuilder;
+import haxework.provider.Provider;
+import ru.m.core.connect.neko.NekoWebConnection;
+import ru.m.core.connect.neko.NekoConnection;
 import haxework.log.TraceLogger;
-import ru.m.armageddon.server.session.Session;
+import ru.m.tankz.server.session.Session;
 import haxe.io.Bytes;
 import sys.net.Socket;
 import neko.net.ThreadServer;
@@ -48,6 +50,7 @@ class Server extends ThreadServer<Session, Bytes> {
   public static function main() {
     L.push(new TraceLogger());
     L.d(TAG, "Running");
+    Provider.set(IPacketBuilder, new PacketBuilder());
     //var server = new Server(ServerMode.NORMAL_SOCKET);
     //server.run("localhost", 5001);
     var wserver = new Server(ServerMode.WEB_SOCKET);

src/server/haxe/ru/m/tankz/server/db/Db.hx

@@ -1,7 +1,7 @@
-package ru.m.armageddon.server.db;
+package ru.m.tankz.server.db;
 
-import ru.m.armageddon.proto.Person;
-import ru.m.armageddon.proto.Account;
+import ru.m.tankz.proto.Person;
+import ru.m.tankz.proto.Account;
 import sys.db.Mysql;
 import sys.db.Connection;
 

src/server/haxe/ru/m/tankz/server/session/Session.hx

@@ -1,15 +1,15 @@
-package ru.m.armageddon.server.session;
+package ru.m.tankz.server.session;
 
-import ru.m.armageddon.proto.PersonSelectResponse;
-import ru.m.armageddon.proto.PersonSelectRequest;
-import ru.m.armageddon.proto.Account;
-import ru.m.armageddon.core.connect.neko.NekoConnection;
-import ru.m.armageddon.proto.ErrorResponse;
-import ru.m.armageddon.server.db.Db;
-import ru.m.armageddon.proto.LoginResponse;
-import ru.m.armageddon.proto.LoginRequest;
+import ru.m.tankz.proto.PersonSelectResponse;
+import ru.m.tankz.proto.PersonSelectRequest;
+import ru.m.tankz.proto.Account;
+import ru.m.core.connect.neko.NekoConnection;
+import ru.m.tankz.proto.ErrorResponse;
+import ru.m.tankz.server.db.Db;
+import ru.m.tankz.proto.LoginResponse;
+import ru.m.tankz.proto.LoginRequest;
 import protohx.Message;
-import ru.m.armageddon.core.connect.IConnection;
+import ru.m.core.connect.IConnection;
 import sys.net.Socket;
 
 class Session implements IConnectionHandler implements IPacketHandler {