Compilation Changes

OskarsMC-Plugins · May 4, 2021 · 501e8d0 · 501e8d0
1 parent 286535c
commit 501e8d0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.oskarsmc</groupId>
     <artifactId>message</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <packaging>jar</packaging>
 
     <name>Message</name>
@@ -75,6 +75,7 @@
     </profiles>
 
     <build>
+        <finalName>message-${project.version}</finalName>
         <resources>
             <resource>
                 <directory>${project.basedir}/src/main/resources</directory>
@@ -91,19 +92,6 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>templating-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <executions>
-                    <execution>
-                        <id>filter-src</id>
-                        <goals>
-                            <goal>filter-sources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
@@ -142,7 +130,11 @@
                     <relocations>
                         <relocation>
                             <pattern>org.bstats</pattern>
-                            <shadedPattern>com.oskarsmc</shadedPattern>
+                            <shadedPattern>com.oskarsmc.message.relocated.bstats</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>net.kyori</pattern>
+                            <shadedPattern>com.oskarsmc.message.relocated.kyori</shadedPattern>
                         </relocation>
                     </relocations>
                 </configuration>
@@ -194,6 +186,7 @@
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
             <version>4.1.0-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.bstats</groupId>

diff --git a/src/main/java/com/oskarsmc/message/Message.java b/src/main/java/com/oskarsmc/message/Message.java
@@ -20,14 +20,6 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicInteger;
 
-@Plugin(
-        id = "message",
-        name = "Message",
-        version = "0.1.0",
-        description = "Cross Server Messaging Platform for Velocity",
-        url = "https://software.oskarsmc.com/",
-        authors = {"OskarsMC", "OskarZyg"}
-)
 public class Message {
 
     @Inject

diff --git a/src/main/resources/velocity-plugin.json b/src/main/resources/velocity-plugin.json
@@ -0,0 +1,10 @@
+{
+  "id":"message",
+  "name":"Message",
+  "version":"${project.version}",
+  "description":"Cross Server Messaging Platform for Velocity",
+  "url":"https://software.oskarsmc.com/",
+  "authors":["OskarsMC","OskarZyg"],
+  "dependencies":[],
+  "main":"com.oskarsmc.message.Message"
+}