Finish 21.1/next

gradle/libs.versions.toml

@@ -7,5 +7,5 @@ module = "io.reactivex.rxjava3:rxjava"
 version = "3.1.5"
 
 [libraries.reactivestreams]
-module = "io.reactivex.rxjava3:reactive-streams"
-version = "[1.0.4,)"
+module = "org.reactivestreams:reactive-streams"
+version = "1.0.4"

neoforge-main/build.gradle.kts

@@ -62,10 +62,10 @@ neoForge {
             logLevel.set(org.slf4j.event.Level.DEBUG)
             sourceSet = project.sourceSets.main
 
-            // JetBrains Runtime Hotswap
-            if (!System.getenv().containsKey("CI")) {
-              jvmArgument("-XX:+AllowEnhancedClassRedefinition")
-            }
+//            // JetBrains Runtime Hotswap
+//            if (!System.getenv().containsKey("CI")) {
+//              jvmArgument("-XX:+AllowEnhancedClassRedefinition")
+//            }
         }
 
         create("client") {
@@ -121,6 +121,9 @@ repositories {
             password = project.findProperty("gpr.token") as String? ?: System.getenv("GITHUB_TOKEN")
         }
     }
+    maven("https://cursemaven.com"){
+        name = "CurseMaven"
+    }
 }
 
 dependencies {
@@ -135,6 +138,9 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
+    implementation("curse.maven:jei-238222:7024953")
+    implementation("curse.maven:the-one-probe-245211:5836106")
+
     jarJar(libs.rxjava)
     jarJar(libs.reactivestreams)
 }