diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-04-11 19:05:19 +0200 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-05-05 00:17:09 +0200 |
| commit | 10265c17a9b67a8a2229d7fc1648165bf95d2706 (patch) | |
| tree | 01fb7b98679a8266e3ebb6b3a73099d2c9ac9b65 | |
| parent | bf47c2000ef88699e5af4722fd200c5405dbaa3c (diff) | |
| download | Firmament-10265c17a9b67a8a2229d7fc1648165bf95d2706.tar.gz Firmament-10265c17a9b67a8a2229d7fc1648165bf95d2706.tar.bz2 Firmament-10265c17a9b67a8a2229d7fc1648165bf95d2706.zip | |
feat: Port REI to 1.21.5
| -rw-r--r-- | build.gradle.kts | 13 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 2 | ||||
| -rw-r--r-- | src/compat/rei/java/moe/nea/firmament/compat/rei/SkyblockItemIdFocusedStackProvider.kt | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 3e7f1f5..b35dc2a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -195,6 +195,11 @@ val SourceSet.modImplementationConfigurationName loom.remapConfigurations.find { it.targetConfigurationName.get() == this.implementationConfigurationName }!!.sourceConfiguration +val SourceSet.modRuntimeOnlyConfigurationName + get() = + loom.remapConfigurations.find { + it.targetConfigurationName.get() == this.runtimeOnlyConfigurationName + }!!.sourceConfiguration val shadowMe by configurations.creating { exclude(group = "org.jetbrains.kotlin") @@ -232,7 +237,7 @@ val explosiveEnhancementSourceSet = val wildfireGenderSourceSet = createIsolatedSourceSet("wildfireGender", isEnabled = false) val jadeSourceSet = createIsolatedSourceSet("jade", isEnabled = false) val modmenuSourceSet = createIsolatedSourceSet("modmenu") -val reiSourceSet = createIsolatedSourceSet("rei", isEnabled = false) +val reiSourceSet = createIsolatedSourceSet("rei") val moulconfigSourceSet = createIsolatedSourceSet("moulconfig") val customTexturesSourceSet = createIsolatedSourceSet("texturePacks", "texturePacks") @@ -288,10 +293,8 @@ dependencies { (yaclSourceSet.modImplementationConfigurationName)(libs.yacl) // Actual dependencies - (reiSourceSet.modImplementationConfigurationName)(libs.rei.api) { - exclude(module = "architectury") - exclude(module = "architectury-fabric") - } + (reiSourceSet.modImplementationConfigurationName)(libs.rei.api) + (reiSourceSet.modRuntimeOnlyConfigurationName)(libs.rei.fabric) nonModImplentation(libs.repoparser) shadowMe(libs.repoparser) fun ktor(mod: String) = "io.ktor:ktor-$mod-jvm:${libs.versions.ktor.get()}" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 382d413..9ed3537 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ yarn = "1.21.5+build.1" modmenu = "14.0.0-rc.2" architectury = "16.0.3" # Update from https://maven.architectury.dev/me/shedaniel/RoughlyEnoughItems-fabric/ (but is typically late) -rei = "18.0.796" +rei = "19.0.805" # Update from https://maven.fabricmc.net/net/fabricmc/fabric-language-kotlin/ fabric_kotlin = "1.13.2+kotlin.2.1.20" diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/SkyblockItemIdFocusedStackProvider.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/SkyblockItemIdFocusedStackProvider.kt index 518f7b4..9ccfab4 100644 --- a/src/compat/rei/java/moe/nea/firmament/compat/rei/SkyblockItemIdFocusedStackProvider.kt +++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/SkyblockItemIdFocusedStackProvider.kt @@ -9,7 +9,6 @@ import me.shedaniel.rei.api.common.entry.EntryStack import net.minecraft.client.gui.screen.Screen import net.minecraft.client.gui.screen.ingame.HandledScreen import moe.nea.firmament.mixins.accessor.AccessorHandledScreen -import moe.nea.firmament.util.skyBlockId object SkyblockItemIdFocusedStackProvider : FocusedStackProvider { override fun provide(screen: Screen?, mouse: Point?): CompoundEventResult<EntryStack<*>> { |