From 18e1ad79c74c77822d4516df5a77b13e4d5087d2 Mon Sep 17 00:00:00 2001
From: TheRealNull <therealnull@gmail.com>
Date: Sun, 27 Dec 2020 17:53:49 -0500
Subject: [PATCH] change default repo

---
 .../openosrs/client/config/OpenOSRSConfig.java  |  4 ++--
 .../client/plugins/ExternalPluginManager.java   | 17 ++++++++---------
 .../runelite/client/plugins/PluginManager.java  |  6 ------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/runelite-client/src/main/java/com/openosrs/client/config/OpenOSRSConfig.java b/runelite-client/src/main/java/com/openosrs/client/config/OpenOSRSConfig.java
index 061daec88a..9c416f5708 100644
--- a/runelite-client/src/main/java/com/openosrs/client/config/OpenOSRSConfig.java
+++ b/runelite-client/src/main/java/com/openosrs/client/config/OpenOSRSConfig.java
@@ -129,7 +129,7 @@ public interface OpenOSRSConfig extends Config
 	}
 
 	@ConfigItem(
-		keyName = "externalRepositories",
+		keyName = "externalRepos",
 		name = "",
 		description = "",
 		hidden = true
@@ -140,7 +140,7 @@ public interface OpenOSRSConfig extends Config
 	}
 
 	@ConfigItem(
-		keyName = "externalRepositories",
+		keyName = "externalRepos",
 		name = "",
 		description = "",
 		hidden = true
diff --git a/runelite-client/src/main/java/com/openosrs/client/plugins/ExternalPluginManager.java b/runelite-client/src/main/java/com/openosrs/client/plugins/ExternalPluginManager.java
index f9ea6350df..0159a2f36b 100644
--- a/runelite-client/src/main/java/com/openosrs/client/plugins/ExternalPluginManager.java
+++ b/runelite-client/src/main/java/com/openosrs/client/plugins/ExternalPluginManager.java
@@ -89,17 +89,16 @@ import org.pf4j.update.DefaultUpdateRepository;
 import org.pf4j.update.PluginInfo;
 import org.pf4j.update.UpdateManager;
 import org.pf4j.update.UpdateRepository;
-import org.pf4j.update.VerifyException;
 
 @Slf4j
 @Singleton
 public class ExternalPluginManager
 {
-	public static final String DEFAULT_PLUGIN_REPOS = "OpenOSRS:https://raw.githubusercontent.com/open-osrs/plugin-hosting/master/";
+	public static final String DEFAULT_PLUGIN_REPOS = "OpenOSRS:https://raw.githubusercontent.com/zeruth/runelite-plugins-release/master/";
 	static final String DEVELOPMENT_MANIFEST_PATH = "build/tmp/jar/MANIFEST.MF";
 
 	public static ArrayList<ClassLoader> pluginClassLoaders = new ArrayList<>();
-	private final net.runelite.client.plugins.PluginManager runelitePluginManager;
+	private final PluginManager runelitePluginManager;
 	private org.pf4j.PluginManager externalPluginManager;
 	@Getter(AccessLevel.PUBLIC)
 	private final List<UpdateRepository> repositories = new ArrayList<>();
@@ -260,7 +259,7 @@ public class ExternalPluginManager
 
 				if (id.contains("https://raw.githubusercontent.com/"))
 				{
-					id = "gh:" + id.substring(id.indexOf("https://raw.githubusercontent.com/")).replace("/master", "")
+					id = "gh:" + id.substring(id.indexOf("https://raw.githubusercontent.com/")).replace("/main", "")
 						.replace("https://raw.githubusercontent.com/", "");
 
 					if (id.endsWith("/"))
@@ -540,15 +539,15 @@ public class ExternalPluginManager
 		List<Plugin> deps = new ArrayList<>();
 		for (net.runelite.client.plugins.PluginDependency pluginDependency : pluginDependencies)
 		{
-			Optional<Plugin> dependency =
-				Stream.concat(runelitePluginManager.getOprsPlugins().stream(), scannedPlugins.stream())
+			Optional<net.runelite.client.plugins.Plugin> dependency =
+				Stream.concat(runelitePluginManager.getPlugins().stream(), scannedPlugins.stream())
 					.filter(p -> p.getClass() == pluginDependency.value()).findFirst();
 			if (dependency.isEmpty())
 			{
 				throw new PluginInstantiationException(
 					"Unmet dependency for " + clazz.getSimpleName() + ": " + pluginDependency.value().getSimpleName());
 			}
-			deps.add(dependency.get());
+			deps.add((Plugin) dependency.get());
 		}
 
 		log.info("Loading plugin {}", clazz.getSimpleName());
@@ -774,7 +773,7 @@ public class ExternalPluginManager
 
 			List<Plugin> extensions = externalPluginManager.getExtensions(Plugin.class, pluginId);
 
-			for (Plugin plugin : runelitePluginManager.getOprsPlugins())
+			for (net.runelite.client.plugins.Plugin plugin : runelitePluginManager.getPlugins())
 			{
 				if (!extensions.get(0).getClass().getName().equals(plugin.getClass().getName()))
 				{
@@ -812,7 +811,7 @@ public class ExternalPluginManager
 		return null;
 	}
 
-	public boolean install(String pluginId) throws VerifyException
+	public boolean install(String pluginId)
 	{
 		if (getDisabledPlugins().contains(pluginId))
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
index 0a49cc0029..292f7b7414 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
@@ -99,7 +99,6 @@ public class PluginManager
 
 	@Setter
 	boolean isOutdated;
-	private Collection<com.openosrs.client.plugins.Plugin> oprsPlugins;
 
 	@Inject
 	@VisibleForTesting
@@ -569,11 +568,6 @@ public class PluginManager
 		return plugins;
 	}
 
-	public Collection<com.openosrs.client.plugins.Plugin> getOprsPlugins()
-	{
-		return oprsPlugins;
-	}
-
 	/**
 	 * Topologically sort a graph into separate groups.
 	 * Each group represents the dependency level of the plugins.