From 10a2df5a7d3cb9824908b6628a67efe1d3e2d640 Mon Sep 17 00:00:00 2001
From: Myles <myles@myles.us>
Date: Sun, 13 Nov 2016 13:15:26 +0000
Subject: [PATCH] Use plugin description from project pom.xml and fix sponge.
 This disables the sponge plugin annotation processor and uses our own
 mcmod.info

---
 bukkit/src/main/resources/plugin.yml              |  2 +-
 bungee/src/main/resources/bungee.yml              |  1 +
 sponge-legacy/pom.xml                             | 15 ---------------
 sponge/pom.xml                                    | 11 +++++++++++
 .../java/us/myles/ViaVersion/SpongePlugin.java    |  3 ++-
 sponge/src/main/resources/mcmod.info              | 12 ++++++++++++
 6 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 sponge/src/main/resources/mcmod.info

diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
index d2cf3947c..116d8babe 100644
--- a/bukkit/src/main/resources/plugin.yml
+++ b/bukkit/src/main/resources/plugin.yml
@@ -2,7 +2,7 @@ name: ViaVersion
 main: us.myles.ViaVersion.ViaVersionPlugin
 authors: [_MylesC, Matsv]
 version: ${project.version}
-description: Allow newer Minecraft versions to connect to an older server version.
+description: ${project.description}
 load: postworld
 loadbefore: [ProtocolLib, ProxyPipe, SpigotLib, SkinRestorer]
 softdepend: [ProtocolSupport, PacketListenerApi]
diff --git a/bungee/src/main/resources/bungee.yml b/bungee/src/main/resources/bungee.yml
index 37b6dc108..b06cfea34 100644
--- a/bungee/src/main/resources/bungee.yml
+++ b/bungee/src/main/resources/bungee.yml
@@ -1,4 +1,5 @@
 name: ViaVersion
 main: us.myles.ViaVersion.BungeePlugin
+description: ${project.description}
 author: _MylesC, Matsv
 version: ${project.version}
\ No newline at end of file
diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml
index e0063d252..2871d0354 100644
--- a/sponge-legacy/pom.xml
+++ b/sponge-legacy/pom.xml
@@ -35,21 +35,6 @@
                 </includes>
             </resource>
         </resources>
-        <plugins>
-            <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>
-        </plugins>
     </build>
 
     <dependencies>
diff --git a/sponge/pom.xml b/sponge/pom.xml
index f4a3ec61d..317b0b3f5 100644
--- a/sponge/pom.xml
+++ b/sponge/pom.xml
@@ -35,6 +35,17 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.0</version>
+                <configuration>
+                    <!-- We only run lombok and not sponge in-built mcmod.info generator due to issues with multiversion -->
+                    <annotationProcessors>
+                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
+                    </annotationProcessors>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>templating-maven-plugin</artifactId>
diff --git a/sponge/src/main/java/us/myles/ViaVersion/SpongePlugin.java b/sponge/src/main/java/us/myles/ViaVersion/SpongePlugin.java
index ccae9006b..801279233 100644
--- a/sponge/src/main/java/us/myles/ViaVersion/SpongePlugin.java
+++ b/sponge/src/main/java/us/myles/ViaVersion/SpongePlugin.java
@@ -37,7 +37,8 @@ import java.util.logging.Logger;
         name = "ViaVersion",
         version = VersionInfo.VERSION,
         authors = {"_MylesC", "Matsv"},
-        description = "Allow newer Minecraft versions to connect to an older server version."
+        description = "Allow newer Minecraft versions to connect to an older server version.",
+        dependencies = {}
 )
 public class SpongePlugin implements ViaPlatform {
     @Inject
diff --git a/sponge/src/main/resources/mcmod.info b/sponge/src/main/resources/mcmod.info
new file mode 100644
index 000000000..2e8251e2f
--- /dev/null
+++ b/sponge/src/main/resources/mcmod.info
@@ -0,0 +1,12 @@
+[
+    {
+        "modid": "viaversion",
+        "name": "ViaVersion",
+        "version": "${project.version}",
+        "description": "${project.description}",
+        "authorList": [
+            "_MylesC",
+            "Matsv"
+        ]
+    }
+]