From f530af0ae8a02c193cb7e250ebc5e52be0f37761 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 12 Aug 2020 15:55:25 +1200 Subject: [PATCH] Small code cleanup --- .../params/types/custom/ParamInfoBlockData.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoBlockData.java b/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoBlockData.java index 386eca66..fc8bba52 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoBlockData.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoBlockData.java @@ -21,8 +21,6 @@ import java.util.concurrent.TimeUnit; */ public class ParamInfoBlockData extends ParamInfo { private Material[] materials; - private Cache> blockDatas = CacheBuilder.newBuilder() - .expireAfterAccess(30, TimeUnit.MINUTES).maximumSize(20).build(); public ParamInfoBlockData(Class paramClass, String name, String description, Material[] possibleValues) { super(paramClass, name, "BlockData[State=Something]", description); @@ -77,10 +75,7 @@ public class ParamInfoBlockData extends ParamInfo { return getParamClass().isAssignableFrom(paramClass); } - private Material getMaterial(String name) { - return Material.matchMaterial(name, false); - } - + @Override public Set getEnums(String tabComplete) { String s = tabComplete.toLowerCase(); HashSet returns = new HashSet<>(); @@ -107,18 +102,14 @@ public class ParamInfoBlockData extends ParamInfo { return returns; } - Material mat = getMaterial(s); - - if (mat == null) { - return returns; - } - // TODO Maybe auto complete blockstate states // Then again, it means I need to get the block states on a new IBlockData // Then call toBukkit with the block states then turn them into strings // Then handle the edge cases where they are not enums.. Idk, I think I'm going to ignore this. // No one cares about auto completion of this either + // Material.matchMaterial(name, false); + return returns; } }