Minecraft/asys
Archived
0
Fork 0
Code Activity

MCSM -> SpacePort

Browse Source
This commit is contained in:
DmitriyMX
2017-08-13 23:14:14 +03:00
parent f4ee3af979
commit bc2b7032a6
42 changed files with 83 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/build.gradle
View File

@@ -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/' }

2
bridge/src/main/java/asys/bridge/bukkit/BridgeBukkitImpl.java
View File

@@ -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;

4
bridge/src/main/java/asys/bridge/client/AbstractBridge.java
View File

@@ -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;

8
bridge/src/main/java/asys/bridge/client/Client.java
View File

@@ -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;

6
bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java
View File

@@ -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<Class<? extends Packet>, IPacketHandler> knownHandlers;

2
libprotocol/build.gradle
View File

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

2
libprotocol/src/main/java/asys/mcsmanager/packets/CS_ConsoleMessage.java → libprotocol/src/main/java/asys/spaceport/packets/CS_ConsoleMessage.java
View File

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

2
libprotocol/src/main/java/asys/mcsmanager/packets/CS_CorrectShutdown.java → libprotocol/src/main/java/asys/spaceport/packets/CS_CorrectShutdown.java
View File

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

2
libprotocol/src/main/java/asys/mcsmanager/packets/CS_Handshake.java → libprotocol/src/main/java/asys/spaceport/packets/CS_Handshake.java
View File

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

2
libprotocol/src/main/java/asys/mcsmanager/packets/CS_Ping.java → libprotocol/src/main/java/asys/spaceport/packets/CS_Ping.java
View File

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

2
libprotocol/src/main/java/asys/mcsmanager/packets/IPacketHandler.java → libprotocol/src/main/java/asys/spaceport/packets/IPacketHandler.java
View File

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

2
libprotocol/src/main/java/asys/mcsmanager/packets/Packet.java → libprotocol/src/main/java/asys/spaceport/packets/Packet.java
View File

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

2
libprotocol/src/main/java/asys/mcsmanager/packets/SC_Command.java → libprotocol/src/main/java/asys/spaceport/packets/SC_Command.java
View File

@@ -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;

2
libprotocol/src/main/java/asys/mcsmanager/packets/SC_HandshakeResult.java → libprotocol/src/main/java/asys/spaceport/packets/SC_HandshakeResult.java
View File

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

2
libprotocol/src/main/java/asys/mcsmanager/packets/SC_ToggleSendMessages.java → libprotocol/src/main/java/asys/spaceport/packets/SC_ToggleSendMessages.java
View File

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

8
libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketDecoder.java → libprotocol/src/main/java/asys/spaceport/packets/codec/PacketDecoder.java
View File

@@ -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.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<Packet> {
@Override

6
libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketEncoder.java → libprotocol/src/main/java/asys/spaceport/packets/codec/PacketEncoder.java
View File

@@ -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

6
libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketHandler.java → libprotocol/src/main/java/asys/spaceport/packets/codec/PacketHandler.java
View File

@@ -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

6
libprotocol/src/main/java/asys/mcsmanager/packets/codec/Params.java → libprotocol/src/main/java/asys/spaceport/packets/codec/Params.java
View File

@@ -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.mcsmanager.packets.IPacketHandler;
import asys.spaceport.packets.Packet;
import asys.spaceport.packets.IPacketHandler;
import com.google.common.collect.BiMap;
import io.netty.util.AttributeKey;

2
settings.gradle
View File

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

2
mcserver-manager/build.gradle → spaceport/build.gradle
View File

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

10
mcserver-manager/src/main/java/asys/mcsmanager/Activator.java → spaceport/src/main/java/asys/spaceport/Activator.java
View File

@@ -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.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();

4
mcserver-manager/src/main/java/asys/mcsmanager/CSPingJsonSerializer.java → spaceport/src/main/java/asys/spaceport/CSPingJsonSerializer.java
View File

@@ -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;

8
mcserver-manager/src/main/java/asys/mcsmanager/Linker.java → spaceport/src/main/java/asys/spaceport/Linker.java
View File

@@ -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.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;

4
mcserver-manager/src/main/java/asys/mcsmanager/MCSM_WebModule.java → spaceport/src/main/java/asys/spaceport/MCSM_WebModule.java
View File

@@ -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;

4
mcserver-manager/src/main/java/asys/mcsmanager/ServerInfo.java → spaceport/src/main/java/asys/spaceport/ServerInfo.java
View File

@@ -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;

2
mcserver-manager/src/main/java/asys/mcsmanager/ServerInfoSerializer.java → spaceport/src/main/java/asys/spaceport/ServerInfoSerializer.java
View File

@@ -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;

4
mcserver-manager/src/main/java/asys/mcsmanager/server/HandshakeResult.java → spaceport/src/main/java/asys/spaceport/server/HandshakeResult.java
View File

@@ -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");

12
mcserver-manager/src/main/java/asys/mcsmanager/server/Server.java → spaceport/src/main/java/asys/spaceport/server/Server.java
View File

@@ -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.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;

11
mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java → spaceport/src/main/java/asys/spaceport/server/ServerPacketHandler.java
View File

@@ -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.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<Integer, Class<? extends Packet>> handshakePackets = ImmutableBiMap.of(

4
mcserver-manager/src/main/java/asys/mcsmanager/websocket/FrameHandler.java → spaceport/src/main/java/asys/spaceport/websocket/FrameHandler.java
View File

@@ -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;

2
mcserver-manager/src/main/java/asys/mcsmanager/websocket/Server.java → spaceport/src/main/java/asys/spaceport/websocket/Server.java
View File

@@ -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;

0
mcserver-manager/src/main/resources/ansi_up.js → spaceport/src/main/resources/ansi_up.js
View File

0
mcserver-manager/src/main/resources/components.js → spaceport/src/main/resources/components.js
View File

0
mcserver-manager/src/main/resources/module.js → spaceport/src/main/resources/module.js
View File

0
mcserver-manager/src/main/resources/moduleStyle.css → spaceport/src/main/resources/moduleStyle.css
View File

2
zond/build.gradle
View File

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

8
zond/src/main/java/asys/zond/proxy/client/Client.java
View File

@@ -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;

6
zond/src/main/java/asys/zond/proxy/client/ClientPacketHandler.java
View File

@@ -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<Integer, Class<? extends Packet>> handshakePackets;

2
zond/src/main/java/asys/zond/proxy/client/Connector.java
View File

@@ -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;

6
zond/src/main/java/asys/zond/proxy/server/Server.java
View File

@@ -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;

6
zond/src/main/java/asys/zond/proxy/server/ServerPacketHandler.java
View File

@@ -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<Integer, Class<? extends Packet>> knownPackets;