Skip to content

Move inventories config to use new config api #562

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
benwoo1110 merged 1 commit into from
Feb 3, 2025
Merged

Move inventories config to use new config api #562

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
7 changes: 6 additions & 1 deletion src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventories.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public void onLoad() {
public final void onEnable() {
super.onEnable();
initializeDependencyInjection();
inventoriesConfig.get().load().onFailure(e -> Logging.severe(e.getMessage()));

Logging.setDebugLevel(mvCoreConfig.get().getGlobalDebug());
this.onMVPluginEnable();
Expand Down Expand Up @@ -206,6 +207,10 @@ public PluginServiceLocator getServiceLocator() {
@Override
public void reloadConfig() {
try {
inventoriesConfig.get().load().onFailure(e -> {
Logging.severe("Failed to load config file!");
Logging.severe(e.getMessage());
});
worldGroupManager.get().load().onFailure(e -> {
Logging.severe("Failed to load world groups!");
Logging.severe(e.getMessage());
Expand All @@ -216,7 +221,7 @@ public void reloadConfig() {
profileDataSource.get().clearAllCache();
}

Logging.fine("Loaded config file!");
Logging.fine("Reloaded all config and groups!");
} catch (Exception e) { // Catch errors loading the config file and exit out if found.
Logging.severe(this.getMessager().getMessage(Message.ERROR_CONFIG_LOAD));
Logging.severe(e.getMessage());
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/org/mvplugins/multiverse/inventories/commands/ToggleCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,21 @@ void onToggleCommand(
return;
}
boolean foundOpt = false;
Shares optionalShares = inventoriesConfig.getOptionalShares();
for (Sharable sharable : shares) {
if (sharable.isOptional()) {
foundOpt = true;
if (inventoriesConfig.getOptionalShares().contains(sharable)) {
inventoriesConfig.getOptionalShares().remove(sharable);
if (optionalShares.contains(sharable)) {
optionalShares.remove(sharable);
this.plugin.getMessager().normal(Message.NOW_NOT_USING_OPTIONAL, sender, sharable.getNames()[0]);
} else {
inventoriesConfig.getOptionalShares().add(sharable);
optionalShares.add(sharable);
this.plugin.getMessager().normal(Message.NOW_USING_OPTIONAL, sender, sharable.getNames()[0]);
}
}
}
if (foundOpt) {
inventoriesConfig.setOptionalShares(optionalShares);
inventoriesConfig.save();
} else {
this.plugin.getMessager().normal(Message.NO_OPTIONAL_SHARES, sender, shareName);
Expand Down
Loading