diff --git a/mcp/mobius/opis/commands/CommandKillAll.java b/mcp/mobius/opis/commands/CommandKillAll.java new file mode 100644 index 0000000..a0a6dff --- /dev/null +++ b/mcp/mobius/opis/commands/CommandKillAll.java @@ -0,0 +1,104 @@ +package mcp.mobius.opis.commands; + +import org.apache.commons.lang3.StringUtils; + +import cpw.mods.fml.common.network.PacketDispatcher; +import cpw.mods.fml.common.network.Player; +import mcp.mobius.opis.data.EntityManager; +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.MemoryConnection; +import net.minecraft.network.packet.Packet3Chat; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.dedicated.DedicatedServer; +import net.minecraft.util.ChatMessageComponent; +import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; + +public class CommandKillAll extends CommandBase { + + @Override + public String getCommandName() { + return "opis_killall"; + } + + @Override + public String getCommandUsage(ICommandSender icommandsender) { + return ""; + } + + @Override + public void processCommand(ICommandSender icommandsender, String[] astring) { + if (astring.length < 1) return; + + String searchname = StringUtils.join(astring, " ").toLowerCase(); + int nkilled = 0; + + if (searchname.equals("Player")){ + if (icommandsender instanceof EntityPlayer) + PacketDispatcher.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oSeriously ? I can't, seriously, I can't. I should remove you from the OP list !"))), (Player)icommandsender); + return; + } + + + for (int dim : DimensionManager.getIDs()){ + World world = DimensionManager.getWorld(dim); + if (world == null) continue; + + for (Object o : world.loadedEntityList){ + Entity ent = (Entity)o; + String name = EntityManager.getEntityName(ent).toLowerCase(); + + if (name.equals(searchname)){ + ent.setDead(); + nkilled += 1; + } + } + } + + if (icommandsender instanceof EntityPlayer) + PacketDispatcher.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oKilled %d entities of type %s", nkilled, searchname))), (Player)icommandsender); + + /* + World world = DimensionManager.getWorld(dim); + if (world == null){ + PacketDispatcher.sendPacketToPlayer( + new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oCannot find dim %d in world %d", dim))), + (Player)icommandsender); + return; + } + + Entity entity = world.getEntityByID(eid); + if (entity == null) { + PacketDispatcher.sendPacketToPlayer( + new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oCannot find entity %d in dim %d", eid, dim))), + (Player)icommandsender); + return; + } + + entity.setDead(); + PacketDispatcher.sendPacketToPlayer( + new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oKilled entity %d in dim %d", eid, dim))), + (Player)icommandsender); + return; + */ + } + + @Override + public int getRequiredPermissionLevel() + { + return 3; + } + + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) + { + if (sender instanceof DedicatedServer) return false; + if (((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; + return MinecraftServer.getServer().getConfigurationManager().isPlayerOpped(((EntityPlayerMP)sender).username); + } + +} diff --git a/mcp/mobius/opis/commands/CommandReset.java b/mcp/mobius/opis/commands/CommandReset.java index 12f96db..e124a89 100644 --- a/mcp/mobius/opis/commands/CommandReset.java +++ b/mcp/mobius/opis/commands/CommandReset.java @@ -7,6 +7,7 @@ import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.EntityManager; import mcp.mobius.opis.data.TileEntityManager; +import mcp.mobius.opis.network.server.Packet_ClearSelection; import mcp.mobius.opis.server.OpisServerTickHandler; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; @@ -44,6 +45,8 @@ public class CommandReset extends CommandBase { if (icommandsender instanceof EntityPlayer) PacketDispatcher.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oInternal data reseted."))), (Player)icommandsender); + + PacketDispatcher.sendPacketToAllPlayers(Packet_ClearSelection.create()); //notifyAdmins(icommandsender, "Opis started with a tick delay %s.", new Object[] {modOpis.profilerDelay}); } diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index ad50983..b587be7 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -13,6 +13,7 @@ import mcp.mobius.opis.commands.CommandChunkDump; import mcp.mobius.opis.commands.CommandChunkList; import mcp.mobius.opis.commands.CommandDataDump; import mcp.mobius.opis.commands.CommandKill; +import mcp.mobius.opis.commands.CommandKillAll; import mcp.mobius.opis.commands.CommandReset; import mcp.mobius.opis.commands.CommandTimingEntities; import mcp.mobius.opis.commands.CommandFrequency; @@ -46,7 +47,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; -@Mod(modid="Opis", name="Opis", version="1.1.0_alpha") +@Mod(modid="Opis", name="Opis", version="1.1.1_alpha") @NetworkMod(channels={"Opis", "Opis_Chunk"},clientSideRequired=false, serverSideRequired=false, connectionHandler=OpisConnectionHandler.class, packetHandler=OpisPacketHandler.class) public class modOpis { @@ -107,6 +108,7 @@ public class modOpis { event.registerServerCommand(new CommandTimingEntities()); event.registerServerCommand(new CommandAmountEntities()); event.registerServerCommand(new CommandKill()); + event.registerServerCommand(new CommandKillAll()); event.registerServerCommand(new CommandReset()); //event.registerServerCommand(new CommandTPS()); diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index 9888efe..6819c37 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -24,6 +24,7 @@ import mcp.mobius.opis.network.client.Packet_ReqTickets; 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_DataListChunkEntities; import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities; import mcp.mobius.opis.network.server.Packet_DataScreenAmountEntities; @@ -143,6 +144,11 @@ public class OpisPacketHandler implements IPacketHandler { modOpis.proxy.displayEntityAmount(castedPacket.entities); } + else if (header == Packets.CLR_SELECTION){ + Packet_ClearSelection castedPacket = new Packet_ClearSelection(packet); + modOpis.selectedBlock = null; + } + } void onPacketToServer(INetworkManager manager, Packet250CustomPayload packet, Player player, Byte header) { diff --git a/mcp/mobius/opis/network/Packets.java b/mcp/mobius/opis/network/Packets.java index d2e2f2a..90b8503 100644 --- a/mcp/mobius/opis/network/Packets.java +++ b/mcp/mobius/opis/network/Packets.java @@ -31,5 +31,7 @@ public class Packets { public static byte DATA_SCREEN_TIMING_ENTITIES = 0x42; public static byte DATA_SCREEN_AMOUNT_ENTITIES = 0x43; - public static byte REQ_DATA = 0x50; // C => S + + public static byte REQ_DATA = 0x50; // C => S + public static byte CLR_SELECTION = 0x51; // S => C } diff --git a/mcp/mobius/opis/network/server/Packet_ClearSelection.java b/mcp/mobius/opis/network/server/Packet_ClearSelection.java new file mode 100644 index 0000000..2d48ad3 --- /dev/null +++ b/mcp/mobius/opis/network/server/Packet_ClearSelection.java @@ -0,0 +1,39 @@ +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.Packet251Extended; +import mcp.mobius.opis.network.Packets; +import net.minecraft.network.packet.Packet250CustomPayload; + +public class Packet_ClearSelection { + public byte header; + + public Packet_ClearSelection(Packet250CustomPayload packet) { + DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); + try{ + this.header = inputStream.readByte(); + } catch (IOException e){} + + } + + public static Packet250CustomPayload create(){ + Packet250CustomPayload packet = new Packet250CustomPayload(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(1); + DataOutputStream outputStream = new DataOutputStream(bos); + + try{ + outputStream.writeByte(Packets.CLR_SELECTION); + }catch(IOException e){} + + packet.channel = "Opis"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + return packet; + } +}