Skip to content

Commit e4015c7

Browse files
OllieMartinOllieMartin
authored
Merge pull request #126 from MultiChat/v19
Version 1.9.4
2 parents 4766dfd + 4f3a286 commit e4015c7

18 files changed

+26
-23
lines changed

Diff for: ‎multichat/dependency-reduced-pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>xyz.olivermartin.multichat</groupId>
55
<artifactId>multichat</artifactId>
6-
<version>1.9.3</version>
6+
<version>1.9.4</version>
77
<build>
88
<plugins>
99
<plugin>

Diff for: ‎multichat/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>xyz.olivermartin.multichat</groupId>
77
<artifactId>multichat</artifactId>
8-
<version>1.9.3</version>
8+
<version>1.9.4</version>
99

1010
<repositories>
1111

Diff for: ‎multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@
3737
*/
3838
public class MultiChat extends Plugin implements Listener {
3939

40-
public static final String LATEST_VERSION = "1.9.3";
40+
public static final String LATEST_VERSION = "1.9.4";
4141

4242
public static final String[] ALLOWED_VERSIONS = new String[] {
4343

4444
LATEST_VERSION,
45+
"1.9.3",
4546
"1.9.2",
4647
"1.9.1",
4748
"1.9",
@@ -98,7 +99,7 @@ public class MultiChat extends Plugin implements Listener {
9899
public static boolean hideVanishedStaffInMsg = true;
99100
public static boolean hideVanishedStaffInStaffList = true;
100101
public static boolean hideVanishedStaffInJoin = true;
101-
102+
102103
public static List<String> legacyServers = new ArrayList<String>();
103104

104105
public static MultiChat getInstance() {
@@ -346,7 +347,7 @@ public void onEnable() {
346347
logStaffChat = configYML.getSection("privacy_settings").getBoolean("log_staffchat");
347348
logGroupChat = configYML.getSection("privacy_settings").getBoolean("log_groupchat");
348349
}
349-
350+
350351
// Legacy servers for RGB approximation
351352
if (configYML.contains("legacy_servers")) {
352353
legacyServers = configYML.getStringList("legacy_servers");

Diff for: ‎multichat/src/main/java/xyz/olivermartin/multichat/local/spigot/LocalSpigotMetaManager.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public String getPrefix(UUID uuid) {
2828
return MultiChatUtil.approximateHexCodes(vaultChat.getPlayerPrefix(Bukkit.getServer().getPlayer(uuid)));
2929
}
3030

31-
return vaultChat.getPlayerPrefix(Bukkit.getServer().getPlayer(uuid));
31+
return MultiChatUtil.reformatRGB(vaultChat.getPlayerPrefix(Bukkit.getServer().getPlayer(uuid)));
3232

3333
}
3434

@@ -50,7 +50,7 @@ public String getSuffix(UUID uuid) {
5050
return MultiChatUtil.approximateHexCodes(vaultChat.getPlayerSuffix(Bukkit.getServer().getPlayer(uuid)));
5151
}
5252

53-
return vaultChat.getPlayerSuffix(Bukkit.getServer().getPlayer(uuid));
53+
return MultiChatUtil.reformatRGB(vaultChat.getPlayerSuffix(Bukkit.getServer().getPlayer(uuid)));
5454

5555
}
5656

@@ -86,6 +86,7 @@ public String getDisplayName(UUID uuid) {
8686
displayNameFormat = displayNameFormat.replaceAll("%NAME%", player.getName());
8787
displayNameFormat = displayNameFormat.replaceAll("%PREFIX%", getPrefix(uuid));
8888
displayNameFormat = displayNameFormat.replaceAll("%SUFFIX%", getSuffix(uuid));
89+
displayNameFormat = MultiChatUtil.reformatRGB(displayNameFormat);
8990
displayNameFormat = displayNameFormat.replaceAll("&(?=[a-f,0-9,k-o,r,x])", "§");
9091

9192
// LEGACY HACK

Diff for: ‎multichat/src/main/java/xyz/olivermartin/multichat/local/sponge/LocalSpongeMetaManager.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public String getPrefix(UUID uuid) {
2424
Player player = opPlayer.get();
2525

2626
if (player.getOption("prefix").isPresent()) {
27-
return MultiChatUtil.approximateHexCodes(player.getOption("prefix").get());
27+
return MultiChatUtil.approximateHexCodes(MultiChatUtil.reformatRGB(player.getOption("prefix").get()));
2828
} else {
2929
return "";
3030
}
@@ -45,7 +45,7 @@ public String getSuffix(UUID uuid) {
4545
Player player = opPlayer.get();
4646

4747
if (player.getOption("suffix").isPresent()) {
48-
return MultiChatUtil.approximateHexCodes(player.getOption("suffix").get());
48+
return MultiChatUtil.approximateHexCodes(MultiChatUtil.reformatRGB(player.getOption("suffix").get()));
4949
} else {
5050
return "";
5151
}
@@ -92,8 +92,9 @@ public String getDisplayName(UUID uuid) {
9292
displayNameFormat = displayNameFormat.replaceAll("%NAME%", player.getName());
9393
displayNameFormat = displayNameFormat.replaceAll("%PREFIX%", getPrefix(uuid));
9494
displayNameFormat = displayNameFormat.replaceAll("%SUFFIX%", getSuffix(uuid));
95+
displayNameFormat = MultiChatUtil.reformatRGB(displayNameFormat);
9596
displayNameFormat = displayNameFormat.replaceAll("&(?=[a-f,0-9,k-o,r,x])", "§");
96-
97+
9798
displayNameFormat = MultiChatUtil.approximateHexCodes(displayNameFormat);
9899

99100
// TODO Sponge doesn't seem to like this... So we tend to work around it by sending back our original string

Diff for: ‎multichat/src/main/java/xyz/olivermartin/multichat/local/sponge/MultiChatLocalSpongePlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import xyz.olivermartin.multichat.local.sponge.listeners.communication.LocalSpongePlayerChannelListener;
5757
import xyz.olivermartin.multichat.local.sponge.listeners.communication.LocalSpongePlayerMetaListener;
5858

59-
@Plugin(id = "multichat", name = "MultiChat", version = "1.9.3", dependencies = { @Dependency(id = "placeholderapi", optional = true) })
59+
@Plugin(id = "multichat", name = "MultiChat", version = "1.9.4", dependencies = { @Dependency(id = "placeholderapi", optional = true) })
6060
public class MultiChatLocalSpongePlugin {
6161

6262
@Inject

Diff for: ‎multichat/src/main/resources/bungee.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: MultiChat
22
main: xyz.olivermartin.multichat.bungee.MultiChat
3-
version: 1.9.3
3+
version: 1.9.4
44
author: Revilo410
55
api-version: 1.16
66
softdepends: [PremiumVanish]

Diff for: ‎multichat/src/main/resources/chatcontrol.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
##################
1010
# DON'T EDIT #
11-
version: "1.9.3" #
11+
version: "1.9.4" #
1212
##################
1313

1414
# 1. Chat Control Rules

Diff for: ‎multichat/src/main/resources/chatcontrol_fr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
##################
1010
# NE PAS EDITER #
11-
version: "1.9.3" #
11+
version: "1.9.4" #
1212
##################
1313

1414
# French Translation by Nogapra - Thank you !

Diff for: ‎multichat/src/main/resources/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
##################
1010
# DON'T EDIT #
11-
version: "1.9.3" #
11+
version: "1.9.4" #
1212
##################
1313

1414
# 1. General

Diff for: ‎multichat/src/main/resources/config_fr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
##################
1010
# NE PAS EDITER #
11-
version: "1.9.3" #
11+
version: "1.9.4" #
1212
##################
1313

1414
# French Translation by Nogapra - Thank you !

Diff for: ‎multichat/src/main/resources/joinmessages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
##################
1010
# DON'T EDIT #
11-
version: "1.9.3" #
11+
version: "1.9.4" #
1212
##################
1313

1414
############################################################

Diff for: ‎multichat/src/main/resources/joinmessages_fr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
##################
1010
# Ne pas éditer #
11-
version: "1.9.3" #
11+
version: "1.9.4" #
1212
##################
1313

1414
# French Translation by Nogapra - Thank you!

Diff for: ‎multichat/src/main/resources/localconfig.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
##################
1010
# DON'T EDIT #
11-
version: "1.9.3" #
11+
version: "1.9.4" #
1212
##################
1313

1414
# 1. Global Chat Settings

Diff for: ‎multichat/src/main/resources/localconfig_fr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
##################
1010
# NE PAS EDITER #
11-
version: "1.9.3" #
11+
version: "1.9.4" #
1212
##################
1313

1414
# French Translation by Nogapra - Thank you !

Diff for: ‎multichat/src/main/resources/messages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
##################
1010
# DON'T EDIT #
11-
version: "1.9.3" #
11+
version: "1.9.4" #
1212
##################
1313

1414
############################################################

Diff for: ‎multichat/src/main/resources/messages_fr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
##################
1010
# DON'T EDIT #
11-
version: "1.9.3" #
11+
version: "1.9.4" #
1212
##################
1313

1414
# French Translation by Nogapra - Thank you!

Diff for: ‎multichat/src/main/resources/plugin.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: MultiChat
2-
version: 1.9.3
2+
version: 1.9.4
33
author: Revilo410
44
main: xyz.olivermartin.multichat.local.spigot.MultiChatLocalSpigotPlugin
55
softdepend: [Vault,PlaceholderAPI]

0 commit comments

Comments
 (0)