Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-12-26 11:08:12 +01:00
Code Issues Projects Releases Wiki Activity

Fixed the columns slightly. Still needs tweaking.

Browse Source
This commit is contained in:
Kristian S. Stangeland 2012-11-03 07:32:14 +01:00
parent da0d55fcea
commit 188f03b39e
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ProtocolLib/src/main/java/com/comphenix/protocol/CommandPacket.java
View File

@ -28,6 +28,7 @@ import com.comphenix.protocol.injector.GamePhase;
import com.comphenix.protocol.reflect.FieldAccessException;
import com.comphenix.protocol.reflect.PrettyPrinter;
import com.comphenix.protocol.utility.ChatExtensions;
import com.google.common.base.Strings;
import com.google.common.collect.DiscreteDomains;
import com.google.common.collect.Range;
import com.google.common.collect.Ranges;
@ -54,6 +55,11 @@ class CommandPacket implements CommandExecutor {
* Name of this command.
*/
public static final String NAME = "packet";
/**
* Default width of the chat window.
*/
private static final int CHAT_WIDTH = 90;
private Plugin plugin;
private Logger logger;
@ -127,7 +133,7 @@ class CommandPacket implements CommandExecutor {
/**
* Send a message without invoking the packet listeners.
* @param player - the player to send it to.
* @param receiver - the player to send it to.
* @param message - the message to send.
* @return TRUE if the message was sent successfully, FALSE otherwise.
*/
@ -205,15 +211,24 @@ class CommandPacket implements CommandExecutor {
} else if (subCommand == SubCommand.NAMES) {
Set<Integer> named = getNamedPackets(side);
List<String> messages = new ArrayList<String>();
// Print the equivalent name of every given ID
for (Range<Integer> range : ranges) {
for (int id : range.asSet(DiscreteDomains.integers())) {
if (named.contains(id)) {
sendMessageSilently(sender, ChatColor.BLUE + "" + id + ": " + Packets.getDeclaredName(id));
messages.add(ChatColor.BLUE + "" + id + ": " + Packets.getDeclaredName(id));
}
}
}
// Convert to two rows
messages = getMessagesInRows(messages, 2, CHAT_WIDTH);
// Print that
for (String message : messages) {
sendMessageSilently(sender, message);
}
}
} catch (NumberFormatException e) {
@ -228,6 +243,24 @@ class CommandPacket implements CommandExecutor {
return false;
}
private List<String> getMessagesInRows(List<String> messages, int rows, int totalWidth) {
List<String> output = new ArrayList<String>();
int columnWidth = totalWidth / rows;
for (int i = 0; i < messages.size(); i++) {
int mapped = i / rows;
// Either create a new row, or add to an existing row
if (mapped < output.size()) {
output.set(mapped, Strings.padEnd(output.get(mapped), columnWidth, ' ') + messages.get(i));
} else {
output.add(messages.get(i));
}
}
return output;
}
/**
* Parse ranges from an array of tokens.
* @param args - array of tokens.

2
ProtocolLib/src/main/java/com/comphenix/protocol/utility/ChatExtensions.java
View File

@ -28,7 +28,7 @@ public class ChatExtensions {
/**
* Send a message without invoking the packet listeners.
* @param player - the player to send it to.
* @param receiver - the receiver.
* @param message - the message to send.
* @return TRUE if the message was sent successfully, FALSE otherwise.
* @throws InvocationTargetException If we were unable to send the message.