Skip to content

Commit

Permalink
Rearrange imports
Browse files Browse the repository at this point in the history
Fix indentation
  • Loading branch information
A5H73Y committed May 17, 2019
1 parent 2594ec3 commit ab0fea8
Show file tree
Hide file tree
Showing 36 changed files with 199 additions and 199 deletions.
4 changes: 2 additions & 2 deletions src/main/java/com/huskehhh/mysql/Database.java
Original file line number Diff line number Diff line change
@@ -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.).
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/huskehhh/mysql/mysql/MySQL.java
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/huskehhh/mysql/sqlite/SQLite.java
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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<String> BASIC_CMDS = new HashSet<>(
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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"};
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/A5H73Y/Parkour/Course/Checkpoint.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/A5H73Y/Parkour/Course/Course.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/me/A5H73Y/Parkour/Course/CourseInfo.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {

/**
Expand Down Expand Up @@ -499,12 +499,12 @@ public static void deleteCourse(String courseName) {
Set<String> playerNames = playersSection.getKeys(false);

for (String playerName : playerNames) {
String completedPath = "PlayerInfo." + playerName + ".Completed";
String completedPath = "PlayerInfo." + playerName + ".Completed";
List<String> completedCourses = userConfig.getStringList(completedPath);

if (completedCourses.contains(completedPath)) {
completedCourses.remove(courseName);
userConfig.set(completedPath, completedCourses);
completedCourses.remove(courseName);
userConfig.set(completedPath, completedCourses);
}
}
}
Expand Down Expand Up @@ -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));
}
}
}
}
12 changes: 6 additions & 6 deletions src/main/java/me/A5H73Y/Parkour/Course/CourseMethods.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/A5H73Y/Parkour/Course/LobbyMethods.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -13,8 +15,6 @@
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

import java.util.Set;

public class LobbyMethods {

/**
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/me/A5H73Y/Parkour/GUI/InventoryBuilder.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 ";
Expand All @@ -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<String> items = getAllItems();

Expand All @@ -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));
Expand Down Expand Up @@ -73,4 +73,4 @@ private int calculateInventorySize() {

return ((rows + 1) * 9);
}
}
}
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/A5H73Y/Parkour/Listeners/ChatListener.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
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;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.Inventory;

import java.util.List;

public class PlayerInventoryListener implements Listener {

@EventHandler
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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<BlockFace> BLOCK_FACES =
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/me/A5H73Y/Parkour/Managers/QuestionManager.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading

0 comments on commit ab0fea8

Please sign in to comment.