Fix dependencies

build.gradle

@@ -44,6 +44,14 @@ subprojects {
             }
         }
     }
+
+    processResources {
+        // inputs.property "project", project
+
+        filesMatching(["META-INF/neoforge.mods.toml", "fabric.mod.json"]) {
+            expand "project": project
+        }
+    }
 }
 
 allprojects {
@@ -56,22 +64,6 @@ allprojects {
     group = rootProject.maven_group
 
     repositories {
-        maven {
-            name "Modrinth"
-            url "https://api.modrinth.com/maven"
-
-            content {
-                includeGroup "maven.modrinth"
-            }
-        }
-        maven {
-            name "CurseForge"
-            url "https://cursemaven.com"
-
-            content {
-                includeGroup "curse.maven"
-            }
-        }
         maven { url "https://maven.shedaniel.me" }
         maven { url "https://maven.neoforged.net/releases" }
         maven { url "https://maven.terraformersmc.com/releases" }

fabric/build.gradle

@@ -33,14 +33,6 @@ dependencies {
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
 }
 
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
-    }
-}
-
 shadowJar {
     configurations = [project.configurations.shadowCommon]
     archiveClassifier.set "dev-shadow"

fabric/src/main/resources/fabric.mod.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "rrls",
-  "version": "${version}",
+  "version": "${project.version}",
   "name": "Remove Reloading Screen",
   "description": "Makes resource packs load in the background, allowing you to do other things while waiting!",
   "authors": [
@@ -40,8 +40,10 @@
     "rrls-common.mixins.json"
   ],
   "depends": {
-    "minecraft": "~1.20",
-    "cloth-config": "*"
+    "fabricloader": ">=${project.loader_version}",
+    "minecraft": ">=${project.minecraft_version}",
+    "cloth-config": ">=${project.cloth_config_version}",
+    "java": ">=${project.targetCompatibility}"
   },
   "conflicts": {
     "dynamicfps": "*"

forge/build.gradle

@@ -22,20 +22,10 @@ configurations {
 dependencies {
     neoForge "net.neoforged:neoforge:${rootProject.forge_version}"
 
-    modLocalRuntime "curse.maven:configured-457570:5105024"
-
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }
 }
 
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("META-INF/neoforge.mods.toml") {
-        expand "version": project.version
-    }
-}
-
 shadowJar {
     exclude "fabric.mod.json"
 

forge/src/main/resources/META-INF/neoforge.mods.toml

@@ -1,12 +1,12 @@
-modLoader = "lowcodefml"
+modLoader = "lowcodefml" # javafml
 loaderVersion = "*"
 issueTrackerURL = "https://github.com/dima-dencep/rrls/issues"
 license = "OSL-3.0"
 
 [[mods]]
 displayTest = "IGNORE_ALL_VERSION"
 modId = "rrls"
-version = "${version}"
+version = "${project.version}"
 displayURL = "https://curseforge.com/minecraft/mc-mods/rrls"
 displayName = "Remove Reloading Screen"
 updateJSONURL = "https://api.modrinth.com/updates/rrls/forge_updates.json"
@@ -23,20 +23,13 @@ config = "rrls-common.mixins.json"
 [[dependencies.rrls]]
 modId = "neoforge"
 type = "required"
-versionRange = "*"
+versionRange = "[${project.forge_version},]"
 ordering = "NONE"
 side = "BOTH"
 
-[[dependencies.rrls]]
-modId = "roughlyenoughconfigscreens"
-type = "optional"
-versionRange = "*"
-ordering = "NONE"
-side = "CLIENT"
-
 [[dependencies.rrls]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.20,)"
+versionRange = "[${project.minecraft_version},)"
 ordering = "NONE"
 side = "BOTH"

gradle.properties

@@ -4,9 +4,9 @@ org.gradle.parallel=true
 
 # Properties
     minecraft_version = 1.20.5
-    parchment_version = 2024.02.25
+    parchment_version = 2024.04.14
     loader_version = 0.15.10
-    forge_version = 20.5.0-beta
+    forge_version = 20.5.20-beta
 
 # Mod Properties
     mod_version = 4.0.4
@@ -15,5 +15,4 @@ org.gradle.parallel=true
 
 # Dependencies
     modmenu_version = 10.0.0-beta.1
-    fabric_api_version = 0.97.6+1.20.5
-    cloth_config_version = 14.0.125
+    cloth_config_version = 14.0.126