Softspoon

.editorconfig

@@ -83,3 +83,6 @@ ij_kotlin_field_annotation_wrap = split_into_lines
 ij_kotlin_finally_on_new_line = false
 ij_kotlin_if_rparen_on_new_line = true
 ij_kotlin_import_nested_classes = false
+
+[*.patch]
+trim_trailing_whitespace=false

.github/workflows/deploy-snapshot.yml

@@ -1,7 +1,7 @@
 name: Deploy Snapshot
 on:
   push:
-    branches: [ 'main' ]
+    branches: [ 'main', 'softspoon-v2' ]
     paths-ignore:
       - 'license/*'
       - 'readme.md'
@@ -29,7 +29,7 @@ jobs:
           echo version=$project_version >> $GITHUB_OUTPUT
       - name: Deploy snapshot version
         if: endsWith(steps.get_version.outputs.version, '-SNAPSHOT')
-        run: ./gradlew -Dorg.gradle.parallel=true publish --no-daemon --stacktrace
+        run: ./gradlew -Dorg.gradle.parallel=true publish --no-daemon --stacktrace -Dorg.gradle.internal.http.socketTimeout=90000 -Dorg.gradle.internal.http.connectionTimeout=90000
         env:
           ORG_GRADLE_PROJECT_paperUsername: ${{ secrets.DEPLOY_USER }}
           ORG_GRADLE_PROJECT_paperPassword: ${{ secrets.DEPLOY_PASS }}

.github/workflows/test.yml

@@ -19,4 +19,14 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
       - name: Execute Gradle build
-        run: ./gradlew build --no-daemon --stacktrace
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "GitHub Actions"
+          ./gradlew build --no-daemon --stacktrace
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v4
+        if:  always()
+        with:
+          report_paths: '**/build/test-results/test/TEST-*.xml'
+          detailed_summary: true
+          annotate_notice: true

.gitignore

@@ -43,3 +43,7 @@ ehthumbs_vista.db
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.ja
+
+# todo remove again
+/test/
+/testfork/

buildSrc/src/main/kotlin/config-kotlin.gradle.kts

@@ -1,5 +1,8 @@
 import com.diffplug.gradle.spotless.SpotlessExtension
 import net.kyori.indra.licenser.spotless.IndraSpotlessLicenserExtension
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     idea
@@ -11,20 +14,16 @@ java {
 }
 
 tasks.withType(JavaCompile::class).configureEach {
-    options.release = 11
+    options.release = 17
 }
 
 kotlin {
     jvmToolchain {
         languageVersion = JavaLanguageVersion.of(17)
     }
-    target {
-        compilations.configureEach {
-            kotlinOptions {
-                jvmTarget = "11"
-                freeCompilerArgs = listOf("-Xjvm-default=all", "-Xjdk-release=11")
-            }
-        }
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+        freeCompilerArgs = listOf("-Xjvm-default=all", "-Xjdk-release=17", "-opt-in=kotlin.io.path.ExperimentalPathApi")
     }
 }
 
@@ -38,6 +37,28 @@ repositories {
         mavenContent {
             includeGroup("codechicken")
             includeGroup("net.fabricmc")
+            includeGroupAndSubgroups("io.papermc")
+        }
+    }
+    maven("https://maven.parchmentmc.org") {
+        name = "ParchmentMC"
+        mavenContent {
+            releasesOnly()
+            includeGroupAndSubgroups("org.parchmentmc")
+        }
+    }
+    maven("https://maven.neoforged.net/releases") {
+        name = "NeoForged"
+        mavenContent {
+            releasesOnly()
+            includeGroupAndSubgroups("net.neoforged")
+        }
+    }
+    maven("https://maven.fabricmc.net") {
+        name = "FabricMC"
+        mavenContent {
+            releasesOnly()
+            includeGroupAndSubgroups("net.fabricmc")
         }
     }
     mavenCentral()
