Skip to content

Commit ae0a9fd

Browse files
null2264null2264
committed
feat: Prepare to port to MC1.21.2
1 parent baed985 commit ae0a9fd

6 files changed

Lines changed: 91 additions & 65 deletions

File tree

‎build.gradle.kts‎

Lines changed: 84 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ val supportedVersionRange: List<String?> = mapOf(
2525
12001 to listOf("1.20-", "1.20.1"),
2626
12002 to listOf("1.20.2-", "1.20.4"),
2727
12005 to listOf("1.20.5-", "1.20.6"),
28-
12100 to listOf("1.21-", null),
28+
12100 to listOf("1.21-", "1.21.1"),
29+
12102 to listOf("1.21.2-", null),
2930
)[mcVersion] ?: listOf()
3031

3132
preprocess {
@@ -57,7 +58,7 @@ repositories {
5758
mavenLocal()
5859
}
5960

60-
base.archivesBaseName = project.properties["archives_base_name"] as? String ?: ""
61+
base.archivesName.set(project.properties["archives_base_name"] as? String ?: "")
6162

6263
val buildNumber: String? = System.getenv("GITHUB_RUN_NUMBER")
6364
project.version = (project.properties["mod_version"] as? String ?: "") + "+${mcVersionStr}" + (if (buildNumber != null) "b${buildNumber}-" else "-") + (project.properties["version_stage"] ?: "") + (if (isFabric) "-fabric" else (if (isNeo) "-neoforge" else "-forge"))
@@ -81,7 +82,7 @@ loom {
8182
if (!isFabric && !isNeo) {
8283
forge {
8384
mixinConfigs = listOf(
84-
"cobblegen.mixins.json"
85+
"cobblegen.mixins.json"
8586
)
8687
}
8788
}
@@ -94,6 +95,7 @@ val shade: Configuration by configurations.creating {
9495
dependencies {
9596
// TODO(addingVersion): For snapshots
9697
val mc: Map<Int, String> = mapOf(
98+
12102 to "1.21.2-pre3"
9799
)
98100
minecraft("com.mojang:minecraft:${mc[mcVersion] ?: mcVersionStr}")
99101

@@ -105,39 +107,42 @@ dependencies {
105107
else if (mcVersion <= 12001)
106108
modImplementation("net.fabricmc:fabric-loader:0.14.21")
107109
else
108-
modImplementation("net.fabricmc:fabric-loader:0.15.11")
110+
modImplementation("net.fabricmc:fabric-loader:0.16.7")
109111

110112
// For testing
111113
if (project.properties["recipe_viewer"] != "none" && mcVersion > 11605)
112114
// TODO: addingVersion
113115
modLocalRuntime("net.fabricmc.fabric-api:fabric-api:" + mapOf(
114-
11605 to "0.42.0+1.16",
115-
11802 to "0.76.0+1.18.2",
116-
11902 to "0.76.0+1.19.2",
117-
11904 to "0.83.0+1.19.4",
118-
12001 to "0.83.1+1.20.1",
119-
12002 to "0.89.0+1.20.2",
120-
12005 to "0.97.8+1.20.5",
121-
12100 to "0.100.1+1.21",
116+
11605 to "0.42.0+1.16",
117+
11802 to "0.76.0+1.18.2",
118+
11902 to "0.76.0+1.19.2",
119+
11904 to "0.83.0+1.19.4",
120+
12001 to "0.83.1+1.20.1",
121+
12002 to "0.89.0+1.20.2",
122+
12005 to "0.97.8+1.20.5",
123+
12100 to "0.100.1+1.21",
124+
12102 to "0.105.4+1.21.2",
122125
)[mcVersion])
123126
} else {
124127
if (!isNeo) {
125128
"forge"("net.minecraftforge:forge:${mcVersionStr}-" + mapOf(
126-
11605 to "36.2.41",
127-
11802 to "40.2.9",
128-
11902 to "43.2.14",
129-
11904 to "45.1.0",
130-
12001 to "47.0.3",
131-
12002 to "48.0.13",
129+
11605 to "36.2.41",
130+
11802 to "40.2.9",
131+
11902 to "43.2.14",
132+
11904 to "45.1.0",
133+
12001 to "47.0.3",
134+
12002 to "48.0.13",
135+
// LexForge is no longer supported
132136
)[mcVersion])
133137
} else {
134138
// TODO: addingVersion
139+
// snapshot version format:
140+
// "20.5.0-alpha.${mc[mcVersion]}.+"
135141
"neoForge"("net.neoforged:neoforge:" + mapOf(
136-
12002 to "20.2.86",
137-
12005 to "20.5.21-beta",
138-
12100 to "21.0.2-beta",
139-
// snapshot version format:
140-
// "20.5.0-alpha.${mc[mcVersion]}.+"
142+
12002 to "20.2.86",
143+
12005 to "20.5.21-beta",
144+
12100 to "21.0.2-beta",
145+
// FIXME: 1.21.2
141146
)[mcVersion])
142147
}
143148
}
@@ -168,35 +173,38 @@ dependencies {
168173
if (project.properties["recipe_viewer"] == "emi")
169174
modLocalRuntime("dev.emi:emi:0.7.3+${mcVersionStr}")
170175
} else {
171-
// TODO: addingVersion - EMI
176+
// TODO: addingVersion - EMI. They didn't break API on MC version upgrade so mismatch should be fine
172177
val suffix = mapOf(
173-
11902 to "1.19.2",
174-
11904 to "1.19.4",
175-
12001 to "1.20.1",
176-
12002 to "1.20.2",
177-
12005 to "1.20.6",
178-
12100 to "1.20.6", // FIXME: Use 1.21 version of EMI
178+
11902 to "1.19.2",
179+
11904 to "1.19.4",
180+
12001 to "1.20.1",
181+
12002 to "1.20.2",
182+
12005 to "1.20.6",
183+
12100 to "1.21.1",
184+
12105 to "1.21.1", // FIXME: .
179185
)
186+
val emiVersion = "1.1.16+${if (mcVersion >= 11902) (suffix[mcVersion] ?: "1.20.2") else "1.19.2"}"
180187
// EMI support multiple platform since 1.0.0
181188
// EMI seems to also skip 1.19 and 1.19.1
182-
modCompileOnly("dev.emi:emi-${if (isFabric) "fabric" else (if (mcVersion >= 12005) "neoforge" else "forge")}:${project.properties["emi_version"]}+${if (mcVersion >= 11902) (suffix[mcVersion] ?: "1.20.2") else "1.19.2"}:api")
189+
modCompileOnly("dev.emi:emi-${if (isFabric) "fabric" else (if (mcVersion >= 12005) "neoforge" else "forge")}:$emiVersion:api")
183190
if (project.properties["recipe_viewer"] == "emi" && suffix[mcVersion] != null)
184-
modLocalRuntime("dev.emi:emi-${if (isFabric) "fabric" else (if (mcVersion >= 12005) "neoforge" else "forge")}:${project.properties["emi_version"]}+${if (mcVersion >= 11902) suffix[mcVersion] else "1.19.2"}")
191+
modLocalRuntime("dev.emi:emi-${if (isFabric) "fabric" else (if (mcVersion >= 12005) "neoforge" else "forge")}:$emiVersion")
185192
}
186193
// EMI ->
187194

188195
// <- REI
189196
// TODO: addingVersion - REI
190197
val reiVersions = mapOf(
191-
11802 to "8.3.618",
192-
11902 to "9.1.619",
193-
11904 to "11.0.621",
194-
12001 to "12.0.625",
195-
12002 to "13.0.685",
196-
12005 to "15.0.728",
197-
12100 to null,
198+
11802 to "8.3.618",
199+
11902 to "9.1.619",
200+
11904 to "11.0.621",
201+
12001 to "12.0.625",
202+
12002 to "13.0.685",
203+
12005 to "15.0.728",
204+
12100 to "16.0.783",
205+
12102 to null,
198206
)
199-
val reiFallback = "15.0.728"
207+
val reiFallback = "16.0.783"
200208
if (isFabric)
201209
modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:${reiVersions[mcVersion] ?: reiFallback}")
202210
// NOTE: I need the full package for Forge(-like) loaders since for whatever reason @REIPluginClient
@@ -219,22 +227,29 @@ dependencies {
219227
// <- JEI
220228
// TODO: addingVersion - JEI
221229
val jeiVersions = mapOf(
222-
11802 to "10.2.1.1004",
223-
11902 to "11.6.0.1015",
224-
11904 to "13.1.0.13",
225-
12001 to "15.0.0.12",
226-
12002 to "16.0.0.28",
230+
11802 to "10.2.1.1004",
231+
11902 to "11.6.0.1015",
232+
11904 to "13.1.0.13",
233+
12001 to "15.0.0.12",
234+
12002 to "16.0.0.28",
235+
12005 to "18.0.0.62", // JEI skipped 1.20.5, so we use 1.20.6 version instead.
236+
12100 to "19.21.0.246",
237+
12102 to null,
227238
)
228-
val fallbackJeiVer = "18.0.0.62"
229-
val fallbackJeiMcVer = "1.20.6"
239+
val jeiVersion = jeiVersions[mcVersion]
240+
// <- fallback - should be the latest version
241+
val fallbackJeiVer = "19.21.0.246"
242+
val fallbackJeiMcVer = "1.21.1"
243+
// fallback ->
230244
val jeiMc = mapOf(
231-
12005 to fallbackJeiMcVer, // JEI skipped 1.20.5
232-
12100 to fallbackJeiMcVer,
245+
12005 to "1.20.6", // JEI skipped 1.20.5
246+
12100 to "1.21.1", // Works for both 1.21 and 1.21.1, but internally defined 1.21.1
247+
12102 to fallbackJeiMcVer,
233248
)
234-
modCompileOnly("mezz.jei:jei-${jeiMc[mcVersion] ?: mcVersionStr}-common-api:${jeiVersions[mcVersion] ?: fallbackJeiVer}")
235-
modCompileOnly("mezz.jei:jei-${jeiMc[mcVersion] ?: mcVersionStr}-${if (isFabric) "fabric" else "forge"}-api:${jeiVersions[mcVersion] ?: fallbackJeiVer}")
236-
if (project.properties["recipe_viewer"] == "jei" && jeiVersions[mcVersion] != null)
237-
modLocalRuntime("mezz.jei:jei-${jeiMc[mcVersion] ?: mcVersionStr}-${if (isFabric) "fabric" else "forge"}:${jeiVersions[mcVersion]}")
249+
modCompileOnly("mezz.jei:jei-${jeiMc[mcVersion] ?: mcVersionStr}-common-api:${jeiVersion ?: fallbackJeiVer}")
250+
modCompileOnly("mezz.jei:jei-${jeiMc[mcVersion] ?: mcVersionStr}-${if (isFabric) "fabric" else "forge"}-api:${jeiVersion ?: fallbackJeiVer}")
251+
if (project.properties["recipe_viewer"] == "jei" && jeiVersion != null)
252+
modLocalRuntime("mezz.jei:jei-${jeiMc[mcVersion] ?: mcVersionStr}-${if (isFabric) "fabric" else "forge"}:${jeiVersion}")
238253
// JEI ->
239254

240255
/* FIXME: Broken, somehow
@@ -339,7 +354,7 @@ java {
339354

340355
tasks.jar {
341356
from("LICENSE") {
342-
rename { "${it}_${base.archivesBaseName}" }
357+
rename { "${it}_${base.archivesName.get()}" }
343358
}
344359
}
345360

@@ -357,20 +372,25 @@ if (JavaVersion.current() != JavaVersion.VERSION_1_8 &&
357372
}
358373

359374
// TODO: addingVersion
360-
val mcReleaseVersions = mapOf(
361-
11605 to listOf("1.16.5"),
362-
11802 to listOf("1.18.2"),
363-
11902 to listOf("1.19", "1.19.1", "1.19.2"),
364-
12001 to listOf("1.20", "1.20.1"),
365-
12002 to listOf("1.20.2", "1.20.3", "1.20.4"),
366-
12005 to listOf("1.20.5", "1.20.6"),
367-
12100 to listOf("1.21", "1.21.1"),
368-
)[mcVersion] ?: listOf()
369-
375+
val mcReleaseVersions = mapOf<Int, List<String>>(
376+
11605 to listOf("1.16.5"),
377+
11802 to listOf("1.18.2"),
378+
11902 to listOf("1.19", "1.19.1", "1.19.2"),
379+
12001 to listOf("1.20", "1.20.1"),
380+
12002 to listOf("1.20.2", "1.20.3", "1.20.4"),
381+
12005 to listOf("1.20.5", "1.20.6"),
382+
12100 to listOf("1.21", "1.21.1"),
383+
12102 to listOf("1.21.2")
384+
)[mcVersion] ?: throw IllegalStateException("Should not be empty!")
385+
386+
// These overwrites mcReleaseVersions
370387
val cfSnapshots = mapOf<Int, List<String>>(
388+
12102 to listOf("1.21.2-Snapshot"),
371389
)[mcVersion]
372390

391+
// These overwrites mcReleaseVersions
373392
val mrSnapshots = mapOf<Int, List<String>>(
393+
12102 to listOf("1.21.2-pre3"),
374394
)[mcVersion]
375395

376396
publishMods {

‎gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ recipe_viewer=none
2020

2121
# Dependencies
2222
jankson_version=1.2.3
23-
emi_version=1.1.6
2423
manifold_version=2024.1.11
2524

2625
# Version Specific Dependencies

‎root.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ plugins {
33
}
44

55
preprocess {
6+
//val neo12102 = createNode("1.21.2-neoforge", 12102, "mojang")
7+
val fabric12102 = createNode("1.21.2-fabric", 12102, "mojang")
68
val neo12100 = createNode("1.21-neoforge", 12100, "mojang")
79
val fabric12100 = createNode("1.21-fabric", 12100, "mojang")
810
val neo12005 = createNode("1.20.5-neoforge", 12005, "mojang")
@@ -18,6 +20,7 @@ preprocess {
1820
val forge11605 = createNode("1.16.5-forge", 11605, "mojang")
1921
val fabric11605 = createNode("1.16.5-fabric", 11605, "mojang")
2022

23+
//neo12102.link(fabric12102)
2124
neo12100.link(fabric12100)
2225
neo12005.link(fabric12005)
2326
neo12002.link(fabric12002)
@@ -27,6 +30,7 @@ preprocess {
2730
forge11802.link(fabric11802)
2831
forge11605.link(fabric11605)
2932

33+
fabric12102.link(fabric12100)
3034
fabric12100.link(fabric12005)
3135
fabric12005.link(fabric12002)
3236
fabric12002.link(fabric12001)

‎settings.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ listOf(
3434
"1.20.5-neoforge",
3535
"1.21-fabric",
3636
"1.21-neoforge",
37+
"1.21.2-fabric",
38+
//"1.21.2-neoforge",
3739
).forEach { version ->
3840
include(":$version")
3941
project(":$version").apply {

‎versions/1.21.2-fabric/.gitkeep‎

Whitespace-only changes.

‎versions/1.21.2-neoforge/gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
loom.platform=neoforge

0 commit comments

Comments
 (0)