Merge branch 'master' into add-more-minecraft-test-projects

FabricMC · Oct 26, 2024 · 2a28368 · 2a28368
2 parents 6e871b3 + be9ee2b
commit 2a28368
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,5 +6,5 @@ description = The mod loading component of Fabric
 url = https://github.com/FabricMC/fabric-loader
 
 asm_version = 9.7.1
-mixin_version = 0.15.3+mixin.0.8.7
+mixin_version = 0.15.4+mixin.0.8.7
 mixin_extras_version = 0.4.1
diff --git a/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/McVersionLookup.java b/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/McVersionLookup.java
@@ -55,7 +55,7 @@ public final class McVersionLookup {
 			+ "[a-c]\\d\\.\\d+(\\.\\d+)?[a-z]?(_\\d+)?[a-z]?|" // alpha/beta a1.2.3_45
 			+ "(Alpha|Beta) v?\\d+\\.\\d+(\\.\\d+)?[a-z]?(_\\d+)?[a-z]?|" // long alpha/beta names: Alpha v1.2.3_45
 			+ "Inf?dev (0\\.31 )?\\d+(-\\d+)?|" // long indev/infdev names: Infdev 12345678-9
-			+ "(rd|inf)-\\d+|" // early rd-123, inf-123
+			+ "(rd|inf?)-\\d+|" // early rd-123, in-20100223, inf-123
 			+ "1\\.RV-Pre1|3D Shareware v1\\.34|23w13a_or_b|24w14potato|" // odd exceptions
 			+ "(.*[Ee]xperimental [Ss]napshot )(\\d+)" // Experimental versions.
 			);
@@ -66,7 +66,7 @@ public final class McVersionLookup {
 	private static final Pattern EXPERIMENTAL_PATTERN = Pattern.compile("(?:.*[Ee]xperimental [Ss]napshot )(\\d+)");
 	private static final Pattern BETA_PATTERN = Pattern.compile("(?:b|Beta v?)1\\.(\\d+(\\.\\d+)?[a-z]?(_\\d+)?[a-z]?)");
 	private static final Pattern ALPHA_PATTERN = Pattern.compile("(?:a|Alpha v?)[01]\\.(\\d+(\\.\\d+)?[a-z]?(_\\d+)?[a-z]?)");
-	private static final Pattern INDEV_PATTERN = Pattern.compile("(?:inf-|Inf?dev )(?:0\\.31 )?(\\d+(-\\d+)?)");
+	private static final Pattern INDEV_PATTERN = Pattern.compile("(?:inf?-|Inf?dev )(?:0\\.31 )?(\\d+(-\\d+)?)");
 	private static final String STRING_DESC = "Ljava/lang/String;";
 
 	public static McVersion getVersion(List<Path> gameJars, String entrypointClass, String versionName) {

diff --git a/src/main/resources/fabric-installer.json b/src/main/resources/fabric-installer.json
@@ -52,13 +52,13 @@
                 "size": 94519
             },
             {
-                "name": "net.fabricmc:sponge-mixin:0.15.3+mixin.0.8.7",
+                "name": "net.fabricmc:sponge-mixin:0.15.4+mixin.0.8.7",
                 "url": "https://maven.fabricmc.net/",
-                "md5": "a33725dd52de94c33514b6867c8d0b4b",
-                "sha1": "51ee0a44ab05f6fddd66b09e66b3a16904f9c55d",
-                "sha256": "0a7735e98905e445a7ddb0eef617ebfb5166ac95c293206cce4241aab7be56fd",
-                "sha512": "3be527b0122a54a1cd5b542a45afd7a9d3d1186fd7d0c62a6c704656229e426a283be35ae285dbd188817467a307f969b0aef28dfa8fa1f360fafdb6a561c9db",
-                "size": 1494835
+                "md5": "991ca8be2c408fe19eb64014d8a18243",
+                "sha1": "6a12aacc794f1078458433116e9ed42c1cc98096",
+                "sha256": "4631f67da980ae2ac9e6e285a7df4680645e2f37a6a14acc775f97982162c2a2",
+                "sha512": "d4f6caaee7cb841cc9bc36ae5eb725bdb3dd28a5af8f63f75747a17156d708263b37f5a87eca863b2c3d91732c0b128318e9de455d1cd964e1ae8ba0a318fbf1",
+                "size": 1494834
             }
         ],
         "server": [

diff --git a/src/main/resources/fabric-installer.launchwrapper.json b/src/main/resources/fabric-installer.launchwrapper.json
@@ -52,13 +52,13 @@
                 "size": 94519
             },
             {
-                "name": "net.fabricmc:sponge-mixin:0.15.3+mixin.0.8.7",
+                "name": "net.fabricmc:sponge-mixin:0.15.4+mixin.0.8.7",
                 "url": "https://maven.fabricmc.net/",
-                "md5": "a33725dd52de94c33514b6867c8d0b4b",
-                "sha1": "51ee0a44ab05f6fddd66b09e66b3a16904f9c55d",
-                "sha256": "0a7735e98905e445a7ddb0eef617ebfb5166ac95c293206cce4241aab7be56fd",
-                "sha512": "3be527b0122a54a1cd5b542a45afd7a9d3d1186fd7d0c62a6c704656229e426a283be35ae285dbd188817467a307f969b0aef28dfa8fa1f360fafdb6a561c9db",
-                "size": 1494835
+                "md5": "991ca8be2c408fe19eb64014d8a18243",
+                "sha1": "6a12aacc794f1078458433116e9ed42c1cc98096",
+                "sha256": "4631f67da980ae2ac9e6e285a7df4680645e2f37a6a14acc775f97982162c2a2",
+                "sha512": "d4f6caaee7cb841cc9bc36ae5eb725bdb3dd28a5af8f63f75747a17156d708263b37f5a87eca863b2c3d91732c0b128318e9de455d1cd964e1ae8ba0a318fbf1",
+                "size": 1494834
             },
             {
                 "name": "net.minecraft:launchwrapper:1.12",