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

[Debt] Removed some static ServerInfo methods

Browse Source 
serverUUID method will require a separate working, as it has 40 usages.
This commit is contained in:
Rsl1122 2018-09-18 18:25:12 +03:00
parent 57377ece82
commit b80198ef51
3 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plan/src/main/java/com/djrapitops/plan/data/store/containers/NetworkContainer.java
View File

@ -1,6 +1,5 @@
package com.djrapitops.plan.data.store.containers;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.data.store.Key;
import com.djrapitops.plan.data.store.keys.NetworkKeys;
import com.djrapitops.plan.data.store.keys.ServerKeys;
@ -9,7 +8,7 @@ import com.djrapitops.plan.data.store.mutators.TPSMutator;
import com.djrapitops.plan.data.store.mutators.health.NetworkHealthInformation;
import com.djrapitops.plan.data.store.objects.DateHolder;
import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.theme.Theme;
@ -38,9 +37,11 @@ public class NetworkContainer extends DataContainer {
private final ServerContainer bungeeContainer;
// TODO
private String version;
private PlanConfig config;
private Theme theme;
private Database database;
private ServerProperties serverProperties;
private Graphs graphs;
private Formatter<DateHolder> yearFormatter;
@ -88,7 +89,7 @@ public class NetworkContainer extends DataContainer {
putRawData(NetworkKeys.REFRESH_TIME_MONTH_AGO, getUnsafe(NetworkKeys.REFRESH_TIME) - TimeAmount.MONTH.ms());
putSupplier(NetworkKeys.REFRESH_TIME_F, () -> secondLongFormatter.apply(getUnsafe(NetworkKeys.REFRESH_TIME)));
putRawData(NetworkKeys.VERSION, PlanPlugin.getInstance().getVersion());
putRawData(NetworkKeys.VERSION, version);
putSupplier(NetworkKeys.TIME_ZONE, config::getTimeZoneOffsetHours);
putSupplier(NetworkKeys.NETWORK_NAME, () ->
@ -96,7 +97,7 @@ public class NetworkContainer extends DataContainer {
config.getString(Settings.BUNGEE_NETWORK_NAME) :
bungeeContainer.getValue(ServerKeys.NAME).orElse("Plan")
);
putSupplier(NetworkKeys.PLAYERS_ONLINE, ServerInfo.getServerProperties_Old()::getOnlinePlayers);
putSupplier(NetworkKeys.PLAYERS_ONLINE, serverProperties::getOnlinePlayers);
putRawData(NetworkKeys.WORLD_MAP_LOW_COLOR, theme.getValue(ThemeVal.WORLD_MAP_LOW));
putRawData(NetworkKeys.WORLD_MAP_HIGH_COLOR, theme.getValue(ThemeVal.WORLD_MAP_HIGH));
putRawData(NetworkKeys.PLAYERS_GRAPH_COLOR, theme.getValue(ThemeVal.GRAPH_PLAYERS_ONLINE));

22
Plan/src/main/java/com/djrapitops/plan/system/info/server/ServerInfo.java
View File

@ -35,29 +35,9 @@ public abstract class ServerInfo implements SubSystem {
return serverInfo;
}
@Deprecated
public static Server getServer_Old() {
return getInstance().server;
}
@Deprecated
public static ServerProperties getServerProperties_Old() {
return getInstance().serverProperties;
}
@Deprecated
public static UUID getServerUUID_Old() {
return getServer_Old().getUuid();
}
@Deprecated
public static String getServerName_Old() {
return getServer_Old().getName();
}
@Deprecated
public static int getServerID_Old() {
return getServer_Old().getId();
return getInstance().server.getUuid();
}
public Server getServer() {

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

@ -7,7 +7,6 @@ package com.djrapitops.plan.utilities.html;
import com.djrapitops.plan.data.store.mutators.TPSMutator;
import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.system.info.server.Server;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.utilities.formatting.Formatter;
import com.djrapitops.plan.utilities.html.graphs.Graphs;
@ -64,13 +63,13 @@ public class HtmlStructure {
// TODO Rework into NetworkPage generation
@Deprecated
public static String createServerContainer() {
ServerProperties properties = ServerInfo.getServerProperties_Old();
ServerProperties properties = null; // TODO
int maxPlayers = properties.getMaxPlayers();
int online = properties.getOnlinePlayers();
Formatter<Long> clockLongFormatter = null; //TODO
String refresh = clockLongFormatter.apply(System.currentTimeMillis());
Server server = ServerInfo.getServer_Old();
Server server = null; // TODO
String serverName = server.getName();
String serverType = properties.getVersion();