Skip to content

Commit 01f49ce

Browse files
author
BuildTools
committed
Improved command handler
1 parent 8b7b556 commit 01f49ce

3 files changed

Lines changed: 35 additions & 8 deletions

File tree

src/com/gmail/arkobat/EssUserDataCleaner/FileHandler.java

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,20 @@ public void checkFiles() {
4747
new BukkitRunnable() {
4848
@Override
4949
public void run() {
50-
File folder = new File("plugins\\Essentials\\userdata");
51-
File[] listOfFiles = folder.listFiles();
52-
usermap = new File("plugins\\Essentials\\usermap.csv");
53-
makeFolder();
50+
debug("Starting a purge");
51+
File folder = new File(main.getDataFolder() + File.separator + ".." + File.separator + "Essentials" + File.separator + "userdata");
52+
debug("Userdata folder path = " + main.getDataFolder() + File.separator + ".." + File.separator + "Essentials" + File.separator + "userdata");
53+
File[] listOfFiles = folder.listFiles();
54+
usermap = new File(main.getDataFolder() + File.separator + ".." + File.separator + "Essentials" + File.separator + "usermap.csv");
55+
debug("Defined files");
56+
makeFolder();
5457
int checkedFiles = 0;
5558
int shouldDelete = 0;
5659
int deletedFiles = 0;
5760
if (listOfFiles != null) {
5861
if (listOfFiles.length >= 1) {
62+
debug("Found " + listOfFiles.length + " files to handle");
63+
debug("Starting to run files");
5964
for (File file : listOfFiles) {
6065
checkedFiles++;
6166
if (checkFile(file)) {
@@ -67,14 +72,20 @@ public void run() {
6772

6873
}
6974
}
70-
}
75+
} else { debug("List of files == null"); }
7176
Bukkit.getServer().getConsoleSender().sendMessage("Checked files: " + checkedFiles);
7277
Bukkit.getServer().getConsoleSender().sendMessage("Files sent to deletion: " + shouldDelete);
7378
Bukkit.getServer().getConsoleSender().sendMessage("Files successfully deleted: " + deletedFiles);
7479
}
7580
}.runTaskAsynchronously(this.main);
7681
}
7782

83+
private void debug(String message) {
84+
if (main.debug) {
85+
Bukkit.getServer().getConsoleSender().sendMessage("§aEssClean DEBUG: §r" + message);
86+
}
87+
}
88+
7889
private boolean checkFile(File file) {
7990
if (compareSize(file)) {
8091
if (lastModified(file)) {
@@ -105,6 +116,7 @@ private boolean cantContain(File file) {
105116
lineChecked = true;
106117
String line = scanner.nextLine();
107118
if (cantContain.contains(line)) {
119+
debug("Files contains illegal lines");
108120
return false;
109121
}
110122
}
@@ -143,6 +155,7 @@ private boolean checkUsermap(File file) {
143155
lineChecked = true;
144156
String line = scanner.nextLine();
145157
if (line.contains(uuid)) {
158+
debug("usermap contains UUID");
146159
return false;
147160
}
148161
}
@@ -206,7 +219,7 @@ private boolean deleteFile(File file) {
206219

207220
private boolean moveFile(File file) {
208221
try {
209-
if (file.renameTo(new File(main.getDataFolder() + File.separator + "userdata\\" + file.getName()))) {
222+
if (file.renameTo(new File(main.getDataFolder() + File.separator + "userdata" + File.separator + file.getName()))) {
210223
if (main.inform) {
211224
Bukkit.getServer().getConsoleSender().sendMessage("Moved essential userdata file " + file.getName());
212225
return true;

src/com/gmail/arkobat/EssUserDataCleaner/Main.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public class Main extends JavaPlugin{
2121
public boolean inform;
2222
public long lastModified;
2323
public boolean consoleOnly;
24+
public boolean debug = false;
2425

2526

2627
FileHandler fileHandler = new FileHandler(this);
@@ -49,7 +50,7 @@ public void onDisable() {
4950
}
5051

5152

52-
private boolean loadDefaultConfig() {
53+
public boolean loadDefaultConfig() {
5354
noPermMsg = getConfig().getString("noPermMsg");
5455
maxSize = getConfig().getInt("maxSize");
5556
cantContain = getConfig().getStringList("cantContain");
@@ -61,6 +62,7 @@ private boolean loadDefaultConfig() {
6162
inform = getConfig().getBoolean("inform");
6263
lastModified = getConfig().getInt("lastModified");
6364
consoleOnly = getConfig().getBoolean("consoleOnly");
65+
debug = false;
6466
return true;
6567
}
6668

src/config.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
1+
# Commands:
2+
# /essclean purge - Starts to purge all userdata files (move or delete, depends on settings)
3+
# /essclean confirm - Confirms your purge request, and actually starts.
4+
# /essclean cancel - Cancels your purge request, and the purge wont start!!
5+
# /essclean debug - Enables/disable debug messages to the console
6+
# /essclean reload - Reloads the config.yml, and applies changes.
7+
8+
# Permissions:
9+
# EssUserDataCleaner.use - Allow user to use the plugin.
10+
11+
112
# Message to send players with no permission. (Standard is default Minecraft unknown command)
2-
noPermMsg: '&fUnknow command. Type "/help" for help'
13+
# To use color codes, use § and not &. (Example: "§eMessage" instead of "&eMessage")
14+
noPermMsg: '§fUnknown command. Type "/help" for help'
315

416
# Max file size in bytes. If the file is bigger it can't be affected in no way.
517
maxSize: 100

0 commit comments

Comments
 (0)