From f3b8afd56a94f9bfd3da7c046a24e7d4923ffbd8 Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Sat, 23 Sep 2017 13:17:20 -0500
Subject: [PATCH] Move eclipse compiler patch to POM changes patch Also update
 to Paperclip 1.1-SNAPSHOT

---
 Spigot-API-Patches/0001-POM-changes.patch     | 19 ++++++++---
 ...se-compiler-we-require-a-JDK-anyways.patch | 33 -------------------
 scripts/paperclip.sh                          |  2 +-
 work/Paperclip                                |  2 +-
 4 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 Spigot-API-Patches/0067-Remove-eclipse-compiler-we-require-a-JDK-anyways.patch

diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch
index 15f78f7939..75f18f67d7 100644
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@@ -1,11 +1,11 @@
-From a1f6c3a5e3fff4f051aea6a29d0e0582e1451d9c Mon Sep 17 00:00:00 2001
+From 9d2397180f0d5ce5b4cce3f1f80c90c860358824 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 00:16:08 +0100
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 98f2d67a..9934e9af 100644
+index 98f2d67a..49fe56cc 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,39 +3,39 @@
@@ -97,7 +97,7 @@ index 98f2d67a..9934e9af 100644
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -100,6 +118,7 @@
+@@ -100,15 +118,12 @@
      </dependencies>
  
      <build>
@@ -105,7 +105,16 @@ index 98f2d67a..9934e9af 100644
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-@@ -118,26 +137,6 @@
+                 <artifactId>maven-compiler-plugin</artifactId>
+                 <version>3.7.0</version>
+-                <configuration>
+-                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
+-                    <compilerId>eclipse</compilerId>
+-                </configuration>
+                 <dependencies>
+                     <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
+                     <dependency>
+@@ -118,26 +133,6 @@
                      </dependency>
                  </dependencies>
              </plugin>
@@ -132,7 +141,7 @@ index 98f2d67a..9934e9af 100644
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-shade-plugin</artifactId>
-@@ -151,6 +150,7 @@
+@@ -151,6 +146,7 @@
                      </execution>
                  </executions>
                  <configuration>
diff --git a/Spigot-API-Patches/0067-Remove-eclipse-compiler-we-require-a-JDK-anyways.patch b/Spigot-API-Patches/0067-Remove-eclipse-compiler-we-require-a-JDK-anyways.patch
deleted file mode 100644
index 510d6482a3..0000000000
--- a/Spigot-API-Patches/0067-Remove-eclipse-compiler-we-require-a-JDK-anyways.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d8ba17cf36bb9c2084405a57609c3e434b78b012 Mon Sep 17 00:00:00 2001
-From: DemonWav <demonwav@gmail.com>
-Date: Fri, 22 Sep 2017 20:11:42 -0500
-Subject: [PATCH] Remove eclipse compiler, we require a JDK anyways Fixes
- building with JDK 9
-
-
-diff --git a/pom.xml b/pom.xml
-index a775f4ed..3ce500f8 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -150,18 +150,6 @@
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-compiler-plugin</artifactId>
-                 <version>3.7.0</version>
--                <configuration>
--                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
--                    <compilerId>eclipse</compilerId>
--                </configuration>
--                <dependencies>
--                    <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
--                    <dependency>
--                        <groupId>org.codehaus.plexus</groupId>
--                        <artifactId>plexus-compiler-eclipse</artifactId>
--                        <version>2.8.2-spigotmc</version>
--                    </dependency>
--                </dependencies>
-             </plugin>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
--- 
-2.14.1
-
diff --git a/scripts/paperclip.sh b/scripts/paperclip.sh
index 92e0b96180..579b3db680 100755
--- a/scripts/paperclip.sh
+++ b/scripts/paperclip.sh
@@ -12,7 +12,7 @@ vanillajar="../Minecraft/$mcver/$mcver.jar"
     cd "$workdir/Paperclip"
     mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$paperjar" "-Dvanillajar=$vanillajar"
 )
-cp "$workdir/Paperclip/target/paperclip-${mcver}.jar" "$basedir/paperclip.jar"
+cp "$workdir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/paperclip.jar"
 
 echo ""
 echo ""
diff --git a/work/Paperclip b/work/Paperclip
index 6dcb3241ca..4abd39dd10 160000
--- a/work/Paperclip
+++ b/work/Paperclip
@@ -1 +1 @@
-Subproject commit 6dcb3241ca8e69fb8209e54fea507425c508915e
+Subproject commit 4abd39dd10f1664d919bba774cce840ae8f8d8dd