diff options
| l--------- | .minecraft | 1 | ||||
| -rw-r--r-- | build.gradle.kts | 16 | ||||
| -rw-r--r-- | buildSrc/build.gradle.kts | 1 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 2 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | src/main/kotlin/moe/nea/firmament/Firmament.kt | 7 |
6 files changed, 13 insertions, 16 deletions
diff --git a/.minecraft b/.minecraft deleted file mode 120000 index 06714e7..0000000 --- a/.minecraft +++ /dev/null @@ -1 +0,0 @@ -/home/nea/.local/share/PrismLauncher/instances/livid fucking dies/.minecraft/
\ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index c8c2af7..be6cd55 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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") +//} diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index ae3f861..d89c20e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -15,6 +15,7 @@ repositories { } dependencies { implementation("com.github.romangraef:neaslicenseextractificator:1.1.0") + implementation("com.google.code.gson:gson:2.10.1") } sourceSets { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 912b88c..2d8fc0b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1a9ecf9..0c78a30 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/src/main/kotlin/moe/nea/firmament/Firmament.kt b/src/main/kotlin/moe/nea/firmament/Firmament.kt index 5fd9f60..a0549fd 100644 --- a/src/main/kotlin/moe/nea/firmament/Firmament.kt +++ b/src/main/kotlin/moe/nea/firmament/Firmament.kt @@ -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 -> |