Skip to content

Commit 740a4ef

Browse files
fix: versioning
1 parent 6e0ccad commit 740a4ef

3 files changed

Lines changed: 29 additions & 5 deletions

File tree

build.gradle

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,22 @@ loom {
2323
repositories {
2424
}
2525

26+
def replaceProperties = [
27+
minecraft_version: minecraft_version,
28+
minecraft_version_range: minecraft_version_range.replace("[%base]", minecraft_version),
29+
forge_version_range: forge_version.split("\\.").first(),
30+
version: version,
31+
]
32+
33+
processResources {
34+
inputs.properties replaceProperties
35+
replaceProperties.put 'project', project
36+
37+
filesMatching("META-INF/mods.toml") {
38+
expand replaceProperties
39+
}
40+
}
41+
2642
dependencies {
2743
minecraft "com.mojang:minecraft:${project.minecraft_version}"
2844
mappings loom.officialMojangMappings()

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ org.gradle.jvmargs=-Xmx4G
44

55
mod_version=2.16.0
66
minecraft_version=1.20
7+
minecraft_version_range=[%base],1.21
78

89
# Forge
910
forge_version=46.0.14
Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
modLoader="javafml" #mandatory
2-
loaderVersion="[39,)" #mandatory
3-
credits="Michael Hillox" #optional
4-
authors="Michael Hillcox" #optional
2+
loaderVersion="[${forge_version_range},)" #mandatory
3+
credits="ErrorMikey" #optional
4+
authors="AdvancedXRay Team" #optional
55
license="GNU GPL v3.0 (https://github.com/MichaelHillcox/XRay-Mod/blob/master/LICENSE)"
66
[[mods]]
77
modId="xray"
8-
version="${file.jarVersion}"
8+
version="${version}"
99
displayName="Advanced XRay"
1010
description="An advanced XRay mod for Minecraft."
1111

1212
[[dependencies.xray]]
1313
modId="forge"
1414
mandatory=true
15-
versionRange="[41.0.98,)"
15+
versionRange="[${forge_version_range},)"
16+
ordering="NONE"
17+
side="CLIENT"
18+
19+
[[dependencies.xray]]
20+
modId="minecraft"
21+
mandatory=true
22+
versionRange="[${minecraft_version_range})"
1623
ordering="NONE"
1724
side="CLIENT"

0 commit comments

Comments
 (0)