diff --git a/src/ClientTesting.py b/src/ClientTesting.py new file mode 100644 index 0000000..3c02134 --- /dev/null +++ b/src/ClientTesting.py @@ -0,0 +1,29 @@ +import asyncore, socket + +class ClientTest(asyncore.dispatcher): + + def __init__(self, host, port): + asyncore.dispatcher.__init__(self) + self.create_socket(socket.AF_INET, socket.SOCK_STREAM) + self.connect( (host, port) ) + self.buffer = "Test" + + def handle_connect(self): + print "handle_connect" + + def handle_close(self): + print "handle_close" + self.close() + + def handle_read(self): + print self.recv(8192) + + def handle_write(self): + sent = self.send(self.buffer) + self.buffer = self.buffer[sent:] + + def writable(self): + return (len(self.buffer) > 0) + +client = ClientTest('localhost', 25566) +asyncore.loop() \ No newline at end of file diff --git a/src/main/java/mcp/mobius/opis/network/rconserver/RConInboundHandler.java b/src/main/java/mcp/mobius/opis/network/rconserver/RConInboundHandler.java index 49748cc..4710396 100644 --- a/src/main/java/mcp/mobius/opis/network/rconserver/RConInboundHandler.java +++ b/src/main/java/mcp/mobius/opis/network/rconserver/RConInboundHandler.java @@ -1,5 +1,13 @@ package mcp.mobius.opis.network.rconserver; +import java.util.UUID; + +import com.mojang.authlib.GameProfile; + +import mcp.mobius.opis.modOpis; +import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.common.util.FakePlayerFactory; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; @@ -7,17 +15,24 @@ import io.netty.util.ReferenceCountUtil; class RConInboundHandler extends ChannelInboundHandlerAdapter{ // One object of this type is created by connection + // There is one permanent context per connection ! @Override public void channelActive(ChannelHandlerContext ctx) throws Exception { // This method is called when the connection is created. - ctx.fireChannelActive(); + UUID fakeUUID = UUID.randomUUID(); + FakePlayer fakePlayer = FakePlayerFactory.get(DimensionManager.getWorld(0), new GameProfile(fakeUUID, ctx.name())); + RConServer.instance.fakePlayers.put(fakePlayer, ctx); + + modOpis.log.info(String.format("Connection to rcon detected. FakePlayer %s with uuid %s created.", ctx.name(), fakeUUID)); + } @Override public void channelRead(ChannelHandlerContext ctx, Object msg) { // This method is called when new data is readable in the stream. - + + System.out.printf("Context : %s\n", ctx); ctx.write(msg); ctx.flush(); @@ -31,7 +46,7 @@ class RConInboundHandler extends ChannelInboundHandlerAdapter{ } finally { ReferenceCountUtil.release(msg); } - */ + */ } @Override diff --git a/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java b/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java index 406c716..5210dc8 100644 --- a/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java +++ b/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java @@ -1,5 +1,8 @@ package mcp.mobius.opis.network.rconserver; +import java.util.HashMap; + +import net.minecraftforge.common.util.FakePlayer; import mcp.mobius.opis.modOpis; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.ByteBuf; @@ -17,6 +20,8 @@ import io.netty.util.ReferenceCountUtil; public class RConServer implements Runnable { public final static RConServer instance = new RConServer(); + public HashMap fakePlayers = new HashMap(); + private int port = -1; private RConServer(){