Re-add missing vanilla safeMode arg

patches/server/0008-CB-fixes.patch

@@ -17,7 +17,7 @@ Subject: [PATCH] CB fixes
 Co-authored-by: Spottedleaf <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 10968eb004ee01c4fb72aeb93f058747b02998b9..0668f61ff7e52d1ea32af9f1fd1879d7280bb7cd 100644
+index 64522a15ecb73087222b33ffb13e29ac048b62a7..82c9886222d49bd03b642c0d9c07d82d1d27896b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -294,7 +294,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -102,6 +102,18 @@ index d1baf686c0a59584a4866490f4f4fe65b3ac6eed..3d2c168d29873c4418bc297740e7032d
      }
 
      @Override
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 3523f8851472890c97e628e22df883b91ba603fe..b1a1caef59f3ea0fa68ca47040ad6fff9820cc5a 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -122,6 +122,7 @@ public class Main {
+
+                 this.acceptsAll(Main.asList("forceUpgrade"), "Whether to force a world upgrade");
+                 this.acceptsAll(Main.asList("eraseCache"), "Whether to force cache erase during world upgrade");
++                this.accepts("safeMode", "Loads level with vanilla datapack only"); // Paper
+                 this.acceptsAll(Main.asList("nogui"), "Disables the graphical console");
+
+                 this.acceptsAll(Main.asList("nojline"), "Disables jline and emulates the vanilla console");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
 index 5ac25dab93fd4c9e9533c80d1ca3d93446d7a365..245ad120a36b6defca7e6889faae1ca5fc33d0c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java

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

@@ -47,10 +47,10 @@ index 819e2238f62b0af747b7e44a72de69a1b79609bf..8dfed6347e5922bdd0083604fc7228ea
          if (type == PluginLoadOrder.STARTUP) {
              this.helpMap.clear();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 9fb74017c655c5abe4388796c4cb0760498e7a99..71c726acbb893b6a3ce6100fc08d5aa761f0eb60 100644
+index d4b36863c55d3ffb2c71118b078c13ae95fc73d3..306fdc4111a9afeafc540dbf4f0f9dabcec3c3d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -159,6 +159,12 @@ public class Main {
+@@ -160,6 +160,12 @@ public class Main {
                          .ofType(File.class)
                          .defaultsTo(new File("paper.yml"))
                          .describedAs("Yml file");

patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch

@@ -32,10 +32,10 @@ index 8dfed6347e5922bdd0083604fc7228eaef86be17..94278a932c95070a5e478e8cf148406e
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 71c726acbb893b6a3ce6100fc08d5aa761f0eb60..3528d310bc80ccf513ff7b6f609a419eb492a624 100644
+index 306fdc4111a9afeafc540dbf4f0f9dabcec3c3d9..be73d6940983672bcccc2b05a9a87b01e0a995b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -240,12 +240,25 @@ public class Main {
+@@ -241,12 +241,25 @@ public class Main {
                      deadline.add(Calendar.DAY_OF_YEAR, -21);
                      if (buildDate.before(deadline.getTime())) {
                          System.err.println("*** Error, this build is outdated ***");

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index f85240cb888688ac0a2b6bedd83fb1c1e1dd5722..175ab86055f249dc68db64406622ab161dcf5a66 100644
+index be73d6940983672bcccc2b05a9a87b01e0a995b0..d8ca6256ad2bedc7afb92162a0e1a5487011bfbc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -166,6 +166,14 @@ public class Main {
+@@ -167,6 +167,14 @@ public class Main {
                          .defaultsTo(new File[] {})
                          .describedAs("Jar file");
                  // Paper end

patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -311,7 +311,7 @@ index 182ae975a0a9bf4ade6932d1bb1a376f77af130a..73155c8cb02a6156c1e48f9c75f51244
 
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index d6816b8402f601e474a156b7e4a8c335624083aa..b916f11cb3799aecf1edd9c2002f4c631754e89f 100644
+index 1989bbc4bcceb86ab49786b0c93ff48f3836e904..567c8fdbb0e21ec9cfc511f8c7487340785d3c62 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -98,6 +98,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -416,7 +416,7 @@ index 9265feda93edd01f8afc0b2e60cd3a54fcbdc208..7491c7a3fad265708c422e87d069120e
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 89cb1612232adc9fa336176ea0585ce6577459fb..ae93a3b7a3dc30ed3bd852242e276aa4e4368b40 100644
+index d8ca6256ad2bedc7afb92162a0e1a5487011bfbc..6f359e225eb11f22c61beb6463f9918002ce0086 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -13,7 +13,6 @@ import java.util.logging.Logger;
@@ -427,7 +427,7 @@ index 89cb1612232adc9fa336176ea0585ce6577459fb..ae93a3b7a3dc30ed3bd852242e276aa4
 
  public class Main {
      public static boolean useJline = true;
-@@ -219,6 +218,8 @@ public class Main {
+@@ -220,6 +219,8 @@ public class Main {
              }
 
              try {
@@ -436,7 +436,7 @@ index 89cb1612232adc9fa336176ea0585ce6577459fb..ae93a3b7a3dc30ed3bd852242e276aa4
                  // This trick bypasses Maven Shade's clever rewriting of our getProperty call when using String literals
                  String jline_UnsupportedTerminal = new String(new char[]{'j', 'l', 'i', 'n', 'e', '.', 'U', 'n', 's', 'u', 'p', 'p', 'o', 'r', 't', 'e', 'd', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 'l'});
                  String jline_terminal = new String(new char[]{'j', 'l', 'i', 'n', 'e', '.', 't', 'e', 'r', 'm', 'i', 'n', 'a', 'l'});
-@@ -236,9 +237,18 @@ public class Main {
+@@ -237,9 +238,18 @@ public class Main {
                      // This ensures the terminal literal will always match the jline implementation
                      System.setProperty(jline.TerminalFactory.JLINE_TERMINAL, jline.UnsupportedTerminal.class.getName());
                  }
@@ -455,7 +455,7 @@ index 89cb1612232adc9fa336176ea0585ce6577459fb..ae93a3b7a3dc30ed3bd852242e276aa4
                  }
 
                  if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
-@@ -266,7 +276,7 @@ public class Main {
+@@ -267,7 +277,7 @@ public class Main {
                      System.out.println("Unable to read system info");
                  }
                  // Paper end

patches/server/0150-Fix-this-stupid-bullshit.patch

@@ -31,10 +31,10 @@ index 8ff786c366332588a2df053438f23cc9fb7e2b84..c887d34171f89c731d76c4ca92c70be2
              Bootstrap.isBootstrapped = true;
              Instant instant = Instant.now();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 960885c891c98859e8ef375d0796c8b53fcf562c..863a983165aa845abbf7b8f2a3cd0c5057bb47d8 100644
+index 6f359e225eb11f22c61beb6463f9918002ce0086..ec442f1a6437f449d55739b990a4b69fcd48e8e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -257,10 +257,12 @@ public class Main {
+@@ -258,10 +258,12 @@ public class Main {
                      Calendar deadline = Calendar.getInstance();
                      deadline.add(Calendar.DAY_OF_YEAR, -21);
                      if (buildDate.before(deadline.getTime())) {

patches/server/0347-Improve-java-version-check.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Improve java version check
 Co-Authored-By: MiniDigger <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index a271ac2e6b17524bf61ef0bc5df7f865dacbe6b0..30f752f99ab888fd78ff58c0263372ec899fe7d6 100644
+index ec442f1a6437f449d55739b990a4b69fcd48e8e0..a288b405052716ba13adefe43ef2006c8bf6242d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -200,23 +200,27 @@ public class Main {
+@@ -201,23 +201,27 @@ public class Main {
                  return;
              }
 

patches/server/0370-Improved-Watchdog-Support.patch

@@ -239,7 +239,7 @@ index f700e677d75f911b786a22b4cc9d0a016d99b02f..5f8cf962a4b630223fb93ffea49d1b21
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index fe9b15bf452e6420dae90b100b9621454ede9792..378a6665159b3e62062df4ded024bcc1604f5300 100644
+index 307f3ab69186c0980f33d664bb2db8d1aae228f8..fce3edc97c7df45389bb3754f873a314d42929e4 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -269,7 +269,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -320,10 +320,10 @@ index 12834995b2bab9e82a40feb01f038532961296cf..12af77215bfd6df3b6802a567ac3c013
                          final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
                          net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c137b80cabde11bba39cfac1cee6e9322bac1b25..62aa0381b380ddd583d1ce2e24e04a9a607a89a7 100644
+index a288b405052716ba13adefe43ef2006c8bf6242d..bec85212b48f8ae0c89aef01c3cd245ae0c282fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -178,6 +178,36 @@ public class Main {
+@@ -179,6 +179,36 @@ public class Main {
 
          OptionSet options = null;
 
@@ -360,7 +360,7 @@ index c137b80cabde11bba39cfac1cee6e9322bac1b25..62aa0381b380ddd583d1ce2e24e04a9a
          try {
              options = parser.parse(args);
          } catch (joptsimple.OptionException ex) {
-@@ -288,8 +318,64 @@ public class Main {
+@@ -289,8 +319,64 @@ public class Main {
              } catch (Throwable t) {
                  t.printStackTrace();
              }

patches/server/0952-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Temp: Pre-init PlayerChunkLoaderData in order to prepopulate
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c8ae7b3eab18cc9e7be4e92200fb3ac345216357..2af0068ef338634d1f44532af5db66c2d0b3dd10 100644
+index ab4cf79e297ada08a0a5e2cbf294a70f9e87c635..c737c5d62407337d3db2899cfc01713a058a6467 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -367,6 +367,7 @@ public class Main {
+@@ -368,6 +368,7 @@ public class Main {
              tryPreloadClass(net.minecraft.world.level.lighting.LayerLightEventListener.DummyLightLayerEventListener.class.getName());
              tryPreloadClass(net.minecraft.world.level.lighting.LayerLightEventListener.class.getName());
              tryPreloadClass(net.minecraft.util.ExceptionCollector.class.getName());