diff --git a/Plan/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml b/Plan/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml deleted file mode 100644 index e05eb9fab..000000000 --- a/Plan/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plan/pom.xml b/Plan/pom.xml index 0dd1c6ee8..e13016cc0 100644 --- a/Plan/pom.xml +++ b/Plan/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.djrapitops Plan - 3.6.3 + 3.7.0 jar @@ -35,7 +35,7 @@ com.djrapitops PlanPluginBridge - 3.6.0 + 3.7.0 compile diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/Importer.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/Importer.java index 98f9a74ad..4e9df48ad 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/Importer.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/Importer.java @@ -32,7 +32,7 @@ public abstract class Importer { /** * Constructor. */ - Importer() { + public Importer() { info = "No info specified"; } diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/html/Html.java b/Plan/src/main/java/com/djrapitops/plan/ui/html/Html.java index cbf20439c..0d916583a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ui/html/Html.java +++ b/Plan/src/main/java/com/djrapitops/plan/ui/html/Html.java @@ -2,6 +2,8 @@ package main.java.com.djrapitops.plan.ui.html; import com.djrapitops.plugin.utilities.Verify; +import java.io.Serializable; + /** * @author Rsl1122 */ @@ -72,11 +74,11 @@ public enum Html { * @param p The replacement Strings * @return The parsed HTML String */ - public String parse(String... p) { + public String parse(Serializable... p) { Verify.nullCheck(p); String returnValue = this.html; for (int i = 0; i < p.length; i++) { - returnValue = returnValue.replace("REPLACE" + i, p[i]); + returnValue = returnValue.replace("REPLACE" + i, p[i].toString()); } return returnValue; } diff --git a/PlanPluginBridge/.idea/libraries/Maven__com_destroystokyo_paper_paper_1_12_R0_1_SNAPSHOT.xml b/PlanPluginBridge/.idea/libraries/Maven__com_destroystokyo_paper_paper_1_12_R0_1_SNAPSHOT.xml new file mode 100644 index 000000000..ec40ac224 --- /dev/null +++ b/PlanPluginBridge/.idea/libraries/Maven__com_destroystokyo_paper_paper_1_12_R0_1_SNAPSHOT.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/PlanPluginBridge/.idea/libraries/Maven__com_djrapitops_Plan_3_6_0.xml b/PlanPluginBridge/.idea/libraries/Maven__com_djrapitops_Plan_3_6_0.xml deleted file mode 100644 index 85b0ed7cf..000000000 --- a/PlanPluginBridge/.idea/libraries/Maven__com_djrapitops_Plan_3_6_0.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PlanPluginBridge/.idea/libraries/Maven__com_djrapitops_Plan_3_7_0.xml b/PlanPluginBridge/.idea/libraries/Maven__com_djrapitops_Plan_3_7_0.xml new file mode 100644 index 000000000..5e868fcca --- /dev/null +++ b/PlanPluginBridge/.idea/libraries/Maven__com_djrapitops_Plan_3_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/PlanPluginBridge/.idea/libraries/Maven__com_gamingmesh_jobs_4_0_1.xml b/PlanPluginBridge/.idea/libraries/Maven__com_gamingmesh_jobs_4_0_1.xml new file mode 100644 index 000000000..a42690c95 --- /dev/null +++ b/PlanPluginBridge/.idea/libraries/Maven__com_gamingmesh_jobs_4_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/PlanPluginBridge/PlanPluginBridge-3.6.0.jar b/PlanPluginBridge/PlanPluginBridge-3.6.0.jar deleted file mode 100644 index ae8ac0249..000000000 Binary files a/PlanPluginBridge/PlanPluginBridge-3.6.0.jar and /dev/null differ diff --git a/PlanPluginBridge/PlanPluginBridge-3.7.0.jar b/PlanPluginBridge/PlanPluginBridge-3.7.0.jar new file mode 100644 index 000000000..cca43c0fb Binary files /dev/null and b/PlanPluginBridge/PlanPluginBridge-3.7.0.jar differ diff --git a/PlanPluginBridge/pom.xml b/PlanPluginBridge/pom.xml index 0d8e4f8b0..482956394 100644 --- a/PlanPluginBridge/pom.xml +++ b/PlanPluginBridge/pom.xml @@ -1,11 +1,20 @@ - + 4.0.0 com.djrapitops PlanPluginBridge - 3.6.3 + 3.7.0 jar + + plan-repo + http://repo.fuzzlemann.de/artifactory/libs-release/ + + + plan-snapshot-repo + http://repo.fuzzlemann.de/artifactory/libs-snapshot/ + vault-repo http://nexus.hc.to/content/repositories/pub_releases @@ -23,13 +32,13 @@ com.djrapitops Plan - 3.6.2 + 3.7.0 provided - org.bukkit - craftbukkit - 1.11.2-R0.1-SNAPSHOT + com.destroystokyo.paper + paper + 1.12-R0.1-20170725.202533-1 provided @@ -59,7 +68,7 @@ com.gamingmesh jobs - 3.9.1 + 4.0.1 provided @@ -117,9 +126,22 @@ provided + + + + org.jacoco + jacoco-maven-plugin + 0.7.9 + + + UTF-8 1.8 1.8 + java + jacoco + reuseReports + ${project.basedir}/target/jacoco.exec \ No newline at end of file diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/FakeOfflinePlayer.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/FakeOfflinePlayer.java index 8f7907740..3673c1bf7 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/FakeOfflinePlayer.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/FakeOfflinePlayer.java @@ -5,14 +5,15 @@ */ package com.djrapitops.pluginbridge.plan; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; import main.java.com.djrapitops.plan.data.UserData; import org.bukkit.Location; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + /** * * @author Rsl1122 @@ -49,11 +50,6 @@ public class FakeOfflinePlayer implements OfflinePlayer { return data.isBanned(); } - @Override - @Deprecated - public void setBanned(boolean bln) { - } - @Override public boolean isWhitelisted() { return true; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/importing/OnTimeImporter.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/importing/OnTimeImporter.java index 0d14398ca..732d27195 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/importing/OnTimeImporter.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/importing/OnTimeImporter.java @@ -1,13 +1,14 @@ package com.djrapitops.pluginbridge.plan.importing; -import java.util.UUID; import main.java.com.djrapitops.plan.data.UserData; import main.java.com.djrapitops.plan.data.handling.importing.Importer; import main.java.com.djrapitops.plan.data.handling.info.HandlingInfo; import main.java.com.djrapitops.plan.data.handling.info.InfoType; import me.edge209.OnTime.OnTimeAPI; -import org.bukkit.GameMode; import org.bukkit.OfflinePlayer; + +import java.util.UUID; + import static org.bukkit.Bukkit.getOfflinePlayer; /** diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsAnalysisJobTable.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsAnalysisJobTable.java index 0cc8c97b4..e69dc59e5 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsAnalysisJobTable.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsAnalysisJobTable.java @@ -1,28 +1,25 @@ package com.djrapitops.pluginbridge.plan.jobs; import com.gamingmesh.jobs.Jobs; -import com.gamingmesh.jobs.PlayerManager; -import com.gamingmesh.jobs.container.JobProgression; -import java.io.Serializable; -import java.util.*; -import java.util.stream.Collectors; - -import com.gamingmesh.jobs.container.JobsPlayer; -import main.java.com.djrapitops.plan.Plan; +import com.gamingmesh.jobs.dao.JobsDAOData; import main.java.com.djrapitops.plan.data.additional.AnalysisType; import main.java.com.djrapitops.plan.data.additional.PluginData; import main.java.com.djrapitops.plan.ui.html.Html; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; +import java.io.Serializable; +import java.util.*; +import java.util.stream.Collectors; + /** * PluginData class for Jobs-plugin. - * + *

* Registered to the plugin by JobsHook * * @author Rsl1122 - * @since 3.2.1 * @see JobsHook + * @since 3.2.1 */ public class JobsAnalysisJobTable extends PluginData { @@ -41,33 +38,30 @@ public class JobsAnalysisJobTable extends PluginData { @Override public String getHtmlReplaceValue(String modifierPrefix, UUID uuid) { - PlayerManager pm = Jobs.getPlayerManager(); - List> players = Plan.getPlanAPI().getInspectCachedUserData().stream() - .map(p -> pm.getPlayerInfo(p.getUuid())) - .filter(Objects::nonNull) - .map(pm::getJobsPlayerOffline) - .map(JobsPlayer::getJobProgression) - .filter(list -> !list.isEmpty()) + List allJobs = Jobs.getDBManager().getDB().getAllJobs() + .values().stream() + .flatMap(Collection::stream) .collect(Collectors.toList()); - if (players.isEmpty()) { + + if (allJobs.isEmpty()) { return parseContainer("", Html.TABLELINE_4.parse("No Players with Jobs", "", "", "")); } + Map workers = new HashMap<>(); Map totals = new HashMap<>(); - for (List jobs : players) { - for (JobProgression job : jobs) { - String name = job.getJob().getName(); - int level = job.getLevel(); - if (!workers.containsKey(name)) { - workers.put(name, 0); - } - workers.put(name, workers.get(name) + 1); - if (!totals.containsKey(name)) { - totals.put(name, 0L); - } - totals.put(name, totals.get(name) + level); + for (JobsDAOData data : allJobs) { + String job = data.getJobName(); + int level = data.getLevel(); + if (!workers.containsKey(job)) { + workers.put(job, 0); } + workers.put(job, workers.get(job) + 1); + if (!totals.containsKey(job)) { + totals.put(job, 0L); + } + totals.put(job, totals.get(job) + level); } + StringBuilder html = new StringBuilder(); for (String job : workers.keySet()) { Integer amountOfWorkers = workers.get(job); diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsInspectJobTable.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsInspectJobTable.java index b5838e3d7..63bc3c207 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsInspectJobTable.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsInspectJobTable.java @@ -1,24 +1,22 @@ package com.djrapitops.pluginbridge.plan.jobs; import com.gamingmesh.jobs.Jobs; -import com.gamingmesh.jobs.PlayerManager; -import com.gamingmesh.jobs.container.JobProgression; -import com.gamingmesh.jobs.container.JobsPlayer; -import com.gamingmesh.jobs.container.PlayerInfo; -import java.io.Serializable; -import java.util.List; -import java.util.UUID; +import com.gamingmesh.jobs.dao.JobsDAOData; import main.java.com.djrapitops.plan.data.additional.PluginData; import main.java.com.djrapitops.plan.ui.html.Html; +import java.io.Serializable; +import java.util.List; +import java.util.UUID; + /** * PluginData class for Jobs-plugin. - * + *

* Registered to the plugin by JobsHook * * @author Rsl1122 - * @since 3.2.1 * @see JobsHook + * @since 3.2.1 */ public class JobsInspectJobTable extends PluginData { @@ -37,14 +35,11 @@ public class JobsInspectJobTable extends PluginData { @Override public String getHtmlReplaceValue(String modifierPrefix, UUID uuid) { try { - PlayerManager pm = Jobs.getPlayerManager(); - PlayerInfo info = pm.getPlayerInfo(uuid); - JobsPlayer player = pm.getJobsPlayerOffline(info); - List progression = player.getJobProgression(); - if (!progression.isEmpty()) { + List playersJobs = Jobs.getDBManager().getDB().getAllJobs(null, uuid); + if (!playersJobs.isEmpty()) { StringBuilder html = new StringBuilder(); - for (JobProgression job : progression) { - html.append(Html.TABLELINE_2.parse(job.getJob().getName(), "" + job.getLevel())); + for (JobsDAOData job : playersJobs) { + html.append(Html.TABLELINE_2.parse(job.getJobName(), job.getLevel())); } return parseContainer("", html.toString()); }