diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index ded5120..6e421a6 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -63,7 +63,7 @@ jobs: athena-ctm(required){modrinth:b1ZV3DIJ}{curseforge:841890} chisel-reborn(required) - version-resolver: latest # Defaults to selecting the latest compatible version of Minecraft, using the tag from the fabric.mod.json + game-version-filter: latest # Defaults to selecting the latest compatible version of Minecraft, using the tag from the fabric.mod.json - name: Upload neoforge artifacts uses: Kir-Antipov/mc-publish@v3.3 @@ -92,4 +92,4 @@ jobs: athena-ctm(required){modrinth:b1ZV3DIJ}{curseforge:841890} chisel-reborn(required) - version-resolver: latest # Defaults to selecting the latest compatible version of Minecraft, using the tag from the fabric.mod.json + game-version-filter: latest # Defaults to selecting the latest compatible version of Minecraft, using the tag from the fabric.mod.json diff --git a/build.gradle b/build.gradle index 3cd19fc..c46c578 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,16 @@ subprojects { } } +def createVersionString() { + def builder = new StringBuilder() + + builder.append(mod_version) + + builder.append('+mc').append(minecraft_version) + + return builder.toString() +} + allprojects { apply plugin: "java" apply plugin: "architectury-plugin" @@ -35,7 +45,7 @@ allprojects { archivesName = rootProject.archives_base_name } - version = rootProject.mod_version + version = createVersionString() group = rootProject.maven_group repositories { diff --git a/fabric/build.gradle b/fabric/build.gradle index 5ca331b..0483407 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -2,6 +2,10 @@ plugins { id "com.github.johnrengelman.shadow" version "7.1.2" } +base { + archivesName = "factory_blocks-fabric" +} + architectury { platformSetupLoomIde() fabric() diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 5ff47c5..6212aca 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ }, "depends": { "fabricloader": ">=0.15.10", - "minecraft": [">=1.21", "<=1.21.1"], + "minecraft": ["~1.21", "~1.21.1"], "fabric-api": "*" }, "suggests": { diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 7770ab4..37fba73 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -2,6 +2,10 @@ plugins { id "com.github.johnrengelman.shadow" version "7.1.2" } +base { + archivesName = "factory_blocks-neoforge" +} + architectury { platformSetupLoomIde() neoForge() diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 185270a..a5ea930 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -13,17 +13,17 @@ Adds Factory Blocks to Chisel Reborn or Chipped ''' logoFile = "assets/factory_blocks/icon.png" -[[dependencies.chisel]] +[[dependencies.factory_blocks]] modId="minecraft" type="required" versionRange="[1.21,1.21.1]" -[[dependencies.chisel]] +[[dependencies.factory_blocks]] modId="neoforge" type="required" versionRange="[0,)" -[[dependencies.chisel]] +[[dependencies.factory_blocks]] modId="architectury" type="required" versionRange="[0,)" \ No newline at end of file