diff --git a/src/ClientTesting.py b/src/ClientTesting.py index 4906e38..3bec835 100644 --- a/src/ClientTesting.py +++ b/src/ClientTesting.py @@ -6,7 +6,7 @@ class ClientTest(asyncore.dispatcher): asyncore.dispatcher.__init__(self) self.create_socket(socket.AF_INET, socket.SOCK_STREAM) self.connect( (host, port) ) - self.buffer = "\x00\x00\x00\x00\x00" + self.buffer = "\x00\x00\x00\x06\x01\x00\x00\x00\x0c\x00\x00" def handle_connect(self): print "handle_connect" @@ -16,6 +16,7 @@ class ClientTest(asyncore.dispatcher): self.close() def handle_read(self): + print "handle_read" print self.recv(8192) def handle_write(self): diff --git a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java index e62728d..8e0e6c8 100644 --- a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java +++ b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java @@ -42,6 +42,9 @@ public enum PlayerTracker{ } public AccessLevel getPlayerAccessLevel(String name){ + if (name.startsWith("RConInboundHandler")) + return AccessLevel.PRIVILEGED; + GameProfile profile = MinecraftServer.getServer().getConfigurationManager().func_152612_a(name).getGameProfile(); if (MinecraftServer.getServer().getConfigurationManager().func_152596_g(profile) || MinecraftServer.getServer().isSinglePlayer()) diff --git a/src/main/java/mcp/mobius/opis/modOpis.java b/src/main/java/mcp/mobius/opis/modOpis.java index d36fcf3..0e3e764 100644 --- a/src/main/java/mcp/mobius/opis/modOpis.java +++ b/src/main/java/mcp/mobius/opis/modOpis.java @@ -1,6 +1,7 @@ package mcp.mobius.opis; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; +import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -95,6 +96,7 @@ public class modOpis { @EventHandler public void preInit(FMLPreInitializationEvent event) { + config = new Configuration(event.getSuggestedConfigurationFile()); profilerDelay = config.get(Configuration.CATEGORY_GENERAL, "profiler.delay", 1).getInt(); diff --git a/src/main/java/mcp/mobius/opis/network/PacketManager.java b/src/main/java/mcp/mobius/opis/network/PacketManager.java index 9b8e2bf..3620b17 100644 --- a/src/main/java/mcp/mobius/opis/network/PacketManager.java +++ b/src/main/java/mcp/mobius/opis/network/PacketManager.java @@ -14,6 +14,7 @@ import java.util.EnumMap; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; + import com.google.common.collect.HashBasedTable; import com.google.common.collect.Maps; import com.google.common.collect.Table.Cell; @@ -47,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.rconserver.RConServer; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -61,6 +63,7 @@ import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S02PacketChat; import net.minecraft.util.ChatComponentText; +import net.minecraftforge.common.util.FakePlayer; @Sharable //public class PacketManager extends FMLIndexedMessageToMessageCodec @@ -269,6 +272,10 @@ public class PacketManager */ public static void validateAndSend(PacketBase capsule, EntityPlayerMP player){ + if (player instanceof FakePlayer){ + RConServer.instance.sendToPlayer(capsule, (FakePlayer)player); + } + if (!capsule.msg.isDisplayActive(PlayerTracker.INSTANCE.getPlayerSelectedTab(player))) return; if (capsule.msg.canPlayerUseCommand(player)) diff --git a/src/main/java/mcp/mobius/opis/network/packets/client/PacketReqData.java b/src/main/java/mcp/mobius/opis/network/packets/client/PacketReqData.java index 217a023..34e6c63 100644 --- a/src/main/java/mcp/mobius/opis/network/packets/client/PacketReqData.java +++ b/src/main/java/mcp/mobius/opis/network/packets/client/PacketReqData.java @@ -1,5 +1,6 @@ package mcp.mobius.opis.network.packets.client; +import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.holders.DataType; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.network.PacketBase; @@ -7,6 +8,7 @@ import mcp.mobius.opis.network.ServerMessageHandler; import mcp.mobius.opis.network.enums.Message; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; + import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; @@ -78,6 +80,6 @@ public class PacketReqData extends PacketBase{ ServerMessageHandler.instance().handle(this.dataReq, this.param1, this.param2, player); } else { logmsg += "Rejected"; - } + } } } 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 4710396..e7964ad 100644 --- a/src/main/java/mcp/mobius/opis/network/rconserver/RConInboundHandler.java +++ b/src/main/java/mcp/mobius/opis/network/rconserver/RConInboundHandler.java @@ -5,6 +5,10 @@ import java.util.UUID; import com.mojang.authlib.GameProfile; import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.events.PlayerTracker; +import mcp.mobius.opis.network.PacketBase; +import mcp.mobius.opis.network.enums.Message; +import mcp.mobius.opis.network.packets.client.PacketReqData; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; @@ -30,23 +34,17 @@ class RConInboundHandler extends ChannelInboundHandlerAdapter{ @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(); - - /* - ByteBuf in = (ByteBuf) msg; try { - while (in.isReadable()) { // (1) - System.out.print((char) in.readByte()); - System.out.flush(); - } + FakePlayer fakePlayer = RConServer.instance.fakePlayers.inverse().get(ctx); + PacketBase packet = (PacketBase) msg; + + if (packet instanceof PacketReqData) + modOpis.log.info(String.format("Received request %s from player %s", ((PacketReqData)packet).dataReq, fakePlayer.getDisplayName())); + + packet.actionServer(null, fakePlayer); } 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 0448700..e2659d7 100644 --- a/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java +++ b/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java @@ -1,10 +1,20 @@ package mcp.mobius.opis.network.rconserver; +import static cpw.mods.fml.relauncher.Side.SERVER; + import java.util.ArrayList; import java.util.HashMap; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; + +import cpw.mods.fml.common.network.FMLOutboundHandler; +import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.util.FakePlayer; import mcp.mobius.opis.modOpis; +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; @@ -35,7 +45,7 @@ public class RConServer implements Runnable { } public final static RConServer instance = new RConServer(); - public HashMap fakePlayers = new HashMap(); + public BiMap fakePlayers = HashBiMap.create(); public ArrayList packetTypes = new ArrayList(); private int port = -1; @@ -78,4 +88,19 @@ public class RConServer implements Runnable { } } + public void sendToPlayer(PacketBase packet, FakePlayer player) + { + ByteArrayDataOutput output = ByteStreams.newDataOutput(); + ChannelHandlerContext ctx = RConServer.instance.fakePlayers.get(player); + + packet.encode(output); + ByteBuf msg = ctx.alloc().buffer(output.toByteArray().length); + msg.writeBytes(output.toByteArray()); + ctx.write(msg); + ctx.flush(); + + modOpis.log.info("We should be sending back something here"); + + } + }