Merge pull request #201 from Fuzzlemann/master

PR for 3.6.0 (Fuzzlemann) (2)

.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_1.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.djrapitops:abstract-plugin-framework:2.0.0">
+  <library name="Maven: com.djrapitops:abstract-plugin-framework:2.0.1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/abstract-plugin-framework/2.0.0/abstract-plugin-framework-2.0.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/abstract-plugin-framework/2.0.1/abstract-plugin-framework-2.0.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/abstract-plugin-framework/2.0.0/abstract-plugin-framework-2.0.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/abstract-plugin-framework/2.0.1/abstract-plugin-framework-2.0.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/abstract-plugin-framework/2.0.0/abstract-plugin-framework-2.0.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/abstract-plugin-framework/2.0.1/abstract-plugin-framework-2.0.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

Plan/dependency-reduced-pom.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.djrapitops</groupId>
   <artifactId>Plan</artifactId>
-    <version>3.5.4</version>
+  <version>3.5.5</version>
   <build>
     <sourceDirectory>${basedir}/src</sourceDirectory>
     <defaultGoal>clean package install</defaultGoal>
@@ -101,15 +100,19 @@
   </build>
   <repositories>
     <repository>
-            <id>spigot-repo</id>
+      <id>plan-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+      <url>http://repo.fuzzlemann.de/artifactory/libs-release/</url>
+    </repository>
+    <repository>
+      <id>plan-snapshot-repo</id>
+      <url>http://repo.fuzzlemann.de/artifactory/libs-snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
     <dependency>
-            <groupId>org.spigotmc</groupId>
+      <groupId>com.destroystokyo.paper</groupId>
-            <artifactId>spigot</artifactId>
+      <artifactId>paper</artifactId>
-            <version>1.12-R0.1-SNAPSHOT</version>
+      <version>1.12-R0.1-20170725.202533-1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Plan/src/main/java/com/djrapitops/plan/ServerVariableHolder.java

