MCSM -> SpacePort

bridge/build.gradle

@@ -1,5 +1,5 @@
 group = 'asys'
-version = '0.8.4'
+version = '0.8.5'
 
 repositories {
     maven { url 'https://hub.spigotmc.org/nexus/content/groups/public/' }

bridge/src/main/java/asys/bridge/bukkit/BridgeBukkitImpl.java

@@ -8,7 +8,7 @@ import asys.bridge.client.AbstractBridge;
 import asys.bridge.client.IBridge;
 import asys.bridge.client.IConfig;
 import asys.bridge.client.ILogger;
-import asys.mcsmanager.packets.CS_Ping;
+import asys.spaceport.packets.CS_Ping;
 
 public class BridgeBukkitImpl extends AbstractBridge implements IBridge {
     private BridgePlugin plugin;

bridge/src/main/java/asys/bridge/client/AbstractBridge.java

@@ -5,8 +5,8 @@
 package asys.bridge.client;
 
 import asys.bridge.bukkit.TaskTicker;
-import asys.mcsmanager.packets.CS_CorrectShutdown;
+import asys.spaceport.packets.CS_CorrectShutdown;
-import asys.mcsmanager.packets.CS_Ping;
+import asys.spaceport.packets.CS_Ping;
 
 public abstract class AbstractBridge implements IBridge {
     protected Client client;

bridge/src/main/java/asys/bridge/client/Client.java

@@ -4,10 +4,10 @@
  */
 package asys.bridge.client;
 
-import asys.mcsmanager.packets.Packet;
+import asys.spaceport.packets.Packet;
-import asys.mcsmanager.packets.codec.PacketDecoder;
+import asys.spaceport.packets.codec.PacketDecoder;
-import asys.mcsmanager.packets.codec.PacketEncoder;
+import asys.spaceport.packets.codec.PacketEncoder;
-import asys.mcsmanager.packets.codec.PacketHandler;
+import asys.spaceport.packets.codec.PacketHandler;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;

bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java

@@ -4,7 +4,7 @@
  */
 package asys.bridge.client;
 
-import asys.mcsmanager.packets.*;
+import asys.spaceport.packets.*;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableMap;
@@ -13,8 +13,8 @@ import io.netty.channel.ChannelInboundHandlerAdapter;
 
 import java.util.Map;
 
-import static asys.mcsmanager.packets.codec.Params.KNOWN_HANDLERS;
+import static asys.spaceport.packets.codec.Params.KNOWN_HANDLERS;
-import static asys.mcsmanager.packets.codec.Params.KNOWN_PACKETS;
+import static asys.spaceport.packets.codec.Params.KNOWN_PACKETS;
 
 public class ClientPacketHandler extends ChannelInboundHandlerAdapter implements IPacketHandler {
     private static Map<Class<? extends Packet>, IPacketHandler> knownHandlers;

libprotocol/build.gradle

@@ -1,5 +1,5 @@
 group = 'asys'
-version = '0.6-SNAPSHOT'
+version = '0.6.1-SNAPSHOT'
 
 task jar(type: Jar, overwrite: true) {
     // не собирать jar

libprotocol/src/main/java/asys/spaceport/packets/CS_ConsoleMessage.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-05-17
  */
-package asys.mcsmanager.packets;
+package asys.spaceport.packets;
 
 import io.netty.buffer.ByteBuf;
 

libprotocol/src/main/java/asys/spaceport/packets/CS_CorrectShutdown.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-07-22
  */
-package asys.mcsmanager.packets;
+package asys.spaceport.packets;
 
 import io.netty.buffer.ByteBuf;
 

libprotocol/src/main/java/asys/spaceport/packets/CS_Handshake.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-26
  */
-package asys.mcsmanager.packets;
+package asys.spaceport.packets;
 
 import io.netty.buffer.ByteBuf;
 

libprotocol/src/main/java/asys/spaceport/packets/CS_Ping.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-26
  */
-package asys.mcsmanager.packets;
+package asys.spaceport.packets;
 
 import io.netty.buffer.ByteBuf;
 

libprotocol/src/main/java/asys/spaceport/packets/IPacketHandler.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-26
  */
-package asys.mcsmanager.packets;
+package asys.spaceport.packets;
 
 import io.netty.channel.ChannelHandlerContext;
 

libprotocol/src/main/java/asys/spaceport/packets/Packet.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-26
  */
-package asys.mcsmanager.packets;
+package asys.spaceport.packets;
 
 import io.netty.buffer.ByteBuf;
 

libprotocol/src/main/java/asys/spaceport/packets/SC_Command.java

@@ -2,7 +2,7 @@
  * DmitriyMX <d.mihailov@samson-rus.com>
  * 2017-06-05
  */
-package asys.mcsmanager.packets;
+package asys.spaceport.packets;
 
 import io.netty.buffer.ByteBuf;
 

libprotocol/src/main/java/asys/spaceport/packets/SC_HandshakeResult.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-26
  */
-package asys.mcsmanager.packets;
+package asys.spaceport.packets;
 
 import io.netty.buffer.ByteBuf;
 

libprotocol/src/main/java/asys/spaceport/packets/SC_ToggleSendMessages.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-06-11
  */
-package asys.mcsmanager.packets;
+package asys.spaceport.packets;
 
 import io.netty.buffer.ByteBuf;
 

libprotocol/src/main/java/asys/spaceport/packets/codec/PacketDecoder.java

@@ -2,17 +2,17 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-26
  */
-package asys.mcsmanager.packets.codec;
+package asys.spaceport.packets.codec;
 
-import asys.mcsmanager.packets.Packet;
+import asys.spaceport.packets.Packet;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ReplayingDecoder;
 
 import java.util.List;
 
-import static asys.mcsmanager.packets.codec.Params.KNOWN_HANDLERS;
+import static asys.spaceport.packets.codec.Params.KNOWN_HANDLERS;
-import static asys.mcsmanager.packets.codec.Params.KNOWN_PACKETS;
+import static asys.spaceport.packets.codec.Params.KNOWN_PACKETS;
 
 public class PacketDecoder extends ReplayingDecoder<Packet> {
     @Override

libprotocol/src/main/java/asys/spaceport/packets/codec/PacketEncoder.java

@@ -2,14 +2,14 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-26
  */
-package asys.mcsmanager.packets.codec;
+package asys.spaceport.packets.codec;
 
-import asys.mcsmanager.packets.Packet;
+import asys.spaceport.packets.Packet;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 
-import static asys.mcsmanager.packets.codec.Params.KNOWN_PACKETS;
+import static asys.spaceport.packets.codec.Params.KNOWN_PACKETS;
 
 public class PacketEncoder extends MessageToByteEncoder<Packet> {
     @Override

libprotocol/src/main/java/asys/spaceport/packets/codec/PacketHandler.java

@@ -2,13 +2,13 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-26
  */
-package asys.mcsmanager.packets.codec;
+package asys.spaceport.packets.codec;
 
-import asys.mcsmanager.packets.Packet;
+import asys.spaceport.packets.Packet;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 
-import static asys.mcsmanager.packets.codec.Params.KNOWN_HANDLERS;
+import static asys.spaceport.packets.codec.Params.KNOWN_HANDLERS;
 
 public class PacketHandler extends SimpleChannelInboundHandler<Packet> {
     @Override

libprotocol/src/main/java/asys/spaceport/packets/codec/Params.java

@@ -2,10 +2,10 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-26
  */
-package asys.mcsmanager.packets.codec;
+package asys.spaceport.packets.codec;
 
-import asys.mcsmanager.packets.Packet;
+import asys.spaceport.packets.Packet;
-import asys.mcsmanager.packets.IPacketHandler;
+import asys.spaceport.packets.IPacketHandler;
 import com.google.common.collect.BiMap;
 import io.netty.util.AttributeKey;
 

settings.gradle

@@ -1,7 +1,7 @@
 rootProject.name = 'asys'
 include 'core'
 include 'webinterface'
-include 'mcserver-manager'
+include 'spaceport'
 include 'libprotocol'
 include 'bridge'
 include 'zond'

spaceport/build.gradle

@@ -1,5 +1,5 @@
 group = 'asys'
-version = '0.10.6-SNAPSHOT'
+version = '0.10.7-SNAPSHOT'
 
 apply plugin: 'osgi'
 

spaceport/src/main/java/asys/spaceport/Activator.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-03-11
  */
-package asys.mcsmanager;
+package asys.spaceport;
 
 import asys.api.Config;
 import asys.webinterface.api.Webinterface;
@@ -19,8 +19,8 @@ public class Activator implements BundleActivator, ServiceListener {
     private ServiceTracker<?, Webinterface> serviceTracker;
     private MCSM_WebModule module;
     private Webinterface webinterface;
-    private asys.mcsmanager.server.Server serverManager;
+    private asys.spaceport.server.Server serverManager;
-    private asys.mcsmanager.websocket.Server webconsoleServer;
+    private asys.spaceport.websocket.Server webconsoleServer;
 
     @Override
     public void start(BundleContext context) throws Exception {
@@ -41,13 +41,13 @@ public class Activator implements BundleActivator, ServiceListener {
         int port = config.getInt("asys.mcsmanager.port", 8779);
         String passcode = config.getString("asys.mcsmanager.passcode", "testpasscode");
         logger.debug("Start server manager: {}:{}", host, port);
-        serverManager = new asys.mcsmanager.server.Server();
+        serverManager = new asys.spaceport.server.Server();
         serverManager.start(host, port, passcode);
 
         host = config.getString("asys.mcsmanager.webconsole.host", "127.0.0.1");
         port = config.getInt("asys.mcsmanager.webconsole.port", 8770);
         logger.debug("Start webconsole server: {}:{}", host, port);
-        webconsoleServer = new asys.mcsmanager.websocket.Server();
+        webconsoleServer = new asys.spaceport.websocket.Server();
         webconsoleServer.start(host, port);
 
         serviceConfigTracker.close();

spaceport/src/main/java/asys/spaceport/CSPingJsonSerializer.java

@@ -2,9 +2,9 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-05-02
  */
-package asys.mcsmanager;
+package asys.spaceport;
 
-import asys.mcsmanager.packets.CS_Ping;
+import asys.spaceport.packets.CS_Ping;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;

spaceport/src/main/java/asys/spaceport/Linker.java

@@ -2,11 +2,11 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-05-01
  */
-package asys.mcsmanager;
+package asys.spaceport;
 
-import asys.mcsmanager.packets.CS_ConsoleMessage;
+import asys.spaceport.packets.CS_ConsoleMessage;
-import asys.mcsmanager.packets.SC_Command;
+import asys.spaceport.packets.SC_Command;
-import asys.mcsmanager.packets.SC_ToggleSendMessages;
+import asys.spaceport.packets.SC_ToggleSendMessages;
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 

spaceport/src/main/java/asys/spaceport/MCSM_WebModule.java

@@ -2,9 +2,9 @@
  * DmitriyMX <mail@dmitriymx.ru>
  * 2017-03-15
  */
-package asys.mcsmanager;
+package asys.spaceport;
 
-import asys.mcsmanager.packets.CS_Ping;
+import asys.spaceport.packets.CS_Ping;
 import asys.webinterface.api.WebModule;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

spaceport/src/main/java/asys/spaceport/ServerInfo.java

@@ -2,9 +2,9 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-05-02
  */
-package asys.mcsmanager;
+package asys.spaceport;
 
-import asys.mcsmanager.packets.CS_Ping;
+import asys.spaceport.packets.CS_Ping;
 import io.netty.channel.Channel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

spaceport/src/main/java/asys/spaceport/ServerInfoSerializer.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-05-02
  */
-package asys.mcsmanager;
+package asys.spaceport;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;

spaceport/src/main/java/asys/spaceport/server/HandshakeResult.java

@@ -2,9 +2,9 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-26
  */
-package asys.mcsmanager.server;
+package asys.spaceport.server;
 
-import asys.mcsmanager.packets.SC_HandshakeResult;
+import asys.spaceport.packets.SC_HandshakeResult;
 
 abstract class HandshakeResult {
     static final SC_HandshakeResult OK = new SC_HandshakeResult(0, "OK");

spaceport/src/main/java/asys/spaceport/server/Server.java

@@ -2,13 +2,13 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-26
  */
-package asys.mcsmanager.server;
+package asys.spaceport.server;
 
-import asys.mcsmanager.packets.CS_Ping;
+import asys.spaceport.packets.CS_Ping;
-import asys.mcsmanager.packets.Packet;
+import asys.spaceport.packets.Packet;
-import asys.mcsmanager.packets.codec.PacketDecoder;
+import asys.spaceport.packets.codec.PacketDecoder;
-import asys.mcsmanager.packets.codec.PacketEncoder;
+import asys.spaceport.packets.codec.PacketEncoder;
-import asys.mcsmanager.packets.codec.PacketHandler;
+import asys.spaceport.packets.codec.PacketHandler;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableBiMap;
 import io.netty.bootstrap.ServerBootstrap;

spaceport/src/main/java/asys/spaceport/server/ServerPacketHandler.java

@@ -2,22 +2,21 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-26
  */
-package asys.mcsmanager.server;
+package asys.spaceport.server;
 
-import asys.mcsmanager.Linker;
+import asys.spaceport.Linker;
-import asys.mcsmanager.packets.*;
+import asys.spaceport.packets.*;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableMap;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.util.AttributeKey;
-import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 
-import static asys.mcsmanager.packets.codec.Params.KNOWN_HANDLERS;
+import static asys.spaceport.packets.codec.Params.KNOWN_HANDLERS;
-import static asys.mcsmanager.packets.codec.Params.KNOWN_PACKETS;
+import static asys.spaceport.packets.codec.Params.KNOWN_PACKETS;
 
 class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacketHandler {
     private static final BiMap<Integer, Class<? extends Packet>> handshakePackets = ImmutableBiMap.of(

spaceport/src/main/java/asys/spaceport/websocket/FrameHandler.java

@@ -2,9 +2,9 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-05-09
  */
-package asys.mcsmanager.websocket;
+package asys.spaceport.websocket;
 
-import asys.mcsmanager.Linker;
+import asys.spaceport.Linker;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;

spaceport/src/main/java/asys/spaceport/websocket/Server.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-05-08
  */
-package asys.mcsmanager.websocket;
+package asys.spaceport.websocket;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelInitializer;

zond/build.gradle

@@ -1,5 +1,5 @@
 group = 'asys'
-version = '0.7.17'
+version = '0.7.18'
 
 apply plugin: 'application'
 

zond/src/main/java/asys/zond/proxy/client/Client.java

@@ -4,10 +4,10 @@
  */
 package asys.zond.proxy.client;
 
-import asys.mcsmanager.packets.Packet;
+import asys.spaceport.packets.Packet;
-import asys.mcsmanager.packets.codec.PacketDecoder;
+import asys.spaceport.packets.codec.PacketDecoder;
-import asys.mcsmanager.packets.codec.PacketEncoder;
+import asys.spaceport.packets.codec.PacketEncoder;
-import asys.mcsmanager.packets.codec.PacketHandler;
+import asys.spaceport.packets.codec.PacketHandler;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandler;

zond/src/main/java/asys/zond/proxy/client/ClientPacketHandler.java

@@ -4,7 +4,7 @@
  */
 package asys.zond.proxy.client;
 
-import asys.mcsmanager.packets.*;
+import asys.spaceport.packets.*;
 import asys.zond.Config;
 import asys.zond.shell.Shell;
 import com.google.common.collect.BiMap;
@@ -15,8 +15,8 @@ import io.netty.channel.ChannelInboundHandlerAdapter;
 
 import java.util.Map;
 
-import static asys.mcsmanager.packets.codec.Params.KNOWN_HANDLERS;
+import static asys.spaceport.packets.codec.Params.KNOWN_HANDLERS;
-import static asys.mcsmanager.packets.codec.Params.KNOWN_PACKETS;
+import static asys.spaceport.packets.codec.Params.KNOWN_PACKETS;
 
 public class ClientPacketHandler extends ChannelInboundHandlerAdapter implements IPacketHandler {
     private final BiMap<Integer, Class<? extends Packet>> handshakePackets;

zond/src/main/java/asys/zond/proxy/client/Connector.java

@@ -4,7 +4,7 @@
  */
 package asys.zond.proxy.client;
 
-import asys.mcsmanager.packets.Packet;
+import asys.spaceport.packets.Packet;
 import asys.zond.Config;
 import asys.zond.proxy.TaskTicker;
 import asys.zond.shell.Shell;

zond/src/main/java/asys/zond/proxy/server/Server.java

@@ -4,9 +4,9 @@
  */
 package asys.zond.proxy.server;
 
-import asys.mcsmanager.packets.codec.PacketDecoder;
+import asys.spaceport.packets.codec.PacketDecoder;
-import asys.mcsmanager.packets.codec.PacketEncoder;
+import asys.spaceport.packets.codec.PacketEncoder;
-import asys.mcsmanager.packets.codec.PacketHandler;
+import asys.spaceport.packets.codec.PacketHandler;
 import asys.zond.PingMonitor;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelHandler;

zond/src/main/java/asys/zond/proxy/server/ServerPacketHandler.java

@@ -4,7 +4,7 @@
  */
 package asys.zond.proxy.server;
 
-import asys.mcsmanager.packets.*;
+import asys.spaceport.packets.*;
 import asys.zond.PingMonitor;
 import asys.zond.proxy.client.Connector;
 import com.google.common.collect.BiMap;
@@ -15,8 +15,8 @@ import io.netty.channel.ChannelInboundHandlerAdapter;
 
 import java.util.Map;
 
-import static asys.mcsmanager.packets.codec.Params.KNOWN_HANDLERS;
+import static asys.spaceport.packets.codec.Params.KNOWN_HANDLERS;
-import static asys.mcsmanager.packets.codec.Params.KNOWN_PACKETS;
+import static asys.spaceport.packets.codec.Params.KNOWN_PACKETS;
 
 public class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacketHandler {
     private final BiMap<Integer, Class<? extends Packet>> knownPackets;