Bump Kotlin version
[no changelog]
This commit is contained in:
@@ -1 +0,0 @@
|
||||
/home/nea/.local/share/PrismLauncher/instances/livid fucking dies/.minecraft/
|
||||
@@ -12,13 +12,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
plugins {
|
||||
java
|
||||
`maven-publish`
|
||||
kotlin("jvm") version "1.8.20"
|
||||
kotlin("plugin.serialization") version "1.8.20"
|
||||
id("com.bnorm.power.kotlin-power-assert") version "0.13.0"
|
||||
id("dev.architectury.loom") version "1.1.336"
|
||||
kotlin("jvm") version "1.9.23"
|
||||
kotlin("plugin.serialization") version "1.9.23"
|
||||
// id("com.bnorm.power.kotlin-power-assert") version "0.13.0"
|
||||
id("dev.architectury.loom") version "1.5.389"
|
||||
id("com.github.johnrengelman.shadow") version "7.1.2"
|
||||
id("moe.nea.licenseextractificator")
|
||||
id("io.github.juuxel.loom-vineflower") version "1.11.0"
|
||||
// id("io.github.juuxel.loom-vineflower") version "1.11.0"
|
||||
id("io.shcm.shsupercm.fabric.fletchingtable") version "1.5"
|
||||
}
|
||||
|
||||
@@ -254,6 +254,6 @@ licensing.addExtraLicenseMatchers()
|
||||
|
||||
fletchingTable.defaultMixinEnvironment.set("client")
|
||||
|
||||
vineflower {
|
||||
toolVersion.set("1.9.1")
|
||||
}
|
||||
//vineflower {
|
||||
// toolVersion.set("1.9.1")
|
||||
//}
|
||||
|
||||
@@ -15,6 +15,7 @@ repositories {
|
||||
}
|
||||
dependencies {
|
||||
implementation("com.github.romangraef:neaslicenseextractificator:1.1.0")
|
||||
implementation("com.google.code.gson:gson:2.10.1")
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
minecraft = "1.20.4"
|
||||
fabric_loader = "0.15.6"
|
||||
fabric_api = "0.95.0+1.20.4"
|
||||
fabric_kotlin = "1.9.4+kotlin.1.8.21"
|
||||
fabric_kotlin = "1.10.19+kotlin.1.9.23"
|
||||
yarn = "1.20.4+build.3"
|
||||
libgui = "9.2.2+1.20.2"
|
||||
rei = "14.0.688"
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -4,6 +4,6 @@
|
||||
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -34,7 +34,6 @@ import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Job
|
||||
import kotlinx.coroutines.SupervisorJob
|
||||
import kotlinx.coroutines.plus
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import kotlinx.serialization.json.Json
|
||||
import kotlin.coroutines.EmptyCoroutineContext
|
||||
import net.minecraft.command.CommandRegistryAccess
|
||||
@@ -134,10 +133,8 @@ object Firmament {
|
||||
HypixelStaticData.spawnDataCollectionLoop()
|
||||
ClientCommandRegistrationCallback.EVENT.register(this::registerCommands)
|
||||
ClientLifecycleEvents.CLIENT_STOPPING.register(ClientLifecycleEvents.ClientStopping {
|
||||
runBlocking {
|
||||
logger.info("Shutting down NEU coroutines")
|
||||
globalJob.cancel()
|
||||
}
|
||||
logger.info("Shutting down Firmament coroutines")
|
||||
globalJob.cancel()
|
||||
})
|
||||
registerFirmamentEvents()
|
||||
ItemTooltipCallback.EVENT.register { a, b, c ->
|
||||
|
||||
Reference in New Issue
Block a user