lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Modpack::acceptFile (#1972)

Browse Source 
* fix Modpack::acceptFile

* fix separator
This commit is contained in:
Glavo
2023-01-07 21:25:36 +08:00
committed by GitHub
parent 9e6d6ff95a
commit 3f0e8138b1
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModAdviser.java
View File

@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.mod;
import org.jackhuang.hmcl.util.Lang;
import java.io.File;
import java.util.List;
/**
@@ -61,7 +62,7 @@ public interface ModAdviser {
"optionsof.txt" /* OptiFine */,
"journeymap" /* JourneyMap */,
"optionsshaders.txt",
"mods/VoxelMods");
"mods" + File.separator + "VoxelMods");
static ModAdviser.ModSuggestion suggestMod(String fileName, boolean isDirectory) {
if (match(MODPACK_BLACK_LIST, fileName, isDirectory))
@@ -75,7 +76,7 @@ public interface ModAdviser {
static boolean match(List<String> l, String fileName, boolean isDirectory) {
for (String s : l)
if (isDirectory) {
if (fileName.startsWith(s + "/"))
if (fileName.startsWith(s + File.separator))
return true;
} else {
if (s.startsWith("regex:")) {

5
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/Modpack.java
View File

@@ -119,9 +119,8 @@ public abstract class Modpack {
public static boolean acceptFile(String path, List<String> blackList, List<String> whiteList) {
if (path.isEmpty())
return true;
for (String s : blackList)
if (path.equals(s))
return false;
if (ModAdviser.match(blackList, path, false))
return false;
if (whiteList == null || whiteList.isEmpty())
return true;
for (String s : whiteList)