Initial work on 1.14 pre-5

Spigot-API-Patches/Timings-v2.patch

@@ -3139,9 +3139,27 @@ index 00000000..5989ee21
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a3c4b148..7e416f08 100644
+index 1c1f650d..d2e47a35 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -0,0 +0,0 @@ public final class Bukkit {
+         return server.getIp();
+     }
+ 
++    // Paper start - bring back server name
++    /**
++     * Get the name of this server
++     * @return the name of the server
++     */
++    @NotNull
++    public static String getServerName() {
++        return server.getServerName();
++    }
++    // Paper
++
+     /**
+      * Get world type (level-type setting) for default world.
+      *
 @@ -0,0 +0,0 @@ public final class Bukkit {
       */
      public static void reload() {
@@ -3151,9 +3169,25 @@ index a3c4b148..7e416f08 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2767f4e5..5b5a3bc5 100644
+index 2a55a954..77d993ad 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
+@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
+     @NotNull
+     public String getIp();
+ 
++    // Paper start - bring back server name
++    /**
++     * Get the name of this server
++     * @return the name of the server
++     */
++    @NotNull
++    public String getServerName();
++    // Paper
++
+     /**
+      * Get world type (level-type setting) for default world.
+      *
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -3209,7 +3243,7 @@ index 00000000..f9a00aec
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index dafc4ed9..c2c19ed4 100644
+index 4bfc2146..03bdc162 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -0,0 +0,0 @@ public abstract class Command {
@@ -3239,7 +3273,7 @@ index dafc4ed9..c2c19ed4 100644
              return true;
          }
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index 2035880e..b8c97a4b 100644
+index d6c8938b..a6ad94ef 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 @@ -0,0 +0,0 @@ public class FormattedCommandAlias extends Command {
@@ -3382,9 +3416,17 @@ index 00000000..ca1893e9
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 1586f648..6a786b8c 100644
+index b3d5a302..9d0ae63f 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
+@@ -0,0 +0,0 @@ import org.bukkit.command.defaults.BukkitCommand;
+ import org.bukkit.command.defaults.HelpCommand;
+ import org.bukkit.command.defaults.PluginsCommand;
+ import org.bukkit.command.defaults.ReloadCommand;
+-import org.bukkit.command.defaults.TimingsCommand;
+ import org.bukkit.command.defaults.VersionCommand;
+ import org.bukkit.entity.Player;
+ import org.bukkit.util.StringUtil;
 @@ -0,0 +0,0 @@ public class SimpleCommandMap implements CommandMap {
          register("bukkit", new VersionCommand("version"));
          register("bukkit", new ReloadCommand("reload"));
@@ -3431,18 +3473,18 @@ index 1586f648..6a786b8c 100644
  
 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 deleted file mode 100644
-index 1e6e7033..00000000
+index 6023e4f6..00000000
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ /dev/null
 @@ -0,0 +0,0 @@
 -package org.bukkit.command.defaults;
 -
+-import com.google.common.collect.ImmutableList;
 -import java.io.File;
 -import java.io.IOException;
 -import java.io.PrintStream;
 -import java.util.ArrayList;
 -import java.util.List;
--
 -import org.apache.commons.lang.Validate;
 -import org.bukkit.Bukkit;
 -import org.bukkit.ChatColor;
@@ -3453,21 +3495,19 @@ index 1e6e7033..00000000
 -import org.bukkit.plugin.RegisteredListener;
 -import org.bukkit.plugin.TimedRegisteredListener;
 -import org.bukkit.util.StringUtil;
--
--import com.google.common.collect.ImmutableList;
 -import org.jetbrains.annotations.NotNull;
 -
 -// Spigot start
+-// CHECKSTYLE:OFF
 -import java.io.ByteArrayOutputStream;
 -import java.io.OutputStream;
 -import java.net.HttpURLConnection;
 -import java.net.URL;
--import java.net.URLEncoder;
 -import java.util.logging.Level;
--
 -import org.bukkit.command.RemoteConsoleCommandSender;
 -import org.bukkit.plugin.SimplePluginManager;
 -import org.spigotmc.CustomTimingsHandler;
+-// CHECKSTYLE:ON
 -// Spigot end
 -
 -public class TimingsCommand extends BukkitCommand {
@@ -3691,7 +3731,7 @@ index 1e6e7033..00000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 97504e6f..777994f7 100644
+index 36a42a80..942cb386 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3707,7 +3747,7 @@ index 97504e6f..777994f7 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 76137a80..fe572551 100644
+index 17ddbe61..47327376 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
@@ -3764,7 +3804,7 @@ index 76137a80..fe572551 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 56f93336..5b29076f 100644
+index 92983c1e..2618906f 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -3806,7 +3846,7 @@ index 56f93336..5b29076f 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 541d8ee6..c39fcac5 100644
+index 0ffc1dfd..b859796b 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;