From 32cbad310f89604fb52c628742f687c8bd28af9b Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 24 Jan 2019 21:36:24 +0000
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
d38ac1be Update compiler
2844ce20 Add CookTimeTotal API to Furnace

CraftBukkit Changes:
13f71402 Update compiler
61c762f4 Add CookTimeTotal API to Furnace
---
 ...nt-furnace-cook-speed-multiplier-API.patch |  4 ++--
 Spigot-API-Patches/POM-changes.patch          |  4 ++--
 ...nt-furnace-cook-speed-multiplier-API.patch |  2 +-
 Spigot-Server-Patches/POM-Changes.patch       | 20 ++++++-------------
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 6 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/Spigot-API-Patches/Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/Implement-furnace-cook-speed-multiplier-API.patch
index 548cb962d5..55697ea650 100644
--- a/Spigot-API-Patches/Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-API-Patches/Implement-furnace-cook-speed-multiplier-API.patch
@@ -6,12 +6,12 @@ Subject: [PATCH] Implement furnace cook speed multiplier API
 Signed-off-by: Tassu <git@tassu.me>
 
 diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java
-index b41e8ffd..e797b060 100644
+index fb82104ba..3df8dc6d4 100644
 --- a/src/main/java/org/bukkit/block/Furnace.java
 +++ b/src/main/java/org/bukkit/block/Furnace.java
 @@ -0,0 +0,0 @@ public interface Furnace extends Container, Nameable {
       */
-     public void setCookTime(short cookTime);
+     public void setCookTimeTotal(int cookTimeTotal);
  
 +    // Paper start
 +    /**
diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch
index eb5e9c7a14..f36df6376c 100644
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index ebcc781c..229fe559 100644
+index 00d8019d9..148c322bc 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -87,7 +87,7 @@ index ebcc781c..229fe559 100644
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
-                 <version>3.7.0</version>
+                 <version>3.8.0</version>
 -                <configuration>
 -                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
 -                    <compilerId>eclipse</compilerId>
diff --git a/Spigot-Server-Patches/Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/Implement-furnace-cook-speed-multiplier-API.patch
index 0e6bdf57c9..9a7f55f506 100644
--- a/Spigot-Server-Patches/Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/Implement-furnace-cook-speed-multiplier-API.patch
@@ -57,7 +57,7 @@ index 5b6ccfa9f5..bfbd35bbe5 100644
                          this.cookTimeTotal = this.s();
                          this.burn(irecipe);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-index 6ca6a6bf24..cb456f7269 100644
+index c2eea8ce03..429c780ec7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 @@ -0,0 +0,0 @@ public class CraftFurnace extends CraftContainer<TileEntityFurnace> implements F
diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index ce31d7157b..6ee2d5dd0f 100644
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 4304b622a..d1913a434 100644
+index b8c0d03fc3..87202a520f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -141,24 +141,16 @@ index 4304b622a..d1913a434 100644
 @@ -0,0 +0,0 @@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
-                 <version>3.7.0</version>
+                 <version>3.8.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.1-spigotmc</version>
--                    </dependency>
--                </dependencies>
-             </plugin>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
+                 <dependencies>
+                     <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
+                     <dependency>
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 93046379d..674096cab 100644
+index 93046379d0..674096cab1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -0,0 +0,0 @@ public final class Versioning {
diff --git a/work/Bukkit b/work/Bukkit
index c64197df52..d38ac1bef4 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit c64197df528c2e6aef9a2404bf24b08a330fefc9
+Subproject commit d38ac1bef469e746c383b1ce8622456e50156640
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 1a64d4ae2b..13f71402e8 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 1a64d4ae2b77fe76d4e6d72ce19749fc427804ee
+Subproject commit 13f71402e8a26a8beb6f7d4c74cd0985c7a8dbda