From bbb2649afedcf0b96740ecbb3f212ae783b3bbc8 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 31 Jan 2022 00:24:03 +0700 Subject: [PATCH] Kotlin build script --- build.gradle | 241 -------------------------------------------- build.gradle.kts | 210 ++++++++++++++++++++++++++++++++++++++ gradle.properties | 13 ++- settings.gradle.kts | 28 +++++ 4 files changed, 248 insertions(+), 244 deletions(-) delete mode 100644 build.gradle create mode 100644 build.gradle.kts create mode 100644 settings.gradle.kts diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 68c9e25b1..000000000 --- a/build.gradle +++ /dev/null @@ -1,241 +0,0 @@ - -buildscript { - repositories { - // These repositories are only for Gradle plugins, put any other repositories in the repository block further below - maven { url = 'https://maven.minecraftforge.net' } - mavenCentral() - } - - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" - } -} - -apply plugin: 'net.minecraftforge.gradle' -// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -apply plugin: 'eclipse' -apply plugin: 'maven-publish' -apply plugin: 'kotlin' - -apply from: "https://raw.githubusercontent.com/thedarkcolour/KotlinForForge/site/thedarkcolour/kotlinforforge/gradle/kff-${kotlin_for_forge_version}.gradle" - -version = mod_version -group = 'ru.dbotthepony.mc' // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = 'overdrive_that_matters' - -// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. -java.toolchain.languageVersion = JavaLanguageVersion.of(17) - -println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { - kotlinOptions { - freeCompilerArgs = ['-Xjvm-default=all'] - } - - compileJava { - options.compilerArgs += ['-Xlint:all'] - } -} - -test { - useJUnitPlatform() -} - -sourceSets { - data { - compileClasspath += main.output - runtimeClasspath += main.output - } -} - -configurations { - dataImplementation.extendsFrom implementation -} - -minecraft { - // The mappings can be changed at any time and must be in the following format. - // Channel: Version: - // snapshot YYYYMMDD Snapshot are built nightly. - // stable # Stables are built at the discretion of the MCP team. - // official MCVersion Official field/method names from Mojang mapping files - // - // You must be aware of the Mojang license when using the 'official' mappings. - // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - // - // Use non-default mappings at your own risk. They may not always work. - // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'official', version: mc_version - - accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default. - - // Default run configurations. - // These can be tweaked, removed, or duplicated as needed. - runs { - client { - workingDirectory project.file('run') - - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - property 'forge.logging.markers', 'REGISTRIES' - - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - property 'forge.logging.console.level', 'debug' - - mods { - overdrive_that_matters { - source sourceSets.main - } - } - } - - server { - workingDirectory project.file('run') - - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - property 'forge.logging.markers', 'REGISTRIES' - - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - property 'forge.logging.console.level', 'debug' - - mods { - overdrive_that_matters { - source sourceSets.main - } - } - } - - data { - workingDirectory project.file('run') - - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - property 'forge.logging.markers', 'REGISTRIES' - - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - property 'forge.logging.console.level', 'debug' - - // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - args '--mod', 'overdrive_that_matters', '--all', '--output', file('src/data/resources/'), '--existing', file('src/main/resources/') - - mods { - overdrive_that_matters { - sources sourceSets.main, sourceSets.data - } - } - } - } -} - -// Include resources generated by data generators. -sourceSets.main.resources { srcDir 'src/data/resources' } - -repositories { - // Put repositories for dependencies here - // ForgeGradle automatically adds the Forge maven and Maven Central for you - maven { - // location of the maven that hosts JEI files - name = "Progwml6 maven" - url = "https://dvs1.progwml6.com/files/maven/" - } - - maven { - // location of a maven mirror for JEI files, as a fallback - name = "ModMaven" - url = "https://modmaven.dev" - } - - maven { - name 'tterrag maven' - url "https://maven.tterrag.com/" - } - - maven { - url "https://maven.k-4u.nl" - } - - // If you have mod jar dependencies in ./libs, you can declare them as a repository like so: - //flatDir { - // dir 'libs' - //} -} - -dependencies { - minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}" - - testImplementation "org.junit.jupiter:junit-jupiter:${jupiter_version}" - - // Real mod deobf dependency examples - these get remapped to your current mappings - // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency - // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency - // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency - - // Examples using mod jars from ./libs - // implementation fg.deobf("blank:EnderRift-1.18.1:2.4.1") - - // compile against the JEI API but do not include it at runtime - //compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") - // at runtime, use the full JEI jar - //runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") - - implementation "mezz.jei:jei-${mc_version}:${jei_version}:deobf" - implementation fg.deobf(create("mcjty.theoneprobe:theoneprobe:${mc_version_weak}-${the_one_probe_version}") { transitive = false }) - - // For more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html -} - -// Example for how to get properties into the manifest for reading at runtime. -jar { - manifest { - attributes([ - "Specification-Title" : "overdrive_that_matters", - "Specification-Vendor" : "DBotThePony", - "Specification-Version" : "1", // We are version 1 of ourselves - "Implementation-Title" : project.name, - "Implementation-Version" : project.jar.archiveVersion, - "Implementation-Vendor" : "DBotThePony", - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") - ]) - } -} - -// Example configuration to allow publishing using the maven-publish plugin -// This is the preferred method to reobfuscate your jar file -jar.finalizedBy('reobfJar') -// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing -// publish.dependsOn('reobfJar') - -publishing { - publications { - mavenJava(MavenPublication) { - artifact jar - } - } - repositories { - maven { - url "file://${project.projectDir}/mcmodsrepo" - } - } -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..b98227359 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,210 @@ +import groovy.lang.Closure +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import java.util.Date +import java.text.SimpleDateFormat + +val mod_version: String by project +val mc_version: String by project +val forge_version: String by project +val mod_id: String by project + +plugins { + java + kotlin + id("net.minecraftforge.gradle") +} + +configurations { + create("klibrary") // Kotlin library +} + +version = mod_version +group = "ru.dbotthepony.mc" + +java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) +println("Targeting Java ${java.toolchain.languageVersion.get()}") + +tasks.withType(KotlinCompile::class.java) { + kotlinOptions { + freeCompilerArgs = listOf("-Xjvm-default=all") + jvmTarget = java.toolchain.languageVersion.get().toString() + } +} + +tasks.withType(JavaCompile::class.java) { + options.compilerArgs.add("-Xlint:all") +} + +sourceSets { + create("data") { + compileClasspath += sourceSets["main"].compileClasspath + runtimeClasspath += sourceSets["main"].runtimeClasspath + } +} + +sourceSets["main"].resources { + srcDir("src/data/resources") +} + +dependencies { + val jupiter_version: String by project + val kotlin_version: String by project + val kotlin_for_forge_version: String by project + val kotlin_coroutines_version: String by project + val kotlin_serialization_version: String by project + + minecraft("net.minecraftforge:forge:$mc_version-$forge_version") + testImplementation("org.junit.jupiter:junit-jupiter:${jupiter_version}") + + implementation("thedarkcolour:kotlinforforge:$kotlin_for_forge_version") + + fun klibrary(notation: Any) { this.add("klibrary", notation) } + + val excludeKGroup = closureOf { + (this as ExternalModuleDependency).exclude(group = "org.jetbrains", module = "annotations") + } as Closure + + // Add everything to the classpath correctly + klibrary(create("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version", excludeKGroup)) + klibrary(create("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version", excludeKGroup)) + klibrary(create("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version", excludeKGroup)) + klibrary(create("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$kotlin_coroutines_version", excludeKGroup)) + klibrary(create("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialization_version", excludeKGroup)) + + // Real mod deobf dependency examples - these get remapped to your current mappings + // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency + // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency + // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency + + // Examples using mod jars from ./libs + // implementation fg.deobf("blank:EnderRift-1.18.1:2.4.1") + + // compile against the JEI API but do not include it at runtime + //compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") + // at runtime, use the full JEI jar + //runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") + + val jei_version: String by project + val mc_version_weak: String by project + val the_one_probe_version: String by project + + implementation("mezz.jei:jei-${mc_version}:${jei_version}:deobf") + implementation(fg.deobf(create("mcjty.theoneprobe:theoneprobe:${mc_version_weak}-${the_one_probe_version}", closureOf { + (this as ExternalModuleDependency).isTransitive = false + } as Closure))) +} + +minecraft { + mappings("official", mc_version) + accessTransformer(file("src/main/resources/META-INF/accesstransformer.cfg")) + + runs { + create("client") { + mods { + create(mod_id) { + source(sourceSets["main"]) + } + } + } + + create("server") { + mods { + create(mod_id) { + source(sourceSets["main"]) + } + } + } + + create("data") { + args("--mod", "overdrive_that_matters", "--all", "--output", file("src/data/resources/"), "--existing", file("src/main/resources/")) + + mods { + create(mod_id) { + sources(sourceSets["main"], sourceSets["data"]) + } + } + } + } +} + +minecraft.runs.all { + workingDirectory = project.file("run").absolutePath + + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + property("forge.logging.markers", "REGISTRIES") + + // Log4j console level + property("forge.logging.console.level", "debug") + + lazyToken("minecraft_classpath") { + configurations["klibrary"].copyRecursive().resolve().map { it.absolutePath }.joinToString(File.pathSeparator) + } +} + +repositories { + maven { + name = "Progwml6 maven" + url = uri("https://dvs1.progwml6.com/files/maven/") + } + + maven { + name = "ModMaven" + url = uri("https://modmaven.dev") + } + + maven { + name = "tterrag maven" + url = uri("https://maven.tterrag.com/") + } + + maven { + url = uri("https://maven.k-4u.nl") + } + + maven { + name = "Kotlin for Forge" + url = uri("https://thedarkcolour.github.io/KotlinForForge/") + } + + // If you have mod jar dependencies in ./libs, you can declare them as a repository like so: + //flatDir { + // dir "libs" + //} +} + +// Example configuration to allow publishing using the maven-publish plugin +// This is the preferred method to reobfuscate your jar file +tasks.jar.configure { + finalizedBy("reobfJar") + + manifest { + attributes(mapOf( + "Specification-Title" to project.name, + "Specification-Vendor" to "DBotThePony", + "Specification-Version" to "1", // We are version 1 of ourselves + "Implementation-Title" to project.name, + "Implementation-Version" to tasks.jar.get().archiveVersion, + "Implementation-Vendor" to "DBotThePony", + "Implementation-Timestamp" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(Date()) + )) + } +} +// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing +// publish.dependsOn("reobfJar") + +/* +publishing { + publications { + mavenJava(MavenPublication) { + artifact jar + } + } + repositories { + maven { + url "file://${project.projectDir}/mcmodsrepo" + } + } +} +*/ diff --git a/gradle.properties b/gradle.properties index 69d47ff46..842a5bce6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,22 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false +kotlin.stdlib.default.dependency=false + +mod_id=overdrive_that_matters +mod_version=0.1 mc_version=1.18.1 mc_version_weak=1.18 +forge_gradle_version=5.1.27 +forge_version=39.0.14 jei_version=9.1.1.48 -forge_version=39.0.14 jupiter_version=5.8.2 the_one_probe_version=5.0.1-5 -kotlin_version=1.6.10 kotlin_for_forge_version=3.1.0 -mod_version=1.0 +kotlin_version=1.6.10 +kotlin_coroutines_version=1.6.0 +kotlin_serialization_version=1.3.2 + diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 000000000..8dad75af9 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,28 @@ + +println("Running with Java ${System.getProperty("java.version")} on JVM: ${System.getProperty("java.vendor")} ${System.getProperty("java.vm.version")} (Architecture: ${System.getProperty("os.arch")})") + +pluginManagement { + val kotlin_version: String by settings + val forge_gradle_version: String by settings + + plugins { + kotlin("jvm") version(kotlin_version) + id("net.minecraftforge.gradle") version(forge_gradle_version) + } +} + +buildscript { + repositories { + // These repositories are only for Gradle plugins, put any other repositories in the repository block further below + maven(url = "https://maven.minecraftforge.net") + mavenCentral() + } + + dependencies { + val kotlin_version: String by settings + val forge_gradle_version: String by settings + + classpath(group = "net.minecraftforge.gradle", name = "ForgeGradle", version = forge_gradle_version) + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}") + } +}