Basic Nexus client implemented.

Common code has been moved to RConHandler (sendToPlayer, fakePlayer list, packet BiMap)
This commit is contained in:
ProfMobius committed 2014-10-11 16:35:31 +02:00
1 parent 258c8fea7c
commit 93cf3172a8
11 files changed
+328 -42

No files matched your search

@@ -1,10 +1,39 @@
package mcp.mobius.opis.events;
import mcp.mobius.opis.network.rcon.nexus.NexusClient;
import mcp.mobius.opis.network.rcon.server.RConServer;
import net.minecraftforge.event.world.WorldEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class OpisServerEventHandler {
public static boolean printEntityTrace = false;
public static boolean printEntityFull = false;
public static boolean firstLoad = false;
@SubscribeEvent
@SideOnly(Side.SERVER)
public void onWorldLoad(WorldEvent.Load event) {
if (!firstLoad && event.world.provider.dimensionId == 0){
firstLoad = true;
Thread rconserver = new Thread(RConServer.instance);
rconserver.setName("Opis Server");
rconserver.start();
Thread nexusclient = new Thread(NexusClient.instance);
nexusclient.setName("Nexus Client");
nexusclient.start();
}
}
/*
@SubscribeEvent
@SideOnly(Side.SERVER)
@@ -15,6 +15,7 @@ import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.AccessLevel;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.NetDataValue;
import mcp.mobius.opis.network.rcon.RConHandler;
import mcp.mobius.opis.network.rcon.server.RConServer;
import mcp.mobius.opis.swing.SelectedTab;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -40,7 +41,7 @@ public enum PlayerTracker{
}
public AccessLevel getPlayerAccessLevel(EntityPlayerMP player){
if (player instanceof FakePlayer && RConServer.instance.fakePlayers.containsKey(player))
if (player instanceof FakePlayer && RConHandler.fakePlayers.containsKey(player))
return AccessLevel.PRIVILEGED;
return this.getPlayerAccessLevel(player.getGameProfile().getName());
@@ -48,6 +48,7 @@ import mcp.mobius.opis.network.packets.server.NetDataCommand;
import mcp.mobius.opis.network.packets.server.NetDataList;
import mcp.mobius.opis.network.packets.server.NetDataValue;
import mcp.mobius.opis.network.packets.server.PacketChunks;
import mcp.mobius.opis.network.rcon.RConHandler;
import mcp.mobius.opis.network.rcon.server.RConServer;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
@@ -221,7 +222,7 @@ public class PacketManager
public static void sendToPlayer(PacketBase packet, EntityPlayer player)
{
if (player instanceof FakePlayer){
RConServer.instance.sendToPlayer(packet, (FakePlayer)player);
RConHandler.sendToPlayer(packet, (FakePlayer)player);
}
else {
channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER);
@@ -254,8 +255,8 @@ public class PacketManager
channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALL);
channels.get(SERVER).writeAndFlush(packet);
for (FakePlayer fakePlayer : RConServer.instance.fakePlayers.keySet()){
RConServer.instance.sendToPlayer(packet, fakePlayer);
for (FakePlayer fakePlayer : RConHandler.fakePlayers.keySet()){
RConHandler.sendToPlayer(packet, fakePlayer);
}
}
@@ -0,0 +1,50 @@
package mcp.mobius.opis.network.rcon;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraftforge.common.util.FakePlayer;
import mcp.mobius.opis.network.PacketBase;
import mcp.mobius.opis.network.packets.client.PacketReqChunks;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.network.packets.server.NetDataCommand;
import mcp.mobius.opis.network.packets.server.NetDataList;
import mcp.mobius.opis.network.packets.server.NetDataValue;
import mcp.mobius.opis.network.packets.server.PacketChunks;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
public class RConHandler {
public static BiMap<Byte, Class> packetTypes = HashBiMap.create();
public static BiMap<FakePlayer, ChannelHandlerContext> fakePlayers = HashBiMap.create();
static {
packetTypes.put((byte)0, PacketReqChunks.class);
packetTypes.put((byte)1, PacketReqData.class);
packetTypes.put((byte)2, NetDataCommand.class);
packetTypes.put((byte)3, NetDataList.class);
packetTypes.put((byte)4, NetDataValue.class);
packetTypes.put((byte)5, PacketChunks.class);
}
public static void sendToPlayer(PacketBase packet, FakePlayer player)
{
ByteArrayDataOutput output = ByteStreams.newDataOutput();
ChannelHandlerContext ctx = RConHandler.fakePlayers.get(player);
packet.encode(output);
byte[] data = output.toByteArray();
ByteBuf buf = ctx.alloc().buffer(data.length + 4 + 1);
buf.writeInt(data.length);
buf.writeByte(RConHandler.packetTypes.inverse().get(packet.getClass()));
buf.writeBytes(data);
ctx.write(buf);
ctx.flush();
//modOpis.log.info(String.format("%s", packet.msg));
}
}
@@ -0,0 +1,151 @@
package mcp.mobius.opis.network.rcon.nexus;
import io.netty.bootstrap.Bootstrap;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.util.SelfSignedCertificate;
import io.netty.handler.timeout.ReadTimeoutHandler;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.security.cert.CertificateException;
import java.util.Properties;
import javax.net.ssl.SSLException;
import net.minecraftforge.common.util.FakePlayer;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.network.packets.client.PacketReqChunks;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.network.packets.server.NetDataCommand;
import mcp.mobius.opis.network.packets.server.NetDataList;
import mcp.mobius.opis.network.packets.server.NetDataValue;
import mcp.mobius.opis.network.packets.server.PacketChunks;
import mcp.mobius.opis.network.rcon.server.RConHandshakeDecoder;
import mcp.mobius.opis.network.rcon.server.RConHandshakeHandler;
import mcp.mobius.opis.network.rcon.server.RConServer;
public class NexusClient implements Runnable {
class ChannelInit extends ChannelInitializer<SocketChannel>{
//private final SslContext sslCtx;
//public ChannelInit(SslContext sslCtx) {
// this.sslCtx = sslCtx;
//}
@Override
protected void initChannel(SocketChannel ch) throws Exception {
//ch.pipeline().addLast(sslCtx.newHandler(ch.alloc(), RConClient.instance.host, RConClient.instance.port));
//ch.pipeline().addLast(new RConHandshakeDecoder());
//ch.pipeline().addLast(new RConHandshakeHandler());
//ch.pipeline().addLast(new JdkZlibDecoder());
//ch.pipeline().addLast(new JdkZlibEncoder());
ch.pipeline().addLast(new NexusMsgDecoder());
ch.pipeline().addLast(new NexusInboundHandler());
}
}
String reverseprop = "opis.properties";
String host = "localhost";
String uuid = "";
Integer port = 8013;
Boolean active = false;
public final static NexusClient instance = new NexusClient();
private NexusClient(){}
@Override
public void run(){
this.readConfig(this.reverseprop);
if (!this.active) return;
modOpis.log.info(String.format("Connecting to OpixNexus %s:%s", this.host, this.port));
EventLoopGroup workerGroup = new NioEventLoopGroup();
try {
Bootstrap b = new Bootstrap(); // (1)
b.group(workerGroup); // (2)
b.channel(NioSocketChannel.class); // (3)
b.option(ChannelOption.SO_KEEPALIVE, true); // (4)
b.handler(new ChannelInit());
ChannelFuture f = b.connect(this.host, this.port).sync(); // (5)
// Wait until the connection is closed.
f.channel().closeFuture().sync();
} catch (Exception e){
modOpis.log.error("Error while connecting to Nexus Server");
e.printStackTrace();
} finally {
workerGroup.shutdownGracefully();
}
}
private void readConfig(String filename){
if (!new File(filename).exists())
writeConfig(filename);
Properties prop = new Properties();
InputStream input = null;
try {
input = new FileInputStream(filename);
prop.load(input);
input.close();
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
this.host = prop.getProperty("host");
this.port = Integer.valueOf(prop.getProperty("port"));
this.active = Boolean.valueOf(prop.getProperty("active"));
this.uuid = prop.getProperty("uuid");
}
private void writeConfig(String filename){
Properties prop = new Properties();
OutputStream output = null;
try {
output = new FileOutputStream(filename);
prop.setProperty("host", host);
prop.setProperty("port", this.port.toString());
prop.setProperty("active", this.active.toString());
prop.setProperty("uuid", this.uuid);
prop.store(output, null);
output.close();
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
}
}
@@ -0,0 +1,50 @@
package mcp.mobius.opis.network.rcon.nexus;
import java.util.List;
import java.util.UUID;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.common.util.FakePlayerFactory;
import com.google.common.io.ByteStreams;
import com.mojang.authlib.GameProfile;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.holders.basetypes.SerialLong;
import mcp.mobius.opis.data.managers.StringCache;
import mcp.mobius.opis.events.PlayerTracker;
import mcp.mobius.opis.network.PacketBase;
import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.NetDataValue;
import mcp.mobius.opis.network.rcon.RConHandler;
import mcp.mobius.opis.network.rcon.server.RConServer;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.handler.codec.ByteToMessageDecoder;
public class NexusInboundHandler extends ChannelInboundHandlerAdapter {
@Override
public void channelActive(final ChannelHandlerContext ctx) {
UUID fakeUUID = UUID.randomUUID();
FakePlayer fakePlayer = FakePlayerFactory.get(DimensionManager.getWorld(0), new GameProfile(fakeUUID, ctx.name()));
RConHandler.fakePlayers.put(fakePlayer, ctx);
PlayerTracker.INSTANCE.playersSwing.add(fakePlayer);
PacketManager.validateAndSend(new NetDataValue(Message.STATUS_CURRENT_TIME, new SerialLong(System.currentTimeMillis())), fakePlayer);
StringCache.INSTANCE.syncCache(fakePlayer);
modOpis.log.info(String.format("FakePlayer %s with uuid %s created.", ctx.name(), fakeUUID));
}
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
cause.printStackTrace();
ctx.close();
}
}
@@ -0,0 +1,31 @@
package mcp.mobius.opis.network.rcon.nexus;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
import java.util.List;
import mcp.mobius.opis.network.PacketBase;
import mcp.mobius.opis.network.rcon.RConHandler;
import com.google.common.io.ByteStreams;
public class NexusMsgDecoder extends ByteToMessageDecoder {
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
if (in.readableBytes() < 4) { return; } // Packet starts with the size (int)
int packetSize = in.getInt(in.readerIndex()); // We read the packet size (not including the packet type byte)
if (in.readableBytes() < 4 + 1 + packetSize) { return ;} // We check if there is at least packet type + packetSize available bytes
in.readInt();
byte packetType = in.readByte(); // We read the header
// Here we should get a list of potential packets and decode for the corresponding byte
PacketBase packet = (PacketBase) RConHandler.packetTypes.get(packetType).newInstance();
packet.decode(ByteStreams.newDataInput(in.readBytes(packetSize).array()));
out.add(packet);
}
}
@@ -13,6 +13,7 @@ import mcp.mobius.opis.network.PacketManager;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.PacketReqData;
import mcp.mobius.opis.network.packets.server.NetDataValue;
import mcp.mobius.opis.network.rcon.RConHandler;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.util.FakePlayer;
@@ -31,7 +32,7 @@ class RConInboundHandler extends ChannelInboundHandlerAdapter{
public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
UUID fakeUUID = UUID.randomUUID();
FakePlayer fakePlayer = FakePlayerFactory.get(DimensionManager.getWorld(0), new GameProfile(fakeUUID, ctx.name()));
RConServer.instance.fakePlayers.put(fakePlayer, ctx);
RConHandler.fakePlayers.put(fakePlayer, ctx);
PlayerTracker.INSTANCE.playersSwing.add(fakePlayer);
PacketManager.validateAndSend(new NetDataValue(Message.STATUS_CURRENT_TIME, new SerialLong(System.currentTimeMillis())), fakePlayer);
@@ -44,7 +45,7 @@ class RConInboundHandler extends ChannelInboundHandlerAdapter{
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) {
try {
FakePlayer fakePlayer = RConServer.instance.fakePlayers.inverse().get(ctx);
FakePlayer fakePlayer = RConHandler.fakePlayers.inverse().get(ctx);
PacketBase packet = (PacketBase) msg;
//if (packet instanceof PacketReqData)
@@ -59,8 +60,8 @@ class RConInboundHandler extends ChannelInboundHandlerAdapter{
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
cause.printStackTrace();
FakePlayer fakePlayer = RConServer.instance.fakePlayers.inverse().get(ctx);
RConServer.instance.fakePlayers.remove(fakePlayer);
FakePlayer fakePlayer = RConHandler.fakePlayers.inverse().get(ctx);
RConHandler.fakePlayers.remove(fakePlayer);
PlayerTracker.INSTANCE.playersSwing.remove(fakePlayer);
modOpis.log.info(String.format("Lost connection from %s", fakePlayer.getDisplayName()));
ctx.close();
@@ -6,6 +6,7 @@ import com.google.common.io.ByteStreams;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.network.PacketBase;
import mcp.mobius.opis.network.rcon.RConHandler;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
@@ -23,7 +24,7 @@ public class RConMsgDecoder extends ByteToMessageDecoder {
// Here we should get a list of potential packets and decode for the corresponding byte
PacketBase packet = (PacketBase) RConServer.instance.packetTypes.get(packetType).newInstance();
PacketBase packet = (PacketBase) RConHandler.packetTypes.get(packetType).newInstance();
packet.decode(ByteStreams.newDataInput(in.readBytes(packetSize).array()));
out.add(packet);
}
@@ -25,6 +25,7 @@ import mcp.mobius.opis.network.packets.server.NetDataCommand;
import mcp.mobius.opis.network.packets.server.NetDataList;
import mcp.mobius.opis.network.packets.server.NetDataValue;
import mcp.mobius.opis.network.packets.server.PacketChunks;
import mcp.mobius.opis.network.rcon.RConHandler;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
@@ -73,24 +74,17 @@ public class RConServer implements Runnable {
}
public final static RConServer instance = new RConServer();
public BiMap<FakePlayer, ChannelHandlerContext> fakePlayers = HashBiMap.create();
public BiMap<Byte, Class> packetTypes = HashBiMap.create();
private int port = -1;
private RConServer(){
this.port = modOpis.rconport;
packetTypes.put((byte)0, PacketReqChunks.class);
packetTypes.put((byte)1, PacketReqData.class);
packetTypes.put((byte)2, NetDataCommand.class);
packetTypes.put((byte)3, NetDataList.class);
packetTypes.put((byte)4, NetDataValue.class);
packetTypes.put((byte)5, PacketChunks.class);
}
@Override
public void run(){
if (!modOpis.rconactive) return;
modOpis.log.info("Starting Opis remote control server.");
@@ -125,23 +119,4 @@ public class RConServer implements Runnable {
bossGroup.shutdownGracefully();
}
}
public void sendToPlayer(PacketBase packet, FakePlayer player)
{
ByteArrayDataOutput output = ByteStreams.newDataOutput();
ChannelHandlerContext ctx = RConServer.instance.fakePlayers.get(player);
packet.encode(output);
byte[] data = output.toByteArray();
ByteBuf buf = ctx.alloc().buffer(data.length + 4 + 1);
buf.writeInt(data.length);
buf.writeByte(packetTypes.inverse().get(packet.getClass()));
buf.writeBytes(data);
ctx.write(buf);
ctx.flush();
//modOpis.log.info(String.format("%s", packet.msg));
}
}
@@ -8,16 +8,12 @@ import mcp.mobius.opis.api.IMessageHandler;
import mcp.mobius.opis.gui.overlay.OverlayStatus;
import mcp.mobius.opis.network.PacketBase;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.rcon.nexus.NexusClient;
import mcp.mobius.opis.network.rcon.server.RConServer;
public class ProxyServer implements IMessageHandler{
public void init(){
if (modOpis.rconactive){
Thread rconserver = new Thread(RConServer.instance);
rconserver.setName("Opis Server");
rconserver.start();
}
}
@Override