Skip to content

Commit 8d1430f

Browse files
Fixed version check on HEX
1 parent c9901ca commit 8d1430f

File tree

2 files changed

+60
-8
lines changed

2 files changed

+60
-8
lines changed

addon/src/main/java/com/jaimemartz/playerbalanceraddon/util/Color.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@ public class Color {
1212
private static final Pattern HEX_PATTERN = Pattern.compile("(&#[0-9a-fA-F]{6})");
1313

1414
public static String translate(String message) {
15-
Matcher matcher = HEX_PATTERN.matcher(message);
16-
StringBuffer sb = new StringBuffer();
17-
while (matcher.find()) {
18-
String hex = matcher.group(1).substring(1);
19-
matcher.appendReplacement(sb, net.md_5.bungee.api.ChatColor.of(hex) + "");
20-
}
21-
matcher.appendTail(sb);
15+
String hexColored = message;
16+
17+
if (VersionCheck.isOnePointSixteenPlus()) {
18+
Matcher matcher = HEX_PATTERN.matcher(message);
19+
StringBuffer sb = new StringBuffer();
20+
while (matcher.find()) {
21+
String hex = matcher.group(1).substring(1);
22+
matcher.appendReplacement(sb, net.md_5.bungee.api.ChatColor.of(hex) + "");
23+
}
24+
matcher.appendTail(sb);
2225

23-
String hexColored = sb.toString();
26+
hexColored = sb.toString();
27+
}
2428

2529
return ChatColor.translateAlternateColorCodes('&', hexColored);
2630
}
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
package com.jaimemartz.playerbalanceraddon.util;
2+
3+
import org.bukkit.Bukkit;
4+
5+
public class VersionCheck {
6+
7+
public static boolean isOnePointEightPlus() {
8+
if (Bukkit.getVersion().contains("1.8") || Bukkit.getVersion().contains("1.9") || Bukkit.getVersion().contains("1.10") || Bukkit.getVersion().contains("1.11") || Bukkit.getVersion().contains("1.12") || Bukkit.getVersion().contains("1.13") || Bukkit.getVersion().contains("1.14") || Bukkit.getVersion().contains("1.15") || Bukkit.getVersion().contains("1.16") || Bukkit.getVersion().contains("1.17") || Bukkit.getVersion().contains("1.18") || Bukkit.getVersion().contains("1.19")) {
9+
return true;
10+
}
11+
return false;
12+
}
13+
14+
public static boolean isOnePointNinePlus() {
15+
if (Bukkit.getVersion().contains("1.9") || Bukkit.getVersion().contains("1.10") || Bukkit.getVersion().contains("1.11") || Bukkit.getVersion().contains("1.12") || Bukkit.getVersion().contains("1.13") || Bukkit.getVersion().contains("1.14") || Bukkit.getVersion().contains("1.15") || Bukkit.getVersion().contains("1.16") || Bukkit.getVersion().contains("1.17") || Bukkit.getVersion().contains("1.18") || Bukkit.getVersion().contains("1.19")) {
16+
return true;
17+
}
18+
return false;
19+
}
20+
21+
public static boolean isOnePointThirteenPlus() {
22+
if (Bukkit.getVersion().contains("1.13") || Bukkit.getVersion().contains("1.14") || Bukkit.getVersion().contains("1.15") || Bukkit.getVersion().contains("1.16") || Bukkit.getVersion().contains("1.17") || Bukkit.getVersion().contains("1.18") || Bukkit.getVersion().contains("1.19")) {
23+
return true;
24+
}
25+
return false;
26+
}
27+
28+
public static boolean isOnePointFourteenPlus() {
29+
if (Bukkit.getVersion().contains("1.14") || Bukkit.getVersion().contains("1.15") || Bukkit.getVersion().contains("1.16") || Bukkit.getVersion().contains("1.17") || Bukkit.getVersion().contains("1.18") || Bukkit.getVersion().contains("1.19")) {
30+
return true;
31+
}
32+
return false;
33+
}
34+
35+
public static boolean isOnePointSixteenPlus() {
36+
if (Bukkit.getVersion().contains("1.16") || Bukkit.getVersion().contains("1.17") || Bukkit.getVersion().contains("1.18") || Bukkit.getVersion().contains("1.19")) {
37+
return true;
38+
}
39+
return false;
40+
}
41+
42+
public static boolean isOnePointSeven() {
43+
if (Bukkit.getVersion().contains("1.7")) {
44+
return true;
45+
}
46+
return false;
47+
}
48+
}

0 commit comments

Comments
 (0)