Skip to content

Commit b5d3653

Browse files
authored
[release/3.6] 移除 Pack200 支持 (#4666)
#4267
1 parent 554503f commit b5d3653

File tree

4 files changed

+2
-146
lines changed

4 files changed

+2
-146
lines changed

HMCL/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ tasks.shadowJar {
147147
"Microsoft-Auth-Secret" to microsoftAuthSecret,
148148
"CurseForge-Api-Key" to curseForgeApiKey,
149149
"Build-Channel" to versionType,
150-
"Class-Path" to "pack200.jar",
151150
"Add-Opens" to listOf(
152151
"java.base/java.lang",
153152
"java.base/java.lang.reflect",

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/HMCLDownloadTask.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,9 @@
1818
package org.jackhuang.hmcl.upgrade;
1919

2020
import org.jackhuang.hmcl.task.FileDownloadTask;
21-
import org.jackhuang.hmcl.util.Pack200Utils;
2221
import org.jackhuang.hmcl.util.io.NetworkUtils;
23-
import org.tukaani.xz.XZInputStream;
2422

25-
import java.io.ByteArrayInputStream;
26-
import java.io.InputStream;
27-
import java.nio.file.Files;
2823
import java.nio.file.Path;
29-
import java.util.jar.JarOutputStream;
3024

3125
class HMCLDownloadTask extends FileDownloadTask {
3226

@@ -47,15 +41,6 @@ public void execute() throws Exception {
4741
switch (archiveFormat) {
4842
case JAR:
4943
break;
50-
51-
case PACK_XZ:
52-
byte[] raw = Files.readAllBytes(target);
53-
try (InputStream in = new XZInputStream(new ByteArrayInputStream(raw));
54-
JarOutputStream out = new JarOutputStream(Files.newOutputStream(target))) {
55-
Pack200Utils.unpack(in, out);
56-
}
57-
break;
58-
5944
default:
6045
throw new IllegalArgumentException("Unknown format: " + archiveFormat);
6146
}

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,22 @@
2121
import com.google.gson.JsonObject;
2222
import com.google.gson.JsonParseException;
2323
import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
24-
import org.jackhuang.hmcl.util.Pack200Utils;
2524
import org.jackhuang.hmcl.util.gson.JsonUtils;
2625
import org.jackhuang.hmcl.util.io.NetworkUtils;
2726

2827
import java.io.IOException;
2928
import java.util.Optional;
3029

31-
public class RemoteVersion {
30+
public final class RemoteVersion {
3231

3332
public static RemoteVersion fetch(UpdateChannel channel, String url) throws IOException {
3433
try {
3534
JsonObject response = JsonUtils.fromNonNullJson(NetworkUtils.doGet(NetworkUtils.toURL(url)), JsonObject.class);
3635
String version = Optional.ofNullable(response.get("version")).map(JsonElement::getAsString).orElseThrow(() -> new IOException("version is missing"));
3736
String jarUrl = Optional.ofNullable(response.get("jar")).map(JsonElement::getAsString).orElse(null);
3837
String jarHash = Optional.ofNullable(response.get("jarsha1")).map(JsonElement::getAsString).orElse(null);
39-
String packXZUrl = Optional.ofNullable(response.get("packxz")).map(JsonElement::getAsString).orElse(null);
40-
String packXZHash = Optional.ofNullable(response.get("packxzsha1")).map(JsonElement::getAsString).orElse(null);
4138
boolean force = Optional.ofNullable(response.get("force")).map(JsonElement::getAsBoolean).orElse(false);
42-
if (Pack200Utils.isSupported() && packXZUrl != null && packXZHash != null) {
43-
return new RemoteVersion(channel, version, packXZUrl, Type.PACK_XZ, new IntegrityCheck("SHA-1", packXZHash), force);
44-
} else if (jarUrl != null && jarHash != null) {
39+
if (jarUrl != null && jarHash != null) {
4540
return new RemoteVersion(channel, version, jarUrl, Type.JAR, new IntegrityCheck("SHA-1", jarHash), force);
4641
} else {
4742
throw new IOException("No download url is available");
@@ -97,7 +92,6 @@ public String toString() {
9792
}
9893

9994
public enum Type {
100-
PACK_XZ,
10195
JAR
10296
}
10397
}

HMCLCore/src/main/java/org/jackhuang/hmcl/util/Pack200Utils.java

Lines changed: 0 additions & 122 deletions
This file was deleted.

0 commit comments

Comments
 (0)