From 95b1ecff0db829782207a0497e6b362819a67a3f Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 27 Aug 2023 14:14:00 -0500 Subject: [PATCH] Add Fabric incompatibility list to versionProperties also mark Sodium <0.5 as incompatible for 1.20 --- build.gradle | 4 +++- fabric/src/main/resources/fabric.mod.json | 4 +++- versionProperties/1.16.5.properties | 2 ++ versionProperties/1.17.1.properties | 2 ++ versionProperties/1.18.2.properties | 2 ++ versionProperties/1.19.2.properties | 2 ++ versionProperties/1.19.4.properties | 2 ++ versionProperties/1.20.1.properties | 4 +++- 8 files changed, 19 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 7b19a6a3d..1869af0a5 100644 --- a/build.gradle +++ b/build.gradle @@ -395,7 +395,9 @@ subprojects { p -> git_main_commit : git_main_commit, git_core_commit : git_core_commit, - git_main_branch : git_main_branch + git_main_branch : git_main_branch, + + fabric_incompatibility_list : fabric_incompatibility_list, ] // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 9a1e3fab2..f311a65bd 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -54,5 +54,7 @@ "suggests": { "blendium": "*" - } + }, + + "breaks": $fabric_incompatibility_list } diff --git a/versionProperties/1.16.5.properties b/versionProperties/1.16.5.properties index 662db3e66..c3683be84 100644 --- a/versionProperties/1.16.5.properties +++ b/versionProperties/1.16.5.properties @@ -20,6 +20,8 @@ fabric_api_version=0.42.0+1.16 immersive_portals_version= canvas_version= + fabric_incompatibility_list={ } + # Fabric mod run # 0 = Don't enable and don't run # 1 = Can be referenced in code but doesn't run diff --git a/versionProperties/1.17.1.properties b/versionProperties/1.17.1.properties index 42f12deae..80aab1901 100644 --- a/versionProperties/1.17.1.properties +++ b/versionProperties/1.17.1.properties @@ -20,6 +20,8 @@ fabric_api_version=0.46.1+1.17 immersive_portals_version= canvas_version= + fabric_incompatibility_list={ } + # Fabric mod run # 0 = Don't enable and don't run # 1 = Can be referenced in code but doesn't run diff --git a/versionProperties/1.18.2.properties b/versionProperties/1.18.2.properties index 4392118ae..62c33f7aa 100644 --- a/versionProperties/1.18.2.properties +++ b/versionProperties/1.18.2.properties @@ -21,6 +21,8 @@ fabric_api_version=0.76.0+1.18.2 immersive_portals_version=v1.4.11-1.18 canvas_version=mc118:1.0.2616 + fabric_incompatibility_list={ } + # Fabric mod run # 0 = Don't enable and don't run # 1 = Can be referenced in code but doesn't run diff --git a/versionProperties/1.19.2.properties b/versionProperties/1.19.2.properties index 8807dcf7a..cdde6a134 100644 --- a/versionProperties/1.19.2.properties +++ b/versionProperties/1.19.2.properties @@ -20,6 +20,8 @@ fabric_api_version=0.76.0+1.19.2 immersive_portals_version= canvas_version=mc119-1.0.2480 + fabric_incompatibility_list={ } + # Fabric mod run # 0 = Don't enable and don't run # 1 = Can be referenced in code but doesn't run diff --git a/versionProperties/1.19.4.properties b/versionProperties/1.19.4.properties index 7ecad56ea..2783daeab 100644 --- a/versionProperties/1.19.4.properties +++ b/versionProperties/1.19.4.properties @@ -19,6 +19,8 @@ fabric_api_version=0.83.0+1.19.4 bclib_version=2.3.3 immersive_portals_version= canvas_version= + + fabric_incompatibility_list={ } # Fabric mod run # 0 = Don't enable and don't run diff --git a/versionProperties/1.20.1.properties b/versionProperties/1.20.1.properties index caf958bab..828da4203 100644 --- a/versionProperties/1.20.1.properties +++ b/versionProperties/1.20.1.properties @@ -19,7 +19,9 @@ fabric_api_version=0.85.0+1.20.1 bclib_version=3.0.12 immersive_portals_version= canvas_version= - + + fabric_incompatibility_list={ "sodium": "<0.5.0" } + # Fabric mod run # 0 = Don't enable and don't run # 1 = Can be referenced in code but doesn't run