From 72f64a2aa5dc252907772309825936cd29834fdd Mon Sep 17 00:00:00 2001 From: r00tb33rman Date: Tue, 28 Oct 2025 17:15:35 -0400 Subject: [PATCH 1/3] Start of Folia support and codestyle cleanup --- .idea/checkstyle-idea.xml | 15 ++ .idea/misc.xml | 2 +- pom.xml | 158 +++++++++++------- .../epic/rename/commands/v3/AddLoreLine.java | 57 ++++--- .../epic/rename/commands/v3/EditLore.java | 38 ++--- .../epic/rename/commands/v3/EditName.java | 30 ++-- .../epic/rename/commands/v3/EpicRename.java | 33 ++-- .../epic/rename/commands/v3/Export.java | 34 ++-- .../epic/rename/commands/v3/Glow.java | 47 +++--- .../rename/commands/v3/HideEnchantments.java | 23 ++- .../epic/rename/commands/v3/Import.java | 48 +++--- .../rename/commands/v3/InsertLoreLine.java | 105 ++++++------ .../epic/rename/commands/v3/Lore.java | 26 ++- .../epic/rename/commands/v3/RemoveGlow.java | 36 ++-- .../epic/rename/commands/v3/RemoveLore.java | 35 ++-- .../rename/commands/v3/RemoveLoreLine.java | 34 ++-- .../epic/rename/commands/v3/RemoveName.java | 36 ++-- .../epic/rename/commands/v3/Rename.java | 26 ++- .../epic/rename/commands/v3/SetLoreLine.java | 38 ++--- .../commands/v3/UnHideEnchantments.java | 27 ++- .../rename/configuration/ConfigUpdater.java | 40 ++--- .../configuration/ConfigurationManager.java | 12 +- .../epic/rename/enums/v3/EcoMessage.java | 4 +- .../rename/enums/v3/EpicRenameCommands.java | 6 +- .../epic/rename/enums/v3/MCVersion.java | 1 + .../epic/rename/enums/v3/XpMessage.java | 4 +- .../ExploitPreventionListener.java | 28 ++-- .../epic/rename/listeners/v3/OnJoin.java | 2 +- .../justbru00/epic/rename/main/v3/Main.java | 109 +++++------- .../epic/rename/main/v3/bstats/BStats.java | 79 ++++++--- .../rename/multiversion/ServerVersion.java | 61 +++++-- .../tabcompleters/EpicRenameTabCompleter.java | 21 ++- .../tabcompleters/ExportTabCompleter.java | 17 +- .../GenericNoArgsTabCompleter.java | 13 +- .../GenericOneArgTabCompleter.java | 15 +- .../GenericTwoArgTabCompleter.java | 19 +-- .../tabcompleters/ImportTabCompleter.java | 55 +++--- .../rename/test/ConfigUpdaterConverter.java | 4 +- .../test/FormattingCodeCounterTest.java | 19 +-- 39 files changed, 692 insertions(+), 665 deletions(-) create mode 100644 .idea/checkstyle-idea.xml diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml new file mode 100644 index 0000000..a99a0e0 --- /dev/null +++ b/.idea/checkstyle-idea.xml @@ -0,0 +1,15 @@ + + + + 11.0.0 + JavaOnly + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index b3cf2e0..7fb4876 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index c1637ed..ea17b84 100644 --- a/pom.xml +++ b/pom.xml @@ -1,67 +1,103 @@ - 4.0.0 - com.gmail.justbru00 - epicrename - 3.12.2 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.gmail.justbru00 + epicrename + 3.12.2 - - UTF-8 - + + UTF-8 + - - src - - - src - - **/*.java - - - - - - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - + + src + + + src + + **/*.java + + + + + + maven-compiler-plugin + 3.14.1 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-shade-plugin + 3.6.1 + + + + com.tcoded:FoliaLib + + + + + com.tcoded.folialib + com.gmail.justbru00.libs.folialib + + + + + + package + + shade + + + + + + - - - jitpack.io - https://jitpack.io - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - + + + jitpack.io + https://jitpack.io + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + tcoded-releases + https://repo.tcoded.com/releases + + - - - com.github.MilkBowl - VaultAPI - 1.7 - provided - - - org.bukkit - bukkit - - - - - org.spigotmc - spigot-api - 1.17.1-R0.1-SNAPSHOT - provided - - + + + com.github.MilkBowl + VaultAPI + 1.7 + provided + + + org.bukkit + bukkit + + + + + org.spigotmc + spigot-api + 1.17.1-R0.1-SNAPSHOT + provided + + + com.tcoded + FoliaLib + 0.5.1 + compile + + - \ No newline at end of file + diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/AddLoreLine.java b/src/com/gmail/justbru00/epic/rename/commands/v3/AddLoreLine.java index 9b4632b..c7c1c21 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/AddLoreLine.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/AddLoreLine.java @@ -34,92 +34,92 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (!command.getName().equalsIgnoreCase("addloreline")) { return false; } - + if (!sender.hasPermission("epicrename.addloreline")) { Messager.msgSenderWithConfigMsg("addloreline.no_permission", sender); return true; } - + if (!(sender instanceof Player)) { Messager.msgSenderWithConfigMsg("addloreline.wrong_sender", sender); return true; } - + Player player = (Player) sender; if (!WorldChecker.checkWorld(player)) { Messager.msgSenderWithConfigMsg("addloreline.disabled_world", sender); return true; } - + ItemStack inHand = RenameUtil.getInHand(player); Material m = inHand.getType(); - + if (!Blacklists.checkTextBlacklist(args, player)) { Messager.msgPlayer(Main.getMsgFromConfig("setloreline.blacklisted_word_found"), player); return true; } - + if (!Blacklists.checkMaterialBlacklist(RenameUtil.getInHand(player).getType(), player)) { Messager.msgPlayer(Main.getMsgFromConfig("addloreline.blacklisted_material_found"), player); return true; } - + if (!Blacklists.checkExistingName(player)) { Messager.msgPlayer(Main.getMsgFromConfig("addloreline.blacklisted_existing_name_found"), player); return true; } - + if (!Blacklists.checkExistingLore(player)) { Messager.msgPlayer(Main.getMsgFromConfig("addloreline.blacklisted_existing_lore_found"), player); return true; } - + if (!MaterialPermManager.checkPerms(EpicRenameCommands.ADDLORELINE, inHand, player)) { Messager.msgPlayer(Main.getMsgFromConfig("addloreline.no_permission_for_material"), player); return true; } - - if ((m == Material.AIR || m == null)) { + + if (m == Material.AIR) { Messager.msgPlayer(Main.getMsgFromConfig("addloreline.cannot_edit_air"), player); return true; } - + if (!FormattingPermManager.checkPerms(EpicRenameCommands.ADDLORELINE, args, player)) { // FormattingPermManager handles the message. return true; } - + if (args.length == 0) { Messager.msgPlayer(Main.getMsgFromConfig("addloreline.wrong_args"), player); return true; } - + StringBuilder builder = new StringBuilder(); - - for (int i = 0; i < args.length; i++) { - builder.append(args[i] + " "); - } - + + for (String arg : args) { + builder.append(arg).append(" "); + } + String loreToBeSet = builder.toString().trim(); - + if (!FormattingCodeCounter.checkMinColorCodes(player, loreToBeSet, EpicRenameCommands.ADDLORELINE, true)) { FormattingCodeCounter.sendMinNotReachedMsg(player, EpicRenameCommands.ADDLORELINE); return true; } - + if (!FormattingCodeCounter.checkMaxColorCodes(player, loreToBeSet, EpicRenameCommands.ADDLORELINE, true)) { FormattingCodeCounter.sendMaxReachedMsg(player, EpicRenameCommands.ADDLORELINE); return true; } - + ItemMeta im = inHand.getItemMeta(); - - List newLore = new ArrayList(); - + + List newLore = new ArrayList<>(); + if (im.hasLore()) { newLore = im.getLore(); } - + newLore.add(Messager.color(loreToBeSet)); im.setLore(newLore); inHand.setItemMeta(im); @@ -128,10 +128,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St } else { player.setItemInHand(inHand); } - + Messager.msgPlayer(Main.getMsgFromConfig("addloreline.success"), player); - + return true; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/EditLore.java b/src/com/gmail/justbru00/epic/rename/commands/v3/EditLore.java index 0687111..446b40c 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/EditLore.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/EditLore.java @@ -24,82 +24,82 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (!command.getName().equalsIgnoreCase("editlore")) { return false; } - + if (!sender.hasPermission("epicrename.editlore")) { Messager.msgSenderWithConfigMsg("editlore.no_permission", sender); return true; } - + if (!(sender instanceof Player)) { Messager.msgSenderWithConfigMsg("editlore.wrong_sender", sender); return true; } - + Player player = (Player) sender; if (!WorldChecker.checkWorld(player)) { Messager.msgSenderWithConfigMsg("editlore.disabled_world", sender); return true; } - + ItemStack inHand = RenameUtil.getInHand(player); Material m = inHand.getType(); - + if (!Blacklists.checkMaterialBlacklist(m, player)) { Messager.msgPlayer(Main.getMsgFromConfig("editlore.blacklisted_material_found"), player); return true; } - + if (!Blacklists.checkExistingName(player)) { Messager.msgPlayer(Main.getMsgFromConfig("editlore.blacklisted_existing_name_found"), player); return true; } - + if (!Blacklists.checkExistingLore(player)) { Messager.msgPlayer(Main.getMsgFromConfig("editlore.blacklisted_existing_lore_found"), player); return true; } - + if (!MaterialPermManager.checkPerms(EpicRenameCommands.EDITLORE, inHand, player)) { Messager.msgPlayer(Main.getMsgFromConfig("editlore.no_permission_for_material"), player); return true; } - - if ((m == Material.AIR || m == null)) { + + if (m == Material.AIR) { Messager.msgPlayer(Main.getMsgFromConfig("editlore.cannot_edit_air"), player); return true; } - + ItemMeta im = inHand.getItemMeta(); if (!im.hasLore()) { Messager.msgPlayer(Main.getMsgFromConfig("editlore.no_lore"), player); return true; } - + StringBuilder loreBuilder = new StringBuilder(); - + for (String loreLine : im.getLore()) { Debug.sendPlain("[EditLore] Original: " + loreLine); String normalColorsReversed = Messager.reverseSectionSignTo(loreLine, '&'); Debug.sendPlain("[EditLore] Reversed: " + normalColorsReversed); String hexReversed = Messager.reverseFromXToHex(normalColorsReversed); Debug.sendPlain("[EditLore] Hex Reversal: " + hexReversed); - loreBuilder.append(hexReversed + "|"); + loreBuilder.append(hexReversed).append("|"); } - + if (loreBuilder.length() == 0) { Messager.msgPlayer(Main.getMsgFromConfig("editlore.lore_content_empty"), player); return true; } - + String loreArgs = loreBuilder.substring(0, loreBuilder.length() - 1); Debug.sendPlain("[EditLore] Lore Args: " + loreArgs); - + if (label.equalsIgnoreCase("epeditlore")) { Messager.sendCommandSuggestionToPlayer(Main.getMsgFromConfig("editlore.click_to_edit"), "/eplore " + loreArgs, player); } else { Messager.sendCommandSuggestionToPlayer(Main.getMsgFromConfig("editlore.click_to_edit"), "/lore " + loreArgs, player); - } + } + return true; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/EditName.java b/src/com/gmail/justbru00/epic/rename/commands/v3/EditName.java index df4743d..f964b49 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/EditName.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/EditName.java @@ -29,69 +29,69 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (!command.getName().equalsIgnoreCase("editname")) { return false; } - + if (!sender.hasPermission("epicrename.editname")) { Messager.msgSenderWithConfigMsg("editname.no_permission", sender); return true; } - + if (!(sender instanceof Player)) { Messager.msgSenderWithConfigMsg("editname.wrong_sender", sender); return true; } - + Player player = (Player) sender; if (!WorldChecker.checkWorld(player)) { Messager.msgSenderWithConfigMsg("editname.disabled_world", sender); return true; } - + ItemStack inHand = RenameUtil.getInHand(player); Material m = inHand.getType(); - + if (!Blacklists.checkMaterialBlacklist(m, player)) { Messager.msgPlayer(Main.getMsgFromConfig("editname.blacklisted_material_found"), player); return true; } - + if (!Blacklists.checkExistingName(player)) { Messager.msgPlayer(Main.getMsgFromConfig("editname.blacklisted_existing_name_found"), player); return true; } - + if (!Blacklists.checkExistingLore(player)) { Messager.msgPlayer(Main.getMsgFromConfig("editname.blacklisted_existing_lore_found"), player); return true; } - + if (!MaterialPermManager.checkPerms(EpicRenameCommands.EDITNAME, inHand, player)) { Messager.msgPlayer(Main.getMsgFromConfig("editname.no_permission_for_material"), player); return true; } - - if ((m == Material.AIR || m == null)) { + + if (m == Material.AIR) { Messager.msgPlayer(Main.getMsgFromConfig("editname.cannot_edit_air"), player); return true; } - + ItemMeta im = inHand.getItemMeta(); if (!im.hasDisplayName()) { Messager.msgPlayer(Main.getMsgFromConfig("editname.no_displayname"), player); return true; } - + Debug.sendPlain("[EditName] Original: " + im.getDisplayName()); String normalColorsReversed = Messager.reverseSectionSignTo(im.getDisplayName(), '&'); Debug.sendPlain("[EditName] Reversed: " + normalColorsReversed); String hexReversed = Messager.reverseFromXToHex(normalColorsReversed); Debug.sendPlain("[EditName] Hex Reversal: " + hexReversed); - + if (label.equalsIgnoreCase("epeditname")) { Messager.sendCommandSuggestionToPlayer(Main.getMsgFromConfig("editname.click_to_edit"), "/eprename " + hexReversed, player); } else { Messager.sendCommandSuggestionToPlayer(Main.getMsgFromConfig("editname.click_to_edit"), "/rename " + hexReversed, player); - } + } + return true; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/EpicRename.java b/src/com/gmail/justbru00/epic/rename/commands/v3/EpicRename.java index ac83074..c0f994d 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/EpicRename.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/EpicRename.java @@ -3,6 +3,7 @@ * * This is licensed under the MPL Version 2.0. See license info in LICENSE.txt */ + package com.gmail.justbru00.epic.rename.commands.v3; import org.bukkit.command.Command; @@ -13,20 +14,20 @@ import com.gmail.justbru00.epic.rename.utils.v3.Messager; public class EpicRename implements CommandExecutor { - + // VERSION 3 @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - + // Start Command Handling | EpicRename if (command.getName().equalsIgnoreCase("epicrename")) { - + if (!sender.hasPermission("epicrename.epicrename")) { // Check Basic Permission Messager.msgSender(Main.getMsgFromConfig("epicrename.no_permission"), sender); return true; } - + if (args.length > 0) { if (args[0].equalsIgnoreCase("license")) { // Start /epicrename license Messager.msgSender(Main.getMsgFromConfig("epicrename.license"), sender); @@ -35,28 +36,29 @@ public boolean onCommand(CommandSender sender, Command command, String label, St for (String s : Main.messages.getStringList("epicrename.help")) { Messager.msgSender(s, sender); } + return true; } else if (args[0].equalsIgnoreCase("reload")) { // End /epicrename license | Start /epicrename reload if (sender.hasPermission("epicrename.epicrename.reload")) { Main.reloadConfigs(); Messager.msgSender(Main.getMsgFromConfig("epicrename.reload_success"), sender); - return true; - } else { + } else { Messager.msgSender(Main.getMsgFromConfig("epicrename.no_permission"), sender); - return true; - } - } else if (args[0].equalsIgnoreCase("debug")) { // End /epicrename reload | Start /epicrename debug + } + + return true; + } else if (args[0].equalsIgnoreCase("debug")) { // End /epicrename reload | Start /epicrename debug if (sender.hasPermission("epicrename.epicrename.debug")) { if (Main.debug) { Main.debug = false; Messager.msgSender(Main.getMsgFromConfig("epicrename.debug_disable"), sender); - return true; - } else { + } else { Main.debug = true; Messager.msgSender(Main.getMsgFromConfig("epicrename.debug_enable"), sender); - return true; - } - } else { + } + + return true; + } else { Messager.msgSender(Main.getMsgFromConfig("epicrename.no_permission"), sender); return true; } @@ -72,8 +74,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St return true; } //End No args } // End Command Handling | EpicRename - + return false; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/Export.java b/src/com/gmail/justbru00/epic/rename/commands/v3/Export.java index db147d4..3bdb7e1 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/Export.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/Export.java @@ -3,6 +3,7 @@ * * This is licensed under the MPL Version 2.0. See license info in LICENSE.txt */ + package com.gmail.justbru00.epic.rename.commands.v3; import java.io.IOException; @@ -29,7 +30,7 @@ */ public class Export implements CommandExecutor { - private static ArrayList playersWhoHaveConfirmed = new ArrayList(); + private static final ArrayList playersWhoHaveConfirmed = new ArrayList<>(); @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { @@ -43,43 +44,45 @@ public boolean onCommand(CommandSender sender, Command command, String label, St String arg = args[0]; if (arg.equalsIgnoreCase("confirm")) { // /export confirm playersWhoHaveConfirmed.add(p.getUniqueId()); - + Messager.msgSenderWithConfigMsg("export.confirmed", sender); return true; } - + // Check confirmation if (!playersWhoHaveConfirmed.contains(p.getUniqueId())) { Messager.msgSenderWithConfigMsg("export.warn_public", sender); return true; } - + if (arg.equalsIgnoreCase("hand") || arg.equalsIgnoreCase("h")) { // /export hand ItemStack inHand = p.getInventory().getItemInMainHand(); - - if (inHand.getType() == Material.AIR || inHand == null) { + + if (inHand.getType() == Material.AIR) { Messager.msgSenderWithConfigMsg("export.no_air", sender); return true; } - + String theItem = ItemSerialization.toString(inHand); - String response = null; + String response; try { response = EpicRenameOnlineAPI.paste(theItem); } catch (MalformedURLException e) { if (Main.debug) { e.printStackTrace(); } + Messager.msgSender(Main.getMsgFromConfig("export.post_fail").replace("{error}", "MalformedURLException"), sender); return true; } catch (IOException e) { if (Main.debug) { e.printStackTrace(); } + Messager.msgSender(Main.getMsgFromConfig("export.post_fail").replace("{error}", "IOException"), sender); return true; } - + if (response.startsWith("ERROR:")) { // FAILED Messager.msgSender(Main.getMsgFromConfig("export.post_fail").replace("{error}", response), sender); @@ -87,28 +90,30 @@ public boolean onCommand(CommandSender sender, Command command, String label, St // SUCCESS Messager.msgSender(Main.getMsgFromConfig("export.success").replace("{link}", response), sender); } - + return true; } else if (arg.equalsIgnoreCase("inventory") || arg.equalsIgnoreCase("inv") || arg.equalsIgnoreCase("i")) { // /export inventory - + String theInventory = ItemSerialization.toString(p.getInventory()); - String response = null; + String response; try { response = EpicRenameOnlineAPI.paste(theInventory); } catch (MalformedURLException e) { if (Main.debug) { e.printStackTrace(); } + Messager.msgSender(Main.getMsgFromConfig("export.post_fail").replace("{error}", "MalformedURLException"), sender); return true; } catch (IOException e) { if (Main.debug) { e.printStackTrace(); } + Messager.msgSender(Main.getMsgFromConfig("export.post_fail").replace("{error}", "IOException"), sender); return true; } - + if (response.startsWith("ERROR:")) { // FAILED Messager.msgSender(Main.getMsgFromConfig("export.post_fail").replace("{error}", response), sender); @@ -116,7 +121,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St // SUCCESS Messager.msgSender(Main.getMsgFromConfig("export.success").replace("{link}", response), sender); } - + return true; } else { Messager.msgSenderWithConfigMsg("export.wrong_args", sender); @@ -139,5 +144,4 @@ public boolean onCommand(CommandSender sender, Command command, String label, St return true; } } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/Glow.java b/src/com/gmail/justbru00/epic/rename/commands/v3/Glow.java index 4138104..94138a7 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/Glow.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/Glow.java @@ -5,11 +5,8 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; import com.gmail.justbru00.epic.rename.enums.v3.EcoMessage; import com.gmail.justbru00.epic.rename.enums.v3.EpicRenameCommands; @@ -18,7 +15,6 @@ public class Glow implements CommandExecutor { - @SuppressWarnings("deprecation") @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { @@ -30,33 +26,33 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (WorldChecker.checkWorld(player)) { ItemStack inHand = RenameUtil.getInHand(player); Material m = inHand.getType(); - + // Check Material Permissions if (!MaterialPermManager.checkPerms(EpicRenameCommands.GLOW, inHand, player)) { Messager.msgPlayer(Main.getMsgFromConfig("glow.no_permission_for_material"), player); return true; } - + // Issue #76 | Check Blacklist if (!Blacklists.checkMaterialBlacklist(RenameUtil.getInHand(player).getType(), player)) { Messager.msgPlayer(Main.getMsgFromConfig("glow.blacklisted_material_found"), player); return true; } // End Issue #76 - + // Check Existing Name Blacklist #81 if (!Blacklists.checkExistingName(player)) { Messager.msgPlayer(Main.getMsgFromConfig("glow.blacklisted_existing_name_found"), player); return true; } - + // Check Existing Lore Blacklist #81 if (!Blacklists.checkExistingLore(player)) { Messager.msgPlayer(Main.getMsgFromConfig("glow.blacklisted_existing_lore_found"), player); return true; } - if (!(m == null || m == Material.AIR)) { + if (!(m == Material.AIR)) { // ISSUE #198 - Convert legacy glowing to modern glowing if (GlowingUtil.isLegacyToModernConversionEnabled()) { ItemStack converted = GlowingUtil.convertLegacyGlowingToModern(inHand); @@ -73,7 +69,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (ecoStatus == EcoMessage.TRANSACTION_ERROR) { return true; } - + // Add experience cost option #121 XpMessage xpStatus = XpCostManager.takeXp(player, EpicRenameCommands.GLOW); @@ -83,30 +79,25 @@ public boolean onCommand(CommandSender sender, Command command, String label, St player.getInventory().setItemInMainHand(GlowingUtil.addGlowingToItemModern(inHand)); Messager.msgSender(Main.getMsgFromConfig("glow.success"), sender); - return true; - } else { + } else { Messager.msgSender(Main.getMsgFromConfig("glow.has_enchants"), sender); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("glow.cannot_edit_air"), sender); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("glow.disabled_world"), sender); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("glow.wrong_sender"), sender); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("glow.no_permission"), sender); - return true; - } - } + } + + return true; + } return false; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/HideEnchantments.java b/src/com/gmail/justbru00/epic/rename/commands/v3/HideEnchantments.java index dcb2aea..64087d8 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/HideEnchantments.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/HideEnchantments.java @@ -29,50 +29,50 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (!command.getName().equalsIgnoreCase("hideenchantments")) { return false; } - + if (!sender.hasPermission("epicrename.hideenchantments")) { Messager.msgSenderWithConfigMsg("hideenchantments.no_permission", sender); } - + if (!(sender instanceof Player)) { Messager.msgSenderWithConfigMsg("hideenchantments.wrong_sender", sender); } - + Player player = (Player) sender; if (!WorldChecker.checkWorld(player)) { Messager.msgSenderWithConfigMsg("hideenchantments.disabled_world", sender); return true; } - + ItemStack inHand = RenameUtil.getInHand(player); Material m = inHand.getType(); - + // Issue #76 | Check Blacklist if (!Blacklists.checkMaterialBlacklist(RenameUtil.getInHand(player).getType(), player)) { Messager.msgPlayer(Main.getMsgFromConfig("hideenchantments.blacklisted_material_found"), player); return true; } // End Issue #76 - + // Check Existing Name Blacklist #81 if (!Blacklists.checkExistingName(player)) { Messager.msgPlayer(Main.getMsgFromConfig("hideenchantments.blacklisted_existing_name_found"), player); return true; } - + // Check Existing Lore Blacklist #81 if (!Blacklists.checkExistingLore(player)) { Messager.msgPlayer(Main.getMsgFromConfig("hideenchantments.blacklisted_existing_lore_found"), player); return true; } - + // Check Material Permissions if (!MaterialPermManager.checkPerms(EpicRenameCommands.HIDEENCHANTMENTS, inHand, player)) { Messager.msgPlayer(Main.getMsgFromConfig("hideenchantments.no_permission_for_material"), player); return true; } - if ((m == Material.AIR || m == null)) { + if (m == Material.AIR) { Messager.msgPlayer(Main.getMsgFromConfig("hideenchantments.cannot_edit_air"), player); return true; } @@ -80,10 +80,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St ItemMeta im = inHand.getItemMeta(); im.addItemFlags(ItemFlag.HIDE_ENCHANTS); inHand.setItemMeta(im); - + Messager.msgPlayer(Main.getMsgFromConfig("hideenchantments.success"), player); - + return true; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/Import.java b/src/com/gmail/justbru00/epic/rename/commands/v3/Import.java index cc1493b..1fcb065 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/Import.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/Import.java @@ -3,6 +3,7 @@ * * This is licensed under the MPL Version 2.0. See license info in LICENSE.txt */ + package com.gmail.justbru00.epic.rename.commands.v3; import java.io.IOException; @@ -34,13 +35,11 @@ */ public class Import implements CommandExecutor { - private static ArrayList playersWhoHaveConfirmed = new ArrayList(); + private static final ArrayList playersWhoHaveConfirmed = new ArrayList<>(); /** * Usage: - * * import - * * Importing an inventory forces a /import confirm before allowing a player to * import once per server restart. Importing to your hand only works if the hand * is empty. @@ -62,10 +61,10 @@ public boolean onCommand(CommandSender sender, Command command, String label, St // /import hand if (args.length == 2) { - if (mainHand == null || mainHand.getType() == Material.AIR) { + if (mainHand.getType() == Material.AIR) { String link = args[1]; - String textFromWeb = null; + String textFromWeb; try { textFromWeb = EpicRenameOnlineAPI.getTextFromURL(link).get(); @@ -102,16 +101,14 @@ public boolean onCommand(CommandSender sender, Command command, String label, St inv.setItemInMainHand(imported); Messager.msgSenderWithConfigMsg("import.success", sender); - return true; - } else { + } else { Messager.msgSenderWithConfigMsg("import.full_hand", sender); - return true; - } - } else { + } + } else { Messager.msgSenderWithConfigMsg("import.wrong_args_hand", sender); - return true; - } - } else if (args[0].equalsIgnoreCase("inventory") || args[0].equalsIgnoreCase("inv") + } + return true; + } else if (args[0].equalsIgnoreCase("inventory") || args[0].equalsIgnoreCase("inv") || args[0].equalsIgnoreCase("i")) { // /import inventory @@ -154,21 +151,20 @@ public boolean onCommand(CommandSender sender, Command command, String label, St ItemSerialization.fillInventoryFromString(textFromWeb, p); Messager.msgSenderWithConfigMsg("import.success", sender); - return true; - } else { + } else { Messager.msgSenderWithConfigMsg("import.wrong_args_inventory", sender); - return true; - } - } else if (args[0].equalsIgnoreCase("raw") || args[0].equalsIgnoreCase("r")) { + } + return true; + } else if (args[0].equalsIgnoreCase("raw") || args[0].equalsIgnoreCase("r")) { // /import raw // Try to import the raw yaml text. Single item only. - if (mainHand == null || mainHand.getType() == Material.AIR) { + if (mainHand.getType() == Material.AIR) { // Empty Main Hand - StringBuilder yamlDataBuilder = new StringBuilder(""); + StringBuilder yamlDataBuilder = new StringBuilder(); for (int i = 1; i < args.length; i++) { - yamlDataBuilder.append(args[i] + " "); + yamlDataBuilder.append(args[i]).append(" "); } String yamlData = yamlDataBuilder.toString().trim(); @@ -185,13 +181,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St inv.setItemInMainHand(importedItem); Messager.msgSenderWithConfigMsg("import.success", sender); - return true; - } else { + } else { // Must have empty hand Messager.msgSenderWithConfigMsg("import.full_hand", sender); - return true; - } - } else if (args[0].equalsIgnoreCase("confirm")) { + } + return true; + } else if (args[0].equalsIgnoreCase("confirm")) { playersWhoHaveConfirmed.add(p.getUniqueId()); Messager.msgSenderWithConfigMsg("import.confirmed", sender); return true; @@ -212,5 +207,4 @@ public boolean onCommand(CommandSender sender, Command command, String label, St return true; } } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/InsertLoreLine.java b/src/com/gmail/justbru00/epic/rename/commands/v3/InsertLoreLine.java index a76a160..019f24c 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/InsertLoreLine.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/InsertLoreLine.java @@ -31,19 +31,19 @@ public class InsertLoreLine implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - + if (command.getName().equalsIgnoreCase("insertloreline")) { if (sender.hasPermission("epicrename.insertloreline")) { if (sender instanceof Player) { - + Player player = (Player) sender; - + if (WorldChecker.checkWorld(player)) { - + if (args.length >= 1) { - - int lineNumber = -1; - + + int lineNumber; + try { lineNumber = Integer.parseInt(args[0]); } catch (NumberFormatException e){ @@ -52,111 +52,111 @@ public boolean onCommand(CommandSender sender, Command command, String label, St Messager.msgSenderWithConfigMsg("insertloreline.not_an_int", sender); return true; } - + if (args.length == 1) { // No text arguments Messager.msgSenderWithConfigMsg("insertloreline.wrong_args", sender); return true; } - + if (lineNumber <= 0) { Debug.send("[InsertLoreLine] The number " + lineNumber + " is below or equal to 0."); Messager.msgPlayer(Main.getMsgFromConfig("insertloreline.invalid_number"), player); return true; } - + Material type = RenameUtil.getInHand(player).getType(); - - if (type== Material.AIR || type == null) { + + if (type == Material.AIR) { // Cannot edit air Messager.msgSenderWithConfigMsg("insertloreline.cannot_edit_air", sender); return true; } - + ItemStack inHand = RenameUtil.getInHand(player); - + // Check Material Permissions if (!MaterialPermManager.checkPerms(EpicRenameCommands.INSERTLORELINE, inHand, player)) { // Doesn't have material permissions Messager.msgSenderWithConfigMsg("insertloreline.no_permission_for_material", sender); return true; } - + // Check Text Blacklist if (!Blacklists.checkTextBlacklist(args, player)) { // Failed text blacklist. Messager.msgSenderWithConfigMsg("insertloreline.blacklisted_word_found", sender); return true; } - + // Check Material Blacklist if (!Blacklists.checkMaterialBlacklist(type, player)) { // Failed material blacklist Messager.msgSenderWithConfigMsg("insertloreline.blacklisted_material_found", sender); return true; } - + // Check Existing Name Blacklist #81 if (!Blacklists.checkExistingName(player)) { // Failed existing name blacklist Messager.msgSenderWithConfigMsg("insertloreline.blacklisted_existing_name_found", sender); return true; } - + // Check Existing Lore Blacklist #81 if (!Blacklists.checkExistingLore(player)) { // Failed existing lore blacklist Messager.msgSenderWithConfigMsg("insertloreline.blacklisted_existing_lore_found", sender); return true; } - + // Check FormattingPerms if (!FormattingPermManager.checkPerms(EpicRenameCommands.INSERTLORELINE, args, player)) { // FormattingPermManager handles the message. return true; } - - StringBuilder textArguments = new StringBuilder(""); - + + StringBuilder textArguments = new StringBuilder(); + for (int i = 1; i < args.length; i++) { - textArguments.append(args[i] + " "); + textArguments.append(args[i]).append(" "); } - + String lineToInsert = textArguments.toString().trim(); Debug.send("Line to be inserted is: " + lineToInsert); - + // Issue #32 if (!FormattingCodeCounter.checkMinColorCodes(player, lineToInsert, EpicRenameCommands.INSERTLORELINE, true)) { FormattingCodeCounter.sendMinNotReachedMsg(player, EpicRenameCommands.INSERTLORELINE); return true; } - + if (!FormattingCodeCounter.checkMaxColorCodes(player, lineToInsert, EpicRenameCommands.INSERTLORELINE, true)) { FormattingCodeCounter.sendMaxReachedMsg(player, EpicRenameCommands.INSERTLORELINE); return true; } // End Issue #32 - - List newLore = new ArrayList(); - + + List newLore = new ArrayList<>(); + lineToInsert = Messager.color(lineToInsert); - + Debug.send("Colored line to insert: " + lineToInsert); - + ItemMeta im = inHand.getItemMeta(); - + if (im.hasLore()) { List oldLore = im.getLore(); - + if (oldLore.size() < lineNumber) { // selected line number is too large. Messager.msgSenderWithConfigMsg("insertloreline.invalid_number", sender); return true; } - + // Lore lines are from 0-x instead of 1-x lineNumber = lineNumber - 1; - + for (int i = 0; i < oldLore.size(); i++) { if (i == lineNumber) { newLore.add(lineToInsert); @@ -165,40 +165,35 @@ public boolean onCommand(CommandSender sender, Command command, String label, St newLore.add(oldLore.get(i)); } } - + im.setLore(newLore); inHand.setItemMeta(im); // SUCCESS Messager.msgSenderWithConfigMsg("insertloreline.success", sender); - return true; - } else { + } else { // Item doesn't have any lore Messager.msgSenderWithConfigMsg("insertloreline.has_no_lore", sender); - return true; - } - } else { + } + } else { // Must have more than one argument Messager.msgSenderWithConfigMsg("insertloreline.wrong_args", sender); - return true; - } - } else { + } + } else { // Plugin is disabled in this world. Messager.msgSenderWithConfigMsg("insertloreline.disabled_world", sender); - return true; - } - } else { + } + } else { // Not a player Messager.msgSenderWithConfigMsg("insertloreline.wrong_sender", sender); - return true; - } - } else { + } + } else { // No permission Messager.msgSenderWithConfigMsg("insertloreline.no_permission", sender); - return true; - } - } - + } + + return true; + } + return false; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/Lore.java b/src/com/gmail/justbru00/epic/rename/commands/v3/Lore.java index f61566c..dc9fba0 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/Lore.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/Lore.java @@ -34,26 +34,20 @@ public boolean onCommand(CommandSender sender, Command command, String label, St LoreUtil.loreHandle(args, player); - return true; - } else { + } else { Messager.msgPlayer(Main.getMsgFromConfig("lore.no_args"), player); - return true; - } - - } else { + } + } else { Messager.msgPlayer(Main.getMsgFromConfig("lore.no_permission"), player); - return true; - } - - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("lore.disabled_world"), sender); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("lore.wrong_sender"), sender); - return true; - } - } // End /lore + } + return true; + } // End /lore return false; } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveGlow.java b/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveGlow.java index 00c9f32..3b081d2 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveGlow.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveGlow.java @@ -1,24 +1,18 @@ package com.gmail.justbru00.epic.rename.commands.v3; -import java.util.Map; - import com.gmail.justbru00.epic.rename.utils.v3.*; import org.bukkit.Material; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; import com.gmail.justbru00.epic.rename.enums.v3.EpicRenameCommands; import com.gmail.justbru00.epic.rename.main.v3.Main; public class RemoveGlow implements CommandExecutor { - @SuppressWarnings("deprecation") @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { @@ -29,33 +23,33 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (WorldChecker.checkWorld(player)) { ItemStack inHand = RenameUtil.getInHand(player); Material m = inHand.getType(); - + // Issue #76 | Check Blacklist if (!Blacklists.checkMaterialBlacklist(RenameUtil.getInHand(player).getType(), player)) { Messager.msgPlayer(Main.getMsgFromConfig("removeglow.blacklisted_material_found"), player); return true; } // End Issue #76 - + // Check Existing Name Blacklist #81 if (!Blacklists.checkExistingName(player)) { Messager.msgPlayer(Main.getMsgFromConfig("removeglow.blacklisted_existing_name_found"), player); return true; } - + // Check Existing Lore Blacklist #81 if (!Blacklists.checkExistingLore(player)) { Messager.msgPlayer(Main.getMsgFromConfig("removeglow.blacklisted_existing_lore_found"), player); return true; } - + // Check Material Permissions if (!MaterialPermManager.checkPerms(EpicRenameCommands.REMOVEGLOW, inHand, player)) { Messager.msgPlayer(Main.getMsgFromConfig("removeglow.no_permission_for_material"), player); return true; } - if (!(m == null || m == Material.AIR)) { + if (!(m == Material.AIR)) { // ISSUE #198 - Convert legacy glowing to modern glowing if (GlowingUtil.isLegacyToModernConversionEnabled()) { ItemStack converted = GlowingUtil.convertLegacyGlowingToModern(inHand); @@ -70,19 +64,14 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (GlowingUtil.isGlowingItem(inHand)) { ItemStack removed = GlowingUtil.removeGlowingFromItemModern(inHand); Debug.send("[RemoveGlow] After Removal Enchantment List: " + removed.getEnchantments().toString()); - if (removed != null) { - player.getInventory().setItemInMainHand(removed); - Messager.msgSender(Main.getMsgFromConfig("removeglow.success"), sender); - return true; - } else { - Messager.msgSender(Main.getMsgFromConfig("removeglow.not_glowing"), sender); - return true; - } - } else { + player.getInventory().setItemInMainHand(removed); + Messager.msgSender(Main.getMsgFromConfig("removeglow.success"), sender); + } else { Messager.msgSender(Main.getMsgFromConfig("removeglow.not_glowing"), sender); - return true; - } - } else { + } + + return true; + } else { Messager.msgSender(Main.getMsgFromConfig("removeglow.cannot_edit_air"), sender); return true; } @@ -102,5 +91,4 @@ public boolean onCommand(CommandSender sender, Command command, String label, St return false; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveLore.java b/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveLore.java index 98bd28a..d5b43ed 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveLore.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveLore.java @@ -30,55 +30,54 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (sender instanceof Player) { Player player = (Player) sender; if (WorldChecker.checkWorld(player)) { - + // Check Material Permissions if (!MaterialPermManager.checkPerms(EpicRenameCommands.REMOVELORE, RenameUtil.getInHand(player), player)) { Messager.msgPlayer(Main.getMsgFromConfig("removelore.no_permission_for_material"), player); return true; } - + // Check Blacklist if (!Blacklists.checkMaterialBlacklist(RenameUtil.getInHand(player).getType(), player)) { Messager.msgPlayer(Main.getMsgFromConfig("removelore.blacklisted_material_found"), player); return true; } - + // Check Existing Name Blacklist if (!Blacklists.checkExistingName(player)) { Messager.msgPlayer(Main.getMsgFromConfig("removelore.blacklisted_existing_name_found"), player); return true; } - + // Check Existing Lore Blacklist if (!Blacklists.checkExistingLore(player)) { Messager.msgPlayer(Main.getMsgFromConfig("removelore.blacklisted_existing_lore_found"), player); return true; } - + if (RenameUtil.getInHand(player).getType() == Material.AIR) { Messager.msgPlayer(Main.getMsgFromConfig("removelore.cannot_edit_air"), player); return true; } + ItemMeta im = RenameUtil.getInHand(player).getItemMeta(); im.setLore(null); RenameUtil.getInHand(player).setItemMeta(im); Messager.msgPlayer(Main.getMsgFromConfig("removelore.success"), player); - return true; - - } else { + + } else { Messager.msgSender(Main.getMsgFromConfig("removelore.disabled_world"), sender); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("removelore.wrong_sender"), sender); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("removelore.no_permission"), sender); - return true; - } - } + } + + return true; + } + return false; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveLoreLine.java b/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveLoreLine.java index 1d9ea17..bc0aae1 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveLoreLine.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveLoreLine.java @@ -3,6 +3,7 @@ * * This is licensed under the MPL Version 2.0. See license info in LICENSE.txt */ + package com.gmail.justbru00.epic.rename.commands.v3; import java.util.List; @@ -34,33 +35,33 @@ public boolean onCommand(CommandSender sender, Command command, String label, St Player player = (Player) sender; if (WorldChecker.checkWorld(player)) { if (args.length == 1) { - + // Check Material Permissions if (!MaterialPermManager.checkPerms(EpicRenameCommands.REMOVELORELINE, RenameUtil.getInHand(player), player)) { Messager.msgPlayer(Main.getMsgFromConfig("removeloreline.no_permission_for_material"), player); return true; } - + // Issue #76 | Check Blacklist if (!Blacklists.checkMaterialBlacklist(RenameUtil.getInHand(player).getType(), player)) { Messager.msgPlayer(Main.getMsgFromConfig("removeloreline.blacklisted_material_found"), player); return true; } // End Issue #76 - + // Check Existing Name Blacklist #81 if (!Blacklists.checkExistingName(player)) { Messager.msgPlayer(Main.getMsgFromConfig("removeloreline.blacklisted_existing_name_found"), player); return true; } - + // Check Existing Lore Blacklist #81 if (!Blacklists.checkExistingLore(player)) { Messager.msgPlayer(Main.getMsgFromConfig("removeloreline.blacklisted_existing_lore_found"), player); return true; } - - int lineNumber = -1; + + int lineNumber; try { lineNumber = Integer.parseInt(args[0]); @@ -68,7 +69,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St Messager.msgPlayer(Main.getMsgFromConfig("removeloreline.not_an_int"), player); return true; } - + // Issue #80 if (lineNumber <= 0) { Debug.send("[RemoveLoreLine] The number " + lineNumber + " is below or equal to 0."); @@ -88,26 +89,24 @@ public boolean onCommand(CommandSender sender, Command command, String label, St List itemLore = RenameUtil.getInHand(player).getItemMeta().getLore(); if (lineNumber < (itemLore.size() + 1)) { // Line - // number - // exists + // number + // exists itemLore.remove((lineNumber - 1)); ItemMeta im = RenameUtil.getInHand(player).getItemMeta(); im.setLore(itemLore); RenameUtil.getInHand(player).setItemMeta(im); Messager.msgPlayer(Main.getMsgFromConfig("removeloreline.success"), player); - return true; - } else { + } else { Messager.msgPlayer(Main.getMsgFromConfig("removeloreline.out_of_bounds"), player); - return true; - } + } - } else { + } else { Messager.msgPlayer(Main.getMsgFromConfig("removeloreline.has_no_lore"), player); - return true; - } - } + } + return true; + } } else { Messager.msgPlayer(Main.getMsgFromConfig("removeloreline.wrong_args"), player); return true; @@ -128,5 +127,4 @@ public boolean onCommand(CommandSender sender, Command command, String label, St return false; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveName.java b/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveName.java index e1c7af7..da33029 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveName.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/RemoveName.java @@ -24,62 +24,60 @@ public class RemoveName implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - + if (command.getName().equalsIgnoreCase("removename")) { if (sender.hasPermission("epicrename.removename")) { if (sender instanceof Player) { Player player = (Player) sender; if (WorldChecker.checkWorld(player)) { - + // Check Material Permissions if (!MaterialPermManager.checkPerms(EpicRenameCommands.REMOVENAME, RenameUtil.getInHand(player), player)) { Messager.msgPlayer(Main.getMsgFromConfig("removename.no_permission_for_material"), player); return true; } - + // Check Blacklist if (!Blacklists.checkMaterialBlacklist(RenameUtil.getInHand(player).getType(), player)) { Messager.msgPlayer(Main.getMsgFromConfig("removename.blacklisted_material_found"), player); return true; } - + // Check Existing Name Blacklist if (!Blacklists.checkExistingName(player)) { Messager.msgPlayer(Main.getMsgFromConfig("removename.blacklisted_existing_name_found"), player); return true; } - + // Check Existing Lore Blacklist if (!Blacklists.checkExistingLore(player)) { Messager.msgPlayer(Main.getMsgFromConfig("removename.blacklisted_existing_lore_found"), player); return true; } - + if (RenameUtil.getInHand(player).getType() == Material.AIR) { Messager.msgPlayer(Main.getMsgFromConfig("removename.cannot_edit_air"), player); return true; } + ItemMeta im = RenameUtil.getInHand(player).getItemMeta(); im.setDisplayName(null); RenameUtil.getInHand(player).setItemMeta(im); Messager.msgPlayer(Main.getMsgFromConfig("removename.success"), player); - return true; - - } else { + + } else { Messager.msgSender(Main.getMsgFromConfig("removename.disabled_world"), sender); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("removename.wrong_sender"), sender); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("removename.no_permission"), sender); - return true; - } - } + } + + return true; + } return false; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/Rename.java b/src/com/gmail/justbru00/epic/rename/commands/v3/Rename.java index 3fac61b..cd39405 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/Rename.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/Rename.java @@ -38,26 +38,22 @@ public boolean onCommand(CommandSender sender, Command command, String commandLa RenameUtil.renameHandle(player, args, RENAME); - return true; - } else { // No Args + } else { // No Args Messager.msgPlayer(Main.getMsgFromConfig("rename.no_args"), player); - return true; - } - } else { // No basic permission. + } + } else { // No basic permission. Messager.msgPlayer(Main.getMsgFromConfig("rename.no_permission"), player); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("rename.disabled_world"), sender); - return true; - } - } else { // Wrong sender + } + } else { // Wrong sender Messager.msgSender(Main.getMsgFromConfig("rename.wrong_sender"), sender); - return true; - } - } // End /rename code + } + + return true; + } // End /rename code return false; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/SetLoreLine.java b/src/com/gmail/justbru00/epic/rename/commands/v3/SetLoreLine.java index cabbe63..6ee68d2 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/SetLoreLine.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/SetLoreLine.java @@ -32,7 +32,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (args.length > 1) { - int lineNumber = -1; + int lineNumber; try { lineNumber = Integer.parseInt(args[0]); @@ -41,7 +41,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St Messager.msgPlayer(Main.getMsgFromConfig("setloreline.not_an_int"), player); return true; } - + // Issue #80 if (lineNumber <= 0) { Debug.send("[SetLoreLine] The number " + lineNumber + " is below or equal to 0."); @@ -49,7 +49,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St return true; } // End Issue #80 - + // Issue #95 int maxLines = Main.getInstance().getConfig().getInt("setloreline_max_lines"); if (lineNumber > maxLines) { @@ -58,11 +58,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St return true; } // End Issue #95 - - if (args.length == 1) { - Messager.msgPlayer(Main.getMsgFromConfig("setloreline.provide_text"), player); - return true; - } if (RenameUtil.getInHand(player).getType() == Material.AIR || RenameUtil.getInHand(player) == null) { @@ -73,27 +68,22 @@ public boolean onCommand(CommandSender sender, Command command, String label, St } LoreUtil.setLoreLine(lineNumber, player, args); - - return true; - } else { + } else { Messager.msgPlayer(Main.getMsgFromConfig("setloreline.wrong_args"), player); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("setloreline.disabled_world"), sender); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("setloreline.wrong_sender"), sender); - return true; - } - } else { + } + } else { Messager.msgSender(Main.getMsgFromConfig("setloreline.no_permission"), sender); - return true; - } - } // Stop /setloreline code. + } + + return true; + } // Stop /setloreline code. return false; } - } diff --git a/src/com/gmail/justbru00/epic/rename/commands/v3/UnHideEnchantments.java b/src/com/gmail/justbru00/epic/rename/commands/v3/UnHideEnchantments.java index a6bddf2..e7c5827 100644 --- a/src/com/gmail/justbru00/epic/rename/commands/v3/UnHideEnchantments.java +++ b/src/com/gmail/justbru00/epic/rename/commands/v3/UnHideEnchantments.java @@ -29,58 +29,57 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (!command.getName().equalsIgnoreCase("unhideenchantments")) { return false; } - + if (!sender.hasPermission("epicrename.unhideenchantments")) { Messager.msgSenderWithConfigMsg("unhideenchantments.no_permission", sender); return true; } - + if (!(sender instanceof Player)) { Messager.msgSenderWithConfigMsg("unhideenchantments.wrong_sender", sender); return true; } - + Player player = (Player) sender; if (!WorldChecker.checkWorld(player)) { Messager.msgSenderWithConfigMsg("unhideenchantments.disabled_world", sender); return true; } - + ItemStack inHand = RenameUtil.getInHand(player); Material m = inHand.getType(); - + if (!Blacklists.checkMaterialBlacklist(m, player)) { Messager.msgPlayer(Main.getMsgFromConfig("unhideenchantments.blacklisted_material_found"), player); return true; } - + if (!Blacklists.checkExistingName(player)) { Messager.msgPlayer(Main.getMsgFromConfig("unhideenchantments.blacklisted_existing_name_found"), player); return true; } - + if (!Blacklists.checkExistingLore(player)) { Messager.msgPlayer(Main.getMsgFromConfig("unhideenchantments.blacklisted_existing_lore_found"), player); return true; } - + if (!MaterialPermManager.checkPerms(EpicRenameCommands.UNHIDEENCHANTMENTS, inHand, player)) { Messager.msgPlayer(Main.getMsgFromConfig("unhideenchantments.no_permission_for_material"), player); return true; } - - if ((m == Material.AIR || m == null)) { + + if (m == Material.AIR) { Messager.msgPlayer(Main.getMsgFromConfig("unhideenchantments.cannot_edit_air"), player); return true; } - + ItemMeta im = inHand.getItemMeta(); im.removeItemFlags(ItemFlag.HIDE_ENCHANTS); inHand.setItemMeta(im); - + Messager.msgPlayer(Main.getMsgFromConfig("unhideenchantments.success"), player); - + return true; } - } diff --git a/src/com/gmail/justbru00/epic/rename/configuration/ConfigUpdater.java b/src/com/gmail/justbru00/epic/rename/configuration/ConfigUpdater.java index bbf7f0b..7ba7036 100644 --- a/src/com/gmail/justbru00/epic/rename/configuration/ConfigUpdater.java +++ b/src/com/gmail/justbru00/epic/rename/configuration/ConfigUpdater.java @@ -1,6 +1,7 @@ package com.gmail.justbru00.epic.rename.configuration; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.bukkit.configuration.file.FileConfiguration; @@ -124,8 +125,8 @@ public static void updateMessagesYml() { "&cSorry you don't have permission to perform that command."); updateMessagesYmlString("epicrename.no_args", "&cType /epicrename help for commands. (No Arguments)"); updateMessagesYmlString("epicrename.license", "&6View license information at: http://bit.ly/2eMknxx"); - updateMessagesYmlStringList("epicrename.help", - "&6/rename ", "&6/lore ", + updateMessagesYmlStringList( + "&6/rename ", "&6/lore ", "&6/setloreline ", "&6/removeloreline ", "&6/insertloreline ", @@ -333,7 +334,7 @@ public static void updateMessagesYml() { updateMessagesYmlString("removelore.cannot_edit_air", "&cSorry you can't edit nothing."); updateMessagesYmlString("removelore.no_permission_for_material", "&cSorry you don't have permission for that material."); updateMessagesYmlString("removelore.success", "&aRemoved the lore from the item successfully."); - + // /hideenchantments updateMessagesYmlString("hideenchantments.no_permission", "&cSorry you don't have permission to perform that command."); updateMessagesYmlString("hideenchantments.wrong_sender", "&cSorry only a player can use that command."); @@ -344,7 +345,7 @@ public static void updateMessagesYml() { updateMessagesYmlString("hideenchantments.cannot_edit_air", "&cSorry you can't edit nothing."); updateMessagesYmlString("hideenchantments.no_permission_for_material", "&cSorry you don't have permission for that material."); updateMessagesYmlString("hideenchantments.success", "&aEnchantments on this item have been hidden."); - + // /unhideenchantments updateMessagesYmlString("unhideenchantments.no_permission", "&cSorry you don't have permission to perform that command."); updateMessagesYmlString("unhideenchantments.wrong_sender", "&cSorry only a player can use that command."); @@ -355,7 +356,7 @@ public static void updateMessagesYml() { updateMessagesYmlString("unhideenchantments.cannot_edit_air", "&cSorry you can't edit nothing."); updateMessagesYmlString("unhideenchantments.no_permission_for_material", "&cSorry you don't have permission for that material."); updateMessagesYmlString("unhideenchantments.success", "&aEnchantments on this item have been unhidden."); - + // /addloreline updateMessagesYmlString("addloreline.no_permission", "&cSorry you don't have permission to perform that command."); updateMessagesYmlString("addloreline.wrong_sender", "&cSorry only a player can use that command."); @@ -368,7 +369,7 @@ public static void updateMessagesYml() { updateMessagesYmlString("addloreline.no_permission_for_material", "&cSorry you don''t have permission for that material."); updateMessagesYmlString("addloreline.success", "&aAdded lore to the item successfully."); updateMessagesYmlString("addloreline.disabled_world", "&cYou are in a disabled world."); - + // /editname updateMessagesYmlString("editname.no_permission", "&cSorry you don't have permission to perform that command."); updateMessagesYmlString("editname.wrong_sender", "&cSorry only a player can use that command."); @@ -381,7 +382,7 @@ public static void updateMessagesYml() { updateMessagesYmlString("editname.no_permission", "&cSorry you don't have permission to perform that command."); updateMessagesYmlString("editname.no_displayname", "&cSorry that item doesn't have a display name set."); updateMessagesYmlString("editname.click_to_edit", "&a&nClick on this message to start editing the name of this item."); - + // /editlore updateMessagesYmlString("editlore.no_permission", "&cSorry you don't have permission to perform that command."); updateMessagesYmlString("editlore.wrong_sender", "&cSorry only a player can use that command."); @@ -395,7 +396,7 @@ public static void updateMessagesYml() { updateMessagesYmlString("editlore.no_lore", "&cSorry that item doesn't have any lore set."); updateMessagesYmlString("editlore.lore_content_empty", "&cSorry the lore on this item appears to have no content."); updateMessagesYmlString("editlore.click_to_edit", "&a&nClick on this message to start editing the lore of this item."); - + // rename_character_limit updateMessagesYmlString("rename_character_limit.name_too_long", "&cSorry that name is too long. The character limit is {char}."); @@ -426,7 +427,7 @@ public static void updateMessagesYml() { updateMessagesYmlString("economy.transaction_success", "&aJust took {cost} from your balance."); updateMessagesYmlString("economy.transaction_error", "&cThere was a problem taking money from your balance: {error}"); - + // xp cost updateMessagesYmlString("xp.bypass", "&aYou just bypassed the experience requirement."); updateMessagesYmlString("xp.transaction_success", "&aJust took {cost} experience points from your inventory."); @@ -448,16 +449,14 @@ private static void updateMessagesYmlString(String path, String updatedValue) { } } - private static void updateMessagesYmlStringList(String path, String... updatedValue) { - if (!messages.isSet(path)) { + private static void updateMessagesYmlStringList(String... updatedValue) { + if (!messages.isSet("epicrename.help")) { // Path doesn't exist. - List stringList = new ArrayList(); - for (String s : updatedValue) { - stringList.add(s); - } + List stringList = new ArrayList<>(); + Collections.addAll(stringList, updatedValue); - messages.set(path, stringList); - Messager.msgConsole("[ConfigUpdater] Added " + path + " to config.yml."); + messages.set("epicrename.help", stringList); + Messager.msgConsole("[ConfigUpdater] Added " + "epicrename.help" + " to config.yml."); messages.save(); } } @@ -492,15 +491,12 @@ private static void updateConfigYmlBoolean(String path, boolean updatedValue) { private static void updateConfigYmlStringList(String path, String... updatedValue) { if (!config.isSet(path)) { // Path doesn't exist. - List stringList = new ArrayList(); - for (String s : updatedValue) { - stringList.add(s); - } + List stringList = new ArrayList<>(); + Collections.addAll(stringList, updatedValue); config.set(path, stringList); Messager.msgConsole("[ConfigUpdater] Added " + path + " to config.yml."); Main.getInstance().saveConfig(); } } - } diff --git a/src/com/gmail/justbru00/epic/rename/configuration/ConfigurationManager.java b/src/com/gmail/justbru00/epic/rename/configuration/ConfigurationManager.java index b49f81e..fafaecc 100644 --- a/src/com/gmail/justbru00/epic/rename/configuration/ConfigurationManager.java +++ b/src/com/gmail/justbru00/epic/rename/configuration/ConfigurationManager.java @@ -18,7 +18,7 @@ public class ConfigurationManager { /** * Checks the config version number vs the one this version of EpicRename has. - * @return True if it needs updated, false if it doesn't. + * @return True if it needs to be updated, false if it doesn't. */ public static boolean doesConfigYmlNeedUpdated() { if (config == null) { @@ -27,19 +27,18 @@ public static boolean doesConfigYmlNeedUpdated() { return config.getInt("config_version") < CONFIG_VERSION; } - + /** * Checks the messages.yml version vs the one this version of Epicrename has. - * @return */ public static boolean doesMessagesYmlNeedUpdated() { if (messages == null) { messages = Main.getMessagesYmlFile(); } - + return messages.getInt("messages_yml_version") < MESSAGES_VERSION; } - + /** * Adds any new config values to the config.yml file if the config_version value doesn't match the value of this version of EpicRename. * These must be set manually in the {@link ConfigUpdater}. @@ -48,7 +47,7 @@ public static boolean doesMessagesYmlNeedUpdated() { public static void updateConfigYml() { ConfigUpdater.updateConfigYml(); } - + /** * Adds any new messages values to the messages.yml file if the messages_version value doesn't match the value of this version of EpicRename. * These must be set manually in the {@link ConfigUpdater}. @@ -57,5 +56,4 @@ public static void updateConfigYml() { public static void updateMessagesYml() { ConfigUpdater.updateMessagesYml(); } - } diff --git a/src/com/gmail/justbru00/epic/rename/enums/v3/EcoMessage.java b/src/com/gmail/justbru00/epic/rename/enums/v3/EcoMessage.java index 67d751b..1b2cf9a 100644 --- a/src/com/gmail/justbru00/epic/rename/enums/v3/EcoMessage.java +++ b/src/com/gmail/justbru00/epic/rename/enums/v3/EcoMessage.java @@ -3,11 +3,11 @@ * * This is licensed under the MPL Version 2.0. See license info in LICENSE.txt */ -package com.gmail.justbru00.epic.rename.enums.v3; +package com.gmail.justbru00.epic.rename.enums.v3; public enum EcoMessage { ECO_DISABLED, SUCCESS, TRANSACTION_ERROR, ECO_BYPASS, UNHANDLED; - + } diff --git a/src/com/gmail/justbru00/epic/rename/enums/v3/EpicRenameCommands.java b/src/com/gmail/justbru00/epic/rename/enums/v3/EpicRenameCommands.java index 861a7d8..59ee0d5 100644 --- a/src/com/gmail/justbru00/epic/rename/enums/v3/EpicRenameCommands.java +++ b/src/com/gmail/justbru00/epic/rename/enums/v3/EpicRenameCommands.java @@ -3,14 +3,14 @@ * * This is licensed under the MPL Version 2.0. See license info in LICENSE.txt */ + package com.gmail.justbru00.epic.rename.enums.v3; public enum EpicRenameCommands { RENAME, LORE, EPICRENAME, SETLORELINE, REMOVELORELINE, INSERTLORELINE, GLOW, REMOVEGLOW, ALIGN, EXPORT, IMPORT, REMOVENAME, REMOVELORE, HIDEENCHANTMENTS, UNHIDEENCHANTMENTS, ADDLORELINE, EDITNAME, EDITLORE; - - + public static String getStringName(EpicRenameCommands e) { switch (e) { case RENAME: {return "rename";} @@ -34,7 +34,7 @@ public static String getStringName(EpicRenameCommands e) { default: break; } + return "Command not found"; } - } diff --git a/src/com/gmail/justbru00/epic/rename/enums/v3/MCVersion.java b/src/com/gmail/justbru00/epic/rename/enums/v3/MCVersion.java index ee435e6..3f7d8b2 100644 --- a/src/com/gmail/justbru00/epic/rename/enums/v3/MCVersion.java +++ b/src/com/gmail/justbru00/epic/rename/enums/v3/MCVersion.java @@ -3,6 +3,7 @@ * * This is licensed under the MPL Version 2.0. See license info in LICENSE.txt */ + package com.gmail.justbru00.epic.rename.enums.v3; public enum MCVersion { diff --git a/src/com/gmail/justbru00/epic/rename/enums/v3/XpMessage.java b/src/com/gmail/justbru00/epic/rename/enums/v3/XpMessage.java index 9fd3623..deca6e6 100644 --- a/src/com/gmail/justbru00/epic/rename/enums/v3/XpMessage.java +++ b/src/com/gmail/justbru00/epic/rename/enums/v3/XpMessage.java @@ -3,11 +3,11 @@ * * This is licensed under the MPL Version 2.0. See license info in LICENSE.txt */ -package com.gmail.justbru00.epic.rename.enums.v3; +package com.gmail.justbru00.epic.rename.enums.v3; public enum XpMessage { XP_DISABLED, SUCCESS, TRANSACTION_ERROR, XP_BYPASS, UNHANDLED; - + } diff --git a/src/com/gmail/justbru00/epic/rename/exploit_prevention/ExploitPreventionListener.java b/src/com/gmail/justbru00/epic/rename/exploit_prevention/ExploitPreventionListener.java index cb12489..02ad9d2 100644 --- a/src/com/gmail/justbru00/epic/rename/exploit_prevention/ExploitPreventionListener.java +++ b/src/com/gmail/justbru00/epic/rename/exploit_prevention/ExploitPreventionListener.java @@ -1,11 +1,8 @@ package com.gmail.justbru00.epic.rename.exploit_prevention; -import java.util.Map.Entry; - import com.gmail.justbru00.epic.rename.utils.v3.GlowingUtil; import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.HumanEntity; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -19,10 +16,10 @@ import com.gmail.justbru00.epic.rename.utils.v3.Messager; public class ExploitPreventionListener implements Listener { - + private boolean grindstoneVersion = true; private boolean grindstoneVersionSet = false; - + /** * Checks if this version has the grindstone. MC 1.14 or greater * @return True if this version has the grindstone. False if not. @@ -31,9 +28,9 @@ public boolean isMCVersionWithGrindstone() { if (grindstoneVersionSet) { return grindstoneVersion; } - + String version = Bukkit.getVersion(); - + if (version.contains("1.7") || version.contains("1.8") || version.contains("1.9") || version.contains("1.10") || version.contains("1.11") || version.contains("1.12") || version.contains("1.13")) { grindstoneVersionSet = true; @@ -42,23 +39,19 @@ public boolean isMCVersionWithGrindstone() { grindstoneVersionSet = true; grindstoneVersion = true; } + return grindstoneVersion; } /** * ISSUE #114 - * @param e */ @EventHandler(priority=EventPriority.HIGHEST) public void onInventoryClick(InventoryClickEvent e) { // Applies to MC 1.14 or higher if (isMCVersionWithGrindstone()) { - if (Main.getBooleanFromConfig("disable_grindstone_for_glowing_items")) { - if (e.getInventory() == null) { - return; - } - - if (e.getInventory().getType() == InventoryType.ANVIL) { + if (Main.getBooleanFromConfig("disable_grindstone_for_glowing_items")) { + if (e.getInventory().getType() == InventoryType.ANVIL) { for (ItemStack is : e.getInventory().getStorageContents()) { if (is != null) { if (GlowingUtil.isGlowingItem(is)) { @@ -76,7 +69,7 @@ public void run() { } } } - + if (e.getInventory().getType() == InventoryType.GRINDSTONE) { for (ItemStack is : e.getInventory().getStorageContents()) { if (is != null) { @@ -94,11 +87,11 @@ public void run() { } } } - + if (e.getCurrentItem() == null || e.getCurrentItem().getType().equals(Material.AIR)) { return; } - + if (GlowingUtil.isGlowingItem(e.getCurrentItem())) { // Glowing Item e.setCancelled(true); @@ -115,5 +108,4 @@ public void run() { } } } - } diff --git a/src/com/gmail/justbru00/epic/rename/listeners/v3/OnJoin.java b/src/com/gmail/justbru00/epic/rename/listeners/v3/OnJoin.java index 3171099..436ae5c 100644 --- a/src/com/gmail/justbru00/epic/rename/listeners/v3/OnJoin.java +++ b/src/com/gmail/justbru00/epic/rename/listeners/v3/OnJoin.java @@ -3,6 +3,7 @@ * * This is licensed under the MPL Version 2.0. See license info in LICENSE.txt */ + package com.gmail.justbru00.epic.rename.listeners.v3; import org.bukkit.event.EventHandler; @@ -20,5 +21,4 @@ public void onJoin(PlayerJoinEvent e) { Messager.msgPlayer("&a&lThis server uses &b&lEpic&f&lRename &a&lversion &c&l" + Main.PLUGIN_VERSION, e.getPlayer()); } } - } diff --git a/src/com/gmail/justbru00/epic/rename/main/v3/Main.java b/src/com/gmail/justbru00/epic/rename/main/v3/Main.java index fa8d2e7..2103b07 100644 --- a/src/com/gmail/justbru00/epic/rename/main/v3/Main.java +++ b/src/com/gmail/justbru00/epic/rename/main/v3/Main.java @@ -57,12 +57,12 @@ public class Main extends JavaPlugin { public static boolean debug = false; public static String PLUGIN_VERSION = null; private static final int BSTATS_PLUGIN_ID = 548; - + /** * Default to the method for getting items in hand for MC version 1.9.x+ */ public static boolean USE_NEW_GET_HAND = true; - + /** * Version is set in checkServerVerison() */ @@ -70,7 +70,7 @@ public class Main extends JavaPlugin { public static Main plugin; public static PluginFile messages = null; public static PluginFile statsFile = null; - + /** * Vault economy. */ @@ -80,7 +80,7 @@ public class Main extends JavaPlugin { public static ConsoleCommandSender clogger = Bukkit.getServer().getConsoleSender(); public static Logger log = Bukkit.getLogger(); - + public static String prefix = Messager.color("&8[&bEpic&fRename&8] &f"); @Override @@ -92,16 +92,16 @@ public void onDisable() { @Override public void onEnable() { plugin = this; - + // Save default yaml files. this.saveDefaultConfig(); messages = new PluginFile(this, "messages.yml", "messages.yml"); statsFile = new PluginFile(this, "stats.yml"); // Issue #162 - + PLUGIN_VERSION = Main.getInstance().getDescription().getVersion(); Main.debug = getConfig().getBoolean("debug", false); - + checkServerVersion(); Messager.msgConsole("&bVersion: &c" + PLUGIN_VERSION + " &bMC Version: &c" + MC_VERSION.toString()); @@ -117,7 +117,7 @@ public void onEnable() { ". Attempting to add missing values to the config file."); ConfigurationManager.updateConfigYml(); } - + if (ConfigurationManager.doesMessagesYmlNeedUpdated()) { Messager.msgConsole("&c[WARN] The messages.yml file version is incorrect. EpicRename v" + PLUGIN_VERSION + " expects a messages.yml version of " + ConfigurationManager.MESSAGES_VERSION + @@ -130,7 +130,7 @@ public void onEnable() { USE_ECO = true; Messager.msgConsole("&aEconomy is enabled in the config."); } - + if (Main.getInstance().getConfig().getBoolean("xp.use")) { USE_XP_COST = true; Messager.msgConsole("&aExperience cost is enabled in the config."); @@ -150,92 +150,72 @@ public void onEnable() { // Command Executors and Tab Completers getCommand("rename").setExecutor(new Rename()); getCommand("rename").setTabCompleter(new GenericOneArgTabCompleter("rename", "")); - + getCommand("epicrename").setExecutor(new EpicRename()); getCommand("epicrename").setTabCompleter(new EpicRenameTabCompleter()); - + getCommand("lore").setExecutor(new Lore()); getCommand("lore").setTabCompleter(new GenericOneArgTabCompleter("lore", "")); - + getCommand("setloreline").setExecutor(new SetLoreLine()); getCommand("setloreline").setTabCompleter(new GenericTwoArgTabCompleter("setloreline", "", "")); - + getCommand("removeloreline").setExecutor(new RemoveLoreLine()); getCommand("removeloreline").setTabCompleter(new GenericOneArgTabCompleter("removeloreline", "")); - + getCommand("insertloreline").setExecutor(new InsertLoreLine()); getCommand("insertloreline").setTabCompleter(new GenericTwoArgTabCompleter("insertloreline", "", "")); - + getCommand("glow").setExecutor(new Glow()); getCommand("glow").setTabCompleter(new GenericNoArgsTabCompleter("glow")); - + getCommand("removeglow").setExecutor(new RemoveGlow()); getCommand("removeglow").setTabCompleter(new GenericNoArgsTabCompleter("removeglow")); - + getCommand("import").setExecutor(new Import()); getCommand("import").setTabCompleter(new ImportTabCompleter()); - + getCommand("export").setExecutor(new Export()); getCommand("export").setTabCompleter(new ExportTabCompleter()); - + getCommand("removename").setExecutor(new RemoveName()); getCommand("removename").setTabCompleter(new GenericNoArgsTabCompleter("removename")); - + getCommand("removelore").setExecutor(new RemoveLore()); getCommand("removelore").setTabCompleter(new GenericNoArgsTabCompleter("removelore")); - + getCommand("hideenchantments").setExecutor(new HideEnchantments()); getCommand("hideenchantments").setTabCompleter(new GenericNoArgsTabCompleter("hideenchantments")); - + getCommand("unhideenchantments").setExecutor(new UnHideEnchantments()); getCommand("unhideenchantments").setTabCompleter(new GenericNoArgsTabCompleter("unhideenchantments")); - + getCommand("addloreline").setExecutor(new AddLoreLine()); getCommand("addloreline").setTabCompleter(new GenericOneArgTabCompleter("addloreline", "")); - + getCommand("editname").setExecutor(new EditName()); getCommand("editname").setTabCompleter(new GenericNoArgsTabCompleter("editname")); getCommand("editlore").setExecutor(new EditLore()); getCommand("editlore").setTabCompleter(new GenericNoArgsTabCompleter("editlore")); - - // Start bstats + + // Start bStats BStats bstats = new BStats(this, BSTATS_PLUGIN_ID); - - bstats.addCustomChart(new BStats.SimplePie("economy_features", new Callable() { - - @Override - public String call() throws Exception { - return Boolean.toString(Main.USE_ECO); - } - - })); - - bstats.addCustomChart(new BStats.SimplePie("uses_epicrenameonline_features", new Callable() { - - @Override - public String call() throws Exception { - return Boolean.toString(Main.isEpicRenameOnlineFeaturesUsedBefore()); - } - - })); - + + bstats.addCustomChart(new BStats.SimplePie("economy_features", () -> Boolean.toString(Main.USE_ECO))); + + bstats.addCustomChart(new BStats.SimplePie("uses_epicrenameonline_features", () -> Boolean.toString(Main.isEpicRenameOnlineFeaturesUsedBefore()))); + // ISSUE #152 - bstats.addCustomChart(new BStats.SimplePie("experience_cost_feature", new Callable() { - - @Override - public String call() throws Exception { - return Boolean.toString(Main.USE_XP_COST); - } - - })); - + bstats.addCustomChart(new BStats.SimplePie("experience_cost_feature", () -> Boolean.toString(Main.USE_XP_COST))); + // Prefix if (Main.getInstance().getConfig().getString("prefix") != null) { prefix = Messager.color(Main.getInstance().getConfig().getString("prefix")); } else { Messager.msgConsole("&cThe prefix in the config is null. Keeping default instead."); } + Messager.msgConsole("&aPrefix set to: '" + prefix + "&a'"); Messager.msgConsole("&aPlugin Enabled!"); @@ -251,6 +231,7 @@ public static String getMsgFromConfig(String path) { Debug.send("[Main#getMsgFromConfig()] A message from messages.yml was NULL. The path to the message is: " + path); return "[ERROR] Could not read value from messages.yml. Ask a server admin to enable /epicrename debug to find the broken value. [ERROR]"; } + return messages.getString(path); // Removed duplicate Messager.color(); Messager#msgXXXX colors the message. } @@ -269,12 +250,12 @@ public static void reloadConfigs() { USE_ECO = true; Messager.msgConsole("&aEconomy is enabled in the config."); } - + if (Main.getInstance().getConfig().getBoolean("xp.use")) { USE_XP_COST = true; Messager.msgConsole("&aXp cost is enabled in the config."); } - + // ISSUE #125 - Prefix not correctly loaded by /epicrename reload if (Main.getInstance().getConfig().getString("prefix") != null) { prefix = Messager.color(Main.getInstance().getConfig().getString("prefix")); @@ -322,8 +303,6 @@ public static void checkServerVersion() { /** * Sets up vault economy. - * - * @return */ private boolean setupEconomy() { if (getServer().getPluginManager().getPlugin("Vault") == null) { @@ -331,19 +310,19 @@ private boolean setupEconomy() { + "http://dev.bukkit.org/bukkit-plugins/vault/"); return false; } + RegisteredServiceProvider rsp = getServer().getServicesManager().getRegistration(Economy.class); if (rsp == null) { Messager.msgConsole("&cFailed to get the economy details from Vault. Is there a Vault compatible economy plugin installed?"); return false; } + econ = rsp.getProvider(); - return econ != null; + return true; } /** * Gets the stack trace as a String from a Throwable - * @param aThrowable - * @return */ public static String getStackTrace(Throwable aThrowable) { Writer result = new StringWriter(); @@ -351,11 +330,11 @@ public static String getStackTrace(Throwable aThrowable) { aThrowable.printStackTrace(printWriter); return result.toString(); } - + public static PluginFile getMessagesYmlFile() { return messages; } - + /** * Issue #162 * Saves the given value to the stats.yml file. @@ -375,7 +354,7 @@ public static void setEpicRenameOnlineFeaturesUsedBefore(boolean value) { Debug.send("[Main#setEpicRenameOnlineFeaturesUsedBefore] stats.yml file is null. Are you sure it was able to be saved during onEnable?"); } } - + /** * Issue #162 * Reads the current boolean value of the key epicrenameonline_features_used_before from stats.yml @@ -386,7 +365,7 @@ public static boolean isEpicRenameOnlineFeaturesUsedBefore() { Debug.send("[Main#isEpicRenameOnlineFeaturesUsedBefore] stats.yml file is null. Are you sure it was able to be saved during onEnable?"); return false; } - + if (statsFile.isBoolean("epicrenameonline_features_used_before")) { return statsFile.getBoolean("epicrenameonline_features_used_before"); } else { diff --git a/src/com/gmail/justbru00/epic/rename/main/v3/bstats/BStats.java b/src/com/gmail/justbru00/epic/rename/main/v3/bstats/BStats.java index 2411b74..114b8ac 100644 --- a/src/com/gmail/justbru00/epic/rename/main/v3/bstats/BStats.java +++ b/src/com/gmail/justbru00/epic/rename/main/v3/bstats/BStats.java @@ -12,6 +12,7 @@ * * Violations will result in a ban of your plugin and account from bStats. */ + package com.gmail.justbru00.epic.rename.main.v3.bstats; import java.io.BufferedReader; @@ -72,20 +73,19 @@ public BStats(Plugin plugin, int serviceId) { config.addDefault("logSentData", false); config.addDefault("logResponseStatusText", false); // Inform the server owners about bStats - config - .options() - .header( - "bStats (https://bStats.org) collects some basic information for plugin authors, like how\n" - + "many people use their plugin and their total player count. It's recommended to keep bStats\n" - + "enabled, but if you're not comfortable with this, you can turn this setting off. There is no\n" - + "performance penalty associated with having metrics enabled, and data sent to bStats is fully\n" - + "anonymous.") + config.options().header( + "bStats (https://bStats.org) collects some basic information for plugin authors, like how\n" + + "many people use their plugin and their total player count. It's recommended to keep bStats\n" + + "enabled, but if you're not comfortable with this, you can turn this setting off. There is no\n" + + "performance penalty associated with having metrics enabled, and data sent to bStats is fully\n" + + "anonymous.") .copyDefaults(true); try { config.save(configFile); } catch (IOException ignored) { } } + // Load the data boolean enabled = config.getBoolean("enabled", true); String serverUUID = config.getString("serverUuid"); @@ -95,7 +95,7 @@ public BStats(Plugin plugin, int serviceId) { boolean isFolia = false; try { isFolia = Class.forName("io.papermc.paper.threadedregions.RegionizedServer") != null; - } catch (Exception e) { + } catch (Exception ignored) { } metricsBase = new // See https://github.com/Bastian/bstats-metrics/pull/126 @@ -212,7 +212,7 @@ public static class MetricsBase { * @param platform The platform of the service. * @param serviceId The id of the service. * @param serverUuid The server uuid. - * @param enabled Whether or not data sending is enabled. + * @param enabled Whether data sending is enabled. * @param appendPlatformDataConsumer A consumer that receives a {@code JsonObjectBuilder} and * appends all platform-specific data. * @param appendServiceDataConsumer A consumer that receives a {@code JsonObjectBuilder} and @@ -223,10 +223,10 @@ public static class MetricsBase { * @param checkServiceEnabledSupplier A supplier to check if the service is still enabled. * @param errorLogger A consumer that accepts log message and an error. * @param infoLogger A consumer that accepts info log messages. - * @param logErrors Whether or not errors should be logged. - * @param logSentData Whether or not the sent data should be logged. - * @param logResponseStatusText Whether or not the response status text should be logged. - * @param skipRelocateCheck Whether or not the relocate check should be skipped. + * @param logErrors Whether errors should be logged. + * @param logSentData Whether the data sent should be logged. + * @param logResponseStatusText Whether the response status text should be logged. + * @param skipRelocateCheck Whether the relocate check should be skipped. */ public MetricsBase( String platform, @@ -273,6 +273,7 @@ public MetricsBase( if (!skipRelocateCheck) { checkRelocation(); } + if (enabled) { // WARNING: Removing the option to opt-out will get your plugin banned from // bStats @@ -351,6 +352,7 @@ private void sendData(JsonObjectBuilder.JsonObject data) throws Exception { if (logSentData) { infoLogger.accept("Sent bStats metrics data: " + data.toString()); } + String url = String.format(REPORT_URL, platform); HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection(); // Compress the data to save bandwidth @@ -366,6 +368,7 @@ private void sendData(JsonObjectBuilder.JsonObject data) throws Exception { try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) { outputStream.write(compressedData); } + StringBuilder builder = new StringBuilder(); try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) { @@ -374,6 +377,7 @@ private void sendData(JsonObjectBuilder.JsonObject data) throws Exception { builder.append(line); } } + if (logResponseStatusText) { infoLogger.accept("Sent data to bStats and received response: " + builder); } @@ -400,7 +404,7 @@ private void checkRelocation() { } /** - * Gzips the given string. + * GZips the given string. * * @param str The string to gzip. * @return The gzipped string. @@ -440,19 +444,23 @@ protected JsonObjectBuilder.JsonObject getChartData() throws Exception { // Null = skip the chart return null; } + boolean allSkipped = true; for (Map.Entry entry : map.entrySet()) { if (entry.getValue().length == 0) { // Skip this invalid continue; } + allSkipped = false; valuesBuilder.appendField(entry.getKey(), entry.getValue()); } + if (allSkipped) { // Null = skip the chart return null; } + return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); } } @@ -479,6 +487,7 @@ protected JsonObjectBuilder.JsonObject getChartData() throws Exception { // Null = skip the chart return null; } + return new JsonObjectBuilder().appendField("value", value).build(); } } @@ -506,6 +515,7 @@ public JsonObjectBuilder.JsonObject getChartData() throws Exception { // Null = skip the chart return null; } + boolean reallyAllSkipped = true; for (Map.Entry> entryValues : map.entrySet()) { JsonObjectBuilder valueBuilder = new JsonObjectBuilder(); @@ -514,15 +524,18 @@ public JsonObjectBuilder.JsonObject getChartData() throws Exception { valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue()); allSkipped = false; } + if (!allSkipped) { reallyAllSkipped = false; valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build()); } } + if (reallyAllSkipped) { // Null = skip the chart return null; } + return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); } } @@ -549,6 +562,7 @@ protected JsonObjectBuilder.JsonObject getChartData() throws Exception { // Null = skip the chart return null; } + return new JsonObjectBuilder().appendField("value", value).build(); } } @@ -576,19 +590,23 @@ protected JsonObjectBuilder.JsonObject getChartData() throws Exception { // Null = skip the chart return null; } + boolean allSkipped = true; for (Map.Entry entry : map.entrySet()) { if (entry.getValue() == 0) { // Skip this invalid continue; } + allSkipped = false; valuesBuilder.appendField(entry.getKey(), entry.getValue()); } + if (allSkipped) { // Null = skip the chart return null; } + return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); } } @@ -616,19 +634,23 @@ protected JsonObjectBuilder.JsonObject getChartData() throws Exception { // Null = skip the chart return null; } + boolean allSkipped = true; for (Map.Entry entry : map.entrySet()) { if (entry.getValue() == 0) { // Skip this invalid continue; } + allSkipped = false; valuesBuilder.appendField(entry.getKey(), entry.getValue()); } + if (allSkipped) { // Null = skip the chart return null; } + return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); } } @@ -641,6 +663,7 @@ protected CustomChart(String chartId) { if (chartId == null) { throw new IllegalArgumentException("chartId must not be null"); } + this.chartId = chartId; } @@ -654,13 +677,16 @@ public JsonObjectBuilder.JsonObject getRequestJsonObject( // If the data is null we don't send the chart. return null; } + builder.appendField("data", data); } catch (Throwable t) { if (logErrors) { errorLogger.accept("Failed to get data for custom chart with id " + chartId, t); } + return null; } + return builder.build(); } @@ -690,9 +716,11 @@ protected JsonObjectBuilder.JsonObject getChartData() throws Exception { // Null = skip the chart return null; } + for (Map.Entry entry : map.entrySet()) { valuesBuilder.appendField(entry.getKey(), new int[] {entry.getValue()}); } + return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); } } @@ -735,6 +763,7 @@ public JsonObjectBuilder appendField(String key, String value) { if (value == null) { throw new IllegalArgumentException("JSON value must not be null"); } + appendFieldUnescaped(key, "\"" + escape(value) + "\""); return this; } @@ -762,6 +791,7 @@ public JsonObjectBuilder appendField(String key, JsonObject object) { if (object == null) { throw new IllegalArgumentException("JSON object must not be null"); } + appendFieldUnescaped(key, object.toString()); return this; } @@ -777,10 +807,10 @@ public JsonObjectBuilder appendField(String key, String[] values) { if (values == null) { throw new IllegalArgumentException("JSON values must not be null"); } - String escapedValues = - Arrays.stream(values) - .map(value -> "\"" + escape(value) + "\"") - .collect(Collectors.joining(",")); + + String escapedValues = Arrays.stream(values) + .map(value -> "\"" + escape(value) + "\"") + .collect(Collectors.joining(",")); appendFieldUnescaped(key, "[" + escapedValues + "]"); return this; } @@ -796,6 +826,7 @@ public JsonObjectBuilder appendField(String key, int[] values) { if (values == null) { throw new IllegalArgumentException("JSON values must not be null"); } + String escapedValues = Arrays.stream(values).mapToObj(String::valueOf).collect(Collectors.joining(",")); appendFieldUnescaped(key, "[" + escapedValues + "]"); @@ -813,6 +844,7 @@ public JsonObjectBuilder appendField(String key, JsonObject[] values) { if (values == null) { throw new IllegalArgumentException("JSON values must not be null"); } + String escapedValues = Arrays.stream(values).map(JsonObject::toString).collect(Collectors.joining(",")); appendFieldUnescaped(key, "[" + escapedValues + "]"); @@ -829,12 +861,15 @@ private void appendFieldUnescaped(String key, String escapedValue) { if (builder == null) { throw new IllegalStateException("JSON has already been built"); } + if (key == null) { throw new IllegalArgumentException("JSON key must not be null"); } + if (hasAtLeastOneField) { builder.append(","); } + builder.append("\"").append(escape(key)).append("\":").append(escapedValue); hasAtLeastOneField = true; } @@ -848,13 +883,14 @@ public JsonObject build() { if (builder == null) { throw new IllegalStateException("JSON has already been built"); } + JsonObject object = new JsonObject(builder.append("}").toString()); builder = null; return object; } /** - * Escapes the given string like stated in https://www.ietf.org/rfc/rfc4627.txt. + * Escapes the given string like stated in .... * *

This method escapes only the necessary characters '"', '\'. and '\u0000' - '\u001F'. * Compact escapes are not used (e.g., '\n' is escaped as "\u000a" and not as "\n"). @@ -878,6 +914,7 @@ private static String escape(String value) { builder.append(c); } } + return builder.toString(); } @@ -902,4 +939,4 @@ public String toString() { } } } -} \ No newline at end of file +} diff --git a/src/com/gmail/justbru00/epic/rename/multiversion/ServerVersion.java b/src/com/gmail/justbru00/epic/rename/multiversion/ServerVersion.java index 3aeb104..290107f 100644 --- a/src/com/gmail/justbru00/epic/rename/multiversion/ServerVersion.java +++ b/src/com/gmail/justbru00/epic/rename/multiversion/ServerVersion.java @@ -3,6 +3,7 @@ * * This is licensed under the MPL Version 2.0. See license info in LICENSE.txt */ + package com.gmail.justbru00.epic.rename.multiversion; import com.gmail.justbru00.epic.rename.utils.v3.Messager; @@ -20,26 +21,62 @@ public ServerVersion(int major, int minor, int patch) { } public boolean isAtLeast(int major, int minor, int patch) { - if (this.major > major) return true; - if (this.major < major) return false; - if (this.minor > minor) return true; - if (this.minor < minor) return false; + if (this.major > major) { + return true; + } + + if (this.major < major) { + return false; + } + + if (this.minor > minor) { + return true; + } + + if (this.minor < minor) { + return false; + } + return this.patch >= patch; } public boolean isLessThan(int major, int minor, int patch) { - if (this.major < major) return true; - if (this.major > major) return false; - if (this.minor < minor) return true; - if (this.minor > minor) return false; + if (this.major < major) { + return true; + } + + if (this.major > major) { + return false; + } + + if (this.minor < minor) { + return true; + } + + if (this.minor > minor) { + return false; + } + return this.patch < patch; } public boolean isLessThanOrEqualTo(int major, int minor, int patch) { - if (this.major < major) return true; - if (this.major > major) return false; - if (this.minor < minor) return true; - if (this.minor > minor) return false; + if (this.major < major) { + return true; + } + + if (this.major > major) { + return false; + } + + if (this.minor < minor) { + return true; + } + + if (this.minor > minor) { + return false; + } + return this.patch <= patch; } diff --git a/src/com/gmail/justbru00/epic/rename/tabcompleters/EpicRenameTabCompleter.java b/src/com/gmail/justbru00/epic/rename/tabcompleters/EpicRenameTabCompleter.java index 6a11b3b..e40b42a 100644 --- a/src/com/gmail/justbru00/epic/rename/tabcompleters/EpicRenameTabCompleter.java +++ b/src/com/gmail/justbru00/epic/rename/tabcompleters/EpicRenameTabCompleter.java @@ -8,9 +8,9 @@ import org.bukkit.command.TabCompleter; public class EpicRenameTabCompleter implements TabCompleter { - - private ArrayList epicrenameFirstArgumentList = new ArrayList(); - private ArrayList empty = new ArrayList(); + + private final ArrayList epicrenameFirstArgumentList = new ArrayList<>(); + private final ArrayList empty = new ArrayList<>(); public EpicRenameTabCompleter() { epicrenameFirstArgumentList.add("help"); @@ -19,31 +19,30 @@ public EpicRenameTabCompleter() { epicrenameFirstArgumentList.add("debug"); epicrenameFirstArgumentList.add("version"); } - + @Override public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { - + if (!command.getName().equalsIgnoreCase("epicrename")) { return null; } - + if (args.length == 1) { if (!args[0].equals("")) { - ArrayList completion = new ArrayList(); - + ArrayList completion = new ArrayList<>(); + for (String first : epicrenameFirstArgumentList) { if (first.toLowerCase().startsWith(args[0].toLowerCase())) { completion.add(first); } } - + return completion; } else { return epicrenameFirstArgumentList; } } - + return empty; } - } diff --git a/src/com/gmail/justbru00/epic/rename/tabcompleters/ExportTabCompleter.java b/src/com/gmail/justbru00/epic/rename/tabcompleters/ExportTabCompleter.java index d18af74..3c6103d 100644 --- a/src/com/gmail/justbru00/epic/rename/tabcompleters/ExportTabCompleter.java +++ b/src/com/gmail/justbru00/epic/rename/tabcompleters/ExportTabCompleter.java @@ -8,10 +8,10 @@ import org.bukkit.command.TabCompleter; public class ExportTabCompleter implements TabCompleter { - - private ArrayList exportFirstArgumentList = new ArrayList(); - private ArrayList empty = new ArrayList(); - + + private final ArrayList exportFirstArgumentList = new ArrayList<>(); + private final ArrayList empty = new ArrayList<>(); + public ExportTabCompleter() { exportFirstArgumentList.add("hand"); exportFirstArgumentList.add("inventory"); @@ -22,24 +22,23 @@ public List onTabComplete(CommandSender sender, Command command, String if (!command.getName().equalsIgnoreCase("export")) { return null; } - + if (args.length == 1) { if (!args[0].equals("")) { ArrayList completion = new ArrayList(); - + for (String first : exportFirstArgumentList) { if (first.toLowerCase().startsWith(args[0].toLowerCase())) { completion.add(first); } } - + return completion; } else { return exportFirstArgumentList; } } - + return empty; } - } diff --git a/src/com/gmail/justbru00/epic/rename/tabcompleters/GenericNoArgsTabCompleter.java b/src/com/gmail/justbru00/epic/rename/tabcompleters/GenericNoArgsTabCompleter.java index 4d86419..08eff76 100644 --- a/src/com/gmail/justbru00/epic/rename/tabcompleters/GenericNoArgsTabCompleter.java +++ b/src/com/gmail/justbru00/epic/rename/tabcompleters/GenericNoArgsTabCompleter.java @@ -8,21 +8,20 @@ import org.bukkit.command.TabCompleter; public class GenericNoArgsTabCompleter implements TabCompleter { - - private ArrayList empty = new ArrayList(); - private String commandName; - + + private final ArrayList empty = new ArrayList<>(); + private final String commandName; + public GenericNoArgsTabCompleter(String _commandName) { commandName = _commandName; } - + @Override public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { if (!command.getName().equalsIgnoreCase(commandName)) { return null; } - + return empty; } - } diff --git a/src/com/gmail/justbru00/epic/rename/tabcompleters/GenericOneArgTabCompleter.java b/src/com/gmail/justbru00/epic/rename/tabcompleters/GenericOneArgTabCompleter.java index a2070ad..8e05e7c 100644 --- a/src/com/gmail/justbru00/epic/rename/tabcompleters/GenericOneArgTabCompleter.java +++ b/src/com/gmail/justbru00/epic/rename/tabcompleters/GenericOneArgTabCompleter.java @@ -9,28 +9,27 @@ public class GenericOneArgTabCompleter implements TabCompleter { - private ArrayList empty = new ArrayList(); - private ArrayList firstArgument = new ArrayList(); - private String commandName; - + private final ArrayList empty = new ArrayList<>(); + private final ArrayList firstArgument = new ArrayList<>(); + private final String commandName; + public GenericOneArgTabCompleter(String _commandName, String _firstArgument) { firstArgument.add(_firstArgument); commandName = _commandName; } - + @Override public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { if (!command.getName().equalsIgnoreCase(commandName)) { return null; } - + if (args.length == 1) { if (args[0].equals("")) { return firstArgument; } } - + return empty; } - } diff --git a/src/com/gmail/justbru00/epic/rename/tabcompleters/GenericTwoArgTabCompleter.java b/src/com/gmail/justbru00/epic/rename/tabcompleters/GenericTwoArgTabCompleter.java index c1defe3..1764aa8 100644 --- a/src/com/gmail/justbru00/epic/rename/tabcompleters/GenericTwoArgTabCompleter.java +++ b/src/com/gmail/justbru00/epic/rename/tabcompleters/GenericTwoArgTabCompleter.java @@ -9,36 +9,35 @@ public class GenericTwoArgTabCompleter implements TabCompleter { - private ArrayList empty = new ArrayList(); - private ArrayList firstArgument = new ArrayList(); - private ArrayList secondArgument = new ArrayList(); - private String commandName; - + private final ArrayList empty = new ArrayList<>(); + private final ArrayList firstArgument = new ArrayList<>(); + private final ArrayList secondArgument = new ArrayList<>(); + private final String commandName; + public GenericTwoArgTabCompleter(String _commandName, String _firstArgument, String _secondArgument) { firstArgument.add(_firstArgument); secondArgument.add(_secondArgument); commandName = _commandName; } - + @Override public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { if (!command.getName().equalsIgnoreCase(commandName)) { return null; } - + if (args.length == 1) { if (args[0].equals("")) { return firstArgument; } } - + if (args.length == 2) { if (args[1].equals("")) { return secondArgument; } } - + return empty; } - } diff --git a/src/com/gmail/justbru00/epic/rename/tabcompleters/ImportTabCompleter.java b/src/com/gmail/justbru00/epic/rename/tabcompleters/ImportTabCompleter.java index 3b92d8f..4735229 100644 --- a/src/com/gmail/justbru00/epic/rename/tabcompleters/ImportTabCompleter.java +++ b/src/com/gmail/justbru00/epic/rename/tabcompleters/ImportTabCompleter.java @@ -8,19 +8,19 @@ import org.bukkit.command.TabCompleter; public class ImportTabCompleter implements TabCompleter { - - private ArrayList importFirstArgumentList = new ArrayList(); - private ArrayList importHandInventorySecondArgumentList = new ArrayList(); - private ArrayList importRawSecondArgumentList = new ArrayList(); - private ArrayList empty = new ArrayList(); - + + private final ArrayList importFirstArgumentList = new ArrayList<>(); + private final ArrayList importHandInventorySecondArgumentList = new ArrayList<>(); + private final ArrayList importRawSecondArgumentList = new ArrayList<>(); + private final ArrayList empty = new ArrayList<>(); + public ImportTabCompleter() { importFirstArgumentList.add("hand"); importFirstArgumentList.add("inventory"); importFirstArgumentList.add("raw"); - + importHandInventorySecondArgumentList.add(""); - + importRawSecondArgumentList.add(""); } @@ -28,60 +28,59 @@ public ImportTabCompleter() { public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { if (!command.getName().equalsIgnoreCase("import")) { return null; - } - - if (args.length == 1) { + } + + if (args.length == 1) { if (!args[0].equals("")) { - ArrayList completion = new ArrayList(); - + ArrayList completion = new ArrayList<>(); + for (String first : importFirstArgumentList) { if (first.toLowerCase().startsWith(args[0].toLowerCase())) { completion.add(first); } } - - return completion; + + return completion; } else { return importFirstArgumentList; } } else if (args.length == 2) { if (!args[1].equals("")) { - if (args[0].toLowerCase().equals("hand") || args[0].toLowerCase().equals("inventory")) { - ArrayList completion = new ArrayList(); - + if (args[0].equalsIgnoreCase("hand") || args[0].equalsIgnoreCase("inventory")) { + ArrayList completion = new ArrayList<>(); + for (String second : importHandInventorySecondArgumentList) { if (second.toLowerCase().startsWith(args[1].toLowerCase())) { completion.add(second); } } - - return completion; - } else if (args[0].toLowerCase().equals("raw")) { - ArrayList completion = new ArrayList(); - + + return completion; + } else if (args[0].equalsIgnoreCase("raw")) { + ArrayList completion = new ArrayList<>(); + for (String second : importRawSecondArgumentList) { if (second.toLowerCase().startsWith(args[1].toLowerCase())) { completion.add(second); } } - + return completion; } else { return empty; } } else { // No text in second argument yet - if (args[0].toLowerCase().equals("hand") || args[0].toLowerCase().equals("inventory")) { + if (args[0].equalsIgnoreCase("hand") || args[0].equalsIgnoreCase("inventory")) { return importHandInventorySecondArgumentList; - } else if (args[0].toLowerCase().equals("raw")) { + } else if (args[0].equalsIgnoreCase("raw")) { return importRawSecondArgumentList; } else { return empty; } } } - + return empty; } - } diff --git a/src/com/gmail/justbru00/epic/rename/test/ConfigUpdaterConverter.java b/src/com/gmail/justbru00/epic/rename/test/ConfigUpdaterConverter.java index 9628e8d..5f11a46 100644 --- a/src/com/gmail/justbru00/epic/rename/test/ConfigUpdaterConverter.java +++ b/src/com/gmail/justbru00/epic/rename/test/ConfigUpdaterConverter.java @@ -4,6 +4,7 @@ import org.bukkit.configuration.file.YamlConfiguration; public class ConfigUpdaterConverter { + public static void main(String[] args) throws InvalidConfigurationException { YamlConfiguration config = new YamlConfiguration(); config.loadFromString("rename:\r\n" + @@ -144,10 +145,9 @@ public static void main(String[] args) throws InvalidConfigurationException { " \r\n" + "exploit_prevention:\r\n" + " no_grindstone_with_glowing_items: '&cYou cannot use a grindstone on a glowing item. Please remove glow from the item first with /removeglow.' "); - + for (String key : config.getRoot().getKeys(true)) { System.out.println("updateMessagesYmlString(\"" + key + "\", \"" + config.getString(key) + "\");"); - //updateMessagesYmlString("rename.blacklisted_material_found", "&cSorry that material is blacklisted."); } } } diff --git a/src/com/gmail/justbru00/epic/rename/test/FormattingCodeCounterTest.java b/src/com/gmail/justbru00/epic/rename/test/FormattingCodeCounterTest.java index 5a3d9f6..d018b5a 100644 --- a/src/com/gmail/justbru00/epic/rename/test/FormattingCodeCounterTest.java +++ b/src/com/gmail/justbru00/epic/rename/test/FormattingCodeCounterTest.java @@ -5,12 +5,13 @@ public class FormattingCodeCounterTest { public static void main(String[] args) { - if (test()) { - System.out.println("TEST PASSED"); - } else { - System.out.println("TEST FAILED"); - } + if (test()) { + System.out.println("TEST PASSED"); + } else { + System.out.println("TEST FAILED"); + } } + /** * * @return True if test is successful @@ -18,11 +19,7 @@ public static void main(String[] args) { public static boolean test() { String test = "&b&lTesting the counter&. &k"; int codes = 3; - - if (codes == FormattingCodeCounter.getAmountOfColorCodes(test, '&')) { - return true; - } - - return false; + + return codes == FormattingCodeCounter.getAmountOfColorCodes(test, '&'); } } From 90f2a7a0ae88a1c58940d2b8e5fe0d4e492c28f5 Mon Sep 17 00:00:00 2001 From: R00tB33rMan Date: Tue, 28 Oct 2025 18:46:50 -0400 Subject: [PATCH 2/3] Even more spaces --- .idea/jarRepositories.xml | 5 + .../epic/rename/commands/v3/EpicRename.java | 2 +- .../epic/rename/commands/v3/Export.java | 2 +- .../epic/rename/commands/v3/Import.java | 4 +- .../rename/commands/v3/InsertLoreLine.java | 2 +- .../epic/rename/commands/v3/Lore.java | 2 +- .../epic/rename/commands/v3/RemoveLore.java | 2 +- .../rename/commands/v3/RemoveLoreLine.java | 2 +- .../epic/rename/commands/v3/RemoveName.java | 2 +- .../epic/rename/commands/v3/Rename.java | 2 +- .../epic/rename/commands/v3/SetLoreLine.java | 2 +- .../epic/rename/enums/v3/EcoMessage.java | 4 +- .../rename/enums/v3/EpicRenameCommands.java | 2 +- .../epic/rename/enums/v3/MCVersion.java | 2 +- .../epic/rename/enums/v3/XpMessage.java | 4 +- .../epic/rename/listeners/v3/OnJoin.java | 2 +- .../justbru00/epic/rename/main/v3/Main.java | 4 +- .../test/FormattingCodeCounterTest.java | 2 +- .../epic/rename/utils/v3/Blacklists.java | 87 ++++++------ .../epic/rename/utils/v3/CharLimit.java | 25 ++-- .../justbru00/epic/rename/utils/v3/Debug.java | 5 +- .../epic/rename/utils/v3/EconomyManager.java | 46 ++++--- .../rename/utils/v3/EpicRenameOnlineAPI.java | 90 ++++++------- .../utils/v3/FormattingCodeCounter.java | 65 ++++----- .../utils/v3/FormattingPermManager.java | 16 ++- .../epic/rename/utils/v3/GlowingUtil.java | 7 +- .../rename/utils/v3/ItemSerialization.java | 41 +++--- .../epic/rename/utils/v3/LoreUtil.java | 125 +++++++----------- .../rename/utils/v3/MaterialPermManager.java | 8 +- .../epic/rename/utils/v3/Messager.java | 89 ++++++------- .../epic/rename/utils/v3/PluginFile.java | 39 +++--- .../epic/rename/utils/v3/RenameUtil.java | 78 +++++------ .../rename/utils/v3/VariableReplacer.java | 20 +-- .../epic/rename/utils/v3/WorldChecker.java | 10 +- .../epic/rename/utils/v3/XpCostManager.java | 86 ++++++------ .../epic/rename/utils/v3/XpResponse.java | 5 +- 36 files changed, 400 insertions(+), 489 deletions(-) diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index b6f250d..3661596 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -16,6 +16,11 @@