Merge branch 'ver/1.19.2' of https://github.com/PrismarineTeam/Prisma…

…rine into dev/rewrite-chunk-system

patches/api/0001-Pufferfish-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <alphakr93@outlook.com>
-Date: Sun, 14 Aug 2022 14:30:25 +0900
+Date: Thu, 25 Aug 2022 16:23:03 +0900
 Subject: [PATCH] Pufferfish API Changes
 
 Original by Kevin Raneri <kevin.raneri@gmail.com>

patches/api/0002-Purpur-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <alphakr93@outlook.com>
-Date: Sun, 14 Aug 2022 14:39:55 +0900
+Date: Thu, 25 Aug 2022 16:49:31 +0900
 Subject: [PATCH] Purpur API Changes
 
 Original by PurpurMC Team

patches/server/0003-Pufferfish-Server-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <alphakr93@outlook.com>
-Date: Sun, 14 Aug 2022 14:29:52 +0900
+Date: Thu, 25 Aug 2022 16:22:20 +0900
 Subject: [PATCH] Pufferfish Server Changes
 
 Original by Kevin Raneri <kevin.raneri@gmail.com>

patches/server/0005-Purpur-Server-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <alphakr93@outlook.com>
-Date: Sun, 14 Aug 2022 14:40:15 +0900
+Date: Thu, 25 Aug 2022 16:50:08 +0900
 Subject: [PATCH] Purpur Server Changes
 
 Original by PurpurMC Team
