From 486ca434ffeb51542fae57574a17db8680d74a7f Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Wed, 18 Jul 2018 16:33:47 +0800
Subject: [PATCH] Remove proxy HMCLDependencyManager

---
 .../jackhuang/hmcl/game/HMCLDependencyManager.java  |  8 +-------
 .../java/org/jackhuang/hmcl/setting/Profile.java    |  2 +-
 .../hmcl/download/DefaultDependencyManager.java     | 13 -------------
 .../jackhuang/hmcl/download/DependencyManager.java  |  7 -------
 4 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLDependencyManager.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLDependencyManager.java
index 5c3e2093b..7c81dabd8 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLDependencyManager.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLDependencyManager.java
@@ -22,8 +22,6 @@ import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.GameBuilder;
 import org.jackhuang.hmcl.setting.Profile;
 
-import java.net.Proxy;
-
 /**
  * @author huangyuhui
  */
@@ -31,11 +29,7 @@ public class HMCLDependencyManager extends DefaultDependencyManager {
     private final Profile profile;
 
     public HMCLDependencyManager(Profile profile, DownloadProvider downloadProvider) {
-        this(profile, downloadProvider, Proxy.NO_PROXY);
-    }
-
-    public HMCLDependencyManager(Profile profile, DownloadProvider downloadProvider, Proxy proxy) {
-        super(profile.getRepository(), downloadProvider, proxy);
+        super(profile.getRepository(), downloadProvider);
 
         this.profile = profile;
     }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
index 8ffd57580..e6b134098 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
@@ -122,7 +122,7 @@ public final class Profile {
     }
 
     public HMCLDependencyManager getDependency() {
-        return new HMCLDependencyManager(this, Settings.INSTANCE.getDownloadProvider(), ProxyManager.getProxy());
+        return new HMCLDependencyManager(this, Settings.INSTANCE.getDownloadProvider());
     }
 
     public VersionSetting getVersionSetting(String id) {
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java
index f86b080e1..b1297fecc 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java
@@ -29,8 +29,6 @@ import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.ParallelTask;
 import org.jackhuang.hmcl.task.Task;
 
-import java.net.Proxy;
-
 /**
  * Note: This class has no state.
  *
@@ -40,16 +38,10 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
 
     private final DefaultGameRepository repository;
     private final DownloadProvider downloadProvider;
-    private final Proxy proxy;
 
     public DefaultDependencyManager(DefaultGameRepository repository, DownloadProvider downloadProvider) {
-        this(repository, downloadProvider, Proxy.NO_PROXY);
-    }
-
-    public DefaultDependencyManager(DefaultGameRepository repository, DownloadProvider downloadProvider, Proxy proxy) {
         this.repository = repository;
         this.downloadProvider = downloadProvider;
-        this.proxy = proxy;
     }
 
     @Override
@@ -62,11 +54,6 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
         return downloadProvider;
     }
 
-    @Override
-    public Proxy getProxy() {
-        return proxy;
-    }
-
     @Override
     public GameBuilder gameBuilder() {
         return new DefaultGameBuilder(this);
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DependencyManager.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DependencyManager.java
index 830b90314..c3b00047b 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DependencyManager.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DependencyManager.java
@@ -21,8 +21,6 @@ import org.jackhuang.hmcl.game.GameRepository;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.Task;
 
-import java.net.Proxy;
-
 /**
  * Do everything that will connect to Internet.
  * Downloading Minecraft files.
@@ -36,11 +34,6 @@ public interface DependencyManager {
      */
     GameRepository getGameRepository();
 
-    /**
-     * The proxy that all network operations should go through.
-     */
-    Proxy getProxy();
-
     /**
      * Check if the game is complete.
      * Check libraries, assets, logging files and so on.