SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small code cleanup

Browse Source
This commit is contained in:
libraryaddict 2020-08-12 15:55:25 +12:00
parent deb3fd243b
commit f530af0ae8
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoBlockData.java
View File

@ -21,8 +21,6 @@ import java.util.concurrent.TimeUnit;
*/ */
public class ParamInfoBlockData extends ParamInfo { public class ParamInfoBlockData extends ParamInfo {
private Material[] materials; private Material[] materials;
private Cache<Material, Map.Entry<String, String[]>> blockDatas = CacheBuilder.newBuilder()
.expireAfterAccess(30, TimeUnit.MINUTES).maximumSize(20).build();
public ParamInfoBlockData(Class paramClass, String name, String description, Material[] possibleValues) { public ParamInfoBlockData(Class paramClass, String name, String description, Material[] possibleValues) {
super(paramClass, name, "BlockData[State=Something]", description); super(paramClass, name, "BlockData[State=Something]", description);
@ -77,10 +75,7 @@ public class ParamInfoBlockData extends ParamInfo {
return getParamClass().isAssignableFrom(paramClass); return getParamClass().isAssignableFrom(paramClass);
} }
private Material getMaterial(String name) { @Override
return Material.matchMaterial(name, false);
}
public Set<String> getEnums(String tabComplete) { public Set<String> getEnums(String tabComplete) {
String s = tabComplete.toLowerCase(); String s = tabComplete.toLowerCase();
HashSet<String> returns = new HashSet<>(); HashSet<String> returns = new HashSet<>();
@ -107,18 +102,14 @@ public class ParamInfoBlockData extends ParamInfo {
return returns; return returns;
} }
Material mat = getMaterial(s);
if (mat == null) {
return returns;
}
// TODO Maybe auto complete blockstate states // TODO Maybe auto complete blockstate states
// Then again, it means I need to get the block states on a new IBlockData // 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 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. // 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 // No one cares about auto completion of this either
// Material.matchMaterial(name, false);
return returns; return returns;
} }
} }