diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 1b3ae22..b316ccf 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -22,7 +22,7 @@ dependencies { shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}" - modApi("com.terraformersmc:modmenu:${mod_menu_version}") { + modCompileOnlyApi("com.terraformersmc:modmenu:${mod_menu_version}") { exclude(group: "net.fabricmc.fabric-api") } } @@ -98,7 +98,7 @@ publishing { pomNode.dependencies.'*'.findAll() { it.artifactId.text() == 'regutils-joined-fabric' || it.artifactId.text() == 'core' || - it.artifactId.text() == 'toml' + it.artifactId.text() == 'toml' || it.artifactId.text() == "modmenu" }.each() { it.parent().remove(it) } diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index 5b9bc0b..682cb21 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -32,9 +32,9 @@ ], "accessWidener": "craterlib.aw", "depends": { - "fabricloader": ">=0.14", + "fabricloader": ">=0.14.19", "fabric": "*", - "minecraft": ">=1.20", + "minecraft": "*", "java": ">=17" } } diff --git a/build.gradle b/build.gradle index d7221df..c370bc9 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,8 @@ if (System.getenv('BUILD_NUMBER') != null && project.release == false) { final_ver = version_base + "." + System.getenv('BUILD_NUMBER') + "d" } +version = "${final_ver}" + subprojects { version = "${final_ver}" group = project.group @@ -95,7 +97,7 @@ task rpcJar(type: Jar) { dependsOn(compileJava) includeEmptyDirs = false archivesBaseName = "${mod_name}-common-${minecraft_version}" - version = project.version; + version = final_ver; classifier = "rpc" from project(":Common").sourceSets.main.output @@ -110,7 +112,7 @@ task configJar(type: Jar) { dependsOn(compileJava) includeEmptyDirs = false archivesBaseName = "${mod_name}-common-${minecraft_version}" - version = project.version; + version = final_ver; classifier = "config" from project(":Common").sourceSets.main.output @@ -121,7 +123,7 @@ task eventsJar(type: Jar) { dependsOn(compileJava) includeEmptyDirs = false archivesBaseName = "${mod_name}-common-${minecraft_version}" - version = project.version; + version = final_ver; classifier = "events" from project(":Common").sourceSets.main.output diff --git a/gradle.properties b/gradle.properties index abead35..83f3959 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ # Project version_major=0 version_minor=0 -version_patch=1d +version_patch=7d group=me.hypherionmc.craterlib # Common -minecraft_version=1.20-pre1 +minecraft_version=1.20-pre6 common_runs_enabled=false common_client_run_name=Common Client common_server_run_name=Common Server @@ -15,7 +15,7 @@ forge_version=45.0.9 forge_ats_enabled=true # Fabric -fabric_version=0.80.3+1.20 +fabric_version=0.82.1+1.20 fabric_loader_version=0.14.9 # Mod options