mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-07 17:28:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added AnalysisContainer access to PluginData on getServerContainer call

Browse Source
This commit is contained in:
Rsl1122 2018-07-09 08:51:45 +03:00
parent 02f3aa21de
commit 61cb0ecb0a
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginData.java
View File

@ -28,6 +28,8 @@ public abstract class PluginData {
private String helpText; private String helpText;
protected com.djrapitops.plan.data.store.containers.AnalysisContainer analysisData;
public PluginData(ContainerSize size, String sourcePlugin) { public PluginData(ContainerSize size, String sourcePlugin) {
this.size = size; this.size = size;
this.sourcePlugin = sourcePlugin; this.sourcePlugin = sourcePlugin;
@ -87,4 +89,8 @@ public abstract class PluginData {
public final String getWithIcon(String text, String icon, String color) { public final String getWithIcon(String text, String icon, String color) {
return Html.FA_COLORED_ICON.parse(color, icon) + " " + text; return Html.FA_COLORED_ICON.parse(color, icon) + " " + text;
} }
public final void setAnalysisData(com.djrapitops.plan.data.store.containers.AnalysisContainer analysisData) {
this.analysisData = analysisData;
}
} }

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

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

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

@ -25,13 +25,16 @@ import java.util.*;
*/ */
public class AnalysisPluginsTabContentCreator { public class AnalysisPluginsTabContentCreator {
public static String[] createContent(PlayersMutator mutator) { public static String[] createContent(
PlayersMutator mutator,
com.djrapitops.plan.data.store.containers.AnalysisContainer analysisContainer
) {
if (mutator.all().isEmpty()) { if (mutator.all().isEmpty()) {
return new String[]{"<li><a>No Data</a></li>", ""}; return new String[]{"<li><a>No Data</a></li>", ""};
} }
List<UUID> uuids = mutator.uuids(); List<UUID> uuids = mutator.uuids();
Map<PluginData, AnalysisContainer> containers = analyzeAdditionalPluginData(uuids); Map<PluginData, AnalysisContainer> containers = analyzeAdditionalPluginData(uuids, analysisContainer);
List<PluginData> order = new ArrayList<>(containers.keySet()); List<PluginData> order = new ArrayList<>(containers.keySet());
order.sort(new PluginDataNameComparator()); order.sort(new PluginDataNameComparator());
@ -90,7 +93,10 @@ public class AnalysisPluginsTabContentCreator {
}; };
} }
private static Map<PluginData, AnalysisContainer> analyzeAdditionalPluginData(Collection<UUID> uuids) { private static Map<PluginData, AnalysisContainer> analyzeAdditionalPluginData(
Collection<UUID> uuids,
com.djrapitops.plan.data.store.containers.AnalysisContainer analysisContainer
) {
Map<PluginData, AnalysisContainer> containers = new HashMap<>(); Map<PluginData, AnalysisContainer> containers = new HashMap<>();
List<PluginData> sources = HookHandler.getInstance().getAdditionalDataSources(); List<PluginData> sources = HookHandler.getInstance().getAdditionalDataSources();
@ -101,6 +107,7 @@ public class AnalysisPluginsTabContentCreator {
try { try {
Benchmark.start("Analysis", "Analysis: Source " + source.getSourcePlugin()); Benchmark.start("Analysis", "Analysis: Source " + source.getSourcePlugin());
source.setAnalysisData(analysisContainer);
AnalysisContainer container = source.getServerData(uuids, new AnalysisContainer()); AnalysisContainer container = source.getServerData(uuids, new AnalysisContainer());
if (container != null && !container.isEmpty()) { if (container != null && !container.isEmpty()) {
containers.put(source, container); containers.put(source, container);