Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 27 additions & 0 deletions API/src/main/java/fr/maxlego08/menu/api/utils/ClickAction.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package fr.maxlego08.menu.api.utils;

import org.bukkit.event.block.Action;
import org.jetbrains.annotations.NotNull;

import java.util.List;

public enum ClickAction {
LEFT_CLICK(Action.LEFT_CLICK_BLOCK, Action.LEFT_CLICK_AIR),
RIGHT_CLICK(Action.RIGHT_CLICK_BLOCK, Action.RIGHT_CLICK_AIR),
LEFT_CLICK_BLOCK(Action.LEFT_CLICK_BLOCK),
RIGHT_CLICK_BLOCK(Action.RIGHT_CLICK_BLOCK),
LEFT_CLICK_AIR(Action.LEFT_CLICK_AIR),
RIGHT_CLICK_AIR(Action.RIGHT_CLICK_AIR),
PHYSICAL(Action.PHYSICAL)
;
private final List<Action> actions;

ClickAction(Action ... actions) {
this.actions = List.of(actions);
}

@NotNull
public List<Action> asActions() {
return this.actions;
}
}
14 changes: 7 additions & 7 deletions src/main/java/fr/maxlego08/menu/loader/InventoryLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import fr.maxlego08.menu.api.pattern.PatternManager;
import fr.maxlego08.menu.api.requirement.Requirement;
import fr.maxlego08.menu.api.utils.ClearInvType;
import fr.maxlego08.menu.api.utils.ClickAction;
import fr.maxlego08.menu.api.utils.Loader;
import fr.maxlego08.menu.api.utils.OpenWithItem;
import fr.maxlego08.menu.common.utils.ZUtils;
Expand All @@ -33,10 +34,7 @@

import java.io.File;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.*;

public class InventoryLoader extends ZUtils implements Loader<Inventory> {

Expand Down Expand Up @@ -248,18 +246,20 @@ private void loadOpenWithItem(YamlConfiguration configuration, ZInventory invent
MenuItemStack loadedItem = menuItemStackLoader.load(configuration, loadString + ".item.", file);

List<String> actionStrings = configuration.getStringList(loadString + ".actions");
List<Action> actions = new ArrayList<>(actionStrings.size());
Set<Action> actions = new HashSet<>();
for (String string : actionStrings) {
try {
actions.add(Action.valueOf(string.toUpperCase()));
actions.addAll(ClickAction.valueOf(string.toUpperCase()).asActions());
} catch (Exception ignored) {
if (Configuration.enableDebug)
Logger.info("Invalid click action " + string + " in " + file.getAbsolutePath() + " for openWithItem, skipping it.", Logger.LogType.WARNING);
}
}

String type = configuration.getString(loadString + ".type", "full");
ItemStackSimilar itemStackSimilar = this.plugin.getInventoryManager().getItemStackVerification(type).orElseGet(FullSimilar::new);

inventory.setOpenWithItem(new OpenWithItem(loadedItem, actions, itemStackSimilar));
inventory.setOpenWithItem(new OpenWithItem(loadedItem, new ArrayList<>(actions), itemStackSimilar));
}
} catch (Exception ignored) {
}
Expand Down
Loading