diff --git a/build.gradle b/build.gradle index 5a21af683..b6af0a7d9 100644 --- a/build.gradle +++ b/build.gradle @@ -447,6 +447,8 @@ subprojects { p -> fabric_incompatibility_list : fabric_incompatibility_list, fabric_recommend_list : fabric_recommend_list, + + neoforge_version_range : neoforge_version_range, ] // replace any properties in the sub-projects with the values defined here diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 7115fe41d..3443a4909 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -3,6 +3,8 @@ loaderVersion = "*" # // mandatory. Allow all forge versions as we are definding license = "LGPL" issueTrackerURL = "${issues}" +# https://docs.neoforged.net/docs/gettingstarted/modfiles/#neoforgemodstoml + [[mods]] #//mandatory modId = "distanthorizons" #//mandatory @@ -32,4 +34,11 @@ issueTrackerURL = "${issues}" type = "required" versionRange = "${compatible_forgemc_versions}" # Where we set what version of mc it is avalible for ordering = "NONE" - side = "BOTH" \ No newline at end of file + side = "BOTH" + +[[dependencies.distanthorizons]] + modId = "neoforge" + type = "required" + versionRange = "${neoforge_version_range}" + ordering = "NONE" + side = "BOTH" diff --git a/versionProperties/1.20.4.properties b/versionProperties/1.20.4.properties index 316737ce4..2086a6bd0 100644 --- a/versionProperties/1.20.4.properties +++ b/versionProperties/1.20.4.properties @@ -45,6 +45,8 @@ fabric_api_version=0.91.2+1.20.4 # (Neo)Forge loader forge_version=49.1.13 neoforge_version=20.4.233 + neoforge_version_range=[,) + # (Neo)Forge mod versions starlight_version_forge= terraforged_version= diff --git a/versionProperties/1.20.6.properties b/versionProperties/1.20.6.properties index 665391a69..78fa78239 100644 --- a/versionProperties/1.20.6.properties +++ b/versionProperties/1.20.6.properties @@ -45,6 +45,8 @@ fabric_api_version=0.97.8+1.20.6 # (Neo)Forge loader forge_version=50.0.19 neoforge_version=20.6.70-beta + neoforge_version_range=[,) + # (Neo)Forge mod versions starlight_version_forge= terraforged_version= diff --git a/versionProperties/1.21.1.properties b/versionProperties/1.21.1.properties index ad7462074..0f4c5d814 100644 --- a/versionProperties/1.21.1.properties +++ b/versionProperties/1.21.1.properties @@ -45,6 +45,8 @@ fabric_api_version=0.115.0+1.21.1 # (Neo)Forge loader forge_version= neoforge_version=21.1.92 + neoforge_version_range=[,) + # (Neo)Forge mod versions starlight_version_forge= terraforged_version= diff --git a/versionProperties/1.21.3.properties b/versionProperties/1.21.3.properties index fb6c485cf..54fcb87ad 100644 --- a/versionProperties/1.21.3.properties +++ b/versionProperties/1.21.3.properties @@ -45,6 +45,8 @@ fabric_api_version=0.110.0+1.21.3 # (Neo)Forge loader forge_version= neoforge_version=21.3.11-beta + neoforge_version_range=[,) + # (Neo)Forge mod versions starlight_version_forge= terraforged_version= diff --git a/versionProperties/1.21.4.properties b/versionProperties/1.21.4.properties index 1234872ac..0f29df42d 100644 --- a/versionProperties/1.21.4.properties +++ b/versionProperties/1.21.4.properties @@ -44,6 +44,8 @@ fabric_api_version=0.110.5+1.21.4 # (Neo)Forge loader forge_version= neoforge_version=21.4.3-beta + neoforge_version_range=[,) + # (Neo)Forge mod versions starlight_version_forge= terraforged_version= diff --git a/versionProperties/1.21.5.properties b/versionProperties/1.21.5.properties index 5504820c0..743740be3 100644 --- a/versionProperties/1.21.5.properties +++ b/versionProperties/1.21.5.properties @@ -44,6 +44,8 @@ fabric_api_version=0.119.5+1.21.5 # (Neo)Forge loader forge_version= neoforge_version=21.5.0-beta + neoforge_version_range=[,) + # (Neo)Forge mod versions starlight_version_forge= terraforged_version= diff --git a/versionProperties/1.21.6.properties b/versionProperties/1.21.6.properties index cfa91fb44..54f77d2f5 100644 --- a/versionProperties/1.21.6.properties +++ b/versionProperties/1.21.6.properties @@ -42,7 +42,10 @@ fabric_api_version=0.127.0+1.21.6 # (Neo)Forge loader forge_version= -neoforge_version=21.6.20-beta +neoforge_version=21.6.19-beta + # around 6.19 neo changed how their render API works, failing to meet this causes the game to crash + neoforge_version_range=[21.6.19-beta,) + # (Neo)Forge mod versions starlight_version_forge= terraforged_version=