Move some tasks to core and other misc cleanup

PaperMC · Dec 21, 2024 · f0563fd · f0563fd
1 parent 6cad4e7
commit f0563fd
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 28 deletions.
diff --git a/paperweight-core/build.gradle.kts b/paperweight-core/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
     implementation(variantOf(libs.diffpatch) { classifier("all") }) {
         isTransitive = false
     }
+    implementation(libs.bundles.cadix)
     shade(libs.jgit)
 
     testImplementation(project(":paperweight-lib", "testClassesJar"))

diff --git a/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/AllTasks.kt b/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/AllTasks.kt
@@ -23,8 +23,8 @@
 package io.papermc.paperweight.core.taskcontainers
 
 import io.papermc.paperweight.DownloadService
-import io.papermc.paperweight.core.coreExt
 import io.papermc.paperweight.core.extension.PaperweightCoreExtension
+import io.papermc.paperweight.core.util.coreExt
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.util.*
 import io.papermc.paperweight.util.constants.*

diff --git a/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/CoreTasks.kt b/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/CoreTasks.kt
@@ -22,15 +22,15 @@
 
 package io.papermc.paperweight.core.taskcontainers
 
-import io.papermc.paperweight.core.coreExt
 import io.papermc.paperweight.core.extension.ForkConfig
+import io.papermc.paperweight.core.tasks.ImportLibraryFiles
+import io.papermc.paperweight.core.tasks.IndexLibraryFiles
 import io.papermc.paperweight.core.tasks.SetupMinecraftSources
+import io.papermc.paperweight.core.tasks.SetupPaperScript
+import io.papermc.paperweight.core.util.coreExt
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.tasks.mache.DecompileJar
 import io.papermc.paperweight.tasks.mache.RemapJar
-import io.papermc.paperweight.tasks.softspoon.ImportLibraryFiles
-import io.papermc.paperweight.tasks.softspoon.IndexLibraryFiles
-import io.papermc.paperweight.tasks.softspoon.SetupPaperScript
 import io.papermc.paperweight.util.*
 import io.papermc.paperweight.util.constants.*
 import io.papermc.paperweight.util.data.mache.*

diff --git a/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/InitialTasks.kt b/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/InitialTasks.kt
@@ -23,8 +23,8 @@
 package io.papermc.paperweight.core.taskcontainers
 
 import io.papermc.paperweight.DownloadService
-import io.papermc.paperweight.core.coreExt
 import io.papermc.paperweight.core.extension.PaperweightCoreExtension
+import io.papermc.paperweight.core.util.coreExt
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.util.*
 import io.papermc.paperweight.util.constants.*

diff --git a/...core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/MinecraftPatchingTasks.kt b/...core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/MinecraftPatchingTasks.kt
@@ -23,14 +23,14 @@
 package io.papermc.paperweight.core.taskcontainers
 
 import io.papermc.paperweight.core.extension.ForkConfig
+import io.papermc.paperweight.core.tasks.ImportLibraryFiles
 import io.papermc.paperweight.core.tasks.SetupForkMinecraftSources
+import io.papermc.paperweight.core.tasks.patching.ApplyFeaturePatches
 import io.papermc.paperweight.core.tasks.patching.ApplyFilePatches
 import io.papermc.paperweight.core.tasks.patching.ApplyFilePatchesFuzzy
+import io.papermc.paperweight.core.tasks.patching.FixupFilePatches
+import io.papermc.paperweight.core.tasks.patching.RebuildFilePatches
 import io.papermc.paperweight.tasks.*
-import io.papermc.paperweight.tasks.softspoon.ApplyFeaturePatches
-import io.papermc.paperweight.tasks.softspoon.FixupFilePatches
-import io.papermc.paperweight.tasks.softspoon.ImportLibraryFiles
-import io.papermc.paperweight.tasks.softspoon.RebuildFilePatches
 import io.papermc.paperweight.util.*
 import io.papermc.paperweight.util.constants.*
 import java.nio.file.Path

diff --git a/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/PatchingTasks.kt b/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/PatchingTasks.kt
@@ -22,12 +22,12 @@
 
 package io.papermc.paperweight.core.taskcontainers
 
+import io.papermc.paperweight.core.tasks.patching.ApplyFeaturePatches
 import io.papermc.paperweight.core.tasks.patching.ApplyFilePatches
 import io.papermc.paperweight.core.tasks.patching.ApplyFilePatchesFuzzy
+import io.papermc.paperweight.core.tasks.patching.FixupFilePatches
+import io.papermc.paperweight.core.tasks.patching.RebuildFilePatches
 import io.papermc.paperweight.tasks.*
-import io.papermc.paperweight.tasks.softspoon.ApplyFeaturePatches
-import io.papermc.paperweight.tasks.softspoon.FixupFilePatches
-import io.papermc.paperweight.tasks.softspoon.RebuildFilePatches
 import io.papermc.paperweight.util.*
 import io.papermc.paperweight.util.constants.paperTaskOutput
 import java.nio.file.Path

diff --git a/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/SpigotTasks.kt b/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/SpigotTasks.kt
@@ -22,8 +22,8 @@
 
 package io.papermc.paperweight.core.taskcontainers
 
-import io.papermc.paperweight.core.coreExt
 import io.papermc.paperweight.core.extension.PaperweightCoreExtension
+import io.papermc.paperweight.core.util.coreExt
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.util.*
 import io.papermc.paperweight.util.constants.*

diff --git a/...ght/tasks/softspoon/ImportLibraryFiles.kt → ...erweight/core/tasks/ImportLibraryFiles.kt b/...ght/tasks/softspoon/ImportLibraryFiles.kt → ...erweight/core/tasks/ImportLibraryFiles.kt
@@ -20,7 +20,7 @@
  * USA
  */
 
-package io.papermc.paperweight.tasks.softspoon
+package io.papermc.paperweight.core.tasks
 
 import com.github.salomonbrys.kotson.typeToken
 import io.papermc.paperweight.PaperweightException

diff --git a/...eight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/SetupForkMinecraftSources.kt b/...eight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/SetupForkMinecraftSources.kt
@@ -22,8 +22,8 @@
 
 package io.papermc.paperweight.core.tasks
 
+import io.papermc.paperweight.core.util.ApplySourceATs
 import io.papermc.paperweight.tasks.*
-import io.papermc.paperweight.tasks.softspoon.ApplySourceATs
 import io.papermc.paperweight.util.*
 import kotlin.io.path.*
 import org.eclipse.jgit.api.Git

diff --git a/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/SetupMinecraftSources.kt b/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/SetupMinecraftSources.kt
@@ -25,8 +25,8 @@ package io.papermc.paperweight.core.tasks
 import codechicken.diffpatch.cli.PatchOperation
 import codechicken.diffpatch.util.LoggingOutputStream
 import codechicken.diffpatch.util.archiver.ArchiveFormat
+import io.papermc.paperweight.core.util.ApplySourceATs
 import io.papermc.paperweight.tasks.*
-import io.papermc.paperweight.tasks.softspoon.ApplySourceATs
 import io.papermc.paperweight.util.*
 import java.nio.file.Path
 import java.util.function.Predicate

diff --git a/...eight/tasks/softspoon/SetupPaperScript.kt → ...aperweight/core/tasks/SetupPaperScript.kt b/...eight/tasks/softspoon/SetupPaperScript.kt → ...aperweight/core/tasks/SetupPaperScript.kt
@@ -20,7 +20,7 @@
  * USA
  */
 
-package io.papermc.paperweight.tasks.softspoon
+package io.papermc.paperweight.core.tasks
 
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.util.*

diff --git a/...ht/tasks/softspoon/ApplyFeaturePatches.kt → ...ore/tasks/patching/ApplyFeaturePatches.kt b/...ht/tasks/softspoon/ApplyFeaturePatches.kt → ...ore/tasks/patching/ApplyFeaturePatches.kt
@@ -20,7 +20,7 @@
  * USA
  */
 
-package io.papermc.paperweight.tasks.softspoon
+package io.papermc.paperweight.core.tasks.patching
 
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.util.*

