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

[Merge] Merge apf-3.3.0-merging to apf-3.3.0

Browse Source 
This Commit fixes merge and commit issues in the merge.
This commit is contained in:
Rsl1122 2018-10-12 23:55:07 +03:00
parent e6a263e071
commit 25b35ac4ca
61 changed files with 697 additions and 467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ import com.djrapitops.plan.modules.FilesModule;
import com.djrapitops.plan.modules.SuperClassBindingModule;
import com.djrapitops.plan.modules.SystemObjectBindingModule;
import com.djrapitops.plan.modules.server.ServerSuperClassBindingModule;
import com.djrapitops.plan.modules.server.bukkit.BukkitInfoModule;
import com.djrapitops.plan.modules.server.bukkit.BukkitServerPropertiesModule;
import com.djrapitops.plan.modules.server.bukkit.BukkitSuperClassBindingModule;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.locale.Locale;
@ -55,7 +55,7 @@ import java.util.logging.Logger;
SystemObjectBindingModule.class,
APFModule.class,
FilesModule.class,
BukkitInfoModule.class,
BukkitServerPropertiesModule.class,
ServerSuperClassBindingModule.class,
BukkitSuperClassBindingModule.class
})

8
Plan/src/main/java/com/djrapitops/plan/PlanBungee.java
View File

