Skip to content

Commit 16e4968

Browse files
committedJun 17, 2024
Move some constants into gradle.properties
1 parent d215d11 commit 16e4968

7 files changed

+67
-42
lines changed
 

‎build-fabric.gradle

+15-10
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ plugins {
22
id 'fabric-loom' version '1.6-SNAPSHOT'
33
}
44

5-
def minecraftVersion = "1.20.6" // Used for output JAR filenames.
6-
7-
version = project.mod_version
5+
version = project.modVersion
86
group = "yalter.mousetweaks"
9-
archivesBaseName = "MouseTweaks-fabric-mc${minecraftVersion}"
7+
archivesBaseName = "MouseTweaks-fabric-mc${project.fabricMcVersion}"
108

11-
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
9+
java.toolchain.languageVersion = JavaLanguageVersion.of(project.modJavaVersion)
1210

1311
repositories {
1412
maven {
@@ -35,19 +33,26 @@ loom {
3533
}
3634

3735
dependencies {
38-
minecraft "com.mojang:minecraft:${minecraftVersion}"
36+
minecraft "com.mojang:minecraft:${project.fabricMcVersion}"
3937
mappings loom.officialMojangMappings()
40-
modImplementation "net.fabricmc:fabric-loader:0.15.10"
41-
modImplementation "net.fabricmc.fabric-api:fabric-api:0.97.8+1.20.6"
38+
modImplementation "net.fabricmc:fabric-loader:${project.fabricLoaderVersion}"
39+
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabricApiVersion}"
4240

43-
modImplementation 'com.terraformersmc:modmenu:10.0.0-beta.1'
41+
modImplementation "com.terraformersmc:modmenu:${project.fabricModMenuVersion}"
4442
}
4543

4644
processResources {
4745
inputs.property "version", project.version
4846

4947
filesMatching("fabric.mod.json") {
50-
expand "version": project.version
48+
expand([
49+
"version": project.modVersion,
50+
"modJavaVersion": project.modJavaVersion,
51+
"fabricMcVersion": project.fabricMcVersion,
52+
"fabricLoaderVersion": project.fabricLoaderVersion,
53+
"modCredits": project.modCredits,
54+
"modDescription": project.modDescription,
55+
])
5156
}
5257
}
5358

‎build-neoforge.gradle

+11-8
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ plugins {
66
id 'net.neoforged.gradle.userdev' version '7.0.109'
77
}
88

9-
def minecraftVersion = "1.20.6" // Used for output JAR filenames.
10-
11-
version = project.mod_version
9+
version = project.modVersion
1210
group = "yalter.mousetweaks"
1311

1412
base {
15-
archivesName = "MouseTweaks-neoforge-mc${minecraftVersion}"
13+
archivesName = "MouseTweaks-neoforge-mc${project.neoMcVersion}"
1614
}
1715

18-
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
16+
java.toolchain.languageVersion = JavaLanguageVersion.of(project.modJavaVersion)
1917

2018
sourceSets {
2119
main {
@@ -33,9 +31,14 @@ sourceSets {
3331
}
3432

3533
processResources {
36-
inputs.property "version", project.mod_version
34+
inputs.property "version", project.modVersion
3735
filesMatching("META-INF/neoforge.mods.toml") {
38-
expand "version": project.mod_version
36+
expand([
37+
"version": project.modVersion,
38+
"neoLoaderVersion": project.neoLoaderVersion,
39+
"modCredits": project.modCredits,
40+
"modDescription": project.modDescription,
41+
])
3942
}
4043
}
4144

@@ -58,7 +61,7 @@ runs {
5861
}
5962

6063
dependencies {
61-
implementation "net.neoforged:neoforge:20.6.11-beta"
64+
implementation "net.neoforged:neoforge:${project.neoVersion}"
6265
}
6366

6467
task srcJar(type: Jar) {

‎build.gradle

+12-9
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ buildscript {
1111
apply plugin: 'net.minecraftforge.gradle'
1212
apply plugin: 'org.spongepowered.mixin'
1313

14-
def minecraftVersion = "1.20.6" // Used for output JAR filenames.
15-
16-
version = project.mod_version
14+
version = project.modVersion
1715
group = "yalter.mousetweaks"
18-
base.archivesName = "MouseTweaks-forge-mc${minecraftVersion}"
16+
base.archivesName = "MouseTweaks-forge-mc${project.forgeMcVersion}"
1917

20-
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
18+
java.toolchain.languageVersion = JavaLanguageVersion.of(project.modJavaVersion)
2119

2220
sourceSets {
2321
main {
@@ -39,7 +37,7 @@ mixin {
3937
}
4038

4139
minecraft {
42-
mappings channel: 'official', version: '1.20.6'
40+
mappings channel: 'official', version: project.forgeMcVersion
4341

4442
reobf = false
4543

@@ -73,14 +71,19 @@ minecraft {
7371
}
7472

7573
processResources {
76-
inputs.property "version", project.mod_version
74+
inputs.property "version", project.modVersion
7775
filesMatching("META-INF/mods.toml") {
78-
expand "version": project.mod_version
76+
expand([
77+
"version": project.modVersion,
78+
"forgeLoaderVersion": project.forgeLoaderVersion,
79+
"modCredits": project.modCredits,
80+
"modDescription": project.modDescription,
81+
])
7982
}
8083
}
8184

8285
dependencies {
83-
minecraft 'net.minecraftforge:forge:1.20.6-50.0.0'
86+
minecraft "net.minecraftforge:forge:${project.forgeMcVersion}-${project.forgeVersion}"
8487
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
8588
}
8689

‎gradle.properties

+19-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,22 @@
33
org.gradle.jvmargs=-Xmx3G
44
org.gradle.parallel=true
55
org.gradle.daemon=false
6-
mod_version=2.26
6+
7+
modVersion=2.26
8+
modJavaVersion=21
9+
# Remember to update fabric.mod.json
10+
modCredits=Contributors: mezz, juliand665, panoskj, FabiClawZ, ErrorMikey.
11+
modDescription=A mod that enhances the inventory management by adding various additional functions to the usual mouse buttons.
12+
13+
forgeMcVersion=1.20.6
14+
forgeVersion=50.0.0
15+
forgeLoaderVersion=[50,)
16+
17+
neoMcVersion=1.20.6
18+
neoVersion=20.6.11-beta
19+
neoLoaderVersion=[2,)
20+
21+
fabricMcVersion=1.20.6
22+
fabricLoaderVersion=0.15.10
23+
fabricApiVersion=0.97.8+1.20.6
24+
fabricModMenuVersion=10.0.0-beta.1

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

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
modLoader="javafml"
2-
loaderVersion="[50,)"
2+
loaderVersion="${forgeLoaderVersion}"
33
license="BSD-3-Clause"
44
issueTrackerURL="https://github.com/YaLTeR/MouseTweaks/issues"
55
clientSideOnly=true
@@ -10,8 +10,6 @@ version="${version}"
1010
displayName="Mouse Tweaks"
1111
displayURL="https://minecraft.curseforge.com/projects/mouse-tweaks"
1212
logoFile="mousetweaks_logo.png"
13-
credits="Contributors: mezz, juliand665, panoskj, FabiClawZ, ErrorMikey."
13+
credits="${modCredits}"
1414
authors="Ivan Molodetskikh (YaLTeR)"
15-
description='''
16-
A mod that enhances the inventory management by adding various additional functions to the usual mouse buttons.
17-
'''
15+
description="${modDescription}"
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
modLoader="javafml"
2-
loaderVersion="[2,)"
2+
loaderVersion="${neoLoaderVersion}"
33
license="BSD-3-Clause"
44
issueTrackerURL="https://github.com/YaLTeR/MouseTweaks/issues"
55

@@ -9,11 +9,9 @@ version="${version}"
99
displayName="Mouse Tweaks"
1010
displayURL="https://minecraft.curseforge.com/projects/mouse-tweaks"
1111
logoFile="mousetweaks_logo.png"
12-
credits="Contributors: mezz, juliand665, panoskj, FabiClawZ, ErrorMikey."
12+
credits="${modCredits}"
1313
authors="Ivan Molodetskikh (YaLTeR)"
14-
description='''
15-
A mod that enhances the inventory management by adding various additional functions to the usual mouse buttons.
16-
'''
14+
description="${modDescription}"
1715

1816
[[mixins]]
1917
config="mousetweaks.mixins.json"

‎src/main/resources/fabric.mod.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"id": "mousetweaks",
44
"version": "${version}",
55
"name": "Mouse Tweaks",
6-
"description": "A mod that enhances the inventory management by adding various additional functions to the usual mouse buttons.",
6+
"description": "${modDescription}",
77
"authors": [
88
"Ivan Molodetskikh (YaLTeR)"
99
],
@@ -35,10 +35,10 @@
3535
"mousetweaks-fabric.mixins.json"
3636
],
3737
"depends": {
38-
"fabricloader": ">=0.15.10",
38+
"fabricloader": ">=${fabricLoaderVersion}",
3939
"fabric-api": "*",
40-
"minecraft": "~1.20.6",
41-
"java": ">=21"
40+
"minecraft": "~${fabricMcVersion}",
41+
"java": ">=${modJavaVersion}"
4242
},
4343
"suggests": {}
4444
}

0 commit comments

Comments
 (0)
Please sign in to comment.