Merge remote-tracking branch 'origin/master'

.gitignore

@@ -6,3 +6,4 @@
 /.idea/
 /EsTools.iml
 /out
+dependency-reduced-pom.xml

CONTRIBUTING.md

@@ -1,2 +1,2 @@
 If you want to contribute to this project please feel free to fill out a pull request. I don't have a strict template or anything for the request 
-but just try be very clear about what you changed and why it is good for the project.
+but just try to be very clear about what you changed and why it is good for the project.

pom.xml

@@ -31,11 +31,19 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <version>3.2.4</version>
+        <configuration>
+            <relocations>
+                <relocation>
+                    <pattern>org.bstats</pattern>
+                    <shadedPattern>net.serble.estools</shadedPattern>
+                </relocation>
+            </relocations>
+        </configuration>
         <executions>
           <execution>
             <phase>package</phase>
             <goals>
-              <goal>shade</goal>
+                <goal>shade</goal>
             </goals>
           </execution>
         </executions>
@@ -77,5 +85,11 @@
           <version>1.7</version>
           <scope>provided</scope>
       </dependency>
+      <dependency>
+          <groupId>org.bstats</groupId>
+          <artifactId>bstats-bukkit</artifactId>
+          <version>3.0.2</version>
+          <scope>compile</scope>
+      </dependency>
   </dependencies>
 </project>

src/main/java/net/serble/estools/Main.java

@@ -10,6 +10,8 @@
 import net.serble.estools.Commands.Teleport.*;
 import net.serble.estools.Commands.Warps.*;
 import net.serble.estools.Signs.SignMain;
+import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -22,6 +24,8 @@ public class Main extends JavaPlugin {
 	public static int majorVersion;
 	public static int minorVersion;
 	public static boolean tabCompleteEnabled = true;
+
+	private static final int bStatsId = 21760;
 
 	@Override
 	public void onEnable() {
@@ -39,6 +43,15 @@ public void onEnable() {
 			saveDefaultConfig();
 		}
 
+		// Metrics
+		if (getConfig().getBoolean("metrics", true)) {
+			Metrics metrics = new Metrics(this, bStatsId);
+			metrics.addCustomChart(new SimplePie("vault_enabled", () -> String.valueOf(Vault.economy != null)));
+			Bukkit.getLogger().info("Started bStat metrics");
+		} else {
+			Bukkit.getLogger().info("Metrics are disabled");
+		}
+
 		if (majorVersion <= 2) {
 			Bukkit.getLogger().info("Tab completion is not supported for versions 1.2 and below.");
 			tabCompleteEnabled = false;

src/main/resources/config.yml

@@ -1 +1,5 @@
+# Stops players taking fall damage when they teleport
 safetp: true
+
+# Toggle bStats metrics
+metrics: true