diff --git a/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_3.xml b/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_3.xml deleted file mode 100644 index bbaec2a3a..000000000 --- a/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plan/pom.xml b/Plan/pom.xml index 629025f40..0dd1c6ee8 100644 --- a/Plan/pom.xml +++ b/Plan/pom.xml @@ -28,7 +28,7 @@ com.djrapitops abstract-plugin-framework - 2.0.3 + 2.0.4 compile diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java index 103be7822..0442bf3c8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java @@ -88,7 +88,7 @@ public class Analysis { log(Locale.get(Msg.ANALYSIS_FETCH).toString()); Benchmark.start("Fetch Phase"); Log.debug("Database", "Analysis Fetch"); - plugin.processStatus().setStatus("Analysis", "Analysis Fetch Phase"); + Log.debug("Analysis", "Analysis Fetch Phase"); try { inspectCache.cacheAllUserData(db); } catch (Exception ex) { @@ -141,7 +141,7 @@ public class Analysis { long fetchPhaseLength = Benchmark.stop("Analysis", "Fetch Phase"); Benchmark.start("Analysis Phase"); - plugin.processStatus().setStatus("Analysis", "Analysis Phase"); + Log.debug("Analysis", "Analysis Phase"); log(Locale.get(Msg.ANALYSIS_PHASE_START).parse(rawData.size(), fetchPhaseLength)); String playersTable = PlayersTableCreator.createSortablePlayersTable(rawData); @@ -153,7 +153,7 @@ public class Analysis { Benchmark.stop("Analysis", "Analysis Phase"); log(Locale.get(Msg.ANALYSIS_3RD_PARTY).toString()); - plugin.processStatus().setStatus("Analysis", "Analyzing additional data sources (3rd party)"); + Log.debug("Analysis", "Analyzing additional data sources (3rd party)"); analysisData.setAdditionalDataReplaceMap(analyzeAdditionalPluginData(uuids)); analysisCache.cache(analysisData); @@ -172,7 +172,8 @@ public class Analysis { ExportUtility.export(analysisData, rawData); } catch (Exception e) { Log.toLog(this.getClass().getName(), e); - plugin.processStatus().setStatus("Analysis", "Error: " + e); + Log.debug("Analysis", "Error: " + e); + Log.logDebug("Analysis"); return false; } return true; @@ -248,11 +249,6 @@ public class Analysis { } public void setTaskId(int id) { - if (id == -2) { - plugin.processStatus().setStatus("Analysis", "Temporarily Disabled"); - } else if (id == -1) { - plugin.processStatus().setStatus("Analysis", "Enabled"); - } taskId = id; } diff --git a/Plan/test/test/java/utils/TestInit.java b/Plan/test/test/java/utils/TestInit.java index bbe7220ff..c24d4c9af 100644 --- a/Plan/test/test/java/utils/TestInit.java +++ b/Plan/test/test/java/utils/TestInit.java @@ -9,7 +9,6 @@ import com.djrapitops.plugin.task.RunnableFactory; import com.djrapitops.plugin.utilities.BenchUtil; import com.djrapitops.plugin.utilities.log.BukkitLog; import com.djrapitops.plugin.utilities.player.Fetch; -import com.djrapitops.plugin.utilities.status.ProcessStatus; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.ServerVariableHolder; import main.java.com.djrapitops.plan.Settings; @@ -106,13 +105,11 @@ public class TestInit { BukkitLog log = new BukkitLog<>(planMock, "console", ""); BenchUtil bench = new BenchUtil(planMock); ServerVariableHolder serverVariableHolder = new ServerVariableHolder(mockServer); - ProcessStatus process = new ProcessStatus<>(planMock); Fetch fetch = new Fetch(planMock); when(planMock.getPluginLogger()).thenReturn(log); when(planMock.benchmark()).thenReturn(bench); when(planMock.getVariable()).thenReturn(serverVariableHolder); - when(planMock.processStatus()).thenReturn(process); when(planMock.fetch()).thenReturn(fetch); RunnableFactory runnableFactory = mockRunnableFactory(); when(planMock.getRunnableFactory()).thenReturn(runnableFactory);