From 59da92249078b3109647f9e0e7671f33fcb5320e Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 12 Aug 2017 12:49:25 +0300 Subject: [PATCH] Revert "PR for 3.6.3 (Fuzzlemann) (1)" --- ...pitops_abstract_plugin_framework_2_0_2.xml | 10 ++-- .../plan/command/commands/ManageCommand.java | 2 +- .../commands/manage/ManageDumpCommand.java | 8 +-- .../data/cache/queue/DataCacheClearQueue.java | 6 +-- .../data/cache/queue/DataCacheGetQueue.java | 12 ++--- .../com/djrapitops/plan/locale/Locale.java | 25 +++++----- .../com/djrapitops/plan/ui/text/TextUI.java | 4 +- .../plan/utilities/analysis/Analysis.java | 2 +- .../utilities/analysis/ExportUtility.java | 30 +++++------- .../plan/utilities/file/dump/DumpLog.java | 49 ++----------------- .../plan/utilities/file/dump/DumpUtils.java | 2 +- Plan/src/main/resources/player.html | 8 +-- Plan/src/test/java/utils/MockUtils.java | 3 +- PlanPluginBridge/pom.xml | 4 +- .../AdvancedAchievementsAchievements.java | 23 +++------ .../plan/askyblock/ASkyBlockIslandLevel.java | 5 +- .../plan/essentials/EssentialsWarps.java | 17 +++++-- .../plan/factions/FactionsTable.java | 30 ++++++------ .../pluginbridge/plan/towny/TownyTable.java | 12 ++--- .../pluginbridge/plan/towny/TownyTown.java | 16 +++--- 20 files changed, 109 insertions(+), 159 deletions(-) diff --git a/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_2.xml b/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_2.xml index ce0411645..d291e16ee 100644 --- a/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_2.xml +++ b/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_2.xml @@ -1,9 +1,13 @@ - + - - + + + + + + \ No newline at end of file diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java index ae8421dd6..3ca20ae3c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java @@ -24,7 +24,7 @@ public class ManageCommand extends TreeCommand { * @param plugin Current instance of Plan */ public ManageCommand(Plan plugin) { - super(plugin, "manage,m", CommandType.CONSOLE, Permissions.MANAGE.getPermission(), Locale.get(Msg.CMD_USG_MANAGE).toString(), "plan m"); + super(plugin, "manage,m", CommandType.CONSOLE, Permissions.MANAGE.getPermission(), Locale.get(Msg.CMD_USG_MANAGE) + "", "plan m"); } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDumpCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDumpCommand.java index a51d4e801..9d8ca7382 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDumpCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDumpCommand.java @@ -50,12 +50,8 @@ public class ManageDumpCommand extends SubCommand { plugin.getRunnableFactory().createNew(new AbsRunnable("DumpTask") { @Override public void run() { - try { - sender.sendLink("Link to the Dump", DumpUtils.dump(plugin)); - sender.sendLink("Report Issues here", "https://github.com/Rsl1122/Plan-PlayerAnalytics/issues/new"); - } finally { - this.cancel(); - } + sender.sendLink("Link to the Dump", DumpUtils.dump(plugin)); + sender.sendLink("Report Issues here", "https://github.com/Rsl1122/Plan-PlayerAnalytics/issues/new"); } }).runTaskAsynchronously(); } diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheClearQueue.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheClearQueue.java index 6a2733742..987888f71 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheClearQueue.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheClearQueue.java @@ -27,7 +27,7 @@ public class DataCacheClearQueue extends Queue { * @param handler current instance of DataCacheHandler. */ public DataCacheClearQueue(DataCacheHandler handler) { - super(new ArrayBlockingQueue<>(Settings.PROCESS_CLEAR_LIMIT.getNumber())); + super(new ArrayBlockingQueue(Settings.PROCESS_CLEAR_LIMIT.getNumber())); setup = new ClearSetup(queue, handler); setup.go(); } @@ -65,7 +65,7 @@ class ClearConsumer extends Consumer implements Runnable { private DataCacheHandler handler; - ClearConsumer(BlockingQueue q, DataCacheHandler handler) { + ClearConsumer(BlockingQueue q, DataCacheHandler handler) { super(q, "ClearQueueConsumer"); this.handler = handler; } @@ -97,7 +97,7 @@ class ClearConsumer extends Consumer implements Runnable { class ClearSetup extends Setup { - ClearSetup(BlockingQueue q, DataCacheHandler handler) { + public ClearSetup(BlockingQueue q, DataCacheHandler handler) { super(new ClearConsumer(q, handler)); } } diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheGetQueue.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheGetQueue.java index 7c311a3d9..395287619 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheGetQueue.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheGetQueue.java @@ -27,7 +27,7 @@ public class DataCacheGetQueue extends Queue * @param plugin current instance of Plan */ public DataCacheGetQueue(Plan plugin) { - super(new ArrayBlockingQueue<>(Settings.PROCESS_GET_LIMIT.getNumber())); + super(new ArrayBlockingQueue(Settings.PROCESS_GET_LIMIT.getNumber())); setup = new GetSetup(queue, plugin.getDB()); setup.go(); } @@ -50,12 +50,8 @@ public class DataCacheGetQueue extends Queue } } - boolean containsUUIDtoBeCached(UUID uuid) { - return uuid != null - && queue.stream() - .map(map -> map.get(uuid)) - .filter(Objects::nonNull) - .anyMatch(list -> list.size() >= 2); + public boolean containsUUIDtoBeCached(UUID uuid) { + return uuid != null && new ArrayList<>(queue).stream().anyMatch(map -> (map.get(uuid) != null && map.get(uuid).size() >= 2)); } } @@ -63,7 +59,7 @@ class GetConsumer extends Consumer>> { private Database db; - GetConsumer(BlockingQueue>> q, Database db) { + GetConsumer(BlockingQueue q, Database db) { super(q, "GetQueueConsumer"); this.db = db; } diff --git a/Plan/src/main/java/com/djrapitops/plan/locale/Locale.java b/Plan/src/main/java/com/djrapitops/plan/locale/Locale.java index a51ab9f10..bdd93b08a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/locale/Locale.java +++ b/Plan/src/main/java/com/djrapitops/plan/locale/Locale.java @@ -39,7 +39,7 @@ public class Locale implements Closeable { private final Map messages; public Locale(Plan plugin) { - LocaleHolder.setLocale(this); + LocaleHolder.setLOCALE(this); this.plugin = plugin; messages = new HashMap<>(); } @@ -62,9 +62,9 @@ public class Locale implements Closeable { } } catch (IOException e) { Log.toLog(this.getClass().getName(), e); - } finally { - Benchmark.stop("Enable", "Initializing locale"); + } + Benchmark.stop("Enable", "Initializing locale"); } private void writeNewDefaultLocale() throws IOException { @@ -316,24 +316,25 @@ public class Locale implements Closeable { } public Message getMessage(Msg msg) { - return messages.getOrDefault(msg, new Message("")); + Message message = messages.get(msg); + return message != null ? message : new Message(""); } @Override public void close() { messages.clear(); - LocaleHolder.locale = null; + LocaleHolder.LOCALE = null; } public static void unload() { - Locale locale = LocaleHolder.getLocale(); + Locale locale = LocaleHolder.getLOCALE(); if (locale != null) { locale.close(); } } public static Message get(Msg msg) { - Locale locale = LocaleHolder.getLocale(); + Locale locale = LocaleHolder.getLOCALE(); if (locale == null) { throw new IllegalStateException("Locale has not been initialized."); } @@ -342,14 +343,14 @@ public class Locale implements Closeable { private static class LocaleHolder { - private static Locale locale; + private static Locale LOCALE; - public static void setLocale(Locale locale) { - LocaleHolder.locale = locale; + public static void setLOCALE(Locale LOCALE) { + LocaleHolder.LOCALE = LOCALE; } - public static Locale getLocale() { - return locale; + public static Locale getLOCALE() { + return LOCALE; } } } diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/text/TextUI.java b/Plan/src/main/java/com/djrapitops/plan/ui/text/TextUI.java index 08fafbe8c..6d768862f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ui/text/TextUI.java +++ b/Plan/src/main/java/com/djrapitops/plan/ui/text/TextUI.java @@ -84,12 +84,12 @@ public class TextUI { final TPSPart tps = d.getTpsPart(); return new String[]{ ball + " Total Players: " + sec + count.getPlayerCount(), - + // ball + " Active: " + sec + activity.getActive().size() + main + " Inactive: " + sec + activity.getInactive().size() + main + " Single Join: " + sec + activity.getJoinedOnce().size() + main + " Banned: " + sec + activity.getBans().size(), - + // ball + " New Players 24h: " + sec + join.get("npday") + main + " 7d: " + sec + d.get("npweek") + main + " 30d: " + sec + d.get("npmonth"), "", ball + " Total Playtime: " + sec + playtime.get("totalplaytime") + main + " Player Avg: " + sec + playtime.get("avgplaytime"), 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 aab2532e6..cb8cfb81b 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 @@ -167,7 +167,7 @@ public class Analysis { PageCacheHandler.cachePage("analysisPage", () -> new AnalysisPageResponse(plugin.getUiServer().getDataReqHandler())); PageCacheHandler.cachePage("players", () -> new PlayersPageResponse(plugin)); - ExportUtility.export(analysisData, rawData); + ExportUtility.export(plugin, analysisData, rawData); } catch (Exception e) { Log.toLog(this.getClass().getName(), e); plugin.processStatus().setStatus("Analysis", "Error: " + e); diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ExportUtility.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ExportUtility.java index d2aee8737..5561ca666 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ExportUtility.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ExportUtility.java @@ -54,31 +54,27 @@ public class ExportUtility { } /** + * @param plugin * @param analysisData * @param rawData */ - public static void export(AnalysisData analysisData, List rawData) { + public static void export(Plan plugin, AnalysisData analysisData, List rawData) { if (!Settings.ANALYSIS_EXPORT.isTrue()) { return; } - Benchmark.start("Exporting Html pages"); try { File folder = getFolder(); Log.debug("Export", "Folder: " + folder.getAbsolutePath()); - writePlayersPageHtml(rawData, new File(folder, "players")); writeAnalysisHtml(analysisData, new File(folder, "server")); - File playersFolder = getPlayersFolder(folder); Log.debug("Export", "Player html files."); Log.debug("Export", "Player Page Folder: " + playersFolder.getAbsolutePath()); - String playerHtml = HtmlUtils.getStringFromResource("player.html"); - - Benchmark.start("Exporting Player pages"); - rawData.forEach(userData -> writeInspectHtml(userData, playersFolder, playerHtml)); - Benchmark.stop("Exporting Player pages"); + rawData.forEach(userData -> { + writeInspectHtml(userData, playersFolder, playerHtml); + }); } catch (IOException ex) { Log.toLog("ExportUtils.export", ex); } finally { @@ -100,18 +96,17 @@ public class ExportUtility { /** * @param userData * @param playersFolder + * @throws FileNotFoundException + * @throws IOException */ - public static void writeInspectHtml(UserData userData, File playersFolder, String playerHtml) { + public static boolean writeInspectHtml(UserData userData, File playersFolder, String playerHtml) { if (!Settings.ANALYSIS_EXPORT.isTrue()) { - return; + return false; } - String name = userData.getName(); - if (name.endsWith(".")) { name = name.replace(".", "%2E"); } - if (name.endsWith(" ")) { name = name.replace(" ", "%20"); } @@ -119,17 +114,16 @@ public class ExportUtility { try { String inspectHtml = HtmlUtils.replacePlaceholders(playerHtml, PlaceholderUtils.getInspectReplaceRules(userData)); - File playerFolder = new File(playersFolder, name); playerFolder.mkdirs(); - File inspectHtmlFile = new File(playerFolder, "index.html"); inspectHtmlFile.createNewFile(); - Files.write(inspectHtmlFile.toPath(), Collections.singletonList(inspectHtml)); } catch (IOException e) { - Log.toLog("Export.writeInspectHtml: " + name, e); + Log.toLog("Export.inspectPage: " + name, e); + return false; } + return true; } /** diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java index bdaa55a54..ec12ed12f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java @@ -1,7 +1,5 @@ package main.java.com.djrapitops.plan.utilities.file.dump; -import com.google.common.base.Splitter; -import com.google.common.collect.ImmutableList; import main.java.com.djrapitops.plan.Log; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; @@ -23,7 +21,7 @@ import java.util.List; */ public class DumpLog { - private final List lines = new ArrayList<>(); + private List lines = new ArrayList<>(); /** * Writes a header @@ -90,11 +88,6 @@ public class DumpLog { * @param line The content of the line */ private void addLine(CharSequence line) { - if (line == null) { - lines.add("\n"); - return; - } - lines.add(line.toString()); } @@ -104,27 +97,7 @@ public class DumpLog { * @return The link to the Dump Log */ String upload() { - List parts = ImmutableList.copyOf(split()).reverse(); - - String lastLink = null; - for (String part : parts) { - if (lastLink != null) { - part += "\n" + lastLink; - } - - lastLink = upload(part); - } - - return lastLink; - } - - /** - * Uploads the content to Hastebin using HTTPS and POST - * - * @param content The content - * @return The link to the content - */ - private String upload(String content) { + String content = this.toString(); HttpsURLConnection connection = null; try { URL url = new URL("https://hastebin.com/documents"); @@ -138,16 +111,13 @@ public class DumpLog { connection.setDoOutput(true); DataOutputStream wr = new DataOutputStream(connection.getOutputStream()); - wr.writeBytes(content); + wr.writeBytes(this.toString()); wr.flush(); wr.close(); - BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); - - String response = reader.readLine(); - + BufferedReader rd = new BufferedReader(new InputStreamReader(connection.getInputStream())); JSONParser parser = new JSONParser(); - JSONObject json = (JSONObject) parser.parse(response); + JSONObject json = (JSONObject) parser.parse(rd.readLine()); return "https://hastebin.com/" + json.get("key"); } catch (IOException | ParseException e) { @@ -160,15 +130,6 @@ public class DumpLog { } } - /** - * Splits the content of the DumpLog into parts - * - * @return The splitted content - */ - private Iterable split() { - return Splitter.fixedLength(390000).split(this.toString()); - } - @Override public String toString() { return String.join("\n", lines); diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpUtils.java index 905679e64..33bc82172 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpUtils.java @@ -247,7 +247,7 @@ public class DumpUtils { * @throws IOException when an error while reading occurred */ private static void addErrorLog(DumpLog log, Plan plan) throws IOException { - Path errorFile = FileSystems.getDefault().getPath(plan.getDataFolder().getAbsolutePath(), "Errors.txt"); + Path errorFile = FileSystems.getDefault().getPath(plan.getDataFolder().getAbsolutePath(), Log.getErrorsFilename()); if (Files.notExists(errorFile)) { return; diff --git a/Plan/src/main/resources/player.html b/Plan/src/main/resources/player.html index 8c84c7d05..0377f1beb 100644 --- a/Plan/src/main/resources/player.html +++ b/Plan/src/main/resources/player.html @@ -741,12 +741,12 @@ function openFunc(i) { return function() { - if (window.getComputedStyle(document.getElementById("navbutton")).getPropertyValue('display') === "inline") { + if (window.getComputedStyle(document.getElementById("navbutton")).getPropertyValue('display') == "inline") { closeNav(); } var max = navButtons.length; for (var j = 0; j < max; j++) { - if (j === i) { + if (j == i) { navButtons[j].classList.add('active'); continue; } @@ -770,7 +770,9 @@ var begin = new Date(%refreshlong%); var seconds = now.getTime() - begin.getTime(); - document.getElementById('divTime').innerHTML = formatTime(seconds); + var out = formatTime(seconds); + + document.getElementById('divTime').innerHTML = out; setTimeout('countUpTimer()', 1000); } diff --git a/Plan/src/test/java/utils/MockUtils.java b/Plan/src/test/java/utils/MockUtils.java index 70db22851..a53069cfb 100644 --- a/Plan/src/test/java/utils/MockUtils.java +++ b/Plan/src/test/java/utils/MockUtils.java @@ -16,6 +16,7 @@ import org.bukkit.entity.Player; import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; +import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.HashSet; @@ -153,7 +154,7 @@ public class MockUtils { return PowerMockito.mock(CommandSender.class); } - public static HttpServer mockHTTPServer() { + public static HttpServer mockHTTPServer() throws IOException { HttpServer httpServer = PowerMockito.mock(HttpServer.class); when(httpServer.getAddress()).thenReturn(new InetSocketAddress(80)); when(httpServer.getExecutor()).thenReturn(command -> System.out.println("HTTP Server command received")); diff --git a/PlanPluginBridge/pom.xml b/PlanPluginBridge/pom.xml index 0d8e4f8b0..343b10cda 100644 --- a/PlanPluginBridge/pom.xml +++ b/PlanPluginBridge/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.djrapitops PlanPluginBridge - 3.6.3 + 3.6.0 jar @@ -23,7 +23,7 @@ com.djrapitops Plan - 3.6.2 + 3.6.0 provided diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsAchievements.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsAchievements.java index 6c0483b90..bcf2e9282 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsAchievements.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsAchievements.java @@ -1,26 +1,23 @@ 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.data.additional.AnalysisType; import main.java.com.djrapitops.plan.data.additional.PluginData; import main.java.com.djrapitops.plan.utilities.MiscUtils; -import java.io.Serializable; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - /** * PluginData class for AdvancedAchievements-plugin. - *

+ * * Registered to the plugin by AdvancedAchievementsHook. - *

+ * * Gives the amount of achievements as value. * * @author Rsl1122 - * @see AdvancedAchievementsHook * @since 3.1.0 + * @see AdvancedAchievementsHook */ public class AdvancedAchievementsAchievements extends PluginData { @@ -60,14 +57,6 @@ public class AdvancedAchievementsAchievements extends PluginData { lastRefresh = MiscUtils.getTime(); } - @Override - public Map getValues(Collection uuid) { - if (MiscUtils.getTime() - lastRefresh > 60000) { - refreshTotalAchievements(); - } - return new HashMap<>(totalAchievements); - } - @Override public Serializable getValue(UUID uuid) { if (MiscUtils.getTime() - lastRefresh > 60000) { diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockIslandLevel.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockIslandLevel.java index 5c783bcf2..4b09d7e23 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockIslandLevel.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockIslandLevel.java @@ -1,11 +1,10 @@ package com.djrapitops.pluginbridge.plan.askyblock; import com.wasteofplastic.askyblock.ASkyBlockAPI; -import main.java.com.djrapitops.plan.data.additional.AnalysisType; -import main.java.com.djrapitops.plan.data.additional.PluginData; - import java.io.Serializable; import java.util.UUID; +import main.java.com.djrapitops.plan.data.additional.AnalysisType; +import main.java.com.djrapitops.plan.data.additional.PluginData; /** * PluginData class for ASkyBlock-plugin. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsWarps.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsWarps.java index b6c5fcae3..14d49c18e 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsWarps.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsWarps.java @@ -2,13 +2,16 @@ package com.djrapitops.pluginbridge.plan.essentials; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.Warps; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +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.Html; -import java.io.Serializable; -import java.util.*; - /** * PluginData class for Essentials-plugin. * @@ -53,7 +56,7 @@ public class EssentialsWarps extends PluginData { Collections.sort(warps); StringBuilder html = new StringBuilder(); if (warps.isEmpty()) { - html.append(Html.TABLELINE_4.parse("No Factions", "", "", "")); + html.append(Html.TABLELINE_4.parse(Html.FACTION_NO_FACTIONS.parse(), "", "", "")); } else { for (String warp : warps) { html.append(Html.TABLELINE_2.parse(warp, "/warp " + warp)); @@ -64,7 +67,11 @@ public class EssentialsWarps extends PluginData { @Override public Serializable getValue(UUID uuid) { - return -1; + Warps warps = essentials.getWarps(); + if (!warps.isEmpty()) { + return warps.getList().toString(); + } + return "No Warps."; } } diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsTable.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsTable.java index eee1aaa84..36e83fa0e 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsTable.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsTable.java @@ -3,6 +3,12 @@ package com.djrapitops.pluginbridge.plan.factions; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.MPlayer; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.UUID; +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; @@ -10,20 +16,14 @@ 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 java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import java.util.stream.Collectors; - /** * PluginData class for Factions-plugin. - *

+ * * Registered to the plugin by FactionsHook * * @author Rsl1122 - * @see FactionsHook * @since 3.1.0 + * @see FactionsHook */ public class FactionsTable extends PluginData { @@ -31,7 +31,7 @@ public class FactionsTable extends PluginData { /** * Class Constructor, sets the parameters of the PluginData object. - *

+ * * Uses Html to easily parse Html for the table. * * @see FactionsHook @@ -67,7 +67,7 @@ public class FactionsTable extends PluginData { StringBuilder html = new StringBuilder(); this.factions = getTopFactions(); if (factions.isEmpty()) { - html.append(Html.TABLELINE_4.parse("No Factions", "", "", "")); + html.append(Html.TABLELINE_4.parse(Html.FACTION_NO_FACTIONS.parse(), "", "", "")); } else { for (Faction f : factions) { String name; @@ -77,14 +77,14 @@ public class FactionsTable extends PluginData { if (f != null) { name = f.getName(); MPlayer fLeader = f.getLeader(); - leader = fLeader != null ? fLeader.getNameAndSomething("", "") : "No Leader"; + leader = fLeader != null ? fLeader.getNameAndSomething("", "") : Html.FACTION_NO_LEADER.parse(); power = FormatUtils.cutDecimals(f.getPower()); land = f.getLandCount() + ""; } else { - name = "Not Found"; - leader = "Not Found"; - power = "Not Found"; - land = "Not Found"; + name = Html.FACTION_NOT_FOUND.parse(); + leader = Html.FACTION_NOT_FOUND.parse(); + power = Html.FACTION_NOT_FOUND.parse(); + land = Html.FACTION_NOT_FOUND.parse(); } String leaderPage = Html.LINK.parse(HtmlUtils.getInspectUrl(leader), leader); html.append(Html.TABLELINE_4.parse(name, power, land, leaderPage)); diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyTable.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyTable.java index 75852b9a3..381f5898e 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyTable.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyTable.java @@ -4,17 +4,17 @@ import com.massivecraft.factions.entity.MPlayer; import com.palmergames.bukkit.towny.object.Resident; import com.palmergames.bukkit.towny.object.Town; import com.palmergames.bukkit.towny.object.TownyUniverse; +import java.io.Serializable; +import java.util.Collections; +import java.util.List; +import java.util.UUID; +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.Html; import main.java.com.djrapitops.plan.utilities.HtmlUtils; -import java.io.Serializable; -import java.util.List; -import java.util.UUID; -import java.util.stream.Collectors; - /** * PluginData class for Towny-plugin. * @@ -45,7 +45,7 @@ public class TownyTable extends PluginData { StringBuilder html = new StringBuilder(); List towns = getTopTowns(); if (towns.isEmpty()) { - html.append(Html.TABLELINE_4.parse("No Towns", "", "", "")); + html.append(Html.TABLELINE_4.parse(Html.TOWN_NO_TOWNS.parse(), "", "", "")); } else { for (Town t : towns) { if (t == null) { diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyTown.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyTown.java index a1c1f1428..68836765c 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyTown.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyTown.java @@ -3,13 +3,13 @@ package com.djrapitops.pluginbridge.plan.towny; import com.palmergames.bukkit.towny.exceptions.NotRegisteredException; import com.palmergames.bukkit.towny.object.Resident; import com.palmergames.bukkit.towny.object.TownyUniverse; +import java.io.Serializable; +import java.util.UUID; +import main.java.com.djrapitops.plan.Phrase; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.data.UserData; import main.java.com.djrapitops.plan.data.additional.PluginData; -import java.io.Serializable; -import java.util.UUID; - /** * PluginData class for Towny-plugin. * @@ -37,7 +37,7 @@ public class TownyTown extends PluginData { public String getHtmlReplaceValue(String modifierPrefix, UUID uuid) { UserData data = Plan.getPlanAPI().getInspectCachedUserDataMap().get(uuid); if (data == null) { - return parseContainer(modifierPrefix, "Not in a Town"); + return parseContainer(modifierPrefix, Phrase.NOT_IN_TOWN + ""); } String name = data.getName(); try { @@ -46,11 +46,11 @@ public class TownyTown extends PluginData { if (res.hasTown()) { town = res.getTown().getName(); } else { - town = "Not in a Town"; + town = Phrase.NOT_IN_TOWN + ""; } return parseContainer("", town); } catch (NotRegisteredException ex) { - return parseContainer(modifierPrefix, "Not in a Town"); + return parseContainer(modifierPrefix, Phrase.NOT_IN_TOWN + ""); } } @@ -58,7 +58,7 @@ public class TownyTown extends PluginData { public Serializable getValue(UUID uuid) { UserData data = Plan.getPlanAPI().getInspectCachedUserDataMap().get(uuid); if (data == null) { - return "Not in a Town"; + return Phrase.NOT_IN_TOWN + ""; } String name = data.getName(); try { @@ -67,7 +67,7 @@ public class TownyTown extends PluginData { if (res.hasTown()) { town = res.getTown().getName(); } else { - town = "Not in a Town"; + town = Phrase.NOT_IN_TOWN + ""; } return town; } catch (NotRegisteredException ex) {