diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index a0f97fc..cde9269 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,7 +29,7 @@ "${mod_id}.mixins.json" ], "depends": { - "minecraft": "${minecraft_dependency}" + "minecraft": ${minecraft_dependency} }, "custom": { "modmenu:clientsideOnly": true, diff --git a/versions/1.20.4/gradle.properties b/versions/1.20.4/gradle.properties index 2a6105e..cb71dcc 100644 --- a/versions/1.20.4/gradle.properties +++ b/versions/1.20.4/gradle.properties @@ -1,7 +1,7 @@ # Development Environment java_version=17 minecraft_version=1.20.4 -minecraft_dependency=1.20.x +minecraft_dependency=1.20, 1.20.1, 1.20.2, 1.20.3, 1.20.4 yarn_mappings=1.20.4+build.3 # Compatible Libraries diff --git a/versions/1.20.6/gradle.properties b/versions/1.20.6/gradle.properties index ef02b82..3748b96 100644 --- a/versions/1.20.6/gradle.properties +++ b/versions/1.20.6/gradle.properties @@ -1,7 +1,7 @@ # Development Environment java_version=21 minecraft_version=1.20.6 -minecraft_dependency=1.20.x +minecraft_dependency=1.20.5, 1.20.6 yarn_mappings=1.20.6+build.3 # Compatible Libraries diff --git a/versions/1.21/build.gradle b/versions/1.21/build.gradle index 129a3ca..3eef405 100644 --- a/versions/1.21/build.gradle +++ b/versions/1.21/build.gradle @@ -1,3 +1,5 @@ +import groovy.json.JsonBuilder + plugins { id 'fabric-loom' id 'com.replaymod.preprocess' @@ -106,13 +108,18 @@ processResources { into("assets/${project.mod_id}") } + HashSet mc_condition = [] + Arrays.stream(project.minecraft_dependency.split(',')) + .map { it.trim() } + .forEach { mc_condition.add(it) } + filesMatching('fabric.mod.json') { filter { line -> line.trim().startsWith('//') ? '' : line } expand([ - 'minecraft_dependency': project.minecraft_dependency, + 'minecraft_dependency': new JsonBuilder(mc_condition), 'minecraft_version_id': project.minecraft_version.replace('.', '_'), 'minecraft_version' : project.minecraft_version, 'mod_description' : project.mod_description,