Add an option to disable common path

HMCLCore/src/main/java/org/jackhuang/hmcl/core/download/MinecraftDownloadService.java

@@ -57,7 +57,7 @@ public class MinecraftDownloadService extends IMinecraftDownloadService {
         MinecraftVersion v = mv.resolve(service.version());
         for (IMinecraftLibrary l : v.getLibraries())
             if (l != null && l.allow() && l.getDownloadURL(service.getDownloadType().name()) != null) {
-                File ff = l.getFilePath(service.baseDirectory());
+                File ff = service.version().getLibraryFile(mv, l);
                 if (!ff.exists()) {
                     String libURL = l.getDownloadURL(service.getDownloadType().name());
                     if (libURL != null)

HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/forge/ForgeInstaller.java

@@ -23,8 +23,6 @@ import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import org.jackhuang.hmcl.api.HMCLApi;
-import org.jackhuang.hmcl.api.event.version.MinecraftLibraryPathEvent;
 import org.jackhuang.hmcl.util.C;
 import org.jackhuang.hmcl.api.HMCLog;
 import org.jackhuang.hmcl.core.service.IMinecraftService;
@@ -32,7 +30,6 @@ import org.jackhuang.hmcl.util.task.Task;
 import org.jackhuang.hmcl.util.sys.FileUtils;
 import org.jackhuang.hmcl.core.version.MinecraftLibrary;
 import org.jackhuang.hmcl.util.MessageBox;
-import org.jackhuang.hmcl.api.Wrapper;
 import org.jackhuang.hmcl.util.sys.IOUtils;
 
 /**
@@ -81,11 +78,9 @@ public class ForgeInstaller extends Task {
             entry = zipFile.getEntry(profile.install.getFilePath());
             InputStream is = zipFile.getInputStream(entry);
             MinecraftLibrary forge = new MinecraftLibrary(profile.install.getPath());
-
-            String path = "libraries/" + forge.getDownloadInfo().path;
-            MinecraftLibraryPathEvent event = new MinecraftLibraryPathEvent(this, path, new Wrapper<>(new File(gameDir, path)));
-            HMCLApi.EVENT_BUS.fireChannel(event);
-            File file = event.getFile().getValue();
+            
+            // We use options from the old vanilla version.
+            File file = mp.version().getLibraryFile(mp.version().getVersionById(profile.install.getMinecraft()), forge);
 
             if (!FileUtils.makeDirectory(file.getParentFile()))
                 HMCLog.warn("Failed to make library directory " + file.getParent());

HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/liteloader/LiteLoaderInstaller.java

@@ -20,8 +20,6 @@ package org.jackhuang.hmcl.core.install.liteloader;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
-import org.jackhuang.hmcl.api.HMCLApi;
-import org.jackhuang.hmcl.api.event.version.MinecraftLibraryPathEvent;
 import org.jackhuang.hmcl.util.C;
 import org.jackhuang.hmcl.api.HMCLog;
 import org.jackhuang.hmcl.core.service.IMinecraftService;
@@ -31,7 +29,6 @@ import org.jackhuang.hmcl.util.task.comm.PreviousResultRegistrar;
 import org.jackhuang.hmcl.util.sys.FileUtils;
 import org.jackhuang.hmcl.core.version.MinecraftLibrary;
 import org.jackhuang.hmcl.core.version.MinecraftVersion;
-import org.jackhuang.hmcl.api.Wrapper;
 
 /**
  *
@@ -69,13 +66,11 @@ public class LiteLoaderInstaller extends Task implements PreviousResultRegistrar
         mv.libraries = new ArrayList<>(Arrays.asList(version.libraries));
 
         MinecraftLibrary ml = new MinecraftLibrary("com.mumfrey:liteloader:" + version.selfVersion);
-        //ml.url = "http://dl.liteloader.com/versions/com/mumfrey/liteloader/" + version.mcVersion + "/liteloader-" + version.selfVersion + ".jar";
+        ml.url = "http://dl.liteloader.com/versions";
         mv.libraries.add(0, ml);
-        
-        String path = "libraries/com/mumfrey/liteloader/" + version.selfVersion + "/liteloader-" + version.selfVersion + ".jar";
-        MinecraftLibraryPathEvent event = new MinecraftLibraryPathEvent(this, path, new Wrapper<>(new File(service.baseDirectory(), path)));
-        HMCLApi.EVENT_BUS.fireChannel(event);
-        FileUtils.copyFile(installer, event.getFile().getValue());
+
+        // We use options from the old vanilla version.
+        FileUtils.copyFile(installer, service.version().getLibraryFile(mv, ml));
 
         mv.id += "-LiteLoader" + version.selfVersion;
 

HMCLCore/src/main/java/org/jackhuang/hmcl/core/install/optifine/OptiFineInstaller.java

@@ -20,8 +20,6 @@ package org.jackhuang.hmcl.core.install.optifine;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.zip.ZipFile;
-import org.jackhuang.hmcl.api.HMCLApi;
-import org.jackhuang.hmcl.api.event.version.MinecraftLibraryPathEvent;
 import org.jackhuang.hmcl.util.C;
 import org.jackhuang.hmcl.core.install.InstallerVersionList;
 import org.jackhuang.hmcl.core.service.IMinecraftService;
@@ -33,7 +31,6 @@ import org.jackhuang.hmcl.util.task.comm.PreviousResultRegistrar;
 import org.jackhuang.hmcl.util.sys.FileUtils;
 import org.jackhuang.hmcl.core.version.MinecraftLibrary;
 import org.jackhuang.hmcl.core.version.MinecraftVersion;
-import org.jackhuang.hmcl.api.Wrapper;
 import org.jackhuang.hmcl.api.HMCLog;
 
 /**
@@ -72,9 +69,8 @@ public class OptiFineInstaller extends Task implements PreviousResultRegistrar<F
         library.downloads.artifact.size = 0;
         mv.libraries.add(0, library);
         
-        MinecraftLibraryPathEvent event = new MinecraftLibraryPathEvent(this, "libraries/" + library.downloads.artifact.path, new Wrapper<>(new File(service.baseDirectory(), "libraries/" + library.downloads.artifact.path)));
-        HMCLApi.EVENT_BUS.fireChannel(event);
-        FileUtils.copyFile(installer, event.getFile().getValue());
+        // We use options from the old vanilla version.
+        FileUtils.copyFile(installer, service.version().getLibraryFile(service.version().getVersionById(installId), library));
 
         mv.id += "-" + selfId;
         try (ZipFile zipFile = new ZipFile(installer)) {

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

@@ -52,13 +52,13 @@ public class MinecraftLoader extends AbstractMinecraftLoader {
                     opt.add(l);
                     continue;
                 }
-                File f = l.getFilePath(gameDir);
+                File f = service.version().getLibraryFile(version, l);
                 if (f == null)
                     continue;
                 library.append(f.getAbsolutePath()).append(File.pathSeparator);
             }
         for (MinecraftLibrary l : opt) {
-            File f = l.getFilePath(gameDir);
+            File f = service.version().getLibraryFile(version, l);
             if (f == null)
                 continue;
             library.append(f.getAbsolutePath()).append(File.pathSeparator);

HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftProvider.java

@@ -22,9 +22,9 @@ import java.util.Collection;
 import org.jackhuang.hmcl.core.GameException;
 import org.jackhuang.hmcl.api.game.DecompressLibraryJob;
 import org.jackhuang.hmcl.core.version.MinecraftVersion;
-import org.jackhuang.hmcl.api.event.EventHandler;
 import org.jackhuang.hmcl.api.func.Consumer;
 import org.jackhuang.hmcl.api.func.Predicate;
+import org.jackhuang.hmcl.api.game.IMinecraftLibrary;
 
 /**
  * Provide everything of the Minecraft of a Profile.
@@ -158,5 +158,7 @@ public abstract class IMinecraftProvider {
     public File baseDirectory() {
         return service.baseDirectory();
     }
+    
+    public abstract File getLibraryFile(MinecraftVersion version, IMinecraftLibrary library);
 
 }

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

@@ -23,7 +23,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import org.jackhuang.hmcl.api.HMCLApi;
-import org.jackhuang.hmcl.api.event.version.MinecraftLibraryPathEvent;
 import org.jackhuang.hmcl.util.sys.OS;
 import org.jackhuang.hmcl.util.sys.Platform;
 import org.jackhuang.hmcl.util.StrUtils;
@@ -108,9 +107,7 @@ public class MinecraftLibrary extends AbstractMinecraftLibrary {
         LibraryDownloadInfo info = getDownloadInfo();
         if (info == null)
             return null;
-        MinecraftLibraryPathEvent event = new MinecraftLibraryPathEvent(this, "libraries/" + info.path, new Wrapper<>(new File(gameDir, "libraries/" + info.path)));
-        HMCLApi.EVENT_BUS.fireChannel(event);
-        return event.getFile().getValue();
+        return new File(gameDir, "libraries/" + info.path);
     }
 
     @Override

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

@@ -77,19 +77,19 @@ public class MinecraftVersionManager extends IMinecraftProvider {
         HMCLApi.EVENT_BUS.fireChannel(new RefreshingVersionsEvent(this));
 
         try {
-            MCUtils.tryWriteProfile(service.baseDirectory());
+            MCUtils.tryWriteProfile(baseDirectory());
         } catch (IOException ex) {
             HMCLog.warn("Failed to create launcher_profiles.json, Forge/LiteLoader installer will not work.", ex);
         }
 
         versions.clear();
-        File oldDir = new File(service.baseDirectory(), "bin");
+        File oldDir = new File(baseDirectory(), "bin");
         if (oldDir.exists()) {
             MinecraftClassicVersion v = new MinecraftClassicVersion();
             versions.put(v.id, v);
         }
 
-        File version = new File(service.baseDirectory(), "versions");
+        File version = new File(baseDirectory(), "versions");
         File[] files = version.listFiles();
         if (files != null && files.length > 0)
             for (File dir : files) {
@@ -154,7 +154,7 @@ public class MinecraftVersionManager extends IMinecraftProvider {
 
     @Override
     public File versionRoot(String id) {
-        return new File(service.baseDirectory(), "versions/" + id);
+        return new File(baseDirectory(), "versions/" + id);
     }
 
     @Override
@@ -220,6 +220,11 @@ public class MinecraftVersionManager extends IMinecraftProvider {
         SwingUtils.openFolder((name == null) ? getRunDirectory(mv) : new File(getRunDirectory(mv), name));
     }
 
+    @Override
+    public File getLibraryFile(MinecraftVersion version, IMinecraftLibrary lib) {
+        return lib.getFilePath(baseDirectory());
+    }
+
     @Override
     public DecompressLibraryJob getDecompressLibraries(MinecraftVersion v) throws GameException {
         if (v.libraries == null)
@@ -228,7 +233,7 @@ public class MinecraftVersionManager extends IMinecraftProvider {
         ArrayList<Extract> extractRules = new ArrayList<>();
         for (IMinecraftLibrary l : v.libraries)
             if (l.isRequiredToUnzip() && v.isAllowedToUnpackNatives()) {
-                unzippings.add(IOUtils.tryGetCanonicalFile(l.getFilePath(service.baseDirectory())));
+                unzippings.add(IOUtils.tryGetCanonicalFile(getLibraryFile(v, l)));
                 extractRules.add(l.getDecompressExtractRules());
             }
         return new DecompressLibraryJob(unzippings.toArray(new File[unzippings.size()]), extractRules.toArray(new Extract[extractRules.size()]), getDecompressNativesToLocation(v));
@@ -236,13 +241,13 @@ public class MinecraftVersionManager extends IMinecraftProvider {
 
     @Override
     public File getDecompressNativesToLocation(MinecraftVersion v) {
-        return v == null ? null : v.getNatives(service.baseDirectory());
+        return v == null ? null : v.getNatives(baseDirectory());
     }
 
     @Override
     public File getMinecraftJar(String id) {
         if (versions.containsKey(id))
-            return versions.get(id).getJar(service.baseDirectory());
+            return versions.get(id).getJar(baseDirectory());
         else
             return null;
     }

HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N.lang

@@ -291,6 +291,7 @@ advancedsettings.launcher_visibility.keep=Keep the launcher visible.
 advancedsettings.game_dir.default=Default (.minecraft/)
 advancedsettings.game_dir.independent=Independent (.minecraft/versions/<version name>/, except assets,libraries)
 advancedsettings.no_jvm_args=No Default JVM Args
+advancedsettings.no_common=Not using common path
 advancedsettings.java_args_default=Default java args: -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -XX:MaxPermSize=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true
 advancedsettings.wrapper_launcher=Wrapper Launcher(like optirun...)
 advancedsettings.precall_command=Precalling command(will be executed before game launching)

HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N.properties

@@ -291,6 +291,7 @@ advancedsettings.launcher_visibility.keep=Keep the launcher visible.
 advancedsettings.game_dir.default=Default (.minecraft/)
 advancedsettings.game_dir.independent=Independent (.minecraft/versions/<version name>/, except assets,libraries)
 advancedsettings.no_jvm_args=No Default JVM Args
+advancedsettings.no_common=Not using common path
 advancedsettings.java_args_default=Default java args: -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -XX:MaxPermSize=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true
 advancedsettings.wrapper_launcher=Wrapper Launcher(like optirun...)
 advancedsettings.precall_command=Precalling command(will be executed before game launching)

HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_vi.lang

@@ -289,6 +289,7 @@ advancedsettings.launcher_visibility.keep=Để cho launcher hiển thị.
 advancedsettings.game_dir.default=Mặc định (.minecraft/)
 advancedsettings.game_dir.independent=Independent (.minecraft/versions/<version name>/, trừ thư mục assets,libraries)
 advancedsettings.no_jvm_args=Không có arguments mặc định cho máy ảo java
+advancedsettings.no_common=Not using common path
 advancedsettings.java_args_default=Java arguments mặc định: -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -XX:MaxPermSize=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true
 advancedsettings.wrapper_launcher=Wrapper Launcher(dạng như optirun...)
 advancedsettings.precall_command=Câu lệnh được chạy trước khi game mở

HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_vi.properties

@@ -289,6 +289,7 @@ advancedsettings.launcher_visibility.keep=\u0110\u1ec3 cho launcher hi\u1ec3n th
 advancedsettings.game_dir.default=M\u1eb7c \u0111\u1ecbnh (.minecraft/)
 advancedsettings.game_dir.independent=Independent (.minecraft/versions/<version name>/, tr\u1eeb th\u01b0 m\u1ee5c assets,libraries)
 advancedsettings.no_jvm_args=Kh\u00f4ng c\u00f3 arguments m\u1eb7c \u0111\u1ecbnh cho m\u00e1y \u1ea3o java
+advancedsettings.no_common=Not using common path
 advancedsettings.java_args_default=Java arguments m\u1eb7c \u0111\u1ecbnh: -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -XX:MaxPermSize=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true
 advancedsettings.wrapper_launcher=Wrapper Launcher(d\u1ea1ng nh\u01b0 optirun...)
 advancedsettings.precall_command=C\u00e2u l\u1ec7nh \u0111\u01b0\u1ee3c ch\u1ea1y tr\u01b0\u1edbc khi game m\u1edf

HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh_CN.lang

@@ -291,6 +291,7 @@ advancedsettings.launcher_visibility.keep=保持启动器可见
 advancedsettings.game_dir.default=默认(.minecraft/)
 advancedsettings.game_dir.independent=各版本独立(.minecraft/versions/<版本名>/,除assets,libraries)
 advancedsettings.no_jvm_args=不添加默认的JVM参数(使用Java9时必勾)
+advancedsettings.no_common=不使用公共路径
 advancedsettings.java_args_default=启动器默认添加的参数（请不要重复添加）：-XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -XX:MaxPermSize=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true
 advancedsettings.wrapper_launcher=前置指令(不必填写,如optirun)
 advancedsettings.precall_command=启动前执行命令(不必填写，将在游戏启动前调用)

HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh_CN.properties

@@ -291,6 +291,7 @@ advancedsettings.launcher_visibility.keep=\u4fdd\u6301\u542f\u52a8\u5668\u53ef\u
 advancedsettings.game_dir.default=\u9ed8\u8ba4(.minecraft/)
 advancedsettings.game_dir.independent=\u5404\u7248\u672c\u72ec\u7acb(.minecraft/versions/<\u7248\u672c\u540d>/,\u9664assets,libraries)
 advancedsettings.no_jvm_args=\u4e0d\u6dfb\u52a0\u9ed8\u8ba4\u7684JVM\u53c2\u6570(\u4f7f\u7528Java9\u65f6\u5fc5\u52fe)
+advancedsettings.no_common=\u4e0d\u4f7f\u7528\u516c\u5171\u8def\u5f84
 advancedsettings.java_args_default=\u542f\u52a8\u5668\u9ed8\u8ba4\u6dfb\u52a0\u7684\u53c2\u6570\uff08\u8bf7\u4e0d\u8981\u91cd\u590d\u6dfb\u52a0\uff09\uff1a-XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -XX:MaxPermSize=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true
 advancedsettings.wrapper_launcher=\u524d\u7f6e\u6307\u4ee4(\u4e0d\u5fc5\u586b\u5199,\u5982optirun)
 advancedsettings.precall_command=\u542f\u52a8\u524d\u6267\u884c\u547d\u4ee4(\u4e0d\u5fc5\u586b\u5199\uff0c\u5c06\u5728\u6e38\u620f\u542f\u52a8\u524d\u8c03\u7528)