Add ${version_name}.jar to the prod client ignoreList, fixes crashes …

…with some launchers (#1718)
neoforged · Nov 29, 2024 · 7bfef48 · 7bfef48
1 parent 9131410
commit 7bfef48
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/buildSrc/src/main/java/net/neoforged/neodev/NeoDevPlugin.java b/buildSrc/src/main/java/net/neoforged/neodev/NeoDevPlugin.java
@@ -252,7 +252,8 @@ public void apply(Project project) {
                 }
                 return repos;
             }));
-            task.getIgnoreList().addAll("client-extra", "neoforge-");
+            // ${version_name}.jar will be filled out by the launcher. It corresponds to the raw SRG Minecraft client jar.
+            task.getIgnoreList().addAll("client-extra", "${version_name}.jar");
             task.setModules(configurations.modulePath);
             task.getLauncherProfile().set(neoDevBuildDir.map(dir -> dir.file("launcher-profile.json")));
         });

diff --git a/buildSrc/src/main/java/net/neoforged/neodev/e2e/RunProductionClient.java b/buildSrc/src/main/java/net/neoforged/neodev/e2e/RunProductionClient.java
@@ -230,6 +230,7 @@ private void applyVersionManifest(Path installDir,
         var gameJar = installDir.resolve("versions").resolve(versionId).resolve(versionId + ".jar");
         copyIfNeeded(getOriginalClientJar().get().getAsFile().toPath(), gameJar);
         classpathItems.add(gameJar.toAbsolutePath().toString());
+        placeholders.put("version_name", versionId);
 
         var classpath = String.join(File.pathSeparator, classpathItems);
         placeholders.putIfAbsent("classpath", classpath);