diff --git a/.gitignore b/.gitignore index d5f737e..b9f938b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# User-specific stuff +a# User-specific stuff .idea/ *.iml diff --git a/fabric/build.gradle b/fabric/build.gradle index cb26cb4..07a38ef 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -13,7 +13,8 @@ dependencies { modImplementation "maven.modrinth:modmenu:${modmenu_version}" - include implementation(group: 'io.projectreactor', name: 'reactor-core', version: '3.5.5') + include implementation('io.projectreactor:reactor-core:3.5.5') + include implementation('org.reactivestreams:reactive-streams:1.0.4') } loom { diff --git a/forge/build.gradle b/forge/build.gradle index 693632d..dc8efe3 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -83,7 +83,8 @@ dependencies { implementation(fg.deobf('io.github.llamalad7:mixinextras-forge:0.4.1') { version { strictly '0.4.1' } }) annotationProcessor(group: 'io.github.llamalad7', name: 'mixinextras-forge', version: '0.4.1') { version { strictly '0.4.1' } } - jarJar minecraftLibrary(group: 'io.projectreactor', name: 'reactor-core', version: '3.5.5') + jarJar minecraftLibrary('io.projectreactor:reactor-core:3.5.5') + jarJar minecraftLibrary('org.reactivestreams:reactive-streams:1.0.4') } publishing { diff --git a/neoforge/build.gradle b/neoforge/build.gradle index fbeeba3..197a84c 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -47,6 +47,15 @@ dependencies { prefer '3.5.5' // The version actually used in your dev workspace } } + jarJar(implementation('org.reactivestreams:reactive-streams:1.0.4')) { + version { + // The version range your mod is actually compatible with. + // Note that you may receive a *lower* version than your preferred if another + // Mod is only compatible up to 1.7.24, for example, your mod might get 1.7.24 at runtime. + strictly '[1.0.4, 1.1.0)' + prefer '1.0.4' // The version actually used in your dev workspace + } + } clientAdditionalRuntimeClasspath group: 'io.projectreactor', name: 'reactor-core', version: '3.5.5' serverAdditionalRuntimeClasspath group: 'io.projectreactor', name: 'reactor-core', version: '3.5.5' dataAdditionalRuntimeClasspath group: 'io.projectreactor', name: 'reactor-core', version: '3.5.5'