Prepare for 1.19 dev

1 files changed, 0 insertions, 67 deletions

diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
deleted file mode 100644
index 865049b0e4..0000000000
--- a/patches/server/0003-Build-system-changes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <[email protected]>
-Date: Mon, 29 Feb 2016 20:40:33 -0600
-Subject: [PATCH] Build system changes
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 75c858870a55f7282a0e3500f803cb330b462f37..d39ed9a8a32913193aec1bba2a59a352b8032dae 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -9,10 +9,9 @@ plugins {
- dependencies {
-     implementation(project(":paper-api"))
-     implementation("jline:jline:2.12.1")
--    implementation("org.apache.logging.log4j:log4j-iostreams:2.17.0") {
--        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
--    }
-+    implementation("org.apache.logging.log4j:log4j-iostreams:2.17.1") // Paper
-     implementation("org.ow2.asm:asm:9.2")
-+    implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
-     runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
-     runtimeOnly("mysql:mysql-connector-java:8.0.27")
- 
-@@ -33,6 +32,7 @@ tasks.jar {
-         val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
-         val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
-         val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
-+        val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
-         attributes(
-             "Main-Class" to "org.bukkit.craftbukkit.Main",
-             "Implementation-Title" to "CraftBukkit",
-@@ -41,6 +41,9 @@ tasks.jar {
-             "Specification-Title" to "Bukkit",
-             "Specification-Version" to project.version,
-             "Specification-Vendor" to "Bukkit Team",
-+            "Git-Branch" to gitBranch, // Paper
-+            "Git-Commit" to gitHash, // Paper
-+            "CraftBukkit-Package-Version" to craftbukkitPackageVersion, // Paper
-         )
-         for (tld in setOf("net", "com", "org")) {
-             attributes("$tld/bukkit", "Sealed" to true)
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 2c90c116d87e060b6da4a8ce79f839fff80db86d..e75ff70c52b097af447b7a91ef2c20c08a904d92 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -190,7 +190,7 @@ public class Main {
-                 }
- 
-                 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
--                    Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L);
-+                    Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
- 
-                     Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -21);
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-@@ -11,7 +11,7 @@ public final class Versioning {
-     public static String getBukkitVersion() {
-         String result = "Unknown-Version";
- 
--        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.spigotmc/spigot-api/pom.properties");
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
-         Properties properties = new Properties();
- 
-         if (stream != null) {