diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch index d787117013..385cf4acdd 100644 --- a/patches/server/0003-Build-system-changes.patch +++ b/patches/server/0003-Build-system-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index 9778c18a2822b00d48134583de87ea281623427d..3d10012abdc43d4cf29f53a2271434991da798be 100644 +index 9778c18a2822b00d48134583de87ea281623427d..a5494ea5ee3354bae16dab1b5a910ddce4e02def 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,10 +14,9 @@ repositories { @@ -38,25 +38,6 @@ index 9778c18a2822b00d48134583de87ea281623427d..3d10012abdc43d4cf29f53a227143499 ) for (tld in setOf("net", "com", "org")) { attributes("$tld/bukkit", "Sealed" to true) -@@ -74,10 +76,18 @@ relocation { - } - } - -+val generatePom = tasks.named("generatePomFileForMavenPublication") -+ - tasks.shadowJar { - configurations = listOf(project.configurations.vanillaServer.get()) - archiveClassifier.set("mojang-mapped") - -+ // Needed for Paperclip's install to maven local feature // todo: are we keeping this? if so is this still correct? -+ from(generatePom) { -+ into("META-INF/maven/io.papermc.paper/paper") -+ rename { "pom.xml" } -+ } -+ - for (relocation in relocation.relocations.get()) { - relocate(relocation.fromPackage, relocation.toPackage) { - for (exclude in relocation.excludes) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java index 189c262b22cad352fc87565ff499a5340d92b4e4..09c33e8613d31f4519109f29b44cfea754184c3f 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index f24ec4dea5..9c5be3b72a 100644 --- a/patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and diff --git a/build.gradle.kts b/build.gradle.kts -index 410c7fbc0a776c4a206cbdbdbd9a570af9b6a0c2..0889860f3de2a6ebd073638676f837c993805658 100644 +index 988f35257391bfb6cbc94b24965559ee7ad2987a..2ee89cff805cf0f7d2fed277442ef74f411f1cd0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,6 @@ @@ -45,7 +45,7 @@ index 410c7fbc0a776c4a206cbdbdbd9a570af9b6a0c2..0889860f3de2a6ebd073638676f837c9 testImplementation("junit:junit:4.13.1") testImplementation("org.hamcrest:hamcrest-library:1.3") } -@@ -109,6 +119,45 @@ tasks.shadowJar { +@@ -101,6 +111,45 @@ tasks.shadowJar { } }