@@ -46,7 +67,6 @@ repositories {
 
 dependencies {
     compileOnly(gradleApi())
-    compileOnly(kotlin("stdlib-jdk8"))
 }
 
 testing {
@@ -55,6 +75,16 @@ testing {
             useKotlinTest(embeddedKotlinVersion)
             dependencies {
                 implementation("org.junit.jupiter:junit-jupiter-engine:5.10.1")
+                implementation("org.junit.platform:junit-platform-launcher:1.10.1")
+            }
+
+            targets.configureEach {
+                testTask {
+                    testLogging {
+                        events(TestLogEvent.FAILED)
+                        exceptionFormat = TestExceptionFormat.FULL
+                    }
+                }
             }
         }
     }
@@ -65,7 +95,6 @@ configurations.all {
         return@all
     }
     dependencies.remove(project.dependencies.gradleApi())
-    dependencies.removeIf { it.group == "org.jetbrains.kotlin" }
 }
 
 tasks.jar {

buildSrc/src/main/kotlin/config-publish.gradle.kts

@@ -21,14 +21,19 @@ configurations.implementation {
     extendsFrom(shade)
 }
 
+configurations.shadowRuntimeElements {
+    compatibilityAttributes(objects)
+}
+
 fun ShadowJar.configureStandard() {
     configurations = listOf(shade)
 
     dependencies {
         exclude(dependency("org.jetbrains.kotlin:.*:.*"))
+        exclude(dependency("org.slf4j:.*:.*"))
     }
 
-    exclude("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", "OSGI-INF/**", "*.profile", "module-info.class", "ant_tasks/**")
+    exclude("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", "OSGI-INF/**", "*.profile", "module-info.class", "ant_tasks/**", "OSGI-OPT/**", "META-INF/*.pro")
 
     mergeServiceFiles()
 }
@@ -66,26 +71,36 @@ val shadowJar by tasks.existing(ShadowJar::class) {
 
     val prefix = "paper.libs"
     listOf(
+        "codechicken.diffpatch",
+        /* -> */ "codechicken.repack",
         "com.github.salomonbrys.kotson",
-        "com.google.errorprone.annotations",
         "com.google.gson",
         "dev.denwav.hypo",
+        /* -> */ "org.jgrapht",
+        /* -> */ "org.jheaps",
+        /* -> */ "com.google.errorprone.annotations",
+        /* -> */ "org.objectweb.asm",
         "io.sigpipe.jbsdiff",
-        "me.jamiemansfield",
+        /* -> */ "org.tukaani.xz",
         "net.fabricmc",
-        "org.apache.commons",
-        "org.apache.felix",
         "org.apache.http",
+        /* -> */ "org.apache.commons",
         "org.cadixdev",
-        "org.eclipse",
-        "org.jgrapht",
-        "org.jheaps",
-        "org.objectweb.asm",
-        "org.osgi",
-        "org.tukaani.xz",
-        "org.slf4j",
-        "codechicken.diffpatch",
-        "codechicken.repack"
+        /* -> */ "me.jamiemansfield",
+        "org.parchmentmc.feather",
+        /* -> */ "com.google.common",
+        /* ----> */ "com.google.j2objc",
+        /* ----> */ "com.google.thirdparty",
+        /* ----> */ "org.checkerframework",
+        /* ----> */ "javax.annotation",
+        "org.eclipse.jgit",
+        /* -> */ "com.googlecode.javaewah",
+        /* -> */ "com.googlecode.javaewah32",
+        "kotlinx.coroutines",
+        //"org.slf4j",
+        // used by multiple
+        "org.intellij.lang",
+        "org.jetbrains.annotations"
     ).forEach { pack ->
         relocate(pack, "$prefix.$pack")
     }

buildSrc/src/main/kotlin/utils.kt

@@ -0,0 +1,12 @@
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.attributes.java.TargetJvmVersion
+import org.gradle.api.attributes.plugin.GradlePluginApiVersion
+import org.gradle.api.model.ObjectFactory
+import org.gradle.kotlin.dsl.*
+
+fun Configuration.compatibilityAttributes(objects: ObjectFactory) {
+    attributes {
+        attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
+        attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, objects.named("8.11.1"))
+    }
+}

gradle.properties

@@ -1,5 +1,5 @@
 group = io.papermc.paperweight
-version = 1.7.8-SNAPSHOT
+version = 2.0.0-SNAPSHOT
 
 org.gradle.caching = true
 org.gradle.parallel = true

gradle/libs.versions.toml

@@ -1,46 +1,60 @@
 [versions]
-asm = "9.7"
+asm = "9.7.1"
 lorenz = "0.5.8"
 hypo = "1.2.4"
+serialize = "1.5.1"
+feather = "1.1.0"
+restamp = "1.1.0"
 
 [libraries]
 asm-core = { module = "org.ow2.asm:asm", version.ref = "asm" }
 asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }
 
 httpclient = "org.apache.httpcomponents:httpclient:4.5.14"
 kotson = "com.github.salomonbrys.kotson:kotson:2.5.0"
+coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2"
+jgit = "org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r"
 gson = "com.google.code.gson:gson:2.10.1"
 
 cadix-lorenz-core = { module = "org.cadixdev:lorenz", version.ref = "lorenz" }
 cadix-lorenz-asm = { module = "org.cadixdev:lorenz-asm", version.ref = "lorenz" }
 cadix-lorenz-proguard = { module = "org.cadixdev:lorenz-io-proguard", version.ref = "lorenz" }
 cadix-atlas = "org.cadixdev:atlas:0.2.1"
 cadix-at = "org.cadixdev:at:0.1.0-rc1"
-cadix-mercury = "org.cadixdev:mercury:0.1.2-paperweight-SNAPSHOT"
 
 hypo-model = { module = "dev.denwav.hypo:hypo-model", version.ref = "hypo" }
 hypo-core = { module = "dev.denwav.hypo:hypo-core", version.ref = "hypo" }
 hypo-hydrate = { module = "dev.denwav.hypo:hypo-hydrate", version.ref = "hypo" }
 hypo-asm-core = { module = "dev.denwav.hypo:hypo-asm", version.ref = "hypo" }
 hypo-asm-hydrate = { module = "dev.denwav.hypo:hypo-asm-hydrate", version.ref = "hypo" }
 hypo-mappings = { module = "dev.denwav.hypo:hypo-mappings", version.ref = "hypo" }
-slf4j-jdk14 = "org.slf4j:slf4j-jdk14:1.7.32"
 
 lorenzTiny = "net.fabricmc:lorenz-tiny:3.0.0"
 jbsdiff = "io.sigpipe:jbsdiff:1.0"
 
-diffpatch = "codechicken:DiffPatch:1.5.0.29"
+feather-core = { module = "org.parchmentmc:feather", version.ref = "feather" }
+feather-gson = { module = "org.parchmentmc.feather:io-gson", version.ref = "feather" }
+
+diffpatch = "codechicken:DiffPatch:1.5.0.30"
+
+serialize-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialize" }
+serialize-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialize" }
+
+restamp = {module = "io.papermc.restamp:restamp", version.ref = "restamp" }
+
+# test
+mockk = "io.mockk:mockk:1.13.8"
 
 # Gradle
 gradle-licenser = "net.kyori:indra-licenser-spotless:3.1.3"
 gradle-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.23.1"
 gradle-shadow = "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:8.1.1"
-gradle-kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.3.0"
+gradle-kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:5.1.1"
 gradle-plugin-kotlin = { module = "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin" }
 gradle-plugin-publish = "com.gradle.publish:plugin-publish-plugin:1.2.1"
 
 [bundles]
 asm = ["asm-core", "asm-tree"]
-cadix = ["cadix-lorenz-core", "cadix-lorenz-asm", "cadix-lorenz-proguard", "cadix-atlas", "cadix-at", "cadix-mercury"]
+cadix = ["cadix-lorenz-core", "cadix-lorenz-asm", "cadix-lorenz-proguard", "cadix-atlas", "cadix-at"]
 hypo = ["hypo-model", "hypo-core", "hypo-hydrate", "hypo-asm-core", "hypo-asm-hydrate", "hypo-mappings"]
 kotson = ["kotson", "gson"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################