Skip to content

Commit 3121f1a

Browse files
committed
Added hotfix for update all command
1 parent f55273b commit 3121f1a

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ allprojects {
1313
apply(plugin = "maven-publish")
1414

1515
group = "org.lushplugins"
16-
version = "1.0.12"
16+
version = "1.0.13"
1717

1818
repositories {
1919
mavenCentral()
@@ -106,11 +106,11 @@ tasks {
106106

107107
tasks.withType(xyz.jpenilla.runtask.task.AbstractRun::class) {
108108
javaLauncher = javaToolchains.launcherFor {
109-
vendor = JvmVendorSpec.JETBRAINS
109+
// vendor = JvmVendorSpec.JETBRAINS
110110
languageVersion = JavaLanguageVersion.of(21)
111111
}
112112

113-
jvmArgs("-XX:+AllowEnhancedClassRedefinition")
113+
// jvmArgs("-XX:+AllowEnhancedClassRedefinition")
114114
}
115115

116116
publishing {

src/main/java/org/lushplugins/pluginupdater/PluginUpdater.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ public void onEnable() {
4141
Lamp<BukkitCommandActor> lamp = BukkitLamp.builder(this)
4242
.suggestionProviders(providers -> {
4343
providers.addProviderForAnnotation(PluginName.class, (annotation) -> (context) -> {
44-
List<String> plugins = new ArrayList<>();
45-
plugins.add("all");
46-
plugins.addAll(PluginUpdater.getInstance().getConfigManager().getPlugins());
47-
return plugins;
44+
return PluginUpdater.getInstance().getConfigManager().getPlugins();
4845
});
4946
})
5047
.responseHandler(String.class, new StringMessageResponseHandler())

src/main/java/org/lushplugins/pluginupdater/command/UpdateCommand.java

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,11 @@ public class UpdateCommand {
1818

1919
@Command("updater update")
2020
@CommandPermission("pluginupdater.downloadupdates")
21-
public String update(
22-
CommandSender sender,
23-
@PluginName String pluginName,
24-
@Switch("force") boolean force
25-
) {
21+
public String update(CommandSender sender, @PluginName String pluginName) {
2622
if (!PluginUpdater.getInstance().getConfigManager().shouldAllowDownloads()) {
2723
return "&#ff6969Update downloads have been disabled in the config";
2824
}
2925

30-
if (pluginName.equalsIgnoreCase("all")) {
31-
return updateAll(sender, force);
32-
}
33-
3426
PluginData pluginData = PluginUpdater.getInstance().getConfigManager().getPluginData(pluginName);
3527
if (pluginData == null) {
3628
return "&#ff6969That plugin is not registered";
@@ -46,7 +38,22 @@ public String update(
4638
}
4739
}
4840

49-
private String updateAll(CommandSender sender, boolean force) {
41+
// TODO: Temporary fix for update all command
42+
@Command("updater update all")
43+
@CommandPermission("pluginupdater.downloadupdates")
44+
public String updateAll(CommandSender sender) {
45+
return this.updateAll(sender, false);
46+
}
47+
48+
@Command("updater update all --force")
49+
@CommandPermission("pluginupdater.downloadupdates")
50+
public String forceUpdateAll(CommandSender sender) {
51+
return this.updateAll(sender, true);
52+
}
53+
54+
// @Command("updater update all")
55+
// @CommandPermission("pluginupdater.downloadupdates")
56+
public String updateAll(CommandSender sender, @Switch("force") boolean force) {
5057
UpdateHandler updateHandler = PluginUpdater.getInstance().getUpdateHandler();
5158
AtomicInteger updateCount = new AtomicInteger(0);
5259
AtomicInteger majorUpdateCount = new AtomicInteger(0);

0 commit comments

Comments
 (0)