Update POM for Java 16

plugins/civmodcore-paper/README.md

@@ -6,7 +6,7 @@ CivModCore is derived from Humbug.
 
 ## Versions
 
-* 1.8.2 - Paper 1.16.5
+* 1.8.4 - Paper 1.16.5
 
 * [1.8.0](https://github.com/CivClassic/CivModCore/tree/08ad95297eb041cf99bd0eb0aaffc70ca87af4f2) - Paper 1.16.1
 
@@ -57,6 +57,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>

plugins/civmodcore-paper/pom.xml

@@ -6,12 +6,12 @@
   <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.3</version>
+  <version>1.8.4</version>
   <name>CivModCore</name>
   <url>https://github.com/Civclassic/CivModCore/</url>
 
@@ -29,7 +29,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.4</version>
+        <version>3.3.0-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -40,10 +40,17 @@
               <artifactSet>
                 <excludes>
                   <!-- Psuedo Provided -->
-                  <exclude>it.unimi.dsi:fastutil</exclude>
-                  <exclude>co.aikar:cleaner</exclude>
+                  <exclude>com.destroystokyo.paper:paper</exclude>
                 </excludes>
               </artifactSet>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/**/*</exclude>
+                  </excludes>
+                </filter>
+              </filters>
             </configuration>
           </execution>
         </executions>
@@ -56,7 +63,6 @@
       <groupId>com.destroystokyo.paper</groupId>
       <artifactId>paper</artifactId>
       <version>1.16.5-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
       <exclusions>
         <exclusion>
           <groupId>io.papermc</groupId>
@@ -85,6 +91,7 @@
       <version>3.7.2</version>
     </dependency>
     <dependency>
+      <!-- https://jitpack.io/#IPVP-MC/canvas -->
       <groupId>com.github.IPVP-MC</groupId>
       <artifactId>canvas</artifactId>
       <version>91ec97f076</version>
@@ -109,17 +116,6 @@
       <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/pom.xml#L68 -->
-    </dependency>
-    <dependency>
-      <groupId>co.aikar</groupId>
-      <artifactId>cleaner</artifactId>
-      <version>1.0-SNAPSHOT</version> <!-- https://github.com/PaperMC/Paper/blob/master/Spigot-Server-Patches/0001-POM-Changes.patch#L108 -->
-    </dependency>
     <!-- For Testing -->
     <dependency>
       <groupId>junit</groupId>

plugins/civmodcore-paper/src/main/java/org/bukkit/pseudo/PseudoServer.java

@@ -2,6 +2,7 @@ package org.bukkit.pseudo;
 
 import com.destroystokyo.paper.entity.ai.MobGoals;
 import com.destroystokyo.paper.profile.PlayerProfile;
+import io.papermc.paper.datapack.DatapackManager;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.Collection;
@@ -896,6 +897,11 @@ public class PseudoServer implements Server {
 		throw new NotImplementedException();
 	}
 
+	@Override
+	public @NotNull DatapackManager getDatapackManager() {
+		return null;
+	}
+
 	@Override
 	public void sendPluginMessage(@NotNull final Plugin plugin, @NotNull final String s, @NotNull final byte[] bytes) {
 		throw new NotImplementedException();

plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/ClonedInventory.java

@@ -165,6 +165,11 @@ public final class ClonedInventory implements Inventory {
 		this.inventory.clear();
 	}
 
+	@Override
+	public int close() {
+		return this.inventory.close();
+	}
+
 	@Override
 	public List<HumanEntity> getViewers() {
 		return this.inventory.getViewers();