chore: Update conventions plugins

refactor: Merge features project into DI, remove old DI classes

Author: 0ffz

.github/workflows/docs.yml

@@ -5,9 +5,6 @@ on:
   push:
     branches:
       - master
-    paths:
-      - 'docs/**'
-      - .github/workflows/docs.yml
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
@@ -22,19 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: MineInAbyss/publish-action@v3
-        with:
-          publish-github-release: false
-          build-tasks: 'docsGenerate'
-
-      - name: Update HTML links for GitHub Pages subdomain
-        run: |
-          find out -name "*.html" -exec sed -i 's#href="/#href="/Idofront/#g; s#src="/#src="/Idofront/#g' {} \;
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: out
+      - uses: MineInAbyss/publish-action/docs@develop
 
   deploy:
     environment:

build.gradle.kts

@@ -1,9 +1,3 @@
-import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import kotlin.io.path.createFile
-import kotlin.io.path.notExists
-import kotlin.io.path.writeText
-
 plugins {
     java
     alias(libs.plugins.kotlin.jvm) apply false
@@ -12,53 +6,37 @@ plugins {
     alias(miaConventions.plugins.mia.docs)
 }
 
-subprojects {
-    repositories {
-        mavenCentral()
-        maven("https://repo.mineinabyss.com/releases")
-        maven("https://repo.mineinabyss.com/snapshots")
-        maven("https://repo.mineinabyss.com/mirror")
-        maven("https://repo.papermc.io/repository/maven-public/")
-        mavenLocal()
-    }
-
-    tasks {
-        withType<KotlinCompile> {
-            compilerOptions {
-                freeCompilerArgs = listOf(
-                    "-opt-in=kotlin.RequiresOptIn",
-                    "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
-                )
-            }
-        }
-    }
-}
-
-repositories {
-    mavenCentral()
-    maven("https://repo.mineinabyss.com/releases")
-    maven("https://repo.mineinabyss.com/snapshots")
-}
-
 tasks {
+    updateDaemonJvm {
+        languageVersion = JavaLanguageVersion.of(25)
+        vendor = JvmVendorSpec.JETBRAINS
+    }
     dependencyUpdates {
         rejectVersionIf {
             isNonStable(candidate.version)
         }
     }
 
+    val versions = libs.versions
+    val minecraftVersion = versions.minecraft.get()
+    val kotlinVersion = versions.kotlin.get()
+    val javaVersion = versions.java.get()
+
     register("versionInfo") {
-        file("build/versions.md").apply { ensureParentDirsCreated() }.toPath()
-            .also { if (it.notExists()) it.createFile() }
-            .writeText(
+        val outputFile = file("build/versions.md")
+        inputs.properties("minecraft" to minecraftVersion, "kotlin" to kotlinVersion, "java" to javaVersion)
+        outputs.file(outputFile)
+        doLast {
+            outputFile.writeText(
                 """
                 ### Built for
-                | Minecraft | `${libs.versions.minecraft.get().substringBefore("-R")}` |
+                | Minecraft | `${minecraftVersion.substringBefore("-R")}` |
                 |-----------|--|
-                | Kotlin | `${libs.versions.kotlin.get()}` |
-                | Java | `${libs.versions.java.get()}` |
+                | Kotlin | `$kotlinVersion` |
+                | Java | `$javaVersion` |
                 """.trimIndent()
             )
+        }
     }
 }
 
@@ -77,7 +55,3 @@ versionCatalogUpdate {
         keepUnusedVersions = true
     }
 }
-
-idofront {
-    docsVersion = "0.0.4"
-}

gradle.properties

@@ -2,6 +2,6 @@ group=com.mineinabyss
 version=2.0
 # Version to use for our conventions plugins.
 # Idofront will point to this version in its catalog.
-conventionsVersion=1.1.1
+conventionsVersion=1.2.3
 org.gradle.configuration-cache=true
 org.gradle.caching=true

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,13 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ff832c875b57113076fee4f253b26a7d/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/a2f766003b96f64a2ea8b94366df3521/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ff832c875b57113076fee4f253b26a7d/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a2f766003b96f64a2ea8b94366df3521/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9dd431e9b5e0fb4d071f9ec98fdbcf74/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/9b892017f53da3db52320b6c212e6874/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ff832c875b57113076fee4f253b26a7d/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a2f766003b96f64a2ea8b94366df3521/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/f9ff5ae41d9c64bfe1899fd7115dcd2b/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/39ed049e9205de21f33a1ae19ef59436/redirect
+toolchainVendor=JETBRAINS
+toolchainVersion=25

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,24 +1,26 @@
 import me.champeau.gradle.japicmp.JapicmpTask
+import net.minecrell.pluginyml.bukkit.BukkitPluginDescription.PluginLoadOrder
 import kotlin.io.path.isDirectory
 import kotlin.io.path.listDirectoryEntries
+import kotlin.io.path.name
 
 plugins {
     id(miaConventions.plugins.mia.kotlin.jvm.get().pluginId)
-    id(miaConventions.plugins.mia.copyjar.get().pluginId)
+    id("com.mineinabyss.conventions.copyjar")
+//    id(miaConventions.plugins.mia.copyjar.get().pluginId)
     id(miaConventions.plugins.mia.papermc.get().pluginId)
     id("me.champeau.gradle.japicmp") version "0.4.5"
 }
 
-val libs = rootProject.extensions.getByType<VersionCatalogsExtension>().named("libs")
-
 repositories {
     google()
 }
 
 tasks {
     register<JapicmpTask>("checkBreakingChanges") {
+        val pastReleases = isolated.rootProject.projectDirectory.file("past-releases")
         oldClasspath.from(
-            rootProject.file("past-releases").toPath().takeIf { it.isDirectory() }?.listDirectoryEntries()?.firstOrNull()
+            pastReleases.asFile.toPath().takeIf { it.isDirectory() }?.listDirectoryEntries()?.firstOrNull()
         )
         newClasspath.from(shadowJar)
         onlyBinaryIncompatibleModified = true
@@ -31,17 +33,23 @@ tasks {
 }
 
 dependencies {
-    libs.findBundle("platform").get().get().forEach {
+    libs.bundles.platform.get().forEach {
         implementation(it)
     }
 
-    rootProject.subprojects
-        .filter { it.name.startsWith("idofront-") }
+    isolated.rootProject.projectDirectory.asFile.toPath().listDirectoryEntries("idofront-*")
+//        .filter { it.name.startsWith("idofront-") }
         .filter { it.name !in setOf("idofront-catalog", "idofront-catalog-shaded") }
-        .forEach { implementation(project(it.path)) }
+        .forEach { implementation(project(":${it.name}")) }
 }
 
 copyJar {
-    jarName.set("idofront-$version.jar")
-    excludePlatformDependencies.set(false)
+    jarName = "idofront-$version.jar"
+    excludePlatformDependencies = false
 }
+
+paper {
+    main = "com.mineinabyss.idofront.IdofrontPlugin"
+    authors = listOf("Offz", "boy0000")
+    load = PluginLoadOrder.STARTUP
+}

idofront-catalog-shaded/build.gradle.kts

@@ -3,12 +3,14 @@ plugins {
     id(miaConventions.plugins.mia.publication.get().pluginId)
 }
 
+val rootDir = isolated.rootProject.projectDirectory
+
 catalog {
     versionCatalog {
-        from(rootProject.files("gradle/libs.versions.toml"))
+        from(rootDir.files("gradle/libs.versions.toml"))
 
         // Add aliases for all our conventions plugins by copying the catalog provided by the conventions repo
-        val conventions = rootProject.extensions
+        val conventions = extensions
             .getByType<VersionCatalogsExtension>()
             .named("miaConventions")
         version("mia-conventions", miaConventions.versions.mia.conventions.get())
@@ -17,15 +19,14 @@ catalog {
         }
 
         // Add all idofront projects to the catalog
-        rootProject.file(".").list()?.filter { it.startsWith("idofront") }?.forEach { name ->
+        rootDir.asFile.list()?.filter { it.startsWith("idofront") }?.forEach { name ->
             library(name, "com.mineinabyss:$name:$version")
         }
         bundle(
             "idofront-core", listOf(
                 "idofront-commands",
                 "idofront-config",
                 "idofront-di",
-                "idofront-features",
                 "idofront-fonts",
                 "idofront-logging",
                 "idofront-serializers",