Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-26 11:08:08 +01:00
Code Issues Projects Releases Wiki Activity

Removed references to MiscUtils#getTime, removed the method

Browse Source
This commit is contained in:
Rsl1122 2018-05-25 09:03:26 +03:00
parent 20eb3d8c3a
commit 1e75a665b9
36 changed files with 52 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plan/src/main/java/com/djrapitops/plan/ShutdownHook.java
View File

@ -13,7 +13,6 @@ import com.djrapitops.plan.system.cache.CacheSystem;
import com.djrapitops.plan.system.cache.DataCache;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import java.util.Map;
@ -53,7 +52,7 @@ public class ShutdownHook extends Thread {
Database db = null;
try {
Map<UUID, Session> activeSessions = SessionCache.getActiveSessions();
long now = MiscUtils.getTime();
long now = System.currentTimeMillis();
db = Database.getActive();
saveFirstSessionInformation(db, now);
saveActiveSessions(db, activeSessions, now);

6
Plan/src/main/java/com/djrapitops/plan/command/commands/QInspectCommand.java
View File

@ -71,7 +71,7 @@ public class QInspectCommand extends CommandNode {
PlayerProfile playerProfile = database.fetch().getPlayerProfile(uuid);
sendMsgs(sender, playerProfile);
sendMessages(sender, playerProfile);
} catch (DBException ex) {
Log.toLog(this.getClass(), ex);
@ -82,8 +82,8 @@ public class QInspectCommand extends CommandNode {
}).runTaskAsynchronously();
}
private void sendMsgs(ISender sender, PlayerProfile profile) {
long now = MiscUtils.getTime();
private void sendMessages(ISender sender, PlayerProfile profile) {
long now = System.currentTimeMillis();
ColorScheme colorScheme = plugin.getColorScheme();

2
Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java
View File

@ -10,7 +10,6 @@ import com.djrapitops.plan.system.settings.Permissions;
import com.djrapitops.plan.system.settings.locale.Locale;
import com.djrapitops.plan.system.settings.locale.Msg;
import com.djrapitops.plan.utilities.Condition;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.command.CommandNode;
import com.djrapitops.plugin.command.CommandType;
@ -72,7 +71,6 @@ public class ManageClearCommand extends CommandNode {
database.remove().everything();
long now = MiscUtils.getTime();
sender.sendMessage(Locale.get(Msg.MANAGE_INFO_CLEAR_SUCCESS).toString());
} catch (FatalDBException e) {
sender.sendMessage(Locale.get(Msg.MANAGE_INFO_FAIL).toString()

11
Plan/src/main/java/com/djrapitops/plan/data/PlayerProfile.java
View File

@ -11,7 +11,6 @@ import com.djrapitops.plan.data.container.PlayerKill;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.data.time.WorldTimes;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plan.utilities.comparators.ActionComparator;
import com.djrapitops.plan.utilities.comparators.GeoInfoComparator;
@ -177,7 +176,7 @@ public class PlayerProfile {
}
public long getTotalPlaytime() {
return getPlaytime(-1, MiscUtils.getTime() + 1L);
return getPlaytime(-1, System.currentTimeMillis() + 1L);
}
public long getPlaytime(long after, long before) {
@ -189,7 +188,7 @@ public class PlayerProfile {
}
public long getLongestSession() {
return getLongestSession(-1, MiscUtils.getTime() + 1L);
return getLongestSession(-1, System.currentTimeMillis() + 1L);
}
public long getLongestSession(int after, long before) {
@ -201,7 +200,7 @@ public class PlayerProfile {
}
public long getSessionMedian() {
return getSessionMedian(-1, MiscUtils.getTime() + 1L);
return getSessionMedian(-1, System.currentTimeMillis() + 1L);
}
public long getSessionMedian(int after, long before) {
@ -215,7 +214,7 @@ public class PlayerProfile {
// Special Getters
public long getSessionAverage() {
return getSessionAverage(-1, MiscUtils.getTime() + 1L);
return getSessionAverage(-1, System.currentTimeMillis() + 1L);
}
public long getSessionAverage(int after, long before) {
@ -241,7 +240,7 @@ public class PlayerProfile {
public GeoInfo getMostRecentGeoInfo() {
if (geoInformation.isEmpty()) {
return new GeoInfo("-", "Not Known", MiscUtils.getTime(), "");
return new GeoInfo("-", "Not Known", System.currentTimeMillis(), "");
}
geoInformation.sort(new GeoInfoComparator());
return geoInformation.get(0);

2
Plan/src/main/java/com/djrapitops/plan/data/calculation/AnalysisData.java
View File

@ -93,7 +93,7 @@ public class AnalysisData extends RawData {
}
public void analyze(ServerProfile profile) {
long now = MiscUtils.getTime();
long now = System.currentTimeMillis();
refreshDate = now;
long dayAgo = now - TimeAmount.DAY.ms();
long weekAgo = now - TimeAmount.WEEK.ms();

3
Plan/src/main/java/com/djrapitops/plan/data/container/Session.java
View File

@ -1,7 +1,6 @@
package com.djrapitops.plan.data.container;
import com.djrapitops.plan.data.time.WorldTimes;
import com.djrapitops.plan.utilities.MiscUtils;
import java.util.ArrayList;
import java.util.HashMap;
@ -106,7 +105,7 @@ public class Session {
*/
public long getLength() {
if (sessionEnd == -1) {
return MiscUtils.getTime() - sessionStart;
return System.currentTimeMillis() - sessionStart;
}
return sessionEnd - sessionStart;
}

4
Plan/src/main/java/com/djrapitops/plan/data/time/WorldTimes.java
View File

@ -1,7 +1,5 @@
package com.djrapitops.plan.data.time;
import com.djrapitops.plan.utilities.MiscUtils;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@ -28,7 +26,7 @@ public class WorldTimes {
worldTimes = new HashMap<>();
currentWorld = startingWorld;
currentGamemode = startingGM;
addWorld(startingWorld, startingGM, MiscUtils.getTime());
addWorld(startingWorld, startingGM, System.currentTimeMillis());
}
/**

3
Plan/src/main/java/com/djrapitops/plan/system/cache/SessionCache.java vendored
View File

@ -4,7 +4,6 @@ import com.djrapitops.plan.api.exceptions.database.DBException;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.utilities.Verify;
@ -71,7 +70,7 @@ public class SessionCache {
public static void refreshActiveSessionsState() {
for (Session session : activeSessions.values()) {
session.getWorldTimes().updateState(MiscUtils.getTime());
session.getWorldTimes().updateState(System.currentTimeMillis());
}
}

3
Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
View File

@ -8,7 +8,6 @@ import com.djrapitops.plan.data.container.*;
import com.djrapitops.plan.system.database.databases.operation.FetchOperations;
import com.djrapitops.plan.system.database.databases.sql.SQLDB;
import com.djrapitops.plan.system.info.server.Server;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.TimeAmount;
import java.sql.SQLException;
@ -32,7 +31,7 @@ public class SQLFetchOps extends SQLOps implements FetchOperations {
profile.setAllTimePeak(peak.getDate());
profile.setAllTimePeakPlayers(peak.getPlayers());
});
Optional<TPS> lastPeak = tpsTable.getPeakPlayerCount(serverUUID, MiscUtils.getTime() - (TimeAmount.DAY.ms() * 2L));
Optional<TPS> lastPeak = tpsTable.getPeakPlayerCount(serverUUID, System.currentTimeMillis() - (TimeAmount.DAY.ms() * 2L));
lastPeak.ifPresent(peak -> {
profile.setLastPeakDate(peak.getDate());
profile.setLastPeakPlayers(peak.getPlayers());

3
Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SessionsTable.java
View File

@ -11,7 +11,6 @@ import com.djrapitops.plan.system.database.databases.sql.statements.Select;
import com.djrapitops.plan.system.database.databases.sql.statements.Sql;
import com.djrapitops.plan.system.database.databases.sql.statements.TableSqlParser;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.utilities.Verify;
@ -619,7 +618,7 @@ public class SessionsTable extends UserIDTable {
return query(new QueryStatement<Map<UUID, Map<UUID, List<Session>>>>(sql, 20000) {
@Override
public void prepare(PreparedStatement statement) throws SQLException {
statement.setLong(1, MiscUtils.getTime() - TimeAmount.MONTH.ms());
statement.setLong(1, System.currentTimeMillis() - TimeAmount.MONTH.ms());
}
@Override

3
Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/TPSTable.java
View File

@ -13,7 +13,6 @@ import com.djrapitops.plan.system.database.databases.sql.statements.Sql;
import com.djrapitops.plan.system.database.databases.sql.statements.TableSqlParser;
import com.djrapitops.plan.system.info.server.Server;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.utilities.Verify;
@ -133,7 +132,7 @@ public class TPSTable extends Table {
statement.setInt(1, pValue);
// More than 2 Months ago.
long fiveWeeks = TimeAmount.MONTH.ms() * 2L;
statement.setLong(2, MiscUtils.getTime() - fiveWeeks);
statement.setLong(2, System.currentTimeMillis() - fiveWeeks);
}
});
}

7
Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/TransferTable.java
View File

@ -12,7 +12,6 @@ import com.djrapitops.plan.system.database.databases.sql.statements.Column;
import com.djrapitops.plan.system.database.databases.sql.statements.Sql;
import com.djrapitops.plan.system.database.databases.sql.statements.TableSqlParser;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.TimeAmount;
import java.sql.PreparedStatement;
@ -84,7 +83,7 @@ public class TransferTable extends Table {
execute(new ExecStatement(sql) {
@Override
public void prepare(PreparedStatement statement) throws SQLException {
statement.setLong(1, MiscUtils.getTime());
statement.setLong(1, System.currentTimeMillis());
statement.setString(2, "onlineStatus");
}
});
@ -133,7 +132,7 @@ public class TransferTable extends Table {
@Override
public void prepare(PreparedStatement statement) throws SQLException {
statement.setString(1, ServerInfo.getServerUUID().toString());
statement.setLong(2, MiscUtils.getTime() + TimeAmount.HOUR.ms());
statement.setLong(2, System.currentTimeMillis() + TimeAmount.HOUR.ms());
statement.setString(3, "configSettings");
statement.setString(4, null);
statement.setString(5, encodedSettingString);
@ -146,7 +145,7 @@ public class TransferTable extends Table {
@Override
public void prepare(PreparedStatement statement) throws SQLException {
statement.setString(1, "configSettings");
statement.setLong(2, MiscUtils.getTime());
statement.setLong(2, System.currentTimeMillis());
}
@Override

5
Plan/src/main/java/com/djrapitops/plan/system/info/connection/BungeeConnectionSystem.java
View File

@ -10,7 +10,6 @@ import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.system.info.request.*;
import com.djrapitops.plan.system.info.server.Server;
import com.djrapitops.plan.system.webserver.WebServerSystem;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.api.utility.log.Log;
@ -32,10 +31,10 @@ public class BungeeConnectionSystem extends ConnectionSystem {
}
private void refreshServerMap() {
if (latestServerMapRefresh < MiscUtils.getTime() - TimeAmount.SECOND.ms() * 15L) {
if (latestServerMapRefresh < System.currentTimeMillis() - TimeAmount.SECOND.ms() * 15L) {
try {
bukkitServers = Database.getActive().fetch().getBukkitServers();
latestServerMapRefresh = MiscUtils.getTime();
latestServerMapRefresh = System.currentTimeMillis();
} catch (DBException e) {
Log.toLog(this.getClass(), e);
}

3
Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionLog.java
View File

@ -6,7 +6,6 @@ package com.djrapitops.plan.system.info.connection;
import com.djrapitops.plan.system.info.request.InfoRequest;
import com.djrapitops.plan.system.info.server.Server;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import java.util.HashMap;
@ -49,7 +48,7 @@ public class ConnectionLog {
private static void logConnection(String address, String infoRequestName, int responseCode) {
Map<String, Map<String, Entry>> log = getInstance().log;
Map<String, Entry> requestMap = log.getOrDefault(address, new HashMap<>());
requestMap.put(infoRequestName, new Entry(responseCode, MiscUtils.getTime()));
requestMap.put(infoRequestName, new Entry(responseCode, System.currentTimeMillis()));
log.put(address, requestMap);
}

5
Plan/src/main/java/com/djrapitops/plan/system/info/connection/ServerConnectionSystem.java
View File

@ -16,7 +16,6 @@ import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.settings.locale.Locale;
import com.djrapitops.plan.system.settings.locale.Msg;
import com.djrapitops.plan.system.webserver.WebServerSystem;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.api.utility.log.Log;
@ -40,13 +39,13 @@ public class ServerConnectionSystem extends ConnectionSystem {
private void refreshServerMap() {
Processing.submitNonCritical(() -> {
if (latestServerMapRefresh < MiscUtils.getTime() - TimeAmount.SECOND.ms() * 15L) {
if (latestServerMapRefresh < System.currentTimeMillis() - TimeAmount.SECOND.ms() * 15L) {
try {
Database database = Database.getActive();
Optional<Server> bungeeInformation = database.fetch().getBungeeInformation();
bungeeInformation.ifPresent(server -> mainServer = server);
bukkitServers = database.fetch().getBukkitServers();
latestServerMapRefresh = MiscUtils.getTime();
latestServerMapRefresh = System.currentTimeMillis();
} catch (DBException e) {
Log.toLog(this.getClass(), e);
}

3
Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/AFKListener.java
View File

@ -1,7 +1,6 @@
package com.djrapitops.plan.system.listeners.bukkit;
import com.djrapitops.plan.system.afk.AFKTracker;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
@ -29,7 +28,7 @@ public class AFKListener implements Listener {
private void event(PlayerEvent event) {
try {
UUID uuid = event.getPlayer().getUniqueId();
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
AFK_TRACKER.performedAction(uuid, time);
} catch (Exception e) {

3
Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/DeathEventListener.java
View File

@ -4,7 +4,6 @@ import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.player.KillProcessor;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.utilities.Format;
import org.bukkit.Material;
@ -32,7 +31,7 @@ public class DeathEventListener implements Listener {
@SuppressWarnings("deprecation")
@EventHandler(priority = EventPriority.MONITOR)
public void onDeath(EntityDeathEvent event) {
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
LivingEntity dead = event.getEntity();
if (dead instanceof Player) {

3
Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/GamemodeChangeListener.java
View File

@ -3,7 +3,6 @@ package com.djrapitops.plan.system.listeners.bukkit;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.settings.WorldAliasSettings;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -41,7 +40,7 @@ public class GamemodeChangeListener implements Listener {
private void actOnEvent(PlayerGameModeChangeEvent event) {
Player player = event.getPlayer();
UUID uuid = player.getUniqueId();
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
String gameMode = event.getNewGameMode().name();
String worldName = player.getWorld().getName();

3
Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java
View File

@ -7,7 +7,6 @@ import com.djrapitops.plan.system.processing.processors.info.NetworkPageUpdatePr
import com.djrapitops.plan.system.processing.processors.info.PlayerPageUpdateProcessor;
import com.djrapitops.plan.system.processing.processors.player.*;
import com.djrapitops.plan.system.tasks.TaskSystem;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.systems.NotificationCenter;
import com.djrapitops.plugin.api.utility.log.Log;
import org.bukkit.entity.Player;
@ -119,7 +118,7 @@ public class PlayerOnlineListener implements Listener {
}
private void actOnQuitEvent(PlayerQuitEvent event) {
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
Player player = event.getPlayer();
UUID uuid = player.getUniqueId();

3
Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/WorldChangeListener.java
View File

@ -3,7 +3,6 @@ package com.djrapitops.plan.system.listeners.bukkit;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.settings.WorldAliasSettings;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -26,7 +25,7 @@ public class WorldChangeListener implements Listener {
}
private void actOnEvent(PlayerChangedWorldEvent event) {
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
Player player = event.getPlayer();
UUID uuid = player.getUniqueId();

9
Plan/src/main/java/com/djrapitops/plan/system/listeners/sponge/SpongeAFKListener.java
View File

@ -1,7 +1,6 @@
package com.djrapitops.plan.system.listeners.sponge;
import com.djrapitops.plan.system.afk.AFKTracker;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.Listener;
@ -31,7 +30,7 @@ public class SpongeAFKListener {
private void event(TargetPlayerEvent event) {
try {
UUID uuid = event.getTargetEntity().getUniqueId();
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
AFK_TRACKER.performedAction(uuid, time);
} catch (Exception e) {
@ -42,21 +41,21 @@ public class SpongeAFKListener {
@Listener(order = Order.POST)
public void onMove(MoveEntityEvent event, @First Player player) {
UUID uuid = player.getUniqueId();
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
AFK_TRACKER.performedAction(uuid, time);
}
@Listener(order = Order.POST)
public void onPlayerChat(MessageChannelEvent.Chat event, @First Player player) {
UUID uuid = player.getUniqueId();
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
AFK_TRACKER.performedAction(uuid, time);
}
@Listener(order = Order.POST)
public void onPlayerCommand(SendCommandEvent event, @First Player player) {
UUID uuid = player.getUniqueId();
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
AFK_TRACKER.performedAction(uuid, time);
}

3
Plan/src/main/java/com/djrapitops/plan/system/listeners/sponge/SpongeDeathListener.java
View File

@ -4,7 +4,6 @@ import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.player.SpongeKillProcessor;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.utilities.Format;
import org.spongepowered.api.data.key.Keys;
@ -34,7 +33,7 @@ public class SpongeDeathListener {
@Listener
public void onEntityDeath(DestructEntityEvent.Death event) {
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
Living dead = event.getTargetEntity();
if (dead instanceof Player) {

3
Plan/src/main/java/com/djrapitops/plan/system/listeners/sponge/SpongeGMChangeListener.java
View File

@ -3,7 +3,6 @@ package com.djrapitops.plan.system.listeners.sponge;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.settings.WorldAliasSettings;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.Listener;
@ -36,7 +35,7 @@ public class SpongeGMChangeListener {
private void actOnGMChangeEvent(ChangeGameModeEvent.TargetPlayer event) {
Player player = event.getTargetEntity();
UUID uuid = player.getUniqueId();
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
String gameMode = event.getGameMode().getName().toUpperCase();
String worldName = player.getWorld().getName();

5
Plan/src/main/java/com/djrapitops/plan/system/listeners/sponge/SpongePlayerListener.java
View File

@ -7,7 +7,6 @@ import com.djrapitops.plan.system.processing.processors.info.NetworkPageUpdatePr
import com.djrapitops.plan.system.processing.processors.info.PlayerPageUpdateProcessor;
import com.djrapitops.plan.system.processing.processors.player.*;
import com.djrapitops.plan.system.tasks.TaskSystem;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.systems.NotificationCenter;
import com.djrapitops.plugin.api.utility.log.Log;
import org.spongepowered.api.Sponge;
@ -82,7 +81,7 @@ public class SpongePlayerListener {
NotificationCenter.checkNotifications(player);
UUID uuid = player.getUniqueId();
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
SpongeAFKListener.AFK_TRACKER.performedAction(uuid, time);
@ -122,7 +121,7 @@ public class SpongePlayerListener {
}
private void actOnQuitEvent(ClientConnectionEvent.Disconnect event) {
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
Player player = event.getTargetEntity();
UUID uuid = player.getUniqueId();

3
Plan/src/main/java/com/djrapitops/plan/system/listeners/sponge/SpongeWorldChangeListener.java
View File

@ -3,7 +3,6 @@ package com.djrapitops.plan.system.listeners.sponge;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.settings.WorldAliasSettings;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import org.spongepowered.api.data.key.Keys;
import org.spongepowered.api.entity.living.player.Player;
@ -37,7 +36,7 @@ public class SpongeWorldChangeListener {
}
private void actOnEvent(MoveEntityEvent.Teleport event, Player player) {
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
UUID uuid = player.getUniqueId();

3
Plan/src/main/java/com/djrapitops/plan/system/processing/importing/importers/Importer.java
View File

@ -17,7 +17,6 @@ import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.processing.importing.ServerImportData;
import com.djrapitops.plan.system.processing.importing.UserImportData;
import com.djrapitops.plan.system.processing.importing.UserImportRefiner;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.Benchmark;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.utilities.Verify;
@ -225,7 +224,7 @@ public abstract class Importer {
}
private List<GeoInfo> convertGeoInfo(UserImportData userImportData) {
long date = MiscUtils.getTime();
long date = System.currentTimeMillis();
return userImportData.getIps().parallelStream()
.map(ip -> {

3
Plan/src/main/java/com/djrapitops/plan/system/processing/processors/player/NameProcessor.java
View File

@ -12,7 +12,6 @@ import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.processing.CriticalRunnable;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plan.utilities.html.HtmlUtils;
import com.djrapitops.plugin.api.utility.log.Log;
@ -67,7 +66,7 @@ public class NameProcessor implements CriticalRunnable {
return;
}
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
Processing.submitCritical(() -> {
String info = HtmlUtils.removeXSS(displayName);

3
Plan/src/main/java/com/djrapitops/plan/system/tasks/TPSCountTimer.java
View File

@ -4,7 +4,6 @@ import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.data.container.TPS;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.TPSInsertProcessor;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.task.AbsRunnable;
@ -33,7 +32,7 @@ public abstract class TPSCountTimer<T extends PlanPlugin> extends AbsRunnable {
public void run() {
try {
long nanoTime = System.nanoTime();
long now = MiscUtils.getTime();
long now = System.currentTimeMillis();
addNewTPSEntry(nanoTime, now);

2
Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/InspectPage.java
View File

@ -77,7 +77,7 @@ public class InspectPage extends Page {
}
public String parse(PlayerProfile profile, UUID serverUUID, Map<UUID, String> serverNames) throws IOException {
long now = MiscUtils.getTime();
long now = System.currentTimeMillis();
addValue("refresh", FormatUtils.formatTimeStampClock(now));
addValue("version", MiscUtils.getPlanVersion());

2
Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/NetworkPage.java
View File

@ -42,7 +42,7 @@ public class NetworkPage extends Page {
public String toHtml() throws ParseException {
try {
UUID serverUUID = ServerInfo.getServerUUID();
long now = MiscUtils.getTime();
long now = System.currentTimeMillis();
Database database = Database.getActive();
List<TPS> networkOnlineData = database.fetch().getNetworkOnlineData();
List<String> geolocations = database.fetch().getNetworkGeolocations();

2
Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java
View File

@ -95,7 +95,7 @@ public class FormatUtils {
}
private static String replaceRecentDays(long epochMs, String format, String pattern) {
long now = MiscUtils.getTime();
long now = System.currentTimeMillis();
long fromStartOfDay = now % TimeAmount.DAY.ms();
if (epochMs > now - fromStartOfDay) {

12
Plan/src/main/java/com/djrapitops/plan/utilities/MiscUtils.java
View File

@ -32,19 +32,9 @@ public class MiscUtils {
throw new IllegalStateException("Utility class");
}
/**
* Used to get the current time as milliseconds.
*
* @return Epoch ms.
*/
@Deprecated
public static long getTime() {
return System.currentTimeMillis();
}
public static int getTimeZoneOffsetHours() {
if (Settings.USE_SERVER_TIME.isTrue()) {
return -TimeZone.getDefault().getOffset(MiscUtils.getTime()) / (int) TimeAmount.HOUR.ms();
return -TimeZone.getDefault().getOffset(System.currentTimeMillis()) / (int) TimeAmount.HOUR.ms();
}
return 0;
}

3
Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
View File

@ -18,7 +18,6 @@ import com.djrapitops.plan.system.settings.locale.Locale;
import com.djrapitops.plan.system.settings.locale.Msg;
import com.djrapitops.plan.system.tasks.ServerTaskSystem;
import com.djrapitops.plan.system.tasks.TaskSystem;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.StaticHolder;
import com.djrapitops.plugin.api.Benchmark;
import com.djrapitops.plugin.api.utility.log.Log;
@ -87,7 +86,7 @@ public class Analysis implements Callable<AnalysisData> {
}
private static void updateRefreshDate() {
Analysis.refreshDate = MiscUtils.getTime();
Analysis.refreshDate = System.currentTimeMillis();
}
private void updatePlayerNameCache(ServerProfile profile) {

3
Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/PlayersTableCreator.java
View File

@ -9,7 +9,6 @@ import com.djrapitops.plan.data.plugin.PluginData;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.utilities.FormatUtils;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plan.utilities.html.Html;
import com.djrapitops.plugin.api.utility.log.Log;
import org.apache.commons.lang3.ArrayUtils;
@ -37,7 +36,7 @@ public class PlayersTableCreator {
StringBuilder html = new StringBuilder();
long now = MiscUtils.getTime();
long now = System.currentTimeMillis();
UUID serverUUID = ServerInfo.getServerUUID();
int i = 0;

7
Plan/src/test/java/com/djrapitops/plan/data/PlayerProfileTest.java
View File

@ -2,7 +2,6 @@ package com.djrapitops.plan.data;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.TimeAmount;
import org.junit.BeforeClass;
import org.junit.ClassRule;
@ -34,7 +33,7 @@ public class PlayerProfileTest {
PlayerProfile p = new PlayerProfile(null, null, 0L);
List<Session> sessions = new ArrayList<>();
long date = MiscUtils.getTime();
long date = System.currentTimeMillis();
long week = TimeAmount.WEEK.ms();
long weekAgo = date - week;
long twoWeeksAgo = date - 2L * week;
@ -58,7 +57,7 @@ public class PlayerProfileTest {
PlayerProfile p = new PlayerProfile(null, null, 0L);
List<Session> sessions = new ArrayList<>();
long date = MiscUtils.getTime();
long date = System.currentTimeMillis();
long week = TimeAmount.WEEK.ms();
long weekAgo = date - week;
long twoWeeksAgo = date - 2L * week;
@ -82,7 +81,7 @@ public class PlayerProfileTest {
PlayerProfile p = new PlayerProfile(null, null, 0L);
List<Session> sessions = new ArrayList<>();
long date = MiscUtils.getTime();
long date = System.currentTimeMillis();
long week = TimeAmount.WEEK.ms();
long weekAgo = date - week;
long twoWeeksAgo = date - 2L * week;

5
Plan/src/test/java/com/djrapitops/plan/system/database/databases/SQLiteTest.java
View File

@ -21,7 +21,6 @@ import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.processing.processors.player.RegisterProcessor;
import com.djrapitops.plan.utilities.Base64Util;
import com.djrapitops.plan.utilities.ManageUtils;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plan.utilities.SHA256Hash;
import com.djrapitops.plan.utilities.analysis.MathUtils;
import com.djrapitops.plugin.StaticHolder;
@ -259,7 +258,7 @@ public class SQLiteTest {
String expectedIP = "1.2.3.4";
String expectedGeoLoc = "TestLocation";
long time = MiscUtils.getTime();
long time = System.currentTimeMillis();
GeoInfo expected = new GeoInfo(expectedIP, expectedGeoLoc, time, "3");
geoInfoTable.saveGeoInfo(playerUUID, expected);
@ -762,7 +761,7 @@ public class SQLiteTest {
@Test
public void testBackupAndRestore() throws SQLException, DBInitException, UnsupportedEncodingException, NoSuchAlgorithmException {
System.out.println("- Creating Backup Database -");
SQLiteDB backup = new SQLiteDB("debug-backup" + MiscUtils.getTime());
SQLiteDB backup = new SQLiteDB("debug-backup" + System.currentTimeMillis());
backup.init();
System.out.println("- Backup Database Created -");