@@ -25,7 +25,8 @@ public class ServerVariableHolder {
         ip = server.getIp();
 
         String serverName = server.getName();
-        usingPaper = serverName.equals("Paper") || serverName.equals("TacoSpigot");
+        usingPaper = serverName.equals("Paper")
+                || serverName.equals("TacoSpigot"); //Fork of Paper
     }
 
     /**

Plan/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java

@@ -15,9 +15,7 @@ import main.java.com.djrapitops.plan.ui.text.TextUI;
 import main.java.com.djrapitops.plan.utilities.Check;
 import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.command.CommandException;
 
 /**
  * This subcommand is used to run the analysis and access the /server link.
@@ -150,12 +148,4 @@ public class AnalyzeCommand extends SubCommand {
         }
         sender.sendMessage(Phrase.CMD_FOOTER.toString());
     }
-
-    @Deprecated // TODO Will be rewritten to the RslPlugin abstractions in the future.
-    private void sendLink(ISender sender, String url) throws CommandException {
-        plugin.getServer().dispatchCommand(
-                Bukkit.getConsoleSender(),
-                "tellraw " + sender.getName() + " [\"\",{\"text\":\"" + Phrase.CMD_CLICK_ME + "\",\"underlined\":true,"
-                        + "\"clickEvent\":{\"action\":\"open_url\",\"value\":\"" + url + "\"}}]");
-    }
 }

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageCleanCommand.java

@@ -39,6 +39,7 @@ public class ManageCleanCommand extends SubCommand {
         if (!Check.isTrue(args.length != 0, Phrase.COMMAND_REQUIRES_ARGUMENTS_ONE.toString(), sender)) {
             return true;
         }
+
         String dbName = args[0].toLowerCase();
         boolean isCorrectDB = "sqlite".equals(dbName) || "mysql".equals(dbName);
 

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java

@@ -78,6 +78,7 @@ public class ManageImportCommand extends SubCommand {
         if (!Check.isTrue(importPlugins.keySet().contains(importFromPlugin), Phrase.MANAGE_ERROR_INCORRECT_PLUGIN + importFromPlugin, sender)) {
             return true;
         }
+
         if (!Check.isTrue(ImportUtils.isPluginEnabled(importFromPlugin), Phrase.MANAGE_ERROR_PLUGIN_NOT_ENABLED + importFromPlugin, sender)) {
             return true;
         }

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageMoveCommand.java

@@ -58,9 +58,11 @@ public class ManageMoveCommand extends SubCommand {
         if (!Check.isTrue(isCorrectDB, Phrase.MANAGE_ERROR_INCORRECT_DB + toDB, sender)) {
             return true;
         }
+
         if (!Check.isTrue(!Verify.equalsIgnoreCase(fromDB, toDB), Phrase.MANAGE_ERROR_SAME_DB.toString(), sender)) {
             return true;
         }
+
         if (!Check.isTrue(Verify.contains("-a", args), Phrase.COMMAND_ADD_CONFIRMATION_ARGUMENT.parse(Phrase.WARN_REMOVE.parse(args[1])), sender)) {
             return true;
         }
@@ -92,7 +94,9 @@ public class ManageMoveCommand extends SubCommand {
                     if (Check.isTrue(Verify.isEmpty(uuids), Phrase.MANAGE_ERROR_NO_PLAYERS + " (" + fromDatabase.getName() + ")", sender)) {
                         return;
                     }
+
                     sender.sendMessage(Phrase.MANAGE_PROCESS_START.parse());
+
                     if (ManageUtils.clearAndCopy(toDatabase, fromDatabase, uuids)) {
                         sender.sendMessage(Phrase.MANAGE_MOVE_SUCCESS + "");
                         boolean movedToCurrentDatabase = Verify.equalsIgnoreCase(toDatabase.getConfigName(), plugin.getDB().getConfigName());

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java

@@ -74,13 +74,16 @@ public class ManageRemoveCommand extends SubCommand {
                 try {
                     UUID uuid = UUIDUtility.getUUIDOf(playerName);
                     String message = Phrase.USERNAME_NOT_VALID.toString();
+
                     if (!Check.isTrue(Verify.notNull(uuid), message, sender)) {
                         return;
                     }
+
                     message = Phrase.USERNAME_NOT_KNOWN.toString();
                     if (!Check.isTrue(plugin.getDB().wasSeenBefore(uuid), message, sender)) {
                         return;
                     }
+
                     message = Phrase.COMMAND_ADD_CONFIRMATION_ARGUMENT.parse(Phrase.WARN_REMOVE.parse(plugin.getDB().getConfigName()));
                     if (!Check.isTrue(Verify.contains("-a", args), message, sender)) {
                         return;

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java

@@ -44,12 +44,14 @@ public class ManageRestoreCommand extends SubCommand {
         if (!Check.isTrue(args.length >= 2, Phrase.COMMAND_REQUIRES_ARGUMENTS.parse(Phrase.USE_RESTORE.toString()), sender)) {
             return true;
         }
+
         String db = args[1].toLowerCase();
         boolean isCorrectDB = "sqlite".equals(db) || "mysql".equals(db);
 
         if (!Check.isTrue(isCorrectDB, Phrase.MANAGE_ERROR_INCORRECT_DB + db, sender)) {
             return true;
         }
+
         if (!Check.isTrue(Verify.contains("-a", args), Phrase.COMMAND_ADD_CONFIRMATION_ARGUMENT.parse(Phrase.WARN_REWRITE.parse(args[1])), sender)) {
             return true;
         }
@@ -81,20 +83,25 @@ public class ManageRestoreCommand extends SubCommand {
                     if (containsDBFileExtension) {
                         backupDBName = backupDBName.replace(".db", "");
                     }
+
                     SQLiteDB backupDB = new SQLiteDB(plugin, backupDBName);
                     if (!backupDB.init()) {
                         sender.sendMessage(Phrase.MANAGE_DATABASE_FAILURE.toString());
                         return;
                     }
+
                     sender.sendMessage(Phrase.MANAGE_PROCESS_START.parse());
+
                     final Collection<UUID> uuids = ManageUtils.getUUIDS(backupDB);
                     if (!Check.isTrue(!Verify.isEmpty(uuids), Phrase.MANAGE_ERROR_NO_PLAYERS + " (" + backupDBName + ")", sender)) {
                         return;
                     }
+
                     if (ManageUtils.clearAndCopy(database, backupDB, uuids)) {
                         if (database.getConfigName().equals(plugin.getDB().getConfigName())) {
                             plugin.getHandler().getCommandUseFromDb();
                         }
+
                         sender.sendMessage(Phrase.MANAGE_COPY_SUCCESS.toString());
                     } else {
                         sender.sendMessage(Phrase.MANAGE_PROCESS_FAIL.toString());

Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebListUsersCommand.java

@@ -37,7 +37,6 @@ public class WebListUsersCommand extends SubCommand {
                 try {
                     ColorScheme cs = plugin.getColorScheme();
                     String mCol = cs.getMainColor();
-                    String sCol = cs.getSecondaryColor();
                     List<WebUser> users = plugin.getDB().getSecurityTable().getUsers();
                     users.sort(new WebUserComparator());
                     sender.sendMessage(Phrase.CMD_FOOTER.parse() + mCol + " WebUsers (" + users.size() + ")");

Plan/src/main/java/com/djrapitops/plan/data/analysis/GamemodePart.java

@@ -53,10 +53,10 @@ public class GamemodePart extends RawData<GamemodePart> {
         long[] times = new long[]{
                 survivalTime, creativeTime, adventureTime, spectatorTime
         };
-        String col0 = Settings.HCOLOR_GMP_0 + "";
+        String col0 = Settings.HCOLOR_GMP_0.toString();
-        String col1 = Settings.HCOLOR_GMP_1 + "";
+        String col1 = Settings.HCOLOR_GMP_1.toString();
-        String col2 = Settings.HCOLOR_GMP_2 + "";
+        String col2 = Settings.HCOLOR_GMP_2.toString();
-        String col3 = Settings.HCOLOR_GMP_3 + "";
+        String col3 = Settings.HCOLOR_GMP_3.toString();
 
         addValue("%gm0col%", col0);
         addValue("%gm1col%", col1);

Plan/src/main/java/com/djrapitops/plan/data/cache/GeolocationCacheHandler.java

@@ -87,7 +87,5 @@ public class GeolocationCacheHandler {
         } finally {
             Benchmark.stop("getUncachedCountry");
         }
-
     }
-
 }

Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanDeathEventListener.java

@@ -6,11 +6,12 @@ import main.java.com.djrapitops.plan.data.handling.info.DeathInfo;
 import main.java.com.djrapitops.plan.data.handling.info.KillInfo;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;
 import org.bukkit.Material;
-import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.*;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 
 /**
@@ -41,9 +42,21 @@ public class PlanDeathEventListener implements Listener {
     public void onDeath(EntityDeathEvent event) {
         long time = MiscUtils.getTime();
         LivingEntity dead = event.getEntity();
-        Player killer = dead.getKiller();
+
-        boolean killerIsPlayer = killer != null;
+        if (dead instanceof Player) {
-        if (killerIsPlayer) {
+            handler.addToPool(new DeathInfo(dead.getUniqueId()));
+        }
+
+        EntityDamageEvent entityDamageEvent = dead.getLastDamageCause();
+        if (!(entityDamageEvent instanceof EntityDamageByEntityEvent)) {
+            return;
+        }
+
+        EntityDamageByEntityEvent entityDamageByEntityEvent = (EntityDamageByEntityEvent) entityDamageEvent;
+        Entity killerEntity = entityDamageByEntityEvent.getDamager();
+
+        if (killerEntity instanceof Player) {
+            Player killer = (Player) killerEntity;
             Material itemInHand;
             try {
                 itemInHand = killer.getInventory().getItemInMainHand().getType();
@@ -54,10 +67,26 @@ public class PlanDeathEventListener implements Listener {
                     itemInHand = Material.AIR;
                 }
             }
+
             handler.addToPool(new KillInfo(killer.getUniqueId(), time, dead, itemInHand.name()));
+            return;
         }
-        if (dead instanceof Player) {
+
-            handler.addToPool(new DeathInfo(dead.getUniqueId()));
+        if (killerEntity instanceof Wolf) {
+            Wolf wolf = (Wolf) killerEntity;
+
+            if (!wolf.isTamed()) {
+                return;
+            }
+
+            AnimalTamer owner = wolf.getOwner();
+
+            if (!(owner instanceof Player)) {
+                return;
+            }
+
+            handler.addToPool(new KillInfo(owner.getUniqueId(), time, dead, "Wolf"));
         }
     }
 }
+

Plan/src/main/java/com/djrapitops/plan/data/listeners/TPSCountTimer.java

@@ -75,8 +75,8 @@ public class TPSCountTimer extends AbsRunnable {
 
         Runtime runtime = Runtime.getRuntime();
 
-        long totalMemory = runtime.totalMemory() / 1024L;
+        long totalMemory = runtime.totalMemory();
-        long usedMemory = totalMemory - runtime.freeMemory() / 1024L;
+        long usedMemory = (totalMemory - runtime.freeMemory()) / (1024L * 1024L);
 
         int playersOnline = plugin.getServer().getOnlinePlayers().size();
         int loadedChunks = getLoadedChunks();

Plan/src/main/resources/analysis.html

@@ -717,8 +717,8 @@
                     </div>
                     <div class="box column">
                         <canvas id="cpu24h" width="1000" height="600" style="width: 95%;"></canvas>
-                        <p>If CPU Graph displays '-1' CPU usage is not available for this platform.</p>
                     </div>
+                    <p>If CPU Graph displays '-1' CPU usage is not available for this platform.</p>
                 </div>
             </div>
             <div class="tab">
@@ -1651,7 +1651,9 @@
         }];
         var layout = {
             title: '',
-                        autosize: true,
+            autosize: false,
+            height: 1000,
+            width: 1500,
             geo:{
                 showframe: false,
                 showcoastlines: false,