Squash Java 8 patches into pom changes patches

10 files changed, 104 insertions, 138 deletions

diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch
index 36115e5228..c7df261d45 100644
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@@ -1,14 +1,14 @@
-From f0bf2e0a92d542e6d723b1d449766205fd4cb5b7 Mon Sep 17 00:00:00 2001
+From 7efc9bdbba963f83977a6f03cec9b1604112ece1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 6 Jan 2015 22:12:31 -0600
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index cb142f2..bc6964d 100644
+index cb142f2..a2dd938 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -4,18 +4,18 @@
+@@ -4,23 +4,25 @@
      <modelVersion>4.0.0</modelVersion>
  
      <parent>
@@ -34,6 +34,42 @@ index cb142f2..bc6964d 100644
      <description>An enhanced plugin API for Minecraft servers.</description>
  
      <properties>
+-        <maven.compiler.source>1.6</maven.compiler.source>
+-        <maven.compiler.target>1.6</maven.compiler.target>
++        <!--PaperSpigot - Bump to 1.8 - This will haunt me -->
++        <additionalparam>-Xdoclint:none</additionalparam>
++        <maven.compiler.source>1.8</maven.compiler.source>
++        <maven.compiler.target>1.8</maven.compiler.target>
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+     </properties>
+ 
+@@ -129,26 +131,6 @@
+                 </dependencies>
+             </plugin>
+             <plugin>
+-                <groupId>org.codehaus.mojo</groupId>
+-                <artifactId>animal-sniffer-maven-plugin</artifactId>
+-                <version>1.13</version>
+-                <executions>
+-                    <execution>
+-                        <phase>process-classes</phase>
+-                        <goals>
+-                            <goal>check</goal>
+-                        </goals>
+-                    </execution>
+-                </executions>
+-                <configuration>
+-                    <signature>
+-                        <groupId>org.codehaus.mojo.signature</groupId>
+-                        <artifactId>java16</artifactId>
+-                        <version>1.1</version>
+-                    </signature>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-shade-plugin</artifactId>
+                 <version>2.3</version>
 -- 
-2.4.5.windows.1
+2.7.0
 
diff --git a/Spigot-API-Patches/0014-Require-Java-8.patch b/Spigot-API-Patches/0014-Require-Java-8.patch
deleted file mode 100644
index 6911b37294..0000000000
--- a/Spigot-API-Patches/0014-Require-Java-8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9d2935793a954b2b8f1aa1ab7d61999906b34253 Mon Sep 17 00:00:00 2001
-From: Zach Brown <[email protected]>
-Date: Fri, 8 Jan 2016 23:50:25 -0600
-Subject: [PATCH] Require Java 8
-
-
-diff --git a/pom.xml b/pom.xml
-index bc6964d..a2dd938 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -19,8 +19,10 @@
-     <description>An enhanced plugin API for Minecraft servers.</description>
- 
-     <properties>
--        <maven.compiler.source>1.6</maven.compiler.source>
--        <maven.compiler.target>1.6</maven.compiler.target>
-+        <!--PaperSpigot - Bump to 1.8 - This will haunt me -->
-+        <additionalparam>-Xdoclint:none</additionalparam>
-+        <maven.compiler.source>1.8</maven.compiler.source>
-+        <maven.compiler.target>1.8</maven.compiler.target>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     </properties>
- 
-@@ -129,26 +131,6 @@
-                 </dependencies>
-             </plugin>
-             <plugin>
--                <groupId>org.codehaus.mojo</groupId>
--                <artifactId>animal-sniffer-maven-plugin</artifactId>
--                <version>1.13</version>
--                <executions>
--                    <execution>
--                        <phase>process-classes</phase>
--                        <goals>
--                            <goal>check</goal>
--                        </goals>
--                    </execution>
--                </executions>
--                <configuration>
--                    <signature>
--                        <groupId>org.codehaus.mojo.signature</groupId>
--                        <artifactId>java16</artifactId>
--                        <version>1.1</version>
--                    </signature>
--                </configuration>
--            </plugin>
--            <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-shade-plugin</artifactId>
-                 <version>2.3</version>
--- 
-2.7.0
-
diff --git a/Spigot-API-Patches/0015-Timings-v2.patch b/Spigot-API-Patches/0014-Timings-v2.patch
index 81b9b95960..a7f1e5635c 100644
--- a/Spigot-API-Patches/0015-Timings-v2.patch
+++ b/Spigot-API-Patches/0014-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 4e504cf9841d2e312e7c33c87298b276ee8c7921 Mon Sep 17 00:00:00 2001
+From 445de7fb20febc456d819d052524c63393920b10 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 8 Jan 2016 23:12:28 -0600
 Subject: [PATCH] Timings v2
diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index 715a59b0cd..14252c1e7e 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From 7e24ff0f3820b76c0efc2b02737e1f193f4ba74a Mon Sep 17 00:00:00 2001
+From 109279a4b9b86578f35995e8b7b5024fd422a56d Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 19 Mar 2015 19:41:15 -0500
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 91627ff..9678b08 100644
+index 91627ff..cdbb1ca 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -25,7 +25,15 @@ index 91627ff..9678b08 100644
  
      <properties>
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -21,8 +21,8 @@
+@@ -16,13 +16,14 @@
+         <minecraft_version>1_8_R3</minecraft_version>
+         <buildtag.prefix>git-Bukkit-</buildtag.prefix>
+         <buildtag.suffix></buildtag.suffix>
+-        <maven.compiler.source>1.6</maven.compiler.source>
+-        <maven.compiler.target>1.6</maven.compiler.target>
++        <!--PaperSpigot - Bump to 1.8 - This will haunt me -->
++        <maven.compiler.source>1.8</maven.compiler.source>
++        <maven.compiler.target>1.8</maven.compiler.target>
      </properties>
  
      <parent>
@@ -36,7 +44,7 @@ index 91627ff..9678b08 100644
          <version>dev-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
-@@ -34,8 +34,8 @@
+@@ -34,8 +35,8 @@
              <version>3.0.3</version>
          </dependency>
          <dependency>
@@ -47,7 +55,7 @@ index 91627ff..9678b08 100644
              <version>${project.version}</version>
              <type>jar</type>
              <scope>compile</scope>
-@@ -108,11 +108,11 @@
+@@ -108,11 +109,11 @@
                  <version>0.2</version>
                  <executions>
                      <execution>
@@ -62,7 +70,7 @@ index 91627ff..9678b08 100644
                          </configuration>
                          <phase>initialize</phase>
                          <goals>
-@@ -142,7 +142,7 @@
+@@ -142,7 +143,7 @@
                          <manifestEntries>
                              <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
                              <Implementation-Title>CraftBukkit</Implementation-Title>
@@ -71,6 +79,46 @@ index 91627ff..9678b08 100644
                              <Implementation-Vendor>Bukkit Team</Implementation-Vendor>
                              <Specification-Title>Bukkit</Specification-Title>
                              <Specification-Version>${api.version}</Specification-Version>
