Слияние ui -> main #1

Merged
sasheg merged 145 commits from ui into main 2026-08-20 13:54:02 +00:00
3 changed files with 10 additions and 4 deletions
Showing only changes of commit 26e0280d84 - Show all commits
@@ -309,7 +309,7 @@ public class ZHttpClient {
* The request-level .timeout(Duration) bounds the actual network I/O.
*/
private static <T> HttpResponse<T> sendBounded(HttpRequest request, HttpResponse.BodyHandler<T> handler, long timeoutSeconds) throws IOException, InterruptedException {
HttpRequest timed = request.newBuilder()
HttpRequest timed = HttpRequest.newBuilder(request, (name, value) -> true)
.timeout(Duration.ofSeconds(timeoutSeconds))
.build();
return client.send(timed, handler);
@@ -119,8 +119,14 @@ class ForgeInstallIntegrationTest {
List<String> command = builder.build(options);
// === JVM args checks ===
assertFalse(command.contains("-cp"),
"Forge must NOT have -cp (causes split-package)");
// Real Forge version.json (1.20.1-47.x) has no -cp, so the launcher adds it
assertTrue(command.contains("-cp"),
"Launcher must add -cp for Forge (version.json has none)");
int cpIdx = command.indexOf("-cp");
assertTrue(cpIdx + 1 < command.size(), "-cp must have a value");
String classpath = command.get(cpIdx + 1);
assertNotNull(classpath, "-cp value must not be null");
assertFalse(classpath.contains("${classpath}"), "-cp must not contain unresolved ${classpath} placeholder");
// Find -Djava.library.path (added manually, not from forge child)
String libPath = null;
+1 -1
View File
@@ -19,7 +19,7 @@
<properties>
<revision>1.0.15</revision>
<hotfix>1</hotfix>
<hotfix>2</hotfix>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>