Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-26 22:22:51 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Format code [skip actions]"

Browse Source 
This reverts commit 22e953b636.
This commit is contained in:
KingRainbow44 2023-06-04 17:50:55 -04:00
parent 22e953b636
commit eb17d65330
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/emu/grasscutter/data/binout/AbilityModifier.java
View File

@ -4,9 +4,10 @@ import com.google.gson.annotations.SerializedName;
import emu.grasscutter.data.common.DynamicFloat; import emu.grasscutter.data.common.DynamicFloat;
import emu.grasscutter.game.props.ElementType; import emu.grasscutter.game.props.ElementType;
import emu.grasscutter.utils.objects.DropType; import emu.grasscutter.utils.objects.DropType;
import java.io.Serializable;
import lombok.ToString; import lombok.ToString;
import java.io.Serializable;
public class AbilityModifier implements Serializable { public class AbilityModifier implements Serializable {
private static final long serialVersionUID = -2001232313615923575L; private static final long serialVersionUID = -2001232313615923575L;

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

@ -8,10 +8,11 @@ import emu.grasscutter.game.world.*;
import emu.grasscutter.utils.objects.DropType; import emu.grasscutter.utils.objects.DropType;
import it.unimi.dsi.fastutil.floats.FloatArrayList; import it.unimi.dsi.fastutil.floats.FloatArrayList;
import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.ints.*;
import lombok.val;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.*; import java.util.*;
import lombok.val;
public interface JsonAdapters { public interface JsonAdapters {
class DynamicFloatAdapter extends TypeAdapter<DynamicFloat> { class DynamicFloatAdapter extends TypeAdapter<DynamicFloat> {
@ -55,7 +56,8 @@ public interface JsonAdapters {
class DropTypeAdapter extends TypeAdapter<DropType> { class DropTypeAdapter extends TypeAdapter<DropType> {
@Override @Override
public void write(JsonWriter out, DropType value) throws IOException { public void write(JsonWriter out, DropType value) throws IOException {
if (value.isString()) out.value(value.getAsString()); if (value.isString())
out.value(value.getAsString());
else out.value(value.getAsInt()); else out.value(value.getAsInt());
} }

1
src/main/java/emu/grasscutter/utils/JsonUtils.java
View File

@ -7,6 +7,7 @@ import emu.grasscutter.game.world.*;
import emu.grasscutter.utils.JsonAdapters.*; import emu.grasscutter.utils.JsonAdapters.*;
import emu.grasscutter.utils.objects.*; import emu.grasscutter.utils.objects.*;
import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntList;
import java.io.*; import java.io.*;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;

15
src/main/java/emu/grasscutter/utils/objects/DropType.java
View File

@ -14,11 +14,10 @@ public final class DropType {
public DropType(String value) { public DropType(String value) {
this.raw = value; this.raw = value;
this.value = this.value = switch (value) {
switch (value) { default -> Integer.parseInt(value);
default -> Integer.parseInt(value); case "ForceDrop" -> 2;
case "ForceDrop" -> 2; };
};
} }
/** /**
@ -32,7 +31,8 @@ public final class DropType {
* @return The drop type value as a string. * @return The drop type value as a string.
*/ */
public String getAsString() { public String getAsString() {
if (this.raw instanceof String) return (String) this.raw; if (this.raw instanceof String)
return (String) this.raw;
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@ -40,7 +40,8 @@ public final class DropType {
* @return The drop type value as an integer. * @return The drop type value as an integer.
*/ */
public int getAsInt() { public int getAsInt() {
if (this.raw instanceof Integer) return (int) this.raw; if (this.raw instanceof Integer)
return (int) this.raw;
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
} }