From ae9187f3ecf4d7f1e4bfd97d7db4046f47a3555f Mon Sep 17 00:00:00 2001 From: Cryptite Date: Tue, 21 Sep 2021 08:11:38 -0500 Subject: [PATCH] First commit stuff --- build.gradle.kts | 38 ++++++++++++--------- gradle.properties | 6 ++-- patches/server/0001-Build-changes.patch | 44 +++++++++++-------------- settings.gradle.kts | 4 +-- 4 files changed, 47 insertions(+), 45 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c96fa9f5c..04ae97c08 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,8 +3,8 @@ import io.papermc.paperweight.util.constants.* plugins { java `maven-publish` - id("com.github.johnrengelman.shadow") version "7.1.2" apply false - id("io.papermc.paperweight.patcher") version "1.3.4" + id("com.github.johnrengelman.shadow") version "7.0.0" apply false + id("io.papermc.paperweight.patcher") version "1.1.11" } repositories { @@ -15,9 +15,9 @@ repositories { } dependencies { - remapper("net.fabricmc:tiny-remapper:0.8.1:fat") - decompiler("net.minecraftforge:forgeflower:1.5.498.22") - paperclip("io.papermc:paperclip:3.0.2") + remapper("org.quiltmc:tiny-remapper:0.4.3") + decompiler("net.minecraftforge:forgeflower:1.5.498.12") + paperclip("io.papermc:paperclip:2.0.1") } allprojects { @@ -26,7 +26,7 @@ allprojects { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(16)) } } } @@ -34,7 +34,7 @@ allprojects { subprojects { tasks.withType { options.encoding = Charsets.UTF_8.name() - options.release.set(17) + options.release.set(16) } tasks.withType { options.encoding = Charsets.UTF_8.name() @@ -45,23 +45,28 @@ subprojects { repositories { mavenCentral() + maven("https://oss.sonatype.org/content/groups/public/") maven("https://papermc.io/repo/repository/maven-public/") + maven("https://ci.emc.gs/nexus/content/groups/aikar/") + maven("https://repo.aikar.co/content/groups/aikar") + maven("https://repo.md-5.net/content/repositories/releases/") + maven("https://hub.spigotmc.org/nexus/content/groups/public/") } } paperweight { - serverProject.set(project(":forktest-server")) + serverProject.set(project(":ForkTest-Server")) - remapRepo.set("https://maven.fabricmc.net/") + remapRepo.set("https://maven.quiltmc.org/repository/release/") decompileRepo.set("https://files.minecraftforge.net/maven/") usePaperUpstream(providers.gradleProperty("paperRef")) { withPaperPatcher { apiPatchDir.set(layout.projectDirectory.dir("patches/api")) - apiOutputDir.set(layout.projectDirectory.dir("forktest-api")) + apiOutputDir.set(layout.projectDirectory.dir("ForkTest-API")) serverPatchDir.set(layout.projectDirectory.dir("patches/server")) - serverOutputDir.set(layout.projectDirectory.dir("forktest-server")) + serverOutputDir.set(layout.projectDirectory.dir("ForkTest-Server")) } } } @@ -75,11 +80,12 @@ tasks.generateDevelopmentBundle { mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi") libraryRepositories.set( listOf( - "https://repo.maven.apache.org/maven2/", "https://libraries.minecraft.net/", - "https://papermc.io/repo/repository/maven-public/", "https://maven.quiltmc.org/repository/release/", - // "https://my.repo/", // This should be a repo hosting your API (in this example, 'com.example.paperfork:forktest-api') + "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') ) ) } @@ -90,8 +96,8 @@ allprojects { publishing { repositories { maven { - name = "myRepoSnapshots" - url = uri("https://my.repo/") + name = "Slice" + url = uri("http://ysera.dyndns.org:8090/releases") // See Gradle docs for how to provide credentials to PasswordCredentials // https://docs.gradle.org/current/samples/sample_publishing_credentials.html credentials(PasswordCredentials::class) diff --git a/gradle.properties b/gradle.properties index 6d99bda38..2288d3004 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group=com.example.paperfork -version=1.18-R0.1-SNAPSHOT +version=1.17.1-R0.1-SNAPSHOT -mcVersion=1.18 -paperRef=956124f86a93515cf67ee850e96cfd7bc58e27e8 +mcVersion=1.17.1 +paperRef=61a09c51023c53997c31ef24849a99262f7ddaf0 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 72501605e..438f3274d 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,25 +5,21 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index cd74406039704e5a880f00b9b60bb7b1dedc5398..c4dfc34277e59143d346725c9ef2bfbcee59bc06 100644 +index 1876481a830228fd15fcd2a4be5f2c28bd7e51fe..872b45c4ea41372c8cfb435cec46b643291a2fa5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -18,8 +18,12 @@ repositories { +@@ -28,8 +28,8 @@ repositories { } dependencies { -- implementation(project(":paper-api")) -- implementation(project(":paper-mojangapi")) -+ // ForkTest start -+ implementation(project(":forktest-api")) -+ implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") { -+ exclude("io.papermc.paper", "paper-api") -+ } -+ // ForkTest end +- implementation(project(":Paper-API")) +- implementation(project(":Paper-MojangAPI")) ++ implementation(project(":ForkTest-API")) // ForkTest ++ implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // ForkTest // Paper start - implementation("org.jline:jline-terminal-jansi:3.21.0") - implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -67,7 +71,7 @@ tasks.jar { + implementation("org.jline:jline-terminal-jansi:3.12.1") + implementation("net.minecrell:terminalconsoleappender:1.2.0") +@@ -80,7 +80,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -32,33 +28,33 @@ index cd74406039704e5a880f00b9b60bb7b1dedc5398..c4dfc34277e59143d346725c9ef2bfbc "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -158,7 +162,7 @@ fun TaskContainer.registerRunTask( - name: String, - block: JavaExec.() -> Unit +@@ -205,7 +205,7 @@ tasks.test { + fun TaskContainer.registerRunTask( + name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { - group = "paper" + group = "paperweight" - mainClass.set("org.bukkit.craftbukkit.Main") standardInput = System.`in` - workingDir = rootProject.layout.projectDirectory + 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 893badbe321fa974cb82f5f11ab590bb3827f8b8..4aba540f4bc8014548cc10818472431dfa6b2ede 100644 +index 3dded5c491ace6b073a7bc3178976bd70f0b9393..72d637ffc00b536357af02a52defe996dceda3b9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1708,7 +1708,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // Spigot - Spigot > // CraftBukkit - cb > vanilla! -+ return "ForkTest"; // ForkTest - ForkTest > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! +- return "Paper"; //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! ++ return "ForkTest"; //ForkTest - ForkTest > //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! } public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d938dc26886aa8a64c11db5e49fe5639bc27e1fb..d941957dee45911626f62e55f598490a60d6c818 100644 +index 6d7f16fede01c19f638e1dcdae8b07b79cd86dc0..5b8132b32234536b89601813bdba17410803428a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -255,7 +255,7 @@ import javax.annotation.Nullable; // Paper +@@ -240,7 +240,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { diff --git a/settings.gradle.kts b/settings.gradle.kts index 81a9c0fe1..e902f3e2f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,6 +5,6 @@ pluginManagement { } } -rootProject.name = "forktest" +rootProject.name = "Slice" -include("forktest-api", "forktest-server") +include("Slice-api", "Slice-server")