1.17 updates & Sharding version

README.md

@@ -6,9 +6,11 @@ CivModCore is derived from Humbug.
 
 ## Versions
 
-* 1.8.2 - Spigot 1.16.4
+* 1.9.0 - Paper 1.17.1
 
-* [1.8.0](https://github.com/CivClassic/CivModCore/tree/08ad95297eb041cf99bd0eb0aaffc70ca87af4f2) - Spigot 1.16.1
+* 1.8.4 - Paper 1.16.5
+
+* [1.8.0](https://github.com/CivClassic/CivModCore/tree/08ad95297eb041cf99bd0eb0aaffc70ca87af4f2) - Paper 1.16.1
 
 * [1.7.9](https://github.com/CivClassic/CivModCore/tree/306b4f7268a3c5d3bd551fe66992f2a4335e86f7) - Spigot 1.14.4
 
@@ -57,6 +59,6 @@ Include the following in your dependency list in your plugin's POM file:
     <dependency>
         <groupId>vg.civcraft.mc.civmodcore</groupId>
         <artifactId>CivModCore</artifactId>
-        <version>1.8.2</version>
+        <version>1.8.4</version>
         <scope>provided</scope>
     </dependency>

pom.xml

@@ -6,91 +6,135 @@
   <parent>
     <groupId>com.github.civclassic</groupId>
     <artifactId>civclassic-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
   </parent>
 
-  <groupId>vg.civcraft.mc.civmodcore</groupId>
   <artifactId>CivModCore</artifactId>
-  <version>1.8.2</version>
+  <version>1.9.0</version>
   <name>CivModCore</name>
   <url>https://github.com/Civclassic/CivModCore/</url>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <!-- Needed to compile, because of the annotation processor -->
-          <compilerArgument>-proc:none</compilerArgument>
-        </configuration>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.3.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <excludes>
+                  <!-- Psuedo Provided -->
+                  <exclude>it.unimi.dsi:fastutil</exclude>
+                  <exclude>co.aikar:cleaner</exclude>
+                </excludes>
+              </artifactSet>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/**/*</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
 
   <dependencies>
     <dependency>
-      <groupId>com.destroystokyo.paper</groupId>
+      <groupId>io.papermc.paper</groupId>
       <artifactId>paper</artifactId>
-      <version>1.16.4-R0.1-SNAPSHOT</version>
+      <version>1.17.1-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>io.papermc</groupId>
+          <artifactId>minecraft-server</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.zaxxer</groupId>
       <artifactId>HikariCP</artifactId>
       <version>3.4.2</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.11</version>
+      <groupId>net.kyori</groupId>
+      <artifactId>adventure-text-minimessage</artifactId>
+      <version>4.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-      <version>4.4</version>
+      <groupId>co.aikar</groupId>
+      <artifactId>acf-bukkit</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <!--
-      Remove this in time since it's included in Paper but
-      this may be used elsewhere.
-      -->
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.26</version>
+      <groupId>co.aikar</groupId>
+      <artifactId>taskchain-bukkit</artifactId>
+      <version>3.7.2</version>
     </dependency>
     <dependency>
-      <groupId>co.aikar</groupId>
-      <artifactId>acf-bukkit</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
+      <!-- https://jitpack.io/#IPVP-MC/canvas -->
+      <groupId>com.github.IPVP-MC</groupId>
+      <artifactId>canvas</artifactId>
+      <version>91ec97f076</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
     </dependency>
     <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <version>20.1.0</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <version>4.4</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
       <version>3.0.2</version>
     </dependency>
+    <!-- Shaded into Paper -->
+    <dependency>
+      <groupId>it.unimi.dsi</groupId>
+      <artifactId>fastutil</artifactId>
+      <version>8.2.2</version> <!-- https://github.com/PaperMC/Paper/blob/master/Paper-MojangAPI/build.gradle.kts#L22 -->
+    </dependency>
+    <dependency>
+      <groupId>co.aikar</groupId>
+      <artifactId>cleaner</artifactId>
+      <version>1.0-SNAPSHOT</version> <!-- https://github.com/PaperMC/Paper/blob/master/patches/server/0003-Build-system-changes.patch#L34 -->
+    </dependency>
     <!-- For Testing -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
   <repositories>
+    <repository>
+      <id>civ-github-repo</id>
+      <url>https://raw.githubusercontent.com/CivClassic/artifacts/master/</url>
+    </repository>
     <repository>
       <id>aikar</id>
       <url>https://repo.aikar.co/content/groups/aikar/</url>
     </repository>
     <repository>
-      <id>civ-github-repo</id>
-      <url>https://raw.githubusercontent.com/CivClassic/artifacts/master/</url>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
     </repository>
   </repositories>