Fix typos & Clean code, Fix #188, Fix imports to new location of Html class

PlanPluginBridge/.idea/artifacts/PlanPluginBridge_3_5_0.xml

@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="PlanPluginBridge-3.5.0">
+    <output-path>$PROJECT_DIR$/target</output-path>
+    <root id="archive" name="PlanPluginBridge-3.5.0.jar">
+      <element id="module-output" name="PlanPluginBridge" />
+    </root>
+  </artifact>
+</component>

PlanPluginBridge/.idea/dictionaries/Risto.xml

@@ -0,0 +1,25 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="Risto">
+    <words>
+      <w>askyblock</w>
+      <w>bukkit</w>
+      <w>customkey</w>
+      <w>gamingmesh</w>
+      <w>gmail</w>
+      <w>jitpack</w>
+      <w>litebans</w>
+      <w>massivecraft</w>
+      <w>mcmmo</w>
+      <w>milkbowl</w>
+      <w>minecraft</w>
+      <w>nossr</w>
+      <w>ontime</w>
+      <w>palmergames</w>
+      <w>ryanhamshire</w>
+      <w>sorttable</w>
+      <w>superbvote</w>
+      <w>viaversion</w>
+      <w>wasteofplastic</w>
+    </words>
+  </dictionary>
+</component>

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java

@@ -19,6 +19,7 @@ import main.java.com.djrapitops.plan.data.additional.HookHandler;
  *
  * @author Rsl1122
  */
+@SuppressWarnings("WeakerAccess")
 public class Bridge {
 
     public static void hook(HookHandler handler) {

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/FakeOfflinePlayer.java

@@ -50,6 +50,7 @@ public class FakeOfflinePlayer implements OfflinePlayer {
     }
 
     @Override
+    @Deprecated
     public void setBanned(boolean bln) {
     }
 

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java

@@ -25,27 +25,19 @@ public abstract class Hook {
      */
     public Hook(String plugin) {
         try {
-            Class<? extends JavaPlugin> pluginClass = (Class<? extends JavaPlugin>) Class.forName(plugin);
+            Class<?> givenClass = Class.forName(plugin);
+            Class<? extends JavaPlugin> pluginClass = (Class<? extends JavaPlugin>) givenClass;
             JavaPlugin hookedPlugin = getPlugin(pluginClass);
             enabled = hookedPlugin.isEnabled();
-        } catch (Exception | NoClassDefFoundError e) {
+        } catch (Throwable e) {
             enabled = false;
         }
     }
 
     /**
-     * Consturctor to set enabled to false.
+     * Constructor to set enabled to false.
      */
     public Hook() {
         enabled = false;
     }
-
-    /**
-     * Check if the hooked plugin is enabled.
-     *
-     * @return true/false
-     */
-    public boolean isEnabled() {
-        return enabled;
-    }
 }

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsAchievements.java

@@ -31,11 +31,11 @@ public class AdvancedAchievementsAchievements extends PluginData {
      * @param aaAPI AdvancedAchievementsAPI given by AdvancedAchievementsHook
      */
     public AdvancedAchievementsAchievements(AdvancedAchievementsAPI aaAPI) {
-        super("AdvancedAchievements", "achievements", new AnalysisType[]{AnalysisType.INT_TOTAL, AnalysisType.INT_AVG});
+        super("AdvancedAchievements", "achievements", AnalysisType.INT_TOTAL, AnalysisType.INT_AVG);
         this.aaAPI = aaAPI;
         super.setAnalysisOnly(false);
         super.setIcon("check-circle-o");
-        super.setPrefix("Achivements: ");
+        super.setPrefix("Achievements: ");
         totalAchievements = aaAPI.getPlayersTotalAchievements();
         lastRefresh = MiscUtils.getTime();
     }

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsHook.java

@@ -17,8 +17,6 @@ import static org.bukkit.plugin.java.JavaPlugin.getPlugin;
  */
 public class AdvancedAchievementsHook extends Hook {
 
-    private AdvancedAchievements aa;
-
     /**
      * Hooks the plugin and registers it's PluginData objects.
      *
@@ -31,7 +29,7 @@ public class AdvancedAchievementsHook extends Hook {
     public AdvancedAchievementsHook(HookHandler hookH) throws NoClassDefFoundError {
         super("com.hm.achievement.AdvancedAchievements");
         if (enabled) {
-            aa = getPlugin(AdvancedAchievements.class);
+            AdvancedAchievements aa = getPlugin(AdvancedAchievements.class);
             if (Integer.parseInt(Character.toString(aa.getDescription().getVersion().charAt(0))) >= 5) {
                 AdvancedAchievementsAPI aaAPI = AdvancedAchievementsBukkitAPI.linkAdvancedAchievements();
                 hookH.addPluginDataSource(new AdvancedAchievementsAchievements(aaAPI));

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsTable.java

@@ -1,16 +1,17 @@
 package com.djrapitops.pluginbridge.plan.advancedachievements;
 
 import com.hm.achievement.api.AdvancedAchievementsAPI;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.UUID;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.UserData;
 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;
+import main.java.com.djrapitops.plan.ui.html.Html;
 import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 
+import java.io.Serializable;
+import java.util.Map;
+import java.util.UUID;
+
 /**
  * PluginData class for AdvancedAchievements-plugin.
  *
@@ -35,7 +36,7 @@ public class AdvancedAchievementsTable extends PluginData {
      * @see Html
      */
     public AdvancedAchievementsTable(AdvancedAchievementsAPI aaAPI) {
-        super("AdvancedAchievements", "achievementstable", AnalysisType.HTML);
+        super("AdvancedAchievements", "achievements_table", AnalysisType.HTML);
         this.aaAPI = aaAPI;
         String player = Html.FONT_AWESOME_ICON.parse("user") + " Player";
         String achievements = Html.FONT_AWESOME_ICON.parse("check-circle-o") + " Achievements";
@@ -51,22 +52,22 @@ public class AdvancedAchievementsTable extends PluginData {
         if (cachedUserData.isEmpty()) {
             html.append(Html.TABLELINE_2.parse("No Players.", ""));
         } else if (aaAPI.getAdvancedAchievementsVersionCode() >= 520) {
-            appendTablelinesForV520Plus(cachedUserData, html);
+            appendTableLinesForV520Plus(cachedUserData, html);
         } else {
-            appendTablelinesForLessThanV520(cachedUserData, html);
+            appendTableLinesForLessThanV520(cachedUserData, html);
         }
         return parseContainer("", html.toString());
     }
 
-    private void appendTablelinesForLessThanV520(Map<UUID, UserData> cachedUserData, StringBuilder html) {
+    private void appendTableLinesForLessThanV520(Map<UUID, UserData> cachedUserData, StringBuilder html) {
-        cachedUserData.values().stream().forEach((uData) -> {
+        cachedUserData.values().forEach((uData) -> {
             String inspectUrl = HtmlUtils.getInspectUrl(uData.getName());
             String achievements = aaAPI.getPlayerTotalAchievements(uData.getUuid()) + "";
             html.append(Html.TABLELINE_2.parse(Html.LINK.parse(inspectUrl, uData.getName()), achievements));
         });
     }
 
-    private void appendTablelinesForV520Plus(Map<UUID, UserData> cachedUserData, StringBuilder html) {
+    private void appendTableLinesForV520Plus(Map<UUID, UserData> cachedUserData, StringBuilder html) {
         Map<UUID, Integer> achievementsMap = aaAPI.getPlayersTotalAchievements();
         for (UUID uuid : achievementsMap.keySet()) {
             UserData uData = cachedUserData.get(uuid);

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockIslandLevel.java

@@ -22,7 +22,7 @@ public class ASkyBlockIslandLevel extends PluginData {
      * @param aaAPI ASkyBlockAPI
      */
     public ASkyBlockIslandLevel(ASkyBlockAPI aaAPI) {
-        super("ASkyBlock", "island_level", new AnalysisType[]{AnalysisType.INT_AVG});
+        super("ASkyBlock", "island_level", AnalysisType.INT_AVG);
         this.api = aaAPI;
         super.setAnalysisOnly(false);
         super.setIcon("street-view");
@@ -41,8 +41,7 @@ public class ASkyBlockIslandLevel extends PluginData {
     @Override
     public Serializable getValue(UUID uuid) {
         if (api.hasIsland(uuid)) {
-            int level = api.getIslandLevel(uuid);
+            return api.getIslandLevel(uuid);
-            return level;
         }
         return -1;
     }

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockIslandName.java

@@ -21,7 +21,7 @@ public class ASkyBlockIslandName extends PluginData {
      * @param aaAPI ASkyBlockAPI
      */
     public ASkyBlockIslandName(ASkyBlockAPI aaAPI) {
-        super("ASkyBlock", "islandname");
+        super("ASkyBlock", "island_name");
         this.api = aaAPI;        
         super.setIcon("street-view");
         super.setPrefix("Island name: ");

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockIslandResets.java

@@ -21,7 +21,7 @@ public class ASkyBlockIslandResets extends PluginData {
      * @param aaAPI ASkyBlockAPI
      */
     public ASkyBlockIslandResets(ASkyBlockAPI aaAPI) {
-        super("ASkyBlock", "islandresetsleft");
+        super("ASkyBlock", "island_resets_left");
         this.api = aaAPI;        
         super.setIcon("refresh");
         super.setPrefix("Island Resets Left: ");

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockIslands.java

@@ -22,7 +22,7 @@ public class ASkyBlockIslands extends PluginData {
      * @param aaAPI ASkyBlockAPI
      */
     public ASkyBlockIslands(ASkyBlockAPI aaAPI) {
-        super("ASkyBlock", "island_count", new AnalysisType[]{AnalysisType.HTML});
+        super("ASkyBlock", "island_count", AnalysisType.HTML);
         this.api = aaAPI;
         super.setIcon("street-view");
         super.setPrefix("Islands: ");

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsWarps.java

@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.UUID;
 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;
+import main.java.com.djrapitops.plan.ui.html.Html;
 
 /**
  * PluginData class for Essentials-plugin.
@@ -45,9 +45,9 @@ public class EssentialsWarps extends PluginData {
     public String getHtmlReplaceValue(String modifier, UUID uuid) {
         Warps warps = essentials.getWarps();
         if (!warps.isEmpty()) {
-            Collection<String> warplist = warps.getList();
+            Collection<String> warpList = warps.getList();
 
-            return parseContainer("", getTableContents(new ArrayList<>(warplist)));
+            return parseContainer("", getTableContents(new ArrayList<>(warpList)));
         }
         return parseContainer("", Html.TABLELINE_2.parse("No Warps.", ""));
     }

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionComparator.java

@@ -18,9 +18,6 @@ public class FactionComparator implements Comparator<Faction> {
 
     @Override
     public int compare(Faction fac1, Faction fac2) {
-        if (fac1.getPower() > fac2.getPower()) {
+        return -Double.compare(fac1.getPower(), fac2.getPower());
-            return 1;
-        }
-        return -1;
     }
 }

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsMaxPower.java

@@ -23,7 +23,7 @@ public class FactionsMaxPower extends PluginData {
      * Class Constructor, sets the parameters of the PluginData object.
      */
     public FactionsMaxPower() {
-        super("Factions", "maxpower");
+        super("Factions", "max_power");
         super.setPrefix("Max Power: ");
         super.setIcon("bolt");
     }

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsTable.java

@@ -12,7 +12,7 @@ import java.util.stream.Collectors;
 import main.java.com.djrapitops.plan.Settings;
 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;
+import main.java.com.djrapitops.plan.ui.html.Html;
 import main.java.com.djrapitops.plan.utilities.FormatUtils;
 import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 
@@ -38,14 +38,14 @@ public class FactionsTable extends PluginData {
      * @see Html
      */
     public FactionsTable() {
-        super("Factions", "factionstable", AnalysisType.HTML);
+        super("Factions", "faction_stable", AnalysisType.HTML);
         this.factions = getTopFactions();
         super.setPrefix(Html.TABLE_FACTIONS_START.parse());
         super.setSuffix(Html.TABLE_END.parse());
     }
 
     /**
-     * Used to get the list of Factions and filter out unnessecary ones.
+     * Used to get the list of Factions and filter out unnecessary ones.
      *
      * @return List of Factions sorted by power
      */
@@ -56,11 +56,10 @@ public class FactionsTable extends PluginData {
         topFactions.remove(FactionColl.get().getSafezone());
         topFactions.remove(FactionColl.get().getNone());
         List<String> hide = Settings.HIDE_FACTIONS.getStringList();
-        Collections.sort(topFactions, new FactionComparator());
+        topFactions.sort(new FactionComparator());
-        List<Faction> factionNames = topFactions.stream()
+        return topFactions.stream()
                 .filter(faction -> !hide.contains(faction.getName()))
                 .collect(Collectors.toList());
-        return factionNames;
     }
 
     @Override

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionClaimArea.java

@@ -2,9 +2,12 @@ package com.djrapitops.pluginbridge.plan.griefprevention;
 
 import java.io.Serializable;
 import java.util.UUID;
+
+import com.djrapitops.plugin.utilities.Verify;
 import main.java.com.djrapitops.plan.data.additional.AnalysisType;
 import main.java.com.djrapitops.plan.data.additional.PluginData;
 import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
+import me.ryanhamshire.GriefPrevention.Claim;
 import me.ryanhamshire.GriefPrevention.DataStore;
 
 /**
@@ -23,7 +26,7 @@ public class GriefPreventionClaimArea extends PluginData {
      * @param dataStore DataStore of GriefPrevention
      */
     public GriefPreventionClaimArea(DataStore dataStore) {
-        super("GriefPrevention", "claim_area", new AnalysisType[]{AnalysisType.INT_TOTAL});
+        super("GriefPrevention", "claim_area", AnalysisType.INT_TOTAL);
         this.dataStore = dataStore;
         super.setAnalysisOnly(false);
         super.setIcon("map-o");
@@ -32,12 +35,18 @@ public class GriefPreventionClaimArea extends PluginData {
 
     @Override
     public String getHtmlReplaceValue(String modifierPrefix, UUID uuid) {
-        int area = MathUtils.sumInt(dataStore.getClaims().stream().filter(claim -> claim.ownerID.equals(uuid)).map(c -> c.getArea()));
+        Verify.nullCheck(uuid);
+        int area = dataStore.getClaims().stream()
+                .filter(claim -> uuid.equals(claim.ownerID))
+                .map(Claim::getArea).mapToInt(i -> i).sum();
         return parseContainer(modifierPrefix, area + "");
     }
 
     @Override
     public Serializable getValue(UUID uuid) {
-        return MathUtils.sumInt(dataStore.getClaims().stream().filter(claim -> claim.ownerID.equals(uuid)).map(c -> c.getArea()));
+        Verify.nullCheck(uuid);
+        return dataStore.getClaims().stream()
+                .filter(claim -> uuid.equals(claim.ownerID))
+                .map(Claim::getArea).mapToInt(i -> i).sum();
     }
 }

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionClaimTable.java

@@ -1,10 +1,11 @@
 package com.djrapitops.pluginbridge.plan.griefprevention;
 
-import com.djrapitops.javaplugin.utilities.FormattingUtils;
 import java.io.Serializable;
 import java.util.UUID;
+
+import com.djrapitops.plugin.utilities.FormattingUtils;
 import main.java.com.djrapitops.plan.data.additional.PluginData;
-import main.java.com.djrapitops.plan.ui.Html;
+import main.java.com.djrapitops.plan.ui.html.Html;
 import me.ryanhamshire.GriefPrevention.DataStore;
 
 /**
@@ -23,7 +24,7 @@ public class GriefPreventionClaimTable extends PluginData {
      * @param dataStore DataStore of GriefPrevention
      */
     public GriefPreventionClaimTable(DataStore dataStore) {
-        super("GriefPrevention", "inspectclaimtable");
+        super("GriefPrevention", "inspect_claim_table");
         this.dataStore = dataStore;
         String location = Html.FONT_AWESOME_ICON.parse("map-marker") + " Location";
         String size = Html.FONT_AWESOME_ICON.parse("map-o") + " Area";

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionClaims.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
+
+import com.djrapitops.plugin.utilities.Verify;
 import main.java.com.djrapitops.plan.data.additional.AnalysisType;
 import main.java.com.djrapitops.plan.data.additional.PluginData;
 import me.ryanhamshire.GriefPrevention.Claim;
@@ -25,7 +27,7 @@ public class GriefPreventionClaims extends PluginData {
      * @param dataStore DataStore of GriefPrevention
      */
     public GriefPreventionClaims(DataStore dataStore) {
-        super("GriefPrevention", "claim_count", new AnalysisType[]{AnalysisType.INT_TOTAL});
+        super("GriefPrevention", "claim_count", AnalysisType.INT_TOTAL);
         this.dataStore = dataStore;
         super.setAnalysisOnly(false);
         super.setIcon("flag-o");
@@ -34,12 +36,18 @@ public class GriefPreventionClaims extends PluginData {
 
     @Override
     public String getHtmlReplaceValue(String modifierPrefix, UUID uuid) {
-        List<Claim> claims = dataStore.getClaims().stream().filter(claim -> claim.ownerID.equals(uuid)).collect(Collectors.toList());
+        Verify.nullCheck(uuid);
+        List<Claim> claims = dataStore.getClaims().stream()
+                .filter(claim -> uuid.equals(claim.ownerID))
+                .collect(Collectors.toList());
         return parseContainer(modifierPrefix, claims.size()+"");
     }
 
     @Override
     public Serializable getValue(UUID uuid) {
-        return dataStore.getClaims().stream().filter(claim -> claim.ownerID.equals(uuid)).collect(Collectors.toList()).size();
+        Verify.nullCheck(uuid);
+        return dataStore.getClaims().stream()
+                .filter(claim -> uuid.equals(claim.ownerID))
+                .collect(Collectors.toList()).size();
     }
 }

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionSoftMuted.java

@@ -22,7 +22,7 @@ public class GriefPreventionSoftMuted extends PluginData {
      * @param dataStore DataStore of GriefPrevention
      */
     public GriefPreventionSoftMuted(DataStore dataStore) {
-        super("GriefPrevention", "softmuted", new AnalysisType[]{AnalysisType.BOOLEAN_TOTAL, AnalysisType.BOOLEAN_PERCENTAGE});
+        super("GriefPrevention", "soft_muted", AnalysisType.BOOLEAN_TOTAL, AnalysisType.BOOLEAN_PERCENTAGE);
         this.dataStore = dataStore;
         super.setAnalysisOnly(false);
         super.setIcon("bell-slash-o");

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/importing/OnTimeImporter.java

@@ -30,7 +30,7 @@ public class OnTimeImporter extends Importer {
     /**
      * Imports playtime from Ontime.
      *
-     * Resets Gamemode times to survival because it is playtime dependent.
+     * Resets GameMode times to survival because it is playtime dependent.
      *
      * @param uuid UUID of the player
      * @return HandlingInfo object
@@ -47,7 +47,7 @@ public class OnTimeImporter extends Importer {
                 }
                 if (playTime > uData.getPlayTime()) {
                     uData.setPlayTime(playTime);
-                    uData.setLastGamemode(GameMode.SURVIVAL);
+                    uData.setLastGamemode("SURVIVAL");
                     uData.setAllGMTimes(playTime, 0, 0, 0);
                     uData.setLastGmSwapTime(playTime);
                 }

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsAnalysisJobTable.java

@@ -4,15 +4,14 @@ import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.PlayerManager;
 import com.gamingmesh.jobs.container.JobProgression;
 import java.io.Serializable;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import java.util.stream.Collectors;
+
+import com.gamingmesh.jobs.container.JobsPlayer;
 import main.java.com.djrapitops.plan.Plan;
 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;
+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;
 
@@ -31,7 +30,7 @@ public class JobsAnalysisJobTable extends PluginData {
      * Class Constructor, sets the parameters of the PluginData object.
      */
     public JobsAnalysisJobTable() {
-        super("Jobs", "analysistable", AnalysisType.HTML);
+        super("Jobs", "analysis_table", AnalysisType.HTML);
         final String job = Html.FONT_AWESOME_ICON.parse("suitcase") + " Job";
         final String workers = Html.FONT_AWESOME_ICON.parse("users") + " Workers";
         final String tLevel = Html.FONT_AWESOME_ICON.parse("plus") + " Total Level";
@@ -45,9 +44,9 @@ public class JobsAnalysisJobTable extends PluginData {
         PlayerManager pm = Jobs.getPlayerManager();
         List<List<JobProgression>> players = Plan.getPlanAPI().getInspectCachedUserData().stream()
                 .map(p -> pm.getPlayerInfo(p.getUuid()))
-                .filter(i -> i != null)
+                .filter(Objects::nonNull)
-                .map(i -> pm.getJobsPlayerOffline(i))
+                .map(pm::getJobsPlayerOffline)
-                .map(p -> p.getJobProgression())
+                .map(JobsPlayer::getJobProgression)
                 .filter(list -> !list.isEmpty())
                 .collect(Collectors.toList());
         if (players.isEmpty()) {

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsInspectJobTable.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.UUID;
 import main.java.com.djrapitops.plan.data.additional.PluginData;
-import main.java.com.djrapitops.plan.ui.Html;
+import main.java.com.djrapitops.plan.ui.html.Html;
 
 /**
  * PluginData class for Jobs-plugin.
@@ -26,7 +26,7 @@ public class JobsInspectJobTable extends PluginData {
      * Class Constructor, sets the parameters of the PluginData object.
      */
     public JobsInspectJobTable() {
-        super("Jobs", "inspecttable");
+        super("Jobs", "inspect_table");
         super.setAnalysisOnly(false);
         final String job = Html.FONT_AWESOME_ICON.parse("suitcase") + " Job";
         final String level = Html.FONT_AWESOME_ICON.parse("plus") + " Level";

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansBansTable.java

@@ -9,7 +9,7 @@ import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.UserData;
 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;
+import main.java.com.djrapitops.plan.ui.html.Html;
 import main.java.com.djrapitops.plan.utilities.FormatUtils;
 import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 
@@ -29,7 +29,7 @@ public class LiteBansBansTable extends PluginData {
      * @param database Database class for queries
      */
     public LiteBansBansTable(LiteBansDatabaseQueries database) {
-        super("LiteBans", "bantable", AnalysisType.HTML);
+        super("LiteBans", "ban_table", AnalysisType.HTML);
         db = database;
         String banned = Html.FONT_AWESOME_ICON.parse("ban") + " Banned";
         String by = Html.FONT_AWESOME_ICON.parse("gavel") + " Banned By";

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java

@@ -23,6 +23,7 @@ public class LiteBansHook extends Hook {
      * @see API
      * @throws NoClassDefFoundError when the plugin class can not be found.
      */
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     public LiteBansHook(HookHandler hookH) throws NoClassDefFoundError {
         super();
         try {

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansInspectBansTable.java

@@ -5,7 +5,7 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 import main.java.com.djrapitops.plan.data.additional.PluginData;
-import main.java.com.djrapitops.plan.ui.Html;
+import main.java.com.djrapitops.plan.ui.html.Html;
 import main.java.com.djrapitops.plan.utilities.FormatUtils;
 import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McmmoAnalysisSkillTable.java

@@ -1,17 +1,15 @@
 package com.djrapitops.pluginbridge.plan.mcmmo;
 
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.util.player.UserManager;
 import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
 import java.util.stream.Collectors;
 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;
+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 org.apache.commons.lang.StringUtils;
@@ -32,7 +30,7 @@ public class McmmoAnalysisSkillTable extends PluginData {
      * Class Constructor, sets the parameters of the PluginData object.
      */
     public McmmoAnalysisSkillTable() {
-        super("McMMO", "analysistable", AnalysisType.HTML);
+        super("McMMO", "analysis_table", AnalysisType.HTML);
         final String skill = Html.FONT_AWESOME_ICON.parse("star") + " Skill";
         final String tLevel = Html.FONT_AWESOME_ICON.parse("plus") + " Total Level";
         final String aLevel = Html.FONT_AWESOME_ICON.parse("plus") + " Average Level";
@@ -44,10 +42,10 @@ public class McmmoAnalysisSkillTable extends PluginData {
     @Override
     public String getHtmlReplaceValue(String modifierPrefix, UUID uuid) {
         List<PlayerProfile> profiles = getOnlinePlayers().stream()
-                .filter(p -> p != null)
+                .filter(Objects::nonNull)
-                .map(p -> UserManager.getOfflinePlayer(p))
+                .map(UserManager::getOfflinePlayer)
-                .filter(u -> u != null)
+                .filter(Objects::nonNull)
-                .map(u -> u.getProfile())
+                .map(McMMOPlayer::getProfile)
                 .collect(Collectors.toList());
         if (profiles.isEmpty()) {
             return parseContainer("", Html.TABLELINE_3.parse("No players online", "", ""));

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McmmoInspectSkillTable.java

@@ -17,7 +17,7 @@ import java.util.UUID;
 import java.util.stream.Collectors;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.additional.PluginData;
-import main.java.com.djrapitops.plan.ui.Html;
+import main.java.com.djrapitops.plan.ui.html.Html;
 import org.apache.commons.lang.StringUtils;
 import static org.bukkit.Bukkit.getOfflinePlayer;
 
@@ -36,7 +36,7 @@ public class McmmoInspectSkillTable extends PluginData {
      * Class Constructor, sets the parameters of the PluginData object.
      */
     public McmmoInspectSkillTable() {
-        super("McMMO", "inspectskilltable");
+        super("McMMO", "inspect_skill_table");
         super.setAnalysisOnly(false);
         final String skill = Html.FONT_AWESOME_ICON.parse("star") + " Skill";
         final String level = Html.FONT_AWESOME_ICON.parse("plus") + " Level";

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteVotes.java

@@ -22,7 +22,7 @@ public class SuperbVoteVotes extends PluginData {
      * @param store VoteStorage of SuperbVote
      */
     public SuperbVoteVotes(VoteStorage store) {
-        super("SuperbVote", "votes", new AnalysisType[]{AnalysisType.INT_TOTAL, AnalysisType.INT_AVG});
+        super("SuperbVote", "votes", AnalysisType.INT_TOTAL, AnalysisType.INT_AVG);
         this.store = store;
         super.setAnalysisOnly(false);
         super.setIcon("check");

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteVotesTable.java

@@ -11,7 +11,7 @@ import java.util.UUID;
 import main.java.com.djrapitops.plan.Plan;
 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;
+import main.java.com.djrapitops.plan.ui.html.Html;
 import main.java.com.djrapitops.plan.utilities.FormatUtils;
 import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 
@@ -26,7 +26,7 @@ public class SuperbVoteVotesTable extends PluginData {
     private final VoteStorage store;
 
     public SuperbVoteVotesTable(VoteStorage store) {
-        super("SuperbVote", "votetable", AnalysisType.HTML);
+        super("SuperbVote", "vote_table", AnalysisType.HTML);
         this.store = store;
         String user = Html.FONT_AWESOME_ICON.parse("user") + " Player";
         String votes = Html.FONT_AWESOME_ICON.parse("check") + " Votes";
@@ -47,7 +47,7 @@ public class SuperbVoteVotesTable extends PluginData {
 
     private String getTableLines() {
         StringBuilder html = new StringBuilder();
-        Plan.getPlanAPI().getInspectCachedUserData().stream()
+        Plan.getPlanAPI().getInspectCachedUserData()
                 .forEach(data -> {
                     String link = Html.LINK.parse(HtmlUtils.getInspectUrl(data.getName()), data.getName());
                     String bal = FormatUtils.cutDecimals(store.getVotes(data.getUuid()));

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyTable.java

@@ -12,7 +12,7 @@ import java.util.stream.Collectors;
 import main.java.com.djrapitops.plan.Settings;
 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;
+import main.java.com.djrapitops.plan.ui.html.Html;
 import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 
 /**
@@ -26,8 +26,6 @@ import main.java.com.djrapitops.plan.utilities.HtmlUtils;
  */
 public class TownyTable extends PluginData {
 
-    private List<Town> towns;
-
     /**
      * Class Constructor, sets the parameters of the PluginData object.
      *
@@ -37,7 +35,7 @@ public class TownyTable extends PluginData {
      * @see Html
      */
     public TownyTable() {
-        super("Towny", "townstable", AnalysisType.HTML);
+        super("Towny", "towns_table", AnalysisType.HTML);
         super.setPrefix(Html.TABLE_TOWNS_START.parse());
         super.setSuffix(Html.TABLE_END.parse());
     }
@@ -45,7 +43,7 @@ public class TownyTable extends PluginData {
     @Override
     public String getHtmlReplaceValue(String modifierPrefix, UUID uuid) {
         StringBuilder html = new StringBuilder();
-        this.towns = getTopTowns();
+        List<Town> towns = getTopTowns();
         if (towns.isEmpty()) {
             html.append(Html.TABLELINE_4.parse(Html.TOWN_NO_TOWNS.parse(), "", "", ""));
         } else {
@@ -71,18 +69,17 @@ public class TownyTable extends PluginData {
     }
 
     /**
-     * Used to get the list of Towns and filter out unnessecary ones.
+     * Used to get the list of Towns and filter out unnecessary ones.
      *
      * @return List of Towns sorted by amount of residents.
      */
     public List<Town> getTopTowns() {
         List<Town> topTowns = TownyUniverse.getDataSource().getTowns();
-        Collections.sort(topTowns, new TownComparator());
+        topTowns.sort(new TownComparator());
         List<String> hide = Settings.HIDE_TOWNS.getStringList();
-        List<Town> townNames = topTowns.stream()
+        return topTowns.stream()
                 .filter(town -> !hide.contains(town.getName()))
                 .collect(Collectors.toList());
-        return townNames;
     }
 
     @Override

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/EconomyBalanceTable.java

@@ -11,7 +11,7 @@ import java.util.UUID;
 import main.java.com.djrapitops.plan.Plan;
 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;
+import main.java.com.djrapitops.plan.ui.html.Html;
 import main.java.com.djrapitops.plan.utilities.FormatUtils;
 import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 import net.milkbowl.vault.economy.Economy;
@@ -27,7 +27,7 @@ public class EconomyBalanceTable extends PluginData {
     private final Economy econ;
 
     public EconomyBalanceTable(Economy econ) {
-        super("Vault", "ecobalancetable", AnalysisType.HTML);
+        super("Vault", "eco_balance_table", AnalysisType.HTML);
         this.econ = econ;
         String user = Html.FONT_AWESOME_ICON.parse("user") + " Player";
         String balance = Html.FONT_AWESOME_ICON.parse("money") + " Balance";
@@ -48,7 +48,7 @@ public class EconomyBalanceTable extends PluginData {
 
     private String getTableLines() {
         StringBuilder html = new StringBuilder();
-        Plan.getPlanAPI().getInspectCachedUserData().stream()
+        Plan.getPlanAPI().getInspectCachedUserData()
                 .forEach(data -> {
                     String link = Html.LINK.parse(HtmlUtils.getInspectUrl(data.getName()), data.getName());
                     String bal = FormatUtils.cutDecimals(econ.getBalance(new FakeOfflinePlayer(data)));

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/PermGroup.java

@@ -24,7 +24,7 @@ public class PermGroup extends PluginData {
     private final Permission permSys;
 
     public PermGroup(Permission permSystem) {
-        super("Vault", "permgroup");
+        super("Vault", "permission_group");
         permSys = permSystem;
         super.setIcon("balance-scale");
         super.setPrefix("Permission Group: ");

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/PermGroupTable.java

@@ -34,7 +34,7 @@ public class PermGroupTable extends PluginData {
     private final Permission permSys;
 
     PermGroupTable(Permission permSystem) {
-        super("Vault", "permgrouptable", AnalysisType.HTML);
+        super("Vault", "permission_group_table", AnalysisType.HTML);
         permSys = permSystem;
         String group = Html.FONT_AWESOME_ICON.parse("balance-scale") + " Perm. Group";
         String members = Html.FONT_AWESOME_ICON.parse("users") + " Members";

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ProtocolTable.java

@@ -51,7 +51,7 @@ public class ProtocolTable extends Table {
         if (exists(uuid)) {
             updateProtocolVersion(uuid, version);
         } else {
-            insertProtocolVerison(uuid, version);
+            insertProtocolVersion(uuid, version);
         }
     }
 
@@ -110,7 +110,7 @@ public class ProtocolTable extends Table {
         }
     }
 
-    private void insertProtocolVerison(UUID uuid, int version) throws SQLException {
+    private void insertProtocolVersion(UUID uuid, int version) throws SQLException {
         PreparedStatement statement = null;
         try {
             statement = prepareStatement(

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionVersion.java

@@ -1,21 +1,13 @@
 package com.djrapitops.pluginbridge.plan.viaversion;
 
 import com.djrapitops.pluginbridge.plan.vault.*;
-import com.djrapitops.pluginbridge.plan.FakeOfflinePlayer;
+
 import java.io.Serializable;
 import java.sql.SQLException;
 import java.util.UUID;
-import java.util.logging.Level;
+
-import java.util.logging.Logger;
 import main.java.com.djrapitops.plan.Log;
-import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.data.UserData;
-import main.java.com.djrapitops.plan.data.additional.AnalysisType;
 import main.java.com.djrapitops.plan.data.additional.PluginData;
-import main.java.com.djrapitops.plan.utilities.FormatUtils;
-import net.milkbowl.vault.economy.Economy;
-import static org.bukkit.Bukkit.getOfflinePlayer;
-import org.bukkit.OfflinePlayer;
 
 /**
  * PluginData class for Vault-plugin.

PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionVersionTable.java

@@ -12,7 +12,7 @@ import java.util.Map;
 import java.util.UUID;
 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;
+import main.java.com.djrapitops.plan.ui.html.Html;
 
 /**
  * PluginData class for Vault-plugin.
@@ -25,7 +25,7 @@ public class ViaVersionVersionTable extends PluginData {
     private final ProtocolTable table;
 
     public ViaVersionVersionTable(ProtocolTable table) {
-        super("ViaVersion", "versiontable", AnalysisType.HTML);
+        super("ViaVersion", "version_table", AnalysisType.HTML);
         this.table = table;
         String version = Html.FONT_AWESOME_ICON.parse("signal") + " Version";
         String members = Html.FONT_AWESOME_ICON.parse("users") + " Users";
@@ -51,9 +51,7 @@ public class ViaVersionVersionTable extends PluginData {
         if (usersPerVersion.isEmpty()) {
             html.append(Html.TABLELINE_2.parse("No joins after 3.5.0 install", ""));
         } else {
-            usersPerVersion.entrySet().stream().map(e -> Html.TABLELINE_2.parse(e.getKey(), e.getValue() + "")).forEach(string -> {
+            usersPerVersion.entrySet().stream().map(e -> Html.TABLELINE_2.parse(e.getKey(), e.getValue() + "")).forEach(html::append);
-                html.append(string);
-            });
         }
         return html.toString();
     }