diff --git a/build.gradle b/build.gradle index f3aa778..4536409 100644 --- a/build.gradle +++ b/build.gradle @@ -158,22 +158,18 @@ dependencies { minecraft 'net.minecraftforge:forge:' + minecraft_version + '-' + forge_version // compile against the JEI API but do not include it at runtime - compileOnly fg.deobf("mezz.jei:jei-1.16.2:${jei_version}:api") + compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api") // at runtime, use the full JEI jar - runtimeOnly fg.deobf("mezz.jei:jei-1.16.2:${jei_version}") + runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}") } def modsTomlSpec = copySpec{ from(sourceSets.main.resources) { include 'META-INF/mods.toml' expand 'version': artifact_version, - 'minecraft_version_min': minecraft_version_min, - 'minecraft_version_max': minecraft_version_max, - 'forge_version_min': forge_version_min, - 'forge_version_max': forge_version_max, - 'javafml_min': javafml_min, - 'javafml_max': javafml_max, - 'MCversion': minecraft_version + 'loader_range': loader_range, + 'minecraft_range': minecraft_range, + 'forge_range': forge_range } } diff --git a/gradle.properties b/gradle.properties index ec3f08e..4e4ac43 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,19 +6,16 @@ org.gradle.daemon=false mod_version=1.6 # Minecraft Version Information -minecraft_version_min=1.16.2 -minecraft_version=1.16.4 -minecraft_version_max=1.17 +minecraft_version=1.16.5 +minecraft_range=[1.16.2,1.17) # Forge Version Information -javafml_min=33.0 -javafml_max=36.0 -forge_version_min=33.0.0 -forge_version=35.0.1 -forge_version_max=36.0.0 +loader_range=[33.0,) +forge_version=36.0.0 +forge_range=[33.0.61,) # Mappings Information mappings_version=20200916-1.16.2 # Build dependencies -jei_version=7.1.0.11 +jei_version=1.16.4:7.6.1.65 diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 346debb..71fc9c8 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[${javafml_min},${javafml_max})" +loaderVersion="${loader_range}" issueTrackerURL="https://github.com/SlimeKnights/Mantle/issues" logoFile="Mantle.png" license="MIT" @@ -17,13 +17,13 @@ Shared code for Slime Knights mods and others. [[dependencies.mantle]] modId="forge" mandatory=true - versionRange="[${forge_version_min},${forge_version_max})" + versionRange="${forge_range}" ordering="NONE" side="BOTH" [[dependencies.mantle]] modId="minecraft" mandatory=true - versionRange="[${minecraft_version_min},${minecraft_version_max})" + versionRange="${minecraft_range}" ordering="NONE" side="BOTH"