AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-08-04 03:46:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

修复导入部分整合包失败的问题 (#2989)

Browse Source 
* 修复导入部分整合包失败的问题

* update

* update
This commit is contained in:
Glavo 2024-04-15 04:02:24 +08:00 committed by GitHub
parent a33377d1f2
commit a8bb5c1570
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
HMCLCore/src/main/java/org/jackhuang/hmcl/download/VersionList.java
View File

@ -131,9 +131,14 @@ public abstract class VersionList<T extends RemoteVersion> {
lock.readLock().lock(); lock.readLock().lock();
try { try {
T result = null; T result = null;
for (T it : versions.get(gameVersion)) TreeSet<T> remoteVersions = versions.get(gameVersion);
for (T it : remoteVersions)
if (remoteVersion.equals(it.getSelfVersion())) if (remoteVersion.equals(it.getSelfVersion()))
result = it; result = it;
if (result == null)
for (T it : remoteVersions)
if (remoteVersion.equals(it.getFullVersion()))
result = it;
return Optional.ofNullable(result); return Optional.ofNullable(result);
} finally { } finally {
lock.readLock().unlock(); lock.readLock().unlock();

5
HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineRemoteVersion.java
View File

@ -31,6 +31,11 @@ public class OptiFineRemoteVersion extends RemoteVersion {
super(LibraryAnalyzer.LibraryType.OPTIFINE.getPatchId(), gameVersion, selfVersion, null, snapshot ? Type.SNAPSHOT : Type.RELEASE, urls); super(LibraryAnalyzer.LibraryType.OPTIFINE.getPatchId(), gameVersion, selfVersion, null, snapshot ? Type.SNAPSHOT : Type.RELEASE, urls);
} }
@Override
public String getFullVersion() {
return getGameVersion() + "_" + getSelfVersion();
}
@Override @Override
public Task<Version> getInstallTask(DefaultDependencyManager dependencyManager, Version baseVersion) { public Task<Version> getInstallTask(DefaultDependencyManager dependencyManager, Version baseVersion) {
return new OptiFineInstallTask(dependencyManager, baseVersion, this); return new OptiFineInstallTask(dependencyManager, baseVersion, this);