Skip to content

Version 1.9.4 #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OllieMartin merged 3 commits into from
Jul 20, 2020
Merged

Version 1.9.4 #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3307989
Attempt to add better support for untranslated RGB codes in meta
OllieMartin Jul 20, 2020
aaf6bad
Incremented version to 1.9.4
OllieMartin Jul 20, 2020
4f3a286
Updated to v1.9.4
OllieMartin Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion multichat/dependency-reduced-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>xyz.olivermartin.multichat</groupId>
<artifactId>multichat</artifactId>
<version>1.9.3</version>
<version>1.9.4</version>
<build>
<plugins>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion multichat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>xyz.olivermartin.multichat</groupId>
<artifactId>multichat</artifactId>
<version>1.9.3</version>
<version>1.9.4</version>

<repositories>

Expand Down
7 changes: 4 additions & 3 deletions multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@
*/
public class MultiChat extends Plugin implements Listener {

public static final String LATEST_VERSION = "1.9.3";
public static final String LATEST_VERSION = "1.9.4";

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

LATEST_VERSION,
"1.9.3",
"1.9.2",
"1.9.1",
"1.9",
Expand Down Expand Up @@ -98,7 +99,7 @@ public class MultiChat extends Plugin implements Listener {
public static boolean hideVanishedStaffInMsg = true;
public static boolean hideVanishedStaffInStaffList = true;
public static boolean hideVanishedStaffInJoin = true;

public static List<String> legacyServers = new ArrayList<String>();

public static MultiChat getInstance() {
Expand Down Expand Up @@ -346,7 +347,7 @@ public void onEnable() {
logStaffChat = configYML.getSection("privacy_settings").getBoolean("log_staffchat");
logGroupChat = configYML.getSection("privacy_settings").getBoolean("log_groupchat");
}

// Legacy servers for RGB approximation
if (configYML.contains("legacy_servers")) {
legacyServers = configYML.getStringList("legacy_servers");
Expand Down
5 changes: 3 additions & 2 deletions multichat/src/main/java/xyz/olivermartin/multichat/local/spigot/LocalSpigotMetaManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public String getPrefix(UUID uuid) {
return MultiChatUtil.approximateHexCodes(vaultChat.getPlayerPrefix(Bukkit.getServer().getPlayer(uuid)));
}

return vaultChat.getPlayerPrefix(Bukkit.getServer().getPlayer(uuid));
return MultiChatUtil.reformatRGB(vaultChat.getPlayerPrefix(Bukkit.getServer().getPlayer(uuid)));

}

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

return vaultChat.getPlayerSuffix(Bukkit.getServer().getPlayer(uuid));
return MultiChatUtil.reformatRGB(vaultChat.getPlayerSuffix(Bukkit.getServer().getPlayer(uuid)));

}

Expand Down Expand Up @@ -86,6 +86,7 @@ public String getDisplayName(UUID uuid) {
displayNameFormat = displayNameFormat.replaceAll("%NAME%", player.getName());
displayNameFormat = displayNameFormat.replaceAll("%PREFIX%", getPrefix(uuid));
displayNameFormat = displayNameFormat.replaceAll("%SUFFIX%", getSuffix(uuid));
displayNameFormat = MultiChatUtil.reformatRGB(displayNameFormat);
displayNameFormat = displayNameFormat.replaceAll("&(?=[a-f,0-9,k-o,r,x])", "�");

// LEGACY HACK
Expand Down
7 changes: 4 additions & 3 deletions multichat/src/main/java/xyz/olivermartin/multichat/local/sponge/LocalSpongeMetaManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public String getPrefix(UUID uuid) {
Player player = opPlayer.get();

if (player.getOption("prefix").isPresent()) {
return MultiChatUtil.approximateHexCodes(player.getOption("prefix").get());
return MultiChatUtil.approximateHexCodes(MultiChatUtil.reformatRGB(player.getOption("prefix").get()));
} else {
return "";
}
Expand All @@ -45,7 +45,7 @@ public String getSuffix(UUID uuid) {
Player player = opPlayer.get();

if (player.getOption("suffix").isPresent()) {
return MultiChatUtil.approximateHexCodes(player.getOption("suffix").get());
return MultiChatUtil.approximateHexCodes(MultiChatUtil.reformatRGB(player.getOption("suffix").get()));
} else {
return "";
}
Expand Down Expand Up @@ -92,8 +92,9 @@ public String getDisplayName(UUID uuid) {
displayNameFormat = displayNameFormat.replaceAll("%NAME%", player.getName());
displayNameFormat = displayNameFormat.replaceAll("%PREFIX%", getPrefix(uuid));
displayNameFormat = displayNameFormat.replaceAll("%SUFFIX%", getSuffix(uuid));
displayNameFormat = MultiChatUtil.reformatRGB(displayNameFormat);
displayNameFormat = displayNameFormat.replaceAll("&(?=[a-f,0-9,k-o,r,x])", "�");

displayNameFormat = MultiChatUtil.approximateHexCodes(displayNameFormat);

// TODO Sponge doesn't seem to like this... So we tend to work around it by sending back our original string
Expand Down
2 changes: 1 addition & 1 deletion ...hat/src/main/java/xyz/olivermartin/multichat/local/sponge/MultiChatLocalSpongePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
import xyz.olivermartin.multichat.local.sponge.listeners.communication.LocalSpongePlayerChannelListener;
import xyz.olivermartin.multichat.local.sponge.listeners.communication.LocalSpongePlayerMetaListener;

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

@Inject
Expand Down
2 changes: 1 addition & 1 deletion multichat/src/main/resources/bungee.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MultiChat
main: xyz.olivermartin.multichat.bungee.MultiChat
version: 1.9.3
version: 1.9.4
author: Revilo410
api-version: 1.16
softdepends: [PremiumVanish]
2 changes: 1 addition & 1 deletion multichat/src/main/resources/chatcontrol.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

##################
# DON'T EDIT #
version: "1.9.3" #
version: "1.9.4" #
##################

# 1. Chat Control Rules
Expand Down
2 changes: 1 addition & 1 deletion multichat/src/main/resources/chatcontrol_fr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

##################
# NE PAS EDITER #
version: "1.9.3" #
version: "1.9.4" #
##################

# French Translation by Nogapra - Thank you !
Expand Down
2 changes: 1 addition & 1 deletion multichat/src/main/resources/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

##################
# DON'T EDIT #
version: "1.9.3" #
version: "1.9.4" #
##################

# 1. General
Expand Down
2 changes: 1 addition & 1 deletion multichat/src/main/resources/config_fr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

##################
# NE PAS EDITER #
version: "1.9.3" #
version: "1.9.4" #
##################

# French Translation by Nogapra - Thank you !
Expand Down
2 changes: 1 addition & 1 deletion multichat/src/main/resources/joinmessages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

##################
# DON'T EDIT #
version: "1.9.3" #
version: "1.9.4" #
##################

############################################################
Expand Down
2 changes: 1 addition & 1 deletion multichat/src/main/resources/joinmessages_fr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

##################
# Ne pas éditer #
version: "1.9.3" #
version: "1.9.4" #
##################

# French Translation by Nogapra - Thank you!
Expand Down
2 changes: 1 addition & 1 deletion multichat/src/main/resources/localconfig.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

##################
# DON'T EDIT #
version: "1.9.3" #
version: "1.9.4" #
##################

# 1. Global Chat Settings
Expand Down
2 changes: 1 addition & 1 deletion multichat/src/main/resources/localconfig_fr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

##################
# NE PAS EDITER #
version: "1.9.3" #
version: "1.9.4" #
##################

# French Translation by Nogapra - Thank you !
Expand Down
2 changes: 1 addition & 1 deletion multichat/src/main/resources/messages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

##################
# DON'T EDIT #
version: "1.9.3" #
version: "1.9.4" #
##################

############################################################
Expand Down
2 changes: 1 addition & 1 deletion multichat/src/main/resources/messages_fr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

##################
# DON'T EDIT #
version: "1.9.3" #
version: "1.9.4" #
##################

# French Translation by Nogapra - Thank you!
Expand Down
2 changes: 1 addition & 1 deletion multichat/src/main/resources/plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: MultiChat
version: 1.9.3
version: 1.9.4
author: Revilo410
main: xyz.olivermartin.multichat.local.spigot.MultiChatLocalSpigotPlugin
softdepend: [Vault,PlaceholderAPI]
Expand Down