diff --git a/build.gradle.kts b/build.gradle.kts index d64a3e8..8a72480 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,6 @@ dependencies { subprojects { apply(plugin = "java") - apply(plugin = "maven-publish") java { toolchain { @@ -38,19 +37,6 @@ subprojects { options.release.set(16) } - configure { - repositories { - maven { - name = "projectEdenSnapshots" - url = uri("https://sonatype.projecteden.gg/repository/maven-snapshots/") - credentials { - username = properties["edenusr"] as String? - password = properties["edenpwd"] as String? - } - } - } - } - repositories { mavenCentral() maven("https://oss.sonatype.org/content/groups/public/") diff --git a/patches/api/0001-Build-changes.patch b/patches/api/0001-Build-changes.patch index bf0c9c9..eb94bef 100644 --- a/patches/api/0001-Build-changes.patch +++ b/patches/api/0001-Build-changes.patch @@ -1,14 +1,20 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: lexikiq -Date: Fri, 2 Jul 2021 01:33:12 -0400 +Date: Sun, 20 Jun 2021 17:18:07 -0400 Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index e142072f31a41b25ac637970f79e71ab70c2f28c..3a2e308a5897cd99257ca9e4e836f4eced881246 100644 +index e142072f31a41b25ac637970f79e71ab70c2f28c..2d3160cc96fa3783ec9863ff3f7325a90291ce91 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -27,6 +27,7 @@ dependencies { +@@ -1,4 +1,5 @@ + import java.util.Locale ++import java.net.URI + + plugins { + `java-library` +@@ -27,6 +28,7 @@ dependencies { api("org.ow2.asm:asm:9.0") api("org.ow2.asm:asm-commons:9.0") api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper @@ -16,3 +22,30 @@ index e142072f31a41b25ac637970f79e71ab70c2f28c..3a2e308a5897cd99257ca9e4e836f4ec compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") +@@ -46,6 +48,26 @@ configure { + publications.create("maven") { + artifactId = project.name.toLowerCase(Locale.ENGLISH) + from(components["java"]) ++// Parchment start ++ groupId = project.group as String? ++ artifactId = project.name.toLowerCase(Locale.ENGLISH) ++ version = project.version as String? ++ ++ pom { ++ name.set(project.name) ++ description.set("Minecraft server software forked from Paper") ++ } ++ } ++ ++ repositories { ++ maven { ++ credentials { ++ username = properties["edenusr"] as String? ++ password = properties["edenpwd"] as String? ++ } ++ url = URI.create("https://sonatype.projecteden.gg/repository/maven-snapshots/") ++ } ++// Parchment end + } + } + diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 79e0758..b10d883 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -1,14 +1,22 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: lexikiq -Date: Fri, 2 Jul 2021 01:33:12 -0400 +Date: Thu, 24 Jun 2021 02:16:25 -0400 Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 5540da58e66f83b283863d3158a9b4ab5ba636db..58cd2219db2a770dddced9af8086f465eb9d2ea1 100644 +index 39beb0331282b297f4f3857560d24ce6a616210d..b18b93e4f99005885f70f01d8a17487c4ec5a42e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -30,8 +30,8 @@ repositories { +@@ -10,6 +10,7 @@ import java.nio.file.Files + import java.text.SimpleDateFormat + import java.util.Date + import java.util.Locale ++import java.net.URI // Parchment + + plugins { + java +@@ -30,8 +31,8 @@ repositories { } dependencies { @@ -19,7 +27,7 @@ index 5540da58e66f83b283863d3158a9b4ab5ba636db..58cd2219db2a770dddced9af8086f465 // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("net.minecrell:terminalconsoleappender:1.2.0") -@@ -82,7 +82,7 @@ tasks.jar { +@@ -82,7 +83,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -28,7 +36,34 @@ index 5540da58e66f83b283863d3158a9b4ab5ba636db..58cd2219db2a770dddced9af8086f465 "Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -114,7 +114,7 @@ tasks.shadowJar { +@@ -104,6 +105,26 @@ publishing { + classifier = null + } + artifact(tasks.shadowJar) ++ // Parchment start ++ groupId = project.group as String? ++ artifactId = "parchment" ++ version = project.version as String? ++ ++ pom { ++ name.set(project.name) ++ description.set("Minecraft server software forked from Paper") ++ } ++ } ++ ++ repositories { ++ maven { ++ credentials { ++ username = properties["edenusr"] as String? ++ password = properties["edenpwd"] as String? ++ } ++ url = URI.create("https://sonatype.projecteden.gg/repository/maven-snapshots/") ++ } ++ // Parchment end + } + } + +@@ -114,7 +135,7 @@ tasks.shadowJar { // Needed for Paperclip's install to maven local feature from(generatePom) { @@ -37,7 +72,7 @@ index 5540da58e66f83b283863d3158a9b4ab5ba636db..58cd2219db2a770dddced9af8086f465 rename { "pom.xml" } } -@@ -178,7 +178,7 @@ tasks.test { +@@ -178,7 +199,7 @@ tasks.test { fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -84,7 +119,7 @@ index 580bae0d414d371a07a6bfeefc41fdd989dc0083..e744a4c6de5beae4161d855da6dcab93 org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion()); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7682bd72c3932a9b20f14e552711d74f70b969b1..7790687dc94ba6c38ecd919fcdfa882856860cda 100644 +index a24bab6095b85fe208bb0f467b267a9d0680c6fc..24f9cc4e117916d872a8410202cef771992a5c62 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1649,7 +1649,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop