Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-26 20:16:02 +01:00
Code Issues Projects Releases Wiki Activity

Hotfix RGB Bungee legacy insertions

Browse Source 
Fixes #1838
We should at some point completely remove the Bungee chat lib and handle everything with plain json ourselves
This commit is contained in:
KennyTV 2020-06-25 09:57:26 +02:00
parent 3ee94415a9
commit f91ddb2521
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
3 changed files with 41 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/ChatRewriter.java
View File

@ -44,25 +44,29 @@ public class ChatRewriter {
builder = new StringBuilder();
components.add(old);
}
switch (format) {
case BOLD:
if (ChatColor.BOLD.equals(format)) {
component.setBold(true);
break;
case ITALIC:
} else if (ChatColor.ITALIC.equals(format)) {
component.setItalic(true);
break;
case UNDERLINE:
} else if (ChatColor.UNDERLINE.equals(format)) {
component.setUnderlined(true);
break;
case STRIKETHROUGH:
} else if (ChatColor.STRIKETHROUGH.equals(format)) {
component.setStrikethrough(true);
break;
case MAGIC:
} else if (ChatColor.MAGIC.equals(format)) {
component.setObfuscated(true);
break;
case RESET:
} else if (ChatColor.RESET.equals(format)) {
format = defaultColor;
default:
component = new TextComponent();
component.setColor(format);
// ViaVersion start
component.setBold(false);
component.setItalic(false);
component.setUnderlined(false);
component.setStrikethrough(false);
component.setObfuscated(false);
// ViaVersion end
} else {
component = new TextComponent();
component.setColor(format);
// ViaVersion start
@ -72,7 +76,6 @@ public class ChatRewriter {
component.setStrikethrough(false);
component.setObfuscated(false);
// ViaVersion end
break;
}
continue;
}

21
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
View File

@ -1,5 +1,6 @@
package us.myles.ViaVersion.protocols.protocol1_13to1_12_2;
import com.google.common.collect.Sets;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import net.md_5.bungee.api.ChatColor;
@ -40,8 +41,9 @@ import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage.TabCompleteTra
import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
import us.myles.ViaVersion.util.GsonUtil;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
public class Protocol1_13To1_12_2 extends Protocol<ClientboundPackets1_12_1, ClientboundPackets1_13, ServerboundPackets1_12_1, ServerboundPackets1_13> {
@ -111,7 +113,9 @@ public class Protocol1_13To1_12_2 extends Protocol<ClientboundPackets1_12_1, Cli
};
// These are arbitrary rewrite values, it just needs an invalid color code character.
protected static final EnumMap<ChatColor, Character> SCOREBOARD_TEAM_NAME_REWRITE = new EnumMap<>(ChatColor.class);
protected static final Map<ChatColor, Character> SCOREBOARD_TEAM_NAME_REWRITE = new HashMap<>();
private static final Set<ChatColor> FORMATTING_CODES = Sets.newHashSet(ChatColor.MAGIC, ChatColor.BOLD, ChatColor.STRIKETHROUGH,
ChatColor.UNDERLINE, ChatColor.ITALIC, ChatColor.RESET);
static {
SCOREBOARD_TEAM_NAME_REWRITE.put(ChatColor.BLACK, 'g');
@ -1045,22 +1049,11 @@ public class Protocol1_13To1_12_2 extends Protocol<ClientboundPackets1_12_1, Cli
if (section == ChatColor.COLOR_CHAR && index < length - 1) {
char c = input.charAt(index + 1);
ChatColor color = ChatColor.getByChar(c);
if (color != null) {
switch (color) {
case MAGIC:
case BOLD:
case STRIKETHROUGH:
case UNDERLINE:
case ITALIC:
case RESET:
break;
default:
if (color != null && !FORMATTING_CODES.contains(color)) {
return color;
}
}
}
}
return ChatColor.RESET;
}

2
pom.xml
View File

@ -114,7 +114,7 @@
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-chat</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>