From b237e1802aa8a887bc1d190467f1281e3becee53 Mon Sep 17 00:00:00 2001 From: Kamigen <46357922+Edouard127@users.noreply.github.com> Date: Mon, 8 Jul 2024 19:32:58 -0400 Subject: [PATCH 1/3] Support all major versions --- fabric/src/main/resources/fabric.mod.json | 2 +- forge/src/main/resources/META-INF/mods.toml | 2 +- gradle.properties | 2 ++ neoforge/src/main/resources/META-INF/mods.toml | 2 +- neoforge/src/main/resources/META-INF/neoforge.mods.toml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index aa876c374..759c3e9d1 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -28,7 +28,7 @@ "depends": { "fabricloader": ">=${fabricLoaderVersion}", "fabric-api": ">=${fabricApiVersion}+${minecraftVersion}", - "minecraft": ">=${minecraftVersion}", + "minecraft": "~${minecraftVersion}", "fabric-language-kotlin": ">=${kotlinFabricVersion}", "java": ">=${javaVersion}" } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 529e21d46..ff222bf19 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -22,7 +22,7 @@ side = "CLIENT" [[dependencies.${modId}]] modId = "minecraft" mandatory = true -versionRange = "[${minecraftVersion},)" +versionRange = "[${minecraftVersionMin},${minecraftVersionMax}]" ordering = "NONE" side = "CLIENT" diff --git a/gradle.properties b/gradle.properties index 319b6b9df..d51bc7632 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,8 @@ modAuthors=Constructor, Blade, Edouard127 # General minecraftVersion=1.20.4 +minecraftVersionMin=1.20 +minecraftVersionMax=1.20.6 mixinExtrasVersion=0.3.6 kotlinVersion=2.0.0 kotlinxCoroutinesVersion=1.9.0-RC diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml index 22d36f423..d582dcf1d 100644 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -28,7 +28,7 @@ side = "CLIENT" modId = "minecraft" mandatory = true type = "required" -versionRange = "[${minecraftVersion},)" +versionRange = "[${minecraftVersionMin},${minecraftVersionMax}]" ordering = "NONE" side = "CLIENT" diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 22d36f423..d582dcf1d 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -28,7 +28,7 @@ side = "CLIENT" modId = "minecraft" mandatory = true type = "required" -versionRange = "[${minecraftVersion},)" +versionRange = "[${minecraftVersionMin},${minecraftVersionMax}]" ordering = "NONE" side = "CLIENT" From eb4f0c5ddb271e5056e58d6de1855f8ce6aaaf18 Mon Sep 17 00:00:00 2001 From: Kamigen <46357922+Edouard127@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:09:13 -0400 Subject: [PATCH 2/3] Added version range --- forge/src/main/resources/META-INF/mods.toml | 4 ++-- gradle.properties | 7 ++++++- neoforge/src/main/resources/META-INF/mods.toml | 4 ++-- neoforge/src/main/resources/META-INF/neoforge.mods.toml | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index ff222bf19..ca2f9de3a 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -15,7 +15,7 @@ displayTest = "IGNORE_ALL_VERSION" [[dependencies.${modId}]] modId = "forge" mandatory = true -versionRange = "[${forgeVersion},)" +versionRange = "[${forgeVersionMin},${forgeVersionMax}]" ordering = "NONE" side = "CLIENT" @@ -29,6 +29,6 @@ side = "CLIENT" [[dependencies.${modId}]] modId = "kotlinforforge" mandatory = true -versionRange = "[${kotlinForgeVersion},)" +versionRange = "[${kotlinForgeVersionMin},${kotlinForgeVersionMax}]" ordering = "NONE" side = "CLIENT" diff --git a/gradle.properties b/gradle.properties index d51bc7632..30b9e0fb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,12 +21,17 @@ fabricApiVersion=0.97.1 kotlinFabricVersion=1.11.0+kotlin.2.0.0 # Forge https://files.minecraftforge.net/ -# Please do not change this version it will implode and create a black hole forgeVersion=49.0.31 +forgeVersionMin=44.0.0 +forgeVersionMax=50.999.10 kotlinForgeVersion=4.11.0 +kotlinForgeVersionMin=4.0.0 +kotlinForgeVersionMax=4.11.0 # NeoForge https://neoforged.net neoVersion=20.4.237 +neoVersionMin=20.2.3-beta +neoVersionMax=20.999.0 # Kotlin https://kotlinlang.org/ kotlin.code.style=official diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml index d582dcf1d..1369f97c9 100644 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -20,7 +20,7 @@ config = "lambda.mixins.common.json" modId = "neoforge" mandatory = true type = "required" -versionRange = "[${neoVersion},)" +versionRange = "[${neoVersionMin},${neoVersionMax}]" ordering = "NONE" side = "CLIENT" @@ -36,6 +36,6 @@ side = "CLIENT" modId = "kotlinforforge" mandatory = true type = "required" -versionRange = "[${kotlinForgeVersion},)" +versionRange = "[${kotlinForgeVersionMin},${kotlinForgeVersionMax}]" ordering = "NONE" side = "CLIENT" diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index d582dcf1d..1369f97c9 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -20,7 +20,7 @@ config = "lambda.mixins.common.json" modId = "neoforge" mandatory = true type = "required" -versionRange = "[${neoVersion},)" +versionRange = "[${neoVersionMin},${neoVersionMax}]" ordering = "NONE" side = "CLIENT" @@ -36,6 +36,6 @@ side = "CLIENT" modId = "kotlinforforge" mandatory = true type = "required" -versionRange = "[${kotlinForgeVersion},)" +versionRange = "[${kotlinForgeVersionMin},${kotlinForgeVersionMax}]" ordering = "NONE" side = "CLIENT" From 99bdc1c81489ae7a67a481ceaa6a9df18e259183 Mon Sep 17 00:00:00 2001 From: Kamigen <46357922+Edouard127@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:56:17 -0400 Subject: [PATCH 3/3] Update gradle.properties --- gradle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 30b9e0fb6..853bead9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,8 @@ modAuthors=Constructor, Blade, Edouard127 # General minecraftVersion=1.20.4 -minecraftVersionMin=1.20 -minecraftVersionMax=1.20.6 +minecraftVersionMin=1.20.3 +minecraftVersionMax=1.20.4 mixinExtrasVersion=0.3.6 kotlinVersion=2.0.0 kotlinxCoroutinesVersion=1.9.0-RC @@ -22,8 +22,8 @@ kotlinFabricVersion=1.11.0+kotlin.2.0.0 # Forge https://files.minecraftforge.net/ forgeVersion=49.0.31 -forgeVersionMin=44.0.0 -forgeVersionMax=50.999.10 +forgeVersionMin=44 +forgeVersionMax=49.999.0 kotlinForgeVersion=4.11.0 kotlinForgeVersionMin=4.0.0 kotlinForgeVersionMax=4.11.0