Skip to content

fix: fix bungeecord, fix fetching commands when config is invalid #2

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
PatryQHyper merged 1 commit into from
Mar 18, 2025
Merged

fix: fix bungeecord, fix fetching commands when config is invalid #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ allprojects {
apply(plugin = "com.gradleup.shadow")

group = "dev.shiza"
version = "1.0.0"
version = "1.0.1"

repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion itemshopsys-bungee/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
}

bungee {
main = "dev.shiza.itemshopsys.bukkit.ItemShopBungeePlugin"
main = "dev.shiza.itemshopsys.bungee.ItemShopBungeePlugin"
name = "itemshopsys"
version = project.version.toString()
author = "shiza"
Expand Down
15 changes: 13 additions & 2 deletions itemshopsys-common/src/dev/shiza/itemshopsys/client/http/HttpItemShopClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,28 @@ public ExecutableCommands retrieveCommands(final String shopId, final String ser
.routeParam("shopId", shopId)
.routeParam("serverId", serverId)
.asObject(ExecutableCommands.class);

if (response.getStatus() == 200) {
return response.getBody();
}

switch (response.getStatus()) {
case 429:
logger.debug("Rate limit exceeded, commands could not be retrieved.");
return EMPTY_COMMANDS;
case 503:
logger.debug("Service unavailable, commands could not be retrieved.");
return EMPTY_COMMANDS;
case 400:
logger.debug("Server token is invalid or is empty, commands could not be retrieved.");
return EMPTY_COMMANDS;
case 404:
logger.debug("Invalid shop or server parameters, commands could not be retrieved. Make sure that you have passed them correctly.");
return EMPTY_COMMANDS;
default:
break;
logger.debug("Received unknown HTTP status from ItemShopSys API during commands fetching. Received status code: " + response.getStatus());
return EMPTY_COMMANDS;
}
return response.getBody();
}

@Override
Expand Down