From ab175caa8fce4c353d22b0bafdaebd347c6919ca Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Mon, 23 Dec 2013 03:08:59 +0100 Subject: [PATCH] Framework for Client command handling. --- .../commands/client/CommandClientTest.java | 38 ++++++++++++++++ mcp/mobius/opis/modOpis.java | 5 ++- mcp/mobius/opis/network/ClientCommand.java | 5 +++ .../opis/network/ClientCommandHandler.java | 17 +++++++ .../opis/network/OpisPacketHandler.java | 6 +++ mcp/mobius/opis/network/Packets.java | 3 +- .../network/server/Packet_ClientCommand.java | 44 +++++++++++++++++++ 7 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 mcp/mobius/opis/commands/client/CommandClientTest.java create mode 100644 mcp/mobius/opis/network/ClientCommand.java create mode 100644 mcp/mobius/opis/network/ClientCommandHandler.java create mode 100644 mcp/mobius/opis/network/server/Packet_ClientCommand.java diff --git a/mcp/mobius/opis/commands/client/CommandClientTest.java b/mcp/mobius/opis/commands/client/CommandClientTest.java new file mode 100644 index 0000000..d063bad --- /dev/null +++ b/mcp/mobius/opis/commands/client/CommandClientTest.java @@ -0,0 +1,38 @@ +package mcp.mobius.opis.commands.client; + +import mcp.mobius.opis.network.ClientCommand; +import mcp.mobius.opis.network.server.Packet_ClientCommand; +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayerMP; + +public class CommandClientTest extends CommandBase { + + @Override + public String getCommandName() { + return "opis_test"; + } + + @Override + public String getCommandUsage(ICommandSender icommandsender) { + return ""; + } + + @Override + public void processCommand(ICommandSender icommandsender, String[] astring) { + ((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_ClientCommand.create(ClientCommand.TEST_CMD)); + } + + @Override + public int getRequiredPermissionLevel() + { + return 0; + } + + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) + { + return true; + } + +} diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index 9173c80..b732d0e 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -8,6 +8,7 @@ import net.minecraftforge.common.MinecraftForge; import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; import mcp.mobius.opis.client.OpisClientEventHandler; import mcp.mobius.opis.client.OpisClientTickHandler; +import mcp.mobius.opis.commands.client.CommandClientTest; import mcp.mobius.opis.commands.server.CommandAmountEntities; import mcp.mobius.opis.commands.server.CommandChunkDump; import mcp.mobius.opis.commands.server.CommandChunkList; @@ -113,7 +114,9 @@ public class modOpis { event.registerServerCommand(new CommandReset()); event.registerServerCommand(new CommandHandler()); - event.registerServerCommand(new CommandHelp()); + event.registerServerCommand(new CommandClientTest()); + + //event.registerServerCommand(new CommandHelp()); //event.registerServerCommand(new CommandTPS()); GameRegistry.registerPlayerTracker(new OpisPlayerTracker()); diff --git a/mcp/mobius/opis/network/ClientCommand.java b/mcp/mobius/opis/network/ClientCommand.java new file mode 100644 index 0000000..d7dec0c --- /dev/null +++ b/mcp/mobius/opis/network/ClientCommand.java @@ -0,0 +1,5 @@ +package mcp.mobius.opis.network; + +public class ClientCommand { + public static byte TEST_CMD = 0x00; +} diff --git a/mcp/mobius/opis/network/ClientCommandHandler.java b/mcp/mobius/opis/network/ClientCommandHandler.java new file mode 100644 index 0000000..e13361d --- /dev/null +++ b/mcp/mobius/opis/network/ClientCommandHandler.java @@ -0,0 +1,17 @@ +package mcp.mobius.opis.network; + +public class ClientCommandHandler { + + private static ClientCommandHandler _instance; + private ClientCommandHandler(){} + + public static ClientCommandHandler instance(){ + if(_instance == null) + _instance = new ClientCommandHandler(); + return _instance; + } + + public void handle(byte cmd){ + System.out.printf("Received client cmd with id %s\n", cmd); + } +} diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index 57c04ed..c3ccd8f 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -25,6 +25,7 @@ import mcp.mobius.opis.network.client.Packet_UnregisterPlayer; import mcp.mobius.opis.network.server.Packet_ChunkTopList; import mcp.mobius.opis.network.server.Packet_Chunks; import mcp.mobius.opis.network.server.Packet_ClearSelection; +import mcp.mobius.opis.network.server.Packet_ClientCommand; import mcp.mobius.opis.network.server.Packet_DataListChunkEntities; import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities; import mcp.mobius.opis.network.server.Packet_DataScreenAmountEntities; @@ -154,6 +155,11 @@ public class OpisPacketHandler implements IPacketHandler { Packet_ClearSelection castedPacket = new Packet_ClearSelection(packet); modOpis.selectedBlock = null; } + + else if (header == Packets.CLIENT_CMD){ + Packet_ClientCommand castedPacket = new Packet_ClientCommand(packet); + ClientCommandHandler.instance().handle(castedPacket.cmd); + } } diff --git a/mcp/mobius/opis/network/Packets.java b/mcp/mobius/opis/network/Packets.java index 20cbbff..1ef2d3d 100644 --- a/mcp/mobius/opis/network/Packets.java +++ b/mcp/mobius/opis/network/Packets.java @@ -25,7 +25,8 @@ public class Packets { public static byte REQ_TELEPORT = 0x30; // C => S public static byte REQ_TELEPORT_EID = 0x31; // C => S - /* Entities packets */ + public static byte CLIENT_CMD = 0x32; + public static byte DATA_OVERLAY_CHUNK_ENTITIES = 0x40; public static byte DATA_LIST_CHUNK_ENTITIES = 0x41; public static byte DATA_SCREEN_TIMING_ENTITIES = 0x42; diff --git a/mcp/mobius/opis/network/server/Packet_ClientCommand.java b/mcp/mobius/opis/network/server/Packet_ClientCommand.java new file mode 100644 index 0000000..9385542 --- /dev/null +++ b/mcp/mobius/opis/network/server/Packet_ClientCommand.java @@ -0,0 +1,44 @@ +package mcp.mobius.opis.network.server; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import mcp.mobius.opis.network.ClientCommand; +import mcp.mobius.opis.network.Packets; +import net.minecraft.network.packet.Packet250CustomPayload; + +public class Packet_ClientCommand { + + public byte header; + public byte cmd; + + public Packet_ClientCommand(Packet250CustomPayload packet) { + DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); + try{ + this.header = inputStream.readByte(); + this.cmd = inputStream.readByte(); + } catch (IOException e){} + + } + + public static Packet250CustomPayload create(byte cmd){ + Packet250CustomPayload packet = new Packet250CustomPayload(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(1); + DataOutputStream outputStream = new DataOutputStream(bos); + + try{ + outputStream.writeByte(Packets.CLIENT_CMD); + outputStream.writeByte(cmd); + }catch(IOException e){} + + packet.channel = "Opis"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + return packet; + } + +}