+@@ -172,26 +173,6 @@
+                 </configuration>
+             </plugin>
+             <plugin>
+-                <groupId>org.codehaus.mojo</groupId>
+-                <artifactId>animal-sniffer-maven-plugin</artifactId>
+-                <version>1.13</version>
+-                <executions>
+-                    <execution>
+-                        <phase>process-classes</phase>
+-                        <goals>
+-                            <goal>check</goal>
+-                        </goals>
+-                    </execution>
+-                </executions>
+-                <configuration>
+-                    <signature>
+-                        <groupId>org.codehaus.mojo.signature</groupId>
+-                        <artifactId>java16</artifactId>
+-                        <version>1.1</version>
+-                    </signature>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-shade-plugin</artifactId>
+                 <version>2.3</version>
+diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
+index c110e0c..5540dde 100644
+--- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
++++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
+@@ -11,7 +11,7 @@ public class PathfinderGoalNearestAttackableTarget<T extends EntityLiving> exten
+     protected final Class<T> a;
+     private final int g;
+     protected final PathfinderGoalNearestAttackableTarget.DistanceComparator b;
+-    protected Predicate<? super T> c;
++    protected Predicate c;
+     protected EntityLiving d;
+ 
+     public PathfinderGoalNearestAttackableTarget(EntityCreature entitycreature, Class<T> oclass, boolean flag) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 9304637..3a4b142 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -85,5 +133,5 @@ index 9304637..3a4b142 100644
  
          if (stream != null) {
 -- 
-2.4.5.windows.1
+2.7.0
 
diff --git a/Spigot-Server-Patches/0042-Fix-jar-being-shaded-multiple-times.patch b/Spigot-Server-Patches/0042-Fix-jar-being-shaded-multiple-times.patch
index 878525921c..c40990ffc9 100644
--- a/Spigot-Server-Patches/0042-Fix-jar-being-shaded-multiple-times.patch
+++ b/Spigot-Server-Patches/0042-Fix-jar-being-shaded-multiple-times.patch
@@ -1,14 +1,14 @@
-From 6e35bbc4b6dcf3e52655ceb9562f5cdfe4b140a9 Mon Sep 17 00:00:00 2001
+From cdb68182791c146d28e7a9f18651f907ef7343d3 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Thu, 30 Apr 2015 22:42:34 -0400
 Subject: [PATCH] Fix jar being shaded multiple times
 
 
 diff --git a/pom.xml b/pom.xml
-index 9678b08..4ec5bf6 100644
+index cdbb1ca..b4ead1d 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -138,6 +138,7 @@
+@@ -139,6 +139,7 @@
                  <artifactId>maven-jar-plugin</artifactId>
                  <version>2.5</version>
                  <configuration>
@@ -17,5 +17,5 @@ index 9678b08..4ec5bf6 100644
                          <manifestEntries>
                              <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0080-Require-Java-8.patch b/Spigot-Server-Patches/0080-Require-Java-8.patch
deleted file mode 100644
index 8df4724096..0000000000
--- a/Spigot-Server-Patches/0080-Require-Java-8.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f7b5a4f597e231c459d6de50e1ef14a1f3e664a6 Mon Sep 17 00:00:00 2001
-From: Zach Brown <[email protected]>
-Date: Fri, 8 Jan 2016 23:50:25 -0600
-Subject: [PATCH] Require Java 8
-
-
-diff --git a/pom.xml b/pom.xml
-index 4ec5bf6..b4ead1d 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -16,8 +16,9 @@
-         <minecraft_version>1_8_R3</minecraft_version>
-         <buildtag.prefix>git-Bukkit-</buildtag.prefix>
-         <buildtag.suffix></buildtag.suffix>
--        <maven.compiler.source>1.6</maven.compiler.source>
--        <maven.compiler.target>1.6</maven.compiler.target>
-+        <!--PaperSpigot - Bump to 1.8 - This will haunt me -->
-+        <maven.compiler.source>1.8</maven.compiler.source>
-+        <maven.compiler.target>1.8</maven.compiler.target>
-     </properties>
- 
-     <parent>
-@@ -173,26 +174,6 @@
-                 </configuration>
-             </plugin>
-             <plugin>
--                <groupId>org.codehaus.mojo</groupId>
--                <artifactId>animal-sniffer-maven-plugin</artifactId>
--                <version>1.13</version>
--                <executions>
--                    <execution>
--                        <phase>process-classes</phase>
--                        <goals>
--                            <goal>check</goal>
--                        </goals>
--                    </execution>
--                </executions>
--                <configuration>
--                    <signature>
--                        <groupId>org.codehaus.mojo.signature</groupId>
--                        <artifactId>java16</artifactId>
--                        <version>1.1</version>
--                    </signature>
--                </configuration>
--            </plugin>
--            <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-shade-plugin</artifactId>
-                 <version>2.3</version>
-diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
-index c110e0c..5540dde 100644
---- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
-+++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
-@@ -11,7 +11,7 @@ public class PathfinderGoalNearestAttackableTarget<T extends EntityLiving> exten
-     protected final Class<T> a;
-     private final int g;
-     protected final PathfinderGoalNearestAttackableTarget.DistanceComparator b;
--    protected Predicate<? super T> c;
-+    protected Predicate c;
-     protected EntityLiving d;
- 
-     public PathfinderGoalNearestAttackableTarget(EntityCreature entitycreature, Class<T> oclass, boolean flag) {
--- 
-2.7.0
-
diff --git a/Spigot-Server-Patches/0081-Timings-v2.patch b/Spigot-Server-Patches/0080-Timings-v2.patch
index cb77814a45..811c02cef7 100644
--- a/Spigot-Server-Patches/0081-Timings-v2.patch
+++ b/Spigot-Server-Patches/0080-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 37e00ce3ff2b725005fcd01d23094333efffaa74 Mon Sep 17 00:00:00 2001
+From a74e60b0c8d1e751e7e8e29600c6068ece507919 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 8 Jan 2016 23:36:39 -0600
 Subject: [PATCH] Timings v2
diff --git a/Spigot-Server-Patches/0082-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0081-Disable-chest-cat-detection.patch
index 505db5b576..5fe0433650 100644
--- a/Spigot-Server-Patches/0082-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0081-Disable-chest-cat-detection.patch
@@ -1,4 +1,4 @@
-From 4e920f946fea67010570e36e28268358e174ab80 Mon Sep 17 00:00:00 2001
+From 4ce89904d826282b5d3e775406360fe289c0e0fe Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 10 Jan 2016 20:40:33 -0600
 Subject: [PATCH] Disable chest cat detection
diff --git a/Spigot-Server-Patches/0083-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0082-Ensure-commands-are-not-ran-async.patch
index 50e5d8ebb9..06623de03f 100644
--- a/Spigot-Server-Patches/0083-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0082-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From 3d5bf73817dbd5e89595cc27a80a9cfe0b5860eb Mon Sep 17 00:00:00 2001
+From e234b01e0a17f6930f80f9bbf9c481facb0bbaf3 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 8 Oct 2014 19:51:28 -0400
 Subject: [PATCH] Ensure commands are not ran async
diff --git a/Spigot-Server-Patches/0084-All-chunks-are-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0083-All-chunks-are-spawn-chunks-toggle.patch
index 267620beee..a18ce94634 100644
--- a/Spigot-Server-Patches/0084-All-chunks-are-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0083-All-chunks-are-spawn-chunks-toggle.patch
@@ -1,4 +1,4 @@
-From b9b6b3d87c7c290c138956e5a051e3c50404e38d Mon Sep 17 00:00:00 2001
+From 22bdf678b9ba4cb81e795b74511ae04a1fc9f307 Mon Sep 17 00:00:00 2001
 From: vemacs <[email protected]>
 Date: Fri, 29 Jan 2016 02:28:17 -0600
 Subject: [PATCH] All chunks are spawn chunks toggle