diff --git a/bridge/build.gradle b/bridge/build.gradle index 71993fe..64a7225 100644 --- a/bridge/build.gradle +++ b/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/' } diff --git a/bridge/src/main/java/asys/bridge/bukkit/BridgeBukkitImpl.java b/bridge/src/main/java/asys/bridge/bukkit/BridgeBukkitImpl.java index cdfbbc8..67439f9 100644 --- a/bridge/src/main/java/asys/bridge/bukkit/BridgeBukkitImpl.java +++ b/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; diff --git a/bridge/src/main/java/asys/bridge/client/AbstractBridge.java b/bridge/src/main/java/asys/bridge/client/AbstractBridge.java index 335f010..9cdd5da 100644 --- a/bridge/src/main/java/asys/bridge/client/AbstractBridge.java +++ b/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.mcsmanager.packets.CS_Ping; +import asys.spaceport.packets.CS_CorrectShutdown; +import asys.spaceport.packets.CS_Ping; public abstract class AbstractBridge implements IBridge { protected Client client; diff --git a/bridge/src/main/java/asys/bridge/client/Client.java b/bridge/src/main/java/asys/bridge/client/Client.java index 084e816..4164620 100644 --- a/bridge/src/main/java/asys/bridge/client/Client.java +++ b/bridge/src/main/java/asys/bridge/client/Client.java @@ -4,10 +4,10 @@ */ package asys.bridge.client; -import asys.mcsmanager.packets.Packet; -import asys.mcsmanager.packets.codec.PacketDecoder; -import asys.mcsmanager.packets.codec.PacketEncoder; -import asys.mcsmanager.packets.codec.PacketHandler; +import asys.spaceport.packets.Packet; +import asys.spaceport.packets.codec.PacketDecoder; +import asys.spaceport.packets.codec.PacketEncoder; +import asys.spaceport.packets.codec.PacketHandler; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; diff --git a/bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java b/bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java index 5d1a25d..3241877 100644 --- a/bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java +++ b/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.mcsmanager.packets.codec.Params.KNOWN_PACKETS; +import static asys.spaceport.packets.codec.Params.KNOWN_HANDLERS; +import static asys.spaceport.packets.codec.Params.KNOWN_PACKETS; public class ClientPacketHandler extends ChannelInboundHandlerAdapter implements IPacketHandler { private static Map, IPacketHandler> knownHandlers; diff --git a/libprotocol/build.gradle b/libprotocol/build.gradle index 2783c19..89d775c 100644 --- a/libprotocol/build.gradle +++ b/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 diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/CS_ConsoleMessage.java b/libprotocol/src/main/java/asys/spaceport/packets/CS_ConsoleMessage.java similarity index 97% rename from libprotocol/src/main/java/asys/mcsmanager/packets/CS_ConsoleMessage.java rename to libprotocol/src/main/java/asys/spaceport/packets/CS_ConsoleMessage.java index f144589..dacd2c1 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/CS_ConsoleMessage.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/CS_ConsoleMessage.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-05-17 */ -package asys.mcsmanager.packets; +package asys.spaceport.packets; import io.netty.buffer.ByteBuf; diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/CS_CorrectShutdown.java b/libprotocol/src/main/java/asys/spaceport/packets/CS_CorrectShutdown.java similarity index 89% rename from libprotocol/src/main/java/asys/mcsmanager/packets/CS_CorrectShutdown.java rename to libprotocol/src/main/java/asys/spaceport/packets/CS_CorrectShutdown.java index 85b334f..c6b1280 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/CS_CorrectShutdown.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/CS_CorrectShutdown.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-07-22 */ -package asys.mcsmanager.packets; +package asys.spaceport.packets; import io.netty.buffer.ByteBuf; diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/CS_Handshake.java b/libprotocol/src/main/java/asys/spaceport/packets/CS_Handshake.java similarity index 96% rename from libprotocol/src/main/java/asys/mcsmanager/packets/CS_Handshake.java rename to libprotocol/src/main/java/asys/spaceport/packets/CS_Handshake.java index 247f1ef..2ef2601 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/CS_Handshake.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/CS_Handshake.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-04-26 */ -package asys.mcsmanager.packets; +package asys.spaceport.packets; import io.netty.buffer.ByteBuf; diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/CS_Ping.java b/libprotocol/src/main/java/asys/spaceport/packets/CS_Ping.java similarity index 96% rename from libprotocol/src/main/java/asys/mcsmanager/packets/CS_Ping.java rename to libprotocol/src/main/java/asys/spaceport/packets/CS_Ping.java index eb6d566..2220fc1 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/CS_Ping.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/CS_Ping.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-04-26 */ -package asys.mcsmanager.packets; +package asys.spaceport.packets; import io.netty.buffer.ByteBuf; diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/IPacketHandler.java b/libprotocol/src/main/java/asys/spaceport/packets/IPacketHandler.java similarity index 86% rename from libprotocol/src/main/java/asys/mcsmanager/packets/IPacketHandler.java rename to libprotocol/src/main/java/asys/spaceport/packets/IPacketHandler.java index 8cb88f3..b939a72 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/IPacketHandler.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/IPacketHandler.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-04-26 */ -package asys.mcsmanager.packets; +package asys.spaceport.packets; import io.netty.channel.ChannelHandlerContext; diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/Packet.java b/libprotocol/src/main/java/asys/spaceport/packets/Packet.java similarity index 96% rename from libprotocol/src/main/java/asys/mcsmanager/packets/Packet.java rename to libprotocol/src/main/java/asys/spaceport/packets/Packet.java index db9b211..756b404 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/Packet.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/Packet.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-04-26 */ -package asys.mcsmanager.packets; +package asys.spaceport.packets; import io.netty.buffer.ByteBuf; diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/SC_Command.java b/libprotocol/src/main/java/asys/spaceport/packets/SC_Command.java similarity index 94% rename from libprotocol/src/main/java/asys/mcsmanager/packets/SC_Command.java rename to libprotocol/src/main/java/asys/spaceport/packets/SC_Command.java index 1cca1bb..a750a18 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/SC_Command.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/SC_Command.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-06-05 */ -package asys.mcsmanager.packets; +package asys.spaceport.packets; import io.netty.buffer.ByteBuf; diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/SC_HandshakeResult.java b/libprotocol/src/main/java/asys/spaceport/packets/SC_HandshakeResult.java similarity index 96% rename from libprotocol/src/main/java/asys/mcsmanager/packets/SC_HandshakeResult.java rename to libprotocol/src/main/java/asys/spaceport/packets/SC_HandshakeResult.java index 3c6835f..f7aa03e 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/SC_HandshakeResult.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/SC_HandshakeResult.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-04-26 */ -package asys.mcsmanager.packets; +package asys.spaceport.packets; import io.netty.buffer.ByteBuf; diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/SC_ToggleSendMessages.java b/libprotocol/src/main/java/asys/spaceport/packets/SC_ToggleSendMessages.java similarity index 94% rename from libprotocol/src/main/java/asys/mcsmanager/packets/SC_ToggleSendMessages.java rename to libprotocol/src/main/java/asys/spaceport/packets/SC_ToggleSendMessages.java index 258d337..a897d5d 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/SC_ToggleSendMessages.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/SC_ToggleSendMessages.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-06-11 */ -package asys.mcsmanager.packets; +package asys.spaceport.packets; import io.netty.buffer.ByteBuf; diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketDecoder.java b/libprotocol/src/main/java/asys/spaceport/packets/codec/PacketDecoder.java similarity index 84% rename from libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketDecoder.java rename to libprotocol/src/main/java/asys/spaceport/packets/codec/PacketDecoder.java index cdcd832..17e8023 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketDecoder.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/codec/PacketDecoder.java @@ -2,17 +2,17 @@ * DmitriyMX * 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.mcsmanager.packets.codec.Params.KNOWN_PACKETS; +import static asys.spaceport.packets.codec.Params.KNOWN_HANDLERS; +import static asys.spaceport.packets.codec.Params.KNOWN_PACKETS; public class PacketDecoder extends ReplayingDecoder { @Override diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketEncoder.java b/libprotocol/src/main/java/asys/spaceport/packets/codec/PacketEncoder.java similarity index 82% rename from libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketEncoder.java rename to libprotocol/src/main/java/asys/spaceport/packets/codec/PacketEncoder.java index ea4947e..06142c6 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketEncoder.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/codec/PacketEncoder.java @@ -2,14 +2,14 @@ * DmitriyMX * 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 { @Override diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketHandler.java b/libprotocol/src/main/java/asys/spaceport/packets/codec/PacketHandler.java similarity index 75% rename from libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketHandler.java rename to libprotocol/src/main/java/asys/spaceport/packets/codec/PacketHandler.java index 14157c1..17d7e00 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketHandler.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/codec/PacketHandler.java @@ -2,13 +2,13 @@ * DmitriyMX * 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 { @Override diff --git a/libprotocol/src/main/java/asys/mcsmanager/packets/codec/Params.java b/libprotocol/src/main/java/asys/spaceport/packets/codec/Params.java similarity index 78% rename from libprotocol/src/main/java/asys/mcsmanager/packets/codec/Params.java rename to libprotocol/src/main/java/asys/spaceport/packets/codec/Params.java index dc61e1b..e5245b6 100644 --- a/libprotocol/src/main/java/asys/mcsmanager/packets/codec/Params.java +++ b/libprotocol/src/main/java/asys/spaceport/packets/codec/Params.java @@ -2,10 +2,10 @@ * DmitriyMX * 2017-04-26 */ -package asys.mcsmanager.packets.codec; +package asys.spaceport.packets.codec; -import asys.mcsmanager.packets.Packet; -import asys.mcsmanager.packets.IPacketHandler; +import asys.spaceport.packets.Packet; +import asys.spaceport.packets.IPacketHandler; import com.google.common.collect.BiMap; import io.netty.util.AttributeKey; diff --git a/settings.gradle b/settings.gradle index d2df509..4bd8f27 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,7 @@ rootProject.name = 'asys' include 'core' include 'webinterface' -include 'mcserver-manager' +include 'spaceport' include 'libprotocol' include 'bridge' include 'zond' diff --git a/mcserver-manager/build.gradle b/spaceport/build.gradle similarity index 97% rename from mcserver-manager/build.gradle rename to spaceport/build.gradle index 2d7d636..9022890 100644 --- a/mcserver-manager/build.gradle +++ b/spaceport/build.gradle @@ -1,5 +1,5 @@ group = 'asys' -version = '0.10.6-SNAPSHOT' +version = '0.10.7-SNAPSHOT' apply plugin: 'osgi' diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/Activator.java b/spaceport/src/main/java/asys/spaceport/Activator.java similarity index 92% rename from mcserver-manager/src/main/java/asys/mcsmanager/Activator.java rename to spaceport/src/main/java/asys/spaceport/Activator.java index ff05c31..b98edbc 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/Activator.java +++ b/spaceport/src/main/java/asys/spaceport/Activator.java @@ -2,7 +2,7 @@ * DmitriyMX * 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 serviceTracker; private MCSM_WebModule module; private Webinterface webinterface; - private asys.mcsmanager.server.Server serverManager; - private asys.mcsmanager.websocket.Server webconsoleServer; + private asys.spaceport.server.Server serverManager; + 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(); diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/CSPingJsonSerializer.java b/spaceport/src/main/java/asys/spaceport/CSPingJsonSerializer.java similarity index 91% rename from mcserver-manager/src/main/java/asys/mcsmanager/CSPingJsonSerializer.java rename to spaceport/src/main/java/asys/spaceport/CSPingJsonSerializer.java index c34c632..aa5cbc5 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/CSPingJsonSerializer.java +++ b/spaceport/src/main/java/asys/spaceport/CSPingJsonSerializer.java @@ -2,9 +2,9 @@ * DmitriyMX * 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; diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/Linker.java b/spaceport/src/main/java/asys/spaceport/Linker.java similarity index 94% rename from mcserver-manager/src/main/java/asys/mcsmanager/Linker.java rename to spaceport/src/main/java/asys/spaceport/Linker.java index ddaa960..6eb8d04 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/Linker.java +++ b/spaceport/src/main/java/asys/spaceport/Linker.java @@ -2,11 +2,11 @@ * DmitriyMX * 2017-05-01 */ -package asys.mcsmanager; +package asys.spaceport; -import asys.mcsmanager.packets.CS_ConsoleMessage; -import asys.mcsmanager.packets.SC_Command; -import asys.mcsmanager.packets.SC_ToggleSendMessages; +import asys.spaceport.packets.CS_ConsoleMessage; +import asys.spaceport.packets.SC_Command; +import asys.spaceport.packets.SC_ToggleSendMessages; import io.netty.channel.Channel; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/MCSM_WebModule.java b/spaceport/src/main/java/asys/spaceport/MCSM_WebModule.java similarity index 98% rename from mcserver-manager/src/main/java/asys/mcsmanager/MCSM_WebModule.java rename to spaceport/src/main/java/asys/spaceport/MCSM_WebModule.java index 287240a..d48f276 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/MCSM_WebModule.java +++ b/spaceport/src/main/java/asys/spaceport/MCSM_WebModule.java @@ -2,9 +2,9 @@ * DmitriyMX * 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; diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/ServerInfo.java b/spaceport/src/main/java/asys/spaceport/ServerInfo.java similarity index 94% rename from mcserver-manager/src/main/java/asys/mcsmanager/ServerInfo.java rename to spaceport/src/main/java/asys/spaceport/ServerInfo.java index 6e14ca8..90fb16e 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/ServerInfo.java +++ b/spaceport/src/main/java/asys/spaceport/ServerInfo.java @@ -2,9 +2,9 @@ * DmitriyMX * 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; diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/ServerInfoSerializer.java b/spaceport/src/main/java/asys/spaceport/ServerInfoSerializer.java similarity index 96% rename from mcserver-manager/src/main/java/asys/mcsmanager/ServerInfoSerializer.java rename to spaceport/src/main/java/asys/spaceport/ServerInfoSerializer.java index 55aaa03..78eb860 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/ServerInfoSerializer.java +++ b/spaceport/src/main/java/asys/spaceport/ServerInfoSerializer.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-05-02 */ -package asys.mcsmanager; +package asys.spaceport; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/server/HandshakeResult.java b/spaceport/src/main/java/asys/spaceport/server/HandshakeResult.java similarity index 81% rename from mcserver-manager/src/main/java/asys/mcsmanager/server/HandshakeResult.java rename to spaceport/src/main/java/asys/spaceport/server/HandshakeResult.java index ec386ad..9879c35 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/server/HandshakeResult.java +++ b/spaceport/src/main/java/asys/spaceport/server/HandshakeResult.java @@ -2,9 +2,9 @@ * DmitriyMX * 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"); diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/server/Server.java b/spaceport/src/main/java/asys/spaceport/server/Server.java similarity index 87% rename from mcserver-manager/src/main/java/asys/mcsmanager/server/Server.java rename to spaceport/src/main/java/asys/spaceport/server/Server.java index e0d0f49..9800d23 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/server/Server.java +++ b/spaceport/src/main/java/asys/spaceport/server/Server.java @@ -2,13 +2,13 @@ * DmitriyMX * 2017-04-26 */ -package asys.mcsmanager.server; +package asys.spaceport.server; -import asys.mcsmanager.packets.CS_Ping; -import asys.mcsmanager.packets.Packet; -import asys.mcsmanager.packets.codec.PacketDecoder; -import asys.mcsmanager.packets.codec.PacketEncoder; -import asys.mcsmanager.packets.codec.PacketHandler; +import asys.spaceport.packets.CS_Ping; +import asys.spaceport.packets.Packet; +import asys.spaceport.packets.codec.PacketDecoder; +import asys.spaceport.packets.codec.PacketEncoder; +import asys.spaceport.packets.codec.PacketHandler; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; import io.netty.bootstrap.ServerBootstrap; diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java b/spaceport/src/main/java/asys/spaceport/server/ServerPacketHandler.java similarity index 93% rename from mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java rename to spaceport/src/main/java/asys/spaceport/server/ServerPacketHandler.java index 205bac4..80d2069 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java +++ b/spaceport/src/main/java/asys/spaceport/server/ServerPacketHandler.java @@ -2,22 +2,21 @@ * DmitriyMX * 2017-04-26 */ -package asys.mcsmanager.server; +package asys.spaceport.server; -import asys.mcsmanager.Linker; -import asys.mcsmanager.packets.*; +import asys.spaceport.Linker; +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.mcsmanager.packets.codec.Params.KNOWN_PACKETS; +import static asys.spaceport.packets.codec.Params.KNOWN_HANDLERS; +import static asys.spaceport.packets.codec.Params.KNOWN_PACKETS; class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacketHandler { private static final BiMap> handshakePackets = ImmutableBiMap.of( diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/websocket/FrameHandler.java b/spaceport/src/main/java/asys/spaceport/websocket/FrameHandler.java similarity index 96% rename from mcserver-manager/src/main/java/asys/mcsmanager/websocket/FrameHandler.java rename to spaceport/src/main/java/asys/spaceport/websocket/FrameHandler.java index 9c8dde8..bd6d7e2 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/websocket/FrameHandler.java +++ b/spaceport/src/main/java/asys/spaceport/websocket/FrameHandler.java @@ -2,9 +2,9 @@ * DmitriyMX * 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; diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/websocket/Server.java b/spaceport/src/main/java/asys/spaceport/websocket/Server.java similarity index 98% rename from mcserver-manager/src/main/java/asys/mcsmanager/websocket/Server.java rename to spaceport/src/main/java/asys/spaceport/websocket/Server.java index b73e5d1..1a1ab47 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/websocket/Server.java +++ b/spaceport/src/main/java/asys/spaceport/websocket/Server.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-05-08 */ -package asys.mcsmanager.websocket; +package asys.spaceport.websocket; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelInitializer; diff --git a/mcserver-manager/src/main/resources/ansi_up.js b/spaceport/src/main/resources/ansi_up.js similarity index 100% rename from mcserver-manager/src/main/resources/ansi_up.js rename to spaceport/src/main/resources/ansi_up.js diff --git a/mcserver-manager/src/main/resources/components.js b/spaceport/src/main/resources/components.js similarity index 100% rename from mcserver-manager/src/main/resources/components.js rename to spaceport/src/main/resources/components.js diff --git a/mcserver-manager/src/main/resources/module.js b/spaceport/src/main/resources/module.js similarity index 100% rename from mcserver-manager/src/main/resources/module.js rename to spaceport/src/main/resources/module.js diff --git a/mcserver-manager/src/main/resources/moduleStyle.css b/spaceport/src/main/resources/moduleStyle.css similarity index 100% rename from mcserver-manager/src/main/resources/moduleStyle.css rename to spaceport/src/main/resources/moduleStyle.css diff --git a/zond/build.gradle b/zond/build.gradle index 488eaae..3cddcab 100644 --- a/zond/build.gradle +++ b/zond/build.gradle @@ -1,5 +1,5 @@ group = 'asys' -version = '0.7.17' +version = '0.7.18' apply plugin: 'application' diff --git a/zond/src/main/java/asys/zond/proxy/client/Client.java b/zond/src/main/java/asys/zond/proxy/client/Client.java index ab57fac..8b79523 100644 --- a/zond/src/main/java/asys/zond/proxy/client/Client.java +++ b/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.mcsmanager.packets.codec.PacketDecoder; -import asys.mcsmanager.packets.codec.PacketEncoder; -import asys.mcsmanager.packets.codec.PacketHandler; +import asys.spaceport.packets.Packet; +import asys.spaceport.packets.codec.PacketDecoder; +import asys.spaceport.packets.codec.PacketEncoder; +import asys.spaceport.packets.codec.PacketHandler; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler; diff --git a/zond/src/main/java/asys/zond/proxy/client/ClientPacketHandler.java b/zond/src/main/java/asys/zond/proxy/client/ClientPacketHandler.java index 202d416..5699bda 100644 --- a/zond/src/main/java/asys/zond/proxy/client/ClientPacketHandler.java +++ b/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.mcsmanager.packets.codec.Params.KNOWN_PACKETS; +import static asys.spaceport.packets.codec.Params.KNOWN_HANDLERS; +import static asys.spaceport.packets.codec.Params.KNOWN_PACKETS; public class ClientPacketHandler extends ChannelInboundHandlerAdapter implements IPacketHandler { private final BiMap> handshakePackets; diff --git a/zond/src/main/java/asys/zond/proxy/client/Connector.java b/zond/src/main/java/asys/zond/proxy/client/Connector.java index 191bee3..4296ff3 100644 --- a/zond/src/main/java/asys/zond/proxy/client/Connector.java +++ b/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; diff --git a/zond/src/main/java/asys/zond/proxy/server/Server.java b/zond/src/main/java/asys/zond/proxy/server/Server.java index a288e83..2cd8edd 100644 --- a/zond/src/main/java/asys/zond/proxy/server/Server.java +++ b/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.mcsmanager.packets.codec.PacketEncoder; -import asys.mcsmanager.packets.codec.PacketHandler; +import asys.spaceport.packets.codec.PacketDecoder; +import asys.spaceport.packets.codec.PacketEncoder; +import asys.spaceport.packets.codec.PacketHandler; import asys.zond.PingMonitor; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelHandler; diff --git a/zond/src/main/java/asys/zond/proxy/server/ServerPacketHandler.java b/zond/src/main/java/asys/zond/proxy/server/ServerPacketHandler.java index 1a0d8f5..bd282f2 100644 --- a/zond/src/main/java/asys/zond/proxy/server/ServerPacketHandler.java +++ b/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.mcsmanager.packets.codec.Params.KNOWN_PACKETS; +import static asys.spaceport.packets.codec.Params.KNOWN_HANDLERS; +import static asys.spaceport.packets.codec.Params.KNOWN_PACKETS; public class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacketHandler { private final BiMap> knownPackets;