diff --git a/...eight/tasks/softspoon/FixupFilePatches.kt → ...t/core/tasks/patching/FixupFilePatches.kt b/...eight/tasks/softspoon/FixupFilePatches.kt → ...t/core/tasks/patching/FixupFilePatches.kt
@@ -20,7 +20,7 @@
  * USA
  */
 
-package io.papermc.paperweight.tasks.softspoon
+package io.papermc.paperweight.core.tasks.patching
 
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.util.*

diff --git a/...ght/tasks/softspoon/RebuildFilePatches.kt → ...core/tasks/patching/RebuildFilePatches.kt b/...ght/tasks/softspoon/RebuildFilePatches.kt → ...core/tasks/patching/RebuildFilePatches.kt
@@ -20,12 +20,13 @@
  * USA
  */
 
-package io.papermc.paperweight.tasks.softspoon
+package io.papermc.paperweight.core.tasks.patching
 
 import codechicken.diffpatch.cli.DiffOperation
 import codechicken.diffpatch.util.LogLevel
 import codechicken.diffpatch.util.LoggingOutputStream
 import io.papermc.paperweight.PaperweightException
+import io.papermc.paperweight.core.util.ApplySourceATs
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.util.*
 import java.io.PrintStream

diff --git a/...rweight/tasks/softspoon/ApplySourceATs.kt → ...c/paperweight/core/util/ApplySourceATs.kt b/...rweight/tasks/softspoon/ApplySourceATs.kt → ...c/paperweight/core/util/ApplySourceATs.kt
@@ -20,7 +20,7 @@
  * USA
  */
 
-package io.papermc.paperweight.tasks.softspoon
+package io.papermc.paperweight.core.util
 
 import io.papermc.paperweight.util.*
 import java.nio.file.Path

diff --git a/...tlin/io/papermc/paperweight/core/utils.kt → ...io/papermc/paperweight/core/util/utils.kt b/...tlin/io/papermc/paperweight/core/utils.kt → ...io/papermc/paperweight/core/util/utils.kt
@@ -20,7 +20,7 @@
  * USA
  */
 
-package io.papermc.paperweight.core
+package io.papermc.paperweight.core.util
 
 import io.papermc.paperweight.core.extension.PaperweightCoreExtension
 import io.papermc.paperweight.util.constants.*

diff --git a/...weight/core/tasks/ApplyFilePatchesTest.kt → ...re/tasks/patching/ApplyFilePatchesTest.kt b/...weight/core/tasks/ApplyFilePatchesTest.kt → ...re/tasks/patching/ApplyFilePatchesTest.kt
@@ -20,9 +20,8 @@
  * USA
  */
 
-package io.papermc.paperweight.core.tasks
+package io.papermc.paperweight.core.tasks.patching
 
-import io.papermc.paperweight.core.tasks.patching.ApplyFilePatches
 import io.papermc.paperweight.tasks.*
 import java.nio.file.Path
 import kotlin.test.BeforeTest

diff --git a/...tasks/softspoon/RebuildFilePatchesTest.kt → .../tasks/patching/RebuildFilePatchesTest.kt b/...tasks/softspoon/RebuildFilePatchesTest.kt → .../tasks/patching/RebuildFilePatchesTest.kt
@@ -20,7 +20,7 @@
  * USA
  */
 
-package io.papermc.paperweight.tasks.softspoon
+package io.papermc.paperweight.core.tasks.patching
 
 import io.papermc.paperweight.tasks.*
 import java.nio.file.Path

diff --git a/...ight/tasks/softspoon/ApplySourceATTest.kt → ...perweight/core/util/ApplySourceATsTest.kt b/...ight/tasks/softspoon/ApplySourceATTest.kt → ...perweight/core/util/ApplySourceATsTest.kt
@@ -20,11 +20,11 @@
  * USA
  */
 
-package io.papermc.paperweight.tasks.softspoon
+package io.papermc.paperweight.core.util
 
 import io.papermc.paperweight.tasks.*
 
-class ApplySourceATTest : TaskTest() {
+class ApplySourceATsTest : TaskTest() {
     /* TODO: re-add a test for this
     private lateinit var task: ApplySourceAT