fix: change versioning logic (closes #76)

CHANGELOG.md

@@ -1,4 +1 @@
-- Only show hoe warning when hand is empty.
-- Add a warning which sends when the client connects to a server without RightClickHarvest.
-- Add configuration for XP levels (loss or gain, depending on config).
-- Lots of modded hoe support.
+- Change versioning logic (closes #76)

build.gradle

@@ -27,6 +27,10 @@ subprojects {
 
     loom {
         silentMojangMappingsLicense()
+
+        mixin {
+            useLegacyMixinAp = false
+        }
     }
 
     jar {

fabric/build.gradle

@@ -97,14 +97,14 @@ publishing {
 processResources {
     filesMatching("fabric.mod.json") {
         expand "version": project.version,
-                "minecraft_version": project.minecraft_version,
+                "minecraft_version": project.minimum_minecraft_version,
                 "fabric_api_version": libs.versions.fabric.api.get(),
                 "architectury_version": libs.versions.architectury.get(),
                 "jamlib_version": libs.versions.jamlib.get()
     }
 
     inputs.property "version", project.version
-    inputs.property "minecraft_version", project.minecraft_version
+    inputs.property "minecraft_version", project.minimum_minecraft_version
     inputs.property "fabric_api_version", libs.versions.fabric.api.get()
     inputs.property "architectury_version", libs.versions.architectury.get()
     inputs.property "jamlib_version", libs.versions.jamlib.get()

gradle.properties

@@ -1,10 +1,11 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 org.gradle.parallel=true
-version=4.4.0+1.21.1
+version=4.4.1+1.21.1
 minecraft_version=1.21.1
 additional_minecraft_versions=1.21
-branch=main
+minimum_minecraft_version=1.21
+branch=1.21.1
 group=io.github.jamalam360
 mod_name=Right Click Harvest
 mod_id=rightclickharvest

libs.versions.toml

@@ -10,7 +10,7 @@ fabric-loader = "0.15.11"
 fabric-api = "0.106.0+1.21.1"
 
 # https://maven.jamalam.tech/#/releases
-jamlib = "1.2.1+1.21"
+jamlib = "1.2.2+1.21.1"
 
 # https://modrinth.com/mod/modmenu/versions
 modmenu = "11.0.3"

neoforge/build.gradle

@@ -96,17 +96,20 @@ publishing {
 }
 
 processResources {
-    filesMatching("mods.toml") {
-        expand "minecraft_version": project.minecraft_version,
+    filesMatching("META-INF/neoforge.mods.toml") {
+        expand "version": project.version,
+                "minecraft_version": project.minimum_minecraft_version,
+                "neoforge_version": libs.versions.neoforge.get(),
                 "architectury_version": libs.versions.architectury.get(),
                 "jamlib_version": libs.versions.jamlib.get()
     }
 
-    inputs.property "minecraft_version", project.minecraft_version
+    inputs.property "version", project.version
+    inputs.property "minecraft_version", project.minimum_minecraft_version
+    inputs.property "neoforge_version", libs.versions.neoforge.get()
     inputs.property "architectury_version", libs.versions.architectury.get()
     inputs.property "jamlib_version", libs.versions.jamlib.get()
 }
-
 shadowJar {
     exclude "fabric.mod.json"
     exclude "architectury.common.json"

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -5,7 +5,7 @@ issueTrackerURL = "https://github.com/JamCoreModding/right-click-harvest/issues"
 
 [[mods]]
 modId = "rightclickharvest"
-version = "${file.jarVersion}"
+version = "${version}"
 displayName = "Right Click Harvest"
 displayURL = "https://github.com/JamCoreModding/right-click-harvest"
 logoFile = "icon.png"
@@ -15,7 +15,7 @@ description = "Right click crops to harvest them - with style."
 [[dependencies.rightclickharvest]]
 modId = "neoforge"
 type = "required"
-versionRange = "[20.4,)"
+versionRange = "[${neoforge_version},)"
 ordering = "NONE"
 side = "BOTH"