Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-11 14:33:36 +08:00
Code Issues Projects Releases Wiki Activity

Fix dropType de-serialization

Browse Source
This commit is contained in:
KingRainbow44
2023-06-04 15:55:06 -04:00
Unverified
parent 6d6e6a041d
commit 6080297be9
5 changed files with 87 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/utils/JsonAdapters.java
+26 -14
View File
@@ -1,24 +1,18 @@
package emu.grasscutter.utils;
import com.google.gson.Gson;
import com.google.gson.TypeAdapter;
import com.google.gson.TypeAdapterFactory;
import com.google.gson.*;
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
import com.google.gson.stream.*;
import emu.grasscutter.data.common.DynamicFloat;
import emu.grasscutter.game.world.GridPosition;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.game.world.*;
import emu.grasscutter.utils.objects.DropType;
import it.unimi.dsi.fastutil.floats.FloatArrayList;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import it.unimi.dsi.fastutil.ints.*;
import lombok.val;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Objects;
import lombok.val;
import java.util.*;
public interface JsonAdapters {
class DynamicFloatAdapter extends TypeAdapter<DynamicFloat> {
@@ -59,6 +53,24 @@ public interface JsonAdapters {
public void write(JsonWriter writer, DynamicFloat f) {}
}
class DropTypeAdapter extends TypeAdapter<DropType> {
@Override
public void write(JsonWriter out, DropType value) throws IOException {
if (value.isString())
out.value(value.getAsString());
else out.value(value.getAsInt());
}
@Override
public DropType read(JsonReader in) throws IOException {
return switch (in.peek()) {
default -> new DropType(0);
case STRING -> new DropType(in.nextString());
case NUMBER -> new DropType(in.nextInt());
};
}
}
class IntListAdapter extends TypeAdapter<IntList> {
@Override
public IntList read(JsonReader reader) throws IOException {