diff --git a/src/main/java/com/huskehhh/mysql/Database.java b/src/main/java/com/huskehhh/mysql/Database.java index bc33e049..6b720d84 100644 --- a/src/main/java/com/huskehhh/mysql/Database.java +++ b/src/main/java/com/huskehhh/mysql/Database.java @@ -1,12 +1,12 @@ package com.huskehhh.mysql; -import me.A5H73Y.Parkour.Utilities.Utils; - import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import me.A5H73Y.Parkour.Utilities.Utils; + /** * Abstract Database class. * Serves as a base for any connection method (MySQL, SQLite, etc.). diff --git a/src/main/java/com/huskehhh/mysql/mysql/MySQL.java b/src/main/java/com/huskehhh/mysql/mysql/MySQL.java index 6f54f7af..6d655d17 100644 --- a/src/main/java/com/huskehhh/mysql/mysql/MySQL.java +++ b/src/main/java/com/huskehhh/mysql/mysql/MySQL.java @@ -1,11 +1,11 @@ package com.huskehhh.mysql.mysql; -import com.huskehhh.mysql.Database; - import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; +import com.huskehhh.mysql.Database; + /** * Connects to and uses a MySQL database. * @@ -35,7 +35,7 @@ public class MySQL extends Database { * Password */ public MySQL(final String hostname, final String port, final String database, - final String username, final String password) { + final String username, final String password) { this.hostname = hostname; this.port = port; this.database = database; diff --git a/src/main/java/com/huskehhh/mysql/sqlite/SQLite.java b/src/main/java/com/huskehhh/mysql/sqlite/SQLite.java index eda6d23a..1e92a5e0 100644 --- a/src/main/java/com/huskehhh/mysql/sqlite/SQLite.java +++ b/src/main/java/com/huskehhh/mysql/sqlite/SQLite.java @@ -1,15 +1,15 @@ package com.huskehhh.mysql.sqlite; -import com.huskehhh.mysql.Database; -import me.A5H73Y.Parkour.Parkour; -import me.A5H73Y.Parkour.Utilities.Utils; - import java.io.File; import java.io.IOException; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; +import com.huskehhh.mysql.Database; +import me.A5H73Y.Parkour.Parkour; +import me.A5H73Y.Parkour.Utilities.Utils; + /** * Connects to and uses a SQLite database. * diff --git a/src/main/java/me/A5H73Y/Parkour/Commands/ParkourAutoTabCompleter.java b/src/main/java/me/A5H73Y/Parkour/Commands/ParkourAutoTabCompleter.java index cf533503..01993a8a 100644 --- a/src/main/java/me/A5H73Y/Parkour/Commands/ParkourAutoTabCompleter.java +++ b/src/main/java/me/A5H73Y/Parkour/Commands/ParkourAutoTabCompleter.java @@ -1,5 +1,11 @@ package me.A5H73Y.Parkour.Commands; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import me.A5H73Y.Parkour.Course.CourseInfo; import me.A5H73Y.Parkour.Other.Validation; import me.A5H73Y.Parkour.ParkourKit.ParkourKitInfo; @@ -10,12 +16,6 @@ import org.bukkit.command.TabCompleter; import org.bukkit.entity.Player; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - public class ParkourAutoTabCompleter implements TabCompleter { private static final Set BASIC_CMDS = new HashSet<>( diff --git a/src/main/java/me/A5H73Y/Parkour/Conversation/other/AddKitItemConversation.java b/src/main/java/me/A5H73Y/Parkour/Conversation/other/AddKitItemConversation.java index 4c4b3aa6..c35931ec 100644 --- a/src/main/java/me/A5H73Y/Parkour/Conversation/other/AddKitItemConversation.java +++ b/src/main/java/me/A5H73Y/Parkour/Conversation/other/AddKitItemConversation.java @@ -1,5 +1,8 @@ package me.A5H73Y.Parkour.Conversation.other; +import java.util.HashMap; +import java.util.Map; + import me.A5H73Y.Parkour.Conversation.ParkourConversation; import me.A5H73Y.Parkour.Parkour; import me.A5H73Y.Parkour.ParkourKit.ParkourKit; @@ -15,9 +18,6 @@ import org.bukkit.conversations.Prompt; import org.bukkit.conversations.StringPrompt; -import java.util.HashMap; -import java.util.Map; - public class AddKitItemConversation { private final String[] actionTypes = {"death", "finish", "climb", "launch", "bounce", "speed", "repulse", "norun", "nopotion"}; diff --git a/src/main/java/me/A5H73Y/Parkour/Course/Checkpoint.java b/src/main/java/me/A5H73Y/Parkour/Course/Checkpoint.java index 4c20528d..fb906640 100644 --- a/src/main/java/me/A5H73Y/Parkour/Course/Checkpoint.java +++ b/src/main/java/me/A5H73Y/Parkour/Course/Checkpoint.java @@ -1,10 +1,10 @@ package me.A5H73Y.Parkour.Course; +import java.io.Serializable; + import org.bukkit.Bukkit; import org.bukkit.Location; -import java.io.Serializable; - public class Checkpoint implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/me/A5H73Y/Parkour/Course/Course.java b/src/main/java/me/A5H73Y/Parkour/Course/Course.java index 42e0364f..c367e0ab 100644 --- a/src/main/java/me/A5H73Y/Parkour/Course/Course.java +++ b/src/main/java/me/A5H73Y/Parkour/Course/Course.java @@ -1,10 +1,10 @@ package me.A5H73Y.Parkour.Course; +import java.io.Serializable; + import me.A5H73Y.Parkour.Other.Constants; import me.A5H73Y.Parkour.ParkourKit.ParkourKit; -import java.io.Serializable; - public class Course implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/me/A5H73Y/Parkour/Course/CourseInfo.java b/src/main/java/me/A5H73Y/Parkour/Course/CourseInfo.java index 368aea19..46cc1ad2 100644 --- a/src/main/java/me/A5H73Y/Parkour/Course/CourseInfo.java +++ b/src/main/java/me/A5H73Y/Parkour/Course/CourseInfo.java @@ -1,5 +1,8 @@ package me.A5H73Y.Parkour.Course; +import java.util.List; +import java.util.Set; + import me.A5H73Y.Parkour.Other.Constants; import me.A5H73Y.Parkour.Parkour; import me.A5H73Y.Parkour.Utilities.DatabaseMethods; @@ -11,9 +14,6 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; -import java.util.List; -import java.util.Set; - public class CourseInfo { /** @@ -499,12 +499,12 @@ public static void deleteCourse(String courseName) { Set playerNames = playersSection.getKeys(false); for (String playerName : playerNames) { - String completedPath = "PlayerInfo." + playerName + ".Completed"; + String completedPath = "PlayerInfo." + playerName + ".Completed"; List completedCourses = userConfig.getStringList(completedPath); if (completedCourses.contains(completedPath)) { - completedCourses.remove(courseName); - userConfig.set(completedPath, completedCourses); + completedCourses.remove(courseName); + userConfig.set(completedPath, completedCourses); } } } @@ -625,10 +625,10 @@ public static void displayCourseInfo(String courseName, Player player) { } if (hasRewardDelay(courseName) && Parkour.getSettings().isDisplayPrizeCooldown()) { - player.sendMessage("Reward Cooldown (days): " + aqua + getRewardDelay(courseName)); - if (!Utils.hasPrizeCooldownDurationPassed(player, courseName, false)) { - player.sendMessage("Cooldown Remaining: " + aqua + Utils.getTimeRemaining(player, courseName)); - } + player.sendMessage("Reward Cooldown (days): " + aqua + getRewardDelay(courseName)); + if (!Utils.hasPrizeCooldownDurationPassed(player, courseName, false)) { + player.sendMessage("Cooldown Remaining: " + aqua + Utils.getTimeRemaining(player, courseName)); + } } } } diff --git a/src/main/java/me/A5H73Y/Parkour/Course/CourseMethods.java b/src/main/java/me/A5H73Y/Parkour/Course/CourseMethods.java index 08ad9505..20c260ad 100644 --- a/src/main/java/me/A5H73Y/Parkour/Course/CourseMethods.java +++ b/src/main/java/me/A5H73Y/Parkour/Course/CourseMethods.java @@ -1,5 +1,11 @@ package me.A5H73Y.Parkour.Course; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import me.A5H73Y.Parkour.Conversation.CoursePrizeConversation; import me.A5H73Y.Parkour.Conversation.LeaderboardConversation; import me.A5H73Y.Parkour.Conversation.ParkourModeConversation; @@ -25,12 +31,6 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - public class CourseMethods { /** diff --git a/src/main/java/me/A5H73Y/Parkour/Course/LobbyMethods.java b/src/main/java/me/A5H73Y/Parkour/Course/LobbyMethods.java index 5be91f77..082d93fb 100644 --- a/src/main/java/me/A5H73Y/Parkour/Course/LobbyMethods.java +++ b/src/main/java/me/A5H73Y/Parkour/Course/LobbyMethods.java @@ -1,5 +1,7 @@ package me.A5H73Y.Parkour.Course; +import java.util.Set; + import me.A5H73Y.Parkour.Other.Validation; import me.A5H73Y.Parkour.Parkour; import me.A5H73Y.Parkour.Player.ParkourSession; @@ -13,8 +15,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import java.util.Set; - public class LobbyMethods { /** diff --git a/src/main/java/me/A5H73Y/Parkour/GUI/InventoryBuilder.java b/src/main/java/me/A5H73Y/Parkour/GUI/InventoryBuilder.java index 6dc596ea..8cc436c8 100644 --- a/src/main/java/me/A5H73Y/Parkour/GUI/InventoryBuilder.java +++ b/src/main/java/me/A5H73Y/Parkour/GUI/InventoryBuilder.java @@ -1,5 +1,8 @@ package me.A5H73Y.Parkour.GUI; +import java.util.Arrays; +import java.util.List; + import me.A5H73Y.Parkour.Parkour; import me.A5H73Y.Parkour.Utilities.Utils; import org.bukkit.Bukkit; @@ -9,9 +12,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import java.util.Arrays; -import java.util.List; - public abstract class InventoryBuilder { public static final String PARKOUR_TITLE_PREFIX = "Parkour "; @@ -25,7 +25,7 @@ public abstract class InventoryBuilder { public Inventory buildInventory(Player player, int page) { int inventorySize = calculateInventorySize(); String inventoryTitle = PARKOUR_TITLE_PREFIX + getInventoryTitle() - .replace("%PAGE%", String.valueOf(page)); + .replace("%PAGE%", String.valueOf(page)); List items = getAllItems(); @@ -35,11 +35,11 @@ public Inventory buildInventory(Player player, int page) { filteredListItems = items.subList(listStartIndex, listEndIndex); - Inventory inv = Bukkit.createInventory(null, inventorySize, inventoryTitle); + Inventory inv = Bukkit.createInventory(null, inventorySize, inventoryTitle); // previous page if (page > 1) { - //TODO change Arrow? + //TODO change Arrow? ItemStack arrow = new ItemStack(Material.ARROW); ItemMeta metadata = arrow.getItemMeta(); metadata.setDisplayName(Utils.getTranslation("ParkourGUI.PreviousPage", false)); @@ -73,4 +73,4 @@ private int calculateInventorySize() { return ((rows + 1) * 9); } -} \ No newline at end of file +} diff --git a/src/main/java/me/A5H73Y/Parkour/GUI/ParkourCoursesInventory.java b/src/main/java/me/A5H73Y/Parkour/GUI/ParkourCoursesInventory.java index f725b798..b732da52 100644 --- a/src/main/java/me/A5H73Y/Parkour/GUI/ParkourCoursesInventory.java +++ b/src/main/java/me/A5H73Y/Parkour/GUI/ParkourCoursesInventory.java @@ -1,5 +1,8 @@ package me.A5H73Y.Parkour.GUI; +import java.util.Collections; +import java.util.List; + import me.A5H73Y.Parkour.Course.CourseInfo; import me.A5H73Y.Parkour.Parkour; import me.A5H73Y.Parkour.Utilities.Utils; @@ -9,9 +12,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import java.util.Collections; -import java.util.List; - public class ParkourCoursesInventory extends InventoryBuilder { @Override diff --git a/src/main/java/me/A5H73Y/Parkour/Listeners/ChatListener.java b/src/main/java/me/A5H73Y/Parkour/Listeners/ChatListener.java index 48e5b764..616e8297 100644 --- a/src/main/java/me/A5H73Y/Parkour/Listeners/ChatListener.java +++ b/src/main/java/me/A5H73Y/Parkour/Listeners/ChatListener.java @@ -1,5 +1,7 @@ package me.A5H73Y.Parkour.Listeners; +import java.util.List; + import me.A5H73Y.Parkour.Managers.QuestionManager; import me.A5H73Y.Parkour.Parkour; import me.A5H73Y.Parkour.Player.PlayerInfo; @@ -14,8 +16,6 @@ import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import java.util.List; - public class ChatListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) diff --git a/src/main/java/me/A5H73Y/Parkour/Listeners/PlayerInventoryListener.java b/src/main/java/me/A5H73Y/Parkour/Listeners/PlayerInventoryListener.java index e66fb2e1..d34b7d1c 100644 --- a/src/main/java/me/A5H73Y/Parkour/Listeners/PlayerInventoryListener.java +++ b/src/main/java/me/A5H73Y/Parkour/Listeners/PlayerInventoryListener.java @@ -1,8 +1,10 @@ package me.A5H73Y.Parkour.Listeners; -import me.A5H73Y.Parkour.Parkour; +import java.util.List; + import me.A5H73Y.Parkour.GUI.InventoryBuilder; import me.A5H73Y.Parkour.GUI.ParkourCoursesInventory; +import me.A5H73Y.Parkour.Parkour; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -10,8 +12,6 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; -import java.util.List; - public class PlayerInventoryListener implements Listener { @EventHandler diff --git a/src/main/java/me/A5H73Y/Parkour/Listeners/PlayerMoveListener.java b/src/main/java/me/A5H73Y/Parkour/Listeners/PlayerMoveListener.java index 9beda80e..18443e52 100644 --- a/src/main/java/me/A5H73Y/Parkour/Listeners/PlayerMoveListener.java +++ b/src/main/java/me/A5H73Y/Parkour/Listeners/PlayerMoveListener.java @@ -1,5 +1,8 @@ package me.A5H73Y.Parkour.Listeners; +import java.util.Arrays; +import java.util.List; + import me.A5H73Y.Parkour.Enums.ParkourMode; import me.A5H73Y.Parkour.Parkour; import me.A5H73Y.Parkour.ParkourKit.ParkourKit; @@ -16,9 +19,6 @@ import org.bukkit.potion.PotionEffectType; import org.bukkit.util.Vector; -import java.util.Arrays; -import java.util.List; - public class PlayerMoveListener implements Listener { private static final List BLOCK_FACES = diff --git a/src/main/java/me/A5H73Y/Parkour/Managers/ChallengeManager.java b/src/main/java/me/A5H73Y/Parkour/Managers/ChallengeManager.java index 05feeb69..88cce88b 100644 --- a/src/main/java/me/A5H73Y/Parkour/Managers/ChallengeManager.java +++ b/src/main/java/me/A5H73Y/Parkour/Managers/ChallengeManager.java @@ -1,5 +1,8 @@ package me.A5H73Y.Parkour.Managers; +import java.util.HashSet; +import java.util.Set; + import me.A5H73Y.Parkour.Course.CourseMethods; import me.A5H73Y.Parkour.Parkour; import me.A5H73Y.Parkour.Player.PlayerMethods; @@ -8,9 +11,6 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import java.util.HashSet; -import java.util.Set; - public class ChallengeManager { private static ChallengeManager instance; diff --git a/src/main/java/me/A5H73Y/Parkour/Managers/QuestionManager.java b/src/main/java/me/A5H73Y/Parkour/Managers/QuestionManager.java index 950dd352..2db9ec43 100644 --- a/src/main/java/me/A5H73Y/Parkour/Managers/QuestionManager.java +++ b/src/main/java/me/A5H73Y/Parkour/Managers/QuestionManager.java @@ -1,5 +1,8 @@ package me.A5H73Y.Parkour.Managers; +import java.util.HashMap; +import java.util.Map; + import me.A5H73Y.Parkour.Course.CheckpointMethods; import me.A5H73Y.Parkour.Course.CourseInfo; import me.A5H73Y.Parkour.Course.CourseMethods; @@ -15,9 +18,6 @@ import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; -import java.util.HashMap; -import java.util.Map; - /** * Manage the questions that require confirmation from the player * Usually caused by actions that could change the outcome of the plugin / course diff --git a/src/main/java/me/A5H73Y/Parkour/Managers/QuietModeManager.java b/src/main/java/me/A5H73Y/Parkour/Managers/QuietModeManager.java index 2fff1a49..4fed0477 100644 --- a/src/main/java/me/A5H73Y/Parkour/Managers/QuietModeManager.java +++ b/src/main/java/me/A5H73Y/Parkour/Managers/QuietModeManager.java @@ -1,11 +1,11 @@ package me.A5H73Y.Parkour.Managers; -import me.A5H73Y.Parkour.Utilities.Utils; -import org.bukkit.entity.Player; - import java.util.ArrayList; import java.util.List; +import me.A5H73Y.Parkour.Utilities.Utils; +import org.bukkit.entity.Player; + public class QuietModeManager { private static QuietModeManager instance; diff --git a/src/main/java/me/A5H73Y/Parkour/Managers/ScoreboardManager.java b/src/main/java/me/A5H73Y/Parkour/Managers/ScoreboardManager.java index a914fbec..8a4b7a0f 100644 --- a/src/main/java/me/A5H73Y/Parkour/Managers/ScoreboardManager.java +++ b/src/main/java/me/A5H73Y/Parkour/Managers/ScoreboardManager.java @@ -1,5 +1,9 @@ package me.A5H73Y.Parkour.Managers; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import me.A5H73Y.Parkour.Course.CourseMethods; import me.A5H73Y.Parkour.Other.TimeObject; import me.A5H73Y.Parkour.Parkour; @@ -15,10 +19,6 @@ import org.bukkit.scoreboard.Scoreboard; import org.bukkit.scoreboard.Team; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public class ScoreboardManager { // For some reason the Scoreboard API is so stupid you have to use a blank string to identify the objective. @@ -77,7 +77,7 @@ public void addScoreboard(Player player) { if (Parkour.getSettings().isPreventPlayerCollisions() && Utils.getMinorServerVersion() > 8) { Team team = board.registerNewTeam("parkour"); - team.setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.NEVER); + team.setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.NEVER); team.addEntry(player.getName()); } diff --git a/src/main/java/me/A5H73Y/Parkour/Other/Backup.java b/src/main/java/me/A5H73Y/Parkour/Other/Backup.java index 2c0a0894..56cca795 100644 --- a/src/main/java/me/A5H73Y/Parkour/Other/Backup.java +++ b/src/main/java/me/A5H73Y/Parkour/Other/Backup.java @@ -1,8 +1,5 @@ package me.A5H73Y.Parkour.Other; -import me.A5H73Y.Parkour.Parkour; -import me.A5H73Y.Parkour.Utilities.Utils; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -12,6 +9,9 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import me.A5H73Y.Parkour.Parkour; +import me.A5H73Y.Parkour.Utilities.Utils; + public class Backup { private static List fileList; @@ -103,4 +103,4 @@ private static String generateZipEntry(String file) { return file.substring(SOURCE_FOLDER.length()+1, file.length()); } -} \ No newline at end of file +} diff --git a/src/main/java/me/A5H73Y/Parkour/Other/Configurations.java b/src/main/java/me/A5H73Y/Parkour/Other/Configurations.java index 89efb080..87901c1b 100644 --- a/src/main/java/me/A5H73Y/Parkour/Other/Configurations.java +++ b/src/main/java/me/A5H73Y/Parkour/Other/Configurations.java @@ -1,5 +1,9 @@ package me.A5H73Y.Parkour.Other; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; + import me.A5H73Y.Parkour.Parkour; import me.A5H73Y.Parkour.ParkourKit.ParkourKitInfo; import me.A5H73Y.Parkour.Utilities.Static; @@ -8,10 +12,6 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; - public class Configurations { private File dataFolder, courseFile, stringFile, usersFile, invFile, checkFile, econFile, kitFile; @@ -485,15 +485,15 @@ public void setupConfig() { config.addDefault("OnFinish.DefaultPrize.Material", "DIAMOND"); config.addDefault("OnFinish.DefaultPrize.Amount", 1); config.addDefault("OnFinish.DefaultPrize.XP", 0); - config.addDefault("OnFinish.DisplayNewRecords", false); - config.addDefault("OnFinish.DisplayStats", true); - config.addDefault("OnFinish.EnablePrizes", true); - config.addDefault("OnFinish.EnforceCompletion", true); - config.addDefault("OnFinish.SaveUserCompletedCourses", true); //TODO false - config.addDefault("OnFinish.SetGamemode", 0); - config.addDefault("OnFinish.TeleportAway", true); - config.addDefault("OnFinish.TeleportDelay", 0); - config.addDefault("OnFinish.UpdatePlayerDatabaseTime", false); + config.addDefault("OnFinish.DisplayNewRecords", false); + config.addDefault("OnFinish.DisplayStats", true); + config.addDefault("OnFinish.EnablePrizes", true); + config.addDefault("OnFinish.EnforceCompletion", true); + config.addDefault("OnFinish.SaveUserCompletedCourses", true); //TODO false + config.addDefault("OnFinish.SetGamemode", 0); + config.addDefault("OnFinish.TeleportAway", true); + config.addDefault("OnFinish.TeleportDelay", 0); + config.addDefault("OnFinish.UpdatePlayerDatabaseTime", false); config.addDefault("OnLeave.TeleportToLinkedLobby", false); @@ -589,4 +589,4 @@ private void validateConfigProperties() { } } } -} \ No newline at end of file +} diff --git a/src/main/java/me/A5H73Y/Parkour/Other/Help.java b/src/main/java/me/A5H73Y/Parkour/Other/Help.java index 79977d4d..3d4b0096 100644 --- a/src/main/java/me/A5H73Y/Parkour/Other/Help.java +++ b/src/main/java/me/A5H73Y/Parkour/Other/Help.java @@ -1,5 +1,7 @@ package me.A5H73Y.Parkour.Other; +import java.io.File; + import me.A5H73Y.Parkour.Course.CourseInfo; import me.A5H73Y.Parkour.Course.CourseMethods; import me.A5H73Y.Parkour.Enums.DatabaseType; @@ -12,8 +14,6 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; -import java.io.File; - public final class Help { /** diff --git a/src/main/java/me/A5H73Y/Parkour/Other/StartPlugin.java b/src/main/java/me/A5H73Y/Parkour/Other/StartPlugin.java index 94abfe99..6df33850 100644 --- a/src/main/java/me/A5H73Y/Parkour/Other/StartPlugin.java +++ b/src/main/java/me/A5H73Y/Parkour/Other/StartPlugin.java @@ -1,5 +1,9 @@ package me.A5H73Y.Parkour.Other; +import java.io.File; +import java.util.HashMap; +import java.util.Map.Entry; + import com.huskehhh.mysql.Database; import com.huskehhh.mysql.mysql.MySQL; import com.huskehhh.mysql.sqlite.SQLite; @@ -21,10 +25,6 @@ import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.RegisteredServiceProvider; -import java.io.File; -import java.util.HashMap; -import java.util.Map.Entry; - public class StartPlugin { public static void run() { diff --git a/src/main/java/me/A5H73Y/Parkour/Other/Updater.java b/src/main/java/me/A5H73Y/Parkour/Other/Updater.java index 2e7b0470..f26067be 100644 --- a/src/main/java/me/A5H73Y/Parkour/Other/Updater.java +++ b/src/main/java/me/A5H73Y/Parkour/Other/Updater.java @@ -1,12 +1,5 @@ package me.A5H73Y.Parkour.Other; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.plugin.Plugin; -import org.bukkit.scheduler.BukkitRunnable; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.json.simple.JSONValue; - import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.BufferedReader; @@ -23,6 +16,13 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.plugin.Plugin; +import org.bukkit.scheduler.BukkitRunnable; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; +import org.json.simple.JSONValue; + /** * Check for updates on BukkitDev for a given plugin, and download the updates if needed. *

@@ -776,4 +776,4 @@ public void run() { private void runCallback() { this.callback.onFinish(this); } -} \ No newline at end of file +} diff --git a/src/main/java/me/A5H73Y/Parkour/Other/Validation.java b/src/main/java/me/A5H73Y/Parkour/Other/Validation.java index 100cab88..4cc19ddf 100644 --- a/src/main/java/me/A5H73Y/Parkour/Other/Validation.java +++ b/src/main/java/me/A5H73Y/Parkour/Other/Validation.java @@ -1,5 +1,8 @@ package me.A5H73Y.Parkour.Other; +import java.util.ArrayList; +import java.util.List; + import me.A5H73Y.Parkour.Course.Course; import me.A5H73Y.Parkour.Course.CourseInfo; import me.A5H73Y.Parkour.Course.CourseMethods; @@ -12,9 +15,6 @@ import org.bukkit.ChatColor; import org.bukkit.entity.Player; -import java.util.ArrayList; -import java.util.List; - public class Validation { /** diff --git a/src/main/java/me/A5H73Y/Parkour/ParkourKit/ParkourKit.java b/src/main/java/me/A5H73Y/Parkour/ParkourKit/ParkourKit.java index 65ee32f5..b0eb2bc7 100644 --- a/src/main/java/me/A5H73Y/Parkour/ParkourKit/ParkourKit.java +++ b/src/main/java/me/A5H73Y/Parkour/ParkourKit/ParkourKit.java @@ -1,11 +1,5 @@ package me.A5H73Y.Parkour.ParkourKit; -import me.A5H73Y.Parkour.Other.Validation; -import me.A5H73Y.Parkour.Parkour; -import me.A5H73Y.Parkour.Utilities.Utils; -import org.bukkit.Material; -import org.bukkit.configuration.file.FileConfiguration; - import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -14,6 +8,12 @@ import java.util.Map; import java.util.Set; +import me.A5H73Y.Parkour.Other.Validation; +import me.A5H73Y.Parkour.Parkour; +import me.A5H73Y.Parkour.Utilities.Utils; +import org.bukkit.Material; +import org.bukkit.configuration.file.FileConfiguration; + public class ParkourKit implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/me/A5H73Y/Parkour/ParkourKit/ParkourKitInfo.java b/src/main/java/me/A5H73Y/Parkour/ParkourKit/ParkourKitInfo.java index 8a7a845d..c7d05203 100644 --- a/src/main/java/me/A5H73Y/Parkour/ParkourKit/ParkourKitInfo.java +++ b/src/main/java/me/A5H73Y/Parkour/ParkourKit/ParkourKitInfo.java @@ -1,5 +1,10 @@ package me.A5H73Y.Parkour.ParkourKit; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import me.A5H73Y.Parkour.Other.Constants; import me.A5H73Y.Parkour.Parkour; import me.A5H73Y.Parkour.Utilities.Static; @@ -10,11 +15,6 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - public class ParkourKitInfo { /** diff --git a/src/main/java/me/A5H73Y/Parkour/ParkourPlaceholders.java b/src/main/java/me/A5H73Y/Parkour/ParkourPlaceholders.java index 6341198d..03903e44 100644 --- a/src/main/java/me/A5H73Y/Parkour/ParkourPlaceholders.java +++ b/src/main/java/me/A5H73Y/Parkour/ParkourPlaceholders.java @@ -78,8 +78,8 @@ public String onPlaceholderRequest(Player player, String message) { return INVALID_SYNTAX; } - TimeObject result = getTopResultForCourse(temp[3]); - return result == null ? NO_TIME_RECORDED : String.valueOf(result.getDeaths()); + TimeObject result = getTopResultForCourse(temp[3]); + return result == null ? NO_TIME_RECORDED : String.valueOf(result.getDeaths()); } else if (message.startsWith("leader")) { String[] temp = message.split("_"); @@ -87,8 +87,8 @@ public String onPlaceholderRequest(Player player, String message) { return INVALID_SYNTAX; } - TimeObject result = getTopResultForCourse(temp[1]); - return result == null ? NO_TIME_RECORDED : result.getPlayer(); + TimeObject result = getTopResultForCourse(temp[1]); + return result == null ? NO_TIME_RECORDED : result.getPlayer(); } // Player specific @@ -129,8 +129,8 @@ public String onPlaceholderRequest(Player player, String message) { } else if (message.equals("current_course_record")) { Course course = CourseMethods.findByPlayer(player.getName()); if (course != null) { - TimeObject result = getTopResultForCourse(course.getName()); - return result == null ? NO_TIME_RECORDED : Utils.displayCurrentTime(result.getTime()); + TimeObject result = getTopResultForCourse(course.getName()); + return result == null ? NO_TIME_RECORDED : Utils.displayCurrentTime(result.getTime()); } return ""; @@ -140,8 +140,8 @@ public String onPlaceholderRequest(Player player, String message) { return INVALID_SYNTAX; } - TimeObject result = getTopPlayerResultForCourse(player.getName(), temp[3]); - return result == null ? NO_TIME_RECORDED : String.valueOf(result.getDeaths()); + TimeObject result = getTopPlayerResultForCourse(player.getName(), temp[3]); + return result == null ? NO_TIME_RECORDED : String.valueOf(result.getDeaths()); } else if (message.startsWith("personal_best")) { String[] temp = message.split("_"); @@ -149,35 +149,35 @@ public String onPlaceholderRequest(Player player, String message) { return null; } - TimeObject result = getTopPlayerResultForCourse(player.getName(), temp[2]); - return result == null ? NO_TIME_RECORDED : Utils.displayCurrentTime(result.getTime()); + TimeObject result = getTopPlayerResultForCourse(player.getName(), temp[2]); + return result == null ? NO_TIME_RECORDED : Utils.displayCurrentTime(result.getTime()); } else if (message.equals("current_personal_best_deaths")) { Course course = CourseMethods.findByPlayer(player.getName()); if (course != null) { - TimeObject result = getTopPlayerResultForCourse(player.getName(), course.getName()); - return result == null ? NO_TIME_RECORDED : String.valueOf(result.getDeaths()); + TimeObject result = getTopPlayerResultForCourse(player.getName(), course.getName()); + return result == null ? NO_TIME_RECORDED : String.valueOf(result.getDeaths()); } return ""; } else if (message.equals("current_personal_best")) { Course course = CourseMethods.findByPlayer(player.getName()); if (course != null) { - TimeObject result = getTopPlayerResultForCourse(player.getName(), course.getName()); - return result == null ? NO_TIME_RECORDED : Utils.displayCurrentTime(result.getTime()); + TimeObject result = getTopPlayerResultForCourse(player.getName(), course.getName()); + return result == null ? NO_TIME_RECORDED : Utils.displayCurrentTime(result.getTime()); } return ""; } else if (message.equals("current_course_leader")) { Course course = CourseMethods.findByPlayer(player.getName()); if (course != null) { - TimeObject result = getTopResultForCourse(course.getName()); - return result == null ? NO_TIME_RECORDED : result.getPlayer(); + TimeObject result = getTopResultForCourse(course.getName()); + return result == null ? NO_TIME_RECORDED : result.getPlayer(); } return ""; } else if (message.equals("current_course_timer")) { - ParkourSession session = PlayerMethods.getParkourSession(player.getName()); + ParkourSession session = PlayerMethods.getParkourSession(player.getName()); return session == null ? "" : session.getLiveTime(); } else if (message.startsWith("topten")) { @@ -185,17 +185,17 @@ public String onPlaceholderRequest(Player player, String message) { if (temp.length != 3) { return INVALID_SYNTAX; } - if (!Validation.isInteger(temp[2])) { - return INVALID_SYNTAX; - } - int pos = Integer.parseInt(temp[2]); - if (pos < 1 || pos > 10) { - return INVALID_SYNTAX; - } - String courseName = temp[1]; - if (!CourseMethods.exist(courseName)) { - return NO_TIME_RECORDED; - } + if (!Validation.isInteger(temp[2])) { + return INVALID_SYNTAX; + } + int pos = Integer.parseInt(temp[2]); + if (pos < 1 || pos > 10) { + return INVALID_SYNTAX; + } + String courseName = temp[1]; + if (!CourseMethods.exist(courseName)) { + return NO_TIME_RECORDED; + } List results = DatabaseMethods.getTopCourseResults(courseName, pos); if (results.isEmpty()) { return NO_TIME_RECORDED; @@ -203,7 +203,7 @@ public String onPlaceholderRequest(Player player, String message) { } else if (pos > results.size()) { return " "; } - TimeObject result = results.get(pos - 1); + TimeObject result = results.get(pos - 1); if (message.startsWith("toptenx")) { String nCol = "&f"; @@ -223,20 +223,20 @@ public String onPlaceholderRequest(Player player, String message) { private TimeObject getTopResultForCourse(String courseName) { - if (!CourseMethods.exist(courseName)) { - return null; - } + if (!CourseMethods.exist(courseName)) { + return null; + } - List time = DatabaseMethods.getTopCourseResults(courseName, 1); - return time.isEmpty() ? null : time.get(0); + List time = DatabaseMethods.getTopCourseResults(courseName, 1); + return time.isEmpty() ? null : time.get(0); } - private TimeObject getTopPlayerResultForCourse(String playerName, String courseName) { - if (!CourseMethods.exist(courseName)) { - return null; - } + private TimeObject getTopPlayerResultForCourse(String playerName, String courseName) { + if (!CourseMethods.exist(courseName)) { + return null; + } - List time = DatabaseMethods.getTopPlayerCourseResults(playerName, courseName, 1); - return time.isEmpty() ? null : time.get(0); - } + List time = DatabaseMethods.getTopPlayerCourseResults(playerName, courseName, 1); + return time.isEmpty() ? null : time.get(0); + } } diff --git a/src/main/java/me/A5H73Y/Parkour/Player/ParkourSession.java b/src/main/java/me/A5H73Y/Parkour/Player/ParkourSession.java index 00dc4434..c994a41c 100644 --- a/src/main/java/me/A5H73Y/Parkour/Player/ParkourSession.java +++ b/src/main/java/me/A5H73Y/Parkour/Player/ParkourSession.java @@ -1,5 +1,7 @@ package me.A5H73Y.Parkour.Player; +import java.io.Serializable; + import me.A5H73Y.Parkour.Course.CheckpointMethods; import me.A5H73Y.Parkour.Course.Course; import me.A5H73Y.Parkour.Course.CourseMethods; @@ -13,8 +15,6 @@ import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitTask; -import java.io.Serializable; - public class ParkourSession implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/me/A5H73Y/Parkour/Player/PlayerInfo.java b/src/main/java/me/A5H73Y/Parkour/Player/PlayerInfo.java index 5bb95905..88d41715 100644 --- a/src/main/java/me/A5H73Y/Parkour/Player/PlayerInfo.java +++ b/src/main/java/me/A5H73Y/Parkour/Player/PlayerInfo.java @@ -1,5 +1,7 @@ package me.A5H73Y.Parkour.Player; +import java.util.List; + import me.A5H73Y.Parkour.Other.Validation; import me.A5H73Y.Parkour.Parkour; import me.A5H73Y.Parkour.ParkourEvents.PlayerParkourLevelEvent; @@ -10,8 +12,6 @@ import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; -import java.util.List; - /** * Centralize player's information retrieval and modifications * Massive thanks to horgeon for the inspiration of this change diff --git a/src/main/java/me/A5H73Y/Parkour/Player/PlayerMethods.java b/src/main/java/me/A5H73Y/Parkour/Player/PlayerMethods.java index ede02355..316c28ed 100644 --- a/src/main/java/me/A5H73Y/Parkour/Player/PlayerMethods.java +++ b/src/main/java/me/A5H73Y/Parkour/Player/PlayerMethods.java @@ -1,5 +1,8 @@ package me.A5H73Y.Parkour.Player; +import java.util.HashMap; +import java.util.List; + import me.A5H73Y.Parkour.Course.Checkpoint; import me.A5H73Y.Parkour.Course.Course; import me.A5H73Y.Parkour.Course.CourseInfo; @@ -37,9 +40,6 @@ import org.bukkit.potion.PotionEffectType; import org.bukkit.util.Vector; -import java.util.HashMap; -import java.util.List; - public class PlayerMethods { /** @@ -641,7 +641,7 @@ public static void displayPlayerInfo(String[] args, Player player) { } if (Parkour.getPlugin().getConfig().getBoolean("OnFinish.SaveUserCompletedCourses")) { - player.sendMessage("Courses Completed: " + ChatColor.AQUA + PlayerInfo.getNumberOfCoursesCompleted(player) + " / " + String.valueOf(CourseInfo.getAllCourses().size())); + player.sendMessage("Courses Completed: " + ChatColor.AQUA + PlayerInfo.getNumberOfCoursesCompleted(player) + " / " + String.valueOf(CourseInfo.getAllCourses().size())); } } } diff --git a/src/main/java/me/A5H73Y/Parkour/Utilities/DatabaseMethods.java b/src/main/java/me/A5H73Y/Parkour/Utilities/DatabaseMethods.java index f692b931..12c73f65 100644 --- a/src/main/java/me/A5H73Y/Parkour/Utilities/DatabaseMethods.java +++ b/src/main/java/me/A5H73Y/Parkour/Utilities/DatabaseMethods.java @@ -1,5 +1,11 @@ package me.A5H73Y.Parkour.Utilities; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + import me.A5H73Y.Parkour.Course.CourseInfo; import me.A5H73Y.Parkour.Enums.DatabaseType; import me.A5H73Y.Parkour.Other.TimeObject; @@ -8,12 +14,6 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; - public class DatabaseMethods { public static DatabaseType type; diff --git a/src/main/java/me/A5H73Y/Parkour/Utilities/Settings.java b/src/main/java/me/A5H73Y/Parkour/Utilities/Settings.java index 66786b77..c0ee863e 100644 --- a/src/main/java/me/A5H73Y/Parkour/Utilities/Settings.java +++ b/src/main/java/me/A5H73Y/Parkour/Utilities/Settings.java @@ -1,12 +1,12 @@ package me.A5H73Y.Parkour.Utilities; +import java.util.List; + import me.A5H73Y.Parkour.Parkour; import org.bukkit.Material; import org.bukkit.Particle; import org.bukkit.configuration.file.FileConfiguration; -import java.util.List; - /** * Quickly access Parkour Settings without knowing the property name * Bukkit implementation caches the property files for us, so there's no need for us to. diff --git a/src/main/java/me/A5H73Y/Parkour/Utilities/Static.java b/src/main/java/me/A5H73Y/Parkour/Utilities/Static.java index ca2d3cac..0910a7ef 100644 --- a/src/main/java/me/A5H73Y/Parkour/Utilities/Static.java +++ b/src/main/java/me/A5H73Y/Parkour/Utilities/Static.java @@ -1,13 +1,13 @@ package me.A5H73Y.Parkour.Utilities; -import me.A5H73Y.Parkour.Parkour; - import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import me.A5H73Y.Parkour.Parkour; + public final class Static { private static List hidden = new ArrayList<>(); diff --git a/src/main/java/me/A5H73Y/Parkour/Utilities/Utils.java b/src/main/java/me/A5H73Y/Parkour/Utilities/Utils.java index 53a3b6e0..49e05f81 100644 --- a/src/main/java/me/A5H73Y/Parkour/Utilities/Utils.java +++ b/src/main/java/me/A5H73Y/Parkour/Utilities/Utils.java @@ -1,5 +1,21 @@ package me.A5H73Y.Parkour.Utilities; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.PrintWriter; +import java.text.Format; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Set; + import com.connorlinfoot.bountifulapi.BountifulAPI; import me.A5H73Y.Parkour.Course.CourseInfo; import me.A5H73Y.Parkour.Course.CourseMethods; @@ -26,22 +42,6 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.material.Stairs; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.PrintWriter; -import java.text.Format; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Set; - public final class Utils { /** @@ -568,7 +568,7 @@ public static void deleteCommand(String[] args, Player player) { String coordinates = location.getBlockX() + "-" + location.getBlockY() + "-" + location.getBlockZ(); if (!Validation.deleteAutoStart(args[2], coordinates, player)) { - return; + return; } QuestionManager.getInstance().askDeleteAutoStartQuestion(player, coordinates); @@ -982,9 +982,9 @@ public static boolean hasPrizeCooldownDurationPassed(Player player, String cours } public static String getTimeRemaining(Player player, String courseName) { - long daysDelay = convertDaysToMilliseconds(CourseInfo.getRewardDelay(courseName)); - long timeDifference = System.currentTimeMillis() - PlayerInfo.getLastRewardedTime(player, courseName); - return displayTimeRemaining(daysDelay - timeDifference); + long daysDelay = convertDaysToMilliseconds(CourseInfo.getRewardDelay(courseName)); + long timeDifference = System.currentTimeMillis() - PlayerInfo.getLastRewardedTime(player, courseName); + return displayTimeRemaining(daysDelay - timeDifference); } private static String displayTimeRemaining(long millis) { diff --git a/src/main/java/me/A5H73Y/Parkour/Utilities/XMaterial.java b/src/main/java/me/A5H73Y/Parkour/Utilities/XMaterial.java index ba901bbb..85ce948a 100644 --- a/src/main/java/me/A5H73Y/Parkour/Utilities/XMaterial.java +++ b/src/main/java/me/A5H73Y/Parkour/Utilities/XMaterial.java @@ -22,10 +22,10 @@ * DEALINGS IN THE SOFTWARE. **/ -import org.bukkit.Material; - import java.util.HashMap; +import org.bukkit.Material; + public enum XMaterial { ACACIA_BOAT(0, "BOAT_ACACIA"), ACACIA_BUTTON(0, "WOOD_BUTTON"),