From ab198758a890ae302be58303e49c4e3396cb0e60 Mon Sep 17 00:00:00 2001 From: Erdragh Date: Fri, 7 Feb 2025 18:33:27 +0100 Subject: [PATCH] Improve gradle build setup --- .gitignore | 1 + build.gradle.kts | 276 +----------------- buildSrc/build.gradle.kts | 14 + buildSrc/settings.gradle.kts | 7 + .../src/main/groovy/multiloader-common.gradle | 202 +++++++++++++ .../src/main/groovy/multiloader-loader.gradle | 100 +++++++ common/build.gradle.kts | 55 ++-- .../main/kotlin/dev/erdragh/astralbot/Bot.kt | 5 +- fabric/build.gradle.kts | 69 ++--- .../dev/erdragh/astralbot/fabric/BotMod.kt | 4 +- fabric/src/main/resources/fabric.mod.json | 2 +- gradle.properties | 37 +-- gradle/libs.versions.toml | 22 -- gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 +- gradlew.bat | 2 + libs.versions.toml | 61 ++++ neoforge/build.gradle.kts | 42 +-- .../dev/erdragh/astralbot/neoforge/BotMod.kt | 4 +- .../resources/META-INF/neoforge.mods.toml | 8 +- settings.gradle.kts | 4 +- 22 files changed, 491 insertions(+), 430 deletions(-) create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/settings.gradle.kts create mode 100644 buildSrc/src/main/groovy/multiloader-common.gradle create mode 100644 buildSrc/src/main/groovy/multiloader-loader.gradle delete mode 100644 gradle/libs.versions.toml create mode 100644 libs.versions.toml diff --git a/.gitignore b/.gitignore index f95b34b..5380871 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ faq # Minecraft **/run +**/runs # Architectury .architectury-transformer \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 3acfeb8..ba23668 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,278 +1,12 @@ -import org.jetbrains.kotlin.gradle.utils.extendsFrom -import java.nio.charset.StandardCharsets -import java.text.SimpleDateFormat -import java.util.* - plugins { - // Since this mod/bot is written in Kotlin and expected to run on Minecraft and as such - // the JVM, the Kotlin plugin is needed - alias(libs.plugins.kotlin) - // For generating documentation based on comments in the code - alias(libs.plugins.dokka) - java - // Required for NeoGradle - idea - // For publishing the mod - alias(libs.plugins.publish) - - // NeoForge and Common development - alias(libs.plugins.moddev) apply false - // Fabric development + // see https://fabricmc.net/develop/ for new versions alias(libs.plugins.loom) apply false + // see https://projects.neoforged.net/neoforged/moddevgradle for new versions + alias(libs.plugins.moddev) apply false + // so we can enable soruce download + idea } -val minecraftVersion: String by project - -repositories { - mavenCentral() -} - -subprojects { - apply(plugin = "java") - apply(plugin = rootProject.libs.plugins.publish.get().pluginId) - - // Gets some values from the gradle.properties files in the - // sub- and root projects - val modLoader = project.name - val modId: String by project - val modName = rootProject.name - val modAuthor: String by project - val isCommon = modLoader == rootProject.projects.common.name - - base { - // This will be the final name of the exported JAR file - archivesName.set("$modId-$modLoader-$minecraftVersion") - } - - extensions.configure { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - withSourcesJar() - } - - repositories { - mavenCentral() - maven(url = "https://maven.neoforged.net/releases/") - maven("https://repo.spongepowered.org/repository/maven-public/") { name = "Sponge / Mixin" } - maven("https://maven.blamejared.com") { name = "BlameJared Maven (JEI / CraftTweaker / Bookshelf)" } - // For the parchment mappings - maven(url = "https://maven.parchmentmc.org") - maven(url = "https://maven.resourcefulbees.com/repository/maven-public/") - maven { - name = "Kotlin for Forge" - setUrl("https://thedarkcolour.github.io/KotlinForForge/") - } - // Forge Config API port - maven { - name = "Fuzs Mod Resources" - setUrl("https://raw.githubusercontent.com/Fuzss/modresources/main/maven/") - } - } - - // Configuration for JiJ-ed dependencies - val includeBotDep by configurations.registering { - isTransitive = false - } - // Configuration for libraries that are needed at runtime - val runtimeLib by configurations.registering { - isTransitive = false - } - // Configuration for depending on the common project - val commonDep by configurations.creating - configurations.implementation.extendsFrom(configurations.named(includeBotDep.name)) - configurations.implementation.extendsFrom(configurations.named(runtimeLib.name)) - configurations.implementation.extendsFrom(configurations.named(commonDep.name)) - - dependencies { - arrayOf( - // Library to build a connection with the sqlite database - rootProject.libs.sqlite, - // Library used to parse and convert markdown - rootProject.libs.commonmark, - - // Library used to communicate with Discord, see https://jda.wiki - rootProject.jda.jda, - // JDA's dependencies - rootProject.jda.commons.collections, - rootProject.jda.trove4j, - rootProject.jda.jackson.annotations, - rootProject.jda.jackson.core, - rootProject.jda.jackson.databind, - rootProject.jda.websocket, - rootProject.jda.okhttp, - rootProject.jda.okio, - rootProject.jda.tink, - // Library used for sending messages via Discord Webhooks - rootProject.dcwebhooks.webhooks, - rootProject.dcwebhooks.json, - - // Library to interact with the SQLite database, - // see: https://github.com/JetBrains/Exposed - rootProject.exposed.core, - rootProject.exposed.dao, - rootProject.exposed.jdbc - ).forEach { - runtimeLib(it) { - exclude(module = "opus-java") - exclude(group = "org.slf4j") - exclude(group = "org.jetbrains.kotlin") - exclude(group = "org.jetbrains.kotlinx") - } - includeBotDep(it) { - exclude(module = "opus-java") - exclude(group = "org.slf4j") - exclude(group = "org.jetbrains.kotlin") - exclude(group = "org.jetbrains.kotlinx") - } - } - } - - tasks.test { - // There are no tests and the Neo build fails - exclude("**/*") - } - - java { - withSourcesJar() - modularity.inferModulePath = true - } - - tasks.jar { - from(rootProject.file("LICENSE")) { - rename { "${it}_$modId" } - } - - manifest { - attributes( - "Specification-Title" to modId, - "Specification-Vendor" to modAuthor, - "Specification-Version" to archiveVersion, - "Implementation-Title" to project.name, - "Implementation-Version" to archiveVersion, - "Implementation-Vendor" to modAuthor, - "Implementation-Timestamp" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(Date()), - "Timestamp" to System.currentTimeMillis(), - "Built-On-Java" to "${System.getProperty("java.vm.version")} (${System.getProperty("java.vm.vendor")})", - "Built-On-Minecraft" to minecraftVersion - ) - } - } - - tasks.processResources { - val version: String by project - val group: String by project - val minecraftVersionRange: String by project - val fabricApiVersion: String by project - val fabricLoaderVersion: String by project - val fabricKotlinVersion: String by project - val neoVersion: String by project - val neoVersionRange: String by project - val kffLoaderRange: String by project - val license: String by project - val description: String by project - val credits: String by project - - val expandProps = mapOf( - "version" to version, - "group" to group, //Else we target the task's group. - "minecraft_version" to minecraftVersion, - "minecraft_version_range" to minecraftVersionRange, - "fabric_version" to fabricApiVersion, - "fabric_loader_version" to fabricLoaderVersion, - "fabric_kotlin_version" to fabricKotlinVersion, - "neoforge_version" to neoVersion, - "neoforge_loader_version_range" to neoVersionRange, - "kff_loader_range" to kffLoaderRange, - "mod_name" to modName, - "mod_author" to modAuthor, - "mod_id" to modId, - "license" to license, - "description" to description, - "credits" to credits - ) - - filesMatching(listOf("pack.mcmeta", "*.mixins.json", "META-INF/*.mods.toml", "fabric.mod.json")) { - expand(expandProps) - } - inputs.properties(expandProps) - } - - if (!isCommon) { - dependencies { - commonDep(project(":common")) { - isTransitive = false - } - } - - tasks.jar { - dependsOn(project(":common").tasks.jar) - from(project(":common").sourceSets.main.get().output) - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - } - } - - // Disables Gradle's custom module metadata from being published to maven. The - // metadata includes mapped dependencies which are not reasonably consumable by - // other mod developers. - tasks.withType { - enabled = false - } - - tasks.withType { - options.encoding = "UTF-8" - targetCompatibility = JavaVersion.VERSION_21.majorVersion - sourceCompatibility = JavaVersion.VERSION_21.majorVersion - } - - // Publishing settings - if (!isCommon) { - publishMods { - // These titles get used based on subproject name - val titles by extra { - mapOf( - "fabric" to "Fabric", - "neoforge" to "NeoForge", - "forge" to "Forge", - "quilt" to "Quilt" - ) - } - val curseforgePublish by extra { - curseforgeOptions { - accessToken = providers.environmentVariable("CURSEFORGE_TOKEN") - minecraftVersions.add(minecraftVersion) - projectId = providers.environmentVariable("CURSEFORGE_ID") - embeds("sqlite-jdbc") - } - } - val modrinthPublish by extra { - modrinthOptions { - accessToken = providers.environmentVariable("MODRINTH_TOKEN") - minecraftVersions.add(minecraftVersion) - projectId = providers.environmentVariable("MODRINTH_ID") - embeds("sqlite-jdbc") - } - } - val changelog by extra { - // Only gets the lines for the latest version from the Changelog - // file. This allows me to keep all previous changes in the file - // without having to worry about them being included on new file - // uploads. - File(rootDir, "CHANGELOG.md") - .readText(StandardCharsets.UTF_8) - .replace(Regex("[^^](#(#|\\n|.)+)|(^#.+)"), "") - .trim() - } - val type by extra { - STABLE - } - } - } -} - -kotlin { - jvmToolchain(21) -} - - // IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior. idea { module { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..f80c745 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,14 @@ +plugins { + id("groovy-gradle-plugin") +} + +dependencies { + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}") + implementation("org.jetbrains.dokka:dokka-gradle-plugin:${libs.versions.dokka.get()}") + implementation("me.modmuss50:mod-publish-plugin:${libs.versions.publish.get()}") +} + +repositories { + mavenCentral() + gradlePluginPortal() +} \ No newline at end of file diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts new file mode 100644 index 0000000..36adc8e --- /dev/null +++ b/buildSrc/settings.gradle.kts @@ -0,0 +1,7 @@ +dependencyResolutionManagement { + versionCatalogs { + register("libs") { + from(files("../libs.versions.toml")) + } + } +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/multiloader-common.gradle b/buildSrc/src/main/groovy/multiloader-common.gradle new file mode 100644 index 0000000..230938e --- /dev/null +++ b/buildSrc/src/main/groovy/multiloader-common.gradle @@ -0,0 +1,202 @@ +import org.jetbrains.dokka.gradle.DokkaTaskPartial + +plugins { + id 'java-library' + id 'maven-publish' + id "org.jetbrains.kotlin.jvm" + id "org.jetbrains.dokka" +} + +base { + archivesName = "${modId}-${project.name}-${libs.versions.minecraft.get()}" +} + +java { + toolchain.languageVersion = JavaLanguageVersion.of(libs.versions.java.get()) + withSourcesJar() + withJavadocJar() +} + +kotlin { + jvmToolchain(Integer.parseInt(libs.versions.java.get())) +} + +repositories { + mavenCentral() + exclusiveContent { + forRepositories( + maven { + name = 'ParchmentMC' + url = 'https://maven.parchmentmc.org/' + }, + maven { + name = "NeoForge" + url = 'https://maven.neoforged.net/releases' + } + ) + filter { includeGroup('org.parchmentmc.data') } + } + maven { + name = 'BlameJared' + url = 'https://maven.blamejared.com' + } + maven { + name = "kotlinforforge" + url = "https://thedarkcolour.github.io/KotlinForForge/" + } + maven { + name = "Sponge / Mixin" + url = "https://repo.spongepowered.org/repository/maven-public/" + } + // Forge Config API port + maven { + name = "Fuzs Mod Resources" + setUrl("https://raw.githubusercontent.com/Fuzss/modresources/main/maven/") + } +} + +// Declare capabilities on the outgoing configurations. +// Read more about capabilities here: https://docs.gradle.org/current/userguide/component_capabilities.html#sec:declaring-additional-capabilities-for-a-local-component +['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements'].each { variant -> + configurations."$variant".outgoing { + capability("$group:${base.archivesName.get()}:$version") + capability("$group:$modId-${project.name}-${libs.versions.minecraft.get()}:$version") + capability("$group:$modId:$version") + } + publishing.publications.configureEach { + suppressPomMetadataWarningsFor(variant) + } +} + +sourcesJar { + from(rootProject.file('LICENSE')) { + rename { "${it}_${modId}" } + } +} + +jar { + from(rootProject.file('LICENSE')) { + rename { "${it}_${modId}" } + } + + manifest { + attributes([ + 'Specification-Title' : modName, + 'Specification-Vendor' : modAuthor, + 'Specification-Version' : project.jar.archiveVersion, + 'Implementation-Title' : project.name, + 'Implementation-Version': project.jar.archiveVersion, + 'Implementation-Vendor' : modAuthor, + 'Built-On-Minecraft' : libs.versions.minecraft.get() + ]) + } +} + +tasks.withType(DokkaTaskPartial).configureEach { + dokkaSourceSets.configureEach { + includeNonPublic = false + skipDeprecated = false + reportUndocumented = false + jdkVersion = Integer.parseInt(libs.versions.java.get()) + sourceRoots.from(sourceSets.main.allSource) + } +} + +// Prevent the default javadoc task from running, as Dokka is +// responsible for generating the docs now +tasks.named("javadoc", Javadoc) { + enabled = false +} + +// Make the javadoc jar take in the Dokka output +tasks.named("javadocJar", Jar) { + dependsOn(tasks.named("dokkaJavadoc")) + from(tasks.named("dokkaJavadoc")) +} + +processResources { + var expandProps = [ + 'version' : version, + 'group' : project.group, //Else we target the task's group. + 'minecraft_version' : libs.versions.minecraft.get(), + 'minecraft_version_range' : libs.versions.minecraftRange.get(), + 'fabric_version' : libs.versions.fabricApi.get(), + 'fabric_loader_version' : libs.versions.fabricLoader.get(), + 'flk_version' : libs.versions.flk.get(), + 'mod_name' : modName, + 'mod_author' : modAuthor, + 'mod_id' : modId, + 'license' : license, + 'description' : project.description, + 'neoforge_version' : libs.versions.neoforge.get(), + 'neoforge_range' : libs.versions.neoforgeRange.get(), + 'kff_version' : libs.versions.kff.get(), + 'kff_version_range' : libs.versions.kffRange.get(), + 'credits' : credits, + 'java_version' : libs.versions.java.get() + ] + + filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/neoforge.mods.toml', '*.mixins.json']) { + expand expandProps + } + inputs.properties(expandProps) +} + +publishing { + publications { + register('mavenJava', MavenPublication) { + artifactId base.archivesName.get() + from components.java + } + } + repositories { + maven { + url System.getenv('local_maven_url') + } + } +} + +configurations { + botLib { + transitive = false + } + implementation.extendsFrom(botLib) +} + +dependencies { + [ + // Library to build a connection with the sqlite database + libs.sqlite, + // Library used to parse and convert markdown + libs.commonmark, + + // Library used to communicate with Discord, see https://jda.wiki + jda.jda, + // JDA's dependencies + jda.commons.collections, + jda.trove4j, + jda.jackson.annotations, + jda.jackson.core, + jda.jackson.databind, + jda.websocket, + jda.okhttp, + jda.okio, + jda.tink, + // Library used for sending messages via Discord Webhooks + dcwebhooks.webhooks, + dcwebhooks.json, + + // Library to interact with the SQLite database, + // see: https://github.com/JetBrains/Exposed + exposed.core, + exposed.dao, + exposed.jdbc, + ].forEach { + botLib(it) { + exclude group: "org.slf4j" + exclude group: "org.jetbrains.kotlin" + exclude group: "org.jetbrains.kotlinx" + exclude module: "opus-java" + } + } +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/multiloader-loader.gradle b/buildSrc/src/main/groovy/multiloader-loader.gradle new file mode 100644 index 0000000..b5f701a --- /dev/null +++ b/buildSrc/src/main/groovy/multiloader-loader.gradle @@ -0,0 +1,100 @@ +import org.jetbrains.dokka.gradle.DokkaTask + +import java.nio.charset.StandardCharsets +import java.nio.file.Files + +plugins { + id 'multiloader-common' + id "org.jetbrains.kotlin.jvm" + id "me.modmuss50.mod-publish-plugin" +} + +configurations { + commonJava { + canBeResolved = true + } + commonKotlin { + canBeResolved = true + } + commonResources { + canBeResolved = true + } +} + +dependencies { + compileOnly(project(':common')) { + capabilities { + requireCapability "$group:$modId" + } + } + commonJava project(path: ':common', configuration: 'commonJava') + commonKotlin project(path: ':common', configuration: 'commonKotlin') + commonResources project(path: ':common', configuration: 'commonResources') +} + +tasks.named('compileJava', JavaCompile) { + dependsOn(configurations.commonJava) + source(configurations.commonJava) +} + +tasks.named('compileKotlin') { + dependsOn(configurations.commonKotlin) + dependsOn(configurations.commonJava) + source(configurations.commonJava) + source(configurations.commonKotlin) +} + +processResources { + dependsOn(configurations.commonResources) + from(configurations.commonResources) +} + +tasks.named('sourcesJar', Jar) { + dependsOn(configurations.commonJava) + from(configurations.commonJava) + dependsOn(configurations.commonKotlin) + from(configurations.commonKotlin) + dependsOn(configurations.commonResources) + from(configurations.commonResources) +} + +// Use dokka to generate javadoc for both Java and Kotlin sources +// instead of using the builtin javadoc tools. This allows mixing +// Kotlin and Java +tasks.named("dokkaJavadoc", DokkaTask) { + dependsOn(configurations.commonJava) + dependsOn(configurations.commonKotlin) + dokkaSourceSets.configureEach { + sourceRoots.from(configurations.commonJava.singleFile, configurations.commonKotlin.singleFile) + } +} + + +// These titles get used based on subproject name +ext.titles = [ + "fabric" : "Fabric", + "neoforge" : "NeoForge", + "forge" : "Forge" +] +ext.curseforgePublish = publishMods.curseforgeOptions { + accessToken = providers.environmentVariable("CURSEFORGE_TOKEN") + minecraftVersions.add(libs.versions.minecraft.get()) + projectId = providers.environmentVariable("CURSEFORGE_ID") + embeds("sqlite-jdbc") +} +ext.modrinthPublish = publishMods.modrinthOptions { + accessToken = providers.environmentVariable("MODRINTH_TOKEN") + minecraftVersions.add(libs.versions.minecraft.get()) + projectId = providers.environmentVariable("MODRINTH_ID") + embeds("sqlite-jdbc") +} + +// Only gets the lines for the latest version from the Changelog +// file. This allows me to keep all previous changes in the file +// without having to worry about them being included on new file +// uploads. +ext.changelog = Files.readString(rootDir.toPath().resolve("CHANGELOG.md")) + .replaceAll("[^^](#(#|\\n|.)+)|(^#.+)", "") + .trim() + +ext.type = publishMods.STABLE \ No newline at end of file diff --git a/common/build.gradle.kts b/common/build.gradle.kts index e1d4819..31502b6 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,30 +1,49 @@ plugins { - idea - java - alias(libs.plugins.kotlin) + id("multiloader-common") alias(libs.plugins.moddev) } -val neoformVersion: String by project -val minecraftVersion: String by project -val mcVersion = minecraftVersion -val parchmentVersion: String by project -val parchmentMinecraft: String by project -val modId: String by project - neoForge { - neoFormVersion = neoformVersion - + neoFormVersion = libs.versions.neoForm.get() + // Automatically enable AccessTransformers if the file exists + val at = file("src/main/resources/META-INF/accesstransformer.cfg") + if (at.exists()) { + accessTransformers.from(at.absolutePath) + } parchment { - minecraftVersion = parchmentMinecraft - mappingsVersion = parchmentVersion + minecraftVersion = libs.versions.parchmentMC + mappingsVersion = libs.versions.parchment } } dependencies { - val forgeConfigAPIVersion: String by project + api(libs.slf4j) + compileOnly(libs.kotlinx.coroutines) + compileOnly(libs.mixin) + // fabric and neoforge both bundle mixinextras, so it is safe to use it in common + compileOnly(libs.mixinExtras.common) + annotationProcessor(libs.mixinExtras.common) + + api(libs.fcapi.common) +} + +configurations { + create("commonJava") { + isCanBeResolved = false + isCanBeConsumed = true + } + create("commonKotlin") { + isCanBeResolved = false + isCanBeConsumed = true + } + create("commonResources") { + isCanBeResolved = false + isCanBeConsumed = true + } +} - api("fuzs.forgeconfigapiport:forgeconfigapiport-common-neoforgeapi:$forgeConfigAPIVersion") - compileOnly("org.spongepowered:mixin:0.8.7") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") +artifacts { + add("commonJava", sourceSets.main.get().java.sourceDirectories.singleFile) + add("commonKotlin", sourceSets.main.get().kotlin.sourceDirectories.filter { !it.name.endsWith("java") }.singleFile) + add("commonResources", sourceSets.main.get().resources.sourceDirectories.singleFile) } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/erdragh/astralbot/Bot.kt b/common/src/main/kotlin/dev/erdragh/astralbot/Bot.kt index 6ae89a3..fe2f4cc 100644 --- a/common/src/main/kotlin/dev/erdragh/astralbot/Bot.kt +++ b/common/src/main/kotlin/dev/erdragh/astralbot/Bot.kt @@ -1,5 +1,6 @@ package dev.erdragh.astralbot +import com.mojang.logging.LogUtils import dev.erdragh.astralbot.listeners.CommandHandlingListener import dev.erdragh.astralbot.listeners.UserEventListener import dev.erdragh.astralbot.config.AstralBotConfig @@ -13,8 +14,6 @@ import net.dv8tion.jda.api.entities.Guild import net.dv8tion.jda.api.entities.channel.concrete.TextChannel import net.dv8tion.jda.api.requests.GatewayIntent import net.minecraft.server.MinecraftServer -import org.slf4j.Logger -import org.slf4j.LoggerFactory import java.io.File import java.time.Duration import java.time.LocalDateTime @@ -23,7 +22,7 @@ import kotlin.io.path.absolute import kotlin.properties.Delegates const val MODID = "astralbot" -val LOGGER: Logger = LoggerFactory.getLogger(MODID) +val LOGGER = LogUtils.getLogger() private lateinit var startTimestamp: LocalDateTime var minecraftHandler: MinecraftHandler? = null diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 6fde5f2..ba625b1 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -3,68 +3,59 @@ import me.modmuss50.mpp.platforms.curseforge.CurseforgeOptions import me.modmuss50.mpp.platforms.modrinth.ModrinthOptions plugins { - java - alias(libs.plugins.kotlin) - idea + id("multiloader-loader") alias(libs.plugins.loom) - alias(libs.plugins.publish) } val modId: String by project -val includeBotDep: Configuration by configurations.getting +val botLib: Configuration by configurations.getting dependencies { - mappings(loom.officialMojangMappings()) - val minecraftVersion: String by project - val fabricLoaderVersion: String by project - val fabricApiVersion: String by project - val fabricKotlinVersion: String by project - val forgeConfigAPIVersion: String by project + minecraft(libs.minecraft) + mappings(loom.layered { + officialMojangMappings() + parchment("org.parchmentmc.data:parchment-${libs.versions.parchmentMC.get()}:${libs.versions.parchment.get()}@zip") + }) + modImplementation(libs.fabricLoader) + modImplementation(libs.fabricApi) - minecraft("com.mojang:minecraft:${minecraftVersion}") + modImplementation(libs.flk) - modImplementation(group = "net.fabricmc", name = "fabric-loader", version = fabricLoaderVersion) - modApi(group = "net.fabricmc.fabric-api", name = "fabric-api", version = "$fabricApiVersion+$minecraftVersion") - modImplementation("net.fabricmc:fabric-language-kotlin:${fabricKotlinVersion}") + modApi(libs.fcapi.fabric) - modApi("fuzs.forgeconfigapiport:forgeconfigapiport-fabric:$forgeConfigAPIVersion") - - includeBotDep.dependencies.forEach { include(it) } + botLib.dependencies.forEach { include(it) } } loom { - serverOnlyMinecraftJar() - - if (project(":common").file("src/main/resources/${modId}.accesswidener").exists()) - accessWidenerPath.set(project(":common").file("src/main/resources/${modId}.accesswidener")) - - @Suppress("UnstableApiUsage") + val aw = project(":common").file("src/main/resources/${modId}.accesswidener") + if (aw.exists()) { + accessWidenerPath.set(aw) + } mixin { - // TODO: Somehow figure out a way to get loom to create a refmap for common mixins - // add(project(":common").sourceSets.main.get()) defaultRefmapName.set("${modId}.refmap.json") } - - mods { - create("astralbot") { - sourceSet(sourceSets.main.get()) - } - } - runs { + named("client") { + client() + setConfigName("Fabric Client") + ideConfigGenerated(true) + mkdir("runs/server") + runDir("runs/client") + } named("server") { server() - configName = "Fabric Server" + setConfigName("Fabric Server") ideConfigGenerated(true) - runDir("run") + mkdir("runs/server") + runDir("runs/server") } } } publishMods { - val minecraftVersion: String by project - val title: String by project + val minecraftVersion = libs.versions.minecraft.get() + val modName: String by project val version: String by project val titles: Map by extra @@ -79,7 +70,7 @@ publishMods { modLoaders.add(project.name) file.set(tasks.remapJar.get().archiveFile) additionalFiles.plus(tasks.sourcesJar.get().archiveFile) - displayName = "$title $version ${titles[project.name]} $minecraftVersion" + displayName = "$modName $version ${titles[project.name]} $minecraftVersion" this.version = "$version-mc$minecraftVersion-${project.name}" requires("fabric-language-kotlin", "forge-config-api-port-fabric", "fabric-api") } @@ -89,7 +80,7 @@ publishMods { modLoaders.add(project.name) file.set(tasks.remapJar.get().archiveFile) additionalFiles.plus(tasks.sourcesJar.get().archiveFile) - displayName = "$title $version ${titles[project.name]} $minecraftVersion" + displayName = "$modName $version ${titles[project.name]} $minecraftVersion" this.version = "$version-mc$minecraftVersion-${project.name}" requires("fabric-language-kotlin", "forge-config-api-port", "fabric-api") } diff --git a/fabric/src/main/kotlin/dev/erdragh/astralbot/fabric/BotMod.kt b/fabric/src/main/kotlin/dev/erdragh/astralbot/fabric/BotMod.kt index ac327fd..4bec884 100644 --- a/fabric/src/main/kotlin/dev/erdragh/astralbot/fabric/BotMod.kt +++ b/fabric/src/main/kotlin/dev/erdragh/astralbot/fabric/BotMod.kt @@ -17,8 +17,8 @@ import net.neoforged.fml.config.ModConfig object BotMod : ModInitializer { override fun onInitialize() { - NeoForgeConfigRegistry.INSTANCE.register(MODID, ModConfig.Type.SERVER, AstralBotConfig.SPEC) - NeoForgeConfigRegistry.INSTANCE.register(MODID, ModConfig.Type.SERVER, AstralBotTextConfig.SPEC, "astralbot-text.toml") + NeoForgeConfigRegistry.INSTANCE.register(MODID, ModConfig.Type.COMMON, AstralBotConfig.SPEC, "astralbot-server.toml") + NeoForgeConfigRegistry.INSTANCE.register(MODID, ModConfig.Type.COMMON, AstralBotTextConfig.SPEC, "astralbot-text.toml") NeoForgeModConfigEvents.reloading(MODID).register { // Updates the webhook client if the URL changed diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 4d4bb75..aa7852b 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -31,7 +31,7 @@ "fabric": "*", "minecraft": ">=${minecraft_version}", "java": ">=17", - "fabric-language-kotlin": ">=${fabric_kotlin_version}", + "fabric-language-kotlin": ">=${flk_version}", "forgeconfigapiport": ">=20.0.0" } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a5ee74b..a4644a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,45 +4,12 @@ org.gradle.jvmargs=-Xmx3G -XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4 # Minecraft things enabledPlatforms=fabric,neoforge -# Fabric -fabricLoaderVersion=0.16.3 -fabricApiVersion=0.102.0 -fabricKotlinVersion=1.12.2+kotlin.2.0.20 - -# Neo -neoVersion=21.1.66 -neoVersionRange=[21.0,21.1) -kotlinForgeVersion=5.5.0 -kffLoaderRange=[5,) - version=1.5.3 group=dev.erdragh.astralbot +modName=AstralBot modId=astralbot modAuthor=Erdragh license=MIT -title=AstralBot description=Discord Bot and Minecraft Mod in one bundle. -credits=Erdragh - -minecraftVersion=1.21.1 -# https://projects.neoforged.net/neoforged/neoform -neoformVersion=1.21.1-20240808.144430 -minecraftVersionRange=[1.21,1.21.1) -parchmentMinecraft=1.21 -parchmentVersion=2024.07.28 - -forgeConfigAPIVersion=21.1.0 - -# Discord Interactions -jdaVersion=5.1.2 - # JDA Dependencies - websocketClientVersion= -dcWebhooksVersion=0.8.4 - -# Database Interactions -exposedVersion=0.55.0 -sqliteJDBCVersion=3.46.1.3 - -# Message parsing -commonmarkVersion=0.23.0 \ No newline at end of file +credits=Erdragh \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml deleted file mode 100644 index d7b8ec8..0000000 --- a/gradle/libs.versions.toml +++ /dev/null @@ -1,22 +0,0 @@ -[versions] -kotlin = "2.0.20" -moddev = "2.0.34-beta" -loom = "1.7-SNAPSHOT" - -dokka = "1.9.10" -publish = "0.6.2" - -sqlite = "3.46.1.3" -commonmark = "0.23.0" - -[libraries] -sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" } -commonmark = { group = "org.commonmark", name = "commonmark", version.ref = "commonmark" } - -[plugins] -kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -moddev = { id = "net.neoforged.moddev", version.ref = "moddev" } -loom = { id = "fabric-loom", version.ref = "loom" } - -dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } -publish = { id = "me.modmuss50.mod-publish-plugin", version.ref = "publish" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3d4ba8a0da8d277868979cfbc8ad796..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 12612 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 HJ4oML2Lo<@i8BwbL^1~GkG`E7C$SEa_ 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f3b75f3 100755 --- a/gradlew +++ b/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 +# ############################################################################## # @@ -84,7 +86,7 @@ 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\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/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 ########################################################################## diff --git a/libs.versions.toml b/libs.versions.toml new file mode 100644 index 0000000..1ba0af3 --- /dev/null +++ b/libs.versions.toml @@ -0,0 +1,61 @@ +[versions] +java = "21" +kotlin = "2.1.10" +moddev = "2.0.78" +loom = "1.9-SNAPSHOT" +dokka = "2.0.0" + +kotlinx-coroutines = "1.10.1" + +minecraft = "1.21.1" +minecraftRange = "[1.21.1, 1.21.2)" + +# The version of ParchmentMC that is used, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions +parchment = "2024.11.17" +parchmentMC = "1.21.1" + +neoforge = "21.1.116" +neoforgeRange = "[21.1, 21.2)" +## This is the version of minecraft that the 'common' project uses, you can find a list of all versions here +## https://projects.neoforged.net/neoforged/neoform +neoForm = "1.21.1-20240808.144430" +kff = "5.7.0" +kffRange = "[5.7, )" + +slf4j = "2.0.9" + +fcapi = "21.1.3" + +fabricLoader = "0.16.10" +fabricApi = "0.102.0+1.21.1" +flk = "1.13.1+kotlin.2.1.10" +publish = "0.8.4" + +sqlite = "3.49.0.0" +commonmark = "0.24.0" + +mixin = "0.8.5" +mixinExtras = "0.3.5" + +[libraries] +minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" } +fabricLoader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabricLoader" } +fabricApi = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabricApi" } +flk = { group = "net.fabricmc", name = "fabric-language-kotlin", version.ref = "flk" } +kff = { group = "thedarkcolour", name = "kotlinforforge-neoforge", version.ref = "kff" } +mixin = { group = "org.spongepowered", name = "mixin", version.ref = "mixin" } +mixinExtras-common = { group = "io.github.llamalad7", name = "mixinextras-common", version.ref = "mixinExtras" } +sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" } +commonmark = { group = "org.commonmark", name = "commonmark", version.ref = "commonmark" } +fcapi-fabric = { group = "fuzs.forgeconfigapiport", name = "forgeconfigapiport-fabric", version.ref = "fcapi" } +fcapi-common = { group = "fuzs.forgeconfigapiport", name = "forgeconfigapiport-common-neoforgeapi", version.ref = "fcapi" } +parchment = { group = "org.parchmentmc.data", name = "parchment-1.21.1", version.ref = "parchment" } +slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" } +kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } + +[plugins] +kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } +moddev = { id = "net.neoforged.moddev", version.ref = "moddev" } +loom = { id = "fabric-loom", version.ref = "loom" } +publish = { id = "me.modmuss50.mod-publish-plugin", version.ref = "publish" } \ No newline at end of file diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts index 468063d..ab304ea 100644 --- a/neoforge/build.gradle.kts +++ b/neoforge/build.gradle.kts @@ -4,29 +4,19 @@ import me.modmuss50.mpp.platforms.modrinth.ModrinthOptions import org.jetbrains.kotlin.gradle.utils.extendsFrom plugins { - idea - java - alias(libs.plugins.kotlin) + id("multiloader-loader") alias(libs.plugins.moddev) } val modId: String by project -val includeBotDep: Configuration by configurations.getting -val runtimeLib: Configuration by configurations.getting - -val minecraftVersion: String by project -val mcVersion = minecraftVersion -val parchmentMinecraft: String by project -val parchmentVersion: String by project -val neoVersion: String by project -val kotlinForgeVersion: String by project +val botLib: Configuration by configurations.getting neoForge { - version = neoVersion + version = libs.versions.neoforge.get() parchment { - minecraftVersion = parchmentMinecraft - mappingsVersion = parchmentVersion + minecraftVersion = libs.versions.parchmentMC.get() + mappingsVersion = libs.versions.parchment.get() } validateAccessTransformers = true @@ -41,7 +31,6 @@ neoForge { mods { create(modId) { sourceSet(project.sourceSets.main.get()) - sourceSet(project(":common").sourceSets.main.get()) } } @@ -63,22 +52,15 @@ sourceSets.main.get().resources.srcDir("src/generated/resources") dependencies { // Adds KFF as dependency and Kotlin libs - implementation("thedarkcolour:kotlinforforge-neoforge:$kotlinForgeVersion") - - configurations.additionalRuntimeClasspath.extendsFrom(configurations.runtimeLib) - configurations.jarJar.extendsFrom(configurations.includeBotDep) -} + implementation(libs.kff) -tasks { - // Fixes IDE runs not processing common resources - processResources { - from(project(":common").sourceSets.main.get().resources) - } + configurations.named("additionalRuntimeClasspath").extendsFrom(configurations.botLib) + configurations.jarJar.extendsFrom(configurations.botLib) } publishMods { - val minecraftVersion: String by project - val title: String by project + val minecraftVersion: String = libs.versions.minecraft.get() + val modName: String by project val version: String by project val titles: Map by extra @@ -93,7 +75,7 @@ publishMods { modLoaders.add(project.name) file.set(tasks.jar.get().archiveFile) additionalFiles.plus(tasks.sourcesJar.get().archiveFile) - displayName = "$title $version ${titles[project.name]} $minecraftVersion" + displayName = "$modName $version ${titles[project.name]} $minecraftVersion" this.version = "$version-mc$minecraftVersion-${project.name}" requires("kotlin-for-forge") } @@ -103,7 +85,7 @@ publishMods { modLoaders.add(project.name) file.set(tasks.jar.get().archiveFile) additionalFiles.plus(tasks.sourcesJar.get().archiveFile) - displayName = "$title $version ${titles[project.name]} $minecraftVersion" + displayName = "$modName $version ${titles[project.name]} $minecraftVersion" this.version = "$version-mc$minecraftVersion-${project.name}" requires("kotlin-for-forge") } diff --git a/neoforge/src/main/kotlin/dev/erdragh/astralbot/neoforge/BotMod.kt b/neoforge/src/main/kotlin/dev/erdragh/astralbot/neoforge/BotMod.kt index 98fcc39..f3a3fbc 100644 --- a/neoforge/src/main/kotlin/dev/erdragh/astralbot/neoforge/BotMod.kt +++ b/neoforge/src/main/kotlin/dev/erdragh/astralbot/neoforge/BotMod.kt @@ -26,8 +26,8 @@ import thedarkcolour.kotlinforforge.neoforge.forge.MOD_BUS @Mod("astralbot") object BotMod { init { - ModLoadingContext.get().activeContainer.registerConfig(ModConfig.Type.SERVER, AstralBotConfig.SPEC) - ModLoadingContext.get().activeContainer.registerConfig(ModConfig.Type.SERVER, AstralBotTextConfig.SPEC, "astralbot-text.toml") + ModLoadingContext.get().activeContainer.registerConfig(ModConfig.Type.COMMON, AstralBotConfig.SPEC, "astralbot-server.toml") + ModLoadingContext.get().activeContainer.registerConfig(ModConfig.Type.COMMON, AstralBotTextConfig.SPEC, "astralbot-text.toml") MOD_BUS.addListener(::onConfigReloaded) FORGE_BUS.addListener(::onServerStart) diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 4d4e7e8..15d0594 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -1,5 +1,5 @@ modLoader = "kotlinforforge" -loaderVersion = "${kff_loader_range}" +loaderVersion = "${kff_version_range}" license = "${license}" issueTrackerURL = "https://github.com/Erdragh/AstralBot/issues" @@ -17,14 +17,14 @@ logoFile = "icon.png" authors = "${mod_author}" description = "${description}" -[[dependencies.${mod_id}]] +[[dependencies."${mod_id}"]] modId = "neoforge" type = "required" -versionRange = "${neoforge_loader_version_range}" +versionRange = "${neoforge_range}" ordering = "NONE" side = "BOTH" -[[dependencies.${mod_id}]] +[[dependencies."${mod_id}"]] modId = "minecraft" type = "required" versionRange = "${minecraft_version_range}" diff --git a/settings.gradle.kts b/settings.gradle.kts index 621f357..91f230d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,7 +18,9 @@ plugins { dependencyResolutionManagement { versionCatalogs { - register("libs") + register("libs") { + from(files("libs.versions.toml")) + } register("jda") { from(files("gradle/jda.versions.toml")) }