Skip to content

Commit aeed232

Browse files
DeftuDeftu
committed
Add 1.21.11 support and bump DGT
1 parent 1d2141e commit aeed232

File tree

6 files changed

+51
-30
lines changed

6 files changed

+51
-30
lines changed

‎buildSrc/src/main/kotlin/org/polyfrost/gradle/addDependencies.kt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ private val fabricApiModuleVersions = mapOf(
4242
"api-base-12108" to "0.4.64+9ec45cd8f3", // 1.21.8
4343
"api-base-12109" to "0.5.2+2fa446b294", // 1.21.9
4444
"api-base-12110" to "1.0.0+14b92d8968", // 1.21.10
45+
"api-base-12111" to "1.0.5+4ebb5c0853", // 1.21.11
4546
"lifecycle-events-v1-common" to "1.1.0+2c3f108c81e6", // Common (Legacy Fabric API)
4647
"lifecycle-events-v1-10809" to "1.1.0+1.8.9+2c3f108c81e6", // 1.8.9
4748
"lifecycle-events-v1-11202" to "1.1.0+1.12.2+2c3f108c81e6", // 1.12.2
@@ -63,6 +64,7 @@ private val fabricApiModuleVersions = mapOf(
6364
"lifecycle-events-v1-12108" to "2.6.3+db4dfd85f3", // 1.21.8
6465
"lifecycle-events-v1-12109" to "2.6.8+33df5e6e94", // 1.21.9
6566
"lifecycle-events-v1-12110" to "2.6.9+33df5e6e68", // 1.21.10
67+
"lifecycle-events-v1-12111" to "2.6.15+4ebb5c0853", // 1.21.11
6668
"keybindings-api-v1-common" to "1.1.1+281301ea81e6", // Common (Legacy Fabric API)
6769
"keybindings-api-v1-10809" to "1.1.1+1.8.9+2c3f108c81e6", // 1.8.9
6870
"keybindings-api-v1-11202" to "1.1.1+1.12.2+2c3f108c81e6", // 1.12.2
@@ -84,6 +86,7 @@ private val fabricApiModuleVersions = mapOf(
8486
"key-binding-api-v1-12108" to "1.0.65+946bf4c3f3", // 1.21.8
8587
"key-binding-api-v1-12109" to "1.1.0+4ec8267494", // 1.21.9
8688
"key-binding-api-v1-12110" to "1.1.1+b3ba9c4868", // 1.21.10
89+
"key-binding-api-v1-12111" to "1.1.7+4fc5413f53", // 1.21.11
8790
"rendering-api-v1-common" to "1.0.0+7c545fdb81e6", // Common (Legacy Fabric API)
8891
"rendering-api-v1-10809" to "1.0.0+1.8.9+2c3f108c81e6", // 1.8.9
8992
"rendering-api-v1-11202" to "1.0.0+1.8.9+2c3f108c81e6", // 1.12.2
@@ -105,6 +108,7 @@ private val fabricApiModuleVersions = mapOf(
105108
"rendering-v1-12108" to "12.4.0+e8d43c76f3", // 1.21.8
106109
"rendering-v1-12109" to "15.0.2+9bce411b94", // 1.21.9
107110
"rendering-v1-12110" to "16.0.1+328a75ba68", // 1.21.10
111+
"rendering-v1-12111" to "16.2.5+1fb1cde953", // 1.21.11
108112
"screen-api-v1-11605" to "1.0.1+3cc0f0907d", // 1.16.5
109113
"screen-api-v1-11701" to "1.0.5+cf39a74318", // 1.17.1
110114
"screen-api-v1-11802" to "1.0.11+d882b91560", // 1.18.2
@@ -123,6 +127,7 @@ private val fabricApiModuleVersions = mapOf(
123127
"screen-api-v1-12108" to "2.1.0+277ecf7df3", // 1.21.8
124128
"screen-api-v1-12109" to "3.0.2+86b3ae5794", // 1.21.9
125129
"screen-api-v1-12110" to "3.1.0+9c82a79868", // 1.21.10
130+
"screen-api-v1-12111" to "3.1.7+4ebb5c0853", // 1.21.11
126131
"command-api-v1-11605" to "1.1.3+3cc0f0907d", // 1.16.5
127132
"command-api-v1-11701" to "1.1.4+cf39a74318", // 1.17.1
128133
"command-api-v1-11802" to "1.1.10+d7c144a860", // 1.18.2
@@ -141,6 +146,7 @@ private val fabricApiModuleVersions = mapOf(
141146
"command-api-v2-12108" to "2.2.53+946bf4c3f3", // 1.21.8
142147
"command-api-v2-12109" to "2.3.5+33df5e6e94", // 1.21.9
143148
"command-api-v2-12110" to "2.3.7+328a75ba68", // 1.21.10
149+
"command-api-v2-12111" to "2.4.6+4ebb5c0853", // 1.21.11
144150
"transitive-access-wideners-v1-11802" to "1.1.0+e747827960", // 1.18.2
145151
"transitive-access-wideners-v1-11902" to "1.3.3+08b73de490", // 1.19.2
146152
"transitive-access-wideners-v1-11904" to "3.3.0+1b5f819af4", // 1.19.4
@@ -157,6 +163,7 @@ private val fabricApiModuleVersions = mapOf(
157163
"transitive-access-wideners-v1-12108" to "6.4.1+ac3e15d1f3", // 1.21.8
158164
"transitive-access-wideners-v1-12109" to "6.5.2+5d9dbead94", // 1.21.9
159165
"transitive-access-wideners-v1-12110" to "6.5.3+41eb434368", // 1.21.10
166+
"transitive-access-wideners-v1-12111" to "7.0.7+1fb1cde953", // 1.21.11
160167
)
161168

162169
/**

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ copycat = "0.1.3"
2121
copycat-image-awt = "0.1.1"
2222

2323
# Per version
24-
textile = "1.0.0-beta.8"
25-
omnicore = "1.0.0-beta.38"
24+
textile = "1.0.0-beta.11"
25+
omnicore = "1.0.0-beta.40"
2626
lwjgl = "3.3.3" # All downloaded by the isolated-lwjgl3-loader
2727

2828
# Legacy only
@@ -35,7 +35,7 @@ brigadier = "1.0.18"
3535
oneconfig-loader = "1.1.0-alpha.48"
3636

3737
# Gradle
38-
dgt = "2.68.0"
38+
dgt = "2.69.0"
3939
kotlinx-abi = "0.18.1"
4040
licenser = "2.1.1"
4141
jetbrains-idea-ext = "1.3"

‎minecraft/build.gradle.kts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ if (mcData.isForge) {
3939
toolkitLoomHelper {
4040
disableRunConfigs(GameSide.SERVER)
4141

42-
useDevAuth("+")
42+
if (mcData.version < MinecraftVersions.VERSION_1_21_11) {
43+
useDevAuth("+")
44+
}
4345

4446
useProperty("mixin.debug.export", "true", GameSide.CLIENT)
4547
useProperty("debugBytecode", "true", GameSide.CLIENT)
@@ -207,7 +209,8 @@ dependencies {
207209
rconfig("1.21.7", "3.7.2"),
208210
rconfig("1.21.8", "3.7.2", "1.21.7"),
209211
rconfig("1.21.9", "3.9.1"),
210-
rconfig("1.21.10", "3.9.1", "1.21.9")
212+
rconfig("1.21.10", "3.9.1", "1.21.9"),
213+
rconfig("1.21.11", "3.9.1", "1.21.9"),
211214
)
212215

213216
compileOnlyCompat(rconfig[mcVersionString])
@@ -249,7 +252,8 @@ dependencies {
249252
yacl("1.21.7", "3.7.1", "1.21.6"),
250253
yacl("1.21.8", "3.7.1", "1.21.6"),
251254
yacl("1.21.9", "3.8.0", "1.21.6"),
252-
yacl("1.21.10", "3.8.0", "1.21.9")
255+
yacl("1.21.10", "3.8.0", "1.21.9"),
256+
yacl("1.21.11", "3.8.0", "1.21.9"),
253257
)
254258
compileOnlyCompat(yacl[mcVersionString])
255259

@@ -274,6 +278,7 @@ dependencies {
274278
modMenu("1.21.7", "15.0.0-beta.3"),
275279
modMenu("1.21.8", "15.0.0-beta.3"),
276280
modMenu("1.21.10", "16.0.0-rc.1"),
281+
modMenu("1.21.11", "17.0.0-alpha.1"),
277282
)
278283
compileOnlyCompat(modMenu[mcVersionString])
279284

‎minecraft/root.gradle.kts‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,31 @@ preprocess {
1414
strictExtraMappings.set(true)
1515
// FOR ALL NEW VERSIONS ENSURE TO UPDATE settings.gradle.kts !
1616

17-
"1.21.10-neoforge"(1_21_10, "srg") {
18-
"1.21.10-fabric"(1_21_10, "srg") {
19-
"1.21.8-fabric"(1_21_08, "srg") {
20-
"1.21.8-neoforge"(1_21_08, "srg") {
21-
"1.21.5-neoforge"(1_21_05, "srg") {
22-
"1.21.5-fabric"(1_21_05, "srg") {
23-
"1.21.4-fabric"(1_21_04, "srg") {
24-
"1.21.4-neoforge"(1_21_04, "srg") {
25-
"1.21.1-neoforge"(1_21_01, "srg", file("mappings/1.21.4-forge+1.21.1-forge.txt")) {
26-
"1.21.1-fabric"(1_21_01, "srg") {
27-
"1.20.4-fabric"(1_20_04, "srg") {
28-
"1.20.4-neoforge"(1_20_04, "srg") {
29-
"1.20.4-forge"(1_20_04, "srg") {
30-
"1.20.1-forge"(1_20_01, "srg", file("mappings/1.20.4-forge+1.20.1-forge.txt")) {
31-
"1.20.1-fabric"(1_20_01, "srg") {
32-
"1.16.5-fabric"(1_16_05, "srg", file("mappings/1.20.1-fabric+1.16.5-fabric.txt")) {
33-
"1.16.5-forge"(1_16_05, "srg") {
34-
"1.12.2-forge"(1_12_02, "srg", file("mappings/1.16.5-forge+1.12.2-forge.txt")) {
35-
"1.12.2-fabric"(1_12_02, "srg") {
36-
"1.8.9-fabric"(1_08_09, "srg") {
37-
"1.8.9-forge"(1_08_09, "srg")
17+
"1.21.11-fabric"(1_21_11, "srg") {
18+
"1.21.11-neoforge"(1_21_11, "srg") {
19+
"1.21.10-neoforge"(1_21_10, "srg") {
20+
"1.21.10-fabric"(1_21_10, "srg") {
21+
"1.21.8-fabric"(1_21_08, "srg") {
22+
"1.21.8-neoforge"(1_21_08, "srg") {
23+
"1.21.5-neoforge"(1_21_05, "srg") {
24+
"1.21.5-fabric"(1_21_05, "srg") {
25+
"1.21.4-fabric"(1_21_04, "srg") {
26+
"1.21.4-neoforge"(1_21_04, "srg") {
27+
"1.21.1-neoforge"(1_21_01, "srg", file("mappings/1.21.4-forge+1.21.1-forge.txt")) {
28+
"1.21.1-fabric"(1_21_01, "srg") {
29+
"1.20.4-fabric"(1_20_04, "srg") {
30+
"1.20.4-neoforge"(1_20_04, "srg") {
31+
"1.20.4-forge"(1_20_04, "srg") {
32+
"1.20.1-forge"(1_20_01, "srg", file("mappings/1.20.4-forge+1.20.1-forge.txt")) {
33+
"1.20.1-fabric"(1_20_01, "srg") {
34+
"1.16.5-fabric"(1_16_05, "srg", file("mappings/1.20.1-fabric+1.16.5-fabric.txt")) {
35+
"1.16.5-forge"(1_16_05, "srg") {
36+
"1.12.2-forge"(1_12_02, "srg", file("mappings/1.16.5-forge+1.12.2-forge.txt")) {
37+
"1.12.2-fabric"(1_12_02, "srg") {
38+
"1.8.9-fabric"(1_08_09, "srg") {
39+
"1.8.9-forge"(1_08_09, "srg")
40+
}
41+
}
3842
}
3943
}
4044
}

‎modules/dependencies/legacy/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.polyfrost.gradle.provideIncludedDependencies
22

33
plugins {
4-
id("gg.essential.loom")
4+
id("dev.deftu.gradle.loom")
55
}
66

77
repositories {

‎settings.gradle.kts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pluginManagement {
2424

2525
plugins {
2626
kotlin("jvm") version("2.2.10")
27-
id("dev.deftu.gradle.multiversion-root") version("2.68.0") // Update in libs.versions.toml too!!!
27+
id("dev.deftu.gradle.multiversion-root") version("2.69.0") // Update in libs.versions.toml too!!!
2828
}
2929
}
3030

@@ -110,6 +110,9 @@ listOf(
110110

111111
"1.21.10-neoforge",
112112
"1.21.10-fabric",
113+
114+
"1.21.11-neoforge",
115+
"1.21.11-fabric",
113116
).forEach { version ->
114117
val proj = ":minecraft:$version"
115118
include(proj)
@@ -125,7 +128,9 @@ listOf(
125128
"1.21.1-fabric",
126129
"1.21.4-fabric",
127130
"1.21.5-fabric",
128-
"1.21.8-fabric"
131+
"1.21.8-fabric",
132+
// "1.21.10-fabric",
133+
// "1.21.11-fabric",
129134
).contains(version)) {
130135
include(bootstrapProj)
131136
project(bootstrapProj).apply {

0 commit comments

Comments
 (0)