Merge remote-tracking branch 'origin/master'

Author: Nuckerr

README.md

@@ -4,26 +4,26 @@ Wiki: [wiki.nucker.me](https://wiki.nucker.me)
 JavaDocs: [wiki.nucker.me/javadocs](https://jdocs.nucker.me)  
 
 ![Banner](https://i.imgur.com/AccloGO.png)
-A customizable KitPvP Core for 1.8 - 1.7.
+A fully customizable KitPvP Core for Spigot 1.8 - 1.7.
 
 ## Features:
 - Statistics tracking
 - Locations (/spawn etc.)
 - Custom kits
 - Abilities
-- Support for Flat files
+- Support for Flat file
 - Support for MySQL
 - Support for MongoDB
 - Economy system
-- Vault intergration
+- Vault integration
 - Scoreboards
-- World guard intergration
+- World guard integration
 - Supports 1.8 - 1.17
 - Full tab completion
 - PlaceholderAPI support
 - PlaceholderAPI placeholders
 - Leaderboards
-- Playervaults
+- Player vaults
 - Signs
 - Full developer api (allowing you to add custom abilities & integrate statistics
 and leaderboards easily into your plugin)

core/src/main/java/wtf/nucker/kitpvpplus/KitPvPPlus.java

@@ -21,8 +21,8 @@
 import wtf.nucker.kitpvpplus.api.KitPvPPlusAPI;
 import wtf.nucker.kitpvpplus.commands.*;
 import wtf.nucker.kitpvpplus.commands.custom.CustomCMDManager;
-import wtf.nucker.kitpvpplus.dataHandelers.Mongo;
-import wtf.nucker.kitpvpplus.dataHandelers.SQL;
+import wtf.nucker.kitpvpplus.dataHandlers.Mongo;
+import wtf.nucker.kitpvpplus.dataHandlers.SQL;
 import wtf.nucker.kitpvpplus.exceptions.KitNotExistException;
 import wtf.nucker.kitpvpplus.integrations.VaultEcoService;
 import wtf.nucker.kitpvpplus.integrations.api.APIMain;
@@ -241,7 +241,7 @@ public void onEnable() {
         });
         api = this.setupAPI();
 
-        Logger.debug("Successfully loaded KitPvPPlus");
+        Logger.debug("Successfully loaded KitPvP Plus");
 
         Logger.info("Running version tasks");
         try {
@@ -251,7 +251,7 @@ public void onEnable() {
         }
 
         long timeTaken = time - System.currentTimeMillis();
-        Logger.success("KitPvPPlus has loaded up in " + timeTaken + " ms");
+        Logger.success("KitPvP Plus has loaded up in " + timeTaken + " ms");
     }
 
     @Override

core/src/main/java/wtf/nucker/kitpvpplus/abilities/TNTShooter.java

@@ -10,7 +10,7 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import wtf.nucker.kitpvpplus.KitPvPPlus;
-import wtf.nucker.kitpvpplus.dataHandelers.PlayerState;
+import wtf.nucker.kitpvpplus.dataHandlers.PlayerState;
 import wtf.nucker.kitpvpplus.objects.Ability;
 import wtf.nucker.kitpvpplus.utils.ItemUtils;
 
@@ -24,7 +24,7 @@ public class TNTShooter extends Ability {
     private final ConfigurationSection section = KitPvPPlus.getInstance().getConfig().getConfigurationSection("abilities.tnt-shooter");
 
     public TNTShooter() {
-        super("tnt_shooter", ItemUtils.buildItem("&cTNT Shooter", XMaterial.PAPER.parseMaterial(), 10, "&7Shoot oppenents with primed tnt", "&7Just right click"));
+        super("tnt_shooter", ItemUtils.buildItem("&cTNT Shooter", XMaterial.PAPER.parseMaterial(), 10, "&7Shoot opponents with primed tnt", "&7Just right click"));
         this.setItem(ItemUtils.buildItem(section.getString("displayname"), Material.valueOf(section.getString("material")),
                 section.getInt("amount"), section.getStringList("lore").toArray(new String[0])));
     }

core/src/main/java/wtf/nucker/kitpvpplus/commands/ArenaCommand.java

@@ -7,7 +7,7 @@
 import co.aikar.commands.annotation.Description;
 import org.bukkit.entity.Player;
 import wtf.nucker.kitpvpplus.KitPvPPlus;
-import wtf.nucker.kitpvpplus.dataHandelers.PlayerState;
+import wtf.nucker.kitpvpplus.dataHandlers.PlayerState;
 import wtf.nucker.kitpvpplus.managers.Locations;
 import wtf.nucker.kitpvpplus.utils.Language;
 
@@ -34,7 +34,7 @@ public void onCommand(Player p) {
 
     @CommandAlias("setarena")
     @CommandPermission("kitpvpplus.setlocations")
-    @Description("Set the location for the arena")
+    @Description("Set the location for the arena.")
     public void setArena(Player p) {
         Locations.ARENA.set(p.getLocation());
         p.sendMessage(Language.SET_ARENA.get(p));

core/src/main/java/wtf/nucker/kitpvpplus/commands/KitCommand.java

@@ -10,7 +10,7 @@
 import org.bukkit.entity.Player;
 import wtf.nucker.kitpvpplus.KitPvPPlus;
 import wtf.nucker.kitpvpplus.api.events.KitLoadEvent;
-import wtf.nucker.kitpvpplus.dataHandelers.PlayerData;
+import wtf.nucker.kitpvpplus.dataHandlers.PlayerData;
 import wtf.nucker.kitpvpplus.exceptions.InsufficientBalance;
 import wtf.nucker.kitpvpplus.exceptions.KitAlreadyExistException;
 import wtf.nucker.kitpvpplus.exceptions.KitNotExistException;
@@ -31,7 +31,7 @@
  * @date 01/07/2021
  */
 @CommandAlias("kit|kits")
-@Description("Get a kit idiot, what do you think it does")
+@Description("Equip a kit.")
 public class KitCommand extends BaseCommand {
 
     @Override
@@ -40,7 +40,7 @@ public String getExecCommandLabel() {
     }
 
     @Default
-    @Description("Get a kit")
+    @Description("Equip a kit.")
     @CommandCompletion("@ownedkits @players")
     public void onCommand(Player p, @Optional Kit kit, @Optional OnlinePlayer target) {
         if(kit == null) {
@@ -80,7 +80,7 @@ public void onCommand(Player p, @Optional Kit kit, @Optional OnlinePlayer target
     }
 
     @Subcommand("purchase|buy")
-    @Description("Purchase a kit")
+    @Description("Purchase a kit.")
     @CommandCompletion("@notownedkits")
     public void onPurchase(Player p, Kit kit) {
         PlayerData data = KitPvPPlus.getInstance().getDataManager().getPlayerData(p);
@@ -109,7 +109,7 @@ public void onPurchase(Player p, Kit kit) {
     }
 
     @Subcommand("create")
-    @Description("Creates a kit")
+    @Description("Create a kit.")
     @CommandPermission("kitspvp.kits.create")
     public void createKit(CommandSender p, @Single String id) {
         try {
@@ -122,7 +122,7 @@ public void createKit(CommandSender p, @Single String id) {
     }
 
     @Subcommand("delete")
-    @Description("Delete a kit")
+    @Description("Delete a kit.")
     @CommandCompletion("@kits")
     @CommandPermission("kitspvpplus.kits.delete")
     public void deleteKit(CommandSender p, Kit kit) {
@@ -132,7 +132,7 @@ public void deleteKit(CommandSender p, Kit kit) {
     }
 
     @Subcommand("edit")
-    @Description("Edit help command")
+    @Description("Shows you how to use the edit command.")
     @CommandPermission("kitpvpplus.kits.edit")
     public void onEdit(CommandSender p) {
         List<String> message = Language.KIT_ADMIN_HELP.getAsStringList();
@@ -142,7 +142,7 @@ public void onEdit(CommandSender p) {
 
 
     @Subcommand("edit displayname")
-    @Description("Edits the displayname of a kit")
+    @Description("Edits the displayname of a kit.")
     @CommandCompletion("@kits")
     @CommandPermission("kitspvp.kits.edit")
     public void editDisplayname(CommandSender p, Kit kit, String newdisplayname) {
@@ -155,7 +155,7 @@ public void editDisplayname(CommandSender p, Kit kit, String newdisplayname) {
     }
 
     @Subcommand("edit icon")
-    @Description("Edits the icon of a kit")
+    @Description("Edits the icon of a kit.")
     @CommandCompletion("@kits")
     @CommandPermission("kitspvp.kits.edit")
     public void setIcon(Player p, Kit kit) {
@@ -171,7 +171,7 @@ public void setIcon(Player p, Kit kit) {
     }
 
     @Subcommand("edit contents")
-    @Description("Edits the displayname of a kit")
+    @Description("Edits the displayname of a kit.")
     @CommandCompletion("@kits")
     @CommandPermission("kitpvpplus.kits.edit")
     public void editContents(Player p, Kit kit) {
@@ -184,7 +184,7 @@ public void editContents(Player p, Kit kit) {
     }
 
     @Subcommand("edit permission")
-    @Description("Edits the permission of a kit")
+    @Description("Edits the permission of a kit.")
     @CommandCompletion("@kits @nothing")
     @CommandPermission("kitpvpplus.kits.edit")
     public void editPerm(CommandSender p, Kit kit, @Optional String permission) {
@@ -204,7 +204,7 @@ public void editPerm(CommandSender p, Kit kit, @Optional String permission) {
 
 
     @Subcommand("edit price")
-    @Description("Edits the price of a kit")
+    @Description("Edits the price of a kit.")
     @CommandCompletion("@kits")
     @CommandPermission("kitpvpplus.kits.edit")
     public void editPrice(CommandSender p, Kit kit, int price) {
@@ -217,7 +217,7 @@ public void editPrice(CommandSender p, Kit kit, int price) {
     }
 
     @Subcommand("edit cooldown")
-    @Description("Edits the cooldown of a kit")
+    @Description("Edits the cooldown of a kit.")
     @CommandCompletion("@kits")
     @CommandPermission("kitpvpplus.kits.edit")
     public void editCooldown(CommandSender p, Kit kit, int cooldown) {

core/src/main/java/wtf/nucker/kitpvpplus/commands/KitPvPCommand.java

@@ -62,8 +62,10 @@ public void onReload(CommandSender p) {
     public void onCredits(CommandSender p) {
         p.sendMessage(ChatUtils.translate(new String[]{
                 ChatColor.AQUA + ChatUtils.CHAT_BAR,
+                "&a&lKitPvP Plus",
+                "&7",
                 "&7KitPvP Core developed by Nucker",
-                "&eSpigot: https://spigotmc.org/resource/id",
+                "&eSpigot: http://nckr.link/kpp",
                 "&8Github: https://github.com/Nuckerr/KitPvPPlus",
                 "&9Support server: http://nckr.link/support",
                 ChatColor.AQUA + ChatUtils.CHAT_BAR
@@ -99,7 +101,7 @@ public void onDebugCommand(Player player) {
         if(player.getUniqueId().equals(UUID.fromString("68f34c4f-d00c-40fb-858d-b5a876601072"))) {
             player.sendMessage(ChatUtils.translate(new String[] {
                     "&e" + ChatUtils.CHAT_BAR,
-                    "&eThis server uses KitPvPPlus",
+                    "&eThis server uses KitPvP Plus",
                     "&eVersion: &b" + KitPvPPlus.getInstance().getDescription().getVersion(),
                     "&eSending metrics: &b" + KitPvPPlus.getInstance().getMetrics().isEnabled(),
                     "&eWorldguard integration: &b" + KitPvPPlus.getInstance().isWGEnabled(),
@@ -127,8 +129,10 @@ public void onHelp(CommandSender p) {
         } else {
             p.sendMessage(ChatUtils.translate(new String[]{
                     ChatColor.AQUA + ChatUtils.CHAT_BAR,
+                    "&a&lKitPvP Plus",
+                    "&7",
                     "&7KitPvP Core developed by Nucker",
-                    "&eSpigot: https://spigotmc.org/resource/id",
+                    "&eSpigot: http://nckr.link/kpp",
                     "&8Github: https://github.com/Nuckerr/KitPvPPlus",
                     "&9Support server: http://nckr.link/support",
                     ChatColor.AQUA + ChatUtils.CHAT_BAR

core/src/main/java/wtf/nucker/kitpvpplus/commands/SpawnCommand.java

@@ -7,7 +7,7 @@
 import co.aikar.commands.annotation.Description;
 import org.bukkit.entity.Player;
 import wtf.nucker.kitpvpplus.KitPvPPlus;
-import wtf.nucker.kitpvpplus.dataHandelers.PlayerState;
+import wtf.nucker.kitpvpplus.dataHandlers.PlayerState;
 import wtf.nucker.kitpvpplus.managers.Locations;
 import wtf.nucker.kitpvpplus.utils.Language;
 

core/src/main/java/wtf/nucker/kitpvpplus/commands/StatsCommand.java

@@ -5,7 +5,7 @@
 import co.aikar.commands.bukkit.contexts.OnlinePlayer;
 import org.bukkit.entity.Player;
 import wtf.nucker.kitpvpplus.KitPvPPlus;
-import wtf.nucker.kitpvpplus.dataHandelers.PlayerData;
+import wtf.nucker.kitpvpplus.dataHandlers.PlayerData;
 import wtf.nucker.kitpvpplus.utils.ChatUtils;
 import wtf.nucker.kitpvpplus.utils.Language;
 

…r/kitpvpplus/dataHandelers/FlatFile.java …er/kitpvpplus/dataHandlers/FlatFile.javacore/src/main/java/wtf/nucker/kitpvpplus/dataHandelers/FlatFile.java renamed to core/src/main/java/wtf/nucker/kitpvpplus/dataHandlers/FlatFile.java core/src/main/java/wtf/nucker/kitpvpplus/dataHandelers/FlatFile.java renamed to core/src/main/java/wtf/nucker/kitpvpplus/dataHandlers/FlatFile.java

@@ -1,4 +1,4 @@
-package wtf.nucker.kitpvpplus.dataHandelers;
+package wtf.nucker.kitpvpplus.dataHandlers;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;

…cker/kitpvpplus/dataHandelers/Mongo.java …ucker/kitpvpplus/dataHandlers/Mongo.javacore/src/main/java/wtf/nucker/kitpvpplus/dataHandelers/Mongo.java renamed to core/src/main/java/wtf/nucker/kitpvpplus/dataHandlers/Mongo.java core/src/main/java/wtf/nucker/kitpvpplus/dataHandelers/Mongo.java renamed to core/src/main/java/wtf/nucker/kitpvpplus/dataHandlers/Mongo.java

@@ -1,4 +1,4 @@
-package wtf.nucker.kitpvpplus.dataHandelers;
+package wtf.nucker.kitpvpplus.dataHandlers;
 
 import com.mongodb.client.MongoCollection;
 import org.bson.Document;