hardfork - initial process

Author: AlphaKR93

.gitignore

@@ -3,7 +3,7 @@ core.*
 hs_err_pid*
 
 # Intellij
-.idea/
+.idea/*
 *.iml
 *.ipr
 *.iws
@@ -18,16 +18,11 @@ out/
 nbproject/
 nbactions.xml
 
-# vscode
-.vscode/
-
 # Gradle
 !gradle-wrapper.jar
 .gradle/
 build/
 */build/
-run/
-javadoc/
 
 # we use maven!
 build.xml
@@ -38,6 +33,7 @@ target/
 dependency-reduced-pom.xml
 
 # various other potential build files
+build/
 bin/
 dist/
 manifest.mf
@@ -52,13 +48,13 @@ manifest.mf
 # Linux temp files
 *~
 
-# Paperweight
-build-data/
-*-API
-*-MojangAPI
-*-Server
-paper-api-generator
-compare.txt
-*.patch
-!patches/**/*
-upstream
+# other stuff
+/run
+
+/plazma-server/build.gradle.kts
+/plazma-server/src/minecraft
+/paper-server
+/plazma-api/build.gradle.kts
+/paper-api
+*.jar
+test-plugin.settings.gradle.kts

build.gradle.kts

@@ -3,159 +3,78 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     java
-    `kotlin-dsl`
-    `maven-publish`
-    `always-up-to-date`
-    alias(libs.plugins.shadow) apply false
-    alias(libs.plugins.paperweight)
+    id("io.papermc.paperweight.patcher") version "2.0.0-beta.14"
 }
 
