Skip to content

Commit

Permalink
[api|plugin] replace it from lambdas with better named variables
Browse files Browse the repository at this point in the history
  • Loading branch information
@iGabyTM
iGabyTM committed Feb 1, 2023
1 parent 148f9d3 commit 6c0584c
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 47 deletions.
2 changes: 1 addition & 1 deletion api/src/main/java/me/gabytm/minecraft/arcaneshop/api/shop/Shop.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public interface Shop {
default @Nullable ShopItem getItem(@NotNull final String id) {
return getItems()
.stream()
.filter(it -> it.getId().equals(id))
.filter(shopItem -> shopItem.getId().equals(id))
.findFirst()
.orElse(null);
}
Expand Down
16 changes: 11 additions & 5 deletions plugin/src/main/java/me/gabytm/minecraft/arcaneshop/item/ItemCreator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,18 @@ public ItemCreator(@NotNull final CustomItemManager customItemManager) {
}

private @NotNull DisplayItem setMeta(@NotNull final ConfigurationNode node, @NotNull final BaseItemBuilder<?> builder) throws SerializationException {
final ItemFlag[] flags = node.node("flags").getList(String.class, Collections.emptyList()).stream()
.map(it -> Enums.getOrNull(ItemFlag.class, it))
final ItemFlag[] flags = node.node("flags")
.getList(String.class, Collections.emptyList())
.stream()
.map(string -> Enums.getOrNull(ItemFlag.class, string))
.filter(Objects::nonNull)
.toArray(ItemFlag[]::new);

final Map<@NotNull Enchantment, @NotNull Integer> enchantments =
node.node("enchantments").getList(String.class, Collections.emptyList()).stream()
.map(it -> it.split(Separator.SEMICOLON)) // Enchantments are defined as Enchantment;Level
node.node("enchantments")
.getList(String.class, Collections.emptyList())
.stream()
.map(string -> string.split(Separator.SEMICOLON)) // Enchantments are defined as Enchantment;Level
.map(this::parseEnchantmentAndLevel)
.filter(Objects::nonNull)
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
Expand All @@ -111,7 +115,9 @@ public ItemCreator(@NotNull final CustomItemManager customItemManager) {
builder.name(removeItalic(nameComponent));
}

final List<Component> loreComponent = node.node("lore").getList(Component.class, Collections.emptyList()).stream()
final List<Component> loreComponent = node.node("lore")
.getList(Component.class, Collections.emptyList())
.stream()
.map(ItemCreator::removeItalic)
.collect(Collectors.toList());

Expand Down
74 changes: 38 additions & 36 deletions plugin/src/main/java/me/gabytm/minecraft/arcaneshop/menu/menus/ShopMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ public ShopMenu(@NotNull final MenuManager menuManager, @NotNull final ArcaneSho
}

public void open(@NotNull final Player player, @NotNull final Shop shop, final int page) {
final List<ShopItem> items = shop.getItems().stream()
.filter(it -> it.getPage() == page)
final List<ShopItem> shopItems = shop.getItems()
.stream()
.filter(shopItem -> shopItem.getPage() == page)
.collect(Collectors.toList());

if (page != 1 && items.isEmpty()) {
if (page != 1 && shopItems.isEmpty()) {
return;
}

Expand All @@ -47,77 +48,78 @@ public void open(@NotNull final Player player, @NotNull final Shop shop, final i
.disableAllInteractions()
.create();

shop.getDecorations().stream()
.filter(it -> it.getPage() == ShopDecorationItem.ALL_PAGES || it.getPage() == page)
.forEach(item -> gui.setItem(item.getSlots(), new GuiItem(item.getDisplayItem().getItemStack())));
shop.getDecorations()
.stream()
.filter(decorationItem -> decorationItem.getPage() == ShopDecorationItem.ALL_PAGES || decorationItem.getPage() == page)
.forEach(decorationItem -> gui.setItem(decorationItem.getSlots(), new GuiItem(decorationItem.getDisplayItem().getItemStack())));

final List<PriceModifier> priceModifiers = api.getPriceModifierManager().getPlayerModifiers(player, shop);

for (final ShopItem item : items) {
final GuiItem guiItem = ItemBuilder.from(item.getDisplayItem().getItemStack().clone())
.amount(item.getAmount())
for (final ShopItem shopItem : shopItems) {
final GuiItem guiItem = ItemBuilder.from(shopItem.getDisplayItem().getItemStack().clone())
.amount(shopItem.getAmount())
.lore(lore -> {
if (item.canBeSold()) {
final Optional<PriceModifier> modifier = priceModifiers.stream()
.filter(it -> it.getItems().isEmpty() || it.getItems().contains(item.getId()))
.filter(it -> it.getAction() == PriceModifier.Action.BOTH || it.getAction() == PriceModifier.Action.SELL)
.filter(it -> player.hasPermission("arcaneshop.modifier." + it.getName()))
if (shopItem.canBeSold()) {
final Optional<PriceModifier> optionalPriceModifier = priceModifiers.stream()
.filter(modifier -> modifier.getItems().isEmpty() || modifier.getItems().contains(shopItem.getId()))
.filter(modifier -> modifier.getAction() == PriceModifier.Action.BOTH || modifier.getAction() == PriceModifier.Action.SELL)
.filter(modifier -> player.hasPermission("arcaneshop.modifier." + modifier.getName()))
.max(Comparator.comparingDouble(PriceModifier::getValue));

if (modifier.isPresent()) {
lore.add(ItemCreator.removeItalic(MiniMessage.miniMessage().deserialize(String.format("<green>Sell for: <gray><st>$%.2f</st></gray> <green>$%.2f (+%.1f%%)", item.getSellPrice(), item.getSellPrice() + (modifier.get().getValue() / 100 * item.getSellPrice()), modifier.get().getValue()))));
if (optionalPriceModifier.isPresent()) {
lore.add(ItemCreator.removeItalic(MiniMessage.miniMessage().deserialize(String.format("<green>Sell for: <gray><st>$%.2f</st></gray> <green>$%.2f (+%.1f%%)", shopItem.getSellPrice(), shopItem.getSellPrice() + (optionalPriceModifier.get().getValue() / 100 * shopItem.getSellPrice()), optionalPriceModifier.get().getValue()))));
} else {
lore.add(ItemCreator.removeItalic(Component.text("Sell for: $" + item.getSellPrice(), NamedTextColor.GREEN)));
lore.add(ItemCreator.removeItalic(Component.text("Sell for: $" + shopItem.getSellPrice(), NamedTextColor.GREEN)));
}
}

if (item.canBeBought()) {
final Optional<PriceModifier> modifier = priceModifiers.stream()
.filter(it -> it.getItems().isEmpty() || it.getItems().contains(item.getId()))
.filter(it -> it.getAction() == PriceModifier.Action.BOTH || it.getAction() == PriceModifier.Action.BUY)
.filter(it -> player.hasPermission("arcaneshop.modifier." + it.getName()))
if (shopItem.canBeBought()) {
final Optional<PriceModifier> optionalPriceModifier = priceModifiers.stream()
.filter(modifier -> modifier.getItems().isEmpty() || modifier.getItems().contains(shopItem.getId()))
.filter(modifier -> modifier.getAction() == PriceModifier.Action.BOTH || modifier.getAction() == PriceModifier.Action.BUY)
.filter(modifier -> player.hasPermission("arcaneshop.modifier." + modifier.getName()))
.max(Comparator.comparingDouble(PriceModifier::getValue));

if (modifier.isPresent()) {
lore.add(ItemCreator.removeItalic(MiniMessage.miniMessage().deserialize(String.format("<red>Buy for: <gray><st>$%.2f</st></gray> <red>$%.2f (-%.1f%%)", item.getSellPrice(), item.getSellPrice() - (modifier.get().getValue() / 100 * item.getSellPrice()), modifier.get().getValue()))));
if (optionalPriceModifier.isPresent()) {
lore.add(ItemCreator.removeItalic(MiniMessage.miniMessage().deserialize(String.format("<red>Buy for: <gray><st>$%.2f</st></gray> <red>$%.2f (-%.1f%%)", shopItem.getSellPrice(), shopItem.getSellPrice() - (optionalPriceModifier.get().getValue() / 100 * shopItem.getSellPrice()), optionalPriceModifier.get().getValue()))));
} else {
lore.add(ItemCreator.removeItalic(Component.text("Buy for: $" + item.getBuyPrice(), NamedTextColor.RED)));
lore.add(ItemCreator.removeItalic(Component.text("Buy for: $" + shopItem.getBuyPrice(), NamedTextColor.RED)));
}
}
})
.asGuiItem(event -> {
final String displayName = item.getDisplayItem().getItemStack().getItemMeta().getDisplayName();
final String displayName = shopItem.getDisplayItem().getItemStack().getItemMeta().getDisplayName();

if (shop.getShopActions().get(ShopAction.SELL) == event.getClick()) {
// The item can not be sold
if (!item.canBeSold()) {
if (!shopItem.canBeSold()) {
player.sendMessage(ChatColor.RED + "Item " + displayName + " can not be sold");
return;
}

// The item is custom, open the menu and let the custom item handler to check if they have enough items
if (item.getItem() != null && item.getItem().isCustom()) {
menuManager.openAmountSelectorForSell(item, player, shop, page);
if (shopItem.getItem() != null && shopItem.getItem().isCustom()) {
menuManager.openAmountSelectorForSell(shopItem, player, shop, page);
return;
}

// Check if the player has any item of the same type in their inventory
final boolean hasItems = Arrays.stream(player.getInventory().getContents())
.filter(Objects::nonNull)
.anyMatch(it -> item.getItem() != null && it.getType() == item.getItem().getItemStack().getType());
.anyMatch(item -> shopItem.getItem() != null && item.getType() == shopItem.getItem().getItemStack().getType());

if (!hasItems) {
player.sendMessage(ChatColor.RED + "You don't have any " + displayName + " in your inventory");
return;
}

menuManager.openAmountSelectorForSell(item, player, shop, page);
menuManager.openAmountSelectorForSell(shopItem, player, shop, page);
return;
}

if (shop.getShopActions().get(ShopAction.BUY) == event.getClick()) {
// The item can not be bought
if (!item.canBeBought()) {
if (!shopItem.canBeBought()) {
player.sendMessage(ChatColor.RED + "Item " + displayName + " can not be bought.");
return;
}
Expand All @@ -129,15 +131,15 @@ public void open(@NotNull final Player player, @NotNull final Shop shop, final i
}

// The player can afford to buy at least one item
if (shop.getEconomyProvider().has(player, item.getBuyPrice())) {
menuManager.openAmountSelectorForBuy(item, player, shop, page);
if (shop.getEconomyProvider().has(player, shopItem.getBuyPrice())) {
menuManager.openAmountSelectorForBuy(shopItem, player, shop, page);
} else {
player.sendMessage(ChatColor.RED + "You don't have " + item.getBuyPrice() + " to buy " + displayName);
player.sendMessage(ChatColor.RED + "You don't have " + shopItem.getBuyPrice() + " to buy " + displayName);
}
}
});

gui.setItem(item.getSlot(), guiItem);
gui.setItem(shopItem.getSlot(), guiItem);
}

if (page != 1) {
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/me/gabytm/minecraft/arcaneshop/menu/menus/amountselector/AmountSelectorMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public AmountSelectorMenu(

config.getLore()
.stream()
.map(it -> MiniMessage.miniMessage().deserialize(it, amountPlaceholder, pricePlaceholder))
.map(line -> MiniMessage.miniMessage().deserialize(line, amountPlaceholder, pricePlaceholder))
.map(ItemCreator::removeItalic)
.forEach(lore::add);
})
Expand Down
6 changes: 3 additions & 3 deletions plugin/src/main/java/me/gabytm/minecraft/arcaneshop/shop/ShopManagerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ public ShopManagerImpl(@NotNull final File shopsFolderPath, @NotNull final Custo
// TODO: 24/10/2022 replace papi placeholders
if (item.executeCommandsOnceForAllItems()) {
item.getCommands()
.forEach(it ->Bukkit.dispatchCommand(Bukkit.getConsoleSender(), it.replace("<amount>", String.valueOf(amount))));
.forEach(command -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command.replace("<amount>", String.valueOf(amount))));
} else {
for (int i = 0; i < amount; i++) {
item.getCommands()
.forEach(it ->Bukkit.dispatchCommand(Bukkit.getConsoleSender(), it));
.forEach(command -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command));
}
}

Expand Down Expand Up @@ -130,7 +130,7 @@ public void loadShops(@NotNull final ConfigManager configManager) {
try {
shops.clear();
shopsFolder.mkdirs();
final File[] files = shopsFolder.listFiles(it -> it.getName().endsWith(".yml"));
final File[] files = shopsFolder.listFiles(file -> file.getName().endsWith(".yml"));

if (files == null) {
Logging.warning("No shops found on {0}", shopsFolder.getAbsolutePath());
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/me/gabytm/minecraft/arcaneshop/shop/price/PriceModifierManagerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class PriceModifierManagerImpl implements PriceModifierManager {
public @NotNull List<@NotNull PriceModifier> getPlayerModifiers(@NotNull Player player, @NotNull Shop shop) {
return loadedModifiers.values()
.stream()
.filter(it -> it.getShops().isEmpty() || it.getShops().contains(shop.getName()))
.filter(modifier -> modifier.getShops().isEmpty() || modifier.getShops().contains(shop.getName()))
.collect(Collectors.toList());
}

Expand Down

0 comments on commit 6c0584c

Please sign in to comment.