mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

[CI skip] Formatting

Browse Source
This commit is contained in:
TheBusyBiscuit 2021-04-26 18:06:25 +02:00
parent 71f3644078
commit 757d7613ac
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/Language.java
View File

@ -135,7 +135,7 @@ public final class Language {
} }
@Nonnull @Nonnull
protected FileConfiguration[] getFiles() { FileConfiguration[] getFiles() {
return Arrays.stream(LanguageFile.valuesCached).map(this::getFile).toArray(FileConfiguration[]::new); return Arrays.stream(LanguageFile.valuesCached).map(this::getFile).toArray(FileConfiguration[]::new);
} }

15
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java
View File

@ -64,20 +64,23 @@ abstract class AbstractEnchantmentMachine extends AContainer {
menu.replaceExistingItem(22, progressBar); menu.replaceExistingItem(22, progressBar);
} }
protected boolean hasIgnoredLore(@Nonnull ItemStack itemStack) { protected boolean hasIgnoredLore(@Nonnull ItemStack item) {
if (useIgnoredLores.getValue() && itemStack.hasItemMeta()) { if (useIgnoredLores.getValue() && item.hasItemMeta()) {
ItemMeta itemMeta = itemStack.getItemMeta(); ItemMeta itemMeta = item.getItemMeta();
if (!itemMeta.hasLore()) {
return false; if (itemMeta.hasLore()) {
}
List<String> itemLore = itemMeta.getLore(); List<String> itemLore = itemMeta.getLore();
List<String> ignoredLore = ignoredLores.getValue(); List<String> ignoredLore = ignoredLores.getValue();
// Check if any of the lines are found on the item
for (String lore : ignoredLore) { for (String lore : ignoredLore) {
if (itemLore.contains(ChatColors.color(lore))) { if (itemLore.contains(ChatColors.color(lore))) {
return true; return true;
} }
} }
} }
}
return false; return false;
} }
} }