Quick cleanup
This commit is contained in:
kashike
@@ -49,11 +49,11 @@ public class PlayerVaults extends JavaPlugin {
|
||||
private static PlayerVaults instance;
|
||||
private boolean update = false;
|
||||
private String newVersion = "";
|
||||
private HashMap<String, SignSetInfo> setSign = new HashMap<>();
|
||||
private final HashMap<String, SignSetInfo> setSign = new HashMap<>();
|
||||
// Player name - VaultViewInfo
|
||||
private HashMap<String, VaultViewInfo> inVault = new HashMap<>();
|
||||
private final HashMap<String, VaultViewInfo> inVault = new HashMap<>();
|
||||
// VaultViewInfo - Inventory
|
||||
private HashMap<String, Inventory> openInventories = new HashMap<>();
|
||||
private final HashMap<String, Inventory> openInventories = new HashMap<>();
|
||||
private Economy economy = null;
|
||||
private boolean useVault = false;
|
||||
private YamlConfiguration signs;
|
||||
@@ -62,7 +62,7 @@ public class PlayerVaults extends JavaPlugin {
|
||||
private boolean backupsEnabled;
|
||||
private File backupsFolder = null;
|
||||
private File vaultData;
|
||||
private Set<Material> blockedMats = new HashSet<>();
|
||||
private final Set<Material> blockedMats = new HashSet<>();
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
|
||||
@@ -17,8 +17,8 @@ import java.util.*;
|
||||
|
||||
public class ConvertCommand implements CommandExecutor {
|
||||
|
||||
private List<Converter> converters = new ArrayList<>();
|
||||
private ServiceProvider uuidProvider;
|
||||
private final List<Converter> converters = new ArrayList<>();
|
||||
private final ServiceProvider uuidProvider;
|
||||
|
||||
public ConvertCommand() {
|
||||
converters.add(new BackpackConverter());
|
||||
|
||||
@@ -23,7 +23,7 @@ package com.drtshock.playervaults.commands;
|
||||
public class SignSetInfo {
|
||||
|
||||
private String owner;
|
||||
private int number;
|
||||
private final int number;
|
||||
private boolean self = false;
|
||||
|
||||
/**
|
||||
|
||||
@@ -18,7 +18,7 @@ public interface Converter {
|
||||
*
|
||||
* @return the number of vaults converted. Returns 0 on none converted or -1 if no vaults were converted.
|
||||
*/
|
||||
public int run(CommandSender initiator, ServiceProvider uuidProvider);
|
||||
int run(CommandSender initiator, ServiceProvider uuidProvider);
|
||||
|
||||
/**
|
||||
* Determines if this converter is applicable for converting to PlayerVaults. This may check for the existance of a
|
||||
@@ -26,13 +26,13 @@ public interface Converter {
|
||||
*
|
||||
* @return true if this converter can convert, false otherwise
|
||||
*/
|
||||
public boolean canConvert();
|
||||
boolean canConvert();
|
||||
|
||||
/**
|
||||
* Gets the name of this converter
|
||||
*
|
||||
* @return the converter name
|
||||
*/
|
||||
public String getName();
|
||||
String getName();
|
||||
|
||||
}
|
||||
|
||||
@@ -44,8 +44,8 @@ import java.io.IOException;
|
||||
|
||||
public class Listeners implements Listener {
|
||||
|
||||
public PlayerVaults plugin;
|
||||
UUIDVaultManager vm = UUIDVaultManager.getInstance();
|
||||
public final PlayerVaults plugin;
|
||||
final UUIDVaultManager vm = UUIDVaultManager.getInstance();
|
||||
|
||||
public Listeners(PlayerVaults playerVaults) {
|
||||
this.plugin = playerVaults;
|
||||
|
||||
@@ -12,7 +12,7 @@ import org.bukkit.scheduler.BukkitRunnable;
|
||||
import java.util.UUID;
|
||||
|
||||
public class VaultPreloadListener implements Listener {
|
||||
UUIDVaultManager vm = UUIDVaultManager.getInstance();
|
||||
final UUIDVaultManager vm = UUIDVaultManager.getInstance();
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR)
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
|
||||
@@ -6,7 +6,7 @@ import java.io.File;
|
||||
|
||||
public class Cleanup implements Runnable {
|
||||
|
||||
private long diff;
|
||||
private final long diff;
|
||||
|
||||
public Cleanup(int diff) {
|
||||
this.diff = diff * 86400;
|
||||
|
||||
@@ -53,8 +53,8 @@ public enum Lang {
|
||||
HELP("help", "/pv <number>"),
|
||||
BLOCKED_ITEM("blocked-item", "&6%m &cis blocked from vaults");
|
||||
|
||||
private String path;
|
||||
private String def;
|
||||
private final String path;
|
||||
private final String def;
|
||||
private static YamlConfiguration LANG;
|
||||
|
||||
/**
|
||||
|
||||
@@ -406,7 +406,7 @@ public class Updater {
|
||||
String version = plugin.getDescription().getVersion();
|
||||
if (title.split("v").length == 2) {
|
||||
String remoteVersion = title.split("v")[1].split(" ")[0]; // Get the newest file's version number
|
||||
int remVer = -1, curVer = 0;
|
||||
int remVer, curVer = 0;
|
||||
try {
|
||||
remVer = calVer(remoteVersion);
|
||||
curVer = calVer(version);
|
||||
|
||||
@@ -30,8 +30,8 @@ import java.io.File;
|
||||
* A class that handles all economy operations.
|
||||
*/
|
||||
public class EconomyOperations {
|
||||
private static PlayerVaults PLUGIN = PlayerVaults.getInstance();
|
||||
private static FileConfiguration BUKKIT_CONFIG = PLUGIN.getConfig();
|
||||
private static final PlayerVaults PLUGIN = PlayerVaults.getInstance();
|
||||
private static final FileConfiguration BUKKIT_CONFIG = PLUGIN.getConfig();
|
||||
|
||||
/**
|
||||
* Have a player pay to open a vault.
|
||||
|
||||
@@ -5,7 +5,6 @@ import com.drtshock.playervaults.util.Lang;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
@@ -228,11 +227,13 @@ public class UUIDVaultManager {
|
||||
}.runTaskAsynchronously(PlayerVaults.getInstance());
|
||||
|
||||
OfflinePlayer player = Bukkit.getPlayer(holder);
|
||||
if (player != null && sender.getName().equalsIgnoreCase(player.getName())) {
|
||||
if (player != null) {
|
||||
if (sender.getName().equalsIgnoreCase(player.getName())) {
|
||||
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT.toString().replace("%v", String.valueOf(number)));
|
||||
} else {
|
||||
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_OTHER_VAULT.toString().replace("%v", String.valueOf(number)).replaceAll("%p", player.getName()));
|
||||
}
|
||||
}
|
||||
|
||||
PlayerVaults.getInstance().getOpenInventories().remove(new VaultViewInfo(holder.toString(), number).toString());
|
||||
}
|
||||
@@ -282,8 +283,6 @@ public class UUIDVaultManager {
|
||||
*
|
||||
* @param holder The vault holder of whose file to save.
|
||||
* @param yaml The config to save.
|
||||
*
|
||||
* @throws IOException Uh oh!
|
||||
*/
|
||||
public void saveFile(final UUID holder, final YamlConfiguration yaml) {
|
||||
if (cachedVaultFiles.containsKey(holder)) {
|
||||
|
||||
@@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
public class VaultOperations {
|
||||
|
||||
private static AtomicBoolean LOCKED = new AtomicBoolean(false);
|
||||
private static final AtomicBoolean LOCKED = new AtomicBoolean(false);
|
||||
|
||||
/**
|
||||
* Gets whether or not player vaults are locked
|
||||
|
||||
@@ -26,8 +26,8 @@ import java.util.UUID;
|
||||
public class VaultViewInfo {
|
||||
|
||||
UUID uuid;
|
||||
String holder;
|
||||
int number;
|
||||
final String holder;
|
||||
final int number;
|
||||
|
||||
/**
|
||||
* Make a VaultViewObject
|
||||
|
||||
Reference in New Issue
Block a user