Merge pull request #131 from itHotL/v2.0

V2.0
itHotL · Feb 28, 2023 · 11a78de · 11a78de
2 parents 220e98e + 0653228
commit 11a78de
Show file tree

Hide file tree

Showing 87 changed files with 3,358 additions and 3,023 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>io.github.ithotl</groupId>
   <artifactId>PlayerStats</artifactId>
   <name>PlayerStats</name>
-  <version>1.8</version>
+  <version>2.0</version>
   <description>Statistics Plugin</description>
   <url>https://www.spigotmc.org/resources/playerstats.102347/</url>
   <developers>
@@ -49,7 +49,7 @@
         <configuration>
           <transformers>
             <transformer>
-              <mainClass>com.artemis.the.gr8.playerstats.Main</mainClass>
+              <mainClass>com.artemis.the.gr8.playerstats.core.Main</mainClass>
             </transformer>
           </transformers>
           <artifactSet>
@@ -60,15 +60,15 @@
           <relocations>
             <relocation>
               <pattern>net.kyori</pattern>
-              <shadedPattern>com.artemis.the.gr8.lib.kyori</shadedPattern>
+              <shadedPattern>com.artemis.the.gr8.playerstats.lib.kyori</shadedPattern>
             </relocation>
             <relocation>
               <pattern>com.tchristofferson</pattern>
-              <shadedPattern>com.artemis.the.gr8.util.tchristofferson</shadedPattern>
+              <shadedPattern>com.artemis.the.gr8.playerstats.lib.tchristofferson</shadedPattern>
             </relocation>
             <relocation>
               <pattern>org.bstats</pattern>
-              <shadedPattern>com.artemis.the.gr8.util.bstats</shadedPattern>
+              <shadedPattern>com.artemis.the.gr8.playerstats.lib.bstats</shadedPattern>
             </relocation>
           </relocations>
           <filters>
@@ -107,7 +107,7 @@
         <executions>
           <execution>
             <id>attach-sources</id>
-            <phase>deploy</phase>
+            <phase>verify</phase>
             <goals>
               <goal>jar-no-fork</goal>
             </goals>
@@ -120,7 +120,7 @@
         <executions>
           <execution>
             <id>sign-artifacts</id>
-            <phase>deploy</phase>
+            <phase>verify</phase>
             <goals>
               <goal>sign</goal>
             </goals>
@@ -133,7 +133,7 @@
         <executions>
           <execution>
             <id>attach-javadocs</id>
-            <phase>deploy</phase>
+            <phase>verify</phase>
             <goals>
               <goal>jar</goal>
             </goals>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.ithotl</groupId>
     <artifactId>PlayerStats</artifactId>
-    <version>1.8</version>
+    <version>2.0</version>
 
     <name>PlayerStats</name>
     <description>Statistics Plugin</description>
@@ -141,7 +141,7 @@
                     <transformers>
                         <transformer
                                 implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <mainClass>com.artemis.the.gr8.playerstats.Main</mainClass>
+                            <mainClass>com.artemis.the.gr8.playerstats.core.Main</mainClass>
                         </transformer>
                     </transformers>
                     <artifactSet>
@@ -152,15 +152,15 @@
                     <relocations>
                         <relocation>
                             <pattern>net.kyori</pattern>
-                            <shadedPattern>com.artemis.the.gr8.lib.kyori</shadedPattern>
+                            <shadedPattern>com.artemis.the.gr8.playerstats.lib.kyori</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>com.tchristofferson</pattern>
-                            <shadedPattern>com.artemis.the.gr8.util.tchristofferson</shadedPattern>
+                            <shadedPattern>com.artemis.the.gr8.playerstats.lib.tchristofferson</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>org.bstats</pattern>
-                            <shadedPattern>com.artemis.the.gr8.util.bstats</shadedPattern>
+                            <shadedPattern>com.artemis.the.gr8.playerstats.lib.bstats</shadedPattern>
                         </relocation>
                     </relocations>
                     <filters>
@@ -200,7 +200,7 @@
                 <executions>
                     <execution>
                         <id>attach-sources</id>
-                        <phase>deploy</phase>
+                        <phase>verify</phase>  <!-- change to verify when deploying -->
                         <goals>
                             <goal>jar-no-fork</goal>
                         </goals>
@@ -214,7 +214,7 @@
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
-                        <phase>deploy</phase>
+                        <phase>verify</phase>  <!-- change to verify when deploying -->
                         <goals>
                             <goal>sign</goal>
                         </goals>
@@ -228,7 +228,7 @@
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
-                        <phase>deploy</phase>
+                        <phase>verify</phase>  <!-- change to verify when deploying -->
                         <goals>
                             <goal>jar</goal>
                         </goals>

diff --git a/src/main/java/com/artemis/the/gr8/playerstats/Main.java b/src/main/java/com/artemis/the/gr8/playerstats/Main.java