From 6cf987586efa76d367bf3e8d1e99c12d02278714 Mon Sep 17 00:00:00 2001 From: Gabriel Dumitru Date: Tue, 9 Aug 2022 01:08:24 +0300 Subject: [PATCH 1/4] remove the eCloud toggle command --- .../commands/impl/cloud/CommandECloud.java | 18 ++--- .../impl/cloud/CommandECloudToggle.java | 74 ------------------- 2 files changed, 8 insertions(+), 84 deletions(-) delete mode 100644 src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudToggle.java diff --git a/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java index 50458be..a09e0db 100644 --- a/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java +++ b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java @@ -22,11 +22,6 @@ package me.clip.placeholderapi.commands.impl.cloud; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import java.util.Collection; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.stream.Stream; import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.commands.PlaceholderCommand; import me.clip.placeholderapi.util.Msg; @@ -34,12 +29,17 @@ import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.stream.Stream; + public final class CommandECloud extends PlaceholderCommand { @Unmodifiable private static final List COMMANDS = ImmutableList .of(new CommandECloudClear(), - new CommandECloudToggle(), new CommandECloudStatus(), new CommandECloudUpdate(), new CommandECloudRefresh(), @@ -115,10 +115,8 @@ public final class CommandECloud extends PlaceholderCommand { return; } - if (!(target instanceof CommandECloudToggle) && !plugin.getPlaceholderAPIConfig() - .isCloudEnabled()) { - Msg.msg(sender, - "&cThe eCloud Manager is not enabled!"); + if (!plugin.getPlaceholderAPIConfig().isCloudEnabled()) { + Msg.msg(sender, "&cThe eCloud Manager is not enabled! To enable it, set 'cloud_enabled' to true and reload the plugin."); return; } diff --git a/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudToggle.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudToggle.java deleted file mode 100644 index 9e62a15..0000000 --- a/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudToggle.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * This file is part of PlaceholderAPI - * - * PlaceholderAPI - * Copyright (c) 2015 - 2021 PlaceholderAPI Team - * - * PlaceholderAPI free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * PlaceholderAPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package me.clip.placeholderapi.commands.impl.cloud; - -import java.util.List; -import java.util.Locale; - -import me.clip.placeholderapi.PlaceholderAPIPlugin; -import me.clip.placeholderapi.commands.PlaceholderCommand; -import me.clip.placeholderapi.util.Msg; -import org.bukkit.command.CommandSender; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Unmodifiable; - -public final class CommandECloudToggle extends PlaceholderCommand { - - public CommandECloudToggle() { - super("toggle", "enable", "disable"); - } - - @Override - public void evaluate(@NotNull final PlaceholderAPIPlugin plugin, - @NotNull final CommandSender sender, @NotNull final String alias, - @NotNull @Unmodifiable final List params) { - final boolean desiredState; - final boolean currentState = plugin.getPlaceholderAPIConfig().isCloudEnabled(); - - switch (alias.toLowerCase(Locale.ROOT)) { - case "enable": - desiredState = true; - break; - case "disable": - desiredState = false; - break; - default: - desiredState = !currentState; - break; - } - - if (desiredState == currentState) { - Msg.msg(sender, "&7The eCloud Manager is already " + (desiredState ? "enabled" : "disabled")); - return; - } - - plugin.getPlaceholderAPIConfig().setCloudEnabled(desiredState); - - if (desiredState) { - plugin.getCloudExpansionManager().load(); - } else { - plugin.getCloudExpansionManager().kill(); - } - - Msg.msg(sender, "&aThe eCloud Manager has been " + (desiredState ? "enabled" : "disabled")); - } - -} From 4c228ca4fb5b1f32296b873843d7b6207941bead Mon Sep 17 00:00:00 2001 From: Gabriel Dumitru Date: Tue, 9 Aug 2022 01:08:45 +0300 Subject: [PATCH 2/4] make the eCloud disable by default --- src/main/resources/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 6fa0861..925a890 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -9,7 +9,7 @@ # No placeholders are provided with this plugin by default. # Download placeholders: /papi ecloud check_updates: true -cloud_enabled: true +cloud_enabled: false cloud_sorting: "name" cloud_allow_unverified_expansions: false boolean: From d888d9754befd65f4496d0435245828525fe1f76 Mon Sep 17 00:00:00 2001 From: Gabriel Dumitru Date: Tue, 9 Aug 2022 01:20:04 +0300 Subject: [PATCH 3/4] remove from help --- .../clip/placeholderapi/commands/impl/cloud/CommandECloud.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java index a09e0db..5ebbd70 100644 --- a/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java +++ b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java @@ -79,8 +79,6 @@ public final class CommandECloud extends PlaceholderCommand { Msg.msg(sender, "&b&lPlaceholderAPI &8- &7eCloud Help Menu &8- ", " ", - "&b/papi &fenable/disable/toggle", - " &7&oEnable or disable the eCloud", "&b/papi &fecloud status", " &7&oView status of the eCloud", "&b/papi &fecloud list {page}", From 3afb634e580499460e0e889cc78b53d08bfb83b8 Mon Sep 17 00:00:00 2001 From: Gabriel Dumitru Date: Wed, 10 Aug 2022 16:01:41 +0300 Subject: [PATCH 4/4] revert 4c228ca4fb5b1f32296b873843d7b6207941bead --- src/main/resources/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 925a890..6fa0861 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -9,7 +9,7 @@ # No placeholders are provided with this plugin by default. # Download placeholders: /papi ecloud check_updates: true -cloud_enabled: false +cloud_enabled: true cloud_sorting: "name" cloud_allow_unverified_expansions: false boolean: