From 4a99d25da394dcfe9719f252313b36dd22288667 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Tue, 21 Nov 2023 22:47:11 -0700 Subject: [PATCH] update logging --- build.gradle.kts | 6 ++++++ .../wagyourtail/patchbase/gradle/PatchCreatorPlugin.kt | 10 +++++++--- .../xyz/wagyourtail/patchbase/gradle/PatchPlugin.kt | 4 ++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 88eee0b..81cfc0d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -66,6 +66,12 @@ gradlePlugin { tasks.jar { from(sourceSets.main.get().output, installer.output) + + manifest { + attributes( + "Implementation-Version" to project.version + ) + } } project.evaluationDependsOnChildren() diff --git a/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchCreatorPlugin.kt b/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchCreatorPlugin.kt index 28998c8..5fc55cf 100644 --- a/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchCreatorPlugin.kt +++ b/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchCreatorPlugin.kt @@ -17,20 +17,24 @@ import xyz.wagyourtail.unimined.util.withSourceSet class PatchCreatorPlugin : Plugin { + val pluginVersion: String = PatchCreatorPlugin::class.java.`package`.implementationVersion ?: "unknown" + + override fun apply(target: Project) { + target.logger.lifecycle("[PatchbaseCreator] Plugin Version: $pluginVersion") } } fun MinecraftConfig.patchBaseCreator() { if (side == EnvType.COMBINED) { - project.logger.warn("Merged may make applying patches more difficult, proceed with caution") + project.logger.warn("[PatchBase/Creator ${this.project.path} ${sourceSet}] Merged may make applying patches more difficult, proceed with caution") } if (!defaultRemapJar) { - project.logger.warn("defaultRemapJar is false, this may cause issues with patching") + project.logger.warn("[PatchBase/Creator ${this.project.path} ${sourceSet}] defaultRemapJar is false, this may cause issues with patching") } if (mcPatcher !is JarModAgentMinecraftTransformer) { - project.logger.warn("mcPatcher is not a JarModAgentMinecraftTransformer, this may cause issues with dev runs") + project.logger.warn("[PatchBase/Creator ${this.project.path} ${sourceSet}] mcPatcher is not a JarModAgentMinecraftTransformer, this may cause issues with dev runs") } project.tasks.register("createSourcePatch".withSourceSet(sourceSet), CreateSourcePatchTask::class.java) { diff --git a/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchPlugin.kt b/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchPlugin.kt index 571b9ce..aa9d8eb 100644 --- a/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchPlugin.kt +++ b/src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchPlugin.kt @@ -5,7 +5,11 @@ import org.gradle.api.Project class PatchPlugin : Plugin { + val pluginVersion: String = PatchPlugin::class.java.`package`.implementationVersion ?: "unknown" + + override fun apply(target: Project) { + target.logger.lifecycle("[Patchbase] Plugin Version: $pluginVersion") } }