mirror/HMCL
2
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-04-18 18:40:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed not downloading when a library and an native library have the same name

Browse Source
This commit is contained in:
huangyuhui 2017-07-01 23:38:07 +08:00
parent 29f53d574c
commit 7d8a66b71a
7 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HMCLAPI/src/main/java/org/jackhuang/hmcl/api/game/IMinecraftLibrary.java
View File

@ -37,8 +37,8 @@ public interface IMinecraftLibrary extends Cloneable {
File getFilePath(File gameDir);
String getName();
boolean isRequiredToUnzip();
boolean isNative();
String getDownloadURL(String downloadSource);

2
HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/MinecraftLoader.java
View File

@ -46,7 +46,7 @@ public class MinecraftLoader extends AbstractMinecraftLoader {
StringBuilder library = new StringBuilder("");
ArrayList<MinecraftLibrary> opt = new ArrayList<>();
for (MinecraftLibrary l : version.libraries)
if (l.allow() && !l.isRequiredToUnzip()) {
if (l.allow() && !l.isNative()) {
if (l.getName().toLowerCase(Locale.US).contains("optifine")) {
opt.add(l);
continue;

2
HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/AbstractMinecraftLibrary.java
View File

@ -26,7 +26,7 @@ import org.jackhuang.hmcl.api.game.IMinecraftLibrary;
*/
public abstract class AbstractMinecraftLibrary implements IMinecraftLibrary {
private String name;
private final String name;
public AbstractMinecraftLibrary(String name) {
this.name = name;

8
HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftLibrary.java
View File

@ -84,7 +84,7 @@ public class MinecraftLibrary extends AbstractMinecraftLibrary {
}
@Override
public boolean isRequiredToUnzip() {
public boolean isNative() {
return natives != null && allow();
}
@ -125,11 +125,7 @@ public class MinecraftLibrary extends AbstractMinecraftLibrary {
downloads.classifiers = new HashMap<>();
if (!downloads.classifiers.containsKey(getNative()))
downloads.classifiers.put(getNative(), info = new LibraryDownloadInfo());
else {
info = downloads.classifiers.get(getNative());
if (info == null)
info = new LibraryDownloadInfo();
}
else info = downloads.classifiers.get(getNative());
} else {
if (downloads.artifact == null)
downloads.artifact = new LibraryDownloadInfo();

2
HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftOldLibrary.java
View File

@ -30,7 +30,7 @@ public class MinecraftOldLibrary extends MinecraftLibrary {
}
@Override
public boolean isRequiredToUnzip() {
public boolean isNative() {
return false;
}

11
HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersion.java
View File

@ -21,8 +21,10 @@ import org.jackhuang.hmcl.api.game.IMinecraftLibrary;
import com.google.gson.annotations.SerializedName;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@ -164,8 +166,7 @@ public class MinecraftVersion implements Cloneable, Comparable<MinecraftVersion>
}
public File getNatives(File gameDir) {
return new File(gameDir, "versions/" + id + "/" + id
+ "-natives");
return new File(gameDir, "versions/" + id + "/" + id + "-natives");
}
public boolean isAllowedToUnpackNatives() {
@ -193,8 +194,6 @@ public class MinecraftVersion implements Cloneable, Comparable<MinecraftVersion>
return Objects.equals(this.id, ((MinecraftVersion) obj).id);
}
public AssetIndexDownloadInfo getAssetsIndex() {
if (assetIndex == null)
assetIndex = new AssetIndexDownloadInfo(assets == null ? AssetsIndex.DEFAULT_ASSET_NAME : assets);
@ -212,7 +211,7 @@ public class MinecraftVersion implements Cloneable, Comparable<MinecraftVersion>
return i;
}
public Set<IMinecraftLibrary> getLibraries() {
return libraries == null ? new HashSet<>() : new HashSet<>(libraries);
public List<IMinecraftLibrary> getLibraries() {
return libraries == null ? new LinkedList<>() : Collections.unmodifiableList(libraries);
}
}

2
HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersionManager.java
View File

@ -248,7 +248,7 @@ public class MinecraftVersionManager<T extends IMinecraftService> extends IMinec
ArrayList<File> unzippings = new ArrayList<>();
ArrayList<Extract> extractRules = new ArrayList<>();
for (IMinecraftLibrary l : v.libraries)
if (l.isRequiredToUnzip() && v.isAllowedToUnpackNatives()) {
if (l.isNative() && v.isAllowedToUnpackNatives()) {
unzippings.add(getLibraryFile(v, l));
extractRules.add(l.getDecompressExtractRules());
}