Clean up .utils

This commit is contained in:
KingRainbow44
2023-05-20 02:25:49 -04:00
Unverified
parent 51c5cb5c62
commit 1a6fa43367
147 changed files with 623 additions and 291 deletions
@@ -8,44 +8,50 @@ import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
import emu.grasscutter.data.common.DynamicFloat;
import emu.grasscutter.game.world.GridPosition;
import emu.grasscutter.game.world.Position;
import it.unimi.dsi.fastutil.floats.FloatArrayList;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
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;
public class JsonAdapters {
static class DynamicFloatAdapter extends TypeAdapter<DynamicFloat> {
public interface JsonAdapters {
class DynamicFloatAdapter extends TypeAdapter<DynamicFloat> {
@Override
public DynamicFloat read(JsonReader reader) throws IOException {
switch (reader.peek()) {
case STRING:
case STRING -> {
return new DynamicFloat(reader.nextString());
case NUMBER:
}
case NUMBER -> {
return new DynamicFloat((float) reader.nextDouble());
case BOOLEAN:
}
case BOOLEAN -> {
return new DynamicFloat(reader.nextBoolean());
case BEGIN_ARRAY:
}
case BEGIN_ARRAY -> {
reader.beginArray();
val opStack = new ArrayList<DynamicFloat.StackOp>();
while (reader.hasNext()) {
opStack.add(
switch (reader.peek()) {
case STRING -> new DynamicFloat.StackOp(reader.nextString());
case NUMBER -> new DynamicFloat.StackOp((float) reader.nextDouble());
case BOOLEAN -> new DynamicFloat.StackOp(reader.nextBoolean());
default -> throw new IOException(
"Invalid DynamicFloat definition - " + reader.peek().name());
});
switch (reader.peek()) {
case STRING -> new DynamicFloat.StackOp(reader.nextString());
case NUMBER -> new DynamicFloat.StackOp((float) reader.nextDouble());
case BOOLEAN -> new DynamicFloat.StackOp(reader.nextBoolean());
default -> throw new IOException(
"Invalid DynamicFloat definition - " + reader.peek().name());
});
}
reader.endArray();
return new DynamicFloat(opStack);
default:
throw new IOException("Invalid DynamicFloat definition - " + reader.peek().name());
}
default -> throw new IOException("Invalid DynamicFloat definition - " + reader.peek().name());
}
}
@@ -53,7 +59,7 @@ public class JsonAdapters {
public void write(JsonWriter writer, DynamicFloat f) {}
}
static class IntListAdapter extends TypeAdapter<IntList> {
class IntListAdapter extends TypeAdapter<IntList> {
@Override
public IntList read(JsonReader reader) throws IOException {
if (Objects.requireNonNull(reader.peek()) == JsonToken.BEGIN_ARRAY) {
@@ -72,12 +78,12 @@ public class JsonAdapters {
public void write(JsonWriter writer, IntList l) throws IOException {
writer.beginArray();
for (val i : l) // .forEach() doesn't appreciate exceptions
writer.value(i);
writer.value(i);
writer.endArray();
}
}
public static class ByteArrayAdapter extends TypeAdapter<byte[]> {
public class ByteArrayAdapter extends TypeAdapter<byte[]> {
@Override
public void write(JsonWriter out, byte[] value) throws IOException {
out.value(Utils.base64Encode(value));
@@ -89,7 +95,7 @@ public class JsonAdapters {
}
}
static class GridPositionAdapter extends TypeAdapter<GridPosition> {
class GridPositionAdapter extends TypeAdapter<GridPosition> {
@Override
public void write(JsonWriter out, GridPosition value) throws IOException {
out.value("(" + value.getX() + ", " + value.getZ() + ", " + value.getWidth() + ")");
@@ -113,17 +119,18 @@ public class JsonAdapters {
}
}
static class PositionAdapter extends TypeAdapter<Position> {
class PositionAdapter extends TypeAdapter<Position> {
@Override
public Position read(JsonReader reader) throws IOException {
switch (reader.peek()) {
case BEGIN_ARRAY: // "pos": [x,y,z]
case BEGIN_ARRAY -> { // "pos": [x,y,z]
reader.beginArray();
val array = new FloatArrayList(3);
while (reader.hasNext()) array.add(reader.nextInt());
reader.endArray();
return new Position(array);
case BEGIN_OBJECT: // "pos": {"x": x, "y": y, "z": z}
}
case BEGIN_OBJECT -> { // "pos": {"x": x, "y": y, "z": z}
float x = 0f;
float y = 0f;
float z = 0f;
@@ -139,8 +146,8 @@ public class JsonAdapters {
}
reader.endObject();
return new Position(x, y, z);
default:
throw new IOException("Invalid Position definition - " + reader.peek().name());
}
default -> throw new IOException("Invalid Position definition - " + reader.peek().name());
}
}
@@ -154,7 +161,7 @@ public class JsonAdapters {
}
}
static class EnumTypeAdapterFactory implements TypeAdapterFactory {
class EnumTypeAdapterFactory implements TypeAdapterFactory {
@SuppressWarnings("unchecked")
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
Class<T> enumClass = (Class<T>) type.getRawType();
@@ -186,16 +193,13 @@ public class JsonAdapters {
}
}
return new TypeAdapter<T>() {
return new TypeAdapter<>() {
public T read(JsonReader reader) throws IOException {
switch (reader.peek()) {
case STRING:
return map.get(reader.nextString());
case NUMBER:
return map.get(String.valueOf(reader.nextInt()));
default:
throw new IOException("Invalid Enum definition - " + reader.peek().name());
}
return switch (reader.peek()) {
case STRING -> map.get(reader.nextString());
case NUMBER -> map.get(String.valueOf(reader.nextInt()));
default -> throw new IOException("Invalid Enum definition - " + reader.peek().name());
};
}
public void write(JsonWriter writer, T value) throws IOException {