Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-11-25 11:35:28 +01:00
Code Issues Projects Releases Wiki Activity

Improve EnumParser to better take in the closeness of names into account

Browse Source 
This is necessary to support new 1.20.5 items as well as better support some older ones.

Also use the properly formatted name when trying to valueOf get the Enum directly.
This commit is contained in:
Phoenix616 2024-04-30 00:58:02 +01:00
parent 60b10a83b6
commit b6b7a6bf43
No known key found for this signature in database
GPG Key ID: 40E2321E71738EB0
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java
View File

@ -56,21 +56,9 @@ public class MaterialUtil {
private static final Map<String, String> ABBREVIATIONS = StringUtil.map(
"Egg", "Eg",
"Spawn", "Spaw",
"Ender", "End",
"Tropical", "Tropic",
"Terracotta", "Terracot",
"Stained", "Stain",
"Sandstone", "Sandston",
"Sandston", "Sandsto",
"Sandsto", "Sandst",
"Block", "Bloc",
"Brewing", "Brew",
"Dolphin", "Dolph",
"Chicken", "Chick",
"Pottery", "Pot",
"Heartbreak", "Heartbr",
"Sherd", "Sher",
"Template", "Templ"
"Sherd", "Sher"
);
private static final Map<String, String> UNIDIRECTIONAL_ABBREVIATIONS = StringUtil.map(
@ -463,18 +451,18 @@ public class MaterialUtil {
private static class EnumParser<E extends Enum<E>> {
private E parse(String name, E[] values) {
String formatted = name.replaceAll("(?<!^)(?>\\s?)([A-Z1-9])", "_$1").toUpperCase(Locale.ROOT).replace(' ', '_');
try {
return E.valueOf(values[0].getDeclaringClass(), name.toUpperCase(Locale.ROOT));
return E.valueOf(values[0].getDeclaringClass(), formatted);
} catch (IllegalArgumentException exception) {
E currentEnum = null;
String[] typeParts = name.replaceAll("(?<!^)(?>\\s?)([A-Z1-9])", "_$1").toUpperCase(Locale.ROOT).split("[ _]");
List<E> possibleEnums = new ArrayList<>();
String[] typeParts = formatted.split("_");
int length = Short.MAX_VALUE;
name = name.toUpperCase(Locale.ROOT);
for (E e : values) {
String enumName = e.name();
if (enumName.length() < length && enumName.startsWith(name)) {
length = (short) enumName.length();
currentEnum = e;
if (enumName.length() < length && enumName.startsWith(formatted)) {
length = enumName.length();
possibleEnums.add(e);
} else if (typeParts.length > 1) {
String[] nameParts = enumName.split("_");
if (typeParts.length == nameParts.length) {
@ -486,13 +474,28 @@ public class MaterialUtil {
}
}
if (matched) {
currentEnum = e;
break;
possibleEnums.add(e);
}
}
}
}
return currentEnum;
if (possibleEnums.size() == 1) {
return possibleEnums.get(0);
} else if (possibleEnums.size() > 1) {
int formattedLength = formatted.length();
int closestDeviation = Short.MAX_VALUE;
E closestEnum = null;
for (E possibleEnum : possibleEnums) {
int deviation = possibleEnum.name().length() - formattedLength;
if (deviation < closestDeviation) {
closestDeviation = deviation;
closestEnum = possibleEnum;
}
}
return closestEnum;
}
return null;
}
}
}