From fe0ed1609cfcb1fe8bd25f65e666838fc41a38c5 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Sat, 2 Oct 2021 18:46:57 -0700 Subject: [PATCH] Update upstream & paperweight to 1.1.12 --- build.gradle.kts | 11 ++++++----- gradle.properties | 2 +- patches/server/0001-Build-changes.patch | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ebb10b5..aed89fb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "7.0.0" apply false - id("io.papermc.paperweight.patcher") version "1.1.11" + id("io.papermc.paperweight.patcher") version "1.1.12" } repositories { @@ -15,7 +15,7 @@ repositories { } dependencies { - remapper("org.quiltmc:tiny-remapper:0.4.3:fat") + remapper("net.fabricmc:tiny-remapper:0.6.0:fat") decompiler("net.minecraftforge:forgeflower:1.5.498.12") paperclip("io.papermc:paperclip:2.0.1") } @@ -57,7 +57,7 @@ subprojects { paperweight { serverProject.set(project(":ForkTest-Server")) - remapRepo.set("https://maven.quiltmc.org/repository/release/") + remapRepo.set("https://maven.fabricmc.net/") decompileRepo.set("https://files.minecraftforge.net/maven/") usePaperUpstream(providers.gradleProperty("paperRef")) { @@ -84,8 +84,9 @@ tasks.generateDevelopmentBundle { "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/", // for paper-mojangapi - // "https://my.repo/" // This should be a repo hosting your API (in this example, 'com.example.paperfork:forktest-api') + "https://papermc.io/repo/repository/maven-public/", + "https://repo.velocitypowered.com/snapshots/", + // "https://my.repo/", // This should be a repo hosting your API (in this example, 'com.example.paperfork:forktest-api') ) ) } diff --git a/gradle.properties b/gradle.properties index 9eed741..eb32053 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=com.example.paperfork version=1.17.1-R0.1-SNAPSHOT mcVersion=1.17.1 -paperRef=d0a2193d4a93ecc7dd69499cd1aa86c94d0f51f4 +paperRef=e39159134f3f52142a06f37a389a00c9ce3e724e org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 3ec70cf..ea03d20 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..643118869823ff4005e6611f3f33bc9391cb37bb 100644 +index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..ed6139b1a8d8c814fde6c1b2fd7db425720908b6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,8 +29,8 @@ repositories { @@ -38,7 +38,7 @@ index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..643118869823ff4005e6611f3f33bc93 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 1d7c26354eee1dff5e66b6234d408ed8f800415c..e3dbbe77bd44c9fff154a28d37a87d88567abcc8 100644 +index fe6d5051b139cd6079e288ffdf20e30fdd46fdda..c0712fde9b41a24166224c188b82d022de56a24a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop