diff --git a/build.gradle.kts b/build.gradle.kts index 6357fa204c..e6c81b7968 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -166,8 +166,6 @@ subprojects { java { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 - - withSourcesJar() } withType { diff --git a/injected-client/injected-client.gradle.kts b/injected-client/injected-client.gradle.kts index 4544988097..fd5ea8f010 100644 --- a/injected-client/injected-client.gradle.kts +++ b/injected-client/injected-client.gradle.kts @@ -76,9 +76,6 @@ tasks { jar { enabled = false } - sourcesJar { - enabled = false - } processResources { enabled = false } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java index bd1cfcf8ee..3ed2758e3c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java @@ -136,6 +136,10 @@ class ExternalPf4jPluginManager extends DefaultPluginManager { try { + if (!isPluginEligibleForLoading(pluginPath) && isNotDevelopment()) + { + continue; + } loadPluginFromPath(pluginPath); } catch (PluginRuntimeException e) @@ -346,4 +350,9 @@ class ExternalPf4jPluginManager extends DefaultPluginManager return pluginRepository.deletePluginPath(pluginPath); } + + private boolean isPluginEligibleForLoading(Path path) + { + return path.toFile().getName().endsWith(".jar"); + } }