From b683ff522ee0a8bfadcc72b0ead465c0ed38561c Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Wed, 16 Jun 2021 01:28:10 -0500 Subject: [PATCH] Updates for paperweight 1.0.3 --- build.gradle.kts | 4 +-- gradle.properties | 3 +- gradle/wrapper/gradle-wrapper.properties | 2 +- patches/server/0001-Build-changes.patch | 36 +++++++++++++----------- settings.gradle.kts | 2 +- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index da33b09..cf84fe1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,12 @@ plugins { java id("com.github.johnrengelman.shadow") version "7.0.0" apply false - id("io.papermc.paperweight.patcher") version "1.0.0-SNAPSHOT" + id("io.papermc.paperweight.patcher") version "1.0.3" } repositories { mavenCentral() - maven("https://wav.jfrog.io/artifactory/repo/") { + maven("https://papermc.io/repo/repository/maven-public/") { content { onlyForConfigurations("paperclip") } diff --git a/gradle.properties b/gradle.properties index 99dc823..60a9d8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,4 @@ version = 1.17-R0.1-SNAPSHOT mcVersion = 1.17 packageVersion = 1_17_R1 -paperRef = dev/1.17 -org.gradle.jvmargs=-Xmx3G +paperRef = 98994a0aa1e72c851b9ea6fb26fcd15ca02a0f6a diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 29e4134..69a9715 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 116b1ff..9023b52 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,42 +5,44 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index f0256fe4aea16c9e0d6f5eee360eeec36cfdeebd..8a13deacc6d70ae1555f1cc8dedd1b7cb50bf291 100644 +index f111042223f0d7974785c37245bb60b75388163e..043e5f4a0914fab856f98d39262a7c28c327460f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -20,7 +20,7 @@ repositories { +@@ -19,8 +19,8 @@ repositories { } dependencies { - implementation(project(":Paper-API")) -+ implementation(project(":ForkTest-API")) +- implementation(project(":Paper-MojangAPI")) ++ implementation(project(":ForkTest-API")) // ForkTest ++ implementation("com.destroystokyo.paper:paper-mojangapi:1.16.5-R0.1-SNAPSHOT") // ForkTest // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("net.minecrell:terminalconsoleappender:1.2.0") -@@ -98,7 +98,7 @@ tasks.test { - - fun TaskContainer.registerRunTask(name: String, block: JavaExec.() -> Unit): TaskProvider = - register(name) { -- group = "Paper" -+ group = "paperweight" - workingDir = rootProject.layout.projectDirectory.dir( - providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run") - ).get().asFile +@@ -119,7 +119,7 @@ tasks.test { + fun TaskContainer.registerRunTask( + name: String, block: JavaExec.() -> Unit + ): TaskProvider = register(name) { +- group = "paper" ++ group = "paperweight" + standardInput = System.`in` + workingDir = rootProject.layout.projectDirectory.dir( + providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run") diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 494a3afaaa0e3496d30e8d97edbab62b21610dfe..180ae99b7ec18b701e1eb92cfdefec20b6ba926f 100644 +index c6747f49ae8ddc9fc1bad82ab480f85d0883da5d..804eb17da12b816438a4d4c39fc330c4869cea1d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1538,7 +1538,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // Spigot - Spigot > // CraftBukkit - cb > vanilla! -+ return "ForkTest"; //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! ++ return "ForkTest"; //ForkTest - ForkTest > //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! } public SystemReport fillSystemReport(SystemReport systemreport) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9730c701b734eb3491bc1fa5d9bb81ddfefc910a..88cb6103d328598e34ec569e39f6ab58bb74d373 100644 +index 8a98bd1018afd934696fedbed24e271ab6b75f51..84c456ef6a375d84ab52e11a58a4e6fe602733c0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper @@ -48,7 +50,7 @@ index 9730c701b734eb3491bc1fa5d9bb81ddfefc910a..88cb6103d328598e34ec569e39f6ab58 public final class CraftServer implements Server { - private final String serverName = "Paper"; // Paper -+ private final String serverName = "ForkTest"; // Paper ++ private final String serverName = "ForkTest"; // ForkTest // Paper private final String serverVersion; private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/settings.gradle.kts b/settings.gradle.kts index a4d9062..8fabfcf 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,7 @@ pluginManagement { repositories { gradlePluginPortal() - maven("https://wav.jfrog.io/artifactory/repo/") + maven("https://papermc.io/repo/repository/maven-public/") } }