Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-28 03:57:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix merge issues

Browse Source
This commit is contained in:
Rsl1122 2017-08-12 16:41:02 +03:00
commit 2a32de97d2
17 changed files with 89 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java
View File

@ -24,7 +24,7 @@ public class ManageCommand extends TreeCommand<Plan> {
* @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");
}

8
Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDumpCommand.java
View File

@ -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();
}

6
Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheClearQueue.java vendored
View File

@ -27,7 +27,7 @@ public class DataCacheClearQueue extends Queue<UUID> {
* @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();
}
@ -63,7 +63,7 @@ class ClearConsumer extends Consumer<UUID> implements Runnable {
private DataCacheHandler handler;
ClearConsumer(BlockingQueue<UUID> q, DataCacheHandler handler) {
ClearConsumer(BlockingQueue q, DataCacheHandler handler) {
super(q, "ClearQueueConsumer");
this.handler = handler;
}
@ -95,7 +95,7 @@ class ClearConsumer extends Consumer<UUID> implements Runnable {
class ClearSetup extends Setup<UUID> {
ClearSetup(BlockingQueue<UUID> q, DataCacheHandler handler) {
public ClearSetup(BlockingQueue<UUID> q, DataCacheHandler handler) {
super(new ClearConsumer(q, handler));
}
}

12
Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheGetQueue.java vendored
View File

@ -27,7 +27,7 @@ public class DataCacheGetQueue extends Queue<Map<UUID, List<DBCallableProcessor>
* @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();
}
@ -49,12 +49,8 @@ public class DataCacheGetQueue extends Queue<Map<UUID, List<DBCallableProcessor>
}
}
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));
}
}
@ -62,7 +58,7 @@ class GetConsumer extends Consumer<Map<UUID, List<DBCallableProcessor>>> {
private Database db;
GetConsumer(BlockingQueue<Map<UUID, List<DBCallableProcessor>>> q, Database db) {
GetConsumer(BlockingQueue q, Database db) {
super(q, "GetQueueConsumer");
this.db = db;
}

25
Plan/src/main/java/com/djrapitops/plan/locale/Locale.java
View File

@ -39,7 +39,7 @@ public class Locale implements Closeable {
private final Map<Msg, Message> 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;
}
}
}

4
Plan/src/main/java/com/djrapitops/plan/ui/text/TextUI.java
View File

@ -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"),

2
Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
View File

@ -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);

49
Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java
View File

@ -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<CharSequence> lines = new ArrayList<>();
private List<CharSequence> 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<String> 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<String> split() {
return Splitter.fixedLength(390000).split(this.toString());
}
@Override
public String toString() {
return String.join("\n", lines);

8
Plan/src/main/resources/player.html
View File

@ -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);
}
</script>

3
Plan/src/test/java/utils/MockUtils.java
View File

@ -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"));

4
PlanPluginBridge/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.djrapitops</groupId>
<artifactId>PlanPluginBridge</artifactId>
<version>3.6.3</version>
<version>3.6.0</version>
<packaging>jar</packaging>
<repositories>
<repository>
@ -23,7 +23,7 @@
<dependency>
<groupId>com.djrapitops</groupId>
<artifactId>Plan</artifactId>
<version>3.6.2</version>
<version>3.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>

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

@ -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.
* <p>
*
* Registered to the plugin by AdvancedAchievementsHook.
* <p>
*
* 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<UUID, Serializable> getValues(Collection<UUID> uuid) {
if (MiscUtils.getTime() - lastRefresh > 60000) {
refreshTotalAchievements();
}
return new HashMap<>(totalAchievements);
}
@Override
public Serializable getValue(UUID uuid) {
if (MiscUtils.getTime() - lastRefresh > 60000) {

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

@ -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.

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

@ -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.";
}
}

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

@ -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.
* <p>
*
* 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.
* <p>
*
* 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));

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

@ -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<Town> 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) {

16
PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyTown.java
View File

@ -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) {