diff --git a/pom.xml b/pom.xml index 5ad8535..fe14685 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.mattyhd0 ChatColor - 2.7.11 + 2.7.12 jar @@ -16,20 +16,34 @@ - + + + central + https://repo1.maven.org/maven2/ + + + + + spigotmc-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + placeholderapi https://repo.extendedclip.com/content/repositories/placeholderapi/ - + + - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + sonatype-oss-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + - minecraft-libraries - Minecraft Libraries - https://libraries.minecraft.net/ + jetbrains + https://www.jetbrains.com/intellij-repository/releases/ @@ -52,7 +66,7 @@ me.clip placeholderapi - 2.11.3 + 2.11.6 provided @@ -63,12 +77,12 @@ compile - + com.google.code.gson diff --git a/src/main/java/me/mattyhd0/chatcolor/MyChatColor.java b/src/main/java/me/mattyhd0/chatcolor/MyChatColor.java index e5d712d..997be79 100644 --- a/src/main/java/me/mattyhd0/chatcolor/MyChatColor.java +++ b/src/main/java/me/mattyhd0/chatcolor/MyChatColor.java @@ -34,7 +34,7 @@ public static String applyHex(String textToTranslate, Player player){ Pattern pattern = Pattern.compile("&#[a-fA-F0-9]{6}"); Matcher matcher = pattern.matcher(textToTranslate); - if(textToTranslate.length() > 0){ + if(!textToTranslate.isEmpty()){ while (matcher.find()) { diff --git a/src/main/java/me/mattyhd0/chatcolor/command/ChatColorAdminCommand.java b/src/main/java/me/mattyhd0/chatcolor/command/ChatColorAdminCommand.java index 86397cd..4cd865c 100644 --- a/src/main/java/me/mattyhd0/chatcolor/command/ChatColorAdminCommand.java +++ b/src/main/java/me/mattyhd0/chatcolor/command/ChatColorAdminCommand.java @@ -13,6 +13,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.command.TabCompleter; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; @@ -25,7 +26,7 @@ public ChatColorAdminCommand(ChatColorPlugin plugin) { this.plugin = plugin; } - public boolean onCommand(CommandSender sender, Command command, String s, String[] arg) { + public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, String[] arg) { if (!(arg.length > 0)) { @@ -53,7 +54,7 @@ public boolean onCommand(CommandSender sender, Command command, String s, String @Override - public List onTabComplete(CommandSender sender, Command command, String s, String[] strings) { + public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, String[] strings) { List completions = new ArrayList<>(); @@ -134,7 +135,7 @@ public void setPattern(CommandSender sender, String[] arg) { .replaceAll("%sender%", sender.getName()) .replaceAll("%pattern%", patternName); - if (!messagePlayer.equals("")) player.sendMessage(messagePlayer); + if (!messagePlayer.isEmpty()) player.sendMessage(messagePlayer); } else { @@ -215,7 +216,7 @@ public void disable(CommandSender sender, String[] arg) { .replaceAll("%pattern%", patternName) .replaceAll("%sender%", sender.getName()); - if (!messagePlayer.equals("")) player.sendMessage(messagePlayer); + if (!messagePlayer.isEmpty()) player.sendMessage(messagePlayer); } else { sender.sendMessage( @@ -271,7 +272,7 @@ public void gui(CommandSender sender, String[] arg) { String messagePlayer = messagesYMLFile.getMessage("commands.chatcoloradmin.gui.gui-opened-target") .replaceAll("%sender%", sender.getName()); - if (!messagePlayer.equals("")) player.sendMessage(messagePlayer); + if (!messagePlayer.isEmpty()) player.sendMessage(messagePlayer); ChatColorGUI.openGui(player); }else { diff --git a/src/main/java/me/mattyhd0/chatcolor/command/ChatColorCommand.java b/src/main/java/me/mattyhd0/chatcolor/command/ChatColorCommand.java index 3442b7d..4344b9d 100644 --- a/src/main/java/me/mattyhd0/chatcolor/command/ChatColorCommand.java +++ b/src/main/java/me/mattyhd0/chatcolor/command/ChatColorCommand.java @@ -13,19 +13,20 @@ import org.bukkit.command.CommandSender; import me.mattyhd0.chatcolor.ChatColorPlugin; import org.bukkit.command.CommandExecutor; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; public class ChatColorCommand implements CommandExecutor, TabCompleter { - private ChatColorPlugin plugin; + private final ChatColorPlugin plugin; public ChatColorCommand(ChatColorPlugin plugin) { this.plugin = plugin; } - public boolean onCommand(CommandSender sender, Command command, String s, String[] arg) { + public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, String[] arg) { ConfigurationManager configurationManager = plugin.getConfigurationManager(); @@ -299,7 +300,7 @@ public void unknownCommand(Player player) { } @Override - public List onTabComplete(CommandSender sender, Command command, String s, String[] strings) { + public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, String[] strings) { List completions = new ArrayList<>(); diff --git a/src/main/java/me/mattyhd0/chatcolor/configuration/ConfigurationManager.java b/src/main/java/me/mattyhd0/chatcolor/configuration/ConfigurationManager.java index 3714bf3..74e7efb 100644 --- a/src/main/java/me/mattyhd0/chatcolor/configuration/ConfigurationManager.java +++ b/src/main/java/me/mattyhd0/chatcolor/configuration/ConfigurationManager.java @@ -2,11 +2,11 @@ public class ConfigurationManager { - private SimpleYMLConfiguration config; - private SimpleYMLConfiguration gui; - private MessagesYMLFile messages; - private SimpleYMLConfiguration patterns; - private SimpleYMLConfiguration data; + private final SimpleYMLConfiguration config; + private final SimpleYMLConfiguration gui; + private final MessagesYMLFile messages; + private final SimpleYMLConfiguration patterns; + private final SimpleYMLConfiguration data; public ConfigurationManager() { this.config = new SimpleYMLConfiguration("config.yml"); this.gui = new SimpleYMLConfiguration("gui.yml"); diff --git a/src/main/java/me/mattyhd0/chatcolor/configuration/SimpleYMLConfiguration.java b/src/main/java/me/mattyhd0/chatcolor/configuration/SimpleYMLConfiguration.java index 813fa28..70d3ea1 100644 --- a/src/main/java/me/mattyhd0/chatcolor/configuration/SimpleYMLConfiguration.java +++ b/src/main/java/me/mattyhd0/chatcolor/configuration/SimpleYMLConfiguration.java @@ -9,7 +9,7 @@ public class SimpleYMLConfiguration extends YamlConfiguration { - private File file; + private final File file; public SimpleYMLConfiguration(String fileName) { super(); diff --git a/src/main/java/me/mattyhd0/chatcolor/gui/ChatColorGUI.java b/src/main/java/me/mattyhd0/chatcolor/gui/ChatColorGUI.java index 78b00d4..a9eec4f 100644 --- a/src/main/java/me/mattyhd0/chatcolor/gui/ChatColorGUI.java +++ b/src/main/java/me/mattyhd0/chatcolor/gui/ChatColorGUI.java @@ -48,7 +48,7 @@ public static void openGui(Player player){ Placeholders.setPlaceholders(actionsStr, null, player) ); - if(slots.size() > 0){ + if(!slots.isEmpty()){ for(int s: slots){ builder = builder.setGuiItem(s, Util.getItemFromConfig(file, key), actions); } diff --git a/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/ConsoleCommandAction.java b/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/ConsoleCommandAction.java index 5c9df1f..6198f4e 100644 --- a/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/ConsoleCommandAction.java +++ b/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/ConsoleCommandAction.java @@ -7,7 +7,7 @@ public class ConsoleCommandAction implements GuiClickAction { - private String command; + private final String command; public ConsoleCommandAction(String command){ this.command = command; diff --git a/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/PlayerCommandAction.java b/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/PlayerCommandAction.java index 9221419..7b2f27b 100644 --- a/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/PlayerCommandAction.java +++ b/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/PlayerCommandAction.java @@ -5,7 +5,7 @@ public class PlayerCommandAction implements GuiClickAction { - private String command; + private final String command; public PlayerCommandAction(String command){ this.command = command; diff --git a/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/SendMessageAction.java b/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/SendMessageAction.java index 91eb3d5..4cbb0ef 100644 --- a/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/SendMessageAction.java +++ b/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/SendMessageAction.java @@ -6,7 +6,7 @@ public class SendMessageAction implements GuiClickAction { - private String message; + private final String message; public SendMessageAction(String message){ this.message = message; diff --git a/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/SetPatternAction.java b/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/SetPatternAction.java index d5a79f4..5c5593b 100644 --- a/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/SetPatternAction.java +++ b/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/SetPatternAction.java @@ -8,7 +8,7 @@ public class SetPatternAction implements GuiClickAction { - private String patternName; + private final String patternName; public SetPatternAction(String patternName){ this.patternName = patternName; diff --git a/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/util/GuiClickActionManager.java b/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/util/GuiClickActionManager.java index ca69c08..7870919 100644 --- a/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/util/GuiClickActionManager.java +++ b/src/main/java/me/mattyhd0/chatcolor/gui/clickaction/util/GuiClickActionManager.java @@ -28,34 +28,30 @@ public static GuiClickAction getClickActionFromString(String string){ String[] splitted = string.split(":", 2); - if(splitted[0].equals("MESSAGE")){ + switch (splitted[0]) { + case "MESSAGE": + return new SendMessageAction(splitted[1]); - return new SendMessageAction(splitted[1]); + case "CONSOLE-COMMAND": + return new ConsoleCommandAction(splitted[1]); + case "PLAYER-COMMAND": + return new PlayerCommandAction(splitted[1]); - } else if (splitted[0].equals("CONSOLE-COMMAND")){ + case "SET-PATTERN": + return new SetPatternAction(splitted[1]); - return new ConsoleCommandAction(splitted[1]); + case "CLOSE-INVENTORY": + return new CloseInventoryAction(); - } else if (splitted[0].equals("PLAYER-COMMAND")){ - - return new PlayerCommandAction(splitted[1]); - - } else if (splitted[0].equals("SET-PATTERN")){ - - return new SetPatternAction(splitted[1]); - - } else if (splitted[0].equals("CLOSE-INVENTORY")){ - - return new CloseInventoryAction(); - - } else if (splitted[0].equals("SOUND")){ - - String[] arg = splitted[1].split(" "); - try { - return new PlaySoundAction(Sound.valueOf(arg[0]), Float.parseFloat(arg[1]), Float.parseFloat(arg[2])); - } catch (IllegalArgumentException ignored){} + case "SOUND": + String[] arg = splitted[1].split(" "); + try { + return new PlaySoundAction(Sound.valueOf(arg[0]), Float.parseFloat(arg[1]), Float.parseFloat(arg[2])); + } catch (IllegalArgumentException ignored) { + } + break; } return null; diff --git a/src/main/java/me/mattyhd0/chatcolor/listener/ChatListener.java b/src/main/java/me/mattyhd0/chatcolor/listener/ChatListener.java index 21b60e9..fffc164 100644 --- a/src/main/java/me/mattyhd0/chatcolor/listener/ChatListener.java +++ b/src/main/java/me/mattyhd0/chatcolor/listener/ChatListener.java @@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull; public class ChatListener implements EventExecutor { - private ChatColorPlugin plugin; + private final ChatColorPlugin plugin; public ChatListener(ChatColorPlugin plugin) { this.plugin = plugin; diff --git a/src/main/java/me/mattyhd0/chatcolor/listener/ConnectionListener.java b/src/main/java/me/mattyhd0/chatcolor/listener/ConnectionListener.java index 8f56a2b..c923d28 100644 --- a/src/main/java/me/mattyhd0/chatcolor/listener/ConnectionListener.java +++ b/src/main/java/me/mattyhd0/chatcolor/listener/ConnectionListener.java @@ -25,8 +25,8 @@ import java.util.UUID; public class ConnectionListener implements Listener { - private ChatColorPlugin plugin; - private HashMap playersBeingLoaded = new HashMap<>(); + private final ChatColorPlugin plugin; + private final HashMap playersBeingLoaded = new HashMap<>(); public ConnectionListener(ChatColorPlugin plugin) { this.plugin = plugin; diff --git a/src/main/java/me/mattyhd0/chatcolor/pattern/GradientPattern.java b/src/main/java/me/mattyhd0/chatcolor/pattern/GradientPattern.java index 753ff5e..024b920 100644 --- a/src/main/java/me/mattyhd0/chatcolor/pattern/GradientPattern.java +++ b/src/main/java/me/mattyhd0/chatcolor/pattern/GradientPattern.java @@ -68,7 +68,7 @@ public String gradient(String text, List colors, TextFormatOptions fo for(float i = 0; i <= text.length()+divideEveryChars; i += divideEveryChars){ - if(i+divideEveryChars > text.length() && text.length() > 0) { + if(i+divideEveryChars > text.length() && !text.isEmpty()) { int lastSub = substrings.size()-1; String latestStr = substrings.get(lastSub); substrings.set(lastSub, latestStr+text.substring(Math.round(i))); diff --git a/src/main/java/me/mattyhd0/chatcolor/pattern/format/TextFormatOptions.java b/src/main/java/me/mattyhd0/chatcolor/pattern/format/TextFormatOptions.java index ee26e14..d0abb82 100644 --- a/src/main/java/me/mattyhd0/chatcolor/pattern/format/TextFormatOptions.java +++ b/src/main/java/me/mattyhd0/chatcolor/pattern/format/TextFormatOptions.java @@ -32,7 +32,7 @@ public List getFormats() { } public String setFormat(String text) { - if(text.length() == 0 || formats.size() == 0){ + if(text.isEmpty() || formats.isEmpty()){ return text; } String[] splitText = text.split(""); @@ -47,7 +47,7 @@ public String setFormat(String text) { } public String setFormat(char character) { - if(formats.size() == 0){ + if(formats.isEmpty()){ return String.valueOf(character); } StringBuilder formattedChar = new StringBuilder(); diff --git a/src/main/java/me/mattyhd0/chatcolor/pattern/manager/PatternManager.java b/src/main/java/me/mattyhd0/chatcolor/pattern/manager/PatternManager.java index ab2ab32..a5f35d6 100644 --- a/src/main/java/me/mattyhd0/chatcolor/pattern/manager/PatternManager.java +++ b/src/main/java/me/mattyhd0/chatcolor/pattern/manager/PatternManager.java @@ -12,7 +12,7 @@ public class PatternManager { - private Map loadedPatternsMap; + private final Map loadedPatternsMap; public PatternManager(){ diff --git a/src/main/java/me/mattyhd0/chatcolor/pattern/type/PatternType.java b/src/main/java/me/mattyhd0/chatcolor/pattern/type/PatternType.java index 153de9a..9d72f65 100644 --- a/src/main/java/me/mattyhd0/chatcolor/pattern/type/PatternType.java +++ b/src/main/java/me/mattyhd0/chatcolor/pattern/type/PatternType.java @@ -16,7 +16,7 @@ public enum PatternType { GRADIENT(GradientPattern.class), GRADIENT_RANDOM(RandomGradientPattern.class); - private Class clazz; + private final Class clazz; PatternType(Class clazz){ this.clazz = clazz; } diff --git a/src/main/java/me/mattyhd0/chatcolor/placeholderapi/ChatColorPlaceholders.java b/src/main/java/me/mattyhd0/chatcolor/placeholderapi/ChatColorPlaceholders.java index 693d9fc..4cf1cb5 100644 --- a/src/main/java/me/mattyhd0/chatcolor/placeholderapi/ChatColorPlaceholders.java +++ b/src/main/java/me/mattyhd0/chatcolor/placeholderapi/ChatColorPlaceholders.java @@ -6,9 +6,9 @@ import me.mattyhd0.chatcolor.ChatColorPlugin; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.plugin.Plugin; +import org.jetbrains.annotations.NotNull; -public class ChatColorPlaceholders extends PlaceholderExpansion -{ +public class ChatColorPlaceholders extends PlaceholderExpansion { private Plugin plugin; public ChatColorPlaceholders() { @@ -19,11 +19,11 @@ public boolean canRegister() { return true; } - public String getAuthor() { + public @NotNull String getAuthor() { return "MattyHD0"; } - public String getIdentifier() { + public @NotNull String getIdentifier() { return "chatcolor"; } @@ -31,7 +31,7 @@ public String getRequiredPlugin() { return "ChatColor"; } - public String getVersion() { + public @NotNull String getVersion() { return "1.0"; } diff --git a/src/main/java/me/mattyhd0/chatcolor/updatechecker/SpigotResource.java b/src/main/java/me/mattyhd0/chatcolor/updatechecker/SpigotResource.java index 615c822..55b5dcb 100644 --- a/src/main/java/me/mattyhd0/chatcolor/updatechecker/SpigotResource.java +++ b/src/main/java/me/mattyhd0/chatcolor/updatechecker/SpigotResource.java @@ -44,12 +44,12 @@ public String getCurrency(){ } - private static class Stats{ + public static class Stats{ private int downloads; private int updates; private Reviews reviews; - private int rating; + private double rating; public int getDownloads() { return downloads; @@ -63,7 +63,7 @@ public Reviews getReviews() { return reviews; } - public int getRating() { + public double getRating() { return rating; } @@ -118,7 +118,7 @@ public String getIconLink() { //public String getAuthorUsername() { return author.username; } public boolean isPremium(){ - return !(premium.price.equals("0.00") && premium.currency.equals("")); + return !(premium.price.equals("0.00") && premium.currency.isEmpty()); } //public Premium getPremium() { return premium; } @@ -158,4 +158,4 @@ public String getDownloadUrl(){ return validUrl.toString(); } -} +} \ No newline at end of file diff --git a/src/main/java/me/mattyhd0/chatcolor/updatechecker/UpdateChecker.java b/src/main/java/me/mattyhd0/chatcolor/updatechecker/UpdateChecker.java index ff0b6cc..1d60bab 100644 --- a/src/main/java/me/mattyhd0/chatcolor/updatechecker/UpdateChecker.java +++ b/src/main/java/me/mattyhd0/chatcolor/updatechecker/UpdateChecker.java @@ -4,8 +4,8 @@ public class UpdateChecker { - private String version; - private SpigotResource spigotResource; + private final String version; + private final SpigotResource spigotResource; public UpdateChecker(Plugin plugin, int spigotResourceId){