From 3b1b2e55cf04b6458fc577e13f307a3befbe2fbd Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 28 Nov 2020 10:45:59 +0000 Subject: [PATCH] Minor clean-up --- .../ecoenchants/enchantments/EcoEnchant.java | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java index 492236ce..b457b59b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java @@ -13,7 +13,6 @@ import com.willfp.ecoenchants.util.StringUtils; import com.willfp.ecoenchants.util.interfaces.ObjectCallable; import com.willfp.ecoenchants.util.interfaces.Registerable; import com.willfp.ecoenchants.util.optional.Prerequisite; -import jdk.nashorn.internal.codegen.ObjectClassGenerator; import org.apache.commons.lang.WordUtils; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -26,14 +25,9 @@ import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.regex.Pattern; +import java.util.stream.Collectors; @SuppressWarnings({"unchecked", "deprecation"}) public abstract class EcoEnchant extends Enchantment implements Listener, Registerable, Watcher { @@ -184,15 +178,7 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Regist PlaceholderManager.registerPlaceholder( new PlaceholderEntry(this.getPermissionName() + "_" + key, (player) -> { Collection c = (Collection) object; - StringBuilder builder = new StringBuilder(); - c.forEach(o -> { - builder.append(o.toString()).append(", "); - }); - String output = builder.toString(); - if(output.length() < 3) - return ""; - output = output.substring(output.length() - 3, output.length() - 1); - return output; + return c.stream().map(String::valueOf).collect(Collectors.joining(", ")); }) ); }