@ -10,8 +10,9 @@ import com.djrapitops.plan.modules.APFModule;
import com.djrapitops.plan.modules.FilesModule;
import com.djrapitops.plan.modules.SuperClassBindingModule;
import com.djrapitops.plan.modules.SystemObjectBindingModule;
import com.djrapitops.plan.modules.bungee.BungeeInfoModule;
import com.djrapitops.plan.modules.bungee.BungeeSuperClassBindingModule;
import com.djrapitops.plan.modules.proxy.ProxySuperClassBindingModule;
import com.djrapitops.plan.modules.proxy.bungee.BungeeServerPropertiesModule;
import com.djrapitops.plan.modules.proxy.bungee.BungeeSuperClassBindingModule;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plan.system.locale.lang.PluginLang;
@ -37,8 +38,9 @@ import java.io.InputStream;
SystemObjectBindingModule.class,
APFModule.class,
FilesModule.class,
ProxySuperClassBindingModule.class,
BungeeSuperClassBindingModule.class,
BungeeInfoModule.class
BungeeServerPropertiesModule.class
})
interface PlanBungeeComponent {

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

@ -7,7 +7,7 @@ import com.djrapitops.plan.modules.FilesModule;
import com.djrapitops.plan.modules.SuperClassBindingModule;
import com.djrapitops.plan.modules.SystemObjectBindingModule;
import com.djrapitops.plan.modules.server.ServerSuperClassBindingModule;
import com.djrapitops.plan.modules.server.sponge.SpongeInfoModule;
import com.djrapitops.plan.modules.server.sponge.SpongeServerPropertiesModule;
import com.djrapitops.plan.modules.server.sponge.SpongeSuperClassBindingModule;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.locale.Locale;
@ -18,7 +18,6 @@ import com.djrapitops.plugin.SpongePlugin;
import com.djrapitops.plugin.command.ColorScheme;
import com.djrapitops.plugin.command.CommandNode;
import com.djrapitops.plugin.logging.L;
import com.google.inject.Inject;
import dagger.BindsInstance;
import dagger.Component;
import dagger.Module;
@ -46,7 +45,7 @@ import java.io.InputStream;
FilesModule.class,
ServerSuperClassBindingModule.class,
SpongeSuperClassBindingModule.class,
SpongeInfoModule.class
SpongeServerPropertiesModule.class
})
interface PlanSpongeComponent {
@ -94,13 +93,13 @@ class SpongePlanModule {
)
public class PlanSponge extends SpongePlugin implements PlanPlugin {
@Inject
@com.google.inject.Inject
private Metrics metrics;
@Inject
@com.google.inject.Inject
private Logger slf4jLogger;
@Inject
@com.google.inject.Inject
@ConfigDir(sharedRoot = false)
private File dataFolder;
private PlanSystem system;

130
Plan/src/main/java/com/djrapitops/plan/PlanVelocity.java
View File

@ -6,29 +6,83 @@ package com.djrapitops.plan;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.command.PlanVelocityCommand;
import com.djrapitops.plan.system.VelocitySystem;
import com.djrapitops.plan.modules.APFModule;
import com.djrapitops.plan.modules.FilesModule;
import com.djrapitops.plan.modules.SuperClassBindingModule;
import com.djrapitops.plan.modules.SystemObjectBindingModule;
import com.djrapitops.plan.modules.proxy.ProxySuperClassBindingModule;
import com.djrapitops.plan.modules.proxy.velocity.VelocityServerPropertiesModule;
import com.djrapitops.plan.modules.proxy.velocity.VelocitySuperClassBindingModule;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plan.system.locale.lang.PluginLang;
import com.djrapitops.plan.system.settings.theme.PlanColorScheme;
import com.djrapitops.plugin.StaticHolder;
import com.djrapitops.plugin.VelocityPlugin;
import com.djrapitops.plugin.api.Benchmark;
import com.djrapitops.plugin.api.utility.log.DebugLog;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.settings.ColorScheme;
import com.google.inject.Inject;
import com.djrapitops.plugin.command.ColorScheme;
import com.djrapitops.plugin.command.CommandNode;
import com.djrapitops.plugin.logging.L;
import com.velocitypowered.api.plugin.Plugin;
import com.velocitypowered.api.plugin.annotation.DataDirectory;
import com.velocitypowered.api.proxy.ProxyServer;
import dagger.BindsInstance;
import dagger.Component;
import dagger.Module;
import dagger.Provides;
import org.slf4j.Logger;
import javax.inject.Named;
import javax.inject.Singleton;
import java.io.File;
import java.io.InputStream;
import java.nio.file.Path;
@Singleton
@Component(modules = {
VelocityPlanModule.class,
SuperClassBindingModule.class,
SystemObjectBindingModule.class,
APFModule.class,
FilesModule.class,
ProxySuperClassBindingModule.class,
VelocitySuperClassBindingModule.class,
VelocityServerPropertiesModule.class
})
interface PlanVelocityComponent {
PlanVelocityCommand planCommand();
PlanSystem system();
@Component.Builder
interface Builder {
@BindsInstance
Builder plan(PlanVelocity plan);
PlanVelocityComponent build();
}
}
@Module
class VelocityPlanModule {
@Provides
@Singleton
PlanPlugin providePlanPlugin(PlanVelocity plugin) {
return plugin;
}
@Provides
@Singleton
@Named("mainCommand")
CommandNode provideMainCommand(PlanVelocityCommand command) {
return command;
}
}
/**
* Velocity Main class.
*
* <p>
* Based on the PlanBungee class
*
* @author MicleBrick
@ -36,16 +90,16 @@ import java.nio.file.Path;
@Plugin(id = "plan", name = "Plan", version = "4.4.6", description = "Player Analytics Plugin by Rsl1122", authors = {"Rsl1122"})
public class PlanVelocity extends VelocityPlugin implements PlanPlugin {
private VelocitySystem system;
private PlanSystem system;
private Locale locale;
public static PlanVelocity getInstance() {
return (PlanVelocity) StaticHolder.getInstance(PlanVelocity.class);
}
@Inject
@com.google.inject.Inject
@DataDirectory
private Path dataFolderPath;
@com.google.inject.Inject
private ProxyServer proxy;
@com.google.inject.Inject
private Logger slf4jLogger;
@Override
public File getDataFolder() {
@ -54,45 +108,39 @@ public class PlanVelocity extends VelocityPlugin implements PlanPlugin {
@Override
public void onEnable() {
super.onEnable();
PlanVelocityComponent component = DaggerPlanVelocityComponent.builder().plan(this).build();
try {
system = new VelocitySystem(this);
system = component.system();
locale = system.getLocaleSystem().getLocale();
system.enable();
Log.info(locale.getString(PluginLang.ENABLED));
logger.info(locale.getString(PluginLang.ENABLED));
} catch (AbstractMethodError e) {
Log.error("Plugin ran into AbstractMethodError - Server restart is required. Likely cause is updating the jar without a restart.");
logger.error("Plugin ran into AbstractMethodError - Server restart is required. Likely cause is updating the jar without a restart.");
} catch (EnableException e) {
Log.error("----------------------------------------");
Log.error("Error: " + e.getMessage());
Log.error("----------------------------------------");
Log.error("Plugin Failed to Initialize Correctly. If this issue is caused by config settings you can use /planvelocity reload");
logger.error("----------------------------------------");
logger.error("Error: " + e.getMessage());
logger.error("----------------------------------------");
logger.error("Plugin Failed to Initialize Correctly. If this issue is caused by config settings you can use /planbungee reload");
onDisable();
} catch (Exception e) {
getLogger().error(this.getClass().getSimpleName() + "-v" + getVersion(), e);
Log.error("Plugin Failed to Initialize Correctly. If this issue is caused by config settings you can use /planvelocity reload");
Log.error("This error should be reported at https://github.com/Rsl1122/Plan-PlayerAnalytics/issues");
errorHandler.log(L.CRITICAL, this.getClass(), e);
logger.error("Plugin Failed to Initialize Correctly. If this issue is caused by config settings you can use /planbungee reload");
logger.error("This error should be reported at https://github.com/Rsl1122/Plan-PlayerAnalytics/issues");
onDisable();
}
registerCommand("planvelocity", new PlanVelocityCommand(this));
PlanVelocityCommand command = component.planCommand();
command.registerCommands();
registerCommand("planvelocity", command);
}
@Override
public void onDisable() {
system.disable();
Log.info(locale.getString(PluginLang.DISABLED));
Benchmark.pluginDisabled(PlanVelocity.class);
DebugLog.pluginDisabled(PlanVelocity.class);
slf4jLogger.info(locale.getString(PluginLang.DISABLED));
}
@Override
public String getVersion() {
return getClass().getAnnotation(Plugin.class).version();
}
@Override
public void onReload() {
// Nothing to be done, systems are disabled
@ -105,11 +153,11 @@ public class PlanVelocity extends VelocityPlugin implements PlanPlugin {
@Override
public ColorScheme getColorScheme() {
return PlanColorScheme.create();
return PlanColorScheme.create(system.getConfigSystem().getConfig(), logger);
}
@Override
public VelocitySystem getSystem() {
public PlanSystem getSystem() {
return system;
}
@ -118,19 +166,13 @@ public class PlanVelocity extends VelocityPlugin implements PlanPlugin {
return reloading;
}
@Inject
private ProxyServer proxy;
@Override
public ProxyServer getProxy() {
return proxy;
}
@Inject
private Logger logger;
@Override
protected Logger getLogger() {
return logger;
return slf4jLogger;
}
}

6
Plan/src/main/java/com/djrapitops/plan/api/ProxyAPI.java
View File

@ -16,18 +16,18 @@ import javax.inject.Singleton;
import java.util.UUID;
/**
* PlanAPI extension for Bungee.
* PlanAPI extension for proxy servers.
*
* @author Rsl1122
*/
@Singleton
public class BungeeAPI extends CommonAPI {
public class ProxyAPI extends CommonAPI {
private final HookHandler hookHandler;
private final Database database;
@Inject
public BungeeAPI(
public ProxyAPI(
UUIDUtility uuidUtility,
Database database,
HookHandler hookHandler,

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

@ -25,7 +25,7 @@ import javax.inject.Singleton;
* @since 1.0.0
*/
@Singleton
public class PlanBungeeCommand extends TreeCmdNode {
public class PlanVelocityCommand extends TreeCmdNode {
private final NetworkCommand networkCommand;
private final ListServersCommand listServersCommand;
@ -42,7 +42,7 @@ public class PlanBungeeCommand extends TreeCmdNode {
private boolean commandsRegistered;
@Inject
public PlanBungeeCommand(
public PlanVelocityCommand(
ColorScheme colorScheme,
Locale locale,
// Group 1
@ -60,7 +60,7 @@ public class PlanBungeeCommand extends TreeCmdNode {
ReloadCommand reloadCommand,
DisableCommand disableCommand
) {
super("planbungee", Permissions.MANAGE.getPermission(), CommandType.CONSOLE, null);
super("planvelocity", Permissions.MANAGE.getPermission(), CommandType.CONSOLE, null);
this.uninstalledCommand = uninstalledCommand;
commandsRegistered = false;

3
Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageUninstalledCommand.java
View File

@ -36,7 +36,6 @@ public class ManageUninstalledCommand extends CommandNode {
private final Database database;
private final ErrorHandler errorHandler;
private final ServerInfo serverInfo;
private final ConnectionSystem connectionSystem;
@Inject
public ManageUninstalledCommand(
@ -44,7 +43,6 @@ public class ManageUninstalledCommand extends CommandNode {
Processing processing,
Database database,
ServerInfo serverInfo,
ConnectionSystem connectionSystem,
ErrorHandler errorHandler
) {
super("uninstalled", Permissions.MANAGE.getPermission(), CommandType.ALL_WITH_ARGS);
@ -53,7 +51,6 @@ public class ManageUninstalledCommand extends CommandNode {
this.processing = processing;
this.database = database;
this.serverInfo = serverInfo;
this.connectionSystem = connectionSystem;
this.errorHandler = errorHandler;
setShortHelp(locale.getString(CmdHelpLang.MANAGE_UNINSTALLED));

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

@ -155,8 +155,17 @@ public class Session extends DataContainer implements DateHolder {
this.worldTimes = worldTimes;
}
public void setPlayerKills(List<PlayerKill> playerKills) {
this.playerKills = playerKills;
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Session session = (Session) o;
return getUnsafe(SessionKeys.START).equals(session.getUnsafe(SessionKeys.START)) &&
getValue(SessionKeys.END).orElse(-1L).equals(session.getValue(SessionKeys.END).orElse(-1L)) &&
mobKills == session.mobKills &&
deaths == session.deaths &&
Objects.equals(playerKills, session.playerKills) &&
Objects.equals(worldTimes, session.worldTimes);
}
public boolean isFetchedFromDB() {
@ -171,17 +180,8 @@ public class Session extends DataContainer implements DateHolder {
putRawData(SessionKeys.DB_ID, sessionID);
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Session session = (Session) o;
return getUnsafe(SessionKeys.START).equals(session.getUnsafe(SessionKeys.START)) &&
getValue(SessionKeys.END).orElse(-1L).equals(session.getValue(SessionKeys.END).orElse(-1L)) &&
mobKills == session.mobKills &&
deaths == session.deaths &&
Objects.equals(playerKills, session.playerKills) &&
Objects.equals(worldTimes, session.worldTimes);
public List<PlayerKill> getPlayerKills() {
return playerKills;
}
@Override
@ -197,8 +197,8 @@ public class Session extends DataContainer implements DateHolder {
return worldTimes;
}
public List<PlayerKill> getPlayerKills() {
return playerKills;
public void setPlayerKills(List<PlayerKill> playerKills) {
this.playerKills = playerKills;
}
private int getMobKills() {

4
Plan/src/main/java/com/djrapitops/plan/data/store/containers/AnalysisContainer.java
View File

@ -458,7 +458,9 @@ public class AnalysisContainer extends DataContainer {
private void addPluginSuppliers() {
// TODO Refactor into a system that supports running the analysis on Bungee
Key<String[]> navAndTabs = new Key<>(new Type<String[]>() {}, "NAV_AND_TABS");
putCachingSupplier(navAndTabs, () -> pluginsTabContentCreator.createContent(this));
putCachingSupplier(navAndTabs, () -> pluginsTabContentCreator.createContent(
this, getValue(AnalysisKeys.PLAYERS_MUTATOR).orElse(new PlayersMutator(new ArrayList<>()))
));
putSupplier(AnalysisKeys.PLUGINS_TAB_NAV, () -> getUnsafe(navAndTabs)[0]);
putSupplier(AnalysisKeys.PLUGINS_TAB, () -> getUnsafe(navAndTabs)[1]);
}

59
Plan/src/main/java/com/djrapitops/plan/modules/proxy/ProxySuperClassBindingModule.java
View File

@ -1,9 +1,64 @@
package com.djrapitops.plan.modules.bungee.proxy;
package com.djrapitops.plan.modules.proxy;
import com.djrapitops.plan.api.PlanAPI;
import com.djrapitops.plan.api.ProxyAPI;
import com.djrapitops.plan.system.cache.DataCache;
import com.djrapitops.plan.system.cache.ProxyDataCache;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.database.ProxyDBSystem;
import com.djrapitops.plan.system.importing.EmptyImportSystem;
import com.djrapitops.plan.system.importing.ImportSystem;
import com.djrapitops.plan.system.info.InfoSystem;
import com.djrapitops.plan.system.info.ProxyInfoSystem;
import com.djrapitops.plan.system.info.connection.ConnectionSystem;
import com.djrapitops.plan.system.info.connection.ProxyConnectionSystem;
import dagger.Module;
import dagger.Provides;
import javax.inject.Singleton;
/**
* //TODO Class Javadoc Comment
* Dagger module for binding proxy server classes to super classes.
*
* @author Rsl1122
*/
@Module
public class ProxySuperClassBindingModule {
@Provides
@Singleton
PlanAPI provideProxyPlanAPI(ProxyAPI proxyAPI) {
return proxyAPI;
}
@Provides
@Singleton
DBSystem provideProxyDatabaseSystem(ProxyDBSystem proxyDBSystem) {
return proxyDBSystem;
}
@Provides
@Singleton
InfoSystem provideProxyInfoSystem(ProxyInfoSystem proxyInfoSystem) {
return proxyInfoSystem;
}
@Provides
@Singleton
ConnectionSystem provideProxyConnectionSystem(ProxyConnectionSystem proxyConnectionSystem) {
return proxyConnectionSystem;
}
@Provides
@Singleton
DataCache provideProxyDataCache(ProxyDataCache proxyDataCache) {
return proxyDataCache;
}
@Provides
@Singleton
ImportSystem provideImportSystem() {
return new EmptyImportSystem();
}
}

14
Plan/src/main/java/com/djrapitops/plan/modules/proxy/bungee/BungeeServerPropertiesModule.java
View File

@ -1,8 +1,6 @@
package com.djrapitops.plan.modules.bungee;
package com.djrapitops.plan.modules.proxy.bungee;
import com.djrapitops.plan.PlanBungee;
import com.djrapitops.plan.system.info.server.BungeeServerInfo;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.info.server.properties.BungeeServerProperties;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.system.settings.Settings;
@ -13,18 +11,12 @@ import dagger.Provides;
import javax.inject.Singleton;
/**
* Dagger module for Bungee ServerInfo.
* Dagger module for Bungee ServerProperties.
*
* @author Rsl1122
*/
@Module
public class BungeeInfoModule {
@Provides
@Singleton
ServerInfo provideBungeeServerInfo(BungeeServerInfo bungeeServerInfo) {
return bungeeServerInfo;
}
public class BungeeServerPropertiesModule {
@Provides
@Singleton

49
Plan/src/main/java/com/djrapitops/plan/modules/proxy/bungee/BungeeSuperClassBindingModule.java
View File

@ -1,19 +1,11 @@
package com.djrapitops.plan.modules.bungee;
package com.djrapitops.plan.modules.proxy.bungee;
import com.djrapitops.plan.api.BungeeAPI;
import com.djrapitops.plan.api.PlanAPI;
import com.djrapitops.plan.system.database.BungeeDBSystem;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.importing.EmptyImportSystem;
import com.djrapitops.plan.system.importing.ImportSystem;
import com.djrapitops.plan.system.info.BungeeInfoSystem;
import com.djrapitops.plan.system.info.InfoSystem;
import com.djrapitops.plan.system.info.connection.BungeeConnectionSystem;
import com.djrapitops.plan.system.info.connection.ConnectionSystem;
import com.djrapitops.plan.system.info.server.BungeeServerInfo;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.listeners.BungeeListenerSystem;
import com.djrapitops.plan.system.listeners.ListenerSystem;
import com.djrapitops.plan.system.settings.config.BungeeConfigSystem;
import com.djrapitops.plan.system.settings.config.ConfigSystem;
import com.djrapitops.plan.system.settings.config.ProxyConfigSystem;
import com.djrapitops.plan.system.tasks.BungeeTaskSystem;
import com.djrapitops.plan.system.tasks.TaskSystem;
import dagger.Module;
@ -31,32 +23,14 @@ public class BungeeSuperClassBindingModule {
@Provides
@Singleton
PlanAPI provideBungeePlanAPI(BungeeAPI bungeeAPI) {
return bungeeAPI;
ServerInfo provideBungeeServerInfo(BungeeServerInfo bungeeServerInfo) {
return bungeeServerInfo;
}
@Provides
@Singleton
DBSystem provideBungeeDatabaseSystem(BungeeDBSystem dbSystem) {
return dbSystem;
}
@Provides
@Singleton
ConfigSystem provideBungeeConfigSystem(BungeeConfigSystem bungeeConfigSystem) {
return bungeeConfigSystem;
}
@Provides
@Singleton
InfoSystem provideBungeeInfoSystem(BungeeInfoSystem bungeeInfoSystem) {
return bungeeInfoSystem;
}
@Provides
@Singleton
ConnectionSystem provideBungeeConnectionSystem(BungeeConnectionSystem bungeeConnectionSystem) {
return bungeeConnectionSystem;
ConfigSystem provideBungeeConfigSystem(ProxyConfigSystem proxyConfigSystem) {
return proxyConfigSystem;
}
@Provides
@ -70,11 +44,4 @@ public class BungeeSuperClassBindingModule {
ListenerSystem provideBungeeListenerSystem(BungeeListenerSystem bungeeListenerSystem) {
return bungeeListenerSystem;
}
@Provides
@Singleton
ImportSystem provideImportSystem() {
return new EmptyImportSystem();
}
}

22
Plan/src/main/java/com/djrapitops/plan/modules/proxy/velocity/VelocityServerPropertiesModule.java
View File

@ -1,9 +1,27 @@
package com.djrapitops.plan.modules.proxy.velocity;
import com.djrapitops.plan.PlanVelocity;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.system.info.server.properties.VelocityServerProperties;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import dagger.Module;
import dagger.Provides;
import javax.inject.Singleton;
/**
* //TODO Class Javadoc Comment
* Dagger module for Bungee ServerProperties.
*
* @author Rsl1122
*/
public class VelocityServerProperties {
@Module
public class VelocityServerPropertiesModule {
@Provides
@Singleton
ServerProperties provideServerProperties(PlanVelocity plugin, PlanConfig config) {
return new VelocityServerProperties(plugin.getProxy(), config.getString(Settings.BUNGEE_IP));
}
}

30
Plan/src/main/java/com/djrapitops/plan/modules/proxy/velocity/VelocitySuperClassBindingModule.java
View File

@ -1,47 +1,47 @@
package com.djrapitops.plan.modules.proxy.bungee;
package com.djrapitops.plan.modules.proxy.velocity;
import com.djrapitops.plan.system.info.server.BungeeServerInfo;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.listeners.BungeeListenerSystem;
import com.djrapitops.plan.system.info.server.VelocityServerInfo;
import com.djrapitops.plan.system.listeners.ListenerSystem;
import com.djrapitops.plan.system.settings.config.BungeeConfigSystem;
import com.djrapitops.plan.system.listeners.VelocityListenerSystem;
import com.djrapitops.plan.system.settings.config.ConfigSystem;
import com.djrapitops.plan.system.tasks.BungeeTaskSystem;
import com.djrapitops.plan.system.settings.config.ProxyConfigSystem;
import com.djrapitops.plan.system.tasks.TaskSystem;
import com.djrapitops.plan.system.tasks.VelocityTaskSystem;
import dagger.Module;
import dagger.Provides;
import javax.inject.Singleton;
/**
* Module for binding Bungee specific classes to the interface implementations.
* Module for binding Velocity specific classes to the interface implementations.
*
* @author Rsl1122
*/
@Module
public class BungeeSuperClassBindingModule {
public class VelocitySuperClassBindingModule {
@Provides
@Singleton
ServerInfo provideBungeeServerInfo(BungeeServerInfo bungeeServerInfo) {
return bungeeServerInfo;
ServerInfo provideVelocityServerInfo(VelocityServerInfo velocityServerInfo) {
return velocityServerInfo;
}
@Provides
@Singleton
ConfigSystem provideBungeeConfigSystem(BungeeConfigSystem bungeeConfigSystem) {
return bungeeConfigSystem;
ConfigSystem provideVelocityConfigSystem(ProxyConfigSystem proxyConfigSystem) {
return proxyConfigSystem;
}
@Provides
@Singleton
TaskSystem provideBungeeTaskSystem(BungeeTaskSystem bungeeTaskSystem) {
return bungeeTaskSystem;
TaskSystem provideVelocityTaskSystem(VelocityTaskSystem velocityTaskSystem) {
return velocityTaskSystem;
}
@Provides
@Singleton
ListenerSystem provideBungeeListenerSystem(BungeeListenerSystem bungeeListenerSystem) {
return bungeeListenerSystem;
ListenerSystem provideVelocityListenerSystem(VelocityListenerSystem velocityListenerSystem) {
return velocityListenerSystem;
}
}

12
Plan/src/main/java/com/djrapitops/plan/modules/server/bukkit/BukkitServerPropertiesModule.java
View File

@ -1,8 +1,6 @@
package com.djrapitops.plan.modules.server.bukkit;
import com.djrapitops.plan.Plan;
import com.djrapitops.plan.system.info.server.BukkitServerInfo;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.info.server.properties.BukkitServerProperties;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import dagger.Module;
@ -11,18 +9,12 @@ import dagger.Provides;
import javax.inject.Singleton;
/**
* Dagger module for Bukkit ServerInfo.
* Dagger module for Bukkit ServerProperties.
*
* @author Rsl1122
*/
@Module
public class BukkitInfoModule {
@Provides
@Singleton
ServerInfo provideBukkitServerInfo(BukkitServerInfo bukkitServerInfo) {
return bukkitServerInfo;
}
public class BukkitServerPropertiesModule {
@Provides
@Singleton

8
Plan/src/main/java/com/djrapitops/plan/modules/server/bukkit/BukkitSuperClassBindingModule.java
View File

@ -4,6 +4,8 @@ import com.djrapitops.plan.system.database.BukkitDBSystem;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.importing.BukkitImportSystem;
import com.djrapitops.plan.system.importing.ImportSystem;
import com.djrapitops.plan.system.info.server.BukkitServerInfo;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.listeners.BukkitListenerSystem;
import com.djrapitops.plan.system.listeners.ListenerSystem;
import com.djrapitops.plan.system.settings.config.BukkitConfigSystem;
@ -23,6 +25,12 @@ import javax.inject.Singleton;
@Module
public class BukkitSuperClassBindingModule {
@Provides
@Singleton
ServerInfo provideBukkitServerInfo(BukkitServerInfo bukkitServerInfo) {
return bukkitServerInfo;
}
@Provides
@Singleton
DBSystem provideBukkitDatabaseSystem(BukkitDBSystem dbSystem) {

12
Plan/src/main/java/com/djrapitops/plan/modules/server/sponge/SpongeServerPropertiesModule.java
View File

@ -1,7 +1,5 @@
package com.djrapitops.plan.modules.server.sponge;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.info.server.SpongeServerInfo;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.system.info.server.properties.SpongeServerProperties;
import dagger.Module;
@ -11,18 +9,12 @@ import org.spongepowered.api.Sponge;
import javax.inject.Singleton;
/**
* Dagger module for Sponge ServerInfo.
* Dagger module for Sponge ServerProperties.
*
* @author Rsl1122
*/
@Module
public class SpongeInfoModule {
@Provides
@Singleton
ServerInfo provideSpongeServerInfo(SpongeServerInfo spongeServerInfo) {
return spongeServerInfo;
}
public class SpongeServerPropertiesModule {
@Provides
@Singleton

8
Plan/src/main/java/com/djrapitops/plan/modules/server/sponge/SpongeSuperClassBindingModule.java
View File

@ -4,6 +4,8 @@ import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.database.SpongeDBSystem;
import com.djrapitops.plan.system.importing.EmptyImportSystem;
import com.djrapitops.plan.system.importing.ImportSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.info.server.SpongeServerInfo;
import com.djrapitops.plan.system.listeners.ListenerSystem;
import com.djrapitops.plan.system.listeners.SpongeListenerSystem;
import com.djrapitops.plan.system.settings.config.ConfigSystem;
@ -23,6 +25,12 @@ import javax.inject.Singleton;
@Module
public class SpongeSuperClassBindingModule {
@Provides
@Singleton
ServerInfo provideSpongeServerInfo(SpongeServerInfo spongeServerInfo) {
return spongeServerInfo;
}
@Provides
@Singleton
DBSystem provideSpongeDatabaseSystem(SpongeDBSystem dbSystem) {

2
Plan/src/main/java/com/djrapitops/plan/system/cache/CacheSystem.java vendored
View File

@ -8,12 +8,14 @@ import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.system.SubSystem;
import javax.inject.Inject;
import javax.inject.Singleton;
/**
* System that holds data caches of the plugin.
*
* @author Rsl1122
*/
@Singleton
public class CacheSystem implements SubSystem {
private final DataCache dataCache;

2
Plan/src/main/java/com/djrapitops/plan/system/database/ProxyDBSystem.java
View File

@ -23,7 +23,7 @@ public class ProxyDBSystem extends DBSystem {
@Inject
public ProxyDBSystem(Locale locale, MySQLDB mySQLDB,
PluginLogger logger, Timings timings, ErrorHandler errorHandler) {
PluginLogger logger, Timings timings, ErrorHandler errorHandler) {
super(locale, logger, timings, errorHandler);
databases.add(mySQLDB);
db = mySQLDB;

33
Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/PatchTask.java
View File

@ -1,14 +1,13 @@
package com.djrapitops.plan.system.database.databases.sql;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.system.database.databases.sql.patches.Patch;
import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plan.system.locale.lang.PluginLang;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import com.djrapitops.plugin.task.AbsRunnable;
import java.util.function.Supplier;
/**
* Task that is in charge on patching the database when the database enables.
*
@ -17,26 +16,30 @@ import java.util.function.Supplier;
public class PatchTask extends AbsRunnable {
private final Patch[] patches;
private final Supplier<Locale> locale;
public PatchTask(Patch[] patches, Supplier<Locale> locale) {
private final Locale locale;
private final PluginLogger logger;
private final ErrorHandler errorHandler;
public PatchTask(Patch[] patches, Locale locale, PluginLogger logger, ErrorHandler errorHandler) {
this.patches = patches;
this.locale = locale;
this.logger = logger;
this.errorHandler = errorHandler;
}
@Override
public void run() {
try {
boolean didApply = applyPatches();
Log.info(locale.get().getString(
didApply ? PluginLang.DB_APPLIED_PATCHES : PluginLang.DB_APPLIED_PATCHES_ALREADY
boolean applied = applyPatches();
logger.info(locale.getString(
applied ? PluginLang.DB_APPLIED_PATCHES : PluginLang.DB_APPLIED_PATCHES_ALREADY
));
} catch (Exception e) {
Log.error("----------------------------------------------------");
Log.error(locale.get().getString(PluginLang.ENABLE_FAIL_DB_PATCH));
Log.error("----------------------------------------------------");
Log.toLog(this.getClass(), e);
PlanPlugin.getInstance().onDisable();
logger.error("----------------------------------------------------");
logger.error(locale.getString(PluginLang.ENABLE_FAIL_DB_PATCH));
logger.error("----------------------------------------------------");
errorHandler.log(L.CRITICAL, this.getClass(), e);
}
}
@ -45,7 +48,7 @@ public class PatchTask extends AbsRunnable {
for (Patch patch : patches) {
if (!patch.hasBeenApplied()) {
String patchName = patch.getClass().getSimpleName();
Log.info(locale.get().getString(PluginLang.DB_APPLY_PATCH, patchName));
logger.info(locale.getString(PluginLang.DB_APPLY_PATCH, patchName));
patch.apply();
didApply = true;
}

4
Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLDB.java
View File

@ -184,8 +184,8 @@ public abstract class SQLDB extends Database {
};
try {
runnableFactory.createNew("Database Patch", new PatchTask(patches, locale))
.runTaskLaterAsynchronously(TimeAmount.SECOND.ticks() * 5L);
runnableFactory.create("Database Patch", new PatchTask(patches, locale, logger, errorHandler))
.runTaskLaterAsynchronously(TimeAmount.toTicks(5L, TimeUnit.SECONDS));
} catch (Exception ignore) {
// Task failed to register because plugin is being disabled
}

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

@ -13,7 +13,6 @@ import com.djrapitops.plan.system.cache.SessionCache;
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.system.info.server.ServerInfo;
import java.util.*;
import java.util.concurrent.TimeUnit;

4
Plan/src/main/java/com/djrapitops/plan/system/info/connection/ProxyConnectionSystem.java
View File

@ -94,9 +94,9 @@ public class ProxyConnectionSystem extends ConnectionSystem {
for (Server server : bukkitServers.values()) {
webExceptionLogger.logIfOccurs(this.getClass(), () -> sendInfoRequest(infoRequest, server));
}
// Quick hack
// Quick hack for Bungee Plugins Tab
if (infoRequest instanceof GenerateInspectPluginsTabRequest) {
webExceptionLogger.logIfOccurs(this.getClass(), () -> InfoSystem.getInstance().sendRequest(infoRequest));
webExceptionLogger.logIfOccurs(this.getClass(), infoRequest::runLocally);
}
}

79
Plan/src/main/java/com/djrapitops/plan/system/info/server/VelocityServerInfo.java
View File

@ -4,29 +4,42 @@
*/
package com.djrapitops.plan.system.info.server;
import com.djrapitops.plan.PlanVelocity;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.api.exceptions.database.DBOpException;
import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.system.info.server.properties.VelocityServerProperties;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.system.webserver.WebServerSystem;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plan.system.webserver.WebServer;
import com.djrapitops.plugin.logging.console.PluginLogger;
import dagger.Lazy;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.Optional;
import java.util.UUID;
/**
* Manages Server information on the Velocity instance.
*
* Based on BungeeServerInfo
* Manages Server information on the Bungee instance.
*
* @author MicleBrick
* @author Rsl1122
*/
@Singleton
public class VelocityServerInfo extends ServerInfo {
public VelocityServerInfo(PlanVelocity plugin) {
super(new VelocityServerProperties(plugin.getProxy()));
private final Database database;
private final Lazy<WebServer> webServer;
private final PluginLogger logger;
@Inject
public VelocityServerInfo(
ServerProperties serverProperties,
Database database,
Lazy<WebServer> webServer,
PluginLogger logger
) {
super(serverProperties);
this.database = database;
this.webServer = webServer;
this.logger = logger;
}
@Override
@ -34,14 +47,12 @@ public class VelocityServerInfo extends ServerInfo {
checkIfDefaultIP();
try {
Database db = Database.getActive();
// doesn't seem like this would need to be different for velocity, perhaps rename to getProxyInformation()?
Optional<Server> velocityInfo = db.fetch().getBungeeInformation();
if (velocityInfo.isPresent()) {
server = velocityInfo.get();
updateServerInfo(db);
Optional<Server> bungeeInfo = database.fetch().getBungeeInformation();
if (bungeeInfo.isPresent()) {
server = bungeeInfo.get();
updateServerInfo(database);
} else {
server = registerVelocityInfo(db);
server = registerVelocityInfo(database);
}
} catch (DBOpException e) {
throw new EnableException("Failed to read Server information from Database.");
@ -50,7 +61,7 @@ public class VelocityServerInfo extends ServerInfo {
}
private void updateServerInfo(Database db) {
String accessAddress = WebServerSystem.getInstance().getWebServer().getAccessAddress();
String accessAddress = webServer.get().getAccessAddress();
if (!accessAddress.equals(server.getWebAddress())) {
server.setWebAddress(accessAddress);
db.save().serverInfoForThisServer(server);
@ -58,31 +69,35 @@ public class VelocityServerInfo extends ServerInfo {
}
private void checkIfDefaultIP() throws EnableException {
String ip = ServerInfo.getServerProperties().getIp();
String ip = serverProperties.getIp();
if ("0.0.0.0".equals(ip)) {
Log.error("IP setting still 0.0.0.0 - Configure AlternativeIP/IP that connects to the Proxy server.");
Log.info("Player Analytics partially enabled (Use /planvelocity to reload config)");
logger.error("IP setting still 0.0.0.0 - Configure AlternativeIP/IP that connects to the Proxy server.");
logger.info("Player Analytics partially enabled (Use /planbungee to reload config)");
throw new EnableException("IP setting still 0.0.0.0 - Configure AlternativeIP/IP that connects to the Proxy server.");
}
}
private Server registerVelocityInfo(Database db) throws EnableException {
ServerProperties properties = ServerInfo.getServerProperties();
UUID serverUUID = generateNewUUID(properties);
String accessAddress = WebServerSystem.getInstance().getWebServer().getAccessAddress();
UUID serverUUID = generateNewUUID();
String accessAddress = webServer.get().getAccessAddress();
Server velocityCord = new Server(-1, serverUUID, "VelocityCord", accessAddress, properties.getMaxPlayers());
db.save().serverInfoForThisServer(velocityCord);
// TODO Rework to allow Velocity as name.
Server bungeeCord = new Server(-1, serverUUID, "BungeeCord", accessAddress, serverProperties.getMaxPlayers());
db.save().serverInfoForThisServer(bungeeCord);
Optional<Server> velocityInfo = db.fetch().getBungeeInformation();
if (velocityInfo.isPresent()) {
return velocityInfo.get();
Optional<Server> bungeeInfo = db.fetch().getBungeeInformation();
if (bungeeInfo.isPresent()) {
return bungeeInfo.get();
}
throw new EnableException("VelocityCord registration failed (DB)");
throw new EnableException("Velocity registration failed (DB)");
}
private UUID generateNewUUID(ServerProperties properties) {
String seed = properties.getName() + properties.getIp() + properties.getPort() + properties.getVersion() + properties.getImplVersion();
private UUID generateNewUUID() {
String seed = serverProperties.getName() +
serverProperties.getIp() +
serverProperties.getPort() +
serverProperties.getVersion() +
serverProperties.getImplVersion();
return UUID.nameUUIDFromBytes(seed.getBytes());
}
}

5
Plan/src/main/java/com/djrapitops/plan/system/info/server/properties/VelocityServerProperties.java
View File

@ -1,6 +1,5 @@
package com.djrapitops.plan.system.info.server.properties;
import com.djrapitops.plan.system.settings.Settings;
import com.velocitypowered.api.proxy.ProxyServer;
/**
@ -12,7 +11,7 @@ import com.velocitypowered.api.proxy.ProxyServer;
*/
public class VelocityServerProperties extends ServerProperties {
public VelocityServerProperties(ProxyServer server) {
public VelocityServerProperties(ProxyServer server, String serverIP) {
super(
server.getAllServers().toString(),
"Velocity",
@ -20,7 +19,7 @@ public class VelocityServerProperties extends ServerProperties {
// not sure how to get these
server.getClass().getPackage().getImplementationVersion(),
server.getClass().getPackage().getImplementationVersion(),
Settings.BUNGEE_IP::toString,
() -> serverIP,
-1, // not sure how to get this
RedisCheck.isClassAvailable() ? new RedisPlayersOnlineSupplier() : server::getPlayerCount
);

15
Plan/src/main/java/com/djrapitops/plan/system/listeners/VelocityListenerSystem.java
View File

@ -3,17 +3,28 @@ package com.djrapitops.plan.system.listeners;
import com.djrapitops.plan.PlanVelocity;
import com.djrapitops.plan.system.listeners.velocity.PlayerOnlineListener;
import javax.inject.Inject;
import javax.inject.Singleton;
@Singleton
public class VelocityListenerSystem extends ListenerSystem {
private final PlanVelocity plugin;
public VelocityListenerSystem(PlanVelocity plugin) {
private final PlayerOnlineListener playerOnlineListener;
@Inject
public VelocityListenerSystem(
PlanVelocity plugin,
PlayerOnlineListener playerOnlineListener
) {
this.plugin = plugin;
this.playerOnlineListener = playerOnlineListener;
}
@Override
protected void registerListeners() {
plugin.registerListener(new PlayerOnlineListener());
plugin.registerListener(playerOnlineListener);
}
@Override

2
Plan/src/main/java/com/djrapitops/plan/system/listeners/bungee/PlayerOnlineListener.java
View File

@ -70,7 +70,7 @@ public class PlayerOnlineListener implements Listener {
boolean gatheringGeolocations = config.isTrue(Settings.DATA_GEOLOCATIONS);
processing.submit(processors.player().bungeeRegisterProcessor(uuid, name, time,
processing.submit(processors.player().proxyRegisterProcessor(uuid, name, time,
gatheringGeolocations ? processors.player().ipUpdateProcessor(uuid, address, time) : null
));
processing.submit(processors.info().playerPageUpdateProcessor(uuid));

4
Plan/src/main/java/com/djrapitops/plan/system/listeners/sponge/SpongePlayerListener.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.info.server.ServerInfo;
import com.djrapitops.plan.system.listeners.bukkit.AFKListener;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.Processors;
import com.djrapitops.plan.system.settings.Settings;
@ -82,8 +81,7 @@ public class SpongePlayerListener {
public void onKick(KickPlayerEvent event) {
try {
UUID uuid = event.getTargetEntity().getUniqueId();
// TODO
if (AFKListener.AFK_TRACKER.isAfk(uuid)) {
if (SpongeAFKListener.AFK_TRACKER.isAfk(uuid)) {
return;
}
processing.submit(processors.player().kickProcessor(uuid));

71
Plan/src/main/java/com/djrapitops/plan/system/listeners/velocity/PlayerOnlineListener.java
View File

@ -8,30 +8,58 @@ import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.info.PlayerPageUpdateProcessor;
import com.djrapitops.plan.system.processing.processors.player.BungeePlayerRegisterProcessor;
import com.djrapitops.plan.system.processing.processors.player.IPUpdateProcessor;
import com.djrapitops.plan.system.processing.processors.Processors;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.webserver.cache.PageId;
import com.djrapitops.plan.system.webserver.cache.ResponseCache;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.connection.DisconnectEvent;
import com.velocitypowered.api.event.connection.PostLoginEvent;
import com.velocitypowered.api.event.player.ServerConnectedEvent;
import com.velocitypowered.api.proxy.Player;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.net.InetAddress;
import java.util.UUID;
/**
* Player Join listener for Velocity.
*
* <p>
* Based on the bungee version.
*
* @author MicleBrick
*/
@Singleton
public class PlayerOnlineListener {
private final PlanConfig config;
private final Processors processors;
private final Processing processing;
private final SessionCache sessionCache;
private final ServerInfo serverInfo;
private final ErrorHandler errorHandler;
@Inject
public PlayerOnlineListener(
PlanConfig config,
Processing processing,
Processors processors,
SessionCache sessionCache,
ServerInfo serverInfo,
ErrorHandler errorHandler
) {
this.config = config;
this.processing = processing;
this.processors = processors;
this.sessionCache = sessionCache;
this.serverInfo = serverInfo;
this.errorHandler = errorHandler;
}
@Subscribe
public void onPostLogin(PostLoginEvent event) {
try {
@ -39,18 +67,19 @@ public class PlayerOnlineListener {
UUID uuid = player.getUniqueId();
String name = player.getUsername();
InetAddress address = player.getRemoteAddress().getAddress();
long now = System.currentTimeMillis();
long time = System.currentTimeMillis();
SessionCache.getInstance().cacheSession(uuid, new Session(uuid, now, "", ""));
sessionCache.cacheSession(uuid, new Session(uuid, serverInfo.getServerUUID(), time, "", ""));
// maybe rename to ProxyPlayerRegisterProcessor?
Processing.submit(new BungeePlayerRegisterProcessor(uuid, name, now,
new IPUpdateProcessor(uuid, address, now))
);
Processing.submit(new PlayerPageUpdateProcessor(uuid));
ResponseCache.clearResponse(PageId.SERVER.of(ServerInfo.getServerUUID()));
boolean gatheringGeolocations = config.isTrue(Settings.DATA_GEOLOCATIONS);
processing.submit(processors.player().proxyRegisterProcessor(uuid, name, time,
gatheringGeolocations ? processors.player().ipUpdateProcessor(uuid, address, time) : null
));
processing.submit(processors.info().playerPageUpdateProcessor(uuid));
ResponseCache.clearResponse(PageId.SERVER.of(serverInfo.getServerUUID()));
} catch (Exception e) {
Log.toLog(this.getClass(), e);
errorHandler.log(L.WARN, this.getClass(), e);
}
}
@ -60,11 +89,11 @@ public class PlayerOnlineListener {
Player player = event.getPlayer();
UUID uuid = player.getUniqueId();
SessionCache.getInstance().endSession(uuid, System.currentTimeMillis());
Processing.submit(new PlayerPageUpdateProcessor(uuid));
ResponseCache.clearResponse(PageId.SERVER.of(ServerInfo.getServerUUID()));
sessionCache.endSession(uuid, System.currentTimeMillis());
processing.submit(processors.info().playerPageUpdateProcessor(uuid));
ResponseCache.clearResponse(PageId.SERVER.of(serverInfo.getServerUUID()));
} catch (Exception e) {
Log.toLog(this.getClass(), e);
errorHandler.log(L.WARN, this.getClass(), e);
}
}
@ -76,10 +105,10 @@ public class PlayerOnlineListener {
long now = System.currentTimeMillis();
// Replaces the current session in the cache.
SessionCache.getInstance().cacheSession(uuid, new Session(uuid, now, "", ""));
Processing.submit(new PlayerPageUpdateProcessor(uuid));
sessionCache.cacheSession(uuid, new Session(uuid, serverInfo.getServerUUID(), now, "", ""));
processing.submit(processors.info().playerPageUpdateProcessor(uuid));
} catch (Exception e) {
Log.toLog(this.getClass(), e);
errorHandler.log(L.WARN, this.getClass(), e);
}
}
}

2
Plan/src/main/java/com/djrapitops/plan/system/processing/Processing.java
View File

@ -7,8 +7,8 @@ import com.djrapitops.plan.system.locale.lang.PluginLang;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import dagger.Lazy;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import dagger.Lazy;
import javax.inject.Inject;
import javax.inject.Singleton;

10
Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/InfoProcessors.java
View File

@ -3,7 +3,6 @@ package com.djrapitops.plan.system.processing.processors.info;
import com.djrapitops.plan.system.info.InfoSystem;
import com.djrapitops.plan.system.info.connection.WebExceptionLogger;
import com.djrapitops.plugin.command.Sender;
import com.djrapitops.plugin.task.RunnableFactory;
import dagger.Lazy;
import javax.inject.Inject;
@ -21,17 +20,14 @@ public class InfoProcessors {
private final Lazy<InfoSystem> infoSystem;
private final Lazy<WebExceptionLogger> webExceptionLogger;
private final Lazy<RunnableFactory> runnableFactory;
@Inject
public InfoProcessors(
Lazy<InfoSystem> infoSystem,
Lazy<WebExceptionLogger> webExceptionLogger,
Lazy<RunnableFactory> runnableFactory
Lazy<WebExceptionLogger> webExceptionLogger
) {
this.infoSystem = infoSystem;
this.webExceptionLogger = webExceptionLogger;
this.runnableFactory = runnableFactory;
}
public InspectCacheRequestProcessor inspectCacheRequestProcessor(
@ -46,8 +42,6 @@ public class InfoProcessors {
}
public PlayerPageUpdateProcessor playerPageUpdateProcessor(UUID uuid) {
return new PlayerPageUpdateProcessor(uuid,
infoSystem.get(), webExceptionLogger.get(), runnableFactory.get()
);
return new PlayerPageUpdateProcessor(uuid);
}
}

1
Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/PlayerPageUpdateProcessor.java
View File

@ -9,7 +9,6 @@ public class PlayerPageUpdateProcessor implements Runnable {
private final UUID uuid;
// TODO Factory method fix
PlayerPageUpdateProcessor(
UUID uuid
) {

4
Plan/src/main/java/com/djrapitops/plan/system/processing/processors/player/PlayerProcessors.java
View File

@ -49,8 +49,8 @@ public class PlayerProcessors {
return new BanAndOpProcessor(uuid, banned, op, database.get());
}
public BungeeRegisterProcessor bungeeRegisterProcessor(UUID uuid, String name, long registered, Runnable... afterProcess) {
return new BungeeRegisterProcessor(uuid, name, registered, processing.get(), database.get(), afterProcess);
public ProxyRegisterProcessor proxyRegisterProcessor(UUID uuid, String name, long registered, Runnable... afterProcess) {
return new ProxyRegisterProcessor(uuid, name, registered, processing.get(), database.get(), afterProcess);
}
public EndSessionProcessor endSessionProcessor(UUID uuid, long time) {

4
Plan/src/main/java/com/djrapitops/plan/system/processing/processors/player/ProxyRegisterProcessor.java
View File

@ -15,7 +15,7 @@ import java.util.UUID;
*
* @author Rsl1122
*/
public class BungeeRegisterProcessor implements CriticalRunnable {
public class ProxyRegisterProcessor implements CriticalRunnable {
private final UUID uuid;
private final String name;
@ -25,7 +25,7 @@ public class BungeeRegisterProcessor implements CriticalRunnable {
private final Processing processing;
private final Database database;
BungeeRegisterProcessor(
ProxyRegisterProcessor(
UUID uuid, String name, long registered,
Processing processing,
Database database,

8
Plan/src/main/java/com/djrapitops/plan/system/settings/WorldAliasSettings.java
View File

@ -96,6 +96,10 @@ public class WorldAliasSettings {
}
public Map<String, Long> getPlaytimePerAlias(WorldTimes worldTimes) {
if (worldTimes.getWorldTimes().isEmpty()) {
return new HashMap<>();
}
Map<String, Long> playtimePerWorld = worldTimes.getWorldTimes() // WorldTimes Map<String, GMTimes>
.entrySet().stream()
.collect(Collectors.toMap(
@ -161,6 +165,10 @@ public class WorldAliasSettings {
Map<String, Long> playtimePerAlias = getPlaytimePerAlias(worldTimes);
long total = worldTimes.getTotal();
// Prevent arithmetic error if 0
if (total <= 0) {
total = -1;
}
long longest = 0;
String theWorld = "-";

4
Plan/src/main/java/com/djrapitops/plan/system/settings/config/ProxyConfigSystem.java
View File

@ -21,10 +21,10 @@ import java.io.IOException;
* @author Rsl1122
*/
@Singleton
public class BungeeConfigSystem extends ConfigSystem {
public class ProxyConfigSystem extends ConfigSystem {
@Inject
public BungeeConfigSystem(
public ProxyConfigSystem(
PlanFiles files,
PlanConfig config,
Theme theme,

8
Plan/src/main/java/com/djrapitops/plan/system/tasks/BukkitTaskSystem.java
View File

@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
public class BukkitTaskSystem extends ServerTaskSystem {
private final Plan plugin;
private final PingCountTimer pingCountTimer;
private final PingCountTimerBukkit pingCountTimer;
@Inject
public BukkitTaskSystem(
@ -33,10 +33,9 @@ public class BukkitTaskSystem extends ServerTaskSystem {
RunnableFactory runnableFactory,
PaperTPSCountTimer paperTPSCountTimer,
BukkitTPSCountTimer bukkitTPSCountTimer,
NetworkPageRefreshTask networkPageRefreshTask,
BootAnalysisTask bootAnalysisTask,
PeriodicAnalysisTask periodicAnalysisTask,
PingCountTimer pingCountTimer,
PingCountTimerBukkit pingCountTimer,
LogsFolderCleanTask logsFolderCleanTask
) {
super(
@ -56,8 +55,7 @@ public class BukkitTaskSystem extends ServerTaskSystem {
super.enable();
try {
plugin.registerListener(pingCountTimer);
// TODO config
long startDelay = TimeAmount.toTicks(Settings.PING_SERVER_ENABLE_DELAY.getNumber(), TimeUnit.SECONDS);
long startDelay = TimeAmount.toTicks(config.getNumber(Settings.PING_SERVER_ENABLE_DELAY), TimeUnit.SECONDS);
registerTask("PingCountTimer", pingCountTimer)
.runTaskTimer(startDelay, 40L);
} catch (ExceptionInInitializerError | NoClassDefFoundError ignore) {

14
Plan/src/main/java/com/djrapitops/plan/system/tasks/BungeeTaskSystem.java
View File

@ -4,6 +4,7 @@
*/
package com.djrapitops.plan.system.tasks;
import com.djrapitops.plan.PlanBungee;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.tasks.bungee.BungeeTPSCountTimer;
@ -23,22 +24,28 @@ import java.util.concurrent.TimeUnit;
*/
public class BungeeTaskSystem extends TaskSystem {
private final PlanBungee plugin;
private final PlanConfig config;
private final NetworkPageRefreshTask networkPageRefreshTask;
private final PingCountTimerBungee pingCountTimer;
private final LogsFolderCleanTask logsFolderCleanTask;
@Inject
public BungeeTaskSystem(
PlanBungee plugin,
PlanConfig config,
RunnableFactory runnableFactory,
BungeeTPSCountTimer bungeeTPSCountTimer,
NetworkPageRefreshTask networkPageRefreshTask,
PingCountTimerBungee pingCountTimer,
LogsFolderCleanTask logsFolderCleanTask
) {
super(runnableFactory, bungeeTPSCountTimer);
this.plugin = plugin;
this.config = config;
this.networkPageRefreshTask = networkPageRefreshTask;
this.pingCountTimer = pingCountTimer;
this.logsFolderCleanTask = logsFolderCleanTask;
}
@ -58,11 +65,8 @@ public class BungeeTaskSystem extends TaskSystem {
}
}).runTaskAsynchronously();
// TODO Move this elsewhere
PingCountTimerBungee pingCountTimer = new PingCountTimerBungee();
plugin.registerListener(pingCountTimer);
long startDelay = TimeAmount.SECOND.ticks() * (long) Settings.PING_SERVER_ENABLE_DELAY.getNumber();
RunnableFactory.createNew("PingCountTimer", pingCountTimer)
.runTaskTimer(startDelay, PingCountTimerBungee.PING_INTERVAL);
long startDelay = TimeAmount.toTicks(config.getNumber(Settings.PING_SERVER_ENABLE_DELAY), TimeUnit.SECONDS);
runnableFactory.create("PingCountTimer", pingCountTimer).runTaskTimer(startDelay, PingCountTimerBungee.PING_INTERVAL);
}
}

2
Plan/src/main/java/com/djrapitops/plan/system/tasks/ServerTaskSystem.java
View File

@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit;
*/
public abstract class ServerTaskSystem extends TaskSystem {
private final PlanConfig config;
protected final PlanConfig config;
private final BootAnalysisTask bootAnalysisTask;
private final PeriodicAnalysisTask periodicAnalysisTask;
private final LogsFolderCleanTask logsFolderCleanTask;

15
Plan/src/main/java/com/djrapitops/plan/system/tasks/SpongeTaskSystem.java
View File

@ -1,24 +1,24 @@
package com.djrapitops.plan.system.tasks;
import com.djrapitops.plan.PlanSponge;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.tasks.server.BootAnalysisTask;
import com.djrapitops.plan.system.tasks.server.NetworkPageRefreshTask;
import com.djrapitops.plan.system.tasks.server.PeriodicAnalysisTask;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.tasks.server.PingCountTimerSponge;
import com.djrapitops.plan.system.tasks.server.SpongeTPSCountTimer;
import com.djrapitops.plugin.task.RunnableFactory;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.task.RunnableFactory;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.scheduler.Task;
import javax.inject.Inject;
import java.util.concurrent.TimeUnit;
public class SpongeTaskSystem extends ServerTaskSystem {
private final PlanSponge plugin;
private final PingCountTimerSponge pingCountTimer;
@Inject
public SpongeTaskSystem(
@ -26,9 +26,9 @@ public class SpongeTaskSystem extends ServerTaskSystem {
PlanConfig config,
RunnableFactory runnableFactory,
SpongeTPSCountTimer spongeTPSCountTimer,
NetworkPageRefreshTask networkPageRefreshTask,
BootAnalysisTask bootAnalysisTask,
PeriodicAnalysisTask periodicAnalysisTask,
PingCountTimerSponge pingCountTimer,
LogsFolderCleanTask logsFolderCleanTask
) {
super(
@ -40,17 +40,16 @@ public class SpongeTaskSystem extends ServerTaskSystem {
logsFolderCleanTask
);
this.plugin = plugin;
this.pingCountTimer = pingCountTimer;
}
@Override
public void enable() {
super.enable();
// TODO Move elsewhere
PingCountTimerSponge pingCountTimer = new PingCountTimerSponge();
plugin.registerListener(pingCountTimer);
long startDelay = TimeAmount.SECOND.ticks() * (long) Settings.PING_SERVER_ENABLE_DELAY.getNumber();
RunnableFactory.createNew("PingCountTimer", pingCountTimer)
long startDelay = TimeAmount.toTicks(config.getNumber(Settings.PING_SERVER_ENABLE_DELAY), TimeUnit.SECONDS);
runnableFactory.create("PingCountTimer", pingCountTimer)
.runTaskTimer(startDelay, PingCountTimerSponge.PING_INTERVAL);
}

54
Plan/src/main/java/com/djrapitops/plan/system/tasks/VelocityTaskSystem.java
View File

@ -6,14 +6,18 @@ package com.djrapitops.plan.system.tasks;
import com.djrapitops.plan.PlanVelocity;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.tasks.proxy.EnableConnectionTask;
import com.djrapitops.plan.system.tasks.velocity.VelocityTPSCountTimer;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.tasks.server.NetworkPageRefreshTask;
import com.djrapitops.plan.system.tasks.server.PingCountTimerBungee;
import com.djrapitops.plan.system.tasks.server.PingCountTimerVelocity;
import com.djrapitops.plan.utilities.file.export.HtmlExport;
import com.djrapitops.plan.system.tasks.velocity.VelocityTPSCountTimer;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.task.AbsRunnable;
import com.djrapitops.plugin.task.RunnableFactory;
import javax.inject.Inject;
import java.util.concurrent.TimeUnit;
/**
* TaskSystem responsible for registering tasks for Velocity.
*
@ -22,10 +26,28 @@ import com.djrapitops.plugin.task.RunnableFactory;
public class VelocityTaskSystem extends TaskSystem {
private final PlanVelocity plugin;
private final PlanConfig config;
private final NetworkPageRefreshTask networkPageRefreshTask;
private final PingCountTimerVelocity pingCountTimer;
private final LogsFolderCleanTask logsFolderCleanTask;
public VelocityTaskSystem(PlanVelocity plugin) {
super(new VelocityTPSCountTimer(plugin));
@Inject
public VelocityTaskSystem(
PlanVelocity plugin,
PlanConfig config,
RunnableFactory runnableFactory,
VelocityTPSCountTimer velocityTPSCountTimer,
NetworkPageRefreshTask networkPageRefreshTask,
PingCountTimerVelocity pingCountTimer,
LogsFolderCleanTask logsFolderCleanTask
) {
super(runnableFactory, velocityTPSCountTimer);
this.plugin = plugin;
this.config = config;
this.networkPageRefreshTask = networkPageRefreshTask;
this.pingCountTimer = pingCountTimer;
this.logsFolderCleanTask = logsFolderCleanTask;
}
@Override
@ -34,16 +56,18 @@ public class VelocityTaskSystem extends TaskSystem {
}
private void registerTasks() {
registerTask(new EnableConnectionTask()).runTaskAsynchronously();
registerTask(tpsCountTimer).runTaskTimerAsynchronously(1000, TimeAmount.SECOND.ticks());
registerTask(new NetworkPageRefreshTask()).runTaskTimerAsynchronously(1500, TimeAmount.MINUTE.ticks());
if (Settings.ANALYSIS_EXPORT.isTrue()) {
registerTask(new HtmlExport(plugin)).runTaskAsynchronously();
}
PingCountTimerVelocity pingCountTimer = new PingCountTimerVelocity();
registerTask(tpsCountTimer).runTaskTimerAsynchronously(1000, TimeAmount.toTicks(1L, TimeUnit.SECONDS));
registerTask(networkPageRefreshTask).runTaskTimerAsynchronously(1500, TimeAmount.toTicks(5L, TimeUnit.MINUTES));
registerTask(logsFolderCleanTask).runTaskLaterAsynchronously(TimeAmount.toTicks(30L, TimeUnit.SECONDS));
registerTask("Settings Save", new AbsRunnable() {
@Override
public void run() {
config.getNetworkSettings().placeSettingsToDB();
}
}).runTaskAsynchronously();
plugin.registerListener(pingCountTimer);
long startDelay = TimeAmount.SECOND.ticks() * (long) Settings.PING_SERVER_ENABLE_DELAY.getNumber();
RunnableFactory.createNew("PingCountTimer", pingCountTimer)
.runTaskTimer(startDelay, PingCountTimerVelocity.PING_INTERVAL);
long startDelay = TimeAmount.toTicks(config.getNumber(Settings.PING_SERVER_ENABLE_DELAY), TimeUnit.SECONDS);
runnableFactory.create("PingCountTimer", pingCountTimer).runTaskTimer(startDelay, PingCountTimerBungee.PING_INTERVAL);
}
}

2
Plan/src/main/java/com/djrapitops/plan/system/tasks/server/BukkitTPSCountTimer.java
View File

@ -12,8 +12,6 @@ import org.bukkit.World;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.lang.management.ManagementFactory;
import java.lang.management.OperatingSystemMXBean;
import java.util.concurrent.TimeUnit;
@Singleton

6
Plan/src/main/java/com/djrapitops/plan/system/tasks/server/PingCountTimerBukkit.java
View File

@ -27,6 +27,7 @@ import com.djrapitops.plan.data.store.objects.DateObj;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.Processors;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.utilities.java.Reflection;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.task.AbsRunnable;
@ -99,16 +100,19 @@ public class PingCountTimerBukkit extends AbsRunnable implements Listener {
private final Map<UUID, List<DateObj<Integer>>> playerHistory;
private final PlanConfig config;
private final Processors processors;
private final Processing processing;
private final RunnableFactory runnableFactory;
@Inject
public PingCountTimerBukkit(
PlanConfig config,
Processors processors,
Processing processing,
RunnableFactory runnableFactory
) {
this.config = config;
this.processors = processors;
this.processing = processing;
this.runnableFactory = runnableFactory;
@ -186,7 +190,7 @@ public class PingCountTimerBukkit extends AbsRunnable implements Listener {
addPlayer(player);
}
}// TODO Config
}).runTaskLater(TimeAmount.toTicks(Settings.PING_PLAYER_LOGIN_DELAY.getNumber(), TimeUnit.SECONDS));
}).runTaskLater(TimeAmount.toTicks(config.getNumber(Settings.PING_PLAYER_LOGIN_DELAY), TimeUnit.SECONDS));
}
@EventHandler

37
Plan/src/main/java/com/djrapitops/plan/system/tasks/server/PingCountTimerBungee.java
View File

@ -25,8 +25,9 @@ package com.djrapitops.plan.system.tasks.server;
import com.djrapitops.plan.data.store.objects.DateObj;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.player.PingInsertProcessor;
import com.djrapitops.plan.system.processing.processors.Processors;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.task.AbsRunnable;
import com.djrapitops.plugin.task.RunnableFactory;
@ -36,20 +37,44 @@ import net.md_5.bungee.api.event.ServerConnectedEvent;
import net.md_5.bungee.api.event.ServerDisconnectEvent;
import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.event.EventHandler;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.*;
import java.util.concurrent.TimeUnit;
/**
* Task that handles player ping calculation on Bungee based servers.
*
* @author BrainStone
*/
@Singleton
public class PingCountTimerBungee extends AbsRunnable implements Listener {
//the server is pinging the client every 40 Ticks (2 sec) - so check it then
//https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/PlayerConnection.java#L178
public static final int PING_INTERVAL = 2 * 20;
private final Map<UUID, List<DateObj<Integer>>> playerHistory = new HashMap<>();
private final Map<UUID, List<DateObj<Integer>>> playerHistory;
private final PlanConfig config;
private final Processors processors;
private final Processing processing;
private final RunnableFactory runnableFactory;
@Inject
public PingCountTimerBungee(
PlanConfig config,
Processors processors,
Processing processing,
RunnableFactory runnableFactory
) {
this.config = config;
this.processors = processors;
this.processing = processing;
this.runnableFactory = runnableFactory;
playerHistory = new HashMap<>();
}
@Override
public void run() {
@ -59,13 +84,13 @@ public class PingCountTimerBungee extends AbsRunnable implements Listener {
ProxiedPlayer player = ProxyServer.getInstance().getPlayer(uuid);
if (player != null) {
int ping = getPing(player);
if (ping < -1 || ping > TimeAmount.SECOND.ms() * 8L) {
if (ping < -1 || ping > TimeUnit.SECONDS.toMillis(8L)) {
// Don't accept bad values
return;
}
history.add(new DateObj<>(time, ping));
if (history.size() >= 30) {
Processing.submit(new PingInsertProcessor(uuid, new ArrayList<>(history)));
processing.submit(processors.player().pingInsertProcessor(uuid, new ArrayList<>(history)));
history.clear();
}
} else {
@ -90,14 +115,14 @@ public class PingCountTimerBungee extends AbsRunnable implements Listener {
@EventHandler
public void onPlayerJoin(ServerConnectedEvent joinEvent) {
ProxiedPlayer player = joinEvent.getPlayer();
RunnableFactory.createNew("Add Player to Ping list", new AbsRunnable() {
runnableFactory.create("Add Player to Ping list", new AbsRunnable() {
@Override
public void run() {
if (player.isConnected()) {
addPlayer(player);
}
}
}).runTaskLater(TimeAmount.SECOND.ticks() * (long) Settings.PING_PLAYER_LOGIN_DELAY.getNumber());
}).runTaskLater(TimeAmount.toTicks(config.getNumber(Settings.PING_PLAYER_LOGIN_DELAY), TimeUnit.SECONDS));
}
@EventHandler

34
Plan/src/main/java/com/djrapitops/plan/system/tasks/server/PingCountTimerSponge.java
View File

@ -25,8 +25,9 @@ package com.djrapitops.plan.system.tasks.server;
import com.djrapitops.plan.data.store.objects.DateObj;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.player.PingInsertProcessor;
import com.djrapitops.plan.system.processing.processors.Processors;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.task.AbsRunnable;
import com.djrapitops.plugin.task.RunnableFactory;
@ -35,7 +36,9 @@ import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.network.ClientConnectionEvent;
import javax.inject.Inject;
import java.util.*;
import java.util.concurrent.TimeUnit;
/**
* Task that handles player ping calculation on Sponge based servers.
@ -48,7 +51,26 @@ public class PingCountTimerSponge extends AbsRunnable {
//https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/PlayerConnection.java#L178
public static final int PING_INTERVAL = 2 * 20;
private final Map<UUID, List<DateObj<Integer>>> playerHistory = new HashMap<>();
private final Map<UUID, List<DateObj<Integer>>> playerHistory;
private final PlanConfig config;
private final Processors processors;
private final Processing processing;
private final RunnableFactory runnableFactory;
@Inject
public PingCountTimerSponge(
PlanConfig config,
Processors processors,
Processing processing,
RunnableFactory runnableFactory
) {
this.config = config;
this.processors = processors;
this.processing = processing;
this.runnableFactory = runnableFactory;
playerHistory = new HashMap<>();
}
@Override
public void run() {
@ -58,13 +80,13 @@ public class PingCountTimerSponge extends AbsRunnable {
Optional<Player> player = Sponge.getServer().getPlayer(uuid);
if (player.isPresent()) {
int ping = getPing(player.get());
if (ping < -1 || ping > TimeAmount.SECOND.ms() * 8L) {
if (ping < -1 || ping > TimeUnit.SECONDS.toMillis(8L)) {
// Don't accept bad values
return;
}
history.add(new DateObj<>(time, ping));
if (history.size() >= 30) {
Processing.submit(new PingInsertProcessor(uuid, new ArrayList<>(history)));
processing.submit(processors.player().pingInsertProcessor(uuid, new ArrayList<>(history)));
history.clear();
}
} else {
@ -89,14 +111,14 @@ public class PingCountTimerSponge extends AbsRunnable {
@Listener
public void onPlayerJoin(ClientConnectionEvent.Join joinEvent) {
Player player = joinEvent.getTargetEntity();
RunnableFactory.createNew("Add Player to Ping list", new AbsRunnable() {
runnableFactory.create("Add Player to Ping list", new AbsRunnable() {
@Override
public void run() {
if (player.isOnline()) {
addPlayer(player);
}
}
}).runTaskLater(TimeAmount.SECOND.ticks() * (long) Settings.PING_PLAYER_LOGIN_DELAY.getNumber());
}).runTaskLater(TimeAmount.toTicks(config.getNumber(Settings.PING_PLAYER_LOGIN_DELAY), TimeUnit.SECONDS));
}
@Listener

43
Plan/src/main/java/com/djrapitops/plan/system/tasks/server/PingCountTimerVelocity.java
View File

@ -26,8 +26,9 @@ package com.djrapitops.plan.system.tasks.server;
import com.djrapitops.plan.PlanVelocity;
import com.djrapitops.plan.data.store.objects.DateObj;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.player.PingInsertProcessor;
import com.djrapitops.plan.system.processing.processors.Processors;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.task.AbsRunnable;
import com.djrapitops.plugin.task.RunnableFactory;
@ -36,38 +37,64 @@ import com.velocitypowered.api.event.connection.DisconnectEvent;
import com.velocitypowered.api.event.player.ServerConnectedEvent;
import com.velocitypowered.api.proxy.Player;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.*;
import java.util.concurrent.TimeUnit;
/**
* Task that handles player ping calculation on Velocity based servers.
*
* <p>
* Based on PingCountTimerBungee
*
* @author MicleBrick
*/
@Singleton
public class PingCountTimerVelocity extends AbsRunnable {
//the server is pinging the client every 40 Ticks (2 sec) - so check it then
//https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/PlayerConnection.java#L178
public static final int PING_INTERVAL = 2 * 20;
private final Map<UUID, List<DateObj<Integer>>> playerHistory = new HashMap<>();
private final Map<UUID, List<DateObj<Integer>>> playerHistory;
private final PlanVelocity plugin;
private final PlanConfig config;
private final Processors processors;
private final Processing processing;
private final RunnableFactory runnableFactory;
@Inject
public PingCountTimerVelocity(
PlanVelocity plugin,
PlanConfig config,
Processors processors,
Processing processing,
RunnableFactory runnableFactory
) {
this.plugin = plugin;
this.config = config;
this.processors = processors;
this.processing = processing;
this.runnableFactory = runnableFactory;
playerHistory = new HashMap<>();
}
@Override
public void run() {
List<UUID> loggedOut = new ArrayList<>();
long time = System.currentTimeMillis();
playerHistory.forEach((uuid, history) -> {
Player player = PlanVelocity.getInstance().getProxy().getPlayer(uuid).orElse(null);
Player player = plugin.getProxy().getPlayer(uuid).orElse(null);
if (player != null) {
int ping = getPing(player);
if (ping < -1 || ping > TimeAmount.SECOND.ms() * 8L) {
if (ping < -1 || ping > TimeUnit.SECONDS.toMillis(8L)) {
// Don't accept bad values
return;
}
history.add(new DateObj<>(time, ping));
if (history.size() >= 30) {
Processing.submit(new PingInsertProcessor(uuid, new ArrayList<>(history)));
processing.submit(processors.player().pingInsertProcessor(uuid, new ArrayList<>(history)));
history.clear();
}
} else {
@ -92,14 +119,14 @@ public class PingCountTimerVelocity extends AbsRunnable {
@Subscribe
public void onPlayerJoin(ServerConnectedEvent joinEvent) {
Player player = joinEvent.getPlayer();
RunnableFactory.createNew("Add Player to Ping list", new AbsRunnable() {
runnableFactory.create("Add Player to Ping list", new AbsRunnable() {
@Override
public void run() {
if (player.isActive()) {
addPlayer(player);
}
}
}).runTaskLater(TimeAmount.SECOND.ticks() * (long) Settings.PING_PLAYER_LOGIN_DELAY.getNumber());
}).runTaskLater(TimeAmount.toTicks(config.getNumber(Settings.PING_PLAYER_LOGIN_DELAY), TimeUnit.SECONDS));
}
@Subscribe

2
Plan/src/main/java/com/djrapitops/plan/system/tasks/server/SpongeTPSCountTimer.java
View File

@ -13,8 +13,6 @@ import org.spongepowered.api.world.World;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.lang.management.ManagementFactory;
import java.lang.management.OperatingSystemMXBean;
@Singleton
public class SpongeTPSCountTimer extends TPSCountTimer {

29
Plan/src/main/java/com/djrapitops/plan/system/tasks/velocity/VelocityTPSCountTimer.java
View File

@ -1,20 +1,37 @@
package com.djrapitops.plan.system.tasks.velocity;
import com.djrapitops.plan.PlanVelocity;
import com.djrapitops.plan.data.container.TPS;
import com.djrapitops.plan.data.container.builders.TPSBuilder;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.Processors;
import com.djrapitops.plan.system.tasks.TPSCountTimer;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
public class VelocityTPSCountTimer extends TPSCountTimer<PlanVelocity> {
import javax.inject.Inject;
import javax.inject.Singleton;
public VelocityTPSCountTimer(PlanVelocity plugin) {
super(plugin);
@Singleton
public class VelocityTPSCountTimer extends TPSCountTimer {
private final ServerProperties serverProperties;
@Inject
public VelocityTPSCountTimer(
Processors processors,
Processing processing,
ServerProperties serverProperties,
PluginLogger logger,
ErrorHandler errorHandler
) {
super(processors, processing, logger, errorHandler);
this.serverProperties = serverProperties;
}
@Override
public void addNewTPSEntry(long nanoTime, long now) {
int onlineCount = ServerInfo.getServerProperties().getOnlinePlayers();
int onlineCount = serverProperties.getOnlinePlayers();
TPS tps = TPSBuilder.get()
.date(now)
.skipTPS()

2
Plan/src/main/java/com/djrapitops/plan/system/webserver/response/pages/AnalysisPageResponse.java
View File

@ -1,7 +1,5 @@
package com.djrapitops.plan.system.webserver.response.pages;
import com.djrapitops.plan.system.webserver.response.Response;
/**
* @author Rsl1122
* @since 3.5.2

1
Plan/src/main/java/com/djrapitops/plan/system/webserver/response/pages/InspectPageResponse.java
View File

@ -2,7 +2,6 @@ package com.djrapitops.plan.system.webserver.response.pages;
import com.djrapitops.plan.system.webserver.cache.PageId;
import com.djrapitops.plan.system.webserver.cache.ResponseCache;
import com.djrapitops.plan.system.webserver.response.Response;
import com.djrapitops.plan.system.webserver.response.pages.parts.InspectPagePluginsContent;
import org.apache.commons.text.StringSubstitutor;

3
Plan/src/main/java/com/djrapitops/plan/system/webserver/response/pages/NetworkPageResponse.java
View File

@ -1,9 +1,6 @@
package com.djrapitops.plan.system.webserver.response.pages;
import com.djrapitops.plan.api.exceptions.ParseException;
import com.djrapitops.plan.system.webserver.response.Response;
import com.djrapitops.plan.data.store.containers.NetworkContainer;
import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.utilities.html.pages.NetworkPage;
/**

15
Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/ProgressBar.java
View File

@ -1,9 +1,9 @@
package com.djrapitops.plan.utilities.html.graphs;
import com.djrapitops.plan.data.store.mutators.formatting.Formatters;
import com.djrapitops.plan.utilities.formatting.Formatter;
/**
* Utility for creating ProgressBars.
* Utility for creating Progress bars.
*
* @author Rsl1122
*/
@ -12,16 +12,19 @@ public class ProgressBar {
private final int obtained;
private final int max;
private final Formatter<Double> percentageFormatter;
private final String color;
public ProgressBar(int obtained, int max) {
this(obtained, max, "teal");
public ProgressBar(int obtained, int max, Formatter<Double> percentageFormatter) {
this(obtained, max, "teal", percentageFormatter);
}
public ProgressBar(int obtained, int max, String color) {
public ProgressBar(int obtained, int max, String color, Formatter<Double> percentageFormatter) {
this.obtained = obtained;
this.max = max;
this.color = color;
this.percentageFormatter = percentageFormatter;
}
public String toHtml() {
@ -32,7 +35,7 @@ public class ProgressBar {
" aria-valuenow=\"" + obtained + "\"" +
" aria-valuemin=\"0\" aria-valuemax=\"" + max + "\"" +
" style=\"width: " + percentageRounded + "%;\">" +
obtained + " / " + max + " (" + Formatters.percentage().apply(percentage) + ")" +
obtained + " / " + max + " (" + percentageFormatter.apply(percentage) + ")" +
"</div></div>";
}

9
Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java
View File

@ -22,16 +22,18 @@ import static com.djrapitops.plan.data.store.keys.NetworkKeys.*;
public class NetworkPage implements Page {
private final NetworkContainer networkContainer;
private final AnalysisPluginsTabContentCreator analysisPluginsTabContentCreator;
private final PlanFiles files;
private final ServerProperties serverProperties;
public NetworkPage(
NetworkPage(
NetworkContainer networkContainer,
PlanFiles files,
AnalysisPluginsTabContentCreator analysisPluginsTabContentCreator, PlanFiles files,
ServerProperties serverProperties
) {
this.networkContainer = networkContainer;
this.analysisPluginsTabContentCreator = analysisPluginsTabContentCreator;
this.files = files;
this.serverProperties = serverProperties;
}
@ -56,8 +58,7 @@ public class NetworkPage implements Page {
SERVERS_TAB
);
// TODO Fix
String[] content = AnalysisPluginsTabContentCreator.createContent(networkContainer.getUnsafe(NetworkKeys.PLAYERS_MUTATOR), null);
String[] content = analysisPluginsTabContentCreator.createContent(null, networkContainer.getUnsafe(NetworkKeys.PLAYERS_MUTATOR));
String nav = content[0];
String tabs = content[1];

8
Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/PageFactory.java
View File

@ -14,6 +14,7 @@ import com.djrapitops.plan.system.webserver.response.pages.parts.InspectPagePlug
import com.djrapitops.plan.utilities.formatting.Formatters;
import com.djrapitops.plan.utilities.html.graphs.Graphs;
import com.djrapitops.plan.utilities.html.structure.Accordions;
import com.djrapitops.plan.utilities.html.structure.AnalysisPluginsTabContentCreator;
import com.djrapitops.plan.utilities.html.tables.HtmlTables;
import com.djrapitops.plugin.benchmarking.Timings;
import com.djrapitops.plugin.logging.debug.DebugLogger;
@ -46,6 +47,7 @@ public class PageFactory {
private final Lazy<Accordions> accordions;
private final Lazy<Formatters> formatters;
private final Lazy<AnalysisContainer.Factory> analysisContainerFactory;
private final Lazy<AnalysisPluginsTabContentCreator> analysisPluginsTabContentCreator;
private final Lazy<HookHandler> hookHandler;
private final Lazy<DebugLogger> debugLogger;
private final Lazy<Timings> timings;
@ -65,6 +67,7 @@ public class PageFactory {
Lazy<Accordions> accordions,
Lazy<Formatters> formatters,
Lazy<AnalysisContainer.Factory> analysisContainerFactory,
Lazy<AnalysisPluginsTabContentCreator> analysisPluginsTabContentCreator,
Lazy<HookHandler> hookHandler,
Lazy<DebugLogger> debugLogger,
Lazy<Timings> timings,
@ -82,6 +85,7 @@ public class PageFactory {
this.accordions = accordions;
this.formatters = formatters;
this.analysisContainerFactory = analysisContainerFactory;
this.analysisPluginsTabContentCreator = analysisPluginsTabContentCreator;
this.hookHandler = hookHandler;
this.debugLogger = debugLogger;
this.timings = timings;
@ -126,6 +130,8 @@ public class PageFactory {
public NetworkPage networkPage() {
NetworkContainer networkContainer = database.get().fetch().getNetworkContainer(); // Not cached, big.
return new NetworkPage(networkContainer, fileSystem.get(), serverInfo.get().getServerProperties());
return new NetworkPage(networkContainer,
analysisPluginsTabContentCreator.get(),
fileSystem.get(), serverInfo.get().getServerProperties());
}
}

5
Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/AnalysisPluginsTabContentCreator.java
View File

@ -8,7 +8,6 @@ import com.djrapitops.plan.data.element.AnalysisContainer;
import com.djrapitops.plan.data.element.InspectContainer;
import com.djrapitops.plan.data.plugin.HookHandler;
import com.djrapitops.plan.data.plugin.PluginData;
import com.djrapitops.plan.data.store.keys.AnalysisKeys;
import com.djrapitops.plan.data.store.mutators.PlayersMutator;
import com.djrapitops.plan.system.DebugChannels;
import com.djrapitops.plan.utilities.comparators.PluginDataNameComparator;
@ -52,9 +51,9 @@ public class AnalysisPluginsTabContentCreator {
}
public String[] createContent(
com.djrapitops.plan.data.store.containers.AnalysisContainer analysisContainer
com.djrapitops.plan.data.store.containers.AnalysisContainer analysisContainer,
PlayersMutator mutator
) {
PlayersMutator mutator = analysisContainer.getValue(AnalysisKeys.PLAYERS_MUTATOR).orElse(new PlayersMutator(new ArrayList<>()));
if (mutator.all().isEmpty()) {
return new String[]{"<li><a>No Data</a></li>", ""};

2
Plan/src/main/resources/plugin.yml
View File

@ -95,7 +95,7 @@ permissions:
plan.basic:
children:
plan.?: true
plan.inspect.base: true
plan.inspect.base: true
plan.qinspect.base: true
plan.advanced:
childer:

84
Plan/src/test/java/com/djrapitops/plan/data/store/mutators/formatting/TimeAmountFormatterDefaultTest.java
View File

@ -1,12 +1,12 @@
package com.djrapitops.plan.data.store.mutators.formatting;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plugin.api.TimeAmount;
import org.junit.AfterClass;
import org.junit.Before;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.utilities.formatting.time.TimeAmountFormatter;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
import utilities.Teardown;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
@ -17,41 +17,35 @@ import static org.junit.Assert.assertEquals;
*/
public class TimeAmountFormatterDefaultTest {
private TimeAmountFormatter timeAmountFormatter;
private static TimeAmountFormatter underTest;
@BeforeClass
public static void setUpClass() {
Settings.FORMAT_YEAR.setTemporaryValue("1 year, ");
Settings.FORMAT_YEARS.setTemporaryValue("%years% years, ");
Settings.FORMAT_MONTH.setTemporaryValue("1 month, ");
Settings.FORMAT_MONTHS.setTemporaryValue("%months% months, ");
Settings.FORMAT_DAY.setTemporaryValue("1d ");
Settings.FORMAT_DAYS.setTemporaryValue("%days%d ");
Settings.FORMAT_HOURS.setTemporaryValue("%hours%h ");
Settings.FORMAT_MINUTES.setTemporaryValue("%minutes%m ");
Settings.FORMAT_SECONDS.setTemporaryValue("%seconds%s");
Settings.FORMAT_ZERO_SECONDS.setTemporaryValue("0s");
}
@AfterClass
public static void tearDownClass() {
Teardown.resetSettingsTempValues();
}
@Before
public void setUp() {
timeAmountFormatter = new TimeAmountFormatter();
// TODO Test initialization
Assume.assumeTrue(false);
PlanConfig config = new PlanConfig(null, null, null);
// Settings.FORMAT_YEAR.setTemporaryValue("1 year, ");
// Settings.FORMAT_YEARS.setTemporaryValue("%years% years, ");
// Settings.FORMAT_MONTH.setTemporaryValue("1 month, ");
// Settings.FORMAT_MONTHS.setTemporaryValue("%months% months, ");
// Settings.FORMAT_DAY.setTemporaryValue("1d ");
// Settings.FORMAT_DAYS.setTemporaryValue("%days%d ");
// Settings.FORMAT_HOURS.setTemporaryValue("%hours%h ");
// Settings.FORMAT_MINUTES.setTemporaryValue("%minutes%m ");
// Settings.FORMAT_SECONDS.setTemporaryValue("%seconds%s");
// Settings.FORMAT_ZERO_SECONDS.setTemporaryValue("0s");
underTest = new TimeAmountFormatter(config);
}
@Test
public void exampleOne() {
String expected = "1 year, 1 month, 5d 12h 30m 20s";
long ms = TimeAmount.DAY.ms() * 400L +
TimeAmount.HOUR.ms() * 12L +
TimeAmount.MINUTE.ms() * 30L +
TimeAmount.SECOND.ms() * 20L;
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.DAYS.toMillis(400L) +
TimeUnit.HOURS.toMillis(12L) +
TimeUnit.MINUTES.toMillis(30L) +
TimeUnit.SECONDS.toMillis(20L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -60,8 +54,8 @@ public class TimeAmountFormatterDefaultTest {
public void exampleTwo() {
String expected = "1 year, 1 month, 5d ";
long ms = TimeAmount.DAY.ms() * 400L;
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.DAYS.toMillis(400L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -70,9 +64,9 @@ public class TimeAmountFormatterDefaultTest {
public void exampleThree() {
String expected = "12h 20s";
long ms = TimeAmount.HOUR.ms() * 12L +
TimeAmount.SECOND.ms() * 20L;
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.HOURS.toMillis(12L) +
TimeUnit.SECONDS.toMillis(20L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -81,8 +75,8 @@ public class TimeAmountFormatterDefaultTest {
public void exampleFour() {
String expected = "30m ";
long ms = TimeAmount.MINUTE.ms() * 30L;
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.MINUTES.toMillis(30L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -91,8 +85,8 @@ public class TimeAmountFormatterDefaultTest {
public void exampleFive() {
String expected = "20s";
long ms = TimeAmount.SECOND.ms() * 20L;
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.SECONDS.toMillis(20L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -102,7 +96,7 @@ public class TimeAmountFormatterDefaultTest {
String expected = "-";
long ms = 0L;
String result = timeAmountFormatter.apply(ms);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -111,8 +105,8 @@ public class TimeAmountFormatterDefaultTest {
public void exampleOneSecond() {
String expected = "1s";
long ms = TimeAmount.SECOND.ms();
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.SECONDS.toMillis(1L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -121,8 +115,8 @@ public class TimeAmountFormatterDefaultTest {
public void exampleOneMinute() {
String expected = "1m ";
long ms = TimeAmount.MINUTE.ms();
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.MINUTES.toMillis(1L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}

84
Plan/src/test/java/com/djrapitops/plan/data/store/mutators/formatting/TimeAmountFormatterExtraZerosTest.java
View File

@ -1,12 +1,12 @@
package com.djrapitops.plan.data.store.mutators.formatting;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plugin.api.TimeAmount;
import org.junit.AfterClass;
import org.junit.Before;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.utilities.formatting.time.TimeAmountFormatter;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
import utilities.Teardown;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
@ -17,41 +17,35 @@ import static org.junit.Assert.assertEquals;
*/
public class TimeAmountFormatterExtraZerosTest {
private TimeAmountFormatter timeAmountFormatter;
private static TimeAmountFormatter underTest;
@BeforeClass
public static void setUpClass() {
Settings.FORMAT_YEAR.setTemporaryValue("1 year, ");
Settings.FORMAT_YEARS.setTemporaryValue("%years% years, ");
Settings.FORMAT_MONTH.setTemporaryValue("1 month, ");
Settings.FORMAT_MONTHS.setTemporaryValue("%months% months, ");
Settings.FORMAT_DAY.setTemporaryValue("1d ");
Settings.FORMAT_DAYS.setTemporaryValue("%days%d ");
Settings.FORMAT_HOURS.setTemporaryValue("%zero%%hours%:");
Settings.FORMAT_MINUTES.setTemporaryValue("%hours%%zero%%minutes%:");
Settings.FORMAT_SECONDS.setTemporaryValue("%minutes%%zero%%seconds%");
Settings.FORMAT_ZERO_SECONDS.setTemporaryValue("00:00:00");
}
@AfterClass
public static void tearDownClass() {
Teardown.resetSettingsTempValues();
}
@Before
public void setUp() {
timeAmountFormatter = new TimeAmountFormatter();
// TODO Test initialization
Assume.assumeTrue(false);
PlanConfig config = new PlanConfig(null, null, null);
// Settings.FORMAT_YEAR.setTemporaryValue("1 year, ");
// Settings.FORMAT_YEARS.setTemporaryValue("%years% years, ");
// Settings.FORMAT_MONTH.setTemporaryValue("1 month, ");
// Settings.FORMAT_MONTHS.setTemporaryValue("%months% months, ");
// Settings.FORMAT_DAY.setTemporaryValue("1d ");
// Settings.FORMAT_DAYS.setTemporaryValue("%days%d ");
// Settings.FORMAT_HOURS.setTemporaryValue("%zero%%hours%:");
// Settings.FORMAT_MINUTES.setTemporaryValue("%hours%%zero%%minutes%:");
// Settings.FORMAT_SECONDS.setTemporaryValue("%minutes%%zero%%seconds%");
// Settings.FORMAT_ZERO_SECONDS.setTemporaryValue("00:00:00");
underTest = new TimeAmountFormatter(config);
}
@Test
public void exampleOne() {
String expected = "1 year, 1 month, 5d 12:30:20";
long ms = TimeAmount.DAY.ms() * 400L +
TimeAmount.HOUR.ms() * 12L +
TimeAmount.MINUTE.ms() * 30L +
TimeAmount.SECOND.ms() * 20L;
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.DAYS.toMillis(400L) +
TimeUnit.HOURS.toMillis(12L) +
TimeUnit.MINUTES.toMillis(30L) +
TimeUnit.SECONDS.toMillis(20L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -60,8 +54,8 @@ public class TimeAmountFormatterExtraZerosTest {
public void exampleTwo() {
String expected = "1 year, 1 month, 5d 00:00:00";
long ms = TimeAmount.DAY.ms() * 400L;
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.DAYS.toMillis(400L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -70,9 +64,9 @@ public class TimeAmountFormatterExtraZerosTest {
public void exampleThree() {
String expected = "12:00:20";
long ms = TimeAmount.HOUR.ms() * 12L +
TimeAmount.SECOND.ms() * 20L;
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.HOURS.toMillis(12L) +
TimeUnit.SECONDS.toMillis(20L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -81,8 +75,8 @@ public class TimeAmountFormatterExtraZerosTest {
public void exampleFour() {
String expected = "00:30:00";
long ms = TimeAmount.MINUTE.ms() * 30L;
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.MINUTES.toMillis(30L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -91,8 +85,8 @@ public class TimeAmountFormatterExtraZerosTest {
public void exampleFive() {
String expected = "00:00:20";
long ms = TimeAmount.SECOND.ms() * 20L;
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.SECONDS.toMillis(20L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -102,7 +96,7 @@ public class TimeAmountFormatterExtraZerosTest {
String expected = "-";
long ms = 0L;
String result = timeAmountFormatter.apply(ms);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -111,8 +105,8 @@ public class TimeAmountFormatterExtraZerosTest {
public void exampleOneSecond() {
String expected = "00:00:01";
long ms = TimeAmount.SECOND.ms();
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.SECONDS.toMillis(1L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}
@ -121,8 +115,8 @@ public class TimeAmountFormatterExtraZerosTest {
public void exampleOneMinute() {
String expected = "00:01:00";
long ms = TimeAmount.MINUTE.ms();
String result = timeAmountFormatter.apply(ms);
long ms = TimeUnit.MINUTES.toMillis(1L);
String result = underTest.apply(ms);
assertEquals(expected, result);
}

14
Plan/src/test/java/com/djrapitops/plan/system/listeners/bukkit/AFKListenerTest.java
View File

@ -1,13 +1,11 @@
package com.djrapitops.plan.system.listeners.bukkit;
import com.djrapitops.plan.system.settings.Settings;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerMoveEvent;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mockito;
import utilities.Teardown;
import utilities.TestConstants;
import java.util.ArrayList;
@ -26,17 +24,13 @@ public class AFKListenerTest {
@BeforeClass
public static void setUpClass() {
Settings.AFK_THRESHOLD_MINUTES.setTemporaryValue(3);
}
@AfterClass
public static void tearDownClass() {
Teardown.resetSettingsTempValues();
// Settings.AFK_THRESHOLD_MINUTES.setTemporaryValue(3);
}
@Test
@Ignore("Requires AfkListener initialization")
public void testAfkPermissionCallCaching() {
AFKListener afkListener = new AFKListener();
AFKListener afkListener = new AFKListener(null, null);
Collection<Boolean> calls = new ArrayList<>();
Player player = mockPlayer(calls);

20
Plan/src/test/java/com/djrapitops/plan/system/processing/processors/player/PingInsertProcessorTest.java
View File

@ -2,7 +2,6 @@ package com.djrapitops.plan.system.processing.processors.player;
import com.djrapitops.plan.data.store.objects.DateObj;
import com.djrapitops.plan.utilities.analysis.Median;
import com.djrapitops.plugin.api.TimeAmount;
import org.junit.Before;
import org.junit.Test;
import utilities.RandomData;
@ -11,6 +10,7 @@ import utilities.TestConstants;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static org.junit.Assert.assertEquals;
@ -28,7 +28,7 @@ public class PingInsertProcessorTest {
public void setUp() {
testPing = new ArrayList<>();
for (int i = 0; i < TimeAmount.MINUTE.ms(); i += TimeAmount.SECOND.ms() * 2L) {
for (int i = 0; i < TimeUnit.MINUTES.toMillis(1L); i += TimeUnit.SECONDS.toMillis(2L)) {
testPing.add(new DateObj<>(i, RandomData.randomInt(1, 4000)));
}
}
@ -36,10 +36,10 @@ public class PingInsertProcessorTest {
@Test
public void testMedian() {
List<Integer> collect = testPing.stream().map(DateObj::getValue).sorted().collect(Collectors.toList());
System.out.println(collect);
int expected = (int) Median.forInt(collect).calculate();
int result = new PingInsertProcessor(TestConstants.PLAYER_ONE_UUID, new ArrayList<>()).getMeanValue(testPing);
System.out.println(result);
int result = new PingInsertProcessor(TestConstants.PLAYER_ONE_UUID, TestConstants.SERVER_UUID, new ArrayList<>(), null)
.getMeanValue(testPing);
assertEquals(expected, result);
}
@ -47,9 +47,8 @@ public class PingInsertProcessorTest {
@Test
public void testMedianSingleEntry() {
int expected = 50;
int result = new PingInsertProcessor(TestConstants.PLAYER_ONE_UUID, new ArrayList<>()).getMeanValue(
Collections.singletonList(new DateObj<>(0, expected))
);
int result = new PingInsertProcessor(TestConstants.PLAYER_ONE_UUID, TestConstants.SERVER_UUID, new ArrayList<>(), null)
.getMeanValue(Collections.singletonList(new DateObj<>(0, expected)));
assertEquals(expected, result);
}
@ -57,9 +56,8 @@ public class PingInsertProcessorTest {
@Test
public void testMedianEmpty() {
int expected = -1;
int result = new PingInsertProcessor(TestConstants.PLAYER_ONE_UUID, new ArrayList<>()).getMeanValue(
Collections.emptyList()
);
int result = new PingInsertProcessor(TestConstants.PLAYER_ONE_UUID, TestConstants.SERVER_UUID, new ArrayList<>(), null)
.getMeanValue(Collections.emptyList());
assertEquals(expected, result);
}