feat: Port REI to 1.21.5

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()}"

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"

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<*>> {