delete paper patch, use Paper userdev branch

Dieser Commit ist enthalten in:
Jason Penilla 2021-07-09 19:50:03 -07:00
Ursprung 087acd1640
Commit 0dbf8c744f
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 0E75A301420E48F8

Datei anzeigen

@ -1,125 +0,0 @@
From b5c01c3fb23ad020f61c004fa3efe4edd3e31b4d Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Fri, 9 Jul 2021 01:43:00 -0700
Subject: [PATCH] Setup dev bundle publishing
Gradle property `publishDevBundle` must be set to publish the dev bundle, ex `./gradlew publishToMavenLocal -PpublishDevBundle`. Patches must be already applied in order to generate the dev bundle.
---
build.gradle.kts | 61 +++++++++++++++++++++++++++++----------------
settings.gradle.kts | 1 +
2 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index cf0754603..e5b6cca29 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,8 @@
plugins {
java
+ `maven-publish`
id("com.github.johnrengelman.shadow") version "7.0.0" apply false
- id("io.papermc.paperweight.core") version "1.1.8"
+ id("io.papermc.paperweight.core") version "1.1.9-LOCAL-SNAPSHOT"
}
subprojects {
@@ -25,16 +26,6 @@ subprojects {
filteringCharset = Charsets.UTF_8.name()
}
- configure<PublishingExtension> {
- repositories {
- maven {
- name = "paperSnapshots"
- url = uri("https://papermc.io/repo/repository/maven-snapshots/")
- credentials(PasswordCredentials::class)
- }
- }
- }
-
if (name == "Paper-MojangAPI") {
return@subprojects
}
@@ -58,16 +49,6 @@ repositories {
onlyForConfigurations("paperclip")
}
}
- maven("https://maven.quiltmc.org/repository/release/") {
- content {
- onlyForConfigurations("paramMappings", "remapper")
- }
- }
- maven("https://files.minecraftforge.net/maven/") {
- content {
- onlyForConfigurations("decompiler")
- }
- }
}
dependencies {
@@ -85,6 +66,10 @@ paperweight {
spigotApiPatchDir.set(layout.projectDirectory.dir("patches/api"))
spigotServerPatchDir.set(layout.projectDirectory.dir("patches/server"))
+ paramMappingsRepo.set("https://maven.quiltmc.org/repository/release/")
+ remapRepo.set("https://maven.quiltmc.org/repository/release/")
+ decompileRepo.set("https://files.minecraftforge.net/maven/")
+
mappingsPatch.set(layout.projectDirectory.file("build-data/mappings-patch.tiny"))
reobfMappingsPatch.set(layout.projectDirectory.file("build-data/reobf-mappings-patch.tiny"))
@@ -104,6 +89,40 @@ paperweight {
}
}
+tasks.generateDevelopmentBundle {
+ apiCoordinates.set("io.papermc.paper:paper-api")
+ mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
+ libraryRepositories.set(listOf(
+ "https://libraries.minecraft.net/",
+ "https://maven.quiltmc.org/repository/release/",
+ "https://repo.aikar.co/content/groups/aikar",
+ "https://ci.emc.gs/nexus/content/groups/aikar/",
+ "https://papermc.io/repo/repository/maven-public/"
+ ))
+}
+
+publishing {
+ if (project.hasProperty("publishDevBundle")) {
+ publications.create<MavenPublication>("devBundle") {
+ artifact(tasks.generateDevelopmentBundle) {
+ artifactId = "dev-bundle"
+ }
+ }
+ }
+}
+
+allprojects {
+ publishing {
+ repositories {
+ maven {
+ name = "paperSnapshots"
+ url = uri("https://papermc.io/repo/repository/maven-snapshots/")
+ credentials(PasswordCredentials::class)
+ }
+ }
+ }
+}
+
tasks.register("printMinecraftVersion") {
doLast {
println(providers.gradleProperty("mcVersion").get().trim())
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4127fc6b8..d6ffb3730 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1,6 @@
pluginManagement {
repositories {
+ mavenLocal()
gradlePluginPortal()
maven("https://papermc.io/repo/repository/maven-public/")
}
--
2.32.0