Fixed that version didn't contain the minecraft version

cech12 · Jan 3, 2024 · 07a7497 · 07a7497
1 parent 5ab7709
commit 07a7497
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/).
 
+## [1.20.4-2.1.0.1] - 2024-01-03
+### Fixed
+- Fixed that version didn't contain the minecraft version
+
 ## [1.20.4-2.1.0.0] - 2023-12-20
 ### Changed
 - Update to Minecraft 1.20.4 (Forge 49.0.10, Neoforge 20.4.46-beta)

diff --git a/build.gradle b/build.gradle
@@ -6,6 +6,8 @@ plugins {
 subprojects {
     apply plugin: 'java'
 
+    version "$project.minecraft_version-$project.mod_version"
+
     java.toolchain.languageVersion = JavaLanguageVersion.of(17)
     //java.withSourcesJar()
     //java.withJavadocJar()

diff --git a/common/build.gradle b/common/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT'
 }
 base {
-    archivesName = "${mod_id}-common-${minecraft_version}"
+    archivesName = "${mod_id}-common"
 }
 minecraft {
     version(minecraft_version)

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'org.spongepowered.mixin' version '0.7-SNAPSHOT'
 }
 base {
-    archivesName = "${mod_id}-forge-${minecraft_version}"
+    archivesName = "${mod_id}-forge"
 }
 mixin {
     add(sourceSets.main, "${mod_id}.refmap.json")

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -4,7 +4,7 @@ issueTrackerURL="${mod_issue_tracker}"
 license="${mod_license}"
 [[mods]]
     modId="${mod_id}"
-    version="${minecraft_version}-${version}"
+    version="${version}"
     displayName="${mod_name}"
     displayURL="${mod_url}"
     logoFile="logo.png"

diff --git a/gradle.properties b/gradle.properties
@@ -3,8 +3,8 @@
 # Every field you add must be added to the root build.gradle expandProps map.
 
 # Project
-version=2.1.0.0
 group=de.cech12.ceramicshears
+mod_version=2.1.0.1
 mod_id=ceramicshears
 mod_name=Ceramic Shears
 mod_author=Cech12

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'java-library'
 }
 base {
-    archivesName = "${mod_id}-neoforge-${minecraft_version}"
+    archivesName = "${mod_id}-neoforge"
 }
 
 // Automatically enable neoforge AccessTransformers if the file exists

diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
@@ -4,7 +4,7 @@ issueTrackerURL="${mod_issue_tracker}"
 license="${mod_license}"
 [[mods]]
     modId="${mod_id}"
-    version="${minecraft_version}-${version}"
+    version="${version}"
     displayName="${mod_name}"
     displayURL="${mod_url}"
     logoFile="logo.png"