-val jdkVersion = property("jdkVersion").toString().toInt()
-kotlin.jvmToolchain(jdkVersion)
-
-repositories {
-    mavenCentral()
-    maven("https://repo.papermc.io/repository/maven-public/") { name = "papermc"
-        content { onlyForConfigurations(configurations.paperclip.name) }
-    }
-    maven("https://repo.codemc.io/repository/maven-public/") { name = "codemc" }
-    maven("https://jitpack.io") { name = "jitpack" }
-}
-
-dependencies {
-    remapper(libs.remapper)
-    paperclip(libs.paperclip)
-    decompiler(libs.decompiler)
-}
-
-val brandName: String by project
-val providerRepo: String by project
 paperweight {
-    serverProject = project(":${brandName.lowercase()}-server")
+    upstreams.paper {
+        ref = providers.gradleProperty("paperCommit")
 
-    remapRepo = "https://repo.papermc.io/repository/maven-public/"
-    decompileRepo = "https://repo.papermc.io/repository/maven-public/"
-
-    usePaperUpstream(providers.gradleProperty("paperCommit")) {
-        withPaperPatcher {
-            apiPatchDir.set(projectDir.resolve("patches/api"))
-            apiOutputDir.set(projectDir.resolve("$brandName-API"))
-
-            serverPatchDir.set(projectDir.resolve("patches/server"))
-            serverOutputDir.set(projectDir.resolve("$brandName-Server"))
+        patchFile {
+            path = "paper-server/build.gradle.kts"
+            outputFile = file("plazma-server/build.gradle.kts")
+            patchFile = file("plazma-server/build.gradle.kts.patch")
         }
-
-        patchTasks.register("generatedApi") {
-            isBareDirectory = true
-            upstreamDirPath = "paper-api-generator/generated"
-            patchDir = projectDir.resolve("patches/generated-api")
-            outputDir = projectDir.resolve("paper-api-generator/generated")
+        patchFile {
+            path = "paper-api/build.gradle.kts"
+            outputFile = file("plazma-api/build.gradle.kts")
+            patchFile = file("plazma-api/build.gradle.kts.patch")
         }
-    }
-}
-
-tasks {
-    applyPatches {
-        dependsOn("applyGeneratedApiPatches")
-    }
-
-    rebuildPatches {
-        dependsOn("rebuildGeneratedApiPatches")
-    }
-
-    generateDevelopmentBundle {
-        apiCoordinates.set("${project.group}:${brandName.lowercase()}-api")
-        libraryRepositories.addAll(
-            "https://repo1.maven.org/maven2/",
-            "https://papermc.io/repo/repository/maven-public/",
-            "https://repo.codemc.io/repository/maven-public/",
-            "https://jitpack.io",
-        )
-    }
-}
-
-publishing.publications.create<MavenPublication>("devBundle") {
-    artifact(tasks.generateDevelopmentBundle) {  artifactId = "dev-bundle" }
-}
-
-val mavenUsername: String? by project
-val mavenPassword: String? by project
-allprojects {
-    apply(plugin = "java")
-    apply(plugin = "maven-publish")
-
-    java.toolchain.languageVersion.set(JavaLanguageVersion.of(jdkVersion))
-
-    publishing.repositories.maven("https://maven.pkg.github.com/$providerRepo") {
-        name = "github"
-
-        credentials {
-            username = mavenUsername ?: System.getenv("GRADLE_PROPERTY_MAVEN_USERNAME") ?: System.getenv("MAVEN_USERNAME")
-            password = mavenPassword ?: System.getenv("GRADLE_PROPERTY_MAVEN_PASSWORD") ?: System.getenv("MAVEN_PASSWORD")
-        }
-    }
-
-    publishing.repositories.maven("https://repo.codemc.io/repository/maven-snapshots/") {
-        name = "codemc"
-
-        credentials {
-            username = mavenUsername ?: System.getenv("GRADLE_PROPERTY_MAVEN_USERNAME") ?: System.getenv("MAVEN_USERNAME")
-            password = mavenPassword ?: System.getenv("GRADLE_PROPERTY_MAVEN_PASSWORD") ?: System.getenv("MAVEN_PASSWORD")
+        patchDir("paperApi") {
+            upstreamPath = "paper-api"
+            excludes = setOf("build.gradle.kts")
+            patchesDir = file("plazma-api/paper-patches")
+            outputDir = file("paper-api")
         }
     }
 }
 
 subprojects {
+    apply(plugin = "java-library")
+    apply(plugin = "maven-publish")
+
     repositories {
+        mavenLocal()
         mavenCentral()
-        maven("https://repo.papermc.io/repository/maven-public/") { name = "papermc" }
-        maven("https://repo.codemc.io/repository/maven-public/") { name = "codeme" }
-        maven("https://jitpack.io") { name = "jitpack" }
+        maven("https://repo.papermc.io/repository/maven-public/")
+        maven("https://jitpack.io")
     }
 
-    tasks {
-        withType<JavaCompile>().configureEach {
-            options.encoding = Charsets.UTF_8.name()
-            options.release = jdkVersion
-        }
-
-        withType<Javadoc> {
-            options.encoding = Charsets.UTF_8.name()
-        }
-
-        withType<ProcessResources> {
-            filteringCharset = Charsets.UTF_8.name()
+    extensions.configure<JavaPluginExtension> {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(21)
         }
+    }
 
-        withType<Test> {
-            testLogging {
-                showStackTraces = true
-                exceptionFormat = TestExceptionFormat.FULL
-                events(TestLogEvent.STANDARD_OUT)
+    extensions.configure<PublishingExtension> {
+        repositories {
+            maven("https://repo.purpurmc.org/snapshots") {
+                name = "purpur"
+                credentials(PasswordCredentials::class)
             }
         }
     }
-}
-
-val paperRepoVal = property("paperRepo").toString()
-val paperBranch = property("paperBranch").toString()
-val purpurRepoVal = property("purpurRepo").toString()
-val purpurBranch = property("purpurBranch").toString()
-val pufferfishRepoVal = property("pufferfishRepo").toString()
-val pufferfishBranch = property("pufferfishBranch").toString()
-val isUsePufferfish = property("usePufferfish").toString().toBoolean()
-alwaysUpToDate {
-
-    paperRepo.set(paperRepoVal)
-    paperRef.set(paperBranch)
-    paperCommitName.set("paperCommit")
-
-    purpurRepo.set(purpurRepoVal)
-    purpurRef.set(purpurBranch)
-    purpurCommitName.set("purpurCommit")
-
-    pufferfishRepo.set(pufferfishRepoVal)
-    pufferfishRef.set(pufferfishBranch)
-    usePufferfish.set(isUsePufferfish)
 
+    tasks.withType<JavaCompile> {
+        options.encoding = Charsets.UTF_8.name()
+        options.release = 21
+        options.isFork = true
+    }
+    tasks.withType<Javadoc> {
+        options.encoding = Charsets.UTF_8.name()
+    }
+    tasks.withType<ProcessResources> {
+        filteringCharset = Charsets.UTF_8.name()
+    }
+    tasks.withType<Test> {
+        testLogging {
+            showStackTraces = true
+            exceptionFormat = TestExceptionFormat.FULL
+            events(TestLogEvent.STANDARD_OUT)
+        }
+    }
+    tasks.withType<AbstractArchiveTask>().configureEach {
+        isPreserveFileTimestamps = false
+        isReproducibleFileOrder = true
+    }
 }