Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump Kotlin version

Browse Source 
[no changelog]
This commit is contained in:
Linnea Gräf
2024-04-01 01:47:15 +02:00
parent a84da71549
commit e098482faa
6 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.minecraft
View File

@@ -1 +0,0 @@
/home/nea/.local/share/PrismLauncher/instances/livid fucking dies/.minecraft/

16
build.gradle.kts
View File

@@ -12,13 +12,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
java java
`maven-publish` `maven-publish`
kotlin("jvm") version "1.8.20" kotlin("jvm") version "1.9.23"
kotlin("plugin.serialization") version "1.8.20" kotlin("plugin.serialization") version "1.9.23"
id("com.bnorm.power.kotlin-power-assert") version "0.13.0" // id("com.bnorm.power.kotlin-power-assert") version "0.13.0"
id("dev.architectury.loom") version "1.1.336" id("dev.architectury.loom") version "1.5.389"
id("com.github.johnrengelman.shadow") version "7.1.2" id("com.github.johnrengelman.shadow") version "7.1.2"
id("moe.nea.licenseextractificator") 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" id("io.shcm.shsupercm.fabric.fletchingtable") version "1.5"
} }
@@ -254,6 +254,6 @@ licensing.addExtraLicenseMatchers()
fletchingTable.defaultMixinEnvironment.set("client") fletchingTable.defaultMixinEnvironment.set("client")
vineflower { //vineflower {
toolVersion.set("1.9.1") // toolVersion.set("1.9.1")
} //}

1
buildSrc/build.gradle.kts
View File

@@ -15,6 +15,7 @@ repositories {
} }
dependencies { dependencies {
implementation("com.github.romangraef:neaslicenseextractificator:1.1.0") implementation("com.github.romangraef:neaslicenseextractificator:1.1.0")
implementation("com.google.code.gson:gson:2.10.1")
} }
sourceSets { sourceSets {

2
gradle/libs.versions.toml
View File

@@ -6,7 +6,7 @@
minecraft = "1.20.4" minecraft = "1.20.4"
fabric_loader = "0.15.6" fabric_loader = "0.15.6"
fabric_api = "0.95.0+1.20.4" 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" yarn = "1.20.4+build.3"
libgui = "9.2.2+1.20.2" libgui = "9.2.2+1.20.2"
rei = "14.0.688" rei = "14.0.688"

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -4,6 +4,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

7
src/main/kotlin/moe/nea/firmament/Firmament.kt
View File

@@ -34,7 +34,6 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.plus import kotlinx.coroutines.plus
import kotlinx.coroutines.runBlocking
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlin.coroutines.EmptyCoroutineContext import kotlin.coroutines.EmptyCoroutineContext
import net.minecraft.command.CommandRegistryAccess import net.minecraft.command.CommandRegistryAccess
@@ -134,10 +133,8 @@ object Firmament {
HypixelStaticData.spawnDataCollectionLoop() HypixelStaticData.spawnDataCollectionLoop()
ClientCommandRegistrationCallback.EVENT.register(this::registerCommands) ClientCommandRegistrationCallback.EVENT.register(this::registerCommands)
ClientLifecycleEvents.CLIENT_STOPPING.register(ClientLifecycleEvents.ClientStopping { ClientLifecycleEvents.CLIENT_STOPPING.register(ClientLifecycleEvents.ClientStopping {
runBlocking { logger.info("Shutting down Firmament coroutines")
logger.info("Shutting down NEU coroutines") globalJob.cancel()
globalJob.cancel()
}
}) })
registerFirmamentEvents() registerFirmamentEvents()
ItemTooltipCallback.EVENT.register { a, b, c -> ItemTooltipCallback.EVENT.register { a, b, c ->