version 1.0.3

Author: KP2048

.gitignore

@@ -1,7 +1,8 @@
 *.iml
+.idea
 .DS_Store
 .gradle
-/local.properties
+**/local.properties
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml

plugin-build/gradle.properties

@@ -1,5 +1,5 @@
 ID=net.kernelpanicsoft.archie.plugin
-VERSION=1.0.0
+VERSION=1.0.3
 GROUP=net.kernelpanicsoft.archie
 DISPLAY_NAME=Archie gradle plugin
 DESCRIPTION=A gradle plugin for my mods

plugin-build/plugin/build.gradle.kts

@@ -2,6 +2,7 @@ import org.gradle.api.internal.artifacts.DefaultModuleIdentifier
 import org.gradle.api.internal.artifacts.dependencies.DefaultMinimalDependency
 import org.gradle.api.internal.artifacts.dependencies.DefaultMutableVersionConstraint
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.konan.properties.loadProperties
 
 plugins {
     kotlin("jvm")
@@ -11,6 +12,20 @@ plugins {
 	alias(libs.plugins.pluginPublish)
 }
 
+val localProperties = kotlin.runCatching { loadProperties("$rootDir/local.properties") }.getOrNull()
+
+val String.prop: String?
+	get() = rootProject.properties[this] as String?
+
+val String.local: String?
+	get() = localProperties?.get(this) as String?
+
+val String.env: String?
+	get() = System.getenv(this)
+
+val String.localOrEnv: String?
+	get() = localProperties?.get(this)?.toString() ?: System.getenv(this.uppercase())
+
 repositories {
 	mavenCentral()
 	gradlePluginPortal()
@@ -72,11 +87,17 @@ gradlePlugin {
 publishing {
 	repositories {
 		maven {
-			name = "milosworks"
-			url = uri("https://maven.milosworks.xyz/releases")
+			name = "kernelpanic"
+			val releasesRepoUrl = "https://repo.kernelpanicsoft.net/maven/releases"
+			val snapshotsRepoUrl = "https://repo.kernelpanicsoft.net/maven/snapshots"
+			url = uri(
+				if (project.version.toString().endsWith("SNAPSHOT") || project.version.toString()
+						.startsWith("0")
+				) snapshotsRepoUrl else releasesRepoUrl
+			)
 			credentials(PasswordCredentials::class) {
-				username = System.getenv("GRADLE_MAVEN_PUBLISH_KEY")
-				password = System.getenv("GRADLE_MAVEN_PUBLISH_SECRET")
+				username = "gradle_maven_publish_key".localOrEnv
+				password = "gradle_maven_publish_secret".localOrEnv
 			}
 			authentication {
 				create<BasicAuthentication>("basic")

plugin-build/plugin/src/main/kotlin/net/kernelpanicsoft/archie/plugin.gradle.kts

@@ -3,7 +3,6 @@ package net.kernelpanicsoft.archie
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import net.fabricmc.loom.util.ModPlatform
 import net.kernelpanicsoft.archie.plugin.ModResourcesExtension
-import net.kernelpanicsoft.archie.plugin.patchedFMLModType
 import org.jetbrains.kotlin.konan.file.file
 import java.nio.file.FileSystem
 import java.nio.file.FileSystems
@@ -13,7 +12,7 @@ val extension = extensions.create<ModResourcesExtension>("modResources")
 val loom = extensions.getByType<LoomGradleExtensionAPI>()
 
 val versionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
-extension.versions.convention(provider {
+extension.versions = provider {
 	val ret = versionCatalog.versionAliases.associate {
 		// both "." and "-" cause issues with expand :/
 		it.replace(".", "_") to versionCatalog.findVersion(it).get().requiredVersion
@@ -32,12 +31,12 @@ extension.versions.convention(provider {
 
 		else -> ret
 	}
-})
-extension.properties.convention(provider {
+}
+extension.properties = provider {
 	project.properties.mapKeys {
 		it.key.replace(".", "_")
 	}.mapValues { it.value.toString() }
-})
+}
 
 // build logic
 
@@ -105,6 +104,19 @@ abstract class PatchFMLModType : TransformAction<PatchFMLModType.Parameters>
 }
 
 val artifactType: Attribute<String> = Attribute.of("artifactType", String::class.java)
+val patchedFMLModType = Attribute.of("patchedFMLModType", Boolean::class.javaObjectType)
+
+val bundleRuntimeLibraryConfiguration: Configuration by configurations.creating {
+	exclude(group = "com.mojang")
+	exclude(group = "org.jetbrains.kotlin")
+	exclude(group = "org.jetbrains.kotlinx")
+}
+
+val runtimeLibraryConfiguration: Configuration by configurations.creating {
+	exclude(group = "com.mojang")
+	exclude(group = "org.jetbrains.kotlin")
+	exclude(group = "org.jetbrains.kotlinx")
+}
 
 dependencies {
 	attributesSchema {
@@ -120,6 +132,37 @@ dependencies {
 		to.attribute(patchedFMLModType, true).attribute(artifactType, "jar")
 	}
 
-	extensions.add("loom", project.extensions.getByName("loom"))
+//	extensions.add("loom", project.extensions.getByName("loom"))
 }
 
+afterEvaluate {
+	dependencies {
+		bundleRuntimeLibraryConfiguration.resolvedConfiguration.resolvedArtifacts.forEach {
+			"include"(it.moduleVersion.id.toString())
+			when (project.extensions.getByType<LoomGradleExtensionAPI>().platform.get())
+			{
+				ModPlatform.NEOFORGE ->
+					"localRuntime"(it.moduleVersion.id.toString()) {
+						attributes {
+							attribute(patchedFMLModType, true)
+						}
+					}
+
+				else -> Unit
+			}
+		}
+		runtimeLibraryConfiguration.resolvedConfiguration.resolvedArtifacts.forEach {
+			when (project.extensions.getByType<LoomGradleExtensionAPI>().platform.get())
+			{
+				ModPlatform.NEOFORGE ->
+					"localRuntime"(it.moduleVersion.id.toString()) {
+						attributes {
+							attribute(patchedFMLModType, true)
+						}
+					}
+
+				else -> Unit
+			}
+		}
+	}
+}