@@ -27,7 +27,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 7074295d7399d03e259598bb4bfa0f21434d74be..dc00d06f9bd4cc7403e0fe89822ed40ed2e148c8 100644
+index 7074295d7399d03e259598bb4bfa0f21434d74be..6b72c9d76ac7a98cc0af0adc9220d21072d4f478 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,7 +9,7 @@ plugins {
@@ -39,16 +39,16 @@ index 7074295d7399d03e259598bb4bfa0f21434d74be..dc00d06f9bd4cc7403e0fe89822ed40e
      // Pufferfish start
      implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
          exclude("io.papermc.paper", "paper-api")
-@@ -44,6 +44,9 @@ dependencies {
+@@ -43,6 +43,9 @@ dependencies {
+     runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
      runtimeOnly("mysql:mysql-connector-java:8.0.29")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
-
++ 
 +    implementation("cat.inspiracio:rhino-js-engine:1.7.7.1") // Purpur
 +    implementation("dev.omega24:upnp4j:1.0") // Purpur
-+
+ 
      runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
 @@ -84,7 +87,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -301,10 +301,27 @@ index 39844531b03eb8a6c70700b4ecbf0ff1a557424d..632ae75cb3bbc7a3955872d14ad0fbc2
      public void removeCommand(String name) {
          this.children.remove(name);
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index 38cb29c646ff496ffaa6553f98a565b71155c464..e077a43cf3f06207234cb445b58dff79eabcb9c6 100644
+index 38cb29c646ff496ffaa6553f98a565b71155c464..852ed093488ae624960a7dd35f68d8cee39067e7 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-@@ -121,6 +121,22 @@ public class PufferfishConfig {
+@@ -36,6 +36,7 @@ public class PufferfishConfig {
+
+ 	private static final YamlFile config = new YamlFile();
+ 	private static int updates = 0;
++	public static File pufferfishFile; // Purpur
+
+ 	private static ConfigurationSection convertToBukkit(org.simpleyaml.configuration.ConfigurationSection section) {
+ 		ConfigurationSection newSection = new MemoryConfiguration();
+@@ -58,7 +59,7 @@ public class PufferfishConfig {
+ 	}
+
+ 	public static void load() throws IOException {
+-		File configFile = new File("pufferfish.yml");
++		File configFile = pufferfishFile; // Purpur
+
+ 		if (configFile.exists()) {
+ 			try {
+@@ -121,6 +122,22 @@ public class PufferfishConfig {
  			config.setComment(key, String.join("\n", comment), CommentType.BLOCK);
  		}
  	}
@@ -1449,10 +1466,10 @@ index 06e3a868e922f1b7a586d0ca28f64a67ae463b68..32beb045f990d4da6112da4fea295333
                          itemstack.setCount(1);
                          entityitem = entityplayer.drop(itemstack, false, false, false); // SPIGOT-2942: Add boolean to call event
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index f2692f0e24837a4c17fa914ffdf1b6c6552b7b70..e2c7a587a83a568fbab35217be59af89e4d0b711 100644
+index f2692f0e24837a4c17fa914ffdf1b6c6552b7b70..97821cd1473f3e04236c48076358cca9d5b7c75f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -223,6 +223,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -223,6 +223,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          thread.start(); // Paper - start console thread after MinecraftServer.console & PaperConfig are initialized
          io.papermc.paper.command.PaperCommands.registerCommands(this);
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
@@ -1464,11 +1481,12 @@ index f2692f0e24837a4c17fa914ffdf1b6c6552b7b70..e2c7a587a83a568fbab35217be59af89
 +            return false;
 +        }
 +        org.purpurmc.purpur.PurpurConfig.registerCommands();
++        gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur
 +        // Purpur end
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
-@@ -274,6 +283,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -274,6 +284,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              DedicatedServer.LOGGER.warn("Perhaps a server is already running on that port?");
              return false;
          }
@@ -1499,7 +1517,7 @@ index f2692f0e24837a4c17fa914ffdf1b6c6552b7b70..e2c7a587a83a568fbab35217be59af89
 
          // CraftBukkit start
          // this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage)); // Spigot - moved up
-@@ -285,11 +318,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -285,11 +319,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
              DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
              // Spigot start
@@ -1514,7 +1532,7 @@ index f2692f0e24837a4c17fa914ffdf1b6c6552b7b70..e2c7a587a83a568fbab35217be59af89
              }
              // Spigot end
              DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
-@@ -341,6 +375,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -341,6 +376,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              }
 
              if (gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
@@ -1523,7 +1541,7 @@ index f2692f0e24837a4c17fa914ffdf1b6c6552b7b70..e2c7a587a83a568fbab35217be59af89
              return true;
          }
      }
-@@ -480,7 +516,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -480,7 +517,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
      }
 
      public void handleConsoleInputs() {
@@ -1532,7 +1550,7 @@ index f2692f0e24837a4c17fa914ffdf1b6c6552b7b70..e2c7a587a83a568fbab35217be59af89
          // Paper start - use proper queue
          ConsoleInput servercommand;
          while ((servercommand = this.serverCommandQueue.poll()) != null) {
-@@ -497,7 +533,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -497,7 +534,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              // CraftBukkit end
          }
 
@@ -19595,14 +19613,19 @@ index cfb810a9cc25c3133d9e333f35deff2424febb67..fe0280d66d593614847b9401130b4aac
      @Override
      public java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 56a784e943cb5d8b15b41e3e66545ebf166c221c..420300ce19d01f36f071eae44efd4cb32beb0ed6 100644
+index 56a784e943cb5d8b15b41e3e66545ebf166c221c..ee15a1f29b7af499ccedb3ff37413d68fb98d270 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -164,6 +164,14 @@ public class Main {
+@@ -164,6 +164,19 @@ public class Main {
                          .describedAs("Jar file");
                  // Paper end
 
 +                // Purpur Start
++                acceptsAll(asList("pufferfish", "pufferfish-settings"), "File for pufferfish settings")
++                        .withRequiredArg()
++                        .ofType(File.class)
++                        .defaultsTo(new File("pufferfish.yml"))
++                        .describedAs("Yml file");
 +                acceptsAll(asList("purpur", "purpur-settings"), "File for purpur settings")
 +                    .withRequiredArg()
 +                    .ofType(File.class)
@@ -19613,7 +19636,7 @@ index 56a784e943cb5d8b15b41e3e66545ebf166c221c..420300ce19d01f36f071eae44efd4cb3
                  // Paper start
                  acceptsAll(asList("server-name"), "Name of the server")
                          .withRequiredArg()
-@@ -268,7 +276,7 @@ public class Main {
+@@ -268,7 +281,7 @@ public class Main {
                      System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
 

patches/server/0008-Prismarine-config-files.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Prismarine config files
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index f787fb206588a643c4f90ee1bd7b1044f651815c..5b2b54bcba6a254ed3c5a065e898383820ff2911 100644
+index 177ad4b4af8ab77a121c0991d19804f59cbeaa5f..81a5089c6e6505437674f04adf783405f797f1e0 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -232,6 +232,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         }
+@@ -233,6 +233,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          org.purpurmc.purpur.PurpurConfig.registerCommands();
+         gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur
          // Purpur end
 +        // Prismarine start
 +        try {
@@ -391,10 +391,10 @@ index 68efc0c7c60f2156734c0d7064c348e73b483279..7a1ec03940392404e5edeb98beddf39e
          @Override
          public void restart() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 420300ce19d01f36f071eae44efd4cb32beb0ed6..235fdb79f8aa350de90f0e8776545820e348b528 100644
+index ee15a1f29b7af499ccedb3ff37413d68fb98d270..5d709c26c210c09f1fe1b00f9f2d3d5314083251 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -172,6 +172,14 @@ public class Main {
+@@ -177,6 +177,14 @@ public class Main {
                      .describedAs("Yml file");
                  // Purpur end
 

patches/server/0024-Implement-No-Chat-Reports.patch

@@ -19,10 +19,10 @@ index 11183b4a39b9897e1b1067eb2a3556d2b1d90f52..1195d24a9a1180e926cd30fe98cfcb18
 
      public static class Players {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 06ef4d20c879b18465c23d969ff2c4a7aed358b3..e642d895b4275ab721d47058bbffe19ae06895d9 100644
+index 8d339f2cec73a7bd5633f95e805333b16c98ad55..25a750a641f75a7df26c005a92352da69cfa4925 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -683,7 +683,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -684,7 +684,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
 
      @Override
      public boolean enforceSecureProfile() {

upstream-data

@@ -1,2 +1,2 @@
-purpur = e9168bf1b042e6b6b3e94db2aa5dd1ddb70bc39a
+purpur = 451e623ec1c8b732435ebd81447d3f51474951cb
 pufferfish = 4b26a0baf6c780a22d93f93022617cc43294ac04