Skip to content

Commit 5c63a02

Browse files
authored
Thank you Mojang
1 parent 1e923c9 commit 5c63a02

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/renovate.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"minecraft-versions": {
1212
"defaultRegistryUrlTemplate": "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json",
1313
"transformTemplates": [
14-
"{\"releases\": versions.{ \"version\": id, \"releaseTimestamp\": releaseTime }}"
14+
"{\"releases\": versions.{ \"version\": $replace($replace(id, \"-snapshot-\", \"-alpha-\"), \"-pre-\", \"-beta-\"), \"releaseTimestamp\": releaseTime }}"
1515
]
1616
}
1717
},
@@ -23,7 +23,7 @@
2323
"/MinecraftVersionList\\.java$/"
2424
],
2525
"matchStrings": [
26-
"public static final List<String> VERSIONS = List\\.of\\(\"(?<currentValue>[\\w\\.]+)\""
26+
"// renovate-mc-version: (?<currentValue>[\\w\\.-]+)"
2727
],
2828
"depNameTemplate": "minecraft-version-list",
2929
"datasourceTemplate": "custom.minecraft-versions"

build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ abstract class GenerateVersionOrder extends DefaultTask {
264264
Comparator<String> BY_LENGTH_REVERSED = Comparator.comparingInt { it.length() }.reversed()
265265
var indicesByLength = versions.stream().sorted(BY_LENGTH_REVERSED).map(versions::indexOf).map(String::valueOf).toList()
266266

267+
// The special renovate-mc-version line contains the latest minecraft version with -snapshot turning into -alpha and -pre into -beta to satisfy snapshot<pre<rc (even though s>p>r). Renovate is configured to do the same replacement.
267268
final clazz = """
268269
package net.neoforged.moddevgradle.internal.generated;
269270
@@ -273,6 +274,7 @@ public final class MinecraftVersionList {
273274
private MinecraftVersionList() {
274275
}
275276
277+
// renovate-mc-version: ${versions[0].replace('-snapshot-', '-alpha-').replace('-pre-', '-beta-')}
276278
/**
277279
* Released Minecraft Versions as of ${java.time.Instant.now()} from latest to oldest.
278280
*/
@@ -286,13 +288,13 @@ public final class MinecraftVersionList {
286288
* Prefix matches must terminate with one of the given separator characters to be found valid.
287289
*/
288290
public static int indexOfByPrefix(String version, String separators) {
289-
for (var versionIdx : BY_LENGTH) {
290-
var versionText = VERSIONS.get(versionIdx);
291-
if (version.startsWith(versionText) && (versionText.length() == version.length() || separators.indexOf(version.charAt(versionText.length())) != -1)) {
292-
return versionIdx;
291+
for (var versionIdx : BY_LENGTH) {
292+
var versionText = VERSIONS.get(versionIdx);
293+
if (version.startsWith(versionText) && (versionText.length() == version.length() || separators.indexOf(version.charAt(versionText.length())) != -1)) {
294+
return versionIdx;
295+
}
293296
}
294-
}
295-
return -1;
297+
return -1;
296298
}
297299
}
298300
"""

0 commit comments

Comments
 (0)