Skip to content

Commit

Permalink
General Code Cleanup
Browse files Browse the repository at this point in the history 
Changed a few methods around, removed a few unused imports. The usual.
  • Loading branch information
FerusGrim committed Apr 29, 2014
1 parent 01f8e0f commit 327190f
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 81 deletions.
1 change: 0 additions & 1 deletion src/main/java/io/github/ferusgrim/GrimList/Commands/AddPlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import org.bukkit.entity.Player;

import io.github.ferusgrim.GrimList.GrimList;
import io.github.ferusgrim.GrimList.FocusManagers.FileManager;

import java.util.Arrays;
import java.util.Map;
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/io/github/ferusgrim/GrimList/Commands/Helper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,11 @@

package io.github.ferusgrim.GrimList.Commands;

import io.github.ferusgrim.GrimList.GrimList;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

public class Helper {
private GrimList plugin;

public Helper(GrimList plugin){
this.plugin = plugin;
}

public boolean run(CommandSender sender, String[] args) {
if(sender instanceof Player){
Expand Down
1 change: 0 additions & 1 deletion src/main/java/io/github/ferusgrim/GrimList/Commands/RemovePlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import io.github.ferusgrim.GrimList.utils.UUIDFetcher;
import io.github.ferusgrim.GrimList.utils.AsyncThenSyncOperation;
import io.github.ferusgrim.GrimList.FocusManagers.FileManager;
import org.bukkit.command.CommandSender;

import io.github.ferusgrim.GrimList.GrimList;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/io/github/ferusgrim/GrimList/Commands/SetConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import io.github.ferusgrim.GrimList.GrimList;

import org.apache.commons.lang.WordUtils;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

Expand Down
18 changes: 9 additions & 9 deletions src/main/java/io/github/ferusgrim/GrimList/Commands/ViewPlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void outputText(CommandSender sender, String uuid){
break;
}
if(viewIds == null || viewIds.size() < 5 || viewPUs == null || viewPIs == null){
plugin.log("SEVERE", "ViewPlayer arrays returned unexpectedly.");
plugin.log("SEVERE", "ViewPlayer arrays returned null unexpectedly.");
if(sender instanceof Player){
sender.sendMessage(plugin.mStart + "Command returned error. Check logs!");
}
Expand All @@ -62,12 +62,12 @@ public void outputText(CommandSender sender, String uuid){
sender.sendMessage("UUID: " + uuid);
sender.sendMessage("Whitelisted: " + viewIds.get(1));
sender.sendMessage("Previous Usernames:");
for(int i = 0; i < viewPUs.size(); i++){
sender.sendMessage(" - " + viewPUs.get(i));
for (String viewPU : viewPUs) {
sender.sendMessage(" - " + viewPU);
}
sender.sendMessage("Previous Addresses:");
for(int i = 0; i < viewPIs.size(); i++){
sender.sendMessage(" - " + viewPIs.get(i));
for (String viewPI : viewPIs) {
sender.sendMessage(" - " + viewPI);
}
sender.sendMessage("First Login: " + viewIds.get(2));
sender.sendMessage("Last Login: " + viewIds.get(3));
Expand All @@ -77,12 +77,12 @@ public void outputText(CommandSender sender, String uuid){
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&a&lUUID: &r&9" + uuid));
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&a&lWhitelisted: &r&9" + viewIds.get(1)));
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&a&lPrevious Usernames:"));
for(int i = 0; i < viewPUs.size(); i++){
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', " &a&l- &r&9" + viewPUs.get(i)));
for (String viewPU : viewPUs) {
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', " &a&l- &r&9" + viewPU));
}
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&a&lPrevious Addresses:"));
for(int i = 0; i < viewPIs.size(); i++){
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', " &a&l- &r&9" + viewPIs.get(i)));
for (String viewPI : viewPIs) {
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', " &a&l- &r&9" + viewPI));
}
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&a&lFirst Login: &r&9" + viewIds.get(2)));
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&a&lLast Login: &r&9" + viewIds.get(3)));
Expand Down
7 changes: 1 addition & 6 deletions src/main/java/io/github/ferusgrim/GrimList/Executor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,11 @@
import io.github.ferusgrim.GrimList.Commands.*;
import io.github.ferusgrim.GrimList.Commands.DeleteRecord;

import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

public class Executor implements CommandExecutor {
private GrimList plugin;

Expand All @@ -36,7 +31,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
}
switch(function){
case "help":
Helper hlp = new Helper(plugin);
Helper hlp = new Helper();
return hlp.run(sender, args);
case "add":
AddPlayer ap = new AddPlayer(plugin);
Expand Down
85 changes: 39 additions & 46 deletions src/main/java/io/github/ferusgrim/GrimList/FocusManagers/FileManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@

import io.github.ferusgrim.GrimList.GrimList;
import io.github.ferusgrim.GrimList.PlayerData;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;

public class FileManager {
private GrimList plugin;
private PlayerData pd;

private String path;
private String isWhitelisted;
Expand All @@ -32,7 +29,6 @@ public class FileManager {

public FileManager(GrimList plugin) {
this.plugin = plugin;
pd = new PlayerData(plugin);
}

private void registerPaths(String uuid){
Expand All @@ -49,43 +45,37 @@ private void registerPaths(String uuid){

public boolean alreadyOnWhitelist(String uuid){
registerPaths(uuid);
if(!pd.get().isSet(path)){
return false;
}
if(!pd.get().getBoolean(isWhitelisted)){
return false;
}
return true;
return plugin.playerData.get().isSet(path) && plugin.playerData.get().getBoolean(isWhitelisted);
}

public boolean recordExists(String uuid){
registerPaths(uuid);
return pd.get().isSet(path);
return plugin.playerData.get().isSet(path);
}

public void deleteRecord(String uuid){
registerPaths(uuid);
pd.get().set(path, null);
pd.save();
plugin.playerData.get().set(path, null);
plugin.playerData.save();
}

public List<String> setupViewPlayers(String uuid){
registerPaths(uuid);
List<String> setupView = new ArrayList<String>();
setupView.add(pd.get().getString(lastUsername));
setupView.add(pd.get().getBoolean(isWhitelisted)? "Yes" : "No");
setupView.add(pd.get().getString(firstLogin));
setupView.add(pd.get().getString(lastLogin));
setupView.add(String.valueOf(pd.get().getInt(loginCount)));
setupView.add(plugin.playerData.get().getString(lastUsername));
setupView.add(plugin.playerData.get().getBoolean(isWhitelisted)? "Yes" : "No");
setupView.add(plugin.playerData.get().getString(firstLogin));
setupView.add(plugin.playerData.get().getString(lastLogin));
setupView.add(String.valueOf(plugin.playerData.get().getInt(loginCount)));
return setupView;
}

public List<String> setupPreviousUsernames(String uuid){
registerPaths(uuid);
List<String> usernames = new ArrayList<String>();
List<String> tmpStr = new ArrayList<String>(pd.get().getStringList(previousUsernames));
for(int i = 0; i < tmpStr.size(); i++){
usernames.add(tmpStr.get(i));
List<String> tmpStr = new ArrayList<String>(plugin.playerData.get().getStringList(previousUsernames));
for (String aTmpStr : tmpStr) {
usernames.add(aTmpStr);
}
tmpStr.clear();
return usernames;
Expand All @@ -94,17 +84,20 @@ public List<String> setupPreviousUsernames(String uuid){
public List<String> setupPreviousAddresses(String uuid){
registerPaths(uuid);
List<String> addresses = new ArrayList<String>();
List<String> tmpStr = new ArrayList<String>(pd.get().getStringList(previousAddresses));
for(int i = 0; i < tmpStr.size(); i++){
addresses.add(tmpStr.get(i));
List<String> tmpStr = new ArrayList<String>(plugin.playerData.get().getStringList(previousAddresses));
for (String aTmpStr : tmpStr) {
addresses.add(aTmpStr);
}
tmpStr.clear();
return addresses;
}

public String getUUID(String name){
for(String uuid : pd.get().getConfigurationSection("Players").getKeys(false)){
if(pd.get().getString("Players." + uuid + ".lastUsername").equalsIgnoreCase(name)){
if(plugin.playerData.get().getConfigurationSection("Players").getKeys(false) == null){
return "";
}
for(String uuid : plugin.playerData.get().getConfigurationSection("Players").getKeys(false)){
if(plugin.playerData.get().getString("Players." + uuid + ".lastUsername").equalsIgnoreCase(name)){
return uuid;
}
}
Expand All @@ -114,42 +107,42 @@ public String getUUID(String name){
public void toggleIsWhitelisted(String uuid, String name){
registerPaths(uuid);
if(alreadyOnWhitelist(uuid)){
pd.get().set(isWhitelisted, false);
plugin.playerData.get().set(isWhitelisted, false);
}else{
pd.get().set(isWhitelisted, true);
plugin.playerData.get().set(isWhitelisted, true);
}
pd.get().set(lastUsername, name);
pd.save();
plugin.playerData.get().set(lastUsername, name);
plugin.playerData.save();
}

public void onLoginRecordUpdater(String uuid, String playerName, String playerAddress) {
registerPaths(uuid);
if(!pd.get().isConfigurationSection(path)){
pd.get().createSection(path);
if(!plugin.playerData.get().isConfigurationSection(path)){
plugin.playerData.get().createSection(path);
}
if(!pd.get().isSet(isWhitelisted)){
pd.get().set(isWhitelisted, false);
if(!plugin.playerData.get().isSet(isWhitelisted)){
plugin.playerData.get().set(isWhitelisted, false);
}
pd.get().set(lastUsername, playerName);
List<String> tmpUn = new ArrayList<String>(pd.get().getStringList(previousUsernames));
plugin.playerData.get().set(lastUsername, playerName);
List<String> tmpUn = new ArrayList<String>(plugin.playerData.get().getStringList(previousUsernames));
if(!tmpUn.contains(playerName)){
tmpUn.add(playerName);
pd.get().set(previousUsernames, tmpUn);
plugin.playerData.get().set(previousUsernames, tmpUn);
}
pd.get().set(lastAddress, playerAddress);
List<String> tmpAd = new ArrayList<String>(pd.get().getStringList(previousAddresses));
plugin.playerData.get().set(lastAddress, playerAddress);
List<String> tmpAd = new ArrayList<String>(plugin.playerData.get().getStringList(previousAddresses));
if(!tmpAd.contains(playerAddress)){
tmpAd.add(playerAddress);
pd.get().set(previousAddresses, tmpAd);
plugin.playerData.get().set(previousAddresses, tmpAd);
}
SimpleDateFormat fDate = new SimpleDateFormat("MM.dd.yyyy-HH:mm:ss");
Date rDate = new Date();
String sDate = fDate.format(rDate);
if(!pd.get().isSet(firstLogin)){
pd.get().set(firstLogin, sDate);
if(!plugin.playerData.get().isSet(firstLogin)){
plugin.playerData.get().set(firstLogin, sDate);
}
pd.get().set(lastLogin, sDate);
pd.get().set(loginCount, pd.get().getInt(loginCount) + 1);
pd.save();
plugin.playerData.get().set(lastLogin, sDate);
plugin.playerData.get().set(loginCount, plugin.playerData.get().getInt(loginCount) + 1);
plugin.playerData.save();
}
}
14 changes: 6 additions & 8 deletions src/main/java/io/github/ferusgrim/GrimList/GrimList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@
package io.github.ferusgrim.GrimList;

import io.github.ferusgrim.GrimList.FocusManagers.FileManager;
import io.github.ferusgrim.GrimList.FocusManagers.MySQLManager;

import java.io.File;
import java.util.logging.Level;

import io.github.ferusgrim.GrimList.FocusManagers.SQLiteManager;
import io.github.ferusgrim.GrimList.FocusManagers.URLManager;
import net.gravitydevelopment.updater.Updater;

import org.bukkit.ChatColor;
Expand All @@ -26,12 +23,9 @@
*/

public class GrimList extends JavaPlugin {
private PlayerData playerData;
public PlayerData playerData;
public boolean isUpdateAvailable;
public FileManager filem;
public MySQLManager mysqlm;
public SQLiteManager sqlitem;
public URLManager urlm;
public String mStart = ChatColor.translateAlternateColorCodes('&', "&a&l[GrimList]&r&e ");
public String version = "";
public String link = "";
Expand All @@ -49,6 +43,7 @@ public void onEnable(){
switch(focusOn){
case "file":
filem = new FileManager(this);
playerData = new PlayerData(this);
break;
case "mysql":
log("SEVERE", "GrimList is released, right now, to prepare users for the UUID changes. Right now, \"file\" is the only supported whitelist format.");
Expand Down Expand Up @@ -90,11 +85,14 @@ public void onEnable(){
link = updater.getLatestFileLink();
}
if(focusOn.equals("file")){
playerData = new PlayerData(this);
if(!new File(getDataFolder(), "playerdata.yml").exists()){
playerData.saveDefault();
}
}
if(getConfig().getBoolean("Metrics")){
MetricManager mm = new MetricManager(this);
mm.setupMetric();
}
PluginManager pm = getServer().getPluginManager();
pm.registerEvents(new PlayerManager(this), this);
getCommand("whitelist").setExecutor(new Executor(this));
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/io/github/ferusgrim/GrimList/PlayerManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

package io.github.ferusgrim.GrimList;

import io.github.ferusgrim.GrimList.FocusManagers.FileManager;

import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
Expand All @@ -25,7 +23,7 @@ public PlayerManager(GrimList plugin){

@EventHandler(priority = EventPriority.HIGH)
public void onPlayerLogin(PlayerLoginEvent event){
if(!plugin.whitelistOn){
if(!plugin.getConfig().getBoolean("Whitelist")){
return;
}
Player player = event.getPlayer();
Expand Down

0 comments on commit 327190f

Please sign in to comment.