From 4c0e4dbb3f1a4747c7ff7404dbe8b4383dc24335 Mon Sep 17 00:00:00 2001 From: HexedHero <6012891+HexedHero@users.noreply.github.com> Date: Tue, 22 Mar 2022 06:53:43 +0000 Subject: [PATCH] Cleanup --- .../mattstudios/citizenscmd/CitizensCMD.java | 56 ++-- .../me/mattstudios/citizenscmd/Settings.java | 18 +- .../citizenscmd/commands/AddCommand.java | 29 +- .../citizenscmd/commands/CooldownCommand.java | 13 +- .../citizenscmd/commands/EditCommand.java | 31 +- .../citizenscmd/commands/HelpCommand.java | 275 +++++++++--------- .../citizenscmd/commands/ListCommand.java | 81 +++--- .../commands/PermissionCommand.java | 17 +- .../citizenscmd/commands/PriceCommand.java | 13 +- .../citizenscmd/commands/ReloadCommand.java | 7 +- .../citizenscmd/commands/RemoveCommand.java | 19 +- .../citizenscmd/files/CooldownHandler.java | 53 ++-- .../citizenscmd/files/DataHandler.java | 131 +++++---- .../citizenscmd/files/LangHandler.java | 33 ++- .../listeners/NPCClickListener.java | 128 ++++---- .../citizenscmd/listeners/NPCListener.java | 11 +- .../citizenscmd/listeners/UpdateEvent.java | 31 +- .../permissions/PermissionsManager.java | 17 +- .../schedulers/ConfirmScheduler.java | 5 +- .../schedulers/CooldownScheduler.java | 3 +- .../schedulers/UpdateScheduler.java | 13 +- .../citizenscmd/updater/SpigotUpdater.java | 10 +- .../mattstudios/citizenscmd/utility/Util.java | 83 +++--- 23 files changed, 584 insertions(+), 493 deletions(-) diff --git a/src/main/java/me/mattstudios/citizenscmd/CitizensCMD.java b/src/main/java/me/mattstudios/citizenscmd/CitizensCMD.java index d780ac5..57c7fe7 100644 --- a/src/main/java/me/mattstudios/citizenscmd/CitizensCMD.java +++ b/src/main/java/me/mattstudios/citizenscmd/CitizensCMD.java @@ -18,6 +18,27 @@ package me.mattstudios.citizenscmd; +import static me.mattstudios.citizenscmd.utility.Util.HEADER; +import static me.mattstudios.citizenscmd.utility.Util.LEGACY; +import static me.mattstudios.citizenscmd.utility.Util.TAG; +import static me.mattstudios.citizenscmd.utility.Util.color; +import static me.mattstudios.citizenscmd.utility.Util.info; + +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import org.bstats.bukkit.Metrics; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.RegisteredServiceProvider; +import org.bukkit.plugin.java.JavaPlugin; + import ch.jalu.configme.SettingsManager; import ch.jalu.configme.SettingsManagerBuilder; import dev.triumphteam.cmd.bukkit.BukkitCommandManager; @@ -55,27 +76,6 @@ import net.kyori.adventure.text.format.Style; import net.kyori.adventure.text.format.TextDecoration; import net.milkbowl.vault.economy.Economy; -import org.bstats.bukkit.Metrics; -import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.RegisteredServiceProvider; -import org.bukkit.plugin.java.JavaPlugin; - -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import java.util.stream.Stream; - -import static me.mattstudios.citizenscmd.utility.Util.HEADER; -import static me.mattstudios.citizenscmd.utility.Util.LEGACY; -import static me.mattstudios.citizenscmd.utility.Util.TAG; -import static me.mattstudios.citizenscmd.utility.Util.color; -import static me.mattstudios.citizenscmd.utility.Util.info; - public final class CitizensCMD extends JavaPlugin { private LangHandler lang; @@ -122,7 +122,7 @@ public final class CitizensCMD extends JavaPlugin { commandManager = BukkitCommandManager.create(this); - Metrics metrics = new Metrics(this, 2652); + final Metrics metrics = new Metrics(this, 2652); Util.setUpMetrics(metrics, settings); console.sendMessage(TAG.append(LEGACY.deserialize("&3Citizens&cCMD &8&o" + getDescription().getVersion()))); @@ -169,7 +169,7 @@ public final class CitizensCMD extends JavaPlugin { } if (settings.getProperty(Settings.CHECK_UPDATES)) { - SpigotUpdater updater = new SpigotUpdater(this, 30224); + final SpigotUpdater updater = new SpigotUpdater(this, 30224); try { // If there's an update, tell the user that they can update if (updater.checkForUpdates()) { @@ -178,7 +178,7 @@ public final class CitizensCMD extends JavaPlugin { console.sendMessage(TAG.append(lang.getMessage(Messages.STARTUP_NEW_VERSION).style(Style.style(NamedTextColor.AQUA, TextDecoration.ITALIC)))); console.sendMessage(TAG.append(Component.text(updater.getResourceURL()).style(Style.style(NamedTextColor.AQUA, TextDecoration.ITALIC)))); } - } catch (Exception ignored) { + } catch (final Exception ignored) { } } @@ -252,20 +252,20 @@ public final class CitizensCMD extends JavaPlugin { new PriceCommand(this), new ReloadCommand(this), new RemoveCommand(this) - ).forEach(commandManager::registerCommand); + ).forEach(commandManager::registerCommand); } /** * Registers all the events to be used */ private void registerEvents() { - PluginManager pm = getServer().getPluginManager(); + final PluginManager pm = getServer().getPluginManager(); pm.registerEvents(new UpdateEvent(this), this); pm.registerEvents(new NPCClickListener(this), this); try { pm.registerEvents(new NPCListener(this), this); - } catch (Exception ex) { + } catch (final Exception ex) { info(color("&cCould not register clone event, please update your Citizens.")); } } @@ -279,7 +279,7 @@ public final class CitizensCMD extends JavaPlugin { if (getServer().getPluginManager().getPlugin("Vault") == null) { return false; } - RegisteredServiceProvider registeredServiceProvider = getServer().getServicesManager().getRegistration(Economy.class); + final RegisteredServiceProvider registeredServiceProvider = getServer().getServicesManager().getRegistration(Economy.class); if (registeredServiceProvider == null) { return false; } diff --git a/src/main/java/me/mattstudios/citizenscmd/Settings.java b/src/main/java/me/mattstudios/citizenscmd/Settings.java index 9dddbda..53946d8 100644 --- a/src/main/java/me/mattstudios/citizenscmd/Settings.java +++ b/src/main/java/me/mattstudios/citizenscmd/Settings.java @@ -12,35 +12,35 @@ public final class Settings implements SettingsHolder { @Comment({"", "Enables Checking for update."}) public static final Property CHECK_UPDATES = PropertyInitializer - .newProperty("check-updates", true); + .newProperty("check-updates", true); @Comment({"", "Available languages EN, PT, BG, RO, NO, CH"}) public static final Property LANG = PropertyInitializer - .newProperty("lang", "EN"); + .newProperty("lang", "EN"); @Comment({"", "Toggle this on to enable using Minimessage style for message commands.", "https://docs.adventure.kyori.net/minimessage/format.html"}) public static final Property MINIMESSAGE = PropertyInitializer - .newProperty("minimessage", false); + .newProperty("minimessage", false); @Comment({"", "Toggle this on to enable using Minimessage style for your language files.", "https://docs.adventure.kyori.net/minimessage/format.html"}) public static final Property MINIMESSAGE_LANG = PropertyInitializer - .newProperty("minimessage-lang", false); + .newProperty("minimessage-lang", false); @Comment({"", "The default npc cooldown in seconds"}) public static final Property DEFAULT_COOLDOWN = PropertyInitializer - .newProperty("default-cooldown", 0); + .newProperty("default-cooldown", 0); @Comment({"", "When using a NPC with price, true means that to confirm the use the player needs to seek or press shift"}) public static final Property SHIT_CONFIRM = PropertyInitializer - .newProperty("shift-confirm", true); + .newProperty("shift-confirm", true); @Comment({"", "Select cooldown display format, SHORT = 3m 3s | MEDIUM = 3 min 3 sec | FULL - 3 minutes 3 seconds"}) public static final Property TIME_DISPLAY = PropertyInitializer - .newProperty("cooldown-time-display", "MEDIUM"); + .newProperty("cooldown-time-display", "MEDIUM"); @Comment({"", "Disables citizens check on startup"}) public static final Property CITIZENS_CHECK = PropertyInitializer - .newProperty("citizens-check", true); + .newProperty("citizens-check", true); @Override public void registerComments(final CommentsConfiguration conf) { @@ -52,6 +52,6 @@ public final class Settings implements SettingsHolder { "GitHub: https://github.com/HexedHero/CitizensCMD", "Spigot: https://www.spigotmc.org/resources/30224/", "" - ); + ); } } diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/AddCommand.java b/src/main/java/me/mattstudios/citizenscmd/commands/AddCommand.java index 2e101d5..55056d7 100644 --- a/src/main/java/me/mattstudios/citizenscmd/commands/AddCommand.java +++ b/src/main/java/me/mattstudios/citizenscmd/commands/AddCommand.java @@ -1,5 +1,14 @@ package me.mattstudios.citizenscmd.commands; +import static me.mattstudios.citizenscmd.utility.Util.HEADER; +import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId; +import static me.mattstudios.citizenscmd.utility.Util.sendNotSelectedMessage; + +import java.util.Optional; +import java.util.OptionalInt; + +import org.bukkit.command.CommandSender; + import dev.triumphteam.cmd.bukkit.annotation.Permission; import dev.triumphteam.cmd.core.annotation.CommandFlags; import dev.triumphteam.cmd.core.annotation.Flag; @@ -9,14 +18,6 @@ import dev.triumphteam.cmd.core.flag.Flags; import me.mattstudios.citizenscmd.CitizensCMD; import me.mattstudios.citizenscmd.utility.Messages; import net.kyori.adventure.audience.Audience; -import org.bukkit.command.CommandSender; - -import java.util.Optional; -import java.util.OptionalInt; - -import static me.mattstudios.citizenscmd.utility.Util.HEADER; -import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId; -import static me.mattstudios.citizenscmd.utility.Util.sendNotSelectedMessage; public class AddCommand extends Npcmd { @@ -29,15 +30,15 @@ public class AddCommand extends Npcmd { @SubCommand("add") @Permission("citizenscmd.add") @CommandFlags({ - @Flag(flag = "n"), - @Flag(flag = "l"), - @Flag(flag = "d", argument = double.class) + @Flag(flag = "n"), + @Flag(flag = "l"), + @Flag(flag = "d", argument = double.class) }) public void addCommand( final CommandSender sender, @Suggestion("permissions") final String permission, final Flags flags - ) { + ) { final OptionalInt selectedNpc = getSelectedNpcId(sender); final Audience audience = plugin.getAudiences().sender(sender); @@ -69,8 +70,8 @@ public class AddCommand extends Npcmd { final String finalString = (flags.hasFlag("n") ? "{display} " + command : command).trim(); plugin - .getDataHandler() - .addCommand(selectedNpc.getAsInt(), permissionBuilder.toString(), finalString, audience, flags.hasFlag("l")); + .getDataHandler() + .addCommand(selectedNpc.getAsInt(), permissionBuilder.toString(), finalString, audience, flags.hasFlag("l")); } } diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/CooldownCommand.java b/src/main/java/me/mattstudios/citizenscmd/commands/CooldownCommand.java index fbb914e..141c2f2 100644 --- a/src/main/java/me/mattstudios/citizenscmd/commands/CooldownCommand.java +++ b/src/main/java/me/mattstudios/citizenscmd/commands/CooldownCommand.java @@ -1,16 +1,17 @@ package me.mattstudios.citizenscmd.commands; +import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId; +import static me.mattstudios.citizenscmd.utility.Util.sendNotSelectedMessage; + +import java.util.OptionalInt; + +import org.bukkit.command.CommandSender; + import dev.triumphteam.cmd.bukkit.annotation.Permission; import dev.triumphteam.cmd.core.annotation.SubCommand; import dev.triumphteam.cmd.core.annotation.Suggestion; import me.mattstudios.citizenscmd.CitizensCMD; import net.kyori.adventure.audience.Audience; -import org.bukkit.command.CommandSender; - -import java.util.OptionalInt; - -import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId; -import static me.mattstudios.citizenscmd.utility.Util.sendNotSelectedMessage; public class CooldownCommand extends Npcmd { diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/EditCommand.java b/src/main/java/me/mattstudios/citizenscmd/commands/EditCommand.java index 32481f1..57ebfa6 100644 --- a/src/main/java/me/mattstudios/citizenscmd/commands/EditCommand.java +++ b/src/main/java/me/mattstudios/citizenscmd/commands/EditCommand.java @@ -1,5 +1,14 @@ package me.mattstudios.citizenscmd.commands; +import static me.mattstudios.citizenscmd.utility.Util.HEADER; +import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId; +import static me.mattstudios.citizenscmd.utility.Util.sendNotSelectedMessage; + +import java.util.List; +import java.util.OptionalInt; + +import org.bukkit.command.CommandSender; + import dev.triumphteam.cmd.bukkit.annotation.Permission; import dev.triumphteam.cmd.core.annotation.SubCommand; import dev.triumphteam.cmd.core.annotation.Suggestion; @@ -7,14 +16,6 @@ import me.mattstudios.citizenscmd.CitizensCMD; import me.mattstudios.citizenscmd.utility.EnumTypes; import me.mattstudios.citizenscmd.utility.Messages; import net.kyori.adventure.audience.Audience; -import org.bukkit.command.CommandSender; - -import java.util.List; -import java.util.OptionalInt; - -import static me.mattstudios.citizenscmd.utility.Util.HEADER; -import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId; -import static me.mattstudios.citizenscmd.utility.Util.sendNotSelectedMessage; public class EditCommand extends Npcmd { @@ -32,7 +33,7 @@ public class EditCommand extends Npcmd { @Suggestion("click") final String clickString, final int id, final List arguments - ) { + ) { final OptionalInt selectedNpc = getSelectedNpcId(sender); final Audience audience = plugin.getAudiences().sender(sender); @@ -68,10 +69,10 @@ public class EditCommand extends Npcmd { switch (clickString.toLowerCase()) { case "left": - int leftCommandSize = plugin.getDataHandler().getClickCommandsData( + final int leftCommandSize = plugin.getDataHandler().getClickCommandsData( selectedNpc.getAsInt(), EnumTypes.ClickType.LEFT - ).size(); + ).size(); if (leftCommandSize == 0) { audience.sendMessage(HEADER); @@ -89,10 +90,10 @@ public class EditCommand extends Npcmd { break; case "right": - int rightCommandSize = plugin.getDataHandler().getClickCommandsData( + final int rightCommandSize = plugin.getDataHandler().getClickCommandsData( selectedNpc.getAsInt(), EnumTypes.ClickType.RIGHT - ).size(); + ).size(); if (rightCommandSize == 0) { audience.sendMessage(HEADER); @@ -115,7 +116,9 @@ public class EditCommand extends Npcmd { } String finalString = String.join(" ", arguments).trim(); - if (finalString.startsWith("/")) finalString = finalString.substring(1); + if (finalString.startsWith("/")) { + finalString = finalString.substring(1); + } plugin.getDataHandler().edit(selectedNpc.getAsInt(), id, click, type, finalString, audience); } diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/HelpCommand.java b/src/main/java/me/mattstudios/citizenscmd/commands/HelpCommand.java index 8b898f8..aa06bcb 100644 --- a/src/main/java/me/mattstudios/citizenscmd/commands/HelpCommand.java +++ b/src/main/java/me/mattstudios/citizenscmd/commands/HelpCommand.java @@ -1,5 +1,13 @@ package me.mattstudios.citizenscmd.commands; +import static me.mattstudios.citizenscmd.utility.Util.HEADER; +import static me.mattstudios.citizenscmd.utility.Util.LEGACY; +import static net.kyori.adventure.text.Component.newline; +import static net.kyori.adventure.text.Component.space; +import static net.kyori.adventure.text.Component.text; + +import org.bukkit.entity.Player; + import dev.triumphteam.cmd.bukkit.annotation.Permission; import dev.triumphteam.cmd.core.annotation.Default; import me.mattstudios.citizenscmd.CitizensCMD; @@ -13,13 +21,6 @@ import net.kyori.adventure.text.event.HoverEvent; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.Style; import net.kyori.adventure.text.format.TextDecoration; -import org.bukkit.entity.Player; - -import static me.mattstudios.citizenscmd.utility.Util.HEADER; -import static me.mattstudios.citizenscmd.utility.Util.LEGACY; -import static net.kyori.adventure.text.Component.newline; -import static net.kyori.adventure.text.Component.space; -import static net.kyori.adventure.text.Component.text; public class HelpCommand extends Npcmd { @@ -39,139 +40,139 @@ public class HelpCommand extends Npcmd { final TextComponent.Builder builder = Component.text(); builder - .append(HEADER) - .append(newline()) - .append(plugin.getLang().getMessage(Messages.HELP_VERSION)) - .append(space()) - .append(text(plugin.getDescription().getVersion()).style(Style.style(NamedTextColor.RED, TextDecoration.ITALIC))) - .append(newline()) - .append(plugin.getLang().getMessage(Messages.HELP_INFO)) - .append(newline()) - .append( - Component.text() - .append(LEGACY.deserialize("&3/npcmd &cadd &b &6 &d[-l]")) - .clickEvent(ClickEvent.suggestCommand("/npcmd add ")) - .hoverEvent( - HoverEvent.showText( - Component.text() - .append(plugin.getLang().getMessage(Messages.HELP_DESCRIPTION_ADD)) - .append(newline()) - .append(plugin.getLang().getMessage(Messages.HELP_EXAMPLE)) - .append(newline()) - .append(LEGACY.deserialize("&3&o/npcmd &c&oadd &b&ossentials.heal &6&oheal")) - .build() - ) - ) - ) - .append(newline()) - .append( - Component.text() - .append(LEGACY.deserialize("&3/npcmd &ccooldown &6