AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-16 23:37:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove proxy HMCLDependencyManager

Browse Source
This commit is contained in:
yushijinhun 2018-07-18 16:33:47 +08:00
parent fe87a899c8
commit 486ca434ff
No known key found for this signature in database
GPG Key ID: 5BC167F73EA558E4
4 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLDependencyManager.java
View File

@ -22,8 +22,6 @@ import org.jackhuang.hmcl.download.DownloadProvider;
import org.jackhuang.hmcl.download.GameBuilder; import org.jackhuang.hmcl.download.GameBuilder;
import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Profile;
import java.net.Proxy;
/** /**
* @author huangyuhui * @author huangyuhui
*/ */
@ -31,11 +29,7 @@ public class HMCLDependencyManager extends DefaultDependencyManager {
private final Profile profile; private final Profile profile;
public HMCLDependencyManager(Profile profile, DownloadProvider downloadProvider) { public HMCLDependencyManager(Profile profile, DownloadProvider downloadProvider) {
this(profile, downloadProvider, Proxy.NO_PROXY); super(profile.getRepository(), downloadProvider);
}
public HMCLDependencyManager(Profile profile, DownloadProvider downloadProvider, Proxy proxy) {
super(profile.getRepository(), downloadProvider, proxy);
this.profile = profile; this.profile = profile;
} }

2
HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
View File

@ -122,7 +122,7 @@ public final class Profile {
} }
public HMCLDependencyManager getDependency() { public HMCLDependencyManager getDependency() {
return new HMCLDependencyManager(this, Settings.INSTANCE.getDownloadProvider(), ProxyManager.getProxy()); return new HMCLDependencyManager(this, Settings.INSTANCE.getDownloadProvider());
} }
public VersionSetting getVersionSetting(String id) { public VersionSetting getVersionSetting(String id) {

13
HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java
View File

@ -29,8 +29,6 @@ import org.jackhuang.hmcl.game.Version;
import org.jackhuang.hmcl.task.ParallelTask; import org.jackhuang.hmcl.task.ParallelTask;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import java.net.Proxy;
/** /**
* Note: This class has no state. * Note: This class has no state.
* *
@ -40,16 +38,10 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
private final DefaultGameRepository repository; private final DefaultGameRepository repository;
private final DownloadProvider downloadProvider; private final DownloadProvider downloadProvider;
private final Proxy proxy;
public DefaultDependencyManager(DefaultGameRepository repository, DownloadProvider downloadProvider) { public DefaultDependencyManager(DefaultGameRepository repository, DownloadProvider downloadProvider) {
this(repository, downloadProvider, Proxy.NO_PROXY);
}
public DefaultDependencyManager(DefaultGameRepository repository, DownloadProvider downloadProvider, Proxy proxy) {
this.repository = repository; this.repository = repository;
this.downloadProvider = downloadProvider; this.downloadProvider = downloadProvider;
this.proxy = proxy;
} }
@Override @Override
@ -62,11 +54,6 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
return downloadProvider; return downloadProvider;
} }
@Override
public Proxy getProxy() {
return proxy;
}
@Override @Override
public GameBuilder gameBuilder() { public GameBuilder gameBuilder() {
return new DefaultGameBuilder(this); return new DefaultGameBuilder(this);

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

@ -21,8 +21,6 @@ import org.jackhuang.hmcl.game.GameRepository;
import org.jackhuang.hmcl.game.Version; import org.jackhuang.hmcl.game.Version;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import java.net.Proxy;
/** /**
* Do everything that will connect to Internet. * Do everything that will connect to Internet.
* Downloading Minecraft files. * Downloading Minecraft files.
@ -36,11 +34,6 @@ public interface DependencyManager {
*/ */
GameRepository getGameRepository(); GameRepository getGameRepository();
/**
* The proxy that all network operations should go through.
*/
Proxy getProxy();
/** /**
* Check if the game is complete. * Check if the game is complete.
* Check libraries, assets, logging files and so on. * Check libraries, assets, logging files and so on.