Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-09 17:32:53 +08:00
Code Issues Projects Releases Wiki Activity

Fix oversight on EnumTypeAdapterFactory

Browse Source
This commit is contained in:
AnimeGitB 2022-11-24 01:36:58 +10:30
parent 0b5329514b
commit 35962542af
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/emu/grasscutter/utils/JsonAdapters.java
View File

@ -71,37 +71,32 @@ public class JsonAdapters {
static class EnumTypeAdapterFactory implements TypeAdapterFactory { static class EnumTypeAdapterFactory implements TypeAdapterFactory {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) { public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
Class<T> rawType = (Class<T>) type.getRawType(); Class<T> enumClass = (Class<T>) type.getRawType();
if (!rawType.isEnum()) return null; if (!enumClass.isEnum()) return null;
Field id = null; // Make mappings of (string) names to enum constants
// System.out.println("Looking for enum value field");
for (Field f : rawType.getDeclaredFields()) {
id = switch (f.getName()) {
case "value", "id" -> f;
default -> null;
};
if (id != null) break;
}
if (id == null) {
// System.out.println("Not found");
return null;
}
// System.out.println("Enum value field found - " + id.getName());
val map = new HashMap<String, T>(); val map = new HashMap<String, T>();
boolean acc = id.isAccessible(); val enumConstants = enumClass.getEnumConstants();
id.setAccessible(true); for (val constant : enumConstants)
try { map.put(constant.toString(), constant);
for (T constant : rawType.getEnumConstants()) {
map.put(constant.toString(), constant); // If the enum also has a numeric value, map those to the constants too
map.put(String.valueOf(id.getInt(constant)), constant); // System.out.println("Looking for enum value field");
for (Field f : enumClass.getDeclaredFields()) {
if (switch (f.getName()) {case "value", "id" -> true; default -> false;}) {
// System.out.println("Enum value field found - " + f.getName());
boolean acc = f.isAccessible();
f.setAccessible(true);
try {
for (val constant : enumConstants)
map.put(String.valueOf(f.getInt(constant)), constant);
} catch (IllegalAccessException e) {
// System.out.println("Failed to access enum id field.");
}
f.setAccessible(acc);
break;
} }
} catch (IllegalAccessException e) {
// System.out.println("Failed to access enum id field.");
return null;
} }
id.setAccessible(acc);
return new TypeAdapter<T>() { return new TypeAdapter<T>() {
public T read(JsonReader reader) throws IOException { public T read(JsonReader reader) throws IOException {