* Methods of Abstract Plugin Framework log utility are used.
*
* @author Rsl1122
@@ -12,6 +12,13 @@ import java.util.Collection;
*/
public class Log {
+ /**
+ * Constructor used to hide the public constructor
+ */
+ private Log() {
+ throw new IllegalStateException("Utility Class");
+ }
+
/**
* Logs the message to the console as INFO.
*
@@ -52,7 +59,7 @@ public class Log {
* Logs trace of caught Exception to Errors.txt and notifies on console.
*
* @param source Class name the exception was caught in.
- * @param e Throwable, eg NullPointerException
+ * @param e Throwable, eg NullPointerException
*/
public static void toLog(String source, Throwable e) {
Plan.getInstance().getPluginLogger().toLog(source, e);
@@ -62,7 +69,7 @@ public class Log {
* Logs multiple caught Errors to Errors.txt.
*
* @param source Class name the exception was caught in.
- * @param e Collection of Throwables, eg NullPointerException
+ * @param e Collection of Throwables, eg NullPointerException
*/
public static void toLog(String source, Collection
* Same as getPermission.
*
* @return permission node eg. plan.inspect
diff --git a/Plan/src/main/java/com/djrapitops/plan/Phrase.java b/Plan/src/main/java/com/djrapitops/plan/Phrase.java
index 8c3b24d93..1770c228b 100644
--- a/Plan/src/main/java/com/djrapitops/plan/Phrase.java
+++ b/Plan/src/main/java/com/djrapitops/plan/Phrase.java
@@ -1,12 +1,13 @@
package main.java.com.djrapitops.plan;
+import org.bukkit.ChatColor;
+
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
-import org.bukkit.ChatColor;
/**
* Phrase contains every message that is used in placeholders or commands. The
@@ -21,7 +22,7 @@ public enum Phrase {
PREFIX("[Plan] "),
ENABLED("Player Analytics Enabled."),
DISABLED("Player Analytics Disabled."),
- RELOAD_COMPLETE(ChatColor.GREEN + "" + PREFIX + "Reload complete."),
+ RELOAD_COMPLETE(ChatColor.GREEN.toString() + PREFIX + "Reload complete."),
CACHE_SAVE("Saving cached data.."),
CACHE_ADD("Added REPLACE0 to Cache."),
CACHE_REMOVE("Cleared REPLACE0 from Cache."),
@@ -34,7 +35,7 @@ public enum Phrase {
DB_ESTABLISHED(REPLACE0 + "-database connection established."),
DB_TYPE_DOES_NOT_EXIST("That database type doesn't exist."),
DB_FAILURE_DISABLE("Database initialization has failed, disabling Plan."),
- NOTIFY_EMPTY_IP(ChatColor.YELLOW + "" + PREFIX + "IP in server.properties is empty & AlternativeServerIP is not used, incorrect links will be given!"),
+ NOTIFY_EMPTY_IP(ChatColor.YELLOW.toString() + PREFIX + "IP in server.properties is empty & AlternativeServerIP is not used, incorrect links will be given!"),
NOTIFY_DISABLED_CHATLISTENER(ChatColor.YELLOW + "Chat listener disabled, nickname info inaccurate."),
NOTIFY_DISABLED_GMLISTENER(ChatColor.YELLOW + "Gamemode change listener disabled, Gm times info inaccurate."),
NOTIFY_DISABLED_COMMANDLISTENER(ChatColor.YELLOW + "Command usage listener disabled."),
@@ -44,14 +45,14 @@ public enum Phrase {
CACHE_GETTASK_DISABLED("Attempted to schedule data grab after task was shut down."),
CACHE_CLEARTASK_DISABLED("Attempted to schedule data for clear after task was shut down."),
//
- VERSION_NEW_AVAILABLE("New Version (" + REPLACE0 + ") is availible at https://www.spigotmc.org/resources/plan-player-analytics.32536/"),
+ VERSION_NEW_AVAILABLE("New Version (" + REPLACE0 + ") is available at https://www.spigotmc.org/resources/plan-player-analytics.32536/"),
VERSION_LATEST("You're running the latest version"),
VERSION_CHECK_ERROR("Failed to compare versions."),
VERSION_FAIL("Failed to get newest version number."),
//
- USERNAME_NOT_VALID(ChatColor.RED + "" + PREFIX + "This Player doesn't exist."),
- USERNAME_NOT_SEEN(ChatColor.RED + "" + PREFIX + "This Player has not played on this server."),
- USERNAME_NOT_KNOWN(ChatColor.RED + "" + PREFIX + "Player not found from the database."),
+ USERNAME_NOT_VALID(ChatColor.RED.toString() + PREFIX + "This Player doesn't exist."),
+ USERNAME_NOT_SEEN(ChatColor.RED.toString() + PREFIX + "This Player has not played on this server."),
+ USERNAME_NOT_KNOWN(ChatColor.RED.toString() + PREFIX + "Player not found from the database."),
//
COLOR_MAIN(ChatColor.getByChar(Settings.COLOR_MAIN.toString().charAt(1))),
COLOR_SEC(ChatColor.getByChar(Settings.COLOR_SEC.toString().charAt(1))),
@@ -59,14 +60,14 @@ public enum Phrase {
//
ARROWS_RIGHT("»"),
BALL("•"),
- GRABBING_DATA_MESSAGE(COLOR_TER + "" + ARROWS_RIGHT + COLOR_MAIN.color() + " Fetching data to cache.."),
+ GRABBING_DATA_MESSAGE(COLOR_TER.toString() + ARROWS_RIGHT + COLOR_MAIN.color() + " Fetching data to cache.."),
//
DEM_UNKNOWN("Not Known"),
NOT_IN_TOWN("Not in a town"),
NOT_IN_FAC("Not in a faction"),
//
ANALYSIS("Analysis | "),
- COMMAND_TIMEOUT(ChatColor.RED + "" + PREFIX + "REPLACE0 Command timed out! Check '/plan status' & console."),
+ COMMAND_TIMEOUT(ChatColor.RED.toString() + PREFIX + "REPLACE0 Command timed out! Check '/plan status' & console."),
ANALYSIS_START(ANALYSIS + "Beginning analysis of user data.."),
ANALYSIS_BOOT_NOTIFY(ANALYSIS + "Boot analysis in 30 seconds.."),
ANALYSIS_BOOT(ANALYSIS + "Starting Boot Analysis.."),
@@ -82,45 +83,45 @@ public enum Phrase {
ERROR_CONSOLE_PLAYER("This point of code should not be accessable on console. Inform author: " + REPLACE0 + " Console: REPLACE1"),
ERROR_NO_DATA_VIEW(ChatColor.YELLOW + "Webserver disabled but Alternative IP/PlanLite not used, no way to view data!"),
ERROR_WEBSERVER_OFF_ANALYSIS(ChatColor.YELLOW + "" + PREFIX + "This command can be only used if the webserver is running on this server."),
- ERROR_WEBSERVER_OFF_INSPECT(ChatColor.YELLOW + "" + PREFIX + "This command can be only used if webserver/planlite is enabled on this server."),
+ ERROR_WEBSERVER_OFF_INSPECT(ChatColor.YELLOW + "" + PREFIX + "This command can be only used if webserver is enabled on this server."),
ERROR_LOGGED("Caught " + REPLACE0 + ". It has been logged to the Errors.txt"),
ERROR_SESSIONDATA_INITIALIZATION("Player's session was initialized in a wrong way! (" + REPLACE0 + ")"),
ERROR_ANALYSIS_FETCH_FAIL("Failed to fetch data for Analysis, Exception occurred."),
ERROR_ANALYSIS_DISABLED_TEMPORARILY(ChatColor.YELLOW + "Analysis has been temporarily disabled due to expensive task, use /plan status for info."),
//
- CMD_FOOTER(COLOR_TER.color() + "" + ARROWS_RIGHT),
- MANAGE_ERROR_INCORRECT_PLUGIN(ChatColor.RED + "" + PREFIX + "Plugin not supported: "),
- MANAGE_PROCESS_START(ARROWS_RIGHT + "" + COLOR_SEC.color() + " Processing data.."),
- MANAGE_ERROR_PLUGIN_NOT_ENABLED(ChatColor.RED + "" + PREFIX + "Plugin is not enabled: "),
- MANAGE_ERROR_INCORRECT_DB(ChatColor.RED + "" + PREFIX + "Incorrect database! (sqlite/mysql accepted): "),
- MANAGE_ERROR_SAME_DB(ChatColor.RED + "" + PREFIX + "Can't move to the same database!"),
- MANAGE_DATABASE_FAILURE(ChatColor.RED + "" + PREFIX + "One of the databases was not initialized properly."),
- MANAGE_DB_CONFIG_REMINDER(ChatColor.YELLOW + "" + PREFIX + "Remember to swap to the new database and reload plugin"),
- MANAGE_ERROR_NO_PLAYERS(ChatColor.RED + "" + PREFIX + "Database has no player data!"),
- MANAGE_ERROR_BACKUP_FILE_NOT_FOUND(ChatColor.RED + "" + PREFIX + "Backup file doesn't exist!"),
- MANAGE_MOVE_SUCCESS(ChatColor.GREEN + "" + PREFIX + "All data moved successfully!"),
- MANAGE_COPY_SUCCESS(ChatColor.GREEN + "" + PREFIX + "All data copied successfully!"),
- MANAGE_PROCESS_FAIL(ChatColor.RED + "" + PREFIX + "Something went wrong while processing the data!"),
- MANAGE_CLEAR_SUCCESS(ChatColor.GREEN + "" + PREFIX + "All data cleared successfully!"),
+ CMD_FOOTER(COLOR_TER.color().toString() + ARROWS_RIGHT),
+ MANAGE_ERROR_INCORRECT_PLUGIN(ChatColor.RED.toString() + PREFIX + "Plugin not supported: "),
+ MANAGE_PROCESS_START(ARROWS_RIGHT.toString() + COLOR_SEC.color() + " Processing data.."),
+ MANAGE_ERROR_PLUGIN_NOT_ENABLED(ChatColor.RED.toString() + PREFIX + "Plugin is not enabled: "),
+ MANAGE_ERROR_INCORRECT_DB(ChatColor.RED.toString() + PREFIX + "Incorrect database! (sqlite/mysql accepted): "),
+ MANAGE_ERROR_SAME_DB(ChatColor.RED.toString() + PREFIX + "Can't move to the same database!"),
+ MANAGE_DATABASE_FAILURE(ChatColor.RED.toString() + PREFIX + "One of the databases was not initialized properly."),
+ MANAGE_DB_CONFIG_REMINDER(ChatColor.YELLOW.toString() + PREFIX + "Remember to swap to the new database and reload plugin"),
+ MANAGE_ERROR_NO_PLAYERS(ChatColor.RED.toString() + PREFIX + "Database has no player data!"),
+ MANAGE_ERROR_BACKUP_FILE_NOT_FOUND(ChatColor.RED.toString() + PREFIX + "Backup file doesn't exist!"),
+ MANAGE_MOVE_SUCCESS(ChatColor.GREEN.toString() + PREFIX + "All data moved successfully!"),
+ MANAGE_COPY_SUCCESS(ChatColor.GREEN.toString() + PREFIX + "All data copied successfully!"),
+ MANAGE_PROCESS_FAIL(ChatColor.RED.toString() + PREFIX + "Something went wrong while processing the data!"),
+ MANAGE_CLEAR_SUCCESS(ChatColor.GREEN.toString() + PREFIX + "All data cleared successfully!"),
MANAGE_REMOVE_SUCCESS(CMD_FOOTER + " " + COLOR_MAIN.color() + "Data of " + COLOR_TER.color() + "REPLACE0" + COLOR_MAIN.color() + " was removed from Database " + COLOR_TER.color() + "REPLACE1" + COLOR_MAIN.color() + "."),
MANAGE_IMPORTING(CMD_FOOTER + " " + COLOR_MAIN.color() + " Importing Data.."),
MANAGE_SUCCESS(CMD_FOOTER + " " + COLOR_MAIN.color() + " Success!"),
//
CMD_BALL(COLOR_SEC.color() + " " + Phrase.BALL.toString() + COLOR_MAIN.color()),
- CMD_ANALYZE_HEADER(CMD_FOOTER + "" + COLOR_MAIN.color() + " Player Analytics - Analysis results"),
- CMD_INSPECT_HEADER(CMD_FOOTER + "" + COLOR_MAIN.color() + " Player Analytics - Inspect results: "),
- CMD_INFO_HEADER(CMD_FOOTER + "" + COLOR_MAIN.color() + " Player Analytics - Info"),
- CMD_INFO_VERSION(CMD_BALL + "" + COLOR_MAIN.color() + " Version: " + COLOR_SEC.color() + REPLACE0),
- CMD_SEARCH_HEADER(CMD_FOOTER + "" + COLOR_MAIN.color() + " Player Analytics - Search results for: "),
- CMD_SEARCH_SEARCHING(CMD_FOOTER + "" + COLOR_MAIN.color() + " Searching.."),
- CMD_HELP_HEADER(CMD_FOOTER + "" + COLOR_MAIN.color() + " Player Analytics - Help"),
- CMD_MANAGE_HELP_HEADER(CMD_FOOTER + "" + COLOR_MAIN.color() + " Player Analytics - Managment Help"),
- CMD_MANAGE_STATUS_HEADER(CMD_FOOTER + "" + COLOR_MAIN.color() + " Player Analytics - Database status"),
- CMD_MANAGE_STATUS_ACTIVE_DB(CMD_BALL + "" + COLOR_MAIN.color() + " Active Database: " + COLOR_SEC.color() + "REPLACE0"),
- CMD_MANAGE_STATUS_QUEUE_SAVE(CMD_BALL + "" + COLOR_MAIN.color() + " Save Queue Size: " + COLOR_SEC.color() + "REPLACE0/" + Settings.PROCESS_SAVE_LIMIT.getNumber()),
- CMD_MANAGE_STATUS_QUEUE_GET(CMD_BALL + "" + COLOR_MAIN.color() + " Get Queue Size: " + COLOR_SEC.color() + "REPLACE0/" + Settings.PROCESS_GET_LIMIT.getNumber()),
- CMD_MANAGE_STATUS_QUEUE_CLEAR(CMD_BALL + "" + COLOR_MAIN.color() + " Clear Queue Size: " + COLOR_SEC.color() + "REPLACE0/" + Settings.PROCESS_CLEAR_LIMIT.getNumber()),
- CMD_MANAGE_STATUS_QUEUE_PROCESS(CMD_BALL + "" + COLOR_MAIN.color() + " Process Queue Size: " + COLOR_SEC.color() + "REPLACE0/20000"),
+ CMD_ANALYZE_HEADER(CMD_FOOTER.toString() + COLOR_MAIN.color() + " Player Analytics - Analysis results"),
+ CMD_INSPECT_HEADER(CMD_FOOTER.toString() + COLOR_MAIN.color() + " Player Analytics - Inspect results: "),
+ CMD_INFO_HEADER(CMD_FOOTER.toString() + COLOR_MAIN.color() + " Player Analytics - Info"),
+ CMD_INFO_VERSION(CMD_BALL.toString() + COLOR_MAIN.color() + " Version: " + COLOR_SEC.color() + REPLACE0),
+ CMD_SEARCH_HEADER(CMD_FOOTER.toString() + COLOR_MAIN.color() + " Player Analytics - Search results for: "),
+ CMD_SEARCH_SEARCHING(CMD_FOOTER.toString() + COLOR_MAIN.color() + " Searching.."),
+ CMD_HELP_HEADER(CMD_FOOTER.toString() + COLOR_MAIN.color() + " Player Analytics - Help"),
+ CMD_MANAGE_HELP_HEADER(CMD_FOOTER.toString() + COLOR_MAIN.color() + " Player Analytics - Managment Help"),
+ CMD_MANAGE_STATUS_HEADER(CMD_FOOTER.toString() + COLOR_MAIN.color() + " Player Analytics - Database status"),
+ CMD_MANAGE_STATUS_ACTIVE_DB(CMD_BALL.toString() + COLOR_MAIN.color() + " Active Database: " + COLOR_SEC.color() + "REPLACE0"),
+ CMD_MANAGE_STATUS_QUEUE_SAVE(CMD_BALL.toString() + COLOR_MAIN.color() + " Save Queue Size: " + COLOR_SEC.color() + "REPLACE0/" + Settings.PROCESS_SAVE_LIMIT.getNumber()),
+ CMD_MANAGE_STATUS_QUEUE_GET(CMD_BALL.toString() + COLOR_MAIN.color() + " Get Queue Size: " + COLOR_SEC.color() + "REPLACE0/" + Settings.PROCESS_GET_LIMIT.getNumber()),
+ CMD_MANAGE_STATUS_QUEUE_CLEAR(CMD_BALL.toString() + COLOR_MAIN.color() + " Clear Queue Size: " + COLOR_SEC.color() + "REPLACE0/" + Settings.PROCESS_CLEAR_LIMIT.getNumber()),
+ CMD_MANAGE_STATUS_QUEUE_PROCESS(CMD_BALL.toString() + COLOR_MAIN.color() + " Process Queue Size: " + COLOR_SEC.color() + "REPLACE0/20000"),
CMD_CLICK_ME("Click Me"),
CMD_LINK(COLOR_SEC.color() + " " + BALL + COLOR_MAIN.color() + " Link: " + COLOR_TER.color()),
CMD_PASS_PLANLITE("UNUSED"),
@@ -134,7 +135,7 @@ public enum Phrase {
CMD_USG_INFO("View Version of Plan"),
CMD_USG_INSPECT("Inspect Player's Data"),
CMD_USG_QINSPECT("QuickInspect Player's Data"),
- CMD_USG_MANAGE("Database managment command"),
+ CMD_USG_MANAGE("Database management command"),
CMD_USG_MANAGE_BACKUP("Backup a database to .db file"),
CMD_USG_MANAGE_RESTORE("Restore a database from a backup file"),
CMD_USG_MANAGE_MOVE("Copy data from one database to another & overwrite values"),
@@ -144,7 +145,7 @@ public enum Phrase {
CMD_USG_MANAGE_CLEAN("Clear incorrect data from the database"),
CMD_USG_MANAGE_REMOVE("Remove players's data from the Active Database."),
CMD_USG_MANAGE_STATUS("Check the status of the Active Database."),
- CMD_USG_MANAGE_HELP("Show managment help."),
+ CMD_USG_MANAGE_HELP("Show management help."),
CMD_USG_MANAGE_HOTSWAP("Hotswap to another database & restart the plugin"),
CMD_USG_RELOAD("Reload plugin config & save cached data"),
CMD_USG_SEARCH("Search for player"),
@@ -167,11 +168,11 @@ public enum Phrase {
WARN_OVERWRITE_SOME("Some data in REPLACE0-database will be overwritten!"),
WARN_REMOVE("Data in REPLACE0-database will be removed!"),
//
- COMMAND_SENDER_NOT_PLAYER(ChatColor.RED + "" + PREFIX + "This command can be only used as a player."),
- COMMAND_REQUIRES_ARGUMENTS(ChatColor.RED + "" + PREFIX + "Command requires arguments. REPLACE0"),
- COMMAND_ADD_CONFIRMATION_ARGUMENT(ChatColor.RED + "" + PREFIX + "Add -a to confirm execution! REPLACE0"),
- COMMAND_REQUIRES_ARGUMENTS_ONE(ChatColor.RED + "" + PREFIX + "Command requires one argument."),
- COMMAND_NO_PERMISSION(ChatColor.RED + "" + PREFIX + "You do not have the required permmission."),
+ COMMAND_SENDER_NOT_PLAYER(ChatColor.RED.toString() + PREFIX + "This command can be only used as a player."),
+ COMMAND_REQUIRES_ARGUMENTS(ChatColor.RED.toString() + PREFIX + "Command requires arguments. REPLACE0"),
+ COMMAND_ADD_CONFIRMATION_ARGUMENT(ChatColor.RED.toString() + PREFIX + "Add -a to confirm execution! REPLACE0"),
+ COMMAND_REQUIRES_ARGUMENTS_ONE(ChatColor.RED.toString() + PREFIX + "Command requires one argument."),
+ COMMAND_NO_PERMISSION(ChatColor.RED.toString() + PREFIX + "You do not have the required permission."),
ERROR_TOO_SMALL_QUEUE("Queue size is too small! (REPLACE0), change the setting to a higher number! (Currently REPLACE1)");
private String text;
@@ -187,6 +188,32 @@ public enum Phrase {
this.text = "";
}
+ static void loadLocale(File localeFile) {
+ try (Scanner localeScanner = new Scanner(localeFile, "UTF-8")) {
+ List
* Everything can be accessed through this class. Use Plan.getInstance() to get
* the initialised instance of Plan.
*
@@ -71,14 +74,38 @@ public class Plan extends BukkitPlugin
* - Enables the plugin's subsystems.
*/
@Override
@@ -103,13 +130,13 @@ public class Plan extends BukkitPlugin
* Stops the webserver, cancels all tasks and saves cache to the database.
*/
@Override
public void onDisable() {
+ //Clears the page cache
+ PageCacheHandler.clearCache();
+
// Stop the UI Server
if (uiServer != null) {
uiServer.stop();
}
+
getServer().getScheduler().cancelTasks(this);
+
if (Verify.notNull(handler, db)) {
Benchmark.start("Disable: DataCache Save");
// Saves the DataCache to the database without Bukkit's Schedulers.
- Log.info(Phrase.CACHE_SAVE + "");
- ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+ Log.info(Phrase.CACHE_SAVE.toString());
+
+ ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
scheduler.execute(() -> {
handler.saveCacheOnDisable();
taskStatus().cancelAllKnownTasks();
Benchmark.stop("Disable: DataCache Save");
});
- scheduler.shutdown(); // Schedules the save to shutdown after it has ran the execute method.
+ scheduler.shutdown(); // Schedules the save to shutdown after it has ran the execute method.
}
- Log.info(Phrase.DISABLED + "");
+
+ Log.info(Phrase.DISABLED.toString());
}
private void registerListeners() {
Benchmark.start("Enable: Register Listeners");
registerListener(new PlanPlayerListener(this));
- boolean chatListenerIsEnabled = Check.isTrue(Settings.GATHERCHAT.isTrue(), Phrase.NOTIFY_DISABLED_CHATLISTENER + "");
- boolean gamemodeChangeListenerIsEnabled = Check.isTrue(Settings.GATHERGMTIMES.isTrue(), Phrase.NOTIFY_DISABLED_GMLISTENER + "");
- boolean commandListenerIsEnabled = Check.isTrue(Settings.GATHERCOMMANDS.isTrue(), Phrase.NOTIFY_DISABLED_COMMANDLISTENER + "");
- boolean deathListenerIsEnabled = Check.isTrue(Settings.GATHERKILLS.isTrue(), Phrase.NOTIFY_DISABLED_DEATHLISTENER + "");
+ boolean chatListenerIsEnabled = Check.isTrue(Settings.GATHERCHAT.isTrue(), Phrase.NOTIFY_DISABLED_CHATLISTENER.toString());
+ boolean commandListenerIsEnabled = Check.isTrue(Settings.GATHERCOMMANDS.isTrue(), Phrase.NOTIFY_DISABLED_COMMANDLISTENER.toString());
+ boolean deathListenerIsEnabled = Check.isTrue(Settings.GATHERKILLS.isTrue(), Phrase.NOTIFY_DISABLED_DEATHLISTENER.toString());
if (chatListenerIsEnabled) {
registerListener(new PlanChatListener(this));
}
- if (gamemodeChangeListenerIsEnabled) {
- registerListener(new PlanGamemodeChangeListener(this));
- }
+
+ registerListener(new PlanGamemodeChangeListener(this));
+ registerListener(new PlanWorldChangeListener(this));
+
if (commandListenerIsEnabled) {
registerListener(new PlanCommandPreprocessListener(this));
}
+
if (deathListenerIsEnabled) {
registerListener(new PlanDeathEventListener(this));
}
+
Benchmark.stop("Enable: Register Listeners");
}
/**
* Initializes the database according to settings in the config.
- *
+ *
* If database connection can not be established plugin is disabled.
*
* @return true if init was successful, false if not.
@@ -243,7 +283,7 @@ public class Plan extends BukkitPlugin
* #init() might need to be called in order for the object to function.
*
* @return Set containing the SqLite and MySQL objects.
*/
- public HashSet
* Methods can be called from Asynchronous task and are thread safe unless
* otherwise stated.
- *
+ *
* Use Plan.getPlanAPI() to get the API.
- *
+ *
* More information about API methods can be found on GitHub.
*
* @author Rsl1122
- * @since 2.0.0
* @see PluginData
* @see AnalysisType
* @see DBCallableProcessor
* @see HandlingInfo
+ * @since 2.0.0
*/
public class API {
@@ -65,12 +65,12 @@ public class API {
/**
* Add a source of plugin data to the Plugins tab on Analysis and/or Inspect
* page.
- *
+ *
* Refer to documentation on GitHub or Javadoc of PluginData to set-up a
* data source that extends PluginData correctly.
*
* @param dataSource an object that extends PluginData-object, thus allowing
- * Analysis and Inspect to manage the data of a plugin correctly.
+ * Analysis and Inspect to manage the data of a plugin correctly.
* @see PluginData
*/
public void addPluginDataSource(PluginData dataSource) {
@@ -81,15 +81,15 @@ public class API {
/**
* Used to get the link to InspectPage of a player.
- *
+ *
* This method is useful if you have a table and want to link to the inspect
* page.
+ *
+ * Html.LINK.parse("Link", "PlayerName") can be used to get a link
+ * {@code PlayerName}
*
- * Html.LINK.parse("Link", "Playername") can be used to get a link
- * {@code Playername}
- *
- * @param name Playername of the player
- * @return ip:port/security/player/Playername
+ * @param name Name of the player
+ * @return ip:port/security/player/PlayerName
*/
public String getPlayerInspectPageLink(String name) {
return HtmlUtils.getInspectUrlWithProtocol(name);
@@ -98,12 +98,12 @@ public class API {
/**
* Schedule a UserData object to be fetched from the database or cache if
* the player is online.
- *
+ *
* The data will not be cached if it is not already cached.
*
- * @param uuid UUID of the player.
+ * @param uuid UUID of the player.
* @param processor Object implementing DBCallableProcessor, which
- * process (UserData data) method will be called.
+ * process (UserData data) method will be called.
*/
public void scheduleForGet(UUID uuid, DBCallableProcessor processor) {
plugin.getHandler().getUserDataForProcessing(processor, uuid, false);
@@ -111,7 +111,7 @@ public class API {
/**
* Schedule a HandlingInfo object to be processed.
- *
+ *
* UserData associated with the UUID of the HandlingInfo object will be
* cached.
*
@@ -123,11 +123,11 @@ public class API {
/**
* Used to cache a UserData object.
- *
+ *
* If data is already cached it will be overridden.
*
* @param data UserData object. Will be placed to the data.getUuid() key in
- * the cache.
+ * the cache.
*/
public void placeDataToCache(UserData data) {
plugin.getHandler().cache(data);
@@ -135,7 +135,7 @@ public class API {
/**
* Used to save the cached data to the database.
- *
+ *
* Should be only called from an Asynchronous thread.
*/
public void saveCachedData() {
@@ -154,7 +154,7 @@ public class API {
/**
* Cache the UserData to InspectCache.
- *
+ *
* Uses cache if data is cached or database if not. Call from an Asynchronous
* thread.
*
@@ -166,14 +166,14 @@ public class API {
/**
* Used to get the full Html of the Inspect page as a string.
- *
+ *
* Check if the data is cached to InspectCache before calling this.
*
* @param uuid UUID of the player.
* @return player.html with all placeholders replaced.
*/
public String getPlayerHtmlAsString(UUID uuid) {
- WebSocketServer server = plugin.getUiServer();
+ WebServer server = plugin.getUiServer();
if (Verify.notNull(server)) {
return server.getDataReqHandler().getInspectHtml(uuid);
}
@@ -193,7 +193,7 @@ public class API {
/**
* Run's the analysis with the current data in the cache and fetches rest
* from the database.
- *
+ *
* Starts a new Asynchronous task to run the analysis.
*/
public void updateAnalysisCache() {
@@ -202,13 +202,13 @@ public class API {
/**
* Used to get the full HTML of the Analysis page as a string.
- *
+ *
* Check if the data is cached to AnalysisCache before calling this.
*
* @return analysis.html with all placeholders replaced.
*/
public String getAnalysisHtmlAsString() {
- WebSocketServer server = plugin.getUiServer();
+ WebServer server = plugin.getUiServer();
if (Verify.notNull(server)) {
return server.getDataReqHandler().getAnalysisHtml();
}
@@ -218,7 +218,7 @@ public class API {
/**
* Used to get the AnalysisData object.
- *
+ *
* Check if the data is cached to AnalysisCache before calling this.
*
* @return AnalysisData object.
@@ -229,13 +229,13 @@ public class API {
}
/**
- * Used to get the playerName of a player who has played on the server.
+ * Used to get the PlayerName of a player who has played on the server.
*
* @param uuid UUID of the player.
- * @return Playername, eg "Rsl1122"
+ * @return PlayerName, eg "Rsl1122"
* @throws IllegalArgumentException If uuid is null.
- * @throws IllegalStateException If the player has not played on the server
- * before.
+ * @throws IllegalStateException If the player has not played on the server
+ * before.
*/
public String getPlayerName(UUID uuid) throws IllegalStateException, IllegalArgumentException {
Verify.nullCheck(uuid);
@@ -253,13 +253,13 @@ public class API {
* @return UUID of the Player
* @throws Exception if player's name is not registered at Mojang
*/
- public UUID playerNameToUUID(String playerName) throws Exception {
+ public UUID PlayerNameToUUID(String playerName) throws Exception {
return UUIDFetcher.getUUIDOf(playerName);
}
/**
* Get the saved UUIDs in the database.
- *
+ *
* Should be called from async thread.
*
* @return Collection of UUIDs that can be found in the database.
@@ -272,9 +272,9 @@ public class API {
/**
* Get the saved UserData in the database for a collection of UUIDs.
- *
+ *
* Will not contain data for UUIDs not found in the database.
- *
+ *
* Should be called from async thread.
*
* @param uuids Collection of UUIDs that can be found in the database.
@@ -288,7 +288,7 @@ public class API {
/**
* Get the cached UserData objects in the InspectCache.
- *
+ *
* This can be used with PluginData objects safely to get the data for all
* users in Plan database, because all data is InspectCached before analysis
* begins.
@@ -302,7 +302,7 @@ public class API {
/**
* Get the cached UserData objects in the InspectCache in a Map form.
- *
+ *
* This can be used with PluginData objects safely to get the data for all
* users in Plan database, because all data is InspectCached before analysis
* begins.
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/ConditionUtils.java b/Plan/src/main/java/com/djrapitops/plan/command/ConditionUtils.java
index aea74ca74..346ef4219 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/ConditionUtils.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/ConditionUtils.java
@@ -14,6 +14,13 @@ import java.util.UUID;
*/
public class ConditionUtils {
+ /**
+ * Constructor used to hide the public constructor
+ */
+ private ConditionUtils() {
+ throw new IllegalStateException("Utility class");
+ }
+
/**
* Check if the plugin can display the data.
*
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java
index bf8c17817..9a840ab58 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java
@@ -3,15 +3,16 @@ package main.java.com.djrapitops.plan.command;
import com.djrapitops.plugin.command.CommandType;
import com.djrapitops.plugin.command.TreeCommand;
import com.djrapitops.plugin.command.defaultcmds.StatusCommand;
+import com.djrapitops.plugin.settings.ColorScheme;
import main.java.com.djrapitops.plan.Permissions;
import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.command.commands.*;
/**
* TreeCommand for the /plan command, and all subcommands.
- *
+ *
* Uses the Abstract Plugin Framework for easier command management.
- *
+ *
* @author Rsl1122
* @since 1.0.0
*/
@@ -19,7 +20,7 @@ public class PlanCommand extends TreeCommand
* Initializes Subcommands
*
* @param plugin Current instance of Plan
@@ -27,6 +28,24 @@ public class PlanCommand extends TreeCommand
* Final because
*
* @param sender Command sender.
@@ -129,17 +144,9 @@ public class AnalyzeCommand extends SubCommand {
sender.sendMessage(message + url);
} else {
sender.sendMessage(message);
- sendLink(sender, url);
+ sender.sendLink(" ", Phrase.CMD_CLICK_ME.toString(), url);
}
}
- sender.sendMessage(Phrase.CMD_FOOTER + "");
- }
-
- @Deprecated // TODO Will be rewritten to the RslPlugin abstractions in the future.
- private void sendLink(ISender sender, String url) throws CommandException {
- plugin.getServer().dispatchCommand(
- Bukkit.getConsoleSender(),
- "tellraw " + sender.getName() + " [\"\",{\"text\":\"" + Phrase.CMD_CLICK_ME + "\",\"underlined\":true,"
- + "\"clickEvent\":{\"action\":\"open_url\",\"value\":\"" + url + "\"}}]");
+ sender.sendMessage(Phrase.CMD_FOOTER.toString());
}
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/InfoCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/InfoCommand.java
index c4d4d84de..9a59230f7 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/InfoCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/InfoCommand.java
@@ -34,11 +34,11 @@ public class InfoCommand extends SubCommand {
public boolean onCommand(ISender sender, String commandLabel, String[] args) {
ChatColor tColor = Phrase.COLOR_SEC.color();
String[] messages = {
- Phrase.CMD_INFO_HEADER.toString(),
- Phrase.CMD_INFO_VERSION.parse(plugin.getDescription().getVersion()),
- Phrase.CMD_BALL.toString() + tColor + " " + Version.checkVersion(plugin),
- Phrase.CMD_MANAGE_STATUS_ACTIVE_DB.parse(plugin.getDB().getConfigName()),
- Phrase.CMD_FOOTER.toString()
+ Phrase.CMD_INFO_HEADER.toString(),
+ Phrase.CMD_INFO_VERSION.parse(plugin.getDescription().getVersion()),
+ Phrase.CMD_BALL.toString() + tColor + " " + Version.checkVersion(plugin),
+ Phrase.CMD_MANAGE_STATUS_ACTIVE_DB.parse(plugin.getDB().getConfigName()),
+ Phrase.CMD_FOOTER.toString()
};
sender.sendMessage(messages);
return true;
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java
index d6d8383bc..9a16ff96a 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java
@@ -5,6 +5,7 @@ import com.djrapitops.plugin.command.CommandType;
import com.djrapitops.plugin.command.CommandUtils;
import com.djrapitops.plugin.command.ISender;
import com.djrapitops.plugin.command.SubCommand;
+import com.djrapitops.plugin.settings.ColorScheme;
import com.djrapitops.plugin.task.AbsRunnable;
import com.djrapitops.plugin.utilities.Verify;
import main.java.com.djrapitops.plan.*;
@@ -15,9 +16,7 @@ import main.java.com.djrapitops.plan.utilities.Check;
import main.java.com.djrapitops.plan.utilities.HtmlUtils;
import main.java.com.djrapitops.plan.utilities.MiscUtils;
import main.java.com.djrapitops.plan.utilities.uuid.UUIDUtility;
-import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
-import org.bukkit.command.CommandException;
import java.sql.SQLException;
import java.util.UUID;
@@ -43,6 +42,24 @@ public class InspectCommand extends SubCommand {
this.plugin = plugin;
inspectCache = plugin.getInspectCache();
+ setHelp(plugin);
+ }
+
+ private void setHelp(Plan plugin) {
+ ColorScheme colorScheme = plugin.getColorScheme();
+
+ String mCol = colorScheme.getMainColor();
+ String sCol = colorScheme.getSecondaryColor();
+ String tCol = colorScheme.getTertiaryColor();
+
+ String[] help = new String[]{
+ mCol + "Inspect command",
+ tCol + " Used to get a link to User's inspect page.",
+ sCol + " Own inspect page can be accessed with /plan inspect",
+ sCol + " Alias: /plan
* Subcommand is not registered if Webserver is not enabled.
- *
+ *
* @author Rsl1122
* @since 3.5.2
*/
public class ListCommand extends SubCommand {
- private final Plan plugin;
-
/**
* Class Constructor.
*
* @param plugin Current instance of Plan
*/
public ListCommand(Plan plugin) {
- super("list", CommandType.CONSOLE, Permissions.INSPECT_OTHER.getPermission(), "List to all cached players", "");
+ super("list, pl", CommandType.CONSOLE, Permissions.INSPECT_OTHER.getPermission(), "List to all cached players", "");
- this.plugin = plugin;
+ setHelp(plugin);
+ }
+
+ private void setHelp(Plan plugin) {
+ ColorScheme colorScheme = plugin.getColorScheme();
+
+ String mCol = colorScheme.getMainColor();
+ String sCol = colorScheme.getSecondaryColor();
+ String tCol = colorScheme.getTertiaryColor();
+
+ String[] help = new String[]{
+ mCol + "List command",
+ tCol + " Used to get a link to players page.",
+ sCol + " Players page contains links to all cached inspect pages.",
+ sCol + " Alias: /plan pl"
+ };
+
+ setInDepthHelp(help);
}
@Override
@@ -50,22 +64,14 @@ public class ListCommand extends SubCommand {
// Link
String url = HtmlUtils.getServerAnalysisUrlWithProtocol().replace("server", "players");
- String message = Phrase.CMD_LINK + "";
+ String message = Phrase.CMD_LINK.toString();
boolean console = !CommandUtils.isPlayer(sender);
if (console) {
sender.sendMessage(message + url);
} else {
sender.sendMessage(message);
- sendLink(sender, url);
+ sender.sendLink(" ", Phrase.CMD_CLICK_ME.toString(), url);
}
- sender.sendMessage(Phrase.CMD_FOOTER + "");
- }
-
- @Deprecated // TODO Will be rewritten to the RslPlugin abstractions in the future.
- private void sendLink(ISender sender, String url) throws CommandException {
- plugin.getServer().dispatchCommand(
- Bukkit.getConsoleSender(),
- "tellraw " + sender.getName() + " [\"\",{\"text\":\"" + Phrase.CMD_CLICK_ME + "\",\"underlined\":true,"
- + "\"clickEvent\":{\"action\":\"open_url\",\"value\":\"" + url + "\"}}]");
+ sender.sendMessage(Phrase.CMD_FOOTER.toString());
}
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java
index e3eb1df36..e476ac497 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java
@@ -2,6 +2,7 @@ package main.java.com.djrapitops.plan.command.commands;
import com.djrapitops.plugin.command.CommandType;
import com.djrapitops.plugin.command.TreeCommand;
+import com.djrapitops.plugin.settings.ColorScheme;
import main.java.com.djrapitops.plan.Permissions;
import main.java.com.djrapitops.plan.Phrase;
import main.java.com.djrapitops.plan.Plan;
@@ -9,7 +10,7 @@ import main.java.com.djrapitops.plan.command.commands.manage.*;
/**
* This command is used to manage the database of the plugin.
- *
+ *
* No arguments will run ManageHelpCommand. Contains subcommands.
*
* @author Rsl1122
@@ -24,6 +25,25 @@ public class ManageCommand extends TreeCommand
* Registers a new webuser to the database.
- *
+ *
* No permission required for self registration. (Constructor string is empty)
- *
+ *
* plan.webmanage required for registering other users.
*
* @author Rsl1122
@@ -34,6 +35,24 @@ public class RegisterCommand extends SubCommand {
public RegisterCommand(Plan plugin) {
super("register", CommandType.CONSOLE_WITH_ARGUMENTS, "", "Register a user for the webserver", "
* Supported plugins (v3.0.0) : OnTime
*
* @author Rsl1122
@@ -39,6 +40,24 @@ public class ManageImportCommand extends SubCommand {
public ManageImportCommand(Plan plugin) {
super("import", CommandType.CONSOLE, Permissions.MANAGE.getPermission(), Phrase.CMD_USG_MANAGE_IMPORT.toString(), Phrase.ARG_IMPORT.toString());
this.plugin = plugin;
+ setHelp(plugin);
+ }
+
+ private void setHelp(Plan plugin) {
+ ColorScheme colorScheme = plugin.getColorScheme();
+
+ String mCol = colorScheme.getMainColor();
+ String sCol = colorScheme.getSecondaryColor();
+ String tCol = colorScheme.getTertiaryColor();
+
+ String[] help = new String[]{
+ mCol + "Manage Import command",
+ tCol + " Used to import data from other sources",
+ sCol + " Analysis will be disabled during import.",
+ sCol + " If a lot of users are not in the database, saving may take a long time."
+ };
+
+ setInDepthHelp(help);
}
@Override
@@ -58,6 +77,7 @@ public class ManageImportCommand extends SubCommand {
if (!Check.isTrue(importPlugins.keySet().contains(importFromPlugin), Phrase.MANAGE_ERROR_INCORRECT_PLUGIN + importFromPlugin, sender)) {
return true;
}
+
if (!Check.isTrue(ImportUtils.isPluginEnabled(importFromPlugin), Phrase.MANAGE_ERROR_PLUGIN_NOT_ENABLED + importFromPlugin, sender)) {
return true;
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageMoveCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageMoveCommand.java
index a91c2a744..a0c10ff11 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageMoveCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageMoveCommand.java
@@ -18,7 +18,7 @@ import java.util.UUID;
/**
* This manage subcommand is used to move all data from one database to another.
- *
+ *
* Destination database will be cleared.
*
* @author Rsl1122
@@ -58,9 +58,11 @@ public class ManageMoveCommand extends SubCommand {
if (!Check.isTrue(isCorrectDB, Phrase.MANAGE_ERROR_INCORRECT_DB + toDB, sender)) {
return true;
}
+
if (!Check.isTrue(!Verify.equalsIgnoreCase(fromDB, toDB), Phrase.MANAGE_ERROR_SAME_DB.toString(), sender)) {
return true;
}
+
if (!Check.isTrue(Verify.contains("-a", args), Phrase.COMMAND_ADD_CONFIRMATION_ARGUMENT.parse(Phrase.WARN_REMOVE.parse(args[1])), sender)) {
return true;
}
@@ -92,9 +94,11 @@ public class ManageMoveCommand extends SubCommand {
if (Check.isTrue(Verify.isEmpty(uuids), Phrase.MANAGE_ERROR_NO_PLAYERS + " (" + fromDatabase.getName() + ")", sender)) {
return;
}
+
sender.sendMessage(Phrase.MANAGE_PROCESS_START.parse());
+
if (ManageUtils.clearAndCopy(toDatabase, fromDatabase, uuids)) {
- sender.sendMessage(Phrase.MANAGE_MOVE_SUCCESS + "");
+ sender.sendMessage(Phrase.MANAGE_MOVE_SUCCESS.toString());
boolean movedToCurrentDatabase = Verify.equalsIgnoreCase(toDatabase.getConfigName(), plugin.getDB().getConfigName());
Check.isTrue(!movedToCurrentDatabase, Phrase.MANAGE_DB_CONFIG_REMINDER.toString(), sender);
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java
index a66b6cc52..30e6afc1c 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java
@@ -3,6 +3,7 @@ package main.java.com.djrapitops.plan.command.commands.manage;
import com.djrapitops.plugin.command.CommandType;
import com.djrapitops.plugin.command.ISender;
import com.djrapitops.plugin.command.SubCommand;
+import com.djrapitops.plugin.settings.ColorScheme;
import com.djrapitops.plugin.task.AbsRunnable;
import com.djrapitops.plugin.utilities.Verify;
import main.java.com.djrapitops.plan.Log;
@@ -35,6 +36,21 @@ public class ManageRemoveCommand extends SubCommand {
super("remove", CommandType.CONSOLE_WITH_ARGUMENTS, Permissions.MANAGE.getPermission(), Phrase.CMD_USG_MANAGE_REMOVE.toString(), Phrase.ARG_PLAYER + " [-a]");
this.plugin = plugin;
+ setHelp(plugin);
+ }
+
+ private void setHelp(Plan plugin) {
+ ColorScheme colorScheme = plugin.getColorScheme();
+
+ String mCol = colorScheme.getMainColor();
+ String tCol = colorScheme.getTertiaryColor();
+
+ String[] help = new String[]{
+ mCol + "Manage Remove command",
+ tCol + " Used to Remove user's data from the active database."
+ };
+
+ setInDepthHelp(help);
}
@Override
@@ -56,13 +72,16 @@ public class ManageRemoveCommand extends SubCommand {
try {
UUID uuid = UUIDUtility.getUUIDOf(playerName);
String message = Phrase.USERNAME_NOT_VALID.toString();
+
if (!Check.isTrue(Verify.notNull(uuid), message, sender)) {
return;
}
+
message = Phrase.USERNAME_NOT_KNOWN.toString();
if (!Check.isTrue(plugin.getDB().wasSeenBefore(uuid), message, sender)) {
return;
}
+
message = Phrase.COMMAND_ADD_CONFIRMATION_ARGUMENT.parse(Phrase.WARN_REMOVE.parse(plugin.getDB().getConfigName()));
if (!Check.isTrue(Verify.contains("-a", args), message, sender)) {
return;
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java
index 3ef71609f..f0a96c11b 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java
@@ -44,12 +44,14 @@ public class ManageRestoreCommand extends SubCommand {
if (!Check.isTrue(args.length >= 2, Phrase.COMMAND_REQUIRES_ARGUMENTS.parse(Phrase.USE_RESTORE.toString()), sender)) {
return true;
}
+
String db = args[1].toLowerCase();
boolean isCorrectDB = "sqlite".equals(db) || "mysql".equals(db);
if (!Check.isTrue(isCorrectDB, Phrase.MANAGE_ERROR_INCORRECT_DB + db, sender)) {
return true;
}
+
if (!Check.isTrue(Verify.contains("-a", args), Phrase.COMMAND_ADD_CONFIRMATION_ARGUMENT.parse(Phrase.WARN_REWRITE.parse(args[1])), sender)) {
return true;
}
@@ -71,7 +73,7 @@ public class ManageRestoreCommand extends SubCommand {
public void run() {
try {
String backupDBName = args[0];
- boolean containsDBFileExtension = backupDBName.contains(".db");
+ boolean containsDBFileExtension = backupDBName.endsWith(".db");
File backupDBFile = new File(plugin.getDataFolder(), backupDBName + (containsDBFileExtension ? "" : ".db"));
if (!Check.isTrue(Verify.exists(backupDBFile), Phrase.MANAGE_ERROR_BACKUP_FILE_NOT_FOUND + " " + args[0], sender)) {
@@ -79,22 +81,27 @@ public class ManageRestoreCommand extends SubCommand {
}
if (containsDBFileExtension) {
- backupDBName = backupDBName.replace(".db", "");
+ backupDBName = backupDBName.substring(0, backupDBName.length() - 3);
}
+
SQLiteDB backupDB = new SQLiteDB(plugin, backupDBName);
if (!backupDB.init()) {
sender.sendMessage(Phrase.MANAGE_DATABASE_FAILURE.toString());
return;
}
+
sender.sendMessage(Phrase.MANAGE_PROCESS_START.parse());
+
final Collection
* Contains parts that can be analysed. Each part has their own purpose.
- *
+ *
* Parts contain variables that can be added to. These variables are then
* analysed using the analysis method.
- *
+ *
* After being analysed the ReplaceMap can be retrieved for replacing
* placeholders on the analysis.html file.
*
* @author Rsl1122
* @since 3.5.2
*/
-public class AnalysisData extends RawData
* (Changes the end to the parameter.).
*
* @param endOfSession Epoch millisecond the session ended.
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/TPS.java b/Plan/src/main/java/com/djrapitops/plan/data/TPS.java
index 798bcd821..7c8bf34cd 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/TPS.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/TPS.java
@@ -6,7 +6,7 @@
package main.java.com.djrapitops.plan.data;
/**
- * Class containing single datapoint of TPS/players online.
+ * Class containing single datapoint of TPS / Players online / CPU Usage / Used Memory / Entity Count / Chunks loaded.
*
* @author Rsl1122
* @since 3.5.0
@@ -17,20 +17,29 @@ public class TPS {
private final double tps;
private final int players;
private final double cpuUsage;
+ private final long usedMemory;
+ private final int entityCount;
+ private final int chunksLoaded;
/**
* Constructor.
*
- * @param date time of the average calculation.
- * @param tps average tps for the last minute.
- * @param players average players for the last minute.
- * @param cpuUsage average CPU usage for the last minute.
+ * @param date time of the TPS calculation.
+ * @param tps average tps for the last minute.
+ * @param players players for the minute.
+ * @param cpuUsage CPU usage for the minute
+ * @param usedMemory used memory at the time of fetching
+ * @param entityCount amount of entities at the time of fetching
+ * @param chunksLoaded amount of chunks loaded at the time of fetching
*/
- public TPS(long date, double tps, int players, double cpuUsage) {
+ public TPS(long date, double tps, int players, double cpuUsage, long usedMemory, int entityCount, int chunksLoaded) {
this.date = date;
this.tps = tps;
this.players = players;
this.cpuUsage = cpuUsage;
+ this.usedMemory = usedMemory;
+ this.entityCount = entityCount;
+ this.chunksLoaded = chunksLoaded;
}
/**
@@ -52,7 +61,7 @@ public class TPS {
}
/**
- * Get the average players for the minute.
+ * Get the player for the time, when the data was fetched.
*
* @return Players online.
*/
@@ -61,14 +70,41 @@ public class TPS {
}
/**
- * Get the average CPU Usage for the minute.
+ * Get the average CPU Usage for the minute
*
- * @return 0-20 double
+ * @return 0-100 double
*/
public double getCPUUsage() {
return cpuUsage;
}
+ /**
+ * Get the used memory for the time, when the data was fetched.
+ *
+ * @return Used Memory in Megabyte
+ */
+ public long getUsedMemory() {
+ return usedMemory;
+ }
+
+ /**
+ * Get the amount of entities for the time, when the data was fetched
+ *
+ * @return Amount of entities
+ */
+ public int getEntityCount() {
+ return entityCount;
+ }
+
+ /**
+ * Get the amount of chunks loaded for the time, when the data was fetched
+ *
+ * @return Amount of chunks loaded
+ */
+ public int getChunksLoaded() {
+ return chunksLoaded;
+ }
+
@Override
public int hashCode() {
int hash = 3;
@@ -83,17 +119,20 @@ public class TPS {
if (this == obj) {
return true;
}
+
if (obj == null) {
return false;
}
+
if (getClass() != obj.getClass()) {
return false;
}
+
final TPS other = (TPS) obj;
- return this.date == other.date
- && Double.doubleToLongBits(this.tps) == Double.doubleToLongBits(other.tps)
+ return date == other.date
+ && Double.compare(this.tps, other.tps) == 0
&& this.players == other.players
- && this.cpuUsage == other.cpuUsage;
+ && Double.compare(cpuUsage, other.cpuUsage) == 0;
}
@Override
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/UserData.java b/Plan/src/main/java/com/djrapitops/plan/data/UserData.java
index 72fc3536b..24fe2c229 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/UserData.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/UserData.java
@@ -4,6 +4,8 @@ import com.djrapitops.plugin.utilities.Verify;
import com.djrapitops.plugin.utilities.player.IOfflinePlayer;
import com.djrapitops.plugin.utilities.player.IPlayer;
import main.java.com.djrapitops.plan.Log;
+import main.java.com.djrapitops.plan.data.time.GMTimes;
+import main.java.com.djrapitops.plan.data.time.WorldTimes;
import java.net.InetAddress;
import java.util.*;
@@ -20,85 +22,85 @@ public class UserData {
private boolean clearAfterSave;
private UUID uuid;
- private Set
* Some variables are left uninitialized: isBanned, lastPlayed, playTime,
- * loginTimes, timesKicked, lastGmSwapTime, mobKills, deaths and
- * currentSession.
- *
+ * loginTimes, timesKicked, lastGmSwapTime, mobKills, deaths, lastWorldSwapTime, lastWorld
+ *
* These variables need to be set with setters.
- *
+ *
* All Collections are left empty: locations, nicknames, ips, sessions,
* playerKills. Because nicknames is empty, lastNick is an empty string.
- *
- * gmTimes HashMap will contain 4 '0L' values: SURVIVAL, CREATIVE,
+ *
+ * gmTimes Map will contain 4 '0L' values: SURVIVAL, CREATIVE,
* ADVENTURE, SPECTATOR
+ * worldTimes Map is left empty.
*
- * @param uuid UUID of the player
- * @param reg Epoch millisecond the player registered.
- * @param op Is the player op? (true/false)
- * @param lastGM last GameMode the player was seen in.
- * @param name Name of the player.
+ * @param uuid UUID of the player
+ * @param reg Epoch millisecond the player registered.
+ * @param op Is the player op? (true/false)
+ * @param name Name of the player.
* @param online Is the player online?
*/
- public UserData(UUID uuid, long reg, boolean op, String lastGM, String name, boolean online) {
+ public UserData(UUID uuid, long reg, boolean op, String gm, String name, boolean online) {
accessing = 0;
+
+ this.gmTimes = new GMTimes(gm);
+ this.worldTimes = new WorldTimes();
+
this.uuid = uuid;
- registered = reg;
- isOp = op;
+ this.name = name;
+ lastNick = "";
nicknames = new HashSet<>();
ips = new HashSet<>();
- gmTimes = new HashMap<>();
- String[] gms = new String[]{"SURVIVAL", "CREATIVE", "ADVENTURE", "SPECTATOR"};
- for (String gm : gms) {
- gmTimes.put(gm, 0L);
- }
- lastGamemode = lastGM;
geolocation = "Not Known";
- this.name = name;
+
+ isOp = op;
isOnline = online;
+ registered = reg;
+
sessions = new ArrayList<>();
- lastNick = "";
playerKills = new ArrayList<>();
}
/**
* Creates a new UserData object with the variables inside a Player object.
- *
+ *
* Some variables are left uninitialized: lastPlayed, playTime, loginTimes,
* timesKicked, lastGmSwapTime, mobKills, deaths and currentSession.
- *
+ *
* These variables need to be set with setters.
- *
+ *
* All Collections are left empty: locations, nicknames, ips, sessions,
* playerKills. Because nicknames is empty, lastNick is an empty string.
- *
+ *
* gmTimes HashMap will contain 4 '0L' values: SURVIVAL, CREATIVE,
* ADVENTURE, SPECTATOR
*
@@ -118,19 +120,19 @@ public class UserData {
/**
* Creates a new UserData object with the variables inside a OfflinePlayer
* object.
- *
+ *
* Some variables are left uninitialized: location, lastPlayed, playTime,
* loginTimes, timesKicked, lastGmSwapTime, mobKills, deaths and
* currentSession.
- *
+ *
* These variables need to be set with setters.
- *
+ *
* All Collections are left empty: locations, nicknames, ips, sessions,
* playerKills. Because nicknames is empty, lastNick is an empty string.
- *
+ *
* gmTimes HashMap will contain 4 '0L' values: SURVIVAL, CREATIVE,
* ADVENTURE, SPECTATOR
- *
+ *
* lastGM will be set as SURVIVAL
*
* @param player IOfflinePlayer object.
@@ -164,10 +166,8 @@ public class UserData {
this.playTime = data.getPlayTime();
this.loginTimes = data.getLoginTimes();
this.timesKicked = data.getTimesKicked();
- this.lastGmSwapTime = data.getLastGmSwapTime();
- this.lastGamemode = data.getLastGamemode();
- this.gmTimes = new HashMap<>();
- gmTimes.putAll(data.getGmTimes());
+ this.gmTimes = data.getGmTimes();
+ this.worldTimes = data.getWorldTimes();
this.isOp = data.isOp();
this.isBanned = data.isBanned();
this.geolocation = data.getGeolocation();
@@ -183,12 +183,22 @@ public class UserData {
@Override
public String toString() {
try {
- return "{" + "accessing:" + accessing + "|uuid:" + uuid + "|ips:" + ips + "|nicknames:" + nicknames + "|lastNick:" + lastNick + "|registered:" + registered + "|lastPlayed:" + lastPlayed + "|playTime:" + playTime + "|loginTimes:" + loginTimes + "|timesKicked:" + timesKicked + "|lastGmSwapTime:" + lastGmSwapTime + "|lastGamemode:" + lastGamemode + "|gmTimes:" + gmTimes + "|isOp:" + isOp + "|isBanned:" + isBanned + "|geolocation:" + geolocation + "|mobKills:" + mobKills + "|playerKills:" + playerKills + "|deaths:" + deaths + "|name:" + name + "|isOnline:" + isOnline + "|currentSession:" + currentSession + "|sessions:" + sessions + '}';
- } catch (Throwable e) {
+ return "{" + "accessing:" + accessing + "|uuid:" + uuid + "|ips:" + ips + "|nicknames:" + nicknames + "|lastNick:" + lastNick + "|registered:" + registered + "|lastPlayed:" + lastPlayed + "|playTime:" + playTime + "|loginTimes:" + loginTimes + "|timesKicked:" + timesKicked + "|gm:" + gmTimes + "|world:" + worldTimes + "|isOp:" + isOp + "|isBanned:" + isBanned + "|geolocation:" + geolocation + "|mobKills:" + mobKills + "|playerKills:" + playerKills + "|deaths:" + deaths + "|name:" + name + "|isOnline:" + isOnline + "|sessions:" + sessions + '}';
+ } catch (Exception e) {
return "UserData: Error on toString:" + e;
}
}
+ @Deprecated
+ public String getLastGamemode() {
+ return gmTimes.getState();
+ }
+
+ @Deprecated
+ public long getLastGmSwapTime() {
+ return gmTimes.getLastStateChange();
+ }
+
/**
* Adds an to the ips Set if it is not null or the set doesn't contain it.
*
@@ -215,9 +225,9 @@ public class UserData {
/**
* Adds a nickname to the nicknames Set.
- *
+ *
* null or empty values filtered.
- *
+ *
* lastNick will be set as the given parameter, if accepted.
*
* @param nick Displayname of the player.
@@ -237,7 +247,7 @@ public class UserData {
/**
* Adds nicknames to the nicknames Set.
- *
+ *
* null or empty values filtered.
*
* @param addNicks Collection of nicknames.
@@ -246,40 +256,9 @@ public class UserData {
nicknames.addAll(addNicks.stream().filter(nick -> !Verify.isEmpty(nick)).collect(Collectors.toList()));
}
- /**
- * Set a specific GameMode's millisecond value.
- *
- * @param gm Name of Gamemode.
- * @param time Milliseconds spent in the gamemode.
- */
- public void setGMTime(String gm, long time) {
- if (!Verify.notNull(gmTimes)) {
- gmTimes = new HashMap<>();
- }
- if (Verify.notNull(gm)) {
- gmTimes.put(gm, time);
- }
- }
-
- /**
- * Set every GameMode's millisecond value.
- *
- * @param survivalTime ms spent in SURVIVAL
- * @param creativeTime ms spent in CREATIVE
- * @param adventureTime ms spent in ADVENTURE
- * @param spectatorTime ms spent in SPECTATOR
- */
- public void setAllGMTimes(long survivalTime, long creativeTime, long adventureTime, long spectatorTime) {
- gmTimes.clear();
- gmTimes.put("SURVIVAL", survivalTime);
- gmTimes.put("CREATIVE", creativeTime);
- gmTimes.put("ADVENTURE", adventureTime);
- gmTimes.put("SPECTATOR", spectatorTime);
- }
-
/**
* Adds a new SessionData to the sessions list.
- *
+ *
* null and invalid sessions filtered.
*
* @param session SessionData object
@@ -292,7 +271,7 @@ public class UserData {
/**
* Adds SessionData objects to the sessions list.
- *
+ *
* null and invalid sessions filtered.
*
* @param sessions Collection of SessionData objects.
@@ -305,28 +284,6 @@ public class UserData {
this.sessions.addAll(filteredSessions);
}
- /**
- * Sets the current session.
- *
- * Currently unused.
- *
- * @param session SessionData object, no restrictions.
- */
- public void setCurrentSession(SessionData session) {
- currentSession = session;
- }
-
- /**
- * Gets the current session.
- *
- * Currently unused.
- *
- * @return SessionData object with a recent start.
- */
- public SessionData getCurrentSession() {
- return currentSession;
- }
-
/**
* Changes the value of isBanned.
*
@@ -369,6 +326,15 @@ public class UserData {
return uuid;
}
+ /**
+ * Set the UUID.
+ *
+ * @param uuid UUID
+ */
+ public void setUuid(UUID uuid) {
+ this.uuid = uuid;
+ }
+
/**
* Get the InetAddress Set.
*
@@ -378,6 +344,17 @@ public class UserData {
return ips;
}
+ /**
+ * Set the ips set.
+ *
+ * @param ips ips of the user.
+ */
+ public void setIps(Set
* NOT INITIALIZED BY CONSTRUCTORS. Value is updated periodically by cache
* if the player is online.
*
@@ -409,8 +406,20 @@ public class UserData {
}
/**
- * Get the playtime in milliseconds.
+ * Set the time the user was last seen.
+ *
+ * Affects playtime calculation, playtime should be updated before updating
+ * this value.
*
+ * @param lastPlayed Epoch millisecond of last seen moment.
+ */
+ public void setLastPlayed(long lastPlayed) {
+ this.lastPlayed = lastPlayed;
+ }
+
+ /**
+ * Get the playtime in milliseconds.
+ *
* NOT INITIALIZED BY CONSTRUCTORS. Value is updated periodically by cache
* if the player is online.
*
@@ -421,8 +430,17 @@ public class UserData {
}
/**
- * Get how many times the player has logged in.
+ * Set the time the user has been playing.
*
+ * @param playTime Time in ms.
+ */
+ public void setPlayTime(long playTime) {
+ this.playTime = playTime;
+ }
+
+ /**
+ * Get how many times the player has logged in.
+ *
* NOT INITIALIZED BY CONSTRUCTORS.
*
* @return 0 to Integer.MAX
@@ -432,8 +450,19 @@ public class UserData {
}
/**
- * Get how many times the player has been kicked.
+ * Set how many times the user has logged in.
+ *
+ * No check for input.
*
+ * @param loginTimes 0 to Int.MAX
+ */
+ public void setLoginTimes(int loginTimes) {
+ this.loginTimes = loginTimes;
+ }
+
+ /**
+ * Get how many times the player has been kicked.
+ *
* NOT INITIALIZED BY CONSTRUCTORS.
*
* @return 0 to Integer.MAX
@@ -443,36 +472,42 @@ public class UserData {
}
/**
- * Get the GMTimes Map.
+ * Set how many times the user has been kicked.
+ *
+ * No check for input.
*
- * @return a GameMode map with 4 keys: SURVIVAL, CREATIVE, ADVENTURE,
- * SPECTATOR.
+ * @param timesKicked 0 to Int.MAX
*/
- public Map
* Set when using addNickname(String)
*
* @return last nickname used.
@@ -733,7 +669,7 @@ public class UserData {
/**
* Set the last nickname the user has set.
- *
+ *
* Also set when using addNickname(String)
*
* @param lastNick last nickname used.
@@ -742,39 +678,13 @@ public class UserData {
this.lastNick = lastNick;
}
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final UserData other = (UserData) obj;
-// if (this.lastPlayed != other.lastPlayed) {
-// return false;
-// }
+ public WorldTimes getWorldTimes() {
+ return worldTimes;
+ }
- return this.registered == other.registered
- && this.playTime == other.playTime
- && this.loginTimes == other.loginTimes
- && this.timesKicked == other.timesKicked
- && this.lastGmSwapTime == other.lastGmSwapTime
- && this.mobKills == other.mobKills
- && this.deaths == other.deaths
- && Objects.equals(this.lastNick, other.lastNick)
- && Objects.equals(this.name, other.name)
- && Objects.equals(this.uuid, other.uuid)
- && Objects.equals(this.ips, other.ips)
- && Objects.equals(this.nicknames, other.nicknames)
- && Objects.equals(this.lastGamemode, other.lastGamemode)
- && Objects.equals(this.gmTimes, other.gmTimes)
- && Objects.equals(this.playerKills, other.playerKills)
- && Objects.equals(this.sessions, other.sessions);
+ public void setWorldTimes(WorldTimes worldTimes) {
+ this.worldTimes = worldTimes;
}
/**
@@ -797,25 +707,69 @@ public class UserData {
this.clearAfterSave = clearAfterSave;
}
- /**
- * Set the banned value.
- *
- * @param isBanned true/false
- */
- public void setBanned(boolean isBanned) {
- this.isBanned = isBanned;
- }
-
- /**
- * Set the online value.
- *
- * @param isOnline true/false
- */
- public void setOnline(boolean isOnline) {
- this.isOnline = isOnline;
- }
-
public String getGeolocation() {
return geolocation;
}
-}
+
+ public void setGeolocation(String geolocation) {
+ this.geolocation = geolocation;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = sessions.hashCode();
+ result = 31 * result + accessing;
+ result = 31 * result + (clearAfterSave ? 1 : 0);
+ result = 31 * result + uuid.hashCode();
+ result = 31 * result + ips.hashCode();
+ result = 31 * result + nicknames.hashCode();
+ result = 31 * result + lastNick.hashCode();
+ result = 31 * result + (int) (registered ^ (registered >>> 32));
+ result = 31 * result + (int) (lastPlayed ^ (lastPlayed >>> 32));
+ result = 31 * result + (int) (playTime ^ (playTime >>> 32));
+ result = 31 * result + loginTimes;
+ result = 31 * result + timesKicked;
+ result = 31 * result + gmTimes.hashCode();
+ result = 31 * result + worldTimes.hashCode();
+ result = 31 * result + (isOp ? 1 : 0);
+ result = 31 * result + (isBanned ? 1 : 0);
+ result = 31 * result + geolocation.hashCode();
+ result = 31 * result + mobKills;
+ result = 31 * result + playerKills.hashCode();
+ result = 31 * result + deaths;
+ result = 31 * result + name.hashCode();
+ result = 31 * result + (isOnline ? 1 : 0);
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+
+ final UserData other = (UserData) obj;
+
+ return this.registered == other.registered
+ && this.playTime == other.playTime
+ && this.loginTimes == other.loginTimes
+ && this.timesKicked == other.timesKicked
+ && this.mobKills == other.mobKills
+ && this.deaths == other.deaths
+ && Objects.equals(this.lastNick, other.lastNick)
+ && Objects.equals(this.name, other.name)
+ && Objects.equals(this.uuid, other.uuid)
+ && Objects.equals(this.ips, other.ips)
+ && Objects.equals(this.nicknames, other.nicknames)
+ && Objects.equals(this.gmTimes, other.gmTimes)
+ && Objects.equals(this.worldTimes, other.worldTimes)
+ && Objects.equals(this.playerKills, other.playerKills)
+ && Objects.equals(this.sessions, other.sessions);
+ }
+}
\ No newline at end of file
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/additional/AnalysisType.java b/Plan/src/main/java/com/djrapitops/plan/data/additional/AnalysisType.java
index 49f7ec4b6..e7696202e 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/additional/AnalysisType.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/additional/AnalysisType.java
@@ -3,10 +3,10 @@ package main.java.com.djrapitops.plan.data.additional;
/**
* This class contains Enum values for different types of Analysis that can be
* performed on values of PluginData.
- *
+ *
* The enum determines what should be done to the return value of
* PluginData.getValue() method when the analysis is run.
- *
+ *
* Refer to the documentation on GitHub for additional information.
*
* @author Rsl1122
@@ -17,56 +17,56 @@ public enum AnalysisType {
/**
* Used when the getValue() method returns an integer and average should be
* calculated.
- *
+ *
* -1 values will be disregarded from the calculation (size will not grow).
*/
INT_AVG("avgInt_", "Average "),
/**
* Used when the getValue() method returns a long and average should be
* calculated.
- *
+ *
* -1 values will be disregarded from the calculation (size will not grow).
*/
LONG_AVG("avgLong_", "Average "),
/**
* Used when the getValue() method returns double and average should be
* calculated.
- *
+ *
* -1 values will be disregarded from the calculation (size will not grow).
*/
DOUBLE_AVG("avgDouble_", "Average "),
/**
* Used when the getValue() method returns an integer and total should be
* calculated.
- *
+ *
* -1 values will be disregarded from the calculation (size will not grow).
*/
INT_TOTAL("totalInt_", "Total "),
/**
* Used when the getValue() method returns a long and total should be
* calculated.
- *
+ *
* -1 values will be disregarded from the calculation (size will not grow).
*/
LONG_TOTAL("totalLong_", "Total "),
/**
* Used when the getValue() method returns a double and total should be
* calculated.
- *
+ *
* -1 values will be disregarded from the calculation (size will not grow).
*/
DOUBLE_TOTAL("totalDouble_", "Total "),
/**
* Used when the getValue() method returns an amount of milliseconds as long
* and average should be calculated.
- *
+ *
* -1 values will be disregarded from the calculation (size will not grow).
*/
LONG_TIME_MS_AVG("avgTimeMs_", "Average "),
/**
* Used when the getValue() method returns an amount of milliseconds as long
* and total should be calculated.
- *
+ *
* -1 values will be disregarded from the calculation (size will not grow).
*/
LONG_TIME_MS_TOTAL("totalTimeMs_"),
@@ -74,11 +74,11 @@ public enum AnalysisType {
* Used when the getValue() method returns an Epoch Millisecond as long and
* average of differences between the millisecond and current millisecond
* should be calculated.
- *
+ *
* For example if a player has dropped a Foo on epoch ms 1494486504000 and
* that was 5s (5000ms) ago. Now you want to calculate the average
* time-since for all players. Then you use this one.
- *
+ *
* -1 values will be disregarded from the calculation (size will not grow).
*/
LONG_EPOCH_MS_MINUS_NOW_AVG("avgEpochMsMinusNow_", "Average "),
@@ -89,13 +89,13 @@ public enum AnalysisType {
/**
* Used to calculate number of true values for the returned boolean values
* of getValue().
- *
+ *
* Will be presented as "n / total".
*/
BOOLEAN_TOTAL("totalBool_"),
/**
* Used to add html tags to the plugins tab.
- *
+ *
* Can be used to add Tables, Images (for example maps) and other html
* elements.
*/
@@ -121,7 +121,7 @@ public enum AnalysisType {
/**
* Used to get the modifier for the Prefix of the value.
- *
+ *
* For example: "Average Votes" when INT_AVG is used and Prefix is set as
* "Votes".
*
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/additional/HookHandler.java b/Plan/src/main/java/com/djrapitops/plan/data/additional/HookHandler.java
index 859f1a8b7..45eaf5d43 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/additional/HookHandler.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/additional/HookHandler.java
@@ -30,7 +30,7 @@ public class HookHandler {
configHandler = new PluginConfigSectionHandler(plugin);
try {
Bridge.hook(this);
- } catch (Throwable e) {
+ } catch (Exception e) {
Log.toLog(this.getClass().getName(), e);
Log.error("Plan Plugin Bridge not included in the plugin jar.");
}
@@ -38,10 +38,10 @@ public class HookHandler {
/**
* Adds a new PluginData source to the list.
- *
+ *
* The plugin data will appear on Analysis and/or Inspect pages depending on
* how the extending object is set up.
- *
+ *
* Refer to documentation on GitHub for more information.
*
* @param dataSource an object extending the PluginData class.
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/additional/PluginData.java b/Plan/src/main/java/com/djrapitops/plan/data/additional/PluginData.java
index bd7b06efa..a06c57935 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/additional/PluginData.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/additional/PluginData.java
@@ -8,7 +8,7 @@ import java.util.*;
/**
* This is an abstract class that can be used to add data from a plugin to the
* "Plugins"-tab of Analysis and Inspect pages.
- *
+ *
* API-section of documentation has examples on the usage of this class and how
* to register objects extending this class.
*
@@ -17,71 +17,65 @@ import java.util.*;
*/
public abstract class PluginData {
+ /**
+ * A list containing the AnalysisType enums that determine what should be
+ * done with the data on the analysis page.
+ */
+ protected final List
* The complete placeholder also includes the plugin name and if analysis is
* run, a modifier.
- *
+ *
* Second parameter of any super constructor.
*/
protected String placeholder;
-
/**
* Name of the plugin the data is coming from.
- *
+ *
* All sources of data with the same sourcePlugin will be placed in the same
* "box" in the "Plugins" tab.
- *
+ *
* A box has a max height of 600px, and higher than that will add a
* scrollbar.
- *
+ *
* First parameter of any super constructor.
*/
protected String sourcePlugin;
-
/**
* Determines if the datapoint should only be used for the analysis page.
- *
+ *
* If set to false, the datapoint will be added to the inspect page as well.
*/
protected boolean analysisOnly;
-
/**
* Font Awesome icon name.
- *
+ *
* http://fontawesome.io/icons/
*/
protected String icon;
-
/**
* Prefix shown before the data, for example "Steps taken: ".
*/
protected String prefix;
-
/**
* Suffix shown after the data, for example " steps".
*/
protected String suffix;
- /**
- * A list containing the AnalysisType enums that determine what should be
- * done with the data on the analysis page.
- */
- protected final List
* Defaults analysisOnly to true.
- *
+ *
* Defaults icon, prefix and suffix to "".
*
- * @param sourcePlugin Name of the plugin the data is coming from
- * @param placeholder Placeholder string, for example "stepsTaken"
+ * @param sourcePlugin Name of the plugin the data is coming from
+ * @param placeholder Placeholder string, for example "stepsTaken"
* @param analysisTypes A list containing the AnalysisType enums that
- * determine what should be done with the data on the analysis page
+ * determine what should be done with the data on the analysis page
*/
public PluginData(String sourcePlugin, String placeholder, List
* analysisOnly will be set to false.
*
* @param sourcePlugin Name of the plugin the data is coming from
- * @param placeholder Placeholder string, for example "stepsTaken"
+ * @param placeholder Placeholder string, for example "stepsTaken"
*/
public PluginData(String sourcePlugin, String placeholder) {
this(sourcePlugin, placeholder, new ArrayList<>());
@@ -120,7 +114,7 @@ public abstract class PluginData {
/**
* Returns the list of AnalysisTypes.
- *
+ *
* Used by Analysis
*
* @return a list.
@@ -132,15 +126,15 @@ public abstract class PluginData {
/**
* This method should be used with the return values of
* getHtmlReplaceValue(String, UUID).
- *
+ *
* It will add the div, icon, modifier, prefix and suffix to the value.
* Modifier is for example, if calculating AnalysisType.INT_AVG "Average ",
* it is a text that helps user understand that a calculation has been made.
*
* @param modifier For example "Average " - Determined by value of
- * AnalysisType's modifier-variable.
+ * AnalysisType's modifier-variable.
* @param contents The data, number/string/html that should be placed on the
- * page.
+ * page.
* @return a proper format for the html.
* @see AnalysisType
*/
@@ -150,12 +144,12 @@ public abstract class PluginData {
/**
* Used to get the full placeholder.
- *
+ *
* Used to avoid conflicts with existing placeholders and placeholders of
* other plugins.
*
* @param modifier Modifier determined by AnalysisType's
- * placeholderModifier-variable.
+ * placeholderModifier-variable.
* @return for example "%StepCounter_stepsTaken_total%"
* @see AnalysisType
*/
@@ -174,20 +168,20 @@ public abstract class PluginData {
/**
* Used to get the string for the html page.
- *
+ *
* parseContainer(modifierPrefix, value); should be used for all return
* values so that div, icon, prefix and suffix are added.
- *
+ *
* This method is used when AnalysisType.HTML is set, or while getting the
* value for the inspect page.
- *
+ *
* When using AnalysisType.HTML a random UUID is given, so it should be
* disregarded. modifierPrefix is empty in that case.
*
* @param modifierPrefix Modifier determined by AnalysisType's
- * modifier-variable.
- * @param uuid UUID of the player or random UUID if AnalysisType.HTML is
- * used.
+ * modifier-variable.
+ * @param uuid UUID of the player or random UUID if AnalysisType.HTML is
+ * used.
* @return html for the page.
*/
public abstract String getHtmlReplaceValue(String modifierPrefix, UUID uuid);
@@ -196,10 +190,10 @@ public abstract class PluginData {
* Used to get the value for analysis. The return value is determined by
* AnalysisType you have specified. If the AnalysisType's name has a BOOLEAN
* in it, Analysis will expect boolean values etc.
- *
+ *
* If the Type and return value mismatch, exception is thrown and the result
* on the analysis page will say that error occurred as the value.
- *
+ *
* If a player has no value a -1 should be returned in the case of a Number.
* -1 is excluded from the Average calculation's size and total.
*
@@ -209,24 +203,6 @@ public abstract class PluginData {
*/
public abstract Serializable getValue(UUID uuid);
- /**
- * Used to set the prefix.
- *
- * @param prefix for example "Steps Taken: " or a Html start tag.
- */
- public final void setPrefix(String prefix) {
- this.prefix = prefix;
- }
-
- /**
- * Used to set the suffix.
- *
- * @param suffix for example " steps" or a html end tag.
- */
- public final void setSuffix(String suffix) {
- this.suffix = suffix;
- }
-
/**
* Used to set the Font Awesome icon.
*
@@ -238,7 +214,7 @@ public abstract class PluginData {
/**
* Used to set the analysisOnly parameter.
- *
+ *
* true: only used for Analysis page false: used for both if AnalysisTypes
* specified, if no AnalysisTypes are specified only used for Inspect page.
*
@@ -266,6 +242,15 @@ public abstract class PluginData {
return prefix;
}
+ /**
+ * Used to set the prefix.
+ *
+ * @param prefix for example "Steps Taken: " or a Html start tag.
+ */
+ public final void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
/**
* Used to get the suffix.
*
@@ -275,6 +260,15 @@ public abstract class PluginData {
return suffix;
}
+ /**
+ * Used to set the suffix.
+ *
+ * @param suffix for example " steps" or a html end tag.
+ */
+ public final void setSuffix(String suffix) {
+ this.suffix = suffix;
+ }
+
/**
* If a PluginData object has same placeholder, sourcePlugin and
* analysisTypes, it is considered equal.
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/analysis/ActivityPart.java b/Plan/src/main/java/com/djrapitops/plan/data/analysis/ActivityPart.java
index 9b420a480..d00876cce 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/analysis/ActivityPart.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/analysis/ActivityPart.java
@@ -2,13 +2,6 @@ package main.java.com.djrapitops.plan.data.analysis;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.utilities.Verify;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
import main.java.com.djrapitops.plan.Settings;
import main.java.com.djrapitops.plan.data.SessionData;
import main.java.com.djrapitops.plan.data.TPS;
@@ -19,17 +12,21 @@ import main.java.com.djrapitops.plan.ui.html.graphs.PunchCardGraphCreator;
import main.java.com.djrapitops.plan.ui.html.graphs.SessionLengthDistributionGraphCreator;
import main.java.com.djrapitops.plan.utilities.FormatUtils;
import main.java.com.djrapitops.plan.utilities.HtmlUtils;
+import main.java.com.djrapitops.plan.utilities.MiscUtils;
import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils;
import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
+import java.util.*;
+import java.util.stream.Collectors;
+
/**
* Part responsible for all Player Activity related analysis.
- *
+ *
* Online Graphs, Player-base pie-chart, Recent Players and Session
* visualisation.
- *
+ *
* Placeholder values can be retrieved using the get method.
- *
+ *
* Contains following place-holders: recentlogins, sessionaverage,
* datapunchcard, datasessiondistribution, labelssessiondistribution,
* datascatterday, datascatterweek, datascattermonth, playersonlinecolor,
@@ -40,18 +37,16 @@ import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
* @author Rsl1122
* @since 3.5.2
*/
-public class ActivityPart extends RawData
* Command Usage Table.
- *
+ *
* Placeholder values can be retrieved using the get method.
- *
+ *
* Contains following place-holders: uniquecommands, totalcommands, commanduse
*
* @author Rsl1122
* @since 3.5.2
*/
-public class CommandUsagePart extends RawData
* Gamemode Piechart, Percentages and Totals.
- *
+ *
* Placeholder values can be retrieved using the get method.
- *
+ *
* Contains following place-holders: gmtotal, gm0col-gm3col, gmcolors, gmlabels,
* gm0-gm3, gmdata, gm0total-gm3total
*
* @author Rsl1122
* @since 3.5.2
*/
-public class GamemodePart extends RawData
+ * Player location World Choropleth map.
+ *
* Placeholder values can be retrieved using the get method.
- *
+ *
* Contains following place-holders: geomapz, geomapcountries, geomapcodes
*
* @author Rsl1122
* @since 3.5.2
*/
-public class GeolocationPart extends RawData
* Unique per Day, Unique, New Players, Logins
- *
+ *
* Placeholder values can be retrieved using the get method.
- *
+ *
* Contains following place-holders: totallogins, uniquejoinsday,
* uniquejoinsweek, uniquejoinsmonth, avguniquejoins, avguniquejoinsday,
- * avguniquejoinsweek, avguniquejoinsmonth, npday, npweek, npmonth
+ * avguniquejoinsweek, avguniquejoinsmonth, npday, npweek, npmonth,
+ * npdataday, npdataweek, npdatamonth, newperday, newperdayday, newperdayweek, newperdaymonth
*
* @author Rsl1122
* @since 3.5.2
*/
-public class JoinInfoPart extends RawData
* Totals
- *
+ *
* Placeholder values can be retrieved using the get method.
- *
- * Contains following place-holders: deaths, mobkills, playerkilss
+ *
+ * Contains following place-holders: deaths, mobkills, playerkills, avgdeaths, avgmobkills, avgplayerkills
*
* @author Rsl1122
* @since 3.5.2
*/
-public class KillPart extends RawData
* Total player count, op count
- *
+ *
* Placeholder values can be retrieved using the get method.
- *
+ *
* Contains following place-holders: activitytotal, ops
*
* @author Rsl1122
* @since 3.5.2
*/
-public class PlayerCountPart extends RawData
* Placeholder values can be retrieved using the get method.
- *
+ *
* Contains following place-holders: totalplaytime, avgplaytime
*
* @author Rsl1122
* @since 3.5.2
*/
-public class PlaytimePart extends RawData
* Places place-holders to the replace map.
*/
public void analyseData() {
@@ -50,7 +50,7 @@ public abstract class RawData
* Place-holders should be added to the replace map.
*/
protected abstract void analyse();
@@ -69,7 +69,7 @@ public abstract class RawData
* Ticks Per Second Graphs
- *
+ *
* Placeholder values can be retrieved using the get method.
- *
- * Contains following place-holders: tpsscatterday, tpsscatterweek, cpuscatterday, cpuscatterweek, averagetps,
- * averagetpsday
+ *
+ * Contains following place-holders: tpsscatterday, tpsscatterweek, cpuscatterday, cpuscatterweek, averagetps(-week),
+ * averagetpsday, averagecpuday, averagecpuweek, averagememoryday, averagememoryweek, averageentitiesday, averageentitiesweek,
+ * averagechunksday, averagechunkweek, ramscatterday, ramscatterweek
*
* @author Rsl1122
* @since 3.5.2
*/
-public class TPSPart extends RawData
+ * World times Pie
+ *
+ * Placeholder values can be retrieved using the get method.
+ *
+ * Contains following place-holders: worldtotal, worldseries
+ *
+ * @author Rsl1122
+ * @since 3.6.0
+ */
+public class WorldPart extends RawData {
+
+ private final Map
* Initializes Analysis
*
* @param plugin Current instance of Plan
@@ -64,7 +64,6 @@ public class AnalysisCacheHandler {
}
/**
- *
* @return
*/
public boolean isAnalysisBeingRun() {
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/DBCallableProcessor.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/DBCallableProcessor.java
index fbe691b00..a12c62d72 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/cache/DBCallableProcessor.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/DBCallableProcessor.java
@@ -3,23 +3,23 @@ package main.java.com.djrapitops.plan.data.cache;
import main.java.com.djrapitops.plan.data.UserData;
/**
- * This abstract class can be extended with anything as the process method and
+ * This interface can be extended with anything as the process method and
* given to the Database.
- *
+ *
* The process method will be called with the UserData object fetched from the
* database.
*
* @author Rsl1122
* @since 2.6.0
*/
-public abstract class DBCallableProcessor {
+public interface DBCallableProcessor {
/**
* Method used to do multiple things to UserData objects such as Caching,
* changing properties etc.
*
* @param data UserData object given to the DBCallableProcessor by the
- * method it was given as parameter to.
+ * method it was given as parameter to.
*/
- public abstract void process(UserData data);
+ void process(UserData data);
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java
index 8bfc74128..4c30f2d3c 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java
@@ -21,19 +21,20 @@ import main.java.com.djrapitops.plan.utilities.MiscUtils;
import main.java.com.djrapitops.plan.utilities.NewPlayerCreator;
import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
import main.java.com.djrapitops.plan.utilities.comparators.HandlingInfoTimeComparator;
+import org.bukkit.entity.Player;
import java.sql.SQLException;
import java.util.*;
/**
* This Class contains the Cache.
- *
+ *
* This class is the main processing class that initialises Save, Clear, Process
* and Get queue and Starts the asynchronous save task.
- *
+ *
* It is used to store command use, locations, active sessions and UserData
* objects in memory.
- *
+ *
* Its methods can be used to access all the data it stores and to clear them.
*
* @author Rsl1122
@@ -42,14 +43,16 @@ import java.util.*;
public class DataCacheHandler extends SessionCache {
// Cache
- private final HashMap
* Gets the Database from the plugin. Starts the queues. Registers
* Asynchronous Periodic Save Task
*
@@ -115,8 +118,8 @@ public class DataCacheHandler extends SessionCache {
* Used to start the Asynchronous Save Task.
*
* @throws IllegalArgumentException BukkitRunnable was given wrong
- * parameters.
- * @throws IllegalStateException BukkitScheduler is in a wrong state.
+ * parameters.
+ * @throws IllegalStateException BukkitScheduler is in a wrong state.
*/
public void startAsyncPeriodicSaveTask() throws IllegalArgumentException, IllegalStateException {
int minutes = Settings.SAVE_CACHE_MIN.getNumber();
@@ -160,26 +163,21 @@ public class DataCacheHandler extends SessionCache {
/**
* Uses Database or Cache to retrieve the UserData of a matching player.
- *
+ *
* Caches the data to the Cache if cache-parameter is true.
*
* @param processor DBCallableProcessor Object used to process the data
- * after it was retrieved
- * @param uuid Player's UUID
- * @param cache Whether or not the UserData will be Cached in this instance
- * of DataCacheHandler after it has been fetched (if not already fetched)
+ * after it was retrieved
+ * @param uuid Player's UUID
+ * @param cache Whether or not the UserData will be Cached in this instance
+ * of DataCacheHandler after it has been fetched (if not already fetched)
*/
public void getUserDataForProcessing(DBCallableProcessor processor, UUID uuid, boolean cache) {
Log.debug(uuid + ": HANDLER getForProcess," + " Cache:" + cache);
UserData uData = dataCache.get(uuid);
if (uData == null) {
if (cache) {
- DBCallableProcessor cacher = new DBCallableProcessor() {
- @Override
- public void process(UserData data) {
- cache(data);
- }
- };
+ DBCallableProcessor cacher = this::cache;
getTask.scheduleForGet(uuid, cacher, processor);
} else {
getTask.scheduleForGet(uuid, processor);
@@ -191,7 +189,7 @@ public class DataCacheHandler extends SessionCache {
/**
* Used to Cache a UserData object to the Cache.
- *
+ *
* If a object already exists it will be replaced.
*
* @param data UserData object with the UUID inside used as key.
@@ -204,12 +202,12 @@ public class DataCacheHandler extends SessionCache {
/**
* Uses Database or Cache to retrieve the UserData of a matching player.
- *
+ *
* Always Caches the data after retrieval (unless already cached)
*
* @param processor DBCallableProcessor Object used to process the data
- * after it was retrieved
- * @param uuid Player's UUID
+ * after it was retrieved
+ * @param uuid Player's UUID
*/
public void getUserDataForProcessing(DBCallableProcessor processor, UUID uuid) {
getUserDataForProcessing(processor, uuid, true);
@@ -217,9 +215,7 @@ public class DataCacheHandler extends SessionCache {
/**
* Saves all UserData in the cache to Database.
- *
- * ATTENTION: TODO - Doesn't save the Locations in the locationCache.
- *
+ *
* Should only be called from Async thread
*/
public void saveCachedUserData() {
@@ -234,7 +230,7 @@ public class DataCacheHandler extends SessionCache {
/**
* Used to add event HandlingInfo to the processTask's pool.
- *
+ *
* Given HandlingInfo object's process method will be called.
*
* @param i Object that extends HandlingInfo.
@@ -249,9 +245,9 @@ public class DataCacheHandler extends SessionCache {
/**
* Saves all data in the cache to Database and closes the database down.
- *
+ *
* Stops all tasks.
- *
+ *
* If processTask has unprocessed information, it will be processed.
*/
public void saveCacheOnDisable() {
@@ -268,7 +264,8 @@ public class DataCacheHandler extends SessionCache {
for (IPlayer p : onlinePlayers) {
UUID uuid = p.getUuid();
endSession(uuid);
- toProcess.add(new LogoutInfo(uuid, time, p.isBanned(), p.getGamemode(), getSession(uuid)));
+ String worldName = ((Player) p.getWrappedPlayerClass()).getWorld().getName();
+ toProcess.add(new LogoutInfo(uuid, time, p.isBanned(), p.getGamemode().name(), getSession(uuid), worldName));
}
Log.debug("ToProcess size_AFTER: " + toProcess.size() + " DataCache size: " + dataCache.keySet().size());
toProcess.sort(new HandlingInfoTimeComparator());
@@ -301,12 +298,7 @@ public class DataCacheHandler extends SessionCache {
for (HandlingInfo i : toProcess) {
UserData uData = dataCache.get(i.getUuid());
if (uData == null) {
- DBCallableProcessor p = new DBCallableProcessor() {
- @Override
- public void process(UserData data) {
- i.process(data);
- }
- };
+ DBCallableProcessor p = i::process;
getUserDataForProcessing(p, i.getUuid());
} else {
i.process(uData);
@@ -321,20 +313,17 @@ public class DataCacheHandler extends SessionCache {
*/
public void saveCachedData(UUID uuid) {
Log.debug(uuid + ": SaveCachedData");
- DBCallableProcessor saveProcessor = new DBCallableProcessor() {
- @Override
- public void process(UserData data) {
- data.access();
- data.setClearAfterSave(true);
- saveTask.scheduleForSave(data);
- }
+ DBCallableProcessor saveProcessor = data -> {
+ data.access();
+ data.setClearAfterSave(true);
+ saveTask.scheduleForSave(data);
};
getUserDataForProcessing(saveProcessor, uuid);
}
/**
* Saves the cached CommandUse.
- *
+ *
* Should be only called from an Asynchronous Thread.
*/
public void saveCommandUse() {
@@ -366,11 +355,14 @@ public class DataCacheHandler extends SessionCache {
for (List
* Calls all the methods that are ran when PlayerJoinEvent is fired
*/
public void handleReload() {
@@ -525,7 +518,6 @@ public class DataCacheHandler extends SessionCache {
}
/**
- *
* @return
*/
public DataCacheSaveQueue getSaveTask() {
@@ -533,7 +525,6 @@ public class DataCacheHandler extends SessionCache {
}
/**
- *
* @return
*/
public DataCacheClearQueue getClearTask() {
@@ -541,7 +532,6 @@ public class DataCacheHandler extends SessionCache {
}
/**
- *
* @return
*/
public DataCacheProcessQueue getProcessTask() {
@@ -549,7 +539,6 @@ public class DataCacheHandler extends SessionCache {
}
/**
- *
* @return
*/
public DataCacheGetQueue getGetTask() {
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/GeolocationCacheHandler.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/GeolocationCacheHandler.java
index 1f9b5a453..5dcde6df6 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/cache/GeolocationCacheHandler.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/GeolocationCacheHandler.java
@@ -7,6 +7,7 @@ import main.java.com.djrapitops.plan.utilities.Benchmark;
import java.io.BufferedReader;
import java.io.InputStreamReader;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
@@ -21,6 +22,14 @@ import java.util.Map;
* @since 3.5.5
*/
public class GeolocationCacheHandler {
+
+ /**
+ * Constructor used to hide the public constructor
+ */
+ private GeolocationCacheHandler() {
+ throw new IllegalStateException("Utility class");
+ }
+
private static final Cache
* If the Userdata is cached in DataCache it will be used. Otherwise the Get
* Queue will handle the DBCallableProcessor.
*
@@ -48,6 +49,7 @@ public class InspectCacheHandler {
public void process(UserData data) {
cache.put(uuid, new UserData(data));
cacheTimes.put(uuid, MiscUtils.getTime());
+ PageCacheHandler.cachePage("inspectPage: " + uuid.toString(), () -> new InspectPageResponse(Plan.getInstance().getUiServer().getDataReqHandler(), uuid));
try {
ExportUtility.writeInspectHtml(data, ExportUtility.getPlayersFolder(ExportUtility.getFolder()));
} catch (IOException ex) {
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/PageCacheHandler.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/PageCacheHandler.java
new file mode 100644
index 000000000..5a1aff43a
--- /dev/null
+++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/PageCacheHandler.java
@@ -0,0 +1,76 @@
+package main.java.com.djrapitops.plan.data.cache;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import main.java.com.djrapitops.plan.ui.webserver.response.Response;
+
+/**
+ * This class contains the page cache.
+ *
+ * It caches all Responses with their matching identifiers.
+ * This reduces CPU cycles and the time to wait for loading the pages.
+ * This is especially useful in situations where multiple clients are accessing the server.
+ *
+ * This cache uses the Google Guava {@link Cache}.
+ *
+ * @author Fuzzlemann
+ * @since 3.6.0
+ */
+public class PageCacheHandler {
+
+ /**
+ * Constructor used to hide the public constructor
+ */
+ private PageCacheHandler() {
+ throw new IllegalStateException("Utility class");
+ }
+
+ private static final Cache
+ * If the {@link Response} isn't cached, {@link PageLoader#createResponse()} in the {@code loader}
+ * is called to create the Response.
+ *
+ * If the Response is created, it's automatically cached.
+ *
+ * @param identifier The identifier of the page
+ * @param loader The {@link PageLoader} (How should it load the page if it's not cached)
+ * @return The Response that was cached or created by the {@link PageLoader loader}
+ */
+ public static Response loadPage(String identifier, PageLoader loader) {
+ Response response = pageCache.getIfPresent(identifier);
+
+ if (response != null) {
+ return response;
+ }
+
+ response = loader.createResponse();
+
+ pageCache.put(identifier, response);
+
+ return response;
+ }
+
+ /**
+ * Puts the page into the page cache.
+ *
+ * If the cache already inherits that {@code identifier}, it's renewed.
+ *
+ * @param identifier The identifier of the page
+ * @param loader The {@link PageLoader} (How it should load the page)
+ */
+ public static void cachePage(String identifier, PageLoader loader) {
+ Response response = loader.createResponse();
+ pageCache.put(identifier, response);
+ }
+
+ /**
+ * Clears the cache from all its contents.
+ */
+ public static void clearCache() {
+ pageCache.asMap().clear();
+ }
+}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/PageLoader.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/PageLoader.java
new file mode 100644
index 000000000..947019430
--- /dev/null
+++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/PageLoader.java
@@ -0,0 +1,15 @@
+package main.java.com.djrapitops.plan.data.cache;
+
+import main.java.com.djrapitops.plan.ui.webserver.response.Response;
+
+/**
+ * This interface is used for providing the method to load the page.
+ *
+ * @author Fuzzlemann
+ * @since 3.6.0
+ */
+public interface PageLoader {
+
+ Response createResponse();
+
+}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/SessionCache.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/SessionCache.java
index cc0c2b6f6..ea9c43ee7 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/cache/SessionCache.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/SessionCache.java
@@ -1,13 +1,14 @@
package main.java.com.djrapitops.plan.data.cache;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
import main.java.com.djrapitops.plan.Log;
import main.java.com.djrapitops.plan.data.SessionData;
import main.java.com.djrapitops.plan.data.UserData;
import main.java.com.djrapitops.plan.utilities.MiscUtils;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
/**
* This class is used to store active sessions of players in memory.
*
@@ -54,7 +55,7 @@ public class SessionCache {
/**
* Used to get the SessionData of the player in the sessionCache.
*
- * @param uuid UUId of the player.
+ * @param uuid UUID of the player.
* @return SessionData or null if not cached.
*/
public SessionData getSession(UUID uuid) {
@@ -78,7 +79,7 @@ public class SessionCache {
/**
* Used to get the Map of active sessions.
- *
+ *
* Used for testing.
*
* @return key:value UUID:SessionData
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/Consumer.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/Consumer.java
index cd9ee74ac..7c99348e0 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/Consumer.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/Consumer.java
@@ -1,24 +1,26 @@
package main.java.com.djrapitops.plan.data.cache.queue;
import com.djrapitops.plugin.task.AbsRunnable;
+import main.java.com.djrapitops.plan.Log;
+
import java.util.concurrent.BlockingQueue;
/**
* Abstract class representing a queue consumer.
*
- * @author Rsl1122
* @param
* Uses free service of freegeoip.net. 15000 requests can be sent per hour.
*
- * @param ip InetAddress used for location.
+ * @param ip InetAddress used for location.
* @param data UserData of the player.
* @see GeolocationCacheHandler
*/
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/LogoutHandling.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/LogoutHandling.java
index 5c2c37259..ea1ec1038 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/handling/LogoutHandling.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/LogoutHandling.java
@@ -15,8 +15,8 @@ public class LogoutHandling {
* Processes the information of the Event and changes UserData object
* accordingly.
*
- * @param data UserData of the player.
- * @param time Epoch ms the event occurred.
+ * @param data UserData of the player.
+ * @param time Epoch ms the event occurred.
* @param banned Is the player banned?
*/
public static void processLogoutInfo(UserData data, long time, boolean banned) {
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/PlaytimeHandling.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/PlaytimeHandling.java
new file mode 100644
index 000000000..3a7e301d2
--- /dev/null
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/PlaytimeHandling.java
@@ -0,0 +1,25 @@
+package main.java.com.djrapitops.plan.data.handling;
+
+import main.java.com.djrapitops.plan.data.UserData;
+import main.java.com.djrapitops.plan.data.time.GMTimes;
+import main.java.com.djrapitops.plan.data.time.WorldTimes;
+
+public class PlaytimeHandling {
+
+ public static void processPlaytimeDependentInfo(UserData data, long time, String gamemode, String worldName) {
+ long diff = time - data.getLastPlayed();
+ long playTime = data.getPlayTime() + diff;
+ data.setPlayTime(playTime);
+ data.setLastPlayed(time);
+
+ GMTimes gmTimes = data.getGmTimes();
+ if (gamemode != null) {
+ gmTimes.changeState(gamemode, playTime);
+ } else {
+ gmTimes.changeState(gmTimes.getState(), playTime);
+ }
+
+ WorldTimes worldTimes = data.getWorldTimes();
+ worldTimes.changeState(worldName, playTime);
+ }
+}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/ImportUtils.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/ImportUtils.java
index 3e82c5c9b..546d315a6 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/ImportUtils.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/ImportUtils.java
@@ -1,9 +1,11 @@
package main.java.com.djrapitops.plan.data.handling.importing;
import com.djrapitops.pluginbridge.plan.importing.OnTimeImporter;
+import main.java.com.djrapitops.plan.Log;
+
import java.util.HashMap;
import java.util.Map;
-import main.java.com.djrapitops.plan.Log;
+
import static org.bukkit.Bukkit.getPluginManager;
/**
@@ -34,7 +36,7 @@ public class ImportUtils {
try {
importers.put("ontime", new OnTimeImporter());
importers.put("offline", new OfflinePlayerImporter());
- } catch (Throwable e) {
+ } catch (Exception e) {
Log.toLog("ImportUtils.getImporters", e);
Log.error("Plan Plugin Bridge not included in the plugin jar.");
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/Importer.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/Importer.java
index 8fd167b8d..86a124843 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/Importer.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/Importer.java
@@ -2,15 +2,6 @@ package main.java.com.djrapitops.plan.data.handling.importing;
import com.djrapitops.plugin.utilities.player.Fetch;
import com.djrapitops.plugin.utilities.player.IOfflinePlayer;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.Function;
-import java.util.stream.Collectors;
import main.java.com.djrapitops.plan.Log;
import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.data.UserData;
@@ -21,6 +12,11 @@ import main.java.com.djrapitops.plan.database.Database;
import main.java.com.djrapitops.plan.utilities.Benchmark;
import main.java.com.djrapitops.plan.utilities.NewPlayerCreator;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
/**
* Abstract class used for importing data from other plugins.
*
@@ -52,11 +48,11 @@ public abstract class Importer {
/**
* Method used for the import.
- *
+ *
* Creates UserData for players that have not been saved to the database.
*
* @param uuids UUIDs to be imported
- * @param args arguments for the import
+ * @param args arguments for the import
* @return success
*/
public boolean importData(Collection
* If the UUIDs don't match no change should occur.
*
* @param uData UserData object to modify.
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/InfoType.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/InfoType.java
index 793e54406..531eb9f46 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/InfoType.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/InfoType.java
@@ -2,9 +2,9 @@ package main.java.com.djrapitops.plan.data.handling.info;
/**
* Enum class for the types of HandlingInfo to be processed.
- *
+ *
* Type is only used for debugging.
- *
+ *
* OTHER should be used when
*
* @author Rsl1122
@@ -49,5 +49,6 @@ public enum InfoType {
*
* @since 3.1.1
*/
+ WORLD,
OTHER
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/KickInfo.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/KickInfo.java
index ff5ab977f..59fcb4350 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/KickInfo.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/KickInfo.java
@@ -1,8 +1,9 @@
package main.java.com.djrapitops.plan.data.handling.info;
-import java.util.UUID;
import main.java.com.djrapitops.plan.data.UserData;
+import java.util.UUID;
+
/**
* HandlingInfo Class for KickEvent information.
*
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/KillInfo.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/KillInfo.java
index 4a17348a3..1ccf83b1c 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/KillInfo.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/KillInfo.java
@@ -21,9 +21,9 @@ public class KillInfo extends HandlingInfo {
/**
* Constructor.
*
- * @param uuid UUID of the killer.
- * @param time Epoch ms the event occurred.
- * @param dead Dead entity (Mob or Player)
+ * @param uuid UUID of the killer.
+ * @param time Epoch ms the event occurred.
+ * @param dead Dead entity (Mob or Player)
* @param weaponName Weapon used.
*/
public KillInfo(UUID uuid, long time, LivingEntity dead, String weaponName) {
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/LoginInfo.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/LoginInfo.java
index dd12297af..954b2cc6f 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/LoginInfo.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/LoginInfo.java
@@ -1,6 +1,5 @@
package main.java.com.djrapitops.plan.data.handling.info;
-import com.djrapitops.plugin.utilities.player.Gamemode;
import main.java.com.djrapitops.plan.data.UserData;
import main.java.com.djrapitops.plan.data.handling.LoginHandling;
@@ -18,41 +17,48 @@ public class LoginInfo extends HandlingInfo {
private final InetAddress ip;
private final boolean banned;
private final String nickname;
- private final GamemodeInfo gmInfo;
+ private final PlaytimeDependentInfo playtimeDependentInfo;
private final int loginTimes;
/**
* Constructor.
*
- * @param uuid UUID of the player.
- * @param time Epoch ms of the event.
- * @param ip IP of the player
- * @param banned Is the player banned?
- * @param nickname Nickname of the player
- * @param gm current gamemode of the player
+ * @param uuid UUID of the player.
+ * @param time Epoch ms of the event.
+ * @param ip IP of the player
+ * @param banned Is the player banned?
+ * @param nickname Nickname of the player
+ * @param gm current gamemode of the player
* @param loginTimes number the loginTimes should be incremented with.
*/
- public LoginInfo(UUID uuid, long time, InetAddress ip, boolean banned, String nickname, Gamemode gm, int loginTimes) {
+ public LoginInfo(UUID uuid, long time, InetAddress ip, boolean banned, String nickname, String gm, int loginTimes, String worldName) {
super(uuid, InfoType.LOGIN, time);
this.ip = ip;
this.banned = banned;
this.nickname = nickname;
- this.gmInfo = new GamemodeInfo(uuid, time, gm);
+ this.playtimeDependentInfo = new PlaytimeDependentInfo(uuid, InfoType.OTHER, time, gm, worldName);
this.loginTimes = loginTimes;
}
/**
* Constructor for not incrementing the loginTimes.
+ *
+ * This constructor is used only by ReloadInfo
*
- * @param uuid UUID of the player.
- * @param time Epoch ms of the event.
- * @param ip IP of the player
- * @param banned Is the player banned?
+ * @param uuid UUID of the player.
+ * @param time Epoch ms of the event.
+ * @param ip IP of the player
+ * @param banned Is the player banned?
* @param nickname Nickname of the player
- * @param gm current gamemode of the player
+ * @param gm current gamemode of the player
*/
- public LoginInfo(UUID uuid, long time, InetAddress ip, boolean banned, String nickname, Gamemode gm) {
- this(uuid, time, ip, banned, nickname, gm, 0);
+ public LoginInfo(UUID uuid, long time, InetAddress ip, boolean banned, String nickname, String gm, String worldName) {
+ super(uuid, InfoType.RELOAD, time);
+ this.ip = ip;
+ this.banned = banned;
+ this.nickname = nickname;
+ this.playtimeDependentInfo = new PlaytimeDependentInfo(uuid, InfoType.OTHER, time, gm, worldName);
+ this.loginTimes = 0;
}
@Override
@@ -61,7 +67,7 @@ public class LoginInfo extends HandlingInfo {
return false;
}
LoginHandling.processLoginInfo(uData, time, ip, banned, nickname, loginTimes);
- gmInfo.process(uData);
+ playtimeDependentInfo.process(uData);
return true;
}
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/LogoutInfo.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/LogoutInfo.java
index 87ed6b107..c591190b3 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/LogoutInfo.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/LogoutInfo.java
@@ -1,6 +1,5 @@
package main.java.com.djrapitops.plan.data.handling.info;
-import com.djrapitops.plugin.utilities.player.Gamemode;
import main.java.com.djrapitops.plan.data.SessionData;
import main.java.com.djrapitops.plan.data.UserData;
import main.java.com.djrapitops.plan.data.handling.LogoutHandling;
@@ -17,23 +16,23 @@ public class LogoutInfo extends HandlingInfo {
private final boolean banned;
private final SessionData sData;
- private final GamemodeInfo gmInfo;
+ private final PlaytimeDependentInfo playtimeDependentInfo;
/**
* Constructor.
*
- * @param uuid UUID of the player.
- * @param time Epoch ms of the event.
+ * @param uuid UUID of the player.
+ * @param time Epoch ms of the event.
* @param banned Is the player banned
- * @param gm current gamemode of the player
- * @param sData session that has been ended at the moment of the logout
- * event.
+ * @param gm current gamemode of the player
+ * @param sData session that has been ended at the moment of the logout
+ * event.
*/
- public LogoutInfo(UUID uuid, long time, boolean banned, Gamemode gm, SessionData sData) {
+ public LogoutInfo(UUID uuid, long time, boolean banned, String gm, SessionData sData, String worldName) {
super(uuid, InfoType.LOGOUT, time);
this.banned = banned;
this.sData = sData;
- this.gmInfo = new GamemodeInfo(uuid, time, gm);
+ this.playtimeDependentInfo = new PlaytimeDependentInfo(uuid, InfoType.OTHER, time, gm, worldName);
}
@Override
@@ -43,7 +42,7 @@ public class LogoutInfo extends HandlingInfo {
}
uData.addSession(sData);
LogoutHandling.processLogoutInfo(uData, time, banned);
- gmInfo.process(uData);
+ playtimeDependentInfo.process(uData);
return true;
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/PlaytimeDependentInfo.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/PlaytimeDependentInfo.java
new file mode 100644
index 000000000..757c4e88f
--- /dev/null
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/PlaytimeDependentInfo.java
@@ -0,0 +1,27 @@
+package main.java.com.djrapitops.plan.data.handling.info;
+
+import main.java.com.djrapitops.plan.data.UserData;
+import main.java.com.djrapitops.plan.data.handling.PlaytimeHandling;
+
+import java.util.UUID;
+
+public class PlaytimeDependentInfo extends HandlingInfo {
+
+ private final String gamemode;
+ private final String worldName;
+
+ public PlaytimeDependentInfo(UUID uuid, InfoType type, long time, String gm, String worldName) {
+ super(uuid, type, time);
+ this.worldName = worldName;
+ this.gamemode = gm;
+ }
+
+ @Override
+ public boolean process(UserData uData) {
+ if (!uuid.equals(uData.getUuid())) {
+ return false;
+ }
+ PlaytimeHandling.processPlaytimeDependentInfo(uData, time, gamemode, worldName);
+ return true;
+ }
+}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/ReloadInfo.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/ReloadInfo.java
index 5d4d7043e..3b289fd08 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/handling/info/ReloadInfo.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/info/ReloadInfo.java
@@ -1,9 +1,5 @@
package main.java.com.djrapitops.plan.data.handling.info;
-import com.djrapitops.plugin.utilities.player.Gamemode;
-import main.java.com.djrapitops.plan.data.UserData;
-import main.java.com.djrapitops.plan.data.handling.LoginHandling;
-
import java.net.InetAddress;
import java.util.UUID;
@@ -13,43 +9,19 @@ import java.util.UUID;
* @author Rsl1122
* @since 3.0.0
*/
-public class ReloadInfo extends HandlingInfo {
-
- private final InetAddress ip;
- private final boolean banned;
- private final String nickname;
- private final GamemodeInfo gmInfo;
+public class ReloadInfo extends LoginInfo {
/**
* Constructor.
*
- * @param uuid UUID of the player.
- * @param time Epoch ms of the event.
- * @param ip IP of the player
- * @param banned Is the player banned?
+ * @param uuid UUID of the player.
+ * @param time Epoch ms of the event.
+ * @param ip IP of the player
+ * @param banned Is the player banned?
* @param nickname Nickname of the player
- * @param gm current gamemode of the player
+ * @param gm current gamemode of the player
*/
- public ReloadInfo(UUID uuid, long time, InetAddress ip, boolean banned, String nickname, Gamemode gm) {
- super(uuid, InfoType.RELOAD, time);
- this.ip = ip;
- this.banned = banned;
- this.nickname = nickname;
- gmInfo = new GamemodeInfo(uuid, time, gm);
+ public ReloadInfo(UUID uuid, long time, InetAddress ip, boolean banned, String nickname, String gm, String worldName) {
+ super(uuid, time, ip, banned, nickname, gm, worldName);
}
-
- @Override
- public boolean process(UserData uData) {
- if (!uData.getUuid().equals(uuid)) {
- return false;
- }
- uData.setPlayTime(uData.getPlayTime() + (time - uData.getLastPlayed()));
- uData.setLastPlayed(time);
- uData.updateBanned(banned);
- uData.addIpAddress(ip);
- uData.addNickname(nickname);
- LoginHandling.updateGeolocation(ip, uData);
- return gmInfo.process(uData);
- }
-
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanChatListener.java b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanChatListener.java
index fec2e8c90..2b1567df1 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanChatListener.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanChatListener.java
@@ -37,7 +37,8 @@ public class PlanChatListener implements Listener {
if (event.isCancelled()) {
return;
}
+
Player p = event.getPlayer();
- handler.addToPool(new ChatInfo(p.getUniqueId(), p.getDisplayName(), event.getMessage()));
+ handler.addToPool(new ChatInfo(p.getUniqueId(), p.getDisplayName()));
}
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanCommandPreprocessListener.java b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanCommandPreprocessListener.java
index 143997743..4e74dee7a 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanCommandPreprocessListener.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanCommandPreprocessListener.java
@@ -49,14 +49,14 @@ public class PlanCommandPreprocessListener implements Listener {
boolean combineCommandAliasesToMainCommand = Settings.COMBINE_COMMAND_ALIASES_TO_MAIN_COMMAND.isTrue();
if (doNotLogUnknownCommands || combineCommandAliasesToMainCommand) {
- Command command = plugin.getServer().getPluginCommand(commandName);
+ Command command = plugin.getServer().getPluginCommand(commandName.substring(1, commandName.length()));
if (command == null) {
if (doNotLogUnknownCommands) {
Log.debug("Ignored command, command is unknown");
return;
}
} else if (combineCommandAliasesToMainCommand) {
- commandName = command.getName();
+ commandName = "/" + command.getName();
}
}
@@ -66,6 +66,7 @@ public class PlanCommandPreprocessListener implements Listener {
Log.debug("Ignored command, player had ignore permission.");
return;
}
+
handler.handleCommand(commandName);
}
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanDeathEventListener.java b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanDeathEventListener.java
index 06cd75d31..9c25f8fd9 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanDeathEventListener.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanDeathEventListener.java
@@ -6,11 +6,12 @@ import main.java.com.djrapitops.plan.data.handling.info.DeathInfo;
import main.java.com.djrapitops.plan.data.handling.info.KillInfo;
import main.java.com.djrapitops.plan.utilities.MiscUtils;
import org.bukkit.Material;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
+import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDeathEvent;
/**
@@ -41,23 +42,51 @@ public class PlanDeathEventListener implements Listener {
public void onDeath(EntityDeathEvent event) {
long time = MiscUtils.getTime();
LivingEntity dead = event.getEntity();
- Player killer = dead.getKiller();
- boolean killerIsPlayer = killer != null;
- if (killerIsPlayer) {
- Material itemInHand;
- try {
- itemInHand = killer.getInventory().getItemInMainHand().getType();
- } catch (Throwable e) {
- try {
- itemInHand = killer.getInventory().getItemInHand().getType(); // Support for non dual wielding versions.
- } catch (Throwable e2) {
- itemInHand = Material.AIR;
- }
- }
- handler.addToPool(new KillInfo(killer.getUniqueId(), time, dead, itemInHand.name()));
- }
+
if (dead instanceof Player) {
handler.addToPool(new DeathInfo(dead.getUniqueId()));
}
+
+ EntityDamageEvent entityDamageEvent = dead.getLastDamageCause();
+ if (!(entityDamageEvent instanceof EntityDamageByEntityEvent)) {
+ return;
+ }
+
+ EntityDamageByEntityEvent entityDamageByEntityEvent = (EntityDamageByEntityEvent) entityDamageEvent;
+ Entity killerEntity = entityDamageByEntityEvent.getDamager();
+
+ if (killerEntity instanceof Player) {
+ Player killer = (Player) killerEntity;
+ Material itemInHand;
+ try {
+ itemInHand = killer.getInventory().getItemInMainHand().getType();
+ } catch (Exception e) {
+ try {
+ itemInHand = killer.getInventory().getItemInHand().getType(); // Support for non dual wielding versions.
+ } catch (Exception e2) {
+ itemInHand = Material.AIR;
+ }
+ }
+
+ handler.addToPool(new KillInfo(killer.getUniqueId(), time, dead, itemInHand.name()));
+ return;
+ }
+
+ if (killerEntity instanceof Wolf) {
+ Wolf wolf = (Wolf) killerEntity;
+
+ if (!wolf.isTamed()) {
+ return;
+ }
+
+ AnimalTamer owner = wolf.getOwner();
+
+ if (!(owner instanceof Player)) {
+ return;
+ }
+
+ handler.addToPool(new KillInfo(owner.getUniqueId(), time, dead, "Wolf"));
+ }
}
}
+
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanGamemodeChangeListener.java b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanGamemodeChangeListener.java
index 8b4bc9ffd..4a21103e5 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanGamemodeChangeListener.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanGamemodeChangeListener.java
@@ -1,9 +1,9 @@
package main.java.com.djrapitops.plan.data.listeners;
-import com.djrapitops.plugin.utilities.player.Gamemode;
import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.data.cache.DataCacheHandler;
-import main.java.com.djrapitops.plan.data.handling.info.GamemodeInfo;
+import main.java.com.djrapitops.plan.data.handling.info.InfoType;
+import main.java.com.djrapitops.plan.data.handling.info.PlaytimeDependentInfo;
import main.java.com.djrapitops.plan.utilities.MiscUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -11,6 +11,8 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerGameModeChangeEvent;
+import java.util.UUID;
+
/**
* Event Listener for PlayerGameModeChangeEvents.
*
@@ -41,6 +43,8 @@ public class PlanGamemodeChangeListener implements Listener {
return;
}
Player p = event.getPlayer();
- handler.addToPool(new GamemodeInfo(p.getUniqueId(), MiscUtils.getTime(), Gamemode.wrap(event.getNewGameMode())));
+ UUID uuid = p.getUniqueId();
+ long time = MiscUtils.getTime();
+ handler.addToPool(new PlaytimeDependentInfo(uuid, InfoType.GM, time, event.getNewGameMode().name(), p.getWorld().getName()));
}
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanPlayerListener.java b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanPlayerListener.java
index 315b42bf1..e57d54790 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanPlayerListener.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanPlayerListener.java
@@ -1,8 +1,9 @@
package main.java.com.djrapitops.plan.data.listeners;
import com.djrapitops.plugin.task.AbsRunnable;
+import com.djrapitops.plugin.utilities.player.Fetch;
import com.djrapitops.plugin.utilities.player.Gamemode;
-import com.djrapitops.plugin.utilities.player.bukkit.BukkitPlayer;
+import com.djrapitops.plugin.utilities.player.IPlayer;
import main.java.com.djrapitops.plan.Log;
import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.data.UserData;
@@ -20,12 +21,14 @@ import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerKickEvent;
import org.bukkit.event.player.PlayerQuitEvent;
+import java.net.InetAddress;
import java.util.UUID;
/**
* Event Listener for PlayerJoin, PlayerQuit and PlayerKickEvents.
*
* @author Rsl1122
+ * @since 2.0.0
*/
public class PlanPlayerListener implements Listener {
@@ -34,9 +37,8 @@ public class PlanPlayerListener implements Listener {
/**
* Class Constructor.
- *
- * Copies the references to multiple handlers from Current instance of
- * handler.
+ *
+ * Copies the references to multiple handlers from Current instance of handler.
*
* @param plugin Current instance of Plan
*/
@@ -47,42 +49,57 @@ public class PlanPlayerListener implements Listener {
/**
* PlayerJoinEvent Listener.
- *
- * If player is a new player, creates a new data in the database for the
- * player. Retrieves the UserData, updates and then saves it to the Cache.
+ *
+ * If player is a new player, creates new data for the player.
+ *
+ * Adds a LoginInfo to the processingQueue if the user is not new.
*
* @param event The Fired event.
*/
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerLogin(PlayerJoinEvent event) {
Player player = event.getPlayer();
+
+ IPlayer iPlayer = Fetch.wrapBukkit(player);
+ plugin.getNotificationCenter().checkNotifications(iPlayer);
+
UUID uuid = player.getUniqueId();
handler.startSession(uuid);
Log.debug(uuid + ": PlayerJoinEvent");
+
plugin.getRunnableFactory().createNew(new AbsRunnable("NewPlayerCheckTask") {
@Override
public void run() {
- LoginInfo loginInfo = new LoginInfo(uuid, MiscUtils.getTime(), player.getAddress().getAddress(), player.isBanned(), player.getDisplayName(), Gamemode.wrap(player.getGameMode()), 1);
+ long time = MiscUtils.getTime();
+ InetAddress ip = player.getAddress().getAddress();
+ boolean banned = player.isBanned();
+ String displayName = player.getDisplayName();
+ String gm = player.getGameMode().name();
+ String worldName = player.getWorld().getName();
+
+ LoginInfo loginInfo = new LoginInfo(uuid, time, ip, banned, displayName, gm, 1, worldName);
boolean isNewPlayer = !plugin.getDB().wasSeenBefore(uuid);
+
if (isNewPlayer) {
- UserData newUserData = NewPlayerCreator.createNewPlayer(BukkitPlayer.wrap(player));
+ UserData newUserData = NewPlayerCreator.createNewPlayer(iPlayer);
loginInfo.process(newUserData);
handler.newPlayer(newUserData);
} else {
handler.addToPool(loginInfo);
}
+
Log.debug(uuid + ": PlayerJoinEvent_AsyncTask_END, New:" + isNewPlayer);
this.cancel();
}
}).runTaskAsynchronously();
+
Log.debug(uuid + ": PlayerJoinEvent_END");
}
/**
* PlayerQuitEvent Listener.
- *
- * Retrieves the current UserData for the Player, updates it, saves the data
- * to Database and clears it from cache.
+ *
+ * Adds a LogoutInfo to the processing Queue.
*
* @param event Fired event
*/
@@ -92,15 +109,20 @@ public class PlanPlayerListener implements Listener {
UUID uuid = player.getUniqueId();
handler.endSession(uuid);
Log.debug(uuid + ": PlayerQuitEvent");
- handler.addToPool(new LogoutInfo(uuid, MiscUtils.getTime(), player.isBanned(), Gamemode.wrap(player.getGameMode()), handler.getSession(uuid)));
+ long time = MiscUtils.getTime();
+ boolean banned = player.isBanned();
+ Gamemode gm = Gamemode.wrap(player.getGameMode());
+ String worldName = player.getWorld().getName();
+
+ handler.addToPool(new LogoutInfo(uuid, time, banned, gm.name(), handler.getSession(uuid), worldName));
handler.saveCachedData(uuid);
Log.debug(uuid + ": PlayerQuitEvent_END");
}
/**
* PlayerKickEvent Listener.
- *
- * Updates current playerdata and saves it to the Database.
+ *
+ * Adds a KickInfo & LogoutInfo to the processing Queue.
*
* @param event Fired event
*/
@@ -113,7 +135,12 @@ public class PlanPlayerListener implements Listener {
UUID uuid = player.getUniqueId();
handler.endSession(uuid);
Log.debug(uuid + ": PlayerKickEvent");
- handler.addToPool(new LogoutInfo(uuid, MiscUtils.getTime(), player.isBanned(), Gamemode.wrap(player.getGameMode()), handler.getSession(uuid)));
+ long time = MiscUtils.getTime();
+ boolean banned = player.isBanned();
+ Gamemode gm = Gamemode.wrap(player.getGameMode());
+ String worldName = player.getWorld().getName();
+
+ handler.addToPool(new LogoutInfo(uuid, time, banned, gm.name(), handler.getSession(uuid), worldName));
handler.addToPool(new KickInfo(uuid));
handler.saveCachedData(uuid);
Log.debug(uuid + ": PlayerKickEvent_END");
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanWorldChangeListener.java b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanWorldChangeListener.java
new file mode 100644
index 000000000..543d0a086
--- /dev/null
+++ b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanWorldChangeListener.java
@@ -0,0 +1,35 @@
+package main.java.com.djrapitops.plan.data.listeners;
+
+import main.java.com.djrapitops.plan.Plan;
+import main.java.com.djrapitops.plan.data.cache.DataCacheHandler;
+import main.java.com.djrapitops.plan.data.handling.info.InfoType;
+import main.java.com.djrapitops.plan.data.handling.info.PlaytimeDependentInfo;
+import main.java.com.djrapitops.plan.utilities.MiscUtils;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerChangedWorldEvent;
+
+import java.util.UUID;
+
+public class PlanWorldChangeListener implements Listener {
+ private final DataCacheHandler handler;
+
+ public PlanWorldChangeListener(Plan plugin) {
+ this.handler = plugin.getHandler();
+ }
+
+ @EventHandler(priority = EventPriority.MONITOR)
+ public void onWorldChange(PlayerChangedWorldEvent event) {
+ Player p = event.getPlayer();
+ String previousWorld = event.getFrom().getName();
+ String worldName = p.getWorld().getName();
+ if (previousWorld.equals(worldName)) {
+ return;
+ }
+ UUID uuid = p.getUniqueId();
+ long time = MiscUtils.getTime();
+ handler.addToPool(new PlaytimeDependentInfo(uuid, InfoType.WORLD, time, p.getGameMode().name(), p.getWorld().getName()));
+ }
+}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/listeners/TPSCountTimer.java b/Plan/src/main/java/com/djrapitops/plan/data/listeners/TPSCountTimer.java
index 2fa7b4b5a..90758193b 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/listeners/TPSCountTimer.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/listeners/TPSCountTimer.java
@@ -8,6 +8,7 @@ import main.java.com.djrapitops.plan.data.TPS;
import main.java.com.djrapitops.plan.data.cache.DataCacheHandler;
import main.java.com.djrapitops.plan.utilities.MiscUtils;
import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
+import org.bukkit.World;
import java.lang.management.ManagementFactory;
import java.lang.management.OperatingSystemMXBean;
@@ -21,10 +22,10 @@ import java.util.List;
*/
public class TPSCountTimer extends AbsRunnable {
- private long lastCheckNano;
private final Plan plugin;
private final DataCacheHandler handler;
private final List
+ * Give 1 - 4 parameters.
+ * times starts from Survival, ends in Spectator.
+ *
+ * Given too few parameters (Under 4, rest are set as 0L)
+ * Extra parameters are ignored (Over 4)
+ *
+ * @param times 1-4 time parameters.
+ * @throws IllegalArgumentException If any parameter is null.
+ */
+ public void setAllGMTimes(long... times) throws IllegalArgumentException {
+ Verify.nullCheck(times);
+ String[] gms = GMTimesTable.getGMKeyArray();
+ int size = times.length;
+ for (int i = 0; i < 4; i++) {
+ if (i >= size) {
+ setTime(gms[i], 0L);
+ } else {
+ setTime(gms[i], times[i]);
+ }
+ }
+ }
+
+ public void resetTimes(long playtime) {
+ resetState("SURVIVAL", playtime);
+ resetState("CREATIVE");
+ resetState("ADVENTURE");
+ resetState("SPECTATOR");
+ }
+
+ @Override
+ public String getState() {
+ String state = super.getState();
+ return state != null ? state : "SURVIVAL";
+ }
+}
\ No newline at end of file
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java b/Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java
new file mode 100644
index 000000000..b17c28c41
--- /dev/null
+++ b/Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java
@@ -0,0 +1,162 @@
+package main.java.com.djrapitops.plan.data.time;
+
+import com.djrapitops.plugin.utilities.Verify;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Abstract class for keeping track of time spent in each state.
+ */
+public abstract class TimeKeeper {
+ /**
+ * Keeps time of states.
+ */
+ protected Map
* All methods should be only called from an asynchronous thread, unless stated
* otherwise.
*
@@ -78,8 +78,27 @@ public abstract class Database {
*/
protected VersionTable versionTable;
+ /**
+ * Table representing plan_security in the database.
+ *
+ * @since 3.5.2
+ */
protected SecurityTable securityTable;
+ /**
+ * Table representing plan_worlds in the database.
+ *
+ * @since 3.6.0
+ */
+ protected WorldTable worldTable;
+
+ /**
+ * Table representing plan_world_times in the database.
+ *
+ * @since 3.6.0
+ */
+ protected WorldTimesTable worldTimesTable;
+
/**
* Super constructor.
*
@@ -91,7 +110,7 @@ public abstract class Database {
/**
* Initiates the database.
- *
+ *
* Default method returns false.
*
* @return Was the initiation successful?
@@ -103,12 +122,12 @@ public abstract class Database {
/**
* Used to give Database processors to call with UserData after they have
* been fetched from the database.
- *
+ *
* This method is a shortcut method for multiple parameters.
*
- * @param uuid UUID of the player.
+ * @param uuid UUID of the player.
* @param processors Processors to call with the UserData after the fetch is
- * complete.
+ * complete.
* @throws SQLException If a database error occurs.
*/
public void giveUserDataToProcessors(UUID uuid, DBCallableProcessor... processors) throws SQLException {
@@ -119,16 +138,16 @@ public abstract class Database {
* Used to give Database processors to call with UserData after they have
* been fetched from the database.
*
- * @param uuid UUID of the player.
+ * @param uuid UUID of the player.
* @param processors Processors to call with the UserData after the fetch is
- * complete.
+ * complete.
* @throws SQLException If a database error occurs.
*/
public abstract void giveUserDataToProcessors(UUID uuid, Collection
* Should only be called from async thread.
*
* @param uuids UUIDs to fetch data for.
@@ -168,7 +187,7 @@ public abstract class Database {
/**
* Used to get the name of the database type.
- *
+ *
* Thread safe.
*
* @return SQLite/MySQL
@@ -177,7 +196,7 @@ public abstract class Database {
/**
* Used to get the config name of the database type.
- *
+ *
* Thread safe.
*
* @return sqlite/mysql
@@ -199,7 +218,7 @@ public abstract class Database {
* Used to set the database schema version.
*
* @param version Integer starting from 0, incremented by one when schema is
- * updated.
+ * updated.
* @throws SQLException If a database error occurs.
*/
public abstract void setVersion(int version) throws SQLException;
@@ -222,7 +241,7 @@ public abstract class Database {
/**
* Used to clear all data from the database.
- *
+ *
* Uses DELETE * FROM table.
*
* @return Success of removal.
@@ -233,7 +252,7 @@ public abstract class Database {
* Used to save CommandUse map.
*
* @param data String command (key), Integer times used
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
* @throws NullPointerException If the database has not initialized tables.
*/
public void saveCommandUse(Map