8000 feat: fetch all expansions by iGabyTM · Pull Request #952 · PlaceholderAPI/PlaceholderAPI · GitHub
[go: up one dir, main page]
Skip to content

feat: fetch all expansions #952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iGabyTM merged 3 commits into from
Jun 21, 2023
Merged

feat: fetch all expansions #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87cb3ea
feat: fetch all expansions
iGabyTM Mar 24, 2023
8084841
feat: remove message regarding config option
iGabyTM Apr 5, 2023
185782b
feat: update ecloud url
iGabyTM Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudDownload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
return;
}

if (!expansion.isVerified() && !plugin.getPlaceholderAPIConfig().cloudAllowUnverifiedExpansions()) {
Msg.msg(sender, "&cThe expansion '&f" + params.get(0) + "&c' is not verified and can only be downloaded manually from &fhttps://placeholderapi.com/ecloud");
return;
}

final CloudExpansion.Version version;
if (params.size() < 2) {
version = expansion.getVersion(expansion.getLatestVersion());
Expand Down Expand Up @@ -86,9 +91,7 @@ public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
.getVersion() + "] &ato file: &f" + file.getName(),
"&aMake sure to type &f/papi reload &ato enable your new expansion!");

plugin.getCloudExpansionManager().clean();
plugin.getCloudExpansionManager()
.fetch(plugin.getPlaceholderAPIConfig().cloudAllowUnverifiedExpansions());
plugin.getCloudExpansionManager().load();
});
}

Expand Down
4 changes: 1 addition & 3 deletions src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudRefresh.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ public CommandECloudRefresh() {
public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
@NotNull final CommandSender sender, @NotNull final String alias,
@NotNull @Unmodifiable final List<String> params) {
plugin.getCloudExpansionManager().clean();
plugin.getCloudExpansionManager()
.fetch(plugin.getPlaceholderAPIConfig().cloudAllowUnverifiedExpansions());
plugin.getCloudExpansionManager().load();

Msg.msg(sender,
"&aThe eCloud manager has been refreshed!");
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private static String toIndexName(@NotNull final CloudExpansion expansion) {

public void load() {
clean();
fetch(plugin.getPlaceholderAPIConfig().cloudAllowUnverifiedExpansions());
fetch();
}

public void kill() {
Expand Down Expand Up @@ -170,7 +170,7 @@ public void clean() {
await.clear();
}

public void fetch(final boolean allowUnverified) {
public void fetch() {
plugin.getLogger().info("Fetching available expansion information...");

ASYNC_EXECUTOR.submit(
Expand All @@ -190,9 +190,6 @@ public void fetch(final boolean allowUnverified) {
|| expansion.getVersion(expansion.getLatestVersion()) == null) {
toRemove.add(entry.getKey());
}
if (!allowUnverified && !expansion.isVerified()) {
toRemove.add(entry.getKey());
}
}

for (String name : toRemove) {
Expand All @@ -203,7 +200,7 @@ public void fetch(final boolean allowUnverified) {
plugin.getLogger().log(Level.WARNING, "Failed to download expansion information", e);
}

// loop thru what's left on the main thread
// loop through what's left on the main thread
plugin
.getServer()
.getScheduler()
Expand Down
0