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

fix: incorrect detected forge version. Closes #961.

Browse Source
This commit is contained in:
huanghongxun
2021-08-21 15:50:22 +08:00
parent f00afbe1b5
commit 66bb27c4dd
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameItem.java
View File

@@ -69,7 +69,7 @@ public class GameItem extends Control {
if (I18n.hasKey("install.installer." + libraryId)) { if (I18n.hasKey("install.installer." + libraryId)) {
libraries.append(", ").append(i18n("install.installer." + libraryId)); libraries.append(", ").append(i18n("install.installer." + libraryId));
if (libraryVersion != null) if (libraryVersion != null)
libraries.append(": ").append(LibraryAnalyzer.modifyVersion(game, libraryVersion.replaceAll("(?i)" + libraryId, ""))); libraries.append(": ").append(libraryVersion.replaceAll("(?i)" + libraryId, ""));
} }
} }

26
HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java
View File

@@ -25,12 +25,11 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.*; import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.jackhuang.hmcl.util.Pair.pair; import static org.jackhuang.hmcl.util.Pair.pair;
import static org.jackhuang.hmcl.util.StringUtils.removePrefix;
import static org.jackhuang.hmcl.util.StringUtils.removeSuffix;
public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMark> { public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMark> {
private Version version; private Version version;
@@ -135,7 +134,7 @@ public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMa
for (Library library : version.resolve(null).getLibraries()) { for (Library library : version.resolve(null).getLibraries()) {
for (LibraryType type : LibraryType.values()) { for (LibraryType type : LibraryType.values()) {
if (type.matchLibrary(library)) { if (type.matchLibrary(library)) {
libraries.put(type.getPatchId(), pair(library, library.getVersion())); libraries.put(type.getPatchId(), pair(library, type.patchVersion(library.getVersion())));
break; break;
} }
} }
@@ -155,14 +154,21 @@ public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMa
return mainClass != null && (LAUNCH_WRAPPER_MAIN.equals(mainClass) || mainClass.startsWith("net.fabricmc") || mainClass.startsWith("cpw.mods")); return mainClass != null && (LAUNCH_WRAPPER_MAIN.equals(mainClass) || mainClass.startsWith("net.fabricmc") || mainClass.startsWith("cpw.mods"));
} }
public static String modifyVersion(String gameVersion, String version) {
return removeSuffix(removePrefix(removeSuffix(removePrefix(version.replace(gameVersion, "").trim(), "-"), "-"), "_"), "_");
}
public enum LibraryType { public enum LibraryType {
MINECRAFT(true, "game", Pattern.compile("^$"), Pattern.compile("^$")), MINECRAFT(true, "game", Pattern.compile("^$"), Pattern.compile("^$")),
FABRIC(true, "fabric", Pattern.compile("net\\.fabricmc"), Pattern.compile("fabric-loader")), FABRIC(true, "fabric", Pattern.compile("net\\.fabricmc"), Pattern.compile("fabric-loader")),
FORGE(true, "forge", Pattern.compile("net\\.minecraftforge"), Pattern.compile("(forge|fmlloader)")), FORGE(true, "forge", Pattern.compile("net\\.minecraftforge"), Pattern.compile("(forge|fmlloader)")) {
private final Pattern FORGE_VERSION_MATCHER = Pattern.compile("^([0-9.]+)-(?<forge>[0-9.]+)(-([0-9.]+))?$");
@Override
public String patchVersion(String libraryVersion) {
Matcher matcher = FORGE_VERSION_MATCHER.matcher(libraryVersion);
if (matcher.find()) {
return matcher.group("forge");
}
return super.patchVersion(libraryVersion);
}
},
LITELOADER(true, "liteloader", Pattern.compile("com\\.mumfrey"), Pattern.compile("liteloader")), LITELOADER(true, "liteloader", Pattern.compile("com\\.mumfrey"), Pattern.compile("liteloader")),
OPTIFINE(false, "optifine", Pattern.compile("(net\\.)?optifine"), Pattern.compile("^(?!.*launchwrapper).*$")), OPTIFINE(false, "optifine", Pattern.compile("(net\\.)?optifine"), Pattern.compile("^(?!.*launchwrapper).*$")),
BOOTSTRAP_LAUNCHER(false, "", Pattern.compile("cpw\\.mods"), Pattern.compile("bootstraplauncher")); BOOTSTRAP_LAUNCHER(false, "", Pattern.compile("cpw\\.mods"), Pattern.compile("bootstraplauncher"));
@@ -196,6 +202,10 @@ public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMa
public boolean matchLibrary(Library library) { public boolean matchLibrary(Library library) {
return group.matcher(library.getGroupId()).matches() && artifact.matcher(library.getArtifactId()).matches(); return group.matcher(library.getGroupId()).matches() && artifact.matcher(library.getArtifactId()).matches();
} }
public String patchVersion(String libraryVersion) {
return libraryVersion;
}
} }
public static class LibraryMark { public static class LibraryMark {