Enable koremods, bump Kotlin to 1.8.0
This commit is contained in:
parent
4ca63a0650
commit
abe53a417f
@ -21,6 +21,8 @@ plugins {
|
|||||||
id("net.minecraftforge.gradle")
|
id("net.minecraftforge.gradle")
|
||||||
id("org.spongepowered.mixin")
|
id("org.spongepowered.mixin")
|
||||||
id("org.parchmentmc.librarian.forgegradle")
|
id("org.parchmentmc.librarian.forgegradle")
|
||||||
|
id("wtf.gofancy.fancygradle")
|
||||||
|
id("wtf.gofancy.koremods.gradle")
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
@ -148,6 +150,7 @@ dependencies {
|
|||||||
val kotlin_coroutines_version: String by project
|
val kotlin_coroutines_version: String by project
|
||||||
val kotlin_serialization_version: String by project
|
val kotlin_serialization_version: String by project
|
||||||
val mixin_version: String by project
|
val mixin_version: String by project
|
||||||
|
val koremods_modlauncher_version: String by project
|
||||||
|
|
||||||
minecraft("net.minecraftforge:forge:$mc_version-$forge_version")
|
minecraft("net.minecraftforge:forge:$mc_version-$forge_version")
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter:${jupiter_version}")
|
testImplementation("org.junit.jupiter:junit-jupiter:${jupiter_version}")
|
||||||
@ -161,28 +164,16 @@ dependencies {
|
|||||||
(this as ExternalModuleDependency).exclude(group = "org.jetbrains", module = "annotations")
|
(this as ExternalModuleDependency).exclude(group = "org.jetbrains", module = "annotations")
|
||||||
} as Closure<Any>
|
} as Closure<Any>
|
||||||
|
|
||||||
// Add everything to the classpath correctly
|
|
||||||
klibrary(create("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version", excludeKGroup))
|
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.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-core:$kotlin_coroutines_version", excludeKGroup))
|
||||||
klibrary(create("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$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))
|
klibrary(create("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialization_version", excludeKGroup))
|
||||||
|
|
||||||
// Real mod deobf dependency examples - these get remapped to your current mappings
|
koremods(group = "wtf.gofancy.koremods", name = "koremods-modlauncher", version = koremods_modlauncher_version)
|
||||||
// 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
|
|
||||||
compileOnly("yalter.mousetweaks:MouseTweaks:2.23:api")
|
compileOnly("yalter.mousetweaks:MouseTweaks:2.23:api")
|
||||||
|
|
||||||
annotationProcessor("org.spongepowered:mixin:${mixin_version}:processor")
|
annotationProcessor("org.spongepowered:mixin:${mixin_version}:processor")
|
||||||
|
|
||||||
// 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}")
|
|
||||||
|
|
||||||
if (handleDeps) {
|
if (handleDeps) {
|
||||||
val jei_version: String by project
|
val jei_version: String by project
|
||||||
val mekanism_version: String by project
|
val mekanism_version: String by project
|
||||||
@ -331,6 +322,17 @@ repositories {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
maven(url = "https://maven.gofancy.wtf/releases") {
|
||||||
|
name = "Garden of Fancy"
|
||||||
|
|
||||||
|
content {
|
||||||
|
includeGroup("wtf.gofancy.koremods")
|
||||||
|
includeGroup("wtf.gofancy.fancygradle")
|
||||||
|
includeGroup("wtf.gofancy.koremods.gradle")
|
||||||
|
includeGroup("codes.som")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
name = "Kotlin for Forge"
|
name = "Kotlin for Forge"
|
||||||
url = uri("https://thedarkcolour.github.io/KotlinForForge/")
|
url = uri("https://thedarkcolour.github.io/KotlinForForge/")
|
||||||
|
@ -10,6 +10,9 @@ mod_version=1.1
|
|||||||
|
|
||||||
use_commit_hash_in_version=true
|
use_commit_hash_in_version=true
|
||||||
|
|
||||||
|
koremods_modlauncher_version=0.5.7
|
||||||
|
koremods_script_version=0.5.0
|
||||||
|
|
||||||
mc_version=1.19.3
|
mc_version=1.19.3
|
||||||
parchment_version=2022.12.18-1.19.3
|
parchment_version=2022.12.18-1.19.3
|
||||||
jei_mc_version=1.19.3
|
jei_mc_version=1.19.3
|
||||||
@ -31,7 +34,7 @@ worldedit_fileid=3922622
|
|||||||
more_overlays_version=1.21.3-mc1.19
|
more_overlays_version=1.21.3-mc1.19
|
||||||
|
|
||||||
kotlin_for_forge_version=3.1.0
|
kotlin_for_forge_version=3.1.0
|
||||||
kotlin_version=1.6.10
|
kotlin_version=1.8.0
|
||||||
kotlin_coroutines_version=1.6.0
|
kotlin_coroutines_version=1.6.0
|
||||||
kotlin_serialization_version=1.3.2
|
kotlin_serialization_version=1.3.2
|
||||||
|
|
||||||
|
@ -5,6 +5,8 @@ buildscript {
|
|||||||
repositories {
|
repositories {
|
||||||
// These repositories are only for Gradle plugins, put any other repositories in the repository block further below
|
// These repositories are only for Gradle plugins, put any other repositories in the repository block further below
|
||||||
maven(url = "https://maven.minecraftforge.net") {
|
maven(url = "https://maven.minecraftforge.net") {
|
||||||
|
name = "Minecraft Forge"
|
||||||
|
|
||||||
content {
|
content {
|
||||||
includeGroup("net.minecraftforge.gradle")
|
includeGroup("net.minecraftforge.gradle")
|
||||||
includeGroup("net.minecraftforge")
|
includeGroup("net.minecraftforge")
|
||||||
@ -12,18 +14,33 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
maven(url = "https://repo.spongepowered.org/repository/maven-public/") {
|
maven(url = "https://repo.spongepowered.org/repository/maven-public/") {
|
||||||
|
name = "Spongepowered"
|
||||||
|
|
||||||
content {
|
content {
|
||||||
includeGroup("org.spongepowered")
|
includeGroup("org.spongepowered")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
maven(url = "https://maven.parchmentmc.org") {
|
maven(url = "https://maven.parchmentmc.org") {
|
||||||
|
name = "Parchment mappings"
|
||||||
|
|
||||||
content {
|
content {
|
||||||
includeGroup("org.parchmentmc")
|
includeGroup("org.parchmentmc")
|
||||||
includeGroup("org.parchmentmc.feather")
|
includeGroup("org.parchmentmc.feather")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
maven(url = "https://maven.gofancy.wtf/releases") {
|
||||||
|
name = "Garden of Fancy"
|
||||||
|
|
||||||
|
content {
|
||||||
|
includeGroup("wtf.gofancy.koremods")
|
||||||
|
includeGroup("wtf.gofancy.fancygradle")
|
||||||
|
includeGroup("wtf.gofancy.koremods.gradle")
|
||||||
|
includeGroup("codes.som")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -31,11 +48,18 @@ buildscript {
|
|||||||
val kotlin_version: String by settings
|
val kotlin_version: String by settings
|
||||||
val forge_gradle_version: String by settings
|
val forge_gradle_version: String by settings
|
||||||
val mixingradle_version: String by settings
|
val mixingradle_version: String by settings
|
||||||
|
val koremods_modlauncher_version: String by settings
|
||||||
|
val koremods_script_version: String by settings
|
||||||
|
|
||||||
classpath(group = "net.minecraftforge.gradle", name = "ForgeGradle", version = forge_gradle_version)
|
classpath(group = "net.minecraftforge.gradle", name = "ForgeGradle", version = forge_gradle_version)
|
||||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}")
|
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}")
|
||||||
classpath("org.spongepowered:mixingradle:${mixingradle_version}")
|
classpath("org.spongepowered:mixingradle:${mixingradle_version}")
|
||||||
|
|
||||||
classpath(group = "org.parchmentmc", name = "librarian", version = "1.+")
|
classpath(group = "org.parchmentmc", name = "librarian", version = "1.+")
|
||||||
|
|
||||||
|
classpath(group = "wtf.gofancy.koremods", name = "koremods-gradle", version = "0.1.23")
|
||||||
|
classpath(group = "wtf.gofancy.fancygradle", name = "wtf.gofancy.fancygradle.gradle.plugin", version = "1.1.2-3")
|
||||||
|
classpath(group = "wtf.gofancy.koremods", name = "koremods-modlauncher", version = koremods_modlauncher_version)
|
||||||
|
classpath(group = "wtf.gofancy.koremods", name = "koremods-script", version = koremods_script_version)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user