b-stats update, code clean-up

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>veth.vetheon</groupId>
     <artifactId>SurvivalPlus</artifactId>
-    <version>4.0.1-RELEASE</version>
+    <version>4.0.2-RELEASE</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -49,6 +49,13 @@
       <version>5.0.0</version>
       <scope>compile</scope>
       </dependency>
+       <!-- bStats -->
+    <dependency>
+      <groupId>org.bstats</groupId>
+      <artifactId>bstats-bukkit</artifactId>
+      <version>2.2.1</version>
+      <scope>compile</scope>
+    </dependency>
     </dependencies>
 
     <profiles>
@@ -65,6 +72,27 @@
                             <outputDirectory>/Users/ShaneBee/Desktop/Server/1-16-SP-TEST/plugins</outputDirectory>
                         </configuration>
                     </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-shade-plugin</artifactId>
+                        <version>3.1.0</version>
+                        <configuration>
+                           <relocations>
+                               <relocation>
+                               <pattern>org.bstats</pattern>
+                               <shadedPattern>veth.vetheon.metrics</shadedPattern>
+                               </relocation>
+                           </relocations>
+                       </configuration>
+                   <executions>
+                       <execution>
+                       <phase>package</phase>
+                   <goals>
+                       <goal>shade</goal>
+                   </goals>
+                       </execution>
+                  </executions>
+                  </plugin>
                 </plugins>
             </build>
         </profile>

src/main/java/veth/vetheon/survival/Survival.java

@@ -65,7 +65,7 @@ public void onEnable() {
 		long time = System.currentTimeMillis();
 
 		// VERSION CHECK
-		if (!Utils.isRunningMinecraft(1, 16)) {
+		if (!Utils.isRunningMinecraft(1, 17)) {
 			String ver = Bukkit.getServer().getBukkitVersion().split("-")[0];
             Utils.log("&c-----------------------------------------------------------");
             Utils.log("&cYour version is not supported: &b" + ver);
@@ -80,7 +80,7 @@ public void onEnable() {
         if (!Utils.isRunningSpigot()) {
             Utils.log("&c-----------------------------------------------------------");
             Utils.log("&7Your server software is not supported: &c" + Bukkit.getName());
-            Utils.log("&7This plugin will only work on &aSpigot &7or &aPaper.");
+            Utils.log("&7This plugin will only work on &aSpigot &7, &aPaper &7ir, &5Purpur.");
             Utils.log("&c-----------------------------------------------------------");
             loaded = false;
             Bukkit.getPluginManager().disablePlugin(this);
@@ -164,6 +164,7 @@ public void onEnable() {
         }
 
 		// LOAD METRICS
+		int pluginId = 12789;
 		Metrics metrics = new Metrics(this);
 		Utils.log("&7Metrics " + (metrics.isEnabled() ? "&aenabled" : "&cdisabled"));
 

src/main/java/veth/vetheon/survival/metrics/Metrics.java

@@ -35,7 +35,7 @@ public class Metrics {
             // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
             final String defaultPackage = new String(
                     new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's', '.', 'b', 'u', 'k', 'k', 'i', 't'});
-            final String examplePackage = new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
+            final String examplePackage = new String(new byte[]{'v', 'e', 't', 'h', '.', 'v', 'e', 't', 'h', 'e', 'o', 'n', '.', 's', 'u', 'v', 'i', 'v', 'a', 'l', '.', 'm', 'e', 't', 'r', 'i', 'c', 's'});
             // We want to make sure nobody just copy & pastes the example and use the wrong package names
             if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) {
                 throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
@@ -193,8 +193,8 @@ public JsonObject getPluginData() {
         String pluginName = plugin.getDescription().getName();
         String pluginVersion = plugin.getDescription().getVersion();
 
-        data.addProperty("pluginName", pluginName); // Append the name of the plugin
-        data.addProperty("pluginVersion", pluginVersion); // Append the version of the plugin
+        data.addProperty("Survival Plus", pluginName); // Append the name of the plugin
+        data.addProperty("4.0.1-RELEASE", pluginVersion); // Append the version of the plugin
         JsonArray customCharts = new JsonArray();
         for (CustomChart customChart : charts) {
             // Add the data of the custom charts

target/classes/plugin.yml

@@ -1,7 +1,7 @@
 name: SurvivalPlus
 main: veth.vetheon.survival.Survival
 authors: [FattyMieo, ShaneBee, VetheonGames]
-version: '4.0.1-RELEASE'
+version: '4.0.2-RELEASE'
 api-version: '1.17'
 softdepend:
    - PlaceholderAPI

target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Sun Sep 12 17:29:40 MDT 2021
+#Tue Sep 14 13:58:28 MDT 2021
 groupId=veth.vetheon
 artifactId=SurvivalPlus
-version=4.0.1-RELEASE
+version=4.0.2-RELEASE