Fork/CitizensCMD
2
0
Fork 0
forked from Upstream/CitizensCMD
Code Pull Requests Actions Releases Activity

Remove old non-Adventure color and console messaging methods

Browse Source
This commit is contained in:
HexedHero 2022-03-30 17:22:53 +01:00
parent 95b8969cd7
commit 84d995b811
4 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/mattstudios/citizenscmd/CitizensCMD.java
View File

@ -21,8 +21,6 @@ package me.mattstudios.citizenscmd;
import static me.mattstudios.citizenscmd.utility.Util.HEADER; import static me.mattstudios.citizenscmd.utility.Util.HEADER;
import static me.mattstudios.citizenscmd.utility.Util.LEGACY; import static me.mattstudios.citizenscmd.utility.Util.LEGACY;
import static me.mattstudios.citizenscmd.utility.Util.TAG; import static me.mattstudios.citizenscmd.utility.Util.TAG;
import static me.mattstudios.citizenscmd.utility.Util.color;
import static me.mattstudios.citizenscmd.utility.Util.info;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
@ -266,7 +264,7 @@ public final class CitizensCMD extends JavaPlugin {
try { try {
pm.registerEvents(new NPCListener(this), this); pm.registerEvents(new NPCListener(this), this);
} catch (final Exception ex) { } catch (final Exception ex) {
info(color("&cCould not register clone event, please update your Citizens.")); audiences.console().sendMessage(LEGACY.deserialize("&cCould not register clone event, please update your Citizens."));
} }
} }

5
src/main/java/me/mattstudios/citizenscmd/files/CooldownHandler.java
View File

@ -18,8 +18,7 @@
package me.mattstudios.citizenscmd.files; package me.mattstudios.citizenscmd.files;
import static me.mattstudios.citizenscmd.utility.Util.color; import static me.mattstudios.citizenscmd.utility.Util.LEGACY;
import static me.mattstudios.citizenscmd.utility.Util.info;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -74,7 +73,7 @@ public class CooldownHandler {
try { try {
cooldownsFile.createNewFile(); cooldownsFile.createNewFile();
} catch (final IOException e) { } catch (final IOException e) {
info(color("&cError creating cooldowns file..")); plugin.getAudiences().console().sendMessage(LEGACY.deserialize("&cError creating cooldowns file.."));
} }
} }
} }

5
src/main/java/me/mattstudios/citizenscmd/files/DataHandler.java
View File

@ -19,8 +19,7 @@
package me.mattstudios.citizenscmd.files; package me.mattstudios.citizenscmd.files;
import static me.mattstudios.citizenscmd.utility.Util.HEADER; import static me.mattstudios.citizenscmd.utility.Util.HEADER;
import static me.mattstudios.citizenscmd.utility.Util.color; import static me.mattstudios.citizenscmd.utility.Util.LEGACY;
import static me.mattstudios.citizenscmd.utility.Util.info;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -82,7 +81,7 @@ public class DataHandler {
try { try {
savesFile.createNewFile(); savesFile.createNewFile();
} catch (final IOException e) { } catch (final IOException e) {
info(color("&cError creating saves file..")); plugin.getAudiences().console().sendMessage(LEGACY.deserialize("&cError creating saves file.."));
} }
} }
} }

18
src/main/java/me/mattstudios/citizenscmd/utility/Util.java
View File

@ -21,17 +21,13 @@ package me.mattstudios.citizenscmd.utility;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.List;
import java.util.OptionalInt; import java.util.OptionalInt;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.bstats.bukkit.Metrics; import org.bstats.bukkit.Metrics;
import org.bstats.charts.SimplePie; import org.bstats.charts.SimplePie;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -59,20 +55,6 @@ public class Util {
public static final Component HEADER = LEGACY.deserialize("&c&m-&6&m-&e&m-&a&m-&b&m-&3&l CitizensCMD &b&m-&a&m-&e&m-&6&m-&c&m-"); public static final Component HEADER = LEGACY.deserialize("&c&m-&6&m-&e&m-&a&m-&b&m-&3&l CitizensCMD &b&m-&a&m-&e&m-&6&m-&c&m-");
public static final Component TAG = LEGACY.deserialize("&f[&3Citizens&cCMD&f]&r "); public static final Component TAG = LEGACY.deserialize("&f[&3Citizens&cCMD&f]&r ");
public static String color(String message) {
return ChatColor.translateAlternateColorCodes('&', message);
}
public static void info(String message) {
Bukkit.getConsoleSender().sendMessage(message);
}
public static List<String> color(final List<String> messages) {
return messages.stream()
.map((message) -> ChatColor.translateAlternateColorCodes('&', message))
.collect(Collectors.toList());
}
/** /**
* Checks if player has or not selected an NPC * Checks if player has or not selected an NPC
* *