Skip to content

Commit 76d5063

Browse files
Big-Iron-CheemsBig-Iron-Cheems
authored
Feat: Gradle Version Catalog (#5813)
1 parent 1f564ad commit 76d5063

6 files changed

Lines changed: 96 additions & 76 deletions

File tree

‎build.gradle.kts‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("fabric-loom") version "1.11-SNAPSHOT"
2+
alias(libs.plugins.fabric.loom)
33
id("maven-publish")
44
}
55

@@ -13,7 +13,7 @@ base {
1313
"local"
1414
}
1515

16-
version = properties["minecraft_version"] as String + "-" + suffix
16+
version = libs.versions.minecraft.get() + "-" + suffix
1717
}
1818

1919
repositories {
@@ -71,35 +71,34 @@ configurations {
7171

7272
dependencies {
7373
// Fabric
74-
minecraft("com.mojang:minecraft:${properties["minecraft_version"] as String}")
75-
mappings("net.fabricmc:yarn:${properties["yarn_mappings"] as String}:v2")
76-
modImplementation("net.fabricmc:fabric-loader:${properties["loader_version"] as String}")
74+
minecraft(libs.minecraft)
75+
mappings(variantOf(libs.yarn) { classifier("v2") })
76+
modImplementation(libs.fabric.loader)
7777

78-
modInclude(fabricApi.module("fabric-api-base", properties["fapi_version"] as String))
79-
modInclude(fabricApi.module("fabric-resource-loader-v0", properties["fapi_version"] as String))
80-
modInclude(fabricApi.module("fabric-resource-loader-v1", properties["fapi_version"] as String))
78+
val fapiVersion = libs.versions.fabric.api.get()
79+
modInclude(fabricApi.module("fabric-api-base", fapiVersion))
80+
modInclude(fabricApi.module("fabric-resource-loader-v0", fapiVersion))
81+
modInclude(fabricApi.module("fabric-resource-loader-v1", fapiVersion))
8182

8283
// Compat fixes
83-
modCompileOnly(fabricApi.module("fabric-renderer-indigo", properties["fapi_version"] as String))
84-
modCompileOnly("maven.modrinth:sodium:${properties["sodium_version"] as String}") { isTransitive = false }
85-
modCompileOnly("maven.modrinth:lithium:${properties["lithium_version"] as String}") { isTransitive = false }
86-
modCompileOnly("maven.modrinth:iris:${properties["iris_version"] as String}") { isTransitive = false }
87-
modCompileOnly("com.viaversion:viafabricplus:${properties["viafabricplus_version"] as String}") { isTransitive = false }
88-
modCompileOnly("com.viaversion:viafabricplus-api:${properties["viafabricplus_version"] as String}") { isTransitive = false }
89-
90-
// Baritone (https://github.com/MeteorDevelopment/baritone)
91-
modCompileOnly("meteordevelopment:baritone:${properties["baritone_version"] as String}-SNAPSHOT")
92-
// ModMenu (https://github.com/TerraformersMC/ModMenu)
93-
modCompileOnly("com.terraformersmc:modmenu:${properties["modmenu_version"] as String}")
94-
95-
// Libraries
96-
jij("meteordevelopment:orbit:${properties["orbit_version"] as String}")
97-
jij("org.meteordev:starscript:${properties["starscript_version"] as String}")
98-
jij("meteordevelopment:discord-ipc:${properties["discordipc_version"] as String}")
99-
jij("org.reflections:reflections:${properties["reflections_version"] as String}")
100-
jij("io.netty:netty-handler-proxy:${properties["netty_version"] as String}") { isTransitive = false }
101-
jij("io.netty:netty-codec-socks:${properties["netty_version"] as String}") { isTransitive = false }
102-
jij("de.florianmichael:WaybackAuthLib:${properties["waybackauthlib_version"] as String}")
84+
modCompileOnly(fabricApi.module("fabric-renderer-indigo", fapiVersion))
85+
modCompileOnly(libs.sodium) { isTransitive = false }
86+
modCompileOnly(libs.lithium) { isTransitive = false }
87+
modCompileOnly(libs.iris) { isTransitive = false }
88+
modCompileOnly(libs.viafabricplus) { isTransitive = false }
89+
modCompileOnly(libs.viafabricplus.api) { isTransitive = false }
90+
91+
modCompileOnly(libs.baritone)
92+
modCompileOnly(libs.modmenu)
93+
94+
// Libraries (JAR-in-JAR)
95+
jij(libs.orbit)
96+
jij(libs.starscript)
97+
jij(libs.discord.ipc)
98+
jij(libs.reflections)
99+
jij(libs.netty.handler.proxy) { isTransitive = false }
100+
jij(libs.netty.codec.socks) { isTransitive = false }
101+
jij(libs.waybackauthlib)
103102
}
104103

105104
// Handle transitive dependencies for jar-in-jar
@@ -152,8 +151,8 @@ tasks {
152151
"version" to project.version,
153152
"build_number" to buildNumber,
154153
"commit" to commit,
155-
"minecraft_version" to project.property("minecraft_version"),
156-
"loader_version" to project.property("loader_version")
154+
"minecraft_version" to libs.versions.minecraft.get(),
155+
"loader_version" to libs.versions.fabric.loader.get()
157156
)
158157

159158
inputs.properties(propertyMap)
@@ -215,7 +214,7 @@ publishing {
215214
from(components["java"])
216215
artifactId = "meteor-client"
217216

218-
version = properties["minecraft_version"] as String + "-SNAPSHOT"
217+
version = libs.versions.minecraft.get() + "-SNAPSHOT"
219218
}
220219
}
221220

‎gradle.properties‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,6 @@
11
org.gradle.jvmargs=-Xmx2G
22
org.gradle.configuration-cache=false
33

4-
# Fabric (https://fabricmc.net/develop)
5-
minecraft_version=1.21.10
6-
yarn_mappings=1.21.10+build.1
7-
loader_version=0.17.2
8-
fapi_version=0.135.0+1.21.10
9-
104
# Mod Properties
115
maven_group=meteordevelopment
126
archives_base_name=meteor-client
13-
14-
# Dependency Versions
15-
16-
# Baritone (https://github.com/MeteorDevelopment/baritone)
17-
baritone_version=1.21.10
18-
19-
# Sodium (https://github.com/CaffeineMC/sodium-fabric)
20-
sodium_version=mc1.21.10-0.7.2-fabric
21-
22-
# Lithium (https://github.com/CaffeineMC/lithium-fabric)
23-
lithium_version=mc1.21.10-0.20.0-fabric
24-
25-
# Iris (https://github.com/IrisShaders/Iris)
26-
iris_version=1.9.6+1.21.10-fabric
27-
28-
# ModMenu (https://github.com/TerraformersMC/ModMenu)
29-
modmenu_version=15.0.0
30-
31-
# Orbit (https://github.com/MeteorDevelopment/orbit)
32-
orbit_version=0.2.4
33-
34-
# Starscript (https://github.com/MeteorDevelopment/starscript)
35-
starscript_version=0.2.5
36-
37-
# DiscordRPC (https://github.com/MeteorDevelopment/java-discord-rpc)
38-
discordipc_version=1.1
39-
40-
# Reflections (https://github.com/ronmamo/reflections)
41-
reflections_version=0.10.2
42-
43-
# Netty (https://github.com/netty/netty)
44-
netty_version=4.1.118.Final
45-
46-
# ViaFabricPlus (https://github.com/ViaVersion/ViaFabricPlus)
47-
viafabricplus_version=4.3.1
48-
49-
# WaybackAuthLib (https://github.com/FlorianMichael/WaybackAuthLib)
50-
waybackauthlib_version=1.0.1

‎gradle/libs.versions.toml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
[versions]
2+
# Fabric (https://fabricmc.net/develop)
3+
minecraft = "1.21.10"
4+
yarn-mappings = "1.21.10+build.2"
5+
fabric-loader = "0.17.3"
6+
fabric-api = "0.136.0+1.21.10"
7+
8+
# Plugins
9+
# Loom (https://github.com/FabricMC/fabric-loom)
10+
loom = "1.12-SNAPSHOT"
11+
12+
# Mods
13+
# Baritone (https://github.com/MeteorDevelopment/baritone)
14+
baritone = "1.21.10-SNAPSHOT"
15+
# Sodium (https://github.com/CaffeineMC/sodium-fabric)
16+
sodium = "mc1.21.10-0.7.2-fabric"
17+
# Lithium (https://github.com/CaffeineMC/lithium-fabric)
18+
lithium = "mc1.21.10-0.20.0-fabric"
19+
# Iris (https://github.com/IrisShaders/Iris)
20+
iris = "1.9.6+1.21.10-fabric"
21+
# ModMenu (https://github.com/TerraformersMC/ModMenu)
22+
modmenu = "15.0.0"
23+
# Orbit (https://github.com/MeteorDevelopment/orbit)
24+
orbit = "0.2.4"
25+
# Starscript (https://github.com/MeteorDevelopment/starscript)
26+
starscript = "0.2.5"
27+
# DiscordRPC (https://github.com/MeteorDevelopment/java-discord-rpc)
28+
discordipc = "1.1"
29+
# Reflections (https://github.com/ronmamo/reflections)
30+
reflections = "0.10.2"
31+
# Netty (https://github.com/netty/netty)
32+
netty = "4.1.118.Final"
33+
# ViaFabricPlus (https://github.com/ViaVersion/ViaFabricPlus)
34+
viafabricplus = "4.3.1"
35+
# WaybackAuthLib (https://github.com/FlorianMichael/WaybackAuthLib)
36+
waybackauthlib = "1.0.1"
37+
38+
[libraries]
39+
# Fabric base
40+
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
41+
yarn = { module = "net.fabricmc:yarn", version.ref = "yarn-mappings" }
42+
fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
43+
44+
# Mods
45+
sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
46+
lithium = { module = "maven.modrinth:lithium", version.ref = "lithium" }
47+
iris = { module = "maven.modrinth:iris", version.ref = "iris" }
48+
baritone = { module = "meteordevelopment:baritone", version.ref = "baritone" }
49+
modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
50+
viafabricplus = { module = "com.viaversion:viafabricplus", version.ref = "viafabricplus" }
51+
viafabricplus-api = { module = "com.viaversion:viafabricplus-api", version.ref = "viafabricplus" }
52+
53+
# Libraries
54+
orbit = { module = "meteordevelopment:orbit", version.ref = "orbit" }
55+
starscript = { module = "org.meteordev:starscript", version.ref = "starscript" }
56+
discord-ipc = { module = "meteordevelopment:discord-ipc", version.ref = "discordipc" }
57+
reflections = { module = "org.reflections:reflections", version.ref = "reflections" }
58+
netty-handler-proxy = { module = "io.netty:netty-handler-proxy", version.ref = "netty" }
59+
netty-codec-socks = { module = "io.netty:netty-codec-socks", version.ref = "netty" }
60+
waybackauthlib = { module = "de.florianmichael:WaybackAuthLib", version.ref = "waybackauthlib" }
61+
62+
[plugins]
63+
fabric-loom = { id = "fabric-loom", version.ref = "loom" }

‎gradle/wrapper/gradle-wrapper.jar‎

176 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎settings.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ pluginManagement {
99
}
1010
}
1111

12+
rootProject.name = "meteor-client"
13+
1214
include("launch")

0 commit comments

Comments
 (0)