move extra plugins patch up & more work

patches/api/Add-command-line-option-to-load-extra-plugin-jars-no.patch

@@ -11,7 +11,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- 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.getCurrentTick();
+         return server;
      }
  
 +    /**
@@ -29,15 +29,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
      /**
-      * Checks if the server is in the process of being shutdown.
+      * Attempts to set the {@link Server} singleton.
-      *
+      * <p>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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, net.kyori.adventure.audi
+@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
-      */
+  */
-     int getCurrentTick();
+ public interface Server extends PluginMessageRecipient {
  
 +    /**
 +     * Returns the de facto plugins directory, generally used for storing plugin jars to be loaded,
@@ -52,8 +52,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    File getPluginsFolder();
 +
      /**
-      * Checks if the server is in the process of being shutdown.
+      * Used for all administrative messages, such as an operator using a
-      *
+      * command.
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java

patches/api/Adventure.patch

@@ -767,6 +767,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +public interface Server extends PluginMessageRecipient, net.kyori.adventure.audience.ForwardingAudience { // Paper
  
      /**
+      * Returns the de facto plugins directory, generally used for storing plugin jars to be loaded,
+@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
       * Used for all administrative messages, such as an operator using a
       * command.
       * <p>

patches/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch

@@ -70,9 +70,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ public class Main {
-                         .ofType(String.class)
+                         .ofType(File.class)
-                         .defaultsTo("Unknown Server")
+                         .defaultsTo(new File("paper.yml"))
-                         .describedAs("Name");
+                         .describedAs("Yml file");
 +
 +                acceptsAll(asList("add-plugin", "add-extra-plugin-jar"), "Specify paths to extra plugin jars to be loaded in addition to those in the plugins folder. This argument can be specified multiple times, once for each extra plugin jar path.")
 +                        .withRequiredArg()

patches/server/Add-server-name-parameter.patch

@@ -9,8 +9,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ public class Main {
-                         .defaultsTo(new File("paper.yml"))
+                         .defaultsTo(new File[] {})
-                         .describedAs("Yml file");
+                         .describedAs("Jar file");
                  // Paper end
 +
 +                // Paper start