bedohswe/crab
1
0
Fork 0
forked from pixtaded/crab
Code Pull Requests Activity

master #1

Merged
bedohswe merged 27 commits from pixtaded/crab:master into master 2025-02-11 18:05:01 +00:00
Conversation 0 Commits 27 Files Changed 13 +6 -9
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 933af5c5e0 - Show all commits

8
src/main/java/net/pixtaded/crab/client/ClientUtil.java
View File

@ -10,12 +10,8 @@ public class ClientUtil {
public static final ClientColor[] colors = {
new ClientColor( COLOR_KEY + "(<.*?>)", "\033[0;31m$1\033[0m"),
new ClientColor("\uB9AC\u3E70(<.*?>)", "\033[0;32m$1\033[0m"),
new ClientColor(" (<.*?>)", " \033[0;34m$1\033[0m")
/*
I'm too lazy to add a message parser, which is absolutely required for Mefedroniy color support. For now, it will be just white.
Also, there is another problem with that - there is no "server log format" in the protocol specification,
and I want my client to be as compatible as possible.
*/
new ClientColor(" (<.*?>)", " \033[0;34m$1\033[0m"),
new ClientColor("\u00B0\u0298(<.*?>)", "\033[0;35m$1\033[0m")
};
public static String clientColors(String s) {

5
src/main/java/net/pixtaded/crab/server/ServerThread.java
View File

@ -69,8 +69,9 @@ public class ServerThread implements Runnable {
}
private void sendLogs(byte PID) throws IOException {
if (PID == COMMUNICATION) respond(server.cache.content());
if (PID == LOGS) {
if (PID == COMMUNICATION) {
respond(server.cache.content());
} else if (PID == LOGS) {
String clientSize = Util.readAsciiNumber(in);
int clientSizeNum = Integer.parseInt(clientSize);
byte[] serverLogs = server.cache.content().getBytes(StandardCharsets